dlw-machine-setup 0.4.9 → 0.4.11

package/bin/installer.js

@@ -3240,9 +3240,9 @@ ${page}${helpTipBottom}${choiceDescription}${import_ansi_escapes3.default.cursor
 });
 
 // src/index.ts
-var import_fs5 = require("fs");
+var import_fs6 = require("fs");
 var import_readline = require("readline");
-var import_path5 = require("path");
+var import_path6 = require("path");
 
 // src/utils/fetch.ts
 var DEFAULT_TIMEOUT_MS = 3e4;
@@ -3761,13 +3761,15 @@ async function setupMCPConfiguration(projectPath, mcpConfig, agent) {
   }
   const addedServers = [];
   const skippedServers = [];
-  const servers = {};
+  const existingServers = existingFile[target.rootKey] ?? {};
+  const newServers = {};
   for (const [serverName, serverConfig] of Object.entries(mcpConfig)) {
     const { description, useWhen, active, ...mcpFields } = serverConfig;
-    servers[serverName] = mcpFields;
+    newServers[serverName] = mcpFields;
     addedServers.push(serverName);
   }
-  const outputFile = { ...existingFile, [target.rootKey]: servers };
+  const mergedServers = { ...existingServers, ...newServers };
+  const outputFile = { ...existingFile, [target.rootKey]: mergedServers };
   (0, import_fs3.writeFileSync)(mcpJsonPath, JSON.stringify(outputFile, null, 2), "utf-8");
   return { addedServers, skippedServers };
 }
@@ -4008,6 +4010,44 @@ alwaysApply: true
   }
 }
 
+// src/utils/setup/setup-gitignore.ts
+var import_fs5 = require("fs");
+var import_path5 = require("path");
+var MARKER_START2 = "# one-shot-installer:start";
+var MARKER_END2 = "# one-shot-installer:end";
+var GITIGNORE_ENTRIES = [
+  "# One-Shot installer generated files",
+  ".one-shot-state.json",
+  ".mcp.json",
+  "_ai-context/",
+  "_bmad/",
+  "_bmad-output/",
+  "",
+  "# Claude Code local/generated files",
+  ".claude/agents/",
+  ".claude/agent-memory/",
+  ".claude/plans/",
+  ".claude/settings.local.json"
+];
+function setupGitignore(projectPath) {
+  const gitignorePath = (0, import_path5.join)(projectPath, ".gitignore");
+  const block = [MARKER_START2, ...GITIGNORE_ENTRIES, MARKER_END2].join("\n");
+  if (!(0, import_fs5.existsSync)(gitignorePath)) {
+    (0, import_fs5.writeFileSync)(gitignorePath, block + "\n", "utf-8");
+    return;
+  }
+  const existing = (0, import_fs5.readFileSync)(gitignorePath, "utf-8");
+  const start = existing.indexOf(MARKER_START2);
+  const end = existing.indexOf(MARKER_END2);
+  if (start !== -1 && end !== -1 && end > start) {
+    const updated = existing.slice(0, start) + block + existing.slice(end + MARKER_END2.length);
+    (0, import_fs5.writeFileSync)(gitignorePath, updated, "utf-8");
+  } else {
+    const separator = existing.endsWith("\n") ? "\n" : "\n\n";
+    (0, import_fs5.writeFileSync)(gitignorePath, existing + separator + block + "\n", "utf-8");
+  }
+}
+
 // src/utils/mod.ts
 async function loadWizardOptions(token, repo) {
   const remote = await fetchWizardOptions(token, repo);
@@ -4028,7 +4068,7 @@ async function loadWizardOptions(token, repo) {
 }
 
 // src/index.ts
-var INSTALLER_VERSION = "0.4.9";
+var INSTALLER_VERSION = "0.4.11";
 function getInstructionFilePath(agent) {
   switch (agent) {
     case "claude-code":
@@ -4126,13 +4166,13 @@ async function collectInputs(options, releaseVersion) {
   }
   const projectInput = await esm_default4({
     message: "Project directory:",
-    default: (0, import_path5.resolve)(process.cwd())
+    default: (0, import_path6.resolve)(process.cwd())
   });
   return {
     personas: selectedPersonas,
     agent,
     azureDevOpsOrg,
-    projectPath: (0, import_path5.resolve)(projectInput),
+    projectPath: (0, import_path6.resolve)(projectInput),
     baseMcpServers: options.baseMcpServers,
     mcpConfig,
     releaseVersion
@@ -4180,7 +4220,8 @@ async function execute(config, token, repo) {
     instructionFilePath,
     mcpConfigured: false,
     mcpConfigPath,
-    mcpServersAdded: []
+    mcpServersAdded: [],
+    gitignoreUpdated: false
   };
   console.log("");
   const uniqueDomains = [...new Set(config.personas.flatMap((p) => p.domains))];
@@ -4219,7 +4260,7 @@ async function execute(config, token, repo) {
   const filteredMcpConfig = Object.fromEntries(
     Object.entries(config.mcpConfig).filter(([name]) => successfulMcpServers.has(name))
   );
-  const statePath = (0, import_path5.join)(config.projectPath, ".one-shot-state.json");
+  const statePath = (0, import_path6.join)(config.projectPath, ".one-shot-state.json");
   const allDomains = result.domainsInstalled;
   process.stdout.write(`  Writing ${instructionFilePath}...    `);
   try {
@@ -4251,6 +4292,15 @@ async function execute(config, token, repo) {
     console.log(`    Error: ${error instanceof Error ? error.message : String(error)}`);
     console.log(`    Path:  ${mcpConfigPath}`);
   }
+  process.stdout.write(`  Updating .gitignore...    `);
+  try {
+    setupGitignore(config.projectPath);
+    result.gitignoreUpdated = true;
+    console.log("\u2713");
+  } catch (error) {
+    console.log("\u2717");
+    console.log(`    Error: ${error instanceof Error ? error.message : String(error)}`);
+  }
   result.success = result.domainsFailed.length === 0 && result.instructionsCreated && result.mcpConfigured;
   const allPersonas = config.personas.map((p) => p.id);
   const state = {
@@ -4270,7 +4320,7 @@ async function execute(config, token, repo) {
     }
   };
   try {
-    (0, import_fs5.writeFileSync)(statePath, JSON.stringify(state, null, 2), "utf-8");
+    (0, import_fs6.writeFileSync)(statePath, JSON.stringify(state, null, 2), "utf-8");
   } catch {
   }
   return result;
@@ -4289,6 +4339,9 @@ function printSummary(result) {
     const serverList = result.mcpServersAdded.length > 0 ? `  (${result.mcpServersAdded.join(", ")})` : "";
     console.log(`  ${result.mcpConfigPath}   written${serverList}`);
   }
+  if (result.gitignoreUpdated) {
+    console.log(`  .gitignore   updated`);
+  }
   if (hasErrors) {
     console.log("\n  What went wrong:");
     if (result.domainsFailed.length > 0) {

package/package.json

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