@contextforge/core 0.1.5 → 0.1.7

package/dist/index.d.ts

@@ -365,9 +365,9 @@ declare function installPack(projectRoot: string, registryUrl: string, packName:
 
 declare function compileOutputs(config: ContextForgeConfig, packs: InstalledPack[], analysis: ProjectAnalysis): GeneratedFile[];
 
-declare function compileAgentsMd(root: string, packs: InstalledPack[]): Promise<string>;
+declare function compileAgentsMd(): Promise<string>;
 
-declare function compileClaudeMd(root: string, packs: InstalledPack[]): Promise<string>;
+declare function compileClaudeMd(): Promise<string>;
 
 declare function generateToolOutputs(root: string, packs: InstalledPack[], config: ContextForgeConfig, previousFiles?: string[]): Promise<string[]>;
 

package/dist/index.js

@@ -657,6 +657,44 @@ async function installPack(projectRoot, registryUrl, packName, options = {}) {
   };
 }
 
+// src/fs/updateGeneratedBlock.ts
+var GENERATED_BLOCK_START = "<!-- contextforge:start -->";
+var GENERATED_BLOCK_END = "<!-- contextforge:end -->";
+var blockPattern = new RegExp(
+  `${escapeRegExp(GENERATED_BLOCK_START)}[\\s\\S]*?${escapeRegExp(GENERATED_BLOCK_END)}`,
+  "m"
+);
+function escapeRegExp(value) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function getGeneratedBlock(content) {
+  return content.match(blockPattern)?.[0] ?? null;
+}
+function removeGeneratedBlock(content) {
+  return content.replace(blockPattern, "").replace(/\s+$/u, "");
+}
+function wrapGeneratedBlock(content) {
+  return `${GENERATED_BLOCK_START}
+${content.trim()}
+${GENERATED_BLOCK_END}`;
+}
+function updateGeneratedBlock(existingContent, generatedContent) {
+  const existing = existingContent?.replace(/\s+$/u, "") ?? "";
+  const generatedBlock = getGeneratedBlock(generatedContent) ?? wrapGeneratedBlock(generatedContent);
+  if (!existing) {
+    return `${generatedContent.includes(GENERATED_BLOCK_START) ? generatedContent.trim() : generatedBlock}
+`;
+  }
+  if (blockPattern.test(existing)) {
+    return `${existing.replace(blockPattern, generatedBlock)}
+`;
+  }
+  return `${existing}
+
+${generatedBlock}
+`;
+}
+
 // src/compiler/compileOutputs.ts
 function normalizeOutputPath(outputPath) {
   return outputPath.split(/[\\/]/u).join("/");
@@ -664,11 +702,11 @@ function normalizeOutputPath(outputPath) {
 function defaultOutput(packName, type) {
   const defaults = {
     rules: null,
-    agents: `.contextforge/instructions/agents/${packName}.md`,
-    claude: `.contextforge/instructions/claude/${packName}.md`,
-    skill: `.agents/skills/${packName}/SKILL.md`,
-    cursor: `.cursor/rules/${packName}.mdc`,
-    copilot: `.github/instructions/${packName}.instructions.md`
+    agents: `.contextforge/agents/codex/${packName}.md`,
+    claude: `.contextforge/agents/claude/${packName}.md`,
+    skill: `.contextforge/skills/${packName}/SKILL.md`,
+    cursor: `.contextforge/agents/cursor/${packName}.md`,
+    copilot: `.contextforge/agents/copilot/${packName}.md`
   };
   return defaults[type];
 }
@@ -680,7 +718,7 @@ function shouldGenerateFile(type, tools) {
     return tools.includes("claude");
   }
   if (type === "skill") {
-    return tools.includes("codex") || tools.includes("claude");
+    return tools.length > 0;
   }
   if (type === "cursor") {
     return tools.includes("cursor");
@@ -691,67 +729,37 @@ function shouldGenerateFile(type, tools) {
   return false;
 }
 function compileRootAgents(packs, analysis) {
-  const summaries = packs.map((pack) => pack.files.agents?.trim()).filter((summary) => Boolean(summary));
-  const gitSafetyWarning = packs.some((pack) => pack.manifest.name === "git-workflow") ? [
-    "## Git Safety",
-    "",
-    "Do not commit, push, merge, rebase, reset, delete branches, or rewrite history unless explicitly requested by the user.",
-    ""
-  ] : [];
   return [
     "# Project Agent Instructions",
     "",
-    "Generated by ContextForge from installed instruction packs.",
-    "",
-    "## Core Behavior",
-    "",
-    summaries.length > 0 ? summaries.join("\n\n") : "No pack-specific agent summaries are installed yet.",
-    "",
-    ...gitSafetyWarning,
-    "## Installed Packs",
-    "",
-    ...packs.length > 0 ? packs.map((pack) => `- ${pack.manifest.name}: ${pack.manifest.title}`) : ["- No packs installed"],
-    "",
-    "## Detected Project",
+    GENERATED_BLOCK_START,
+    "ContextForge is installed for this repo.",
     "",
-    `- Framework: ${analysis.framework}`,
-    `- Language: ${analysis.language}`,
-    `- Package manager: ${analysis.packageManager}`,
+    "Before working, read the relevant instruction files in:",
     "",
-    "## Notes",
+    "- `.contextforge/agents/codex/`",
+    "- `.contextforge/skills/`",
     "",
-    "Detailed Codex skills live in `.agents/skills`.",
-    "Pack sources live in `.contextforge/packs`.",
-    "Pack-specific agent summaries live in `.contextforge/instructions/agents`."
+    "Follow the installed packs listed in `.contextforge/config.json`.",
+    "Do not copy these instructions into this file.",
+    GENERATED_BLOCK_END
   ].join("\n");
 }
 function compileRootClaude(packs) {
-  const summaries = packs.map((pack) => pack.files.claude?.trim()).filter((summary) => Boolean(summary));
-  const gitSafetyWarning = packs.some((pack) => pack.manifest.name === "git-workflow") ? [
-    "## Git Safety",
-    "",
-    "Do not commit, push, merge, rebase, reset, delete branches, or rewrite history unless explicitly requested by the user.",
-    ""
-  ] : [];
   return [
     "# Claude Code Instructions",
     "",
-    "Generated by ContextForge from installed instruction packs.",
-    "",
-    "## Core Behavior",
-    "",
-    summaries.length > 0 ? summaries.join("\n\n") : "No pack-specific Claude summaries are installed yet.",
-    "",
-    ...gitSafetyWarning,
-    "## Installed Packs",
+    GENERATED_BLOCK_START,
+    "ContextForge is installed for this repo.",
     "",
-    ...packs.length > 0 ? packs.map((pack) => `- ${pack.manifest.name}: ${pack.manifest.title}`) : ["- No packs installed"],
+    "Before working, read the relevant instruction files in:",
     "",
-    "## Notes",
+    "- `.contextforge/agents/claude/`",
+    "- `.contextforge/skills/`",
     "",
-    "Keep this file concise.",
-    "Detailed pack sources live in `.contextforge/packs`.",
-    "Pack-specific Claude summaries live in `.contextforge/instructions/claude`."
+    "Follow the installed packs listed in `.contextforge/config.json`.",
+    "Do not copy these instructions into this file.",
+    GENERATED_BLOCK_END
   ].join("\n");
 }
 function compileOutputs(config, packs, analysis) {
@@ -762,13 +770,13 @@ function compileOutputs(config, packs, analysis) {
         continue;
       }
       const content = pack.files[file.type];
-      const outputPath = file.output ?? defaultOutput(pack.manifest.name, file.type);
+      const outputPath = defaultOutput(pack.manifest.name, file.type);
       if (!content || !outputPath) {
         continue;
       }
       outputs.push({
         path: normalizeOutputPath(outputPath),
-        content
+        content: withContextForgePreamble(pack, file.type, content)
       });
     }
   }
@@ -780,176 +788,94 @@ function compileOutputs(config, packs, analysis) {
   }
   return outputs;
 }
-
-// src/compiler/compileAgentsMd.ts
-import path14 from "path";
-import fs13 from "fs-extra";
-
-// src/fs/updateGeneratedBlock.ts
-var GENERATED_BLOCK_START = "<!-- contextforge:start -->";
-var GENERATED_BLOCK_END = "<!-- contextforge:end -->";
-var blockPattern = new RegExp(
-  `${escapeRegExp(GENERATED_BLOCK_START)}[\\s\\S]*?${escapeRegExp(GENERATED_BLOCK_END)}`,
-  "m"
-);
-function escapeRegExp(value) {
-  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-function getGeneratedBlock(content) {
-  return content.match(blockPattern)?.[0] ?? null;
-}
-function removeGeneratedBlock(content) {
-  return content.replace(blockPattern, "").replace(/\s+$/u, "");
-}
-function wrapGeneratedBlock(content) {
-  return `${GENERATED_BLOCK_START}
-${content.trim()}
-${GENERATED_BLOCK_END}`;
-}
-function updateGeneratedBlock(existingContent, generatedContent) {
-  const existing = existingContent?.replace(/\s+$/u, "") ?? "";
-  const generatedBlock = getGeneratedBlock(generatedContent) ?? wrapGeneratedBlock(generatedContent);
-  if (!existing) {
-    return `${generatedContent.includes(GENERATED_BLOCK_START) ? generatedContent.trim() : generatedBlock}
-`;
+function withContextForgePreamble(pack, type, content) {
+  if (pack.manifest.name !== "git-workflow" || !["agents", "claude", "cursor", "copilot"].includes(type)) {
+    return content;
   }
-  if (blockPattern.test(existing)) {
-    return `${existing.replace(blockPattern, generatedBlock)}
-`;
+  const warning = "Do not commit, push, merge, rebase, reset, delete branches, or rewrite history unless explicitly requested by the user.";
+  if (content.includes(warning)) {
+    return content;
   }
-  return `${existing}
-
-${generatedBlock}
-`;
+  return ["# ContextForge Git Safety", "", warning, "", content.trim()].join("\n");
 }
 
 // src/compiler/compileAgentsMd.ts
-var AGENTS_INSTRUCTIONS_DIR = ".contextforge/instructions/agents";
-async function readInstructionSummaries(root) {
-  const directory = path14.join(root, AGENTS_INSTRUCTIONS_DIR);
-  if (!await fs13.pathExists(directory)) {
-    return [];
-  }
-  const files = (await fs13.readdir(directory)).filter((file) => file.endsWith(".md")).sort((a, b) => a.localeCompare(b));
-  return Promise.all(files.map((file) => fs13.readFile(path14.join(directory, file), "utf8")));
-}
-async function compileAgentsMd(root, packs) {
-  const summaries = await readInstructionSummaries(root);
-  const gitSafetyWarning = packs.some((pack) => pack.manifest.name === "git-workflow") ? [
-    "## Git Safety",
-    "",
-    "Do not commit, push, merge, rebase, reset, delete branches, or rewrite history unless explicitly requested by the user.",
-    ""
-  ] : [];
+async function compileAgentsMd() {
   return [
     "# Project Agent Instructions",
     "",
     GENERATED_BLOCK_START,
-    "Generated by ContextForge from installed instruction packs.",
-    "",
-    "## Core Behavior",
-    "",
-    summaries.length > 0 ? summaries.map((summary) => summary.trim()).join("\n\n") : "No pack-specific agent summaries are installed yet.",
+    "ContextForge is installed for this repo.",
     "",
-    ...gitSafetyWarning,
-    "## Installed Packs",
+    "Before working, read the relevant instruction files in:",
     "",
-    ...packs.length > 0 ? packs.map((pack) => `- ${pack.manifest.name}: ${pack.manifest.title}`) : ["- No packs installed"],
-    "",
-    "## Notes",
-    "",
-    "Detailed Codex skills live in `.agents/skills`.",
-    "Pack sources live in `.contextforge/packs`.",
-    "Pack-specific agent summaries live in `.contextforge/instructions/agents`.",
+    "- `.contextforge/agents/codex/`",
+    "- `.contextforge/skills/`",
     "",
+    "Follow the installed packs listed in `.contextforge/config.json`.",
+    "Do not copy these instructions into this file.",
     GENERATED_BLOCK_END
   ].join("\n");
 }
 
 // src/compiler/compileClaudeMd.ts
-import path15 from "path";
-import fs14 from "fs-extra";
-var CLAUDE_INSTRUCTIONS_DIR = ".contextforge/instructions/claude";
-async function readInstructionSummaries2(root) {
-  const directory = path15.join(root, CLAUDE_INSTRUCTIONS_DIR);
-  if (!await fs14.pathExists(directory)) {
-    return [];
-  }
-  const files = (await fs14.readdir(directory)).filter((file) => file.endsWith(".md")).sort((a, b) => a.localeCompare(b));
-  return Promise.all(files.map((file) => fs14.readFile(path15.join(directory, file), "utf8")));
-}
-async function compileClaudeMd(root, packs) {
-  const summaries = await readInstructionSummaries2(root);
-  const gitSafetyWarning = packs.some((pack) => pack.manifest.name === "git-workflow") ? [
-    "## Git Safety",
-    "",
-    "Do not commit, push, merge, rebase, reset, delete branches, or rewrite history unless explicitly requested by the user.",
-    ""
-  ] : [];
+async function compileClaudeMd() {
   return [
     "# Claude Code Instructions",
     "",
     GENERATED_BLOCK_START,
-    "Generated by ContextForge from installed instruction packs.",
+    "ContextForge is installed for this repo.",
     "",
-    "## Core Behavior",
+    "Before working, read the relevant instruction files in:",
     "",
-    summaries.length > 0 ? summaries.map((summary) => summary.trim()).join("\n\n") : "No pack-specific Claude summaries are installed yet.",
-    "",
-    ...gitSafetyWarning,
-    "## Installed Packs",
-    "",
-    ...packs.length > 0 ? packs.map((pack) => `- ${pack.manifest.name}: ${pack.manifest.title}`) : ["- No packs installed"],
-    "",
-    "## Notes",
-    "",
-    "Keep this file concise.",
-    "Detailed pack sources live in `.contextforge/packs`.",
-    "Pack-specific Claude summaries live in `.contextforge/instructions/claude`.",
+    "- `.contextforge/agents/claude/`",
+    "- `.contextforge/skills/`",
     "",
+    "Follow the installed packs listed in `.contextforge/config.json`.",
+    "Do not copy these instructions into this file.",
     GENERATED_BLOCK_END
   ].join("\n");
 }
 
 // src/compiler/generateToolOutputs.ts
-import path18 from "path";
-import fs17 from "fs-extra";
-
-// src/fs/safeWriteFile.ts
 import path16 from "path";
 import fs15 from "fs-extra";
+
+// src/fs/safeWriteFile.ts
+import path14 from "path";
+import fs13 from "fs-extra";
 async function safeWriteFile(filePath, generatedContent) {
-  const existingContent = await fs15.pathExists(filePath) ? await fs15.readFile(filePath, "utf8") : null;
+  const existingContent = await fs13.pathExists(filePath) ? await fs13.readFile(filePath, "utf8") : null;
   const nextContent = updateGeneratedBlock(existingContent, generatedContent);
-  await fs15.ensureDir(path16.dirname(filePath));
-  await fs15.writeFile(filePath, nextContent);
+  await fs13.ensureDir(path14.dirname(filePath));
+  await fs13.writeFile(filePath, nextContent);
 }
 
 // src/compiler/cleanupGeneratedFiles.ts
-import path17 from "path";
-import fs16 from "fs-extra";
+import path15 from "path";
+import fs14 from "fs-extra";
 function isGeneratedOnlyPath(relativePath) {
-  return relativePath.startsWith(".agents/skills/") || relativePath.startsWith(".cursor/rules/");
+  return relativePath.startsWith(".agents/skills/") || relativePath.startsWith(".cursor/rules/") || relativePath.startsWith(".github/instructions/") || relativePath.startsWith(".contextforge/instructions/") || relativePath.startsWith(".contextforge/agents/") || relativePath.startsWith(".contextforge/skills/");
 }
 async function cleanupFile(root, relativePath) {
-  const filePath = path17.join(root, relativePath);
-  if (!await fs16.pathExists(filePath)) {
+  const filePath = path15.join(root, relativePath);
+  if (!await fs14.pathExists(filePath)) {
     return;
   }
   if (isGeneratedOnlyPath(relativePath)) {
-    await fs16.remove(filePath);
+    await fs14.remove(filePath);
     return;
   }
-  const content = await fs16.readFile(filePath, "utf8");
+  const content = await fs14.readFile(filePath, "utf8");
   if (!getGeneratedBlock(content)) {
     return;
   }
   const nextContent = removeGeneratedBlock(content);
   if (nextContent.trim().length === 0) {
-    await fs16.remove(filePath);
+    await fs14.remove(filePath);
     return;
   }
-  await fs16.writeFile(filePath, `${nextContent}
+  await fs14.writeFile(filePath, `${nextContent}
 `);
 }
 async function cleanupStaleGeneratedFiles(root, previousFiles, currentFiles) {
@@ -962,10 +888,8 @@ async function cleanupStaleGeneratedFiles(root, previousFiles, currentFiles) {
 
 // src/compiler/generateToolOutputs.ts
 var GENERATED_ONLY_PREFIXES = [
-  ".agents/skills/",
-  ".cursor/rules/",
-  ".github/instructions/",
-  ".contextforge/instructions/"
+  ".contextforge/agents/",
+  ".contextforge/skills/"
 ];
 function normalizeOutputPath2(outputPath) {
   return outputPath.split(/[\\/]/u).join("/");
@@ -973,11 +897,11 @@ function normalizeOutputPath2(outputPath) {
 function defaultOutput2(packName, type) {
   const defaults = {
     rules: null,
-    agents: `.contextforge/instructions/agents/${packName}.md`,
-    claude: `.contextforge/instructions/claude/${packName}.md`,
-    skill: `.agents/skills/${packName}/SKILL.md`,
-    cursor: `.cursor/rules/${packName}.mdc`,
-    copilot: `.github/instructions/${packName}.instructions.md`
+    agents: `.contextforge/agents/codex/${packName}.md`,
+    claude: `.contextforge/agents/claude/${packName}.md`,
+    skill: `.contextforge/skills/${packName}/SKILL.md`,
+    cursor: `.contextforge/agents/cursor/${packName}.md`,
+    copilot: `.contextforge/agents/copilot/${packName}.md`
   };
   return defaults[type];
 }
@@ -989,7 +913,7 @@ function shouldGenerateFile2(type, tools) {
     return tools.includes("claude");
   }
   if (type === "skill") {
-    return tools.includes("codex") || tools.includes("claude");
+    return tools.length > 0;
   }
   if (type === "cursor") {
     return tools.includes("cursor");
@@ -1001,19 +925,29 @@ function shouldGenerateFile2(type, tools) {
 }
 function generatedFileFromPack(pack, file) {
   const content = pack.files[file.type];
-  const outputPath = file.output ?? defaultOutput2(pack.manifest.name, file.type);
+  const outputPath = defaultOutput2(pack.manifest.name, file.type);
   if (!content || !outputPath) {
     return null;
   }
   return {
     path: normalizeOutputPath2(outputPath),
-    content
+    content: withContextForgePreamble2(pack, file.type, content)
   };
 }
+function withContextForgePreamble2(pack, type, content) {
+  if (pack.manifest.name !== "git-workflow" || !["agents", "claude", "cursor", "copilot"].includes(type)) {
+    return content;
+  }
+  const warning = "Do not commit, push, merge, rebase, reset, delete branches, or rewrite history unless explicitly requested by the user.";
+  if (content.includes(warning)) {
+    return content;
+  }
+  return ["# ContextForge Git Safety", "", warning, "", content.trim()].join("\n");
+}
 async function writeGeneratedOnlyFile(root, output) {
-  const filePath = path18.join(root, output.path);
-  await fs17.ensureDir(path18.dirname(filePath));
-  await fs17.writeFile(filePath, output.content.endsWith("\n") ? output.content : `${output.content}
+  const filePath = path16.join(root, output.path);
+  await fs15.ensureDir(path16.dirname(filePath));
+  await fs15.writeFile(filePath, output.content.endsWith("\n") ? output.content : `${output.content}
 `);
 }
 function packOutputs(pack, tools) {
@@ -1026,18 +960,18 @@ async function generateToolOutputs(root, packs, config, previousFiles = []) {
     if (isGeneratedOnly) {
       await writeGeneratedOnlyFile(root, output);
     } else {
-      await safeWriteFile(path18.join(root, output.path), output.content);
+      await safeWriteFile(path16.join(root, output.path), output.content);
     }
   }
   const rootOutputs = [];
   if (config.tools.includes("codex")) {
-    rootOutputs.push({ path: "AGENTS.md", content: await compileAgentsMd(root, packs) });
+    rootOutputs.push({ path: "AGENTS.md", content: await compileAgentsMd() });
   }
   if (config.tools.includes("claude")) {
-    rootOutputs.push({ path: "CLAUDE.md", content: await compileClaudeMd(root, packs) });
+    rootOutputs.push({ path: "CLAUDE.md", content: await compileClaudeMd() });
   }
   for (const output of rootOutputs) {
-    await safeWriteFile(path18.join(root, output.path), output.content);
+    await safeWriteFile(path16.join(root, output.path), output.content);
   }
   const currentFiles = [...packGeneratedOutputs, ...rootOutputs].map((output) => output.path);
   await cleanupStaleGeneratedFiles(root, previousFiles, currentFiles);
@@ -1045,19 +979,19 @@ async function generateToolOutputs(root, packs, config, previousFiles = []) {
 }
 
 // src/compiler/writeGeneratedFiles.ts
-import path19 from "path";
+import path17 from "path";
 async function writeGeneratedFiles(root, outputs, previousFiles = []) {
   const currentFiles = outputs.map((output) => output.path);
   for (const output of outputs) {
-    await safeWriteFile(path19.join(root, output.path), output.content);
+    await safeWriteFile(path17.join(root, output.path), output.content);
   }
   await cleanupStaleGeneratedFiles(root, previousFiles, currentFiles);
   return currentFiles;
 }
 
 // src/sync.ts
-import path20 from "path";
-import fs18 from "fs-extra";
+import path18 from "path";
+import fs16 from "fs-extra";
 async function updateContextForgeConfig(projectRoot, packName, registryUrl, generatedFiles) {
   const existing = await loadOptionalConfig(projectRoot);
   const config = addPackToConfig(
@@ -1092,7 +1026,7 @@ async function loadInstalledPackFromRegistry(projectRoot, registryUrl, summary,
   return downloadPackToContextForge(projectRoot, manifest.name, manifest, packUrl, timeoutMs);
 }
 async function syncInstalledPacks(projectRoot, providedConfig) {
-  const root = path20.resolve(projectRoot);
+  const root = path18.resolve(projectRoot);
   const analysis = await detectProject(root);
   const previousConfig = await loadOptionalConfig(root);
   const config = providedConfig ?? await loadConfig(root);
@@ -1144,7 +1078,7 @@ async function syncProject(root, providedConfig) {
   return syncInstalledPacks(root, providedConfig);
 }
 async function installPackAndSync(projectRoot, registryUrl, packName, options = {}) {
-  const root = path20.resolve(projectRoot);
+  const root = path18.resolve(projectRoot);
   const config = await loadOptionalConfig(root);
   const result = await installPack(root, registryUrl, packName, options);
   if (result.alreadyInstalled && !options.force && config?.installedPacks.includes(packName)) {
@@ -1180,21 +1114,21 @@ async function readInstalledPacks(projectRoot) {
   return loadProjectPacks(projectRoot);
 }
 async function pathExists(root, relativePath) {
-  return fs18.pathExists(path20.join(root, relativePath));
+  return fs16.pathExists(path18.join(root, relativePath));
 }
 
 // src/doctor/doctorProject.ts
-import path21 from "path";
-import fs19 from "fs-extra";
+import path19 from "path";
+import fs17 from "fs-extra";
 async function fileExists(root, relativePath) {
-  return fs19.pathExists(path21.join(root, relativePath));
+  return fs17.pathExists(path19.join(root, relativePath));
 }
 async function readIfExists(root, relativePath) {
-  const filePath = path21.join(root, relativePath);
-  if (!await fs19.pathExists(filePath)) {
+  const filePath = path19.join(root, relativePath);
+  if (!await fs17.pathExists(filePath)) {
     return null;
   }
-  return fs19.readFile(filePath, "utf8");
+  return fs17.readFile(filePath, "utf8");
 }
 function hasContextForgeBlock(content) {
   return Boolean(content && getGeneratedBlock(content));
@@ -1204,27 +1138,27 @@ function tooLarge(content) {
 }
 function expectedGeneratedOutputs(packName, tools) {
   const outputs = [];
-  if (tools.includes("codex") || tools.includes("claude")) {
-    outputs.push(`.agents/skills/${packName}/SKILL.md`);
-  }
-  if (tools.includes("cursor")) {
-    outputs.push(`.cursor/rules/${packName}.mdc`);
-  }
-  if (tools.includes("copilot")) {
-    outputs.push(`.github/instructions/${packName}.instructions.md`);
+  if (tools.length > 0) {
+    outputs.push(`.contextforge/skills/${packName}/SKILL.md`);
   }
   if (tools.includes("codex")) {
-    outputs.push(`.contextforge/instructions/agents/${packName}.md`);
+    outputs.push(`.contextforge/agents/codex/${packName}.md`);
   }
   if (tools.includes("claude")) {
-    outputs.push(`.contextforge/instructions/claude/${packName}.md`);
+    outputs.push(`.contextforge/agents/claude/${packName}.md`);
+  }
+  if (tools.includes("cursor")) {
+    outputs.push(`.contextforge/agents/cursor/${packName}.md`);
+  }
+  if (tools.includes("copilot")) {
+    outputs.push(`.contextforge/agents/copilot/${packName}.md`);
   }
   return outputs;
 }
 async function doctorProject(root, options = {}) {
   const checks = [];
   const issues = [];
-  const resolvedRoot = path21.resolve(root);
+  const resolvedRoot = path19.resolve(root);
   if (!await fileExists(resolvedRoot, CONFIG_PATH)) {
     return {
       checks,
@@ -1324,7 +1258,18 @@ async function doctorProject(root, options = {}) {
   }
   const gitWorkflow = cachedPacks.find((pack) => pack.manifest.name === "git-workflow");
   if (gitWorkflow) {
-    const gitSummary = [gitWorkflow.files.agents, gitWorkflow.files.claude, agentsMd, claudeMd].filter((content) => Boolean(content)).join("\n").toLowerCase();
+    const generatedGitFiles = await Promise.all(
+      ["codex", "claude", "cursor", "copilot"].map(
+        (tool) => readIfExists(resolvedRoot, `.contextforge/agents/${tool}/git-workflow.md`)
+      )
+    );
+    const gitSummary = [
+      gitWorkflow.files.agents,
+      gitWorkflow.files.claude,
+      ...generatedGitFiles,
+      agentsMd,
+      claudeMd
+    ].filter((content) => Boolean(content)).join("\n").toLowerCase();
     if (!gitSummary.includes("do not commit") || !gitSummary.includes("push") || !gitSummary.includes("explicitly")) {
       issues.push({
         level: "warning",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contextforge/core",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",