dlw-machine-setup 0.5.16 → 0.5.18

package/bin/installer.js

@@ -3388,6 +3388,7 @@ async function tryOrgReposList(headers, topic) {
 var import_fs = require("fs");
 var import_path = require("path");
 var import_os = require("os");
+var import_child_process = require("child_process");
 var GITHUB_CLIENT_ID = "Ov23liwpMumAhwVufZ7N";
 var GITHUB_DEVICE_CODE_URL = "https://github.com/login/device/code";
 var GITHUB_TOKEN_URL = "https://github.com/login/oauth/access_token";
@@ -3511,11 +3512,26 @@ async function authenticateWithGitHub() {
   console.log("You'll authenticate once, and the token will be cached for future use.\n");
   console.log("Requesting authorization code...");
   const deviceCodeData = await requestDeviceCode();
+  let copied = false;
+  try {
+    const os = (0, import_os.platform)();
+    if (os === "win32") {
+      (0, import_child_process.execSync)(`echo ${deviceCodeData.user_code} | clip`, { stdio: "ignore" });
+      copied = true;
+    } else if (os === "darwin") {
+      (0, import_child_process.execSync)(`echo "${deviceCodeData.user_code}" | pbcopy`, { stdio: "ignore" });
+      copied = true;
+    } else {
+      (0, import_child_process.execSync)(`echo "${deviceCodeData.user_code}" | xclip -selection clipboard`, { stdio: "ignore" });
+      copied = true;
+    }
+  } catch {
+  }
   console.log("\n\u2554\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2557");
   console.log("\u2551          GitHub Authentication             \u2551");
   console.log("\u255A\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u255D\n");
   console.log(`1. Visit: ${deviceCodeData.verification_uri}`);
-  console.log(`2. Enter code: ${deviceCodeData.user_code}`);
+  console.log(`2. Enter code: ${deviceCodeData.user_code}${copied ? " (copied to clipboard!)" : ""}`);
   console.log("\nWaiting for authentication...");
   console.log("(This window will continue automatically once you approve)\n");
   const accessToken = await pollForToken(
@@ -3622,6 +3638,7 @@ var steps_exports = {};
 __export(steps_exports, {
   fetchContexts: () => fetch_contexts_default,
   fetchFactory: () => fetch_factory_default,
+  runMcpInstallCommands: () => run_mcp_install_commands_default,
   updateGitignore: () => update_gitignore_default,
   writeInstructions: () => write_instructions_default,
   writeMcpConfig: () => write_mcp_config_default,
@@ -3631,7 +3648,7 @@ __export(steps_exports, {
 // src/steps/resources/fetch-contexts.ts
 var import_fs2 = require("fs");
 var import_path2 = require("path");
-var import_child_process = require("child_process");
+var import_child_process2 = require("child_process");
 var MIN_FILE_SIZE = 1024;
 var fetch_contexts_default = defineStep({
   name: "fetch-contexts",
@@ -3640,10 +3657,20 @@ var fetch_contexts_default = defineStep({
   execute: async (ctx) => {
     const uniqueDomains = [...new Set(ctx.config.technologies.flatMap((p) => p.domains))];
     const domainValues = uniqueDomains.map((d) => d.toLowerCase());
-    const downloadResult = await fetchContexts(domainValues, ctx.token, ctx.repo, ctx.config.projectPath);
+    if (!ctx.contextRepo) {
+      for (const domain of domainValues) {
+        ctx.installed.domainsFailed = domainValues;
+      }
+      return {
+        status: "failed",
+        detail: "Context repo not found (topic: context-data)"
+      };
+    }
+    const downloadResult = await fetchContexts(domainValues, ctx.token, ctx.contextRepo, ctx.config.projectPath);
     ctx.installed.domainsInstalled = downloadResult.successful;
     ctx.installed.domainsFailed = downloadResult.failed;
     ctx.installed.failureReasons = downloadResult.failureReasons;
+    ctx.installed.contextReleaseVersion = downloadResult.releaseVersion;
     const domainColWidth = Math.max(...domainValues.map((d) => d.length), 8) + 2;
     console.log("");
     for (const domain of domainValues) {
@@ -3667,7 +3694,7 @@ var fetch_contexts_default = defineStep({
 async function fetchContexts(domains, token, repo, targetDir) {
   const result = { successful: [], failed: [], failureReasons: {} };
   if (domains.length === 0) return result;
-  const tarCheck = (0, import_child_process.spawnSync)("tar", ["--version"], { stdio: "ignore" });
+  const tarCheck = (0, import_child_process2.spawnSync)("tar", ["--version"], { stdio: "ignore" });
   if (tarCheck.status !== 0) {
     throw new Error("tar command not found. Please ensure tar is installed and available in your PATH.");
   }
@@ -3683,52 +3710,58 @@ async function fetchContexts(domains, token, repo, targetDir) {
     throw new Error(`GitHub API error (${releaseResponse.status}): ${getReadableError(releaseResponse.status)}`);
   }
   const releaseData = await releaseResponse.json();
+  result.releaseVersion = releaseData.tag_name;
+  const asset = releaseData.assets?.find((a) => a.name.endsWith(".tar.gz"));
+  if (!asset) {
+    for (const domain of domains) {
+      result.failed.push(domain);
+      result.failureReasons[domain] = "No tar.gz asset in release";
+    }
+    return result;
+  }
   const contextsDir = (0, import_path2.join)(targetDir, "_ai-context");
   const tempDir = (0, import_path2.join)(targetDir, ".temp-download");
   try {
     if (!(0, import_fs2.existsSync)(contextsDir)) (0, import_fs2.mkdirSync)(contextsDir, { recursive: true });
     if ((0, import_fs2.existsSync)(tempDir)) (0, import_fs2.rmSync)(tempDir, { recursive: true, force: true });
     (0, import_fs2.mkdirSync)(tempDir, { recursive: true });
+    const downloadHeaders = {
+      "Accept": "application/octet-stream",
+      "Authorization": `Bearer ${token}`
+    };
+    const response = await fetchWithRetry(asset.url, { headers: downloadHeaders });
+    if (!response.ok) {
+      throw new Error(`Download failed: ${getReadableError(response.status)}`);
+    }
+    const archivePath = (0, import_path2.join)(tempDir, asset.name);
+    const arrayBuffer = await response.arrayBuffer();
+    (0, import_fs2.writeFileSync)(archivePath, Buffer.from(arrayBuffer));
+    const stats = (0, import_fs2.statSync)(archivePath);
+    if (stats.size < MIN_FILE_SIZE) {
+      throw new Error("File corrupted");
+    }
+    const listResult = (0, import_child_process2.spawnSync)("tar", ["-tzf", archivePath], { encoding: "utf8" });
+    if (listResult.status !== 0) throw new Error("Failed to read archive contents");
+    const resolvedTempDir = (0, import_path2.resolve)(tempDir);
+    for (const entry of listResult.stdout.split("\n").filter(Boolean)) {
+      const entryPath = (0, import_path2.resolve)((0, import_path2.join)(tempDir, entry.replace(/\/$/, "")));
+      if (!entryPath.startsWith(resolvedTempDir + import_path2.sep)) {
+        throw new Error(`Archive contains unsafe path: ${entry}`);
+      }
+    }
+    const extractResult = (0, import_child_process2.spawnSync)("tar", ["-xzf", archivePath, "-C", tempDir], { stdio: "ignore" });
+    if (extractResult.status !== 0) throw new Error("Archive extraction failed");
+    const extractedFolders = (0, import_fs2.readdirSync)(tempDir, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => e.name);
     for (const domain of domains) {
       try {
-        const domainPath = (0, import_path2.join)(contextsDir, domain);
-        const archiveName = `${domain.toLowerCase()}.tar.gz`;
-        const asset = releaseData.assets?.find((a) => a.name === archiveName);
-        if (!asset) {
+        const match = extractedFolders.find((f) => f.toLowerCase() === domain.toLowerCase());
+        if (!match) {
           result.failed.push(domain);
-          result.failureReasons[domain] = "Not found in release";
+          result.failureReasons[domain] = "Not found in archive";
           continue;
         }
-        const downloadHeaders = {
-          "Accept": "application/octet-stream",
-          "Authorization": `Bearer ${token}`
-        };
-        const response = await fetchWithRetry(asset.url, { headers: downloadHeaders });
-        if (!response.ok) {
-          throw new Error(`Download failed: ${getReadableError(response.status)}`);
-        }
-        const archivePath = (0, import_path2.join)(tempDir, archiveName);
-        const arrayBuffer = await response.arrayBuffer();
-        (0, import_fs2.writeFileSync)(archivePath, Buffer.from(arrayBuffer));
-        const stats = (0, import_fs2.statSync)(archivePath);
-        if (stats.size < MIN_FILE_SIZE) {
-          throw new Error("File corrupted");
-        }
-        const listResult = (0, import_child_process.spawnSync)("tar", ["-tzf", archivePath], { encoding: "utf8" });
-        if (listResult.status !== 0) throw new Error("Failed to read archive contents");
-        const resolvedTempDir = (0, import_path2.resolve)(tempDir);
-        for (const entry of listResult.stdout.split("\n").filter(Boolean)) {
-          const entryPath = (0, import_path2.resolve)((0, import_path2.join)(tempDir, entry.replace(/\/$/, "")));
-          if (!entryPath.startsWith(resolvedTempDir + import_path2.sep)) {
-            throw new Error(`Archive contains unsafe path: ${entry}`);
-          }
-        }
-        const extractResult = (0, import_child_process.spawnSync)("tar", ["-xzf", archivePath, "-C", tempDir], { stdio: "ignore" });
-        if (extractResult.status !== 0) throw new Error("Archive extraction failed");
-        const extractedEntries = (0, import_fs2.readdirSync)(tempDir);
-        const extractedFolder = extractedEntries.find((e) => e.toLowerCase() === domain.toLowerCase());
-        if (!extractedFolder) throw new Error("Extraction failed");
-        copyDirectory((0, import_path2.join)(tempDir, extractedFolder), domainPath);
+        const domainPath = (0, import_path2.join)(contextsDir, domain);
+        copyDirectory((0, import_path2.join)(tempDir, match), domainPath);
         result.successful.push(domain);
       } catch (error) {
         result.failed.push(domain);
@@ -3780,7 +3813,7 @@ function getReadableError(status) {
 // src/steps/resources/fetch-factory.ts
 var import_fs3 = require("fs");
 var import_path3 = require("path");
-var import_child_process2 = require("child_process");
+var import_child_process3 = require("child_process");
 var MIN_FILE_SIZE2 = 1024;
 function getFactoryAsset(agent) {
   switch (agent) {
@@ -3805,7 +3838,7 @@ var fetch_factory_default = defineStep({
 });
 async function fetchFactory(token, repo, targetDir, agent) {
   const result = { success: false, filesInstalled: [] };
-  const tarCheck = (0, import_child_process2.spawnSync)("tar", ["--version"], { stdio: "ignore" });
+  const tarCheck = (0, import_child_process3.spawnSync)("tar", ["--version"], { stdio: "ignore" });
   if (tarCheck.status !== 0) {
     result.failureReason = "tar command not found";
     return result;
@@ -3848,7 +3881,7 @@ async function fetchFactory(token, repo, targetDir, agent) {
       result.failureReason = "Downloaded file corrupted (too small)";
       return result;
     }
-    const listResult = (0, import_child_process2.spawnSync)("tar", ["-tzf", archivePath], { encoding: "utf8" });
+    const listResult = (0, import_child_process3.spawnSync)("tar", ["-tzf", archivePath], { encoding: "utf8" });
     if (listResult.status !== 0) {
       result.failureReason = "Failed to read archive contents";
       return result;
@@ -3861,7 +3894,7 @@ async function fetchFactory(token, repo, targetDir, agent) {
         return result;
       }
     }
-    const extractResult = (0, import_child_process2.spawnSync)("tar", ["-xzf", archivePath, "-C", tempDir], { stdio: "ignore" });
+    const extractResult = (0, import_child_process3.spawnSync)("tar", ["-xzf", archivePath, "-C", tempDir], { stdio: "ignore" });
     if (extractResult.status !== 0) {
       result.failureReason = "Archive extraction failed";
       return result;
@@ -4336,7 +4369,7 @@ var write_mcp_config_default = defineStep({
     const existingServers = existingFile[target.rootKey] ?? {};
     const newServers = {};
     for (const [serverName, serverConfig] of Object.entries(filteredMcpConfig)) {
-      const { description, useWhen, active, ...mcpFields } = serverConfig;
+      const { description, useWhen, active, installCommand, ...mcpFields } = serverConfig;
       newServers[serverName] = mcpFields;
       addedServers.push(serverName);
     }
@@ -4362,6 +4395,66 @@ function getAgentMCPTarget(agent) {
   }
 }
 
+// src/steps/setup/run-mcp-install-commands.ts
+var import_child_process4 = require("child_process");
+var run_mcp_install_commands_default = defineStep({
+  name: "run-mcp-install-commands",
+  label: "Registering MCP servers with Claude Code",
+  when: (ctx) => {
+    if (ctx.config.agent !== "claude-code") return false;
+    const filtered = getFilteredMcpConfig(ctx);
+    return Object.values(filtered).some((s) => typeof s.installCommand === "string" && s.installCommand.length > 0);
+  },
+  execute: async (ctx) => {
+    if (!isClaudeCliAvailable()) {
+      return {
+        status: "skipped",
+        detail: "`claude` CLI not found on PATH \u2014 skipping CLI registration (project .mcp.json was still written)"
+      };
+    }
+    const filtered = getFilteredMcpConfig(ctx);
+    const succeeded = [];
+    const failed = [];
+    for (const [name, cfg] of Object.entries(filtered)) {
+      const cmd = cfg.installCommand;
+      if (typeof cmd !== "string" || cmd.length === 0) continue;
+      const result = (0, import_child_process4.spawnSync)(cmd, {
+        shell: true,
+        stdio: "pipe",
+        encoding: "utf-8",
+        cwd: ctx.config.projectPath
+      });
+      if (result.status === 0) {
+        succeeded.push(name);
+      } else {
+        const stderr = (result.stderr ?? "").trim();
+        const reason = stderr.length > 0 ? stderr.split("\n")[0] : `exit ${result.status}`;
+        failed.push({ name, reason });
+      }
+    }
+    ctx.installed.mcpInstallCommandsRun = { succeeded, failed };
+    if (failed.length === 0) {
+      return {
+        status: "success",
+        message: succeeded.length > 0 ? succeeded.join(", ") : void 0
+      };
+    }
+    const failedSummary = failed.map((f) => `${f.name} (${f.reason})`).join("; ");
+    if (succeeded.length === 0) {
+      return { status: "failed", detail: failedSummary };
+    }
+    return {
+      status: "success",
+      message: `${succeeded.join(", ")}; failed: ${failed.map((f) => f.name).join(", ")}`,
+      detail: `Some registrations failed: ${failedSummary}`
+    };
+  }
+});
+function isClaudeCliAvailable() {
+  const check2 = (0, import_child_process4.spawnSync)("claude --version", { shell: true, stdio: "ignore" });
+  return check2.status === 0;
+}
+
 // src/steps/setup/update-gitignore.ts
 var import_fs6 = require("fs");
 var import_path6 = require("path");
@@ -4422,7 +4515,7 @@ var update_gitignore_default = defineStep({
 var import_fs7 = require("fs");
 var import_path7 = require("path");
 var import_os2 = require("os");
-var INSTALLER_VERSION = "0.5.16";
+var INSTALLER_VERSION = "0.5.18";
 var write_state_default = defineStep({
   name: "write-state",
   label: "Saving installation state",
@@ -4436,6 +4529,7 @@ var write_state_default = defineStep({
       installedAt: (/* @__PURE__ */ new Date()).toISOString(),
       installerVersion: INSTALLER_VERSION,
       releaseVersion: ctx.config.releaseVersion,
+      contextReleaseVersion: ctx.installed.contextReleaseVersion ?? null,
       projectPath: ctx.config.projectPath,
       agent: ctx.config.agent,
       technologies: ctx.config.technologies.map((p) => p.id),
@@ -4542,10 +4636,14 @@ async function main() {
   try {
     const token = await getGitHubToken();
     console.log("  Locating repositories...");
-    const [repo, factoryRepo] = await Promise.all([
+    const [repo, contextRepo, factoryRepo] = await Promise.all([
       discoverRepo(token),
+      discoverRepo(token, "context-data").catch(() => null),
       discoverRepo(token, "factory-data").catch(() => null)
     ]);
+    if (!contextRepo) {
+      console.log("  \u26A0  Context repo not found \u2014 AI contexts will not be installed.");
+    }
     if (!factoryRepo) {
       console.log("  \u26A0  Factory repo not found \u2014 Factory will not be installed.");
     }
@@ -4566,6 +4664,7 @@ async function main() {
       config,
       token,
       repo,
+      contextRepo,
       factoryRepo,
       installed: {}
     };
@@ -4610,6 +4709,9 @@ async function collectInputs(options, releaseVersion, factoryAvailable = false)
       mcpConfig["azure-devops"].args = mcpConfig["azure-devops"].args?.map(
         (arg) => arg === "__AZURE_ORG__" ? azureDevOpsOrg : arg
       );
+      if (mcpConfig["azure-devops"].installCommand) {
+        mcpConfig["azure-devops"].installCommand = mcpConfig["azure-devops"].installCommand.replace(/__AZURE_ORG__/g, azureDevOpsOrg);
+      }
     }
   }
   const projectInput = await esm_default4({

package/package.json

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