ai-dev-harness 0.1.0 → 0.1.1

package/dist/cli.js

@@ -2,7 +2,7 @@
 import { readFile, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { AuditLogger, prepareRunFiles, writeJson } from "./audit.js";
-import { createAgentAdapter } from "./agent.js";
+import { checkAgentContract, createAgentAdapter } from "./agent.js";
 import { loadConfig, loadSkill } from "./config.js";
 import { buildContextPack } from "./context.js";
 import { initHarness } from "./init.js";
@@ -32,8 +32,9 @@ function parseArgs(argv) {
 function usage() {
     return `AI Dev Harness
 
-Usage:
+用法:
   harness init
+  harness init --no-integration
   harness run --task <text> --skill <name> --agent <codex|claude>
   harness run --task <text> --skill <name> --agent <codex|claude> --live
   harness verify --run <run_id_or_path>
@@ -44,12 +45,12 @@ Usage:
 function requireString(args, key) {
     const value = args[key];
     if (typeof value !== "string" || !value.trim())
-        throw new Error(`Missing required --${key}`);
+        throw new Error(`缺少必填参数 --${key}`);
     return value;
 }
 function requireAgent(value) {
     if (value !== "codex" && value !== "claude")
-        throw new Error(`Invalid agent: ${value}. Expected codex or claude.`);
+        throw new Error(`无效 agent：${value}。期望 codex 或 claude。`);
     return value;
 }
 function quoteCommandPath(filePath) {
@@ -63,12 +64,24 @@ async function resolveRunDir(cwd, runArg) {
     const underAudit = path.join(cwd, config.audit.path, runArg);
     if (await pathExists(underAudit))
         return underAudit;
-    throw new Error(`Run not found: ${runArg}`);
+    throw new Error(`未找到运行记录：${runArg}`);
 }
 async function commandInit(cwd) {
-    const result = await initHarness(cwd);
-    console.log(`Initialized AI Dev Harness in ${cwd}`);
-    console.log(`Created ${result.created.length} file(s), skipped ${result.skipped.length} existing file(s).`);
+    const packageRoot = path.resolve(path.dirname(process.argv[1]), "..");
+    const result = await initHarness(cwd, packageRoot);
+    console.log(`AI Dev Harness 初始化完成：${cwd}`);
+    console.log(`创建 ${result.created.length} 个文件，跳过 ${result.skipped.length} 个已存在文件。`);
+    if (process.argv.includes("--no-integration")) {
+        console.log("已跳过 Claude/Codex 对话集成。");
+        return;
+    }
+    const harnessCliPath = path.resolve(process.argv[1]);
+    const harnessCommand = `node ${quoteCommandPath(harnessCliPath)}`;
+    const integration = await installIntegration({ targetDir: cwd, harnessCommand, harnessCliPath, agent: "both", packageRoot });
+    console.log("Claude/Codex 对话集成已安装。");
+    console.log(`集成创建：${integration.created.length ? integration.created.join(", ") : "无"}`);
+    console.log(`集成更新：${integration.updated.length ? integration.updated.join(", ") : "无"}`);
+    console.log(`集成跳过：${integration.skipped.length ? integration.skipped.join(", ") : "无"}`);
 }
 function sayLive(live, message) {
     if (live)
@@ -84,8 +97,8 @@ async function commandRun(cwd, args) {
     const paths = makeRunPaths(cwd, config, task);
     await prepareRunFiles(paths);
     const audit = new AuditLogger(paths.audit);
-    sayLive(live, `run started: skill=${skillName} agent=${agentName}`);
-    sayLive(live, `evidence directory: ${paths.runDir}`);
+    sayLive(live, `运行开始：skill=${skillName} agent=${agentName}`);
+    sayLive(live, `证据目录：${paths.runDir}`);
     await audit.event({ stage: "intake", event: "run_started", status: "started", detail: { task, skill: skillName, agent: agentName } });
     const isGitRepo = Boolean(await git(cwd, "rev-parse --show-toplevel"));
     const intake = {
@@ -103,12 +116,12 @@ async function commandRun(cwd, args) {
             stage: "intake",
             event: "git_repo_check",
             status: "failed",
-            detail: "Current directory is not a Git repository. Run inside a business Git repository before executing harness run."
+            detail: "当前目录不是 Git 仓库。请在业务 Git 仓库内执行 harness run。"
         });
         await audit.event({ stage: "run", event: "run_finished", status: "failed" });
-        throw new Error(`harness run must execute inside a Git repository. Evidence: ${paths.runDir}`);
+        throw new Error(`harness run 必须在 Git 仓库内执行。证据目录：${paths.runDir}`);
     }
-    sayLive(live, "building context pack with MCP first, local fallback second");
+    sayLive(live, "正在构建 Context Pack：包含 Agent MCP 指引和本地兜底上下文");
     await audit.event({ stage: "context_pack", event: "build_started", status: "started" });
     const contextPack = await buildContextPack({
         cwd,
@@ -122,24 +135,25 @@ async function commandRun(cwd, args) {
     await audit.event({
         stage: "context_pack",
         event: "build_finished",
-        status: contextPack.degraded ? "degraded" : "succeeded"
+        status: "succeeded"
     });
-    sayLive(live, `context pack ${contextPack.degraded ? "degraded" : "ready"}: ${paths.contextPack}`);
-    const plan = `# Execution Plan
+    sayLive(live, `Context Pack 已生成：${paths.contextPack}`);
+    const plan = `# 执行阶段协议
 
-The selected agent must:
-1. Read the context pack.
-2. Produce impact analysis.
-3. Make the smallest safe change.
-4. Leave enough evidence for review.
-5. Allow the harness to run verification and summarize results.
+Agent 必须：
+1. 阅读 context_pack.md。
+2. 按固定格式输出影响分析。
+3. 制定最小修改计划。
+4. 执行最小安全变更。
+5. 说明验证计划和残余风险。
+6. 让 Harness 运行验证并生成总结。
 `;
     await writeFile(paths.plan, plan, "utf8");
     await audit.event({ stage: "plan", event: "plan_written", status: "succeeded", detail: { path: paths.plan } });
-    sayLive(live, `plan written: ${paths.plan}`);
+    sayLive(live, `阶段协议已写入：${paths.plan}`);
     const adapter = createAgentAdapter(agentName, config);
     const agentCommand = agentName === "codex" ? config.agents.codex.command : config.agents.claude.command;
-    sayLive(live, `executing ${adapter.name}: ${agentCommand}`);
+    sayLive(live, `正在执行 ${adapter.name}：${agentCommand}`);
     await audit.event({ stage: "execute", event: "agent_started", status: "started", detail: { agent: adapter.name, command: agentCommand } });
     let agentResult;
     try {
@@ -172,12 +186,20 @@ The selected agent must:
         await audit.event({ stage: "execute", event: "agent_error", status: "failed", detail: agentResult.error });
     }
     await writeFile(paths.gitDiff, agentResult.diff, "utf8");
-    sayLive(live, `agent finished: status=${agentResult.status} changedFiles=${agentResult.changedFiles.length}`);
-    sayLive(live, "running verification commands");
+    const contractCheck = checkAgentContract(`${agentResult.stdout}\n${agentResult.stderr}`);
+    await writeJson(paths.agentContract, contractCheck);
+    await audit.event({
+        stage: "execute",
+        event: "agent_contract_check",
+        status: contractCheck.status === "passed" ? "succeeded" : "failed",
+        detail: contractCheck
+    });
+    sayLive(live, `Agent 执行完成：status=${agentResult.status} changedFiles=${agentResult.changedFiles.length} contract=${contractCheck.status}`);
+    sayLive(live, "正在运行验证命令");
     await audit.event({ stage: "verify", event: "verify_started", status: "started" });
     const verifyResult = await runVerify(cwd, config, skill, paths.verify);
     await audit.event({ stage: "verify", event: "verify_finished", status: verifyResult.status === "passed" ? "succeeded" : "failed", detail: verifyResult });
-    sayLive(live, `verification ${verifyResult.status}: ${paths.verify}`);
+    sayLive(live, `验证完成：${verifyResult.status} ${paths.verify}`);
     await writeSummary({
         task,
         skillName,
@@ -190,28 +212,29 @@ The selected agent must:
     });
     await audit.event({ stage: "summarize", event: "summary_written", status: "succeeded" });
     await audit.event({ stage: "persist", event: "suggestions_written", status: "succeeded" });
-    sayLive(live, `summary written: ${paths.summary}`);
-    sayLive(live, `persist suggestions written: ${paths.persistSuggestions}`);
+    sayLive(live, `总结已写入：${paths.summary}`);
+    sayLive(live, `知识沉淀建议已写入：${paths.persistSuggestions}`);
     const runPassed = verifyResult.status === "passed" && agentResult.status === "success";
     await audit.event({ stage: "run", event: "run_finished", status: runPassed ? "succeeded" : "failed" });
-    console.log(`Run complete: ${paths.runId}`);
-    console.log(`Evidence: ${paths.runDir}`);
+    console.log(`运行完成：${paths.runId}`);
+    console.log(`证据目录：${paths.runDir}`);
     if (!runPassed)
-        throw new Error(`Harness run failed. Evidence: ${paths.runDir}`);
+        throw new Error(`Harness 运行失败。证据目录：${paths.runDir}`);
 }
 async function commandInstallIntegration(cwd, args) {
     const rawAgent = String(args.agent ?? "both");
     if (rawAgent !== "claude" && rawAgent !== "codex" && rawAgent !== "both") {
-        throw new Error(`Invalid --agent ${rawAgent}. Expected claude, codex, or both.`);
+        throw new Error(`无效 --agent ${rawAgent}。期望 claude、codex 或 both。`);
     }
     const targetDir = typeof args.target === "string" ? path.resolve(cwd, args.target) : cwd;
     const packageRoot = path.resolve(path.dirname(process.argv[1]), "..");
-    const harnessCommand = typeof args.command === "string" ? args.command : `node ${quoteCommandPath(path.resolve(process.argv[1]))}`;
-    const result = await installIntegration({ targetDir, harnessCommand, agent: rawAgent, packageRoot });
-    console.log(`Installed AI Dev Harness conversation integration in ${targetDir}`);
-    console.log(`Created: ${result.created.length ? result.created.join(", ") : "(none)"}`);
-    console.log(`Updated: ${result.updated.length ? result.updated.join(", ") : "(none)"}`);
-    console.log(`Skipped: ${result.skipped.length ? result.skipped.join(", ") : "(none)"}`);
+    const harnessCliPath = path.resolve(process.argv[1]);
+    const harnessCommand = typeof args.command === "string" ? args.command : `node ${quoteCommandPath(harnessCliPath)}`;
+    const result = await installIntegration({ targetDir, harnessCommand, harnessCliPath, agent: rawAgent, packageRoot });
+    console.log(`AI Dev Harness 对话集成已安装：${targetDir}`);
+    console.log(`创建：${result.created.length ? result.created.join(", ") : "无"}`);
+    console.log(`更新：${result.updated.length ? result.updated.join(", ") : "无"}`);
+    console.log(`跳过：${result.skipped.length ? result.skipped.join(", ") : "无"}`);
 }
 async function commandVerify(cwd, args) {
     const runDir = await resolveRunDir(cwd, requireString(args, "run"));
@@ -221,7 +244,7 @@ async function commandVerify(cwd, args) {
     const result = await runVerify(cwd, config, skill, path.join(runDir, "verify.json"));
     const audit = new AuditLogger(path.join(runDir, "audit.jsonl"));
     await audit.event({ stage: "verify", event: "verify_rerun", status: result.status === "passed" ? "succeeded" : "failed", detail: result });
-    console.log(`Verify ${result.status}: ${runDir}`);
+    console.log(`验证 ${result.status}：${runDir}`);
 }
 async function commandSummarize(cwd, args) {
     const runDir = await resolveRunDir(cwd, requireString(args, "run"));
@@ -252,7 +275,7 @@ async function commandSummarize(cwd, args) {
     });
     const audit = new AuditLogger(path.join(runDir, "audit.jsonl"));
     await audit.event({ stage: "summarize", event: "summary_rerun", status: "succeeded" });
-    console.log(`Summary refreshed: ${runDir}`);
+    console.log(`总结已刷新：${runDir}`);
 }
 async function main() {
     const cwd = process.cwd();
@@ -271,7 +294,7 @@ async function main() {
         return commandSummarize(cwd, args);
     if (command === "install-integration")
         return commandInstallIntegration(cwd, args);
-    throw new Error(`Unknown command: ${command}\n${usage()}`);
+    throw new Error(`未知命令：${command}\n${usage()}`);
 }
 main().catch((error) => {
     console.error(error instanceof Error ? error.message : String(error));

package/dist/config.js

@@ -7,8 +7,8 @@ export const defaultConfig = {
         claude: { command: "claude -p -" }
     },
     mcp: {
-        codegraph: { url: "http://localhost:7331/mcp" },
-        knowledgeGraph: { url: "http://localhost:7332/mcp" },
+        codegraph: { type: "http", url: "http://localhost:7331/mcp", headers: {} },
+        knowledgeGraph: { type: "http", url: "http://localhost:7332/mcp", headers: {} },
         timeoutMs: 15000
     },
     verify: {
@@ -48,6 +48,8 @@ export function renderYaml(value, indent = 0) {
             .join("\n");
     }
     if (typeof value === "object" && value !== null) {
+        if (Object.keys(value).length === 0)
+            return `${pad}{}`;
         return Object.entries(value)
             .map(([key, item]) => {
             if (typeof item === "object" && item !== null)
@@ -65,7 +67,10 @@ function readScalar(raw) {
     const value = raw.trim().replace(/^["']|["']$/g, "");
     if (/^\d+$/.test(value))
         return Number(value);
-    return value;
+    return expandEnv(value);
+}
+function expandEnv(value) {
+    return value.replace(/\$\{([A-Za-z_][A-Za-z0-9_]*)\}/g, (_match, name) => process.env[name] ?? "");
 }
 function parseVerifyCommands(text) {
     const commands = [];
@@ -95,14 +100,71 @@ function blockList(text, key) {
     const match = text.match(new RegExp(`^\\s*${key}:\\n([\\s\\S]*?)(?=^\\s*[a-zA-Z][\\w]*:|^\\S|$)`, "m"));
     return match ? parseStringList(match[1]) : [];
 }
+function mcpAskFor(text, source) {
+    const lines = text.split("\n");
+    const sourceIndex = lines.findIndex((line) => line === `  ${source}:`);
+    if (sourceIndex < 0)
+        return [];
+    const askForIndex = lines.findIndex((line, index) => index > sourceIndex && line === "    ask_for:");
+    if (askForIndex < 0)
+        return [];
+    const values = [];
+    for (const line of lines.slice(askForIndex + 1)) {
+        if (!line.trim())
+            continue;
+        if (!line.startsWith("      - "))
+            break;
+        values.push(String(readScalar(line.slice("      - ".length))));
+    }
+    return values;
+}
+function objectBlock(text, key) {
+    const values = {};
+    const lines = text.split("\n");
+    const start = lines.findIndex((line) => line.match(new RegExp(`^\\s*${key}:\\s*$`)));
+    if (start < 0)
+        return values;
+    const baseIndent = lines[start].match(/^\s*/)?.[0].length ?? 0;
+    for (const line of lines.slice(start + 1)) {
+        if (!line.trim())
+            continue;
+        const indent = line.match(/^\s*/)?.[0].length ?? 0;
+        if (indent <= baseIndent)
+            break;
+        const item = line.match(/^\s*([A-Za-z0-9_-]+):\s*(.+)$/);
+        if (item)
+            values[item[1]] = String(readScalar(item[2]));
+    }
+    return values;
+}
+function indentedSection(text, key, indent) {
+    const lines = text.split("\n");
+    const start = lines.findIndex((line) => line.match(new RegExp(`^ {${indent}}${key}:\\s*$`)));
+    if (start < 0)
+        return "";
+    const collected = [];
+    for (const line of lines.slice(start + 1)) {
+        if (!line.trim()) {
+            collected.push(line);
+            continue;
+        }
+        const currentIndent = line.match(/^\s*/)?.[0].length ?? 0;
+        if (currentIndent <= indent)
+            break;
+        collected.push(line);
+    }
+    return collected.join("\n");
+}
 export async function loadConfig(cwd) {
     const configPath = path.join(cwd, "harness.yaml");
     if (!(await pathExists(configPath)))
         return defaultConfig;
-    const text = await readFile(configPath, "utf8");
+    const text = (await readFile(configPath, "utf8")).replace(/\r\n/g, "\n");
     const verifyRoot = topSection(text, "verify");
     const verifySection = verifyRoot.match(/defaultCommands:\n([\s\S]*?)(?=^\S|^  [a-zA-Z][\w]*:|$)/m)?.[1] ?? "";
     const contextSection = topSection(text, "context");
+    const codegraphSection = indentedSection(text, "codegraph", 2);
+    const knowledgeSection = indentedSection(text, "knowledgeGraph", 2);
     return {
         agents: {
             codex: {
@@ -114,10 +176,14 @@ export async function loadConfig(cwd) {
         },
         mcp: {
             codegraph: {
-                url: String(scalar(text, /mcp:\n[\s\S]*?codegraph:\n\s+url:\s*([^\n]+)/m, defaultConfig.mcp.codegraph.url))
+                type: String(scalar(codegraphSection, /^\s*type:\s*([^\n]+)/m, defaultConfig.mcp.codegraph.type ?? "http")),
+                url: String(scalar(codegraphSection, /^\s*url:\s*([^\n]+)/m, defaultConfig.mcp.codegraph.url)),
+                headers: objectBlock(codegraphSection, "headers")
             },
             knowledgeGraph: {
-                url: String(scalar(text, /mcp:\n[\s\S]*?knowledgeGraph:\n\s+url:\s*([^\n]+)/m, defaultConfig.mcp.knowledgeGraph.url))
+                type: String(scalar(knowledgeSection, /^\s*type:\s*([^\n]+)/m, defaultConfig.mcp.knowledgeGraph.type ?? "http")),
+                url: String(scalar(knowledgeSection, /^\s*url:\s*([^\n]+)/m, defaultConfig.mcp.knowledgeGraph.url)),
+                headers: objectBlock(knowledgeSection, "headers")
             },
             timeoutMs: Number(scalar(text, /mcp:\n[\s\S]*?timeoutMs:\s*([^\n]+)/m, defaultConfig.mcp.timeoutMs))
         },
@@ -143,14 +209,19 @@ export async function loadSkill(cwd, name) {
         throw new Error(`Skill not found: ${name}. Expected ${path.join(dir, "SKILL.md")}`);
     }
     const markdown = await readTextIfExists(path.join(dir, "SKILL.md"));
-    const verifyText = await readTextIfExists(path.join(dir, "verify.yaml"));
-    const contextText = await readTextIfExists(path.join(dir, "context.yaml"));
+    const verifyText = (await readTextIfExists(path.join(dir, "verify.yaml"))).replace(/\r\n/g, "\n");
+    const contextText = (await readTextIfExists(path.join(dir, "context.yaml"))).replace(/\r\n/g, "\n");
     return {
         name,
         dir,
         markdown,
         verifyCommands: parseVerifyCommands(verifyText),
         contextQueries: blockList(contextText, "queries"),
+        mcpPreflight: {
+            codegraph: mcpAskFor(contextText, "codegraph"),
+            knowledgeGraph: mcpAskFor(contextText, "knowledgeGraph")
+        },
+        stopConditions: blockList(contextText, "stop_conditions"),
         fallbackInclude: blockList(contextText, "fallbackInclude")
     };
 }

package/dist/context.js

@@ -41,24 +41,15 @@ async function fallbackContext(cwd, config, skill) {
     }
     return snippets.join("\n\n");
 }
+function listSection(items, empty = "- (none configured)") {
+    return items.length ? items.map((item) => `- ${item}`).join("\n") : empty;
+}
 export async function buildContextPack(options) {
     const { cwd, task, config, skill, contextPackPath, mcpLogPath, audit } = options;
-    await audit.event({ stage: "context_pack", event: "mcp_query", status: "started" });
+    await audit.event({ stage: "context_pack", event: "mcp_sources_record", status: "started" });
     const source = new ContextSource(config, mcpLogPath);
     const { codeContext, knowledgeContext } = await source.searchTaskContext(task, skill);
-    const degraded = codeContext.degraded || knowledgeContext.degraded;
-    if (degraded)
-        await audit.event({
-            stage: "context_pack",
-            event: "mcp_query",
-            status: "degraded",
-            detail: {
-                codegraph: codeContext.error,
-                knowledgeGraph: knowledgeContext.error
-            }
-        });
-    else
-        await audit.event({ stage: "context_pack", event: "mcp_query", status: "succeeded" });
+    await audit.event({ stage: "context_pack", event: "mcp_sources_record", status: "succeeded" });
     const branch = await git(cwd, "branch --show-current");
     const status = await git(cwd, "status --short");
     const recent = await git(cwd, "log -5 --oneline");
@@ -66,12 +57,53 @@ export async function buildContextPack(options) {
     const markdown = `# Context Pack
 
 ## How To Use This Context
-- Treat CodeGraph and Knowledge Graph results as primary context when status is ok.
-- If either MCP source is degraded, explicitly mention the degraded source in your analysis and rely on fallback context carefully.
+- CodeGraph and Knowledge Graph are agent-side MCP sources. Use Claude/Codex MCP tools directly before and during execution when available.
+- Harness records MCP configuration and audit evidence, but it does not implement MCP transport or replace the agent MCP client.
+- If the current agent cannot access an MCP source, explicitly mention the missing source and rely on fallback context carefully.
 - Do not assume fallback file snippets are complete repository knowledge.
 - Cross-check task assumptions against Git state, project rules, and available source files before editing.
 - Prefer minimal changes in files directly connected to the task.
 
+## Agent Context Assembly Protocol
+Before editing, assemble context in this exact shape:
+
+### MCP Preflight Findings
+- CodeGraph tools used:
+- CodeGraph findings:
+  - Related files:
+  - Related symbols:
+  - Callers / dependencies:
+  - Impact scope:
+- Knowledge Graph tools used:
+- Knowledge Graph findings:
+  - ADRs / decisions:
+  - Module notes:
+  - API notes:
+  - Runbooks / known issues:
+- Missing context:
+
+### Impact Analysis
+- Root cause or implementation intent:
+- Affected files/modules:
+- User-visible behavior:
+- Compatibility and risk:
+
+### Proposed Plan
+- Files to inspect:
+- Files to change:
+- Verification plan:
+- Stop conditions checked:
+
+## Skill MCP Preflight Requirements
+### CodeGraph ask_for
+${listSection(skill.mcpPreflight.codegraph)}
+
+### Knowledge Graph ask_for
+${listSection(skill.mcpPreflight.knowledgeGraph)}
+
+## Skill Stop Conditions
+${listSection(skill.stopConditions)}
+
 ## Task
 ${task}
 
@@ -92,15 +124,15 @@ ${status || "(clean or unavailable)"}
 ${recent || "(unavailable)"}
 \`\`\`
 
-## CodeGraph MCP
-Status: ${codeContext.ok ? "ok" : "degraded"}
+## CodeGraph MCP Source
+Mode: agent-driven
 
 \`\`\`json
 ${truncate(JSON.stringify(codeContext.data ?? { error: codeContext.error }, null, 2), 12000)}
 \`\`\`
 
-## Knowledge Graph MCP
-Status: ${knowledgeContext.ok ? "ok" : "degraded"}
+## Knowledge Graph MCP Source
+Mode: agent-driven
 
 \`\`\`json
 ${truncate(JSON.stringify(knowledgeContext.data ?? { error: knowledgeContext.error }, null, 2), 12000)}
@@ -110,5 +142,5 @@ ${truncate(JSON.stringify(knowledgeContext.data ?? { error: knowledgeContext.err
 ${fallback || "(no fallback context found)"}
 `;
     await writeFile(contextPackPath, markdown, "utf8");
-    return { markdown, degraded, mcpResults: [codeContext, knowledgeContext] };
+    return { markdown, mcpResults: [codeContext, knowledgeContext] };
 }

package/dist/init.js

@@ -1,29 +1,17 @@
 import path from "node:path";
-import { mkdir } from "node:fs/promises";
-import { rootTemplates, skillTemplates } from "./templates.js";
+import { defaultProjectTemplates, packageRootFromHere } from "./templates.js";
 import { ensureDir, writeFileIfMissing } from "./utils.js";
-export async function initHarness(cwd) {
+export async function initHarness(cwd, packageRoot = packageRootFromHere()) {
     const created = [];
     const skipped = [];
-    for (const [file, content] of Object.entries(rootTemplates)) {
-        const target = path.join(cwd, file);
-        if (await writeFileIfMissing(target, content))
-            created.push(file);
-        else
-            skipped.push(file);
-    }
     await ensureDir(path.join(cwd, "runs"));
     await ensureDir(path.join(cwd, "skills"));
-    for (const [skillName, files] of Object.entries(skillTemplates)) {
-        await mkdir(path.join(cwd, "skills", skillName), { recursive: true });
-        for (const [file, content] of Object.entries(files)) {
-            const rel = path.join("skills", skillName, file);
-            const target = path.join(cwd, rel);
-            if (await writeFileIfMissing(target, content))
-                created.push(rel);
-            else
-                skipped.push(rel);
-        }
+    for (const file of await defaultProjectTemplates(packageRoot)) {
+        const target = path.join(cwd, file.relPath);
+        if (await writeFileIfMissing(target, file.content))
+            created.push(file.relPath);
+        else
+            skipped.push(file.relPath);
     }
     return { created, skipped };
 }