dlw-machine-setup 0.4.7 → 0.4.9

package/bin/installer.js

@@ -3637,7 +3637,7 @@ async function fetchContexts(options = {}) {
           throw new Error("Extraction failed");
         }
         const extractedPath = (0, import_path2.join)(tempDir, extractedFolder);
-        mergeDirectories(extractedPath, domainPath);
+        copyDirectory(extractedPath, domainPath);
         result.successful.push(domain);
       } catch (error) {
         const reason = error instanceof Error ? error.message : "Unknown error";
@@ -3689,9 +3689,9 @@ function getReadableError(status) {
       return `Unexpected error (${status})`;
   }
 }
-function mergeDirectories(source, target) {
+function copyDirectory(source, target) {
   let added = 0;
-  let skipped = 0;
+  let overwritten = 0;
   if (!(0, import_fs2.existsSync)(target)) {
     (0, import_fs2.mkdirSync)(target, { recursive: true });
   }
@@ -3700,19 +3700,19 @@ function mergeDirectories(source, target) {
     const sourcePath = (0, import_path2.join)(source, entry.name);
     const targetPath = (0, import_path2.join)(target, entry.name);
     if (entry.isDirectory()) {
-      const result = mergeDirectories(sourcePath, targetPath);
+      const result = copyDirectory(sourcePath, targetPath);
       added += result.added;
-      skipped += result.skipped;
+      overwritten += result.overwritten;
     } else {
       if ((0, import_fs2.existsSync)(targetPath)) {
-        skipped++;
+        overwritten++;
       } else {
-        (0, import_fs2.copyFileSync)(sourcePath, targetPath);
         added++;
       }
+      (0, import_fs2.copyFileSync)(sourcePath, targetPath);
     }
   }
-  return { added, skipped };
+  return { added, overwritten };
 }
 
 // src/utils/setup/setup-mcp.ts
@@ -3759,20 +3759,15 @@ async function setupMCPConfiguration(projectPath, mcpConfig, agent) {
       console.log(box);
     }
   }
-  const existing = existingFile[target.rootKey] ?? {};
   const addedServers = [];
   const skippedServers = [];
-  const mergedServers = { ...existing };
+  const servers = {};
   for (const [serverName, serverConfig] of Object.entries(mcpConfig)) {
-    if (mergedServers[serverName]) {
-      skippedServers.push(serverName);
-    } else {
-      const { description, useWhen, active, ...mcpFields } = serverConfig;
-      mergedServers[serverName] = mcpFields;
-      addedServers.push(serverName);
-    }
+    const { description, useWhen, active, ...mcpFields } = serverConfig;
+    servers[serverName] = mcpFields;
+    addedServers.push(serverName);
   }
-  const outputFile = { ...existingFile, [target.rootKey]: mergedServers };
+  const outputFile = { ...existingFile, [target.rootKey]: servers };
   (0, import_fs3.writeFileSync)(mcpJsonPath, JSON.stringify(outputFile, null, 2), "utf-8");
   return { addedServers, skippedServers };
 }
@@ -3995,8 +3990,17 @@ applyTo: "**"
     case "cursor": {
       const cursorDir = (0, import_path4.join)(projectPath, ".cursor", "rules");
       if (!(0, import_fs4.existsSync)(cursorDir)) (0, import_fs4.mkdirSync)(cursorDir, { recursive: true });
+      const filePath = (0, import_path4.join)(cursorDir, "instructions.mdc");
+      if (!(0, import_fs4.existsSync)(filePath)) {
+        (0, import_fs4.writeFileSync)(filePath, `---
+description: AI development instructions from One-Shot Installer
+alwaysApply: true
+---
+
+`, "utf-8");
+      }
       const body = buildCombinedInstructions(domains, mcpConfig, agent, projectPath);
-      upsertBlock((0, import_path4.join)(cursorDir, `instructions.mdc`), body);
+      upsertBlock(filePath, body);
       break;
     }
     default:
@@ -4024,7 +4028,7 @@ async function loadWizardOptions(token, repo) {
 }
 
 // src/index.ts
-var INSTALLER_VERSION = "0.4.7";
+var INSTALLER_VERSION = "0.4.9";
 function getInstructionFilePath(agent) {
   switch (agent) {
     case "claude-code":
@@ -4216,27 +4220,13 @@ async function execute(config, token, repo) {
     Object.entries(config.mcpConfig).filter(([name]) => successfulMcpServers.has(name))
   );
   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 ?? {},
-    ...filteredMcpConfig
-  };
+  const allDomains = result.domainsInstalled;
   process.stdout.write(`  Writing ${instructionFilePath}...    `);
   try {
     await setupInstructions({
       domains: allDomains,
       agent: config.agent,
-      mcpConfig: mergedMcpConfig,
+      mcpConfig: filteredMcpConfig,
       projectPath: config.projectPath
     });
     result.instructionsCreated = true;
@@ -4262,10 +4252,7 @@ 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 allPersonas = config.personas.map((p) => p.id);
   const state = {
     installedAt: (/* @__PURE__ */ new Date()).toISOString(),
     installerVersion: INSTALLER_VERSION,
@@ -4274,8 +4261,8 @@ async function execute(config, token, repo) {
     agent: config.agent,
     personas: allPersonas,
     domains: allDomains,
-    mcpServers: Object.keys(mergedMcpConfig),
-    mcpConfigs: mergedMcpConfig,
+    mcpServers: Object.keys(filteredMcpConfig),
+    mcpConfigs: filteredMcpConfig,
     files: {
       instructions: instructionFilePath,
       mcpConfig: mcpConfigPath,

package/package.json

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