dlw-machine-setup 0.9.4 → 0.9.6

package/bin/installer.js

@@ -3295,9 +3295,9 @@ ${page}${helpTipBottom}${choiceDescription}${import_ansi_escapes4.default.cursor
 });
 
 // src/index.ts
-var import_fs16 = require("fs");
+var import_fs17 = require("fs");
 var import_readline2 = require("readline");
-var import_path16 = require("path");
+var import_path17 = require("path");
 
 // src/utils/fetch.ts
 var DEFAULT_TIMEOUT_MS = 3e4;
@@ -3951,6 +3951,7 @@ var Journal = class {
 // src/steps/index.ts
 var steps_exports = {};
 __export(steps_exports, {
+  buildCodeIndex: () => build_code_index_default,
   fetchAbapHooks: () => fetch_abap_hooks_default,
   fetchContexts: () => fetch_contexts_default,
   fetchFactory: () => fetch_factory_default,
@@ -4465,20 +4466,29 @@ function runBundleV2(manifest, ctx) {
     filesPatched: [],
     markerBlockFiles: []
   };
-  const hookPatches = /* @__PURE__ */ new Map();
+  const mergePatches = /* @__PURE__ */ new Map();
   for (const asset of manifest.assets ?? []) {
-    runAsset(asset, profile, hookPatches, ctx, result);
+    runAsset(asset, profile, mergePatches, ctx, result);
     result.opsExecuted++;
   }
-  for (const [file, patch] of hookPatches) {
-    runMergeJson({ op: "merge-json", file, patch }, manifest.name, ctx, result);
-  }
   for (const op of manifest.ops ?? []) {
     if (op.when === "hooks-supported" && !profile.handlers.hook.supported) continue;
     if (op.when === "statusline-supported" && !profile.statusLineSupported) continue;
-    executeOp(substituteHookDir(op, profile), manifest.name, ctx, result);
+    const substituted = substituteHookDir(op, profile);
+    if (substituted.op === "merge-json") {
+      const existing = mergePatches.get(substituted.file);
+      mergePatches.set(
+        substituted.file,
+        deepMerge2(existing ?? {}, substituted.patch)
+      );
+    } else {
+      executeOp(substituted, manifest.name, ctx, result);
+    }
     result.opsExecuted++;
   }
+  for (const [file, patch] of mergePatches) {
+    runMergeJson({ op: "merge-json", file, patch }, manifest.name, ctx, result);
+  }
   writeGitignoreBlock(manifest, ctx, result);
   const snippet = result.instructionsSnippet;
   if (snippet) {
@@ -5458,9 +5468,112 @@ function isClaudeCliAvailable() {
   return check2.status === 0;
 }
 
-// src/steps/setup/update-gitignore.ts
+// src/steps/setup/build-code-index.ts
+var import_child_process4 = require("child_process");
 var import_fs13 = require("fs");
 var import_path13 = require("path");
+var CODE_INDEX_RELATIVE_PATH = ".claude/factory/utils/code-index";
+var INDEX_OUTPUT_RELATIVE_PATH = ".claude/factory/repo-index.json";
+var INDEX_STAMP_RELATIVE_PATH = ".claude/factory/index.stamp";
+var build_code_index_default = defineStep({
+  name: "build-code-index",
+  label: "Building code index",
+  when: (ctx) => ctx.installed.factoryInstalled === true,
+  execute: async (ctx) => {
+    const codeIndexDirectory = (0, import_path13.join)(ctx.config.projectPath, CODE_INDEX_RELATIVE_PATH);
+    if (!(0, import_fs13.existsSync)(codeIndexDirectory)) {
+      return {
+        status: "skipped",
+        detail: `code-index not found at ${CODE_INDEX_RELATIVE_PATH} \u2014 older Factory release?`,
+        record: { depsInstalled: false, indexBuilt: false }
+      };
+    }
+    if (!isNodeAvailable()) {
+      return {
+        status: "skipped",
+        detail: "`node` not found on PATH \u2014 run the indexer manually once node is available",
+        record: { depsInstalled: false, indexBuilt: false }
+      };
+    }
+    const npmResult = (0, import_child_process4.spawnSync)("npm install --silent --no-audit --no-fund --omit=dev", {
+      shell: true,
+      stdio: "pipe",
+      encoding: "utf-8",
+      cwd: codeIndexDirectory
+    });
+    const depsInstalled = npmResult.status === 0;
+    if (!depsInstalled) {
+      const stderrFirstLine = (npmResult.stderr ?? "").trim().split("\n")[0] || `exit ${npmResult.status}`;
+      return {
+        status: "failed",
+        detail: `npm install failed: ${stderrFirstLine}`,
+        record: { depsInstalled: false, indexBuilt: false }
+      };
+    }
+    const indexerScriptPath = (0, import_path13.join)(codeIndexDirectory, "index.cjs");
+    const indexerResult = (0, import_child_process4.spawnSync)(`node "${indexerScriptPath}" "${ctx.config.projectPath}"`, {
+      shell: true,
+      stdio: "pipe",
+      encoding: "utf-8",
+      cwd: ctx.config.projectPath
+    });
+    const indexBuilt = indexerResult.status === 0;
+    if (!indexBuilt) {
+      const stderrFirstLine = (indexerResult.stderr ?? "").trim().split("\n")[0] || `exit ${indexerResult.status}`;
+      return {
+        status: "success",
+        message: "deps installed; initial index build failed (run manually)",
+        detail: `indexer error: ${stderrFirstLine}`,
+        record: { depsInstalled: true, indexBuilt: false }
+      };
+    }
+    const lastStdoutLines = (indexerResult.stdout ?? "").trim().split("\n").slice(-5).join(" | ");
+    return {
+      status: "success",
+      message: lastStdoutLines || "index built",
+      record: { depsInstalled: true, indexBuilt: true }
+    };
+  },
+  inverse: {
+    label: "Removing code index",
+    execute: async (raw, ctx) => {
+      const record = raw ?? {};
+      const projectPath = ctx.config.projectPath;
+      const summaryActions = [];
+      if (record.indexBuilt) {
+        const indexFilePath = (0, import_path13.join)(projectPath, INDEX_OUTPUT_RELATIVE_PATH);
+        if ((0, import_fs13.existsSync)(indexFilePath)) {
+          (0, import_fs13.unlinkSync)(indexFilePath);
+          summaryActions.push(`removed ${INDEX_OUTPUT_RELATIVE_PATH}`);
+        }
+        const stampFilePath = (0, import_path13.join)(projectPath, INDEX_STAMP_RELATIVE_PATH);
+        if ((0, import_fs13.existsSync)(stampFilePath)) {
+          (0, import_fs13.unlinkSync)(stampFilePath);
+          summaryActions.push(`removed ${INDEX_STAMP_RELATIVE_PATH}`);
+        }
+      }
+      if (record.depsInstalled) {
+        const nodeModulesPath = (0, import_path13.join)(projectPath, CODE_INDEX_RELATIVE_PATH, "node_modules");
+        if ((0, import_fs13.existsSync)(nodeModulesPath)) {
+          (0, import_fs13.rmSync)(nodeModulesPath, { recursive: true, force: true });
+          summaryActions.push("removed code-index node_modules");
+        }
+      }
+      return {
+        status: "success",
+        message: summaryActions.length > 0 ? summaryActions.join(", ") : "nothing to remove"
+      };
+    }
+  }
+});
+function isNodeAvailable() {
+  const probeResult = (0, import_child_process4.spawnSync)("node --version", { shell: true, stdio: "ignore" });
+  return probeResult.status === 0;
+}
+
+// src/steps/setup/update-gitignore.ts
+var import_fs14 = require("fs");
+var import_path14 = require("path");
 var MARKER_START2 = "# one-shot-installer:start";
 var MARKER_END2 = "# one-shot-installer:end";
 var CORE_GITIGNORE_ENTRIES = [
@@ -5481,8 +5594,8 @@ var update_gitignore_default = defineStep({
   name: "update-gitignore",
   label: "Updating .gitignore",
   execute: async (ctx) => {
-    const gitignorePath = (0, import_path13.join)(ctx.config.projectPath, ".gitignore");
-    const fileExistedBefore = (0, import_fs13.existsSync)(gitignorePath);
+    const gitignorePath = (0, import_path14.join)(ctx.config.projectPath, ".gitignore");
+    const fileExistedBefore = (0, import_fs14.existsSync)(gitignorePath);
     upsertMarkerBlock(gitignorePath, MARKER_START2, MARKER_END2, CORE_GITIGNORE_ENTRIES.join("\n"));
     const record = {
       filePath: ".gitignore",
@@ -5510,8 +5623,8 @@ var update_gitignore_default = defineStep({
 });
 
 // src/steps/setup/write-state.ts
-var import_fs14 = require("fs");
-var import_path14 = require("path");
+var import_fs15 = require("fs");
+var import_path15 = require("path");
 var import_os2 = require("os");
 
 // package.json
@@ -5545,7 +5658,7 @@ var write_state_default = defineStep({
   name: "write-state",
   label: "Saving installation state",
   execute: async (ctx) => {
-    const statePath = (0, import_path14.join)(ctx.config.projectPath, ".one-shot-state.json");
+    const statePath = (0, import_path15.join)(ctx.config.projectPath, ".one-shot-state.json");
     const mcpServersAdded = ctx.installed.mcpServersAdded ?? [];
     const filteredMcpConfig = Object.fromEntries(
       Object.entries(ctx.config.mcpConfig).filter(([name]) => mcpServersAdded.includes(name))
@@ -5576,13 +5689,13 @@ var write_state_default = defineStep({
          * mislead the uninstall preview which reads this field. */
         factory: ctx.installed.factoryInstalled ? ".claude/" : null,
         abapHooks: ctx.installed.abapHooksInstalled ? ".claude/hooks/" : null,
-        globalConfig: (0, import_path14.join)((0, import_os2.homedir)(), ".one-shot-installer")
+        globalConfig: (0, import_path15.join)((0, import_os2.homedir)(), ".one-shot-installer")
       }
     };
     if (ctx.journal) {
       ctx.journal.setSummary(state);
     } else {
-      (0, import_fs14.writeFileSync)(statePath, JSON.stringify(state, null, 2), "utf-8");
+      (0, import_fs15.writeFileSync)(statePath, JSON.stringify(state, null, 2), "utf-8");
     }
     return { status: "success" };
   },
@@ -5597,9 +5710,9 @@ var write_state_default = defineStep({
 });
 
 // src/uninstall.ts
-var import_fs15 = require("fs");
+var import_fs16 = require("fs");
 var import_readline = require("readline");
-var import_path15 = require("path");
+var import_path16 = require("path");
 var dim = (text) => `\x1B[2m${text}\x1B[0m`;
 var yellow = (text) => `\x1B[33m${text}\x1B[0m`;
 var red3 = (text) => `\x1B[31m${text}\x1B[0m`;
@@ -5619,11 +5732,11 @@ async function uninstall() {
   try {
     const projectInput = await esm_default4({
       message: "Project directory to uninstall from:",
-      default: (0, import_path15.resolve)(process.cwd())
+      default: (0, import_path16.resolve)(process.cwd())
     });
-    const projectPath = (0, import_path15.resolve)(projectInput);
-    const statePath = (0, import_path15.join)(projectPath, ".one-shot-state.json");
-    if (!(0, import_fs15.existsSync)(statePath)) {
+    const projectPath = (0, import_path16.resolve)(projectInput);
+    const statePath = (0, import_path16.join)(projectPath, ".one-shot-state.json");
+    if (!(0, import_fs16.existsSync)(statePath)) {
       console.log("");
       console.log(red3("  No .one-shot-state.json found at:"));
       console.log(`    ${statePath}`);
@@ -5648,7 +5761,7 @@ async function uninstall() {
         default: false
       });
       if (proceed2) {
-        (0, import_fs15.unlinkSync)(statePath);
+        (0, import_fs16.unlinkSync)(statePath);
         console.log("  Removed .one-shot-state.json");
       }
       await waitForEnter();
@@ -5689,7 +5802,7 @@ async function uninstall() {
     console.log("");
     const result = await runRollback(stepList, ctx);
     try {
-      if ((0, import_fs15.existsSync)(statePath)) (0, import_fs15.unlinkSync)(statePath);
+      if ((0, import_fs16.existsSync)(statePath)) (0, import_fs16.unlinkSync)(statePath);
     } catch {
     }
     printSummary(result);
@@ -5701,7 +5814,7 @@ async function uninstall() {
 }
 function readSummary(statePath) {
   try {
-    const raw = JSON.parse((0, import_fs15.readFileSync)(statePath, "utf-8"));
+    const raw = JSON.parse((0, import_fs16.readFileSync)(statePath, "utf-8"));
     return raw;
   } catch {
     return {};
@@ -5782,19 +5895,19 @@ var dim2 = (text) => `\x1B[2m${text}\x1B[0m`;
 var yellow2 = (text) => `\x1B[33m${text}\x1B[0m`;
 var green2 = (text) => `\x1B[32m${text}\x1B[0m`;
 function detectMarkerFileMode(filePath, markerStart) {
-  if (!(0, import_fs16.existsSync)(filePath)) return green2("create");
-  const content = (0, import_fs16.readFileSync)(filePath, "utf-8");
+  if (!(0, import_fs17.existsSync)(filePath)) return green2("create");
+  const content = (0, import_fs17.readFileSync)(filePath, "utf-8");
   if (content.includes(markerStart)) return yellow2("update");
   return yellow2("append");
 }
 function detectMCPFileMode(filePath) {
-  if (!(0, import_fs16.existsSync)(filePath)) return green2("create");
+  if (!(0, import_fs17.existsSync)(filePath)) return green2("create");
   return yellow2("merge");
 }
 function detectContextMode(projectPath, domain) {
-  const contextDir = (0, import_path16.join)(projectPath, "_ai-context", domain.toUpperCase());
-  const contextDirLower = (0, import_path16.join)(projectPath, "_ai-context", domain);
-  if ((0, import_fs16.existsSync)(contextDir) || (0, import_fs16.existsSync)(contextDirLower)) return yellow2("overwrite");
+  const contextDir = (0, import_path17.join)(projectPath, "_ai-context", domain.toUpperCase());
+  const contextDirLower = (0, import_path17.join)(projectPath, "_ai-context", domain);
+  if ((0, import_fs17.existsSync)(contextDir) || (0, import_fs17.existsSync)(contextDirLower)) return yellow2("overwrite");
   return green2("create");
 }
 function waitForEnter2() {
@@ -5840,7 +5953,7 @@ async function main() {
       await waitForEnter2();
       return;
     }
-    const statePath = (0, import_path16.join)(config.projectPath, ".one-shot-state.json");
+    const statePath = (0, import_path17.join)(config.projectPath, ".one-shot-state.json");
     const journal = new Journal(statePath);
     journal.startFresh();
     const ctx = {
@@ -5924,7 +6037,7 @@ async function collectInputs(options, releaseVersion, factoryAvailable = false,
   }
   const projectInput = await esm_default4({
     message: "Project directory:",
-    default: (0, import_path16.resolve)(process.cwd())
+    default: (0, import_path17.resolve)(process.cwd())
   });
   const isAbapSelected = selectedTechnologies.some((t) => t.domains.includes("ABAP"));
   const installAbapHooks = abapHooksAvailable && agent === "claude-code" && isAbapSelected;
@@ -5932,7 +6045,7 @@ async function collectInputs(options, releaseVersion, factoryAvailable = false,
     technologies: selectedTechnologies,
     agent,
     azureDevOpsOrg,
-    projectPath: (0, import_path16.resolve)(projectInput),
+    projectPath: (0, import_path17.resolve)(projectInput),
     baseMcpServers: options.baseMcpServers,
     mcpConfig,
     releaseVersion,
@@ -5947,9 +6060,9 @@ async function previewAndConfirm(config, options) {
   const instructionFile = target.instructions;
   const mcpConfigFile = target.mcpConfig;
   const serverEntries = Object.entries(config.mcpConfig);
-  const instructionFilePath = (0, import_path16.join)(config.projectPath, instructionFile);
-  const mcpConfigFilePath = (0, import_path16.join)(config.projectPath, mcpConfigFile);
-  const gitignorePath = (0, import_path16.join)(config.projectPath, ".gitignore");
+  const instructionFilePath = (0, import_path17.join)(config.projectPath, instructionFile);
+  const mcpConfigFilePath = (0, import_path17.join)(config.projectPath, mcpConfigFile);
+  const gitignorePath = (0, import_path17.join)(config.projectPath, ".gitignore");
   const instructionMode = detectMarkerFileMode(instructionFilePath, "<!-- one-shot-installer:start -->");
   const mcpMode = detectMCPFileMode(mcpConfigFilePath);
   const gitignoreMode = detectMarkerFileMode(gitignorePath, "# one-shot-installer:start");
@@ -5976,11 +6089,11 @@ async function previewAndConfirm(config, options) {
   console.log(`    ${mcpConfigFile.padEnd(domainColWidth + 14)}${mcpMode}`);
   console.log(`    ${".gitignore".padEnd(domainColWidth + 14)}${gitignoreMode}`);
   if (config.installFactory || config.installAbapHooks) {
-    const claudeDir = (0, import_path16.join)(config.projectPath, ".claude");
-    const claudeMode = (0, import_fs16.existsSync)(claudeDir) ? yellow2("merge") : green2("create");
+    const claudeDir = (0, import_path17.join)(config.projectPath, ".claude");
+    const claudeMode = (0, import_fs17.existsSync)(claudeDir) ? yellow2("merge") : green2("create");
     console.log(`    ${".claude/".padEnd(domainColWidth + 14)}${claudeMode}`);
-    const settingsPath = (0, import_path16.join)(config.projectPath, ".claude", "settings.json");
-    const settingsMode = (0, import_fs16.existsSync)(settingsPath) ? yellow2("merge") : green2("create");
+    const settingsPath = (0, import_path17.join)(config.projectPath, ".claude", "settings.json");
+    const settingsMode = (0, import_fs17.existsSync)(settingsPath) ? yellow2("merge") : green2("create");
     console.log(`    ${".claude/settings.json".padEnd(domainColWidth + 14)}${settingsMode}`);
   }
   if (serverEntries.length > 0) {

package/package.json

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