260806_01_ENH: Agent Harness 연동 및 KriCommon 버전 고정
This commit is contained in:
31
src/args.ts
31
src/args.ts
@@ -1,5 +1,5 @@
|
||||
import path from "node:path";
|
||||
import type { DatabaseType, ParsedArguments } from "./types.js";
|
||||
import type { DatabaseType, ParsedArguments, ProjectType } from "./types.js";
|
||||
|
||||
const requireValue = (args: string[], index: number, option: string): string => {
|
||||
const value = args[index + 1];
|
||||
@@ -14,12 +14,22 @@ const parseDatabase = (value: string): DatabaseType => {
|
||||
throw new Error("--database는 mysql 또는 mssql이어야 합니다.");
|
||||
};
|
||||
|
||||
export const parseProjectType = (value: string): ProjectType => {
|
||||
if (value === "requested-project" || value === "internal-service" || value === "shared-service") {
|
||||
return value;
|
||||
}
|
||||
throw new Error(
|
||||
"--project-type은 requested-project, internal-service, shared-service 중 하나여야 합니다.",
|
||||
);
|
||||
};
|
||||
|
||||
export function parseArguments(argv: string[]): ParsedArguments {
|
||||
const parsed: ParsedArguments = {
|
||||
yes: false,
|
||||
build: true,
|
||||
jenkins: true,
|
||||
mybatis: false,
|
||||
skipAgentCompose: false,
|
||||
force: false,
|
||||
help: false,
|
||||
};
|
||||
@@ -54,6 +64,21 @@ export function parseArguments(argv: string[]): ParsedArguments {
|
||||
case "--mybatis":
|
||||
parsed.mybatis = true;
|
||||
break;
|
||||
case "--skip-agent-compose":
|
||||
parsed.skipAgentCompose = true;
|
||||
break;
|
||||
case "--project-type":
|
||||
parsed.projectType = parseProjectType(requireValue(argv, index, arg));
|
||||
index += 1;
|
||||
break;
|
||||
case "--agent-project-id":
|
||||
parsed.agentProjectId = requireValue(argv, index, arg);
|
||||
index += 1;
|
||||
break;
|
||||
case "--harness-root":
|
||||
parsed.harnessRoot = path.resolve(requireValue(argv, index, arg));
|
||||
index += 1;
|
||||
break;
|
||||
case "--target-dir":
|
||||
parsed.targetDir = path.resolve(requireValue(argv, index, arg));
|
||||
index += 1;
|
||||
@@ -119,6 +144,9 @@ export function printHelp(): void {
|
||||
옵션:
|
||||
--base-package <package> 기본 패키지
|
||||
--description <text> 프로젝트 설명
|
||||
--project-type <type> requested-project|internal-service|shared-service
|
||||
--agent-project-id <id> 하네스 프로젝트 ID (기본: 프로젝트명 slug)
|
||||
--harness-root <path> 중앙 Agent Harness 저장소 경로
|
||||
--port <number> 서버 포트 (기본 8080)
|
||||
--database mysql|mssql DB 종류 (기본 mysql)
|
||||
--mybatis MyBatis 예제 포함
|
||||
@@ -131,6 +159,7 @@ export function printHelp(): void {
|
||||
--target-dir <path> 생성 경로
|
||||
--yes, -y 질문 없이 기본값 사용
|
||||
--skip-build Gradle build 생략
|
||||
--skip-agent-compose 하네스 자동 등록·합성·검증 생략
|
||||
--no-jenkins Jenkinsfile 생성 안 함
|
||||
--force 비어 있지 않은 대상 폴더 사용
|
||||
--help, -h 도움말
|
||||
|
||||
35
src/cli.ts
35
src/cli.ts
@@ -2,13 +2,14 @@
|
||||
|
||||
import path from "node:path";
|
||||
import process from "node:process";
|
||||
import { parseArguments, printHelp } from "./args.js";
|
||||
import { parseArguments, parseProjectType, printHelp } from "./args.js";
|
||||
import { createProject } from "./create-project.js";
|
||||
import { ask, confirm } from "./prompts.js";
|
||||
import type { CliOptions, DatabaseType } from "./types.js";
|
||||
|
||||
const PROJECT_NAME_PATTERN = /^[a-z0-9][a-z0-9._-]*$/;
|
||||
const PACKAGE_PATTERN = /^[a-z][a-z0-9_]*(?:\.[a-z][a-z0-9_]*)+$/;
|
||||
const AGENT_PROJECT_ID_PATTERN = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
|
||||
|
||||
function validateProjectName(name: string): string {
|
||||
const normalized = name.trim();
|
||||
@@ -18,6 +19,21 @@ function validateProjectName(name: string): string {
|
||||
return normalized;
|
||||
}
|
||||
|
||||
function defaultAgentProjectId(projectName: string): string {
|
||||
return projectName
|
||||
.toLowerCase()
|
||||
.replace(/[^a-z0-9]+/g, "-")
|
||||
.replace(/^-+|-+$/g, "");
|
||||
}
|
||||
|
||||
function validateAgentProjectId(value: string): string {
|
||||
const normalized = value.trim();
|
||||
if (!AGENT_PROJECT_ID_PATTERN.test(normalized)) {
|
||||
throw new Error("Agent Harness 프로젝트 ID는 영문 소문자, 숫자, 하이픈으로 구성된 slug여야 합니다.");
|
||||
}
|
||||
return normalized;
|
||||
}
|
||||
|
||||
function defaultBasePackage(projectName: string): string {
|
||||
const suffix = projectName
|
||||
.toLowerCase()
|
||||
@@ -64,6 +80,19 @@ async function resolveOptions(): Promise<CliOptions> {
|
||||
if (!projectName) throw new Error("프로젝트명이 필요합니다.");
|
||||
projectName = validateProjectName(projectName);
|
||||
|
||||
const agentProjectId = validateAgentProjectId(
|
||||
parsed.agentProjectId ?? defaultAgentProjectId(projectName),
|
||||
);
|
||||
const projectType = parsed.projectType
|
||||
?? (parsed.yes
|
||||
? "requested-project"
|
||||
: parseProjectType(
|
||||
(await ask(
|
||||
"Project type (requested-project/internal-service/shared-service)",
|
||||
"requested-project",
|
||||
)).toLowerCase(),
|
||||
));
|
||||
|
||||
const basePackageDefault = defaultBasePackage(projectName);
|
||||
const basePackage = validateBasePackage(
|
||||
parsed.basePackage ?? (parsed.yes ? basePackageDefault : await ask("Base package", basePackageDefault)),
|
||||
@@ -99,6 +128,8 @@ async function resolveOptions(): Promise<CliOptions> {
|
||||
|
||||
return {
|
||||
projectName,
|
||||
agentProjectId,
|
||||
projectType,
|
||||
targetDir,
|
||||
basePackage,
|
||||
applicationClass,
|
||||
@@ -115,6 +146,8 @@ async function resolveOptions(): Promise<CliOptions> {
|
||||
yes: parsed.yes,
|
||||
build: parsed.build,
|
||||
jenkins,
|
||||
harnessRoot: parsed.harnessRoot,
|
||||
skipAgentCompose: parsed.skipAgentCompose,
|
||||
force: parsed.force,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -8,6 +8,7 @@ import {
|
||||
removeMyBatisFiles,
|
||||
replacePlaceholders,
|
||||
} from "./files.js";
|
||||
import { composeAgentHarness } from "./harness.js";
|
||||
import { run } from "./process.js";
|
||||
import type { CliOptions } from "./types.js";
|
||||
|
||||
@@ -55,6 +56,10 @@ export async function createProject(options: CliOptions): Promise<void> {
|
||||
|
||||
await replacePlaceholders(options.targetDir, {
|
||||
"__PROJECT_NAME__": options.projectName,
|
||||
"__AGENT_PROJECT_ID__": options.agentProjectId,
|
||||
"__AGENT_PROJECT_NAME_YAML__": JSON.stringify(options.projectName),
|
||||
"__AGENT_PROJECT_TYPE__": options.projectType,
|
||||
"__DATABASE__": options.database,
|
||||
"__BASE_PACKAGE__": options.basePackage,
|
||||
"__APPLICATION_CLASS__": options.applicationClass,
|
||||
"__DESCRIPTION__": options.description,
|
||||
@@ -75,13 +80,14 @@ export async function createProject(options: CliOptions): Promise<void> {
|
||||
|
||||
if (!options.build) {
|
||||
console.log("[SKIP] Gradle build");
|
||||
return;
|
||||
} else {
|
||||
console.log("\n[1/1] Gradle clean build 검증");
|
||||
if (process.platform === "win32") {
|
||||
await run("gradlew.bat", ["clean", "build"], options.targetDir);
|
||||
} else {
|
||||
await run("./gradlew", ["clean", "build"], options.targetDir);
|
||||
}
|
||||
}
|
||||
|
||||
console.log("\n[1/1] Gradle clean build 검증");
|
||||
if (process.platform === "win32") {
|
||||
await run("gradlew.bat", ["clean", "build"], options.targetDir);
|
||||
} else {
|
||||
await run("./gradlew", ["clean", "build"], options.targetDir);
|
||||
}
|
||||
await composeAgentHarness(options);
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ import path from "node:path";
|
||||
const ROOT_RENAMES: Record<string, string> = {
|
||||
"_gitignore": ".gitignore",
|
||||
"_gitattributes": ".gitattributes",
|
||||
"_agent": ".agent",
|
||||
"README.md.template": "README.md",
|
||||
"Jenkinsfile.template": "Jenkinsfile",
|
||||
};
|
||||
|
||||
115
src/harness.ts
Normal file
115
src/harness.ts
Normal file
@@ -0,0 +1,115 @@
|
||||
import { access } from "node:fs/promises";
|
||||
import path from "node:path";
|
||||
import process from "node:process";
|
||||
import { spawn } from "node:child_process";
|
||||
|
||||
const HARNESS_DIRECTORY_NAME = "_________AgentHarnessBase";
|
||||
const HARNESS_CLI_PATH = path.join("dist", "cli.cjs");
|
||||
|
||||
interface HarnessOptions {
|
||||
targetDir: string;
|
||||
agentProjectId: string;
|
||||
harnessRoot?: string;
|
||||
skipAgentCompose: boolean;
|
||||
}
|
||||
|
||||
async function isHarnessRoot(candidate: string): Promise<boolean> {
|
||||
try {
|
||||
await Promise.all([
|
||||
access(path.join(candidate, "workspace.yml")),
|
||||
access(path.join(candidate, HARNESS_CLI_PATH)),
|
||||
]);
|
||||
return true;
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
async function configuredHarnessRoot(candidate: string, source: string): Promise<string> {
|
||||
const resolved = path.resolve(candidate);
|
||||
if (!(await isHarnessRoot(resolved))) {
|
||||
throw new Error(`${source}에 유효한 Agent Harness가 없습니다: ${resolved}`);
|
||||
}
|
||||
return resolved;
|
||||
}
|
||||
|
||||
async function findHarnessRoot(options: HarnessOptions): Promise<string | undefined> {
|
||||
if (options.harnessRoot) {
|
||||
return configuredHarnessRoot(options.harnessRoot, "--harness-root");
|
||||
}
|
||||
|
||||
const environmentRoot = process.env.KRI_AGENT_HARNESS_ROOT?.trim();
|
||||
if (environmentRoot) {
|
||||
return configuredHarnessRoot(environmentRoot, "KRI_AGENT_HARNESS_ROOT");
|
||||
}
|
||||
|
||||
let current = path.resolve(options.targetDir);
|
||||
while (true) {
|
||||
const candidate = path.join(current, HARNESS_DIRECTORY_NAME);
|
||||
if (await isHarnessRoot(candidate)) return candidate;
|
||||
|
||||
const parent = path.dirname(current);
|
||||
if (parent === current) return undefined;
|
||||
current = parent;
|
||||
}
|
||||
}
|
||||
|
||||
function workspaceRelativePath(harnessRoot: string, targetDir: string): string {
|
||||
const workspaceRoot = path.dirname(harnessRoot);
|
||||
const relative = path.relative(workspaceRoot, path.resolve(targetDir));
|
||||
if (!relative || path.isAbsolute(relative) || relative === ".." || relative.startsWith(`..${path.sep}`)) {
|
||||
throw new Error(`생성 경로가 Agent Harness 워크스페이스 밖에 있습니다: ${targetDir}`);
|
||||
}
|
||||
return relative.split(path.sep).join("/");
|
||||
}
|
||||
|
||||
async function runHarness(harnessRoot: string, args: string[]): Promise<void> {
|
||||
const cliPath = path.join(harnessRoot, HARNESS_CLI_PATH);
|
||||
await new Promise<void>((resolve, reject) => {
|
||||
const child = spawn(process.execPath, [cliPath, ...args], {
|
||||
cwd: harnessRoot,
|
||||
env: process.env,
|
||||
stdio: "inherit",
|
||||
shell: false,
|
||||
windowsHide: true,
|
||||
});
|
||||
|
||||
child.once("error", reject);
|
||||
child.once("exit", (code, signal) => {
|
||||
if (code === 0) {
|
||||
resolve();
|
||||
return;
|
||||
}
|
||||
reject(new Error(
|
||||
`Agent Harness ${args[0]} 실패 (code=${code ?? "null"}, signal=${signal ?? "none"})`,
|
||||
));
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
export async function composeAgentHarness(options: HarnessOptions): Promise<void> {
|
||||
if (options.skipAgentCompose) {
|
||||
console.log("[SKIP] Agent Harness 자동 등록·합성·검증");
|
||||
return;
|
||||
}
|
||||
|
||||
const harnessRoot = await findHarnessRoot(options);
|
||||
if (!harnessRoot) {
|
||||
console.warn(
|
||||
"[WARN] 중앙 Agent Harness를 찾지 못했습니다. .agent 원본은 생성했지만 AGENTS.md와 CLAUDE.md는 아직 합성되지 않았습니다.",
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
const projectPath = workspaceRelativePath(harnessRoot, options.targetDir);
|
||||
console.log("\n[Agent Harness] 로컬 등록·합성·검증");
|
||||
await runHarness(harnessRoot, [
|
||||
"register",
|
||||
"--project",
|
||||
options.agentProjectId,
|
||||
"--path",
|
||||
projectPath,
|
||||
]);
|
||||
await runHarness(harnessRoot, ["compose", "--project", options.agentProjectId]);
|
||||
await runHarness(harnessRoot, ["verify", "--project", options.agentProjectId]);
|
||||
}
|
||||
@@ -1,7 +1,10 @@
|
||||
export type DatabaseType = "mysql" | "mssql";
|
||||
export type ProjectType = "requested-project" | "internal-service" | "shared-service";
|
||||
|
||||
export interface CliOptions {
|
||||
projectName: string;
|
||||
agentProjectId: string;
|
||||
projectType: ProjectType;
|
||||
targetDir: string;
|
||||
basePackage: string;
|
||||
applicationClass: string;
|
||||
@@ -18,11 +21,15 @@ export interface CliOptions {
|
||||
yes: boolean;
|
||||
build: boolean;
|
||||
jenkins: boolean;
|
||||
harnessRoot?: string;
|
||||
skipAgentCompose: boolean;
|
||||
force: boolean;
|
||||
}
|
||||
|
||||
export interface ParsedArguments {
|
||||
projectName?: string;
|
||||
agentProjectId?: string;
|
||||
projectType?: ProjectType;
|
||||
targetDir?: string;
|
||||
basePackage?: string;
|
||||
description?: string;
|
||||
@@ -38,6 +45,8 @@ export interface ParsedArguments {
|
||||
yes: boolean;
|
||||
build: boolean;
|
||||
jenkins: boolean;
|
||||
harnessRoot?: string;
|
||||
skipAgentCompose: boolean;
|
||||
force: boolean;
|
||||
help: boolean;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user