dlw-machine-setup 0.4.4 → 0.4.6

package/bin/installer.js

@@ -3845,7 +3845,27 @@ function buildMCPSection(mcpConfig) {
   }
   return lines2.join("\n");
 }
-function buildContextRefsSection(domains) {
+function resolveDomainFolder(domain) {
+  if ((0, import_fs4.existsSync)(CONTEXTS_DIR)) {
+    try {
+      const entries = (0, import_fs4.readdirSync)(CONTEXTS_DIR);
+      const match = entries.find((e) => e.toLowerCase() === domain.toLowerCase());
+      if (match) {
+        return { folderName: match, folderPath: (0, import_path4.join)(CONTEXTS_DIR, match) };
+      }
+    } catch {
+    }
+  }
+  const fallback = domain.toUpperCase();
+  return { folderName: fallback, folderPath: (0, import_path4.join)(CONTEXTS_DIR, fallback) };
+}
+function formatPathRef(contextPath, description, agent) {
+  if (agent === "github-copilot") {
+    return `- [${contextPath}](../../${contextPath}) \u2014 ${description}`;
+  }
+  return `- \`${contextPath}\` \u2014 ${description}`;
+}
+function buildContextRefsSection(domains, agent) {
   const lines2 = [
     `## Context References`,
     ``,
@@ -3854,26 +3874,25 @@ function buildContextRefsSection(domains) {
   ];
   let hasAnyFiles = false;
   for (const domain of domains) {
-    const domainUpper = domain.toUpperCase();
-    const domainPath = (0, import_path4.join)(CONTEXTS_DIR, domainUpper);
+    const { folderName, folderPath: domainPath } = resolveDomainFolder(domain);
     if (!(0, import_fs4.existsSync)(domainPath)) continue;
     const domainFiles = [];
     const ctxInstructions = (0, import_path4.join)(domainPath, "context-instructions.md");
     if ((0, import_fs4.existsSync)(ctxInstructions)) {
       const desc = extractFirstHeading(ctxInstructions);
-      domainFiles.push(`- \`_ai-context/${domainUpper}/context-instructions.md\` \u2014 ${desc}`);
+      domainFiles.push(formatPathRef(`_ai-context/${folderName}/context-instructions.md`, desc, agent));
     }
     const instructionsMd = (0, import_path4.join)(domainPath, "core", "instructions.md");
     if ((0, import_fs4.existsSync)(instructionsMd)) {
       const desc = extractFirstHeading(instructionsMd);
-      domainFiles.push(`- \`_ai-context/${domainUpper}/core/instructions.md\` \u2014 ${desc} (start here)`);
+      domainFiles.push(formatPathRef(`_ai-context/${folderName}/core/instructions.md`, `${desc} (start here)`, agent));
     }
     const coreDir = (0, import_path4.join)(domainPath, "core");
     if ((0, import_fs4.existsSync)(coreDir)) {
       const coreFiles = collectMdFiles(coreDir).filter((f) => f !== "instructions.md" && !f.startsWith("instructions/"));
       for (const file of coreFiles) {
         const desc = extractFirstHeading((0, import_path4.join)(coreDir, file));
-        domainFiles.push(`- \`_ai-context/${domainUpper}/core/${file}\` \u2014 ${desc}`);
+        domainFiles.push(formatPathRef(`_ai-context/${folderName}/core/${file}`, desc, agent));
       }
     }
     const refDir = (0, import_path4.join)(domainPath, "reference");
@@ -3884,13 +3903,13 @@ function buildContextRefsSection(domains) {
         domainFiles.push(`**Reference & cheat sheets:**`);
         for (const file of refFiles) {
           const desc = extractFirstHeading((0, import_path4.join)(refDir, file));
-          domainFiles.push(`- \`_ai-context/${domainUpper}/reference/${file}\` \u2014 ${desc}`);
+          domainFiles.push(formatPathRef(`_ai-context/${folderName}/reference/${file}`, desc, agent));
         }
       }
     }
     if (domainFiles.length === 0) continue;
     hasAnyFiles = true;
-    lines2.push(`### ${domainUpper}`);
+    lines2.push(`### ${folderName}`);
     lines2.push(...domainFiles);
     lines2.push(``);
   }
@@ -3900,14 +3919,14 @@ function buildContextRefsSection(domains) {
   }
   return lines2.join("\n");
 }
-function buildCombinedInstructions(domains, mcpConfig) {
+function buildCombinedInstructions(domains, mcpConfig, agent = "") {
   const lines2 = [
     `# AI Development Instructions`,
     ``,
     `> Generated by One-Shot Installer`,
     ``
   ];
-  lines2.push(buildContextRefsSection(domains));
+  lines2.push(buildContextRefsSection(domains, agent));
   if (mcpConfig && Object.keys(mcpConfig).length > 0) {
     lines2.push(buildMCPSection(mcpConfig));
   }
@@ -3917,7 +3936,7 @@ async function setupInstructions(config) {
   const { domains, agent, mcpConfig } = config;
   switch (agent) {
     case "claude-code": {
-      const content = buildCombinedInstructions(domains, mcpConfig);
+      const content = buildCombinedInstructions(domains, mcpConfig, agent);
       upsertBlock((0, import_path4.join)(process.cwd(), "CLAUDE.md"), content);
       break;
     }
@@ -3932,14 +3951,14 @@ applyTo: "**"
 
 `, "utf-8");
       }
-      const body = buildCombinedInstructions(domains, mcpConfig);
+      const body = buildCombinedInstructions(domains, mcpConfig, agent);
       upsertBlock(filePath, body);
       break;
     }
     case "cursor": {
       const cursorDir = (0, import_path4.join)(process.cwd(), ".cursor", "rules");
       if (!(0, import_fs4.existsSync)(cursorDir)) (0, import_fs4.mkdirSync)(cursorDir, { recursive: true });
-      const body = buildCombinedInstructions(domains, mcpConfig);
+      const body = buildCombinedInstructions(domains, mcpConfig, agent);
       upsertBlock((0, import_path4.join)(cursorDir, `instructions.mdc`), body);
       break;
     }
@@ -4143,12 +4162,28 @@ async function execute(config, token, repo) {
     result.success = false;
     return result;
   }
+  const statePath = (0, import_path5.join)(config.projectPath, ".one-shot-state.json");
+  let previousState = {};
+  try {
+    if ((0, import_fs5.existsSync)(statePath)) {
+      previousState = JSON.parse((0, import_fs5.readFileSync)(statePath, "utf-8"));
+    }
+  } catch {
+  }
+  const allDomains = [.../* @__PURE__ */ new Set([
+    ...previousState.domains ?? [],
+    ...result.domainsInstalled
+  ])];
+  const mergedMcpConfig = {
+    ...previousState.mcpConfigs ?? {},
+    ...config.mcpConfig
+  };
   process.stdout.write(`  Writing ${instructionFilePath}...    `);
   try {
     await setupInstructions({
-      domains: result.domainsInstalled,
+      domains: allDomains,
       agent: config.agent,
-      mcpConfig: config.mcpConfig
+      mcpConfig: mergedMcpConfig
     });
     result.instructionsCreated = true;
     console.log("\u2713");
@@ -4173,12 +4208,17 @@ async function execute(config, token, repo) {
     console.log(`    Path:  ${mcpConfigPath}`);
   }
   result.success = result.domainsFailed.length === 0 && result.instructionsCreated && result.mcpConfigured;
+  const allPersonas = [.../* @__PURE__ */ new Set([
+    ...previousState.personas ?? [],
+    ...config.personas.map((p) => p.id)
+  ])];
   const state = {
     installedAt: (/* @__PURE__ */ new Date()).toISOString(),
     agent: config.agent,
-    personas: config.personas.map((p) => p.id),
-    domains: result.domainsInstalled,
-    mcpServers: Object.keys(config.mcpConfig),
+    personas: allPersonas,
+    domains: allDomains,
+    mcpServers: Object.keys(mergedMcpConfig),
+    mcpConfigs: mergedMcpConfig,
     files: {
       instructions: instructionFilePath,
       mcpConfig: mcpConfigPath,
@@ -4186,7 +4226,7 @@ async function execute(config, token, repo) {
     }
   };
   try {
-    (0, import_fs5.writeFileSync)((0, import_path5.join)(config.projectPath, ".one-shot-state.json"), JSON.stringify(state, null, 2), "utf-8");
+    (0, import_fs5.writeFileSync)(statePath, JSON.stringify(state, null, 2), "utf-8");
   } catch {
   }
   return result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dlw-machine-setup",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "description": "One-shot installer for The Machine toolchain",
   "bin": {
     "dlw-machine-setup": "bin/installer.js"