dlw-machine-setup 0.5.13 → 0.5.15

package/bin/installer.js

@@ -3309,7 +3309,8 @@ async function fetchWizardOptions(token, repo) {
     });
     if (!assetRes.ok) return null;
     const data = await assetRes.json();
-    if (!Array.isArray(data.agents) || !Array.isArray(data.personas?.personas)) {
+    const techArray = data.personas?.technologies ?? data.personas?.personas;
+    if (!Array.isArray(data.agents) || !Array.isArray(techArray)) {
       return null;
     }
     return { options: data, releaseVersion: release.tag_name ?? "unknown" };
@@ -3571,9 +3572,9 @@ async function loadWizardOptions(token, repo) {
     Object.entries(options.mcpServers).filter(([, config]) => config.active !== false)
   );
   return {
-    personas: options.personas.personas.filter((p) => p.active !== false),
+    technologies: (options.personas?.technologies ?? options.personas?.personas ?? []).filter((p) => p.active !== false),
     agents: options.agents.filter((a) => a.active !== false),
-    baseMcpServers: options.personas.baseMcpServers,
+    baseMcpServers: options.personas?.baseMcpServers ?? [],
     mcpServers: filteredMcpServers,
     releaseVersion
   };
@@ -3635,8 +3636,9 @@ var MIN_FILE_SIZE = 1024;
 var fetch_contexts_default = defineStep({
   name: "fetch-contexts",
   label: "Downloading contexts",
+  when: (ctx) => ctx.config.technologies.length > 0,
   execute: async (ctx) => {
-    const uniqueDomains = [...new Set(ctx.config.personas.flatMap((p) => p.domains))];
+    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);
     ctx.installed.domainsInstalled = downloadResult.successful;
@@ -3780,7 +3782,14 @@ var import_fs3 = require("fs");
 var import_path3 = require("path");
 var import_child_process2 = require("child_process");
 var MIN_FILE_SIZE2 = 1024;
-var FACTORY_ASSET_NAME = "factory.tar.gz";
+function getFactoryAsset(agent) {
+  switch (agent) {
+    case "github-copilot":
+      return { assetName: "factory-copilot.tar.gz", rootFolder: "factory-copilot" };
+    default:
+      return { assetName: "factory.tar.gz", rootFolder: "factory" };
+  }
+}
 var fetch_factory_default = defineStep({
   name: "fetch-factory",
   label: "Installing Factory framework",
@@ -3794,37 +3803,6 @@ var fetch_factory_default = defineStep({
     return { status: "success", message: result.filesInstalled.join(", ") };
   }
 });
-function getAgentPaths(agent, targetDir) {
-  const claudeDir = (0, import_path3.join)(targetDir, ".claude");
-  const githubDir = (0, import_path3.join)(targetDir, ".github");
-  switch (agent) {
-    case "github-copilot":
-      return {
-        agentsDir: (0, import_path3.join)(githubDir, "agents"),
-        hooksDir: (0, import_path3.join)(claudeDir, "hooks"),
-        // Copilot reads .claude/hooks/ natively
-        skillsDir: (0, import_path3.join)(githubDir, "prompts"),
-        // Copilot uses .github/prompts/ for slash commands
-        settingsDir: claudeDir,
-        // Copilot reads .claude/settings.json natively
-        agentsLabel: ".github/agents/",
-        hooksLabel: ".claude/hooks/",
-        skillsLabel: ".github/prompts/",
-        settingsLabel: ".claude/settings.json"
-      };
-    default:
-      return {
-        agentsDir: (0, import_path3.join)(claudeDir, "agents"),
-        hooksDir: (0, import_path3.join)(claudeDir, "hooks"),
-        skillsDir: (0, import_path3.join)(claudeDir, "skills"),
-        settingsDir: claudeDir,
-        agentsLabel: ".claude/agents/",
-        hooksLabel: ".claude/hooks/",
-        skillsLabel: ".claude/skills/",
-        settingsLabel: ".claude/settings.json"
-      };
-  }
-}
 async function fetchFactory(token, repo, targetDir, agent) {
   const result = { success: false, filesInstalled: [] };
   const tarCheck = (0, import_child_process2.spawnSync)("tar", ["--version"], { stdio: "ignore" });
@@ -3832,6 +3810,7 @@ async function fetchFactory(token, repo, targetDir, agent) {
     result.failureReason = "tar command not found";
     return result;
   }
+  const { assetName, rootFolder } = getFactoryAsset(agent);
   const headers = {
     "Accept": "application/vnd.github+json",
     "Authorization": `Bearer ${token}`
@@ -3845,9 +3824,9 @@ async function fetchFactory(token, repo, targetDir, agent) {
     return result;
   }
   const releaseData = await releaseResponse.json();
-  const asset = releaseData.assets?.find((a) => a.name === FACTORY_ASSET_NAME);
+  const asset = releaseData.assets?.find((a) => a.name === assetName);
   if (!asset) {
-    result.failureReason = `${FACTORY_ASSET_NAME} not found in release`;
+    result.failureReason = `${assetName} not found in release`;
     return result;
   }
   const tempDir = (0, import_path3.join)(targetDir, ".temp-factory-download");
@@ -3861,7 +3840,7 @@ async function fetchFactory(token, repo, targetDir, agent) {
       result.failureReason = `Download failed (${response.status})`;
       return result;
     }
-    const archivePath = (0, import_path3.join)(tempDir, FACTORY_ASSET_NAME);
+    const archivePath = (0, import_path3.join)(tempDir, assetName);
     const arrayBuffer = await response.arrayBuffer();
     (0, import_fs3.writeFileSync)(archivePath, Buffer.from(arrayBuffer));
     const stats = (0, import_fs3.statSync)(archivePath);
@@ -3888,54 +3867,17 @@ async function fetchFactory(token, repo, targetDir, agent) {
       return result;
     }
     const extractedEntries = (0, import_fs3.readdirSync)(tempDir);
-    const extractedFolder = extractedEntries.find((e) => e.toLowerCase() === "factory");
+    const extractedFolder = extractedEntries.find((e) => e.toLowerCase() === rootFolder.toLowerCase());
     if (!extractedFolder) {
-      result.failureReason = "No factory/ folder in archive";
+      result.failureReason = `No ${rootFolder}/ folder in archive`;
       return result;
     }
     const extractedPath = (0, import_path3.join)(tempDir, extractedFolder);
-    const paths = getAgentPaths(agent, targetDir);
-    const factoryDir = (0, import_path3.join)(targetDir, "factory");
-    const agentsSrc = (0, import_path3.join)(extractedPath, "agents");
-    if ((0, import_fs3.existsSync)(agentsSrc)) {
-      copyDirectory2(agentsSrc, paths.agentsDir);
-      result.filesInstalled.push(paths.agentsLabel);
-    }
-    const hooksSrc = (0, import_path3.join)(extractedPath, "hooks");
-    if ((0, import_fs3.existsSync)(hooksSrc)) {
-      copyDirectory2(hooksSrc, paths.hooksDir);
-      result.filesInstalled.push(paths.hooksLabel);
-    }
-    const skillsSrc = (0, import_path3.join)(extractedPath, "skills");
-    if ((0, import_fs3.existsSync)(skillsSrc)) {
-      copyDirectory2(skillsSrc, paths.skillsDir);
-      result.filesInstalled.push(paths.skillsLabel);
-    }
-    const workflowSrc = (0, import_path3.join)(extractedPath, "workflow");
-    if ((0, import_fs3.existsSync)(workflowSrc)) {
-      copyDirectory2(workflowSrc, (0, import_path3.join)(factoryDir, "workflow"));
-      result.filesInstalled.push("factory/workflow/");
-    }
-    const utilsSrc = (0, import_path3.join)(extractedPath, "utils");
-    if ((0, import_fs3.existsSync)(utilsSrc)) {
-      copyDirectory2(utilsSrc, (0, import_path3.join)(factoryDir, "utils"));
-      result.filesInstalled.push("factory/utils/");
-    }
-    const docsSrc = (0, import_path3.join)(extractedPath, "docs");
-    if ((0, import_fs3.existsSync)(docsSrc)) {
-      copyDirectory2(docsSrc, (0, import_path3.join)(factoryDir, "docs"));
-      result.filesInstalled.push("factory/docs/");
-    }
-    const rootEntries = (0, import_fs3.readdirSync)(extractedPath, { withFileTypes: true });
-    for (const entry of rootEntries) {
-      if (entry.isFile()) {
-        if (!(0, import_fs3.existsSync)(factoryDir)) (0, import_fs3.mkdirSync)(factoryDir, { recursive: true });
-        (0, import_fs3.copyFileSync)((0, import_path3.join)(extractedPath, entry.name), (0, import_path3.join)(factoryDir, entry.name));
-        result.filesInstalled.push(`factory/${entry.name}`);
-      }
+    if (agent === "github-copilot") {
+      installCopilotFactory(extractedPath, targetDir, result);
+    } else {
+      installClaudeFactory(extractedPath, targetDir, result);
     }
-    configureSettings(paths.settingsDir);
-    result.filesInstalled.push(paths.settingsLabel);
     result.success = true;
   } catch (error) {
     result.failureReason = error instanceof Error ? error.message : String(error);
@@ -3949,6 +3891,62 @@ async function fetchFactory(token, repo, targetDir, agent) {
   }
   return result;
 }
+function installClaudeFactory(extractedPath, targetDir, result) {
+  const claudeDir = (0, import_path3.join)(targetDir, ".claude");
+  const factoryDir = (0, import_path3.join)(targetDir, "factory");
+  const agentsSrc = (0, import_path3.join)(extractedPath, "agents");
+  if ((0, import_fs3.existsSync)(agentsSrc)) {
+    copyDirectory2(agentsSrc, (0, import_path3.join)(claudeDir, "agents"));
+    result.filesInstalled.push(".claude/agents/");
+  }
+  const hooksSrc = (0, import_path3.join)(extractedPath, "hooks");
+  if ((0, import_fs3.existsSync)(hooksSrc)) {
+    copyDirectory2(hooksSrc, (0, import_path3.join)(claudeDir, "hooks"));
+    result.filesInstalled.push(".claude/hooks/");
+  }
+  const skillsSrc = (0, import_path3.join)(extractedPath, "skills");
+  if ((0, import_fs3.existsSync)(skillsSrc)) {
+    copyDirectory2(skillsSrc, (0, import_path3.join)(claudeDir, "skills"));
+    result.filesInstalled.push(".claude/skills/");
+  }
+  const workflowSrc = (0, import_path3.join)(extractedPath, "workflow");
+  if ((0, import_fs3.existsSync)(workflowSrc)) {
+    copyDirectory2(workflowSrc, (0, import_path3.join)(factoryDir, "workflow"));
+    result.filesInstalled.push("factory/workflow/");
+  }
+  const utilsSrc = (0, import_path3.join)(extractedPath, "utils");
+  if ((0, import_fs3.existsSync)(utilsSrc)) {
+    copyDirectory2(utilsSrc, (0, import_path3.join)(factoryDir, "utils"));
+    result.filesInstalled.push("factory/utils/");
+  }
+  const docsSrc = (0, import_path3.join)(extractedPath, "docs");
+  if ((0, import_fs3.existsSync)(docsSrc)) {
+    copyDirectory2(docsSrc, (0, import_path3.join)(factoryDir, "docs"));
+    result.filesInstalled.push("factory/docs/");
+  }
+  const rootEntries = (0, import_fs3.readdirSync)(extractedPath, { withFileTypes: true });
+  for (const entry of rootEntries) {
+    if (entry.isFile()) {
+      if (!(0, import_fs3.existsSync)(factoryDir)) (0, import_fs3.mkdirSync)(factoryDir, { recursive: true });
+      (0, import_fs3.copyFileSync)((0, import_path3.join)(extractedPath, entry.name), (0, import_path3.join)(factoryDir, entry.name));
+      result.filesInstalled.push(`factory/${entry.name}`);
+    }
+  }
+  configureSettings(claudeDir);
+  result.filesInstalled.push(".claude/settings.json");
+}
+function installCopilotFactory(extractedPath, targetDir, result) {
+  const factoryDir = (0, import_path3.join)(targetDir, "factory");
+  copyDirectory2(extractedPath, factoryDir);
+  const entries = (0, import_fs3.readdirSync)(extractedPath, { withFileTypes: true });
+  for (const entry of entries) {
+    if (entry.isDirectory()) {
+      result.filesInstalled.push(`factory/${entry.name}/`);
+    } else {
+      result.filesInstalled.push(`factory/${entry.name}`);
+    }
+  }
+}
 function configureSettings(claudeDir) {
   const settingsPath = (0, import_path3.join)(claudeDir, "settings.json");
   let settings = {};
@@ -4029,12 +4027,12 @@ var import_path4 = require("path");
 // src/steps/shared.ts
 function getFilteredMcpConfig(ctx) {
   const successfulDomains = new Set(ctx.installed.domainsInstalled ?? []);
-  const successfulPersonas = ctx.config.personas.filter(
+  const successfulTechnologies = ctx.config.technologies.filter(
     (p) => p.domains.every((d) => successfulDomains.has(d.toLowerCase()))
   );
   const successfulMcpServers = /* @__PURE__ */ new Set([
     ...ctx.config.baseMcpServers,
-    ...successfulPersonas.flatMap((p) => p.mcpServers)
+    ...successfulTechnologies.flatMap((p) => p.mcpServers)
   ]);
   return Object.fromEntries(
     Object.entries(ctx.config.mcpConfig).filter(([name]) => successfulMcpServers.has(name))
@@ -4048,7 +4046,7 @@ var red = (text) => `\x1B[31m${text}\x1B[0m`;
 var write_instructions_default = defineStep({
   name: "write-instructions",
   label: "Writing instruction file",
-  when: (ctx) => (ctx.installed.domainsInstalled?.length ?? 0) > 0,
+  when: (ctx) => (ctx.installed.domainsInstalled?.length ?? 0) > 0 || Object.keys(ctx.config.mcpConfig).length > 0 || ctx.installed.factoryInstalled,
   execute: async (ctx) => {
     const filteredMcpConfig = getFilteredMcpConfig(ctx);
     const domains = ctx.installed.domainsInstalled;
@@ -4245,7 +4243,25 @@ function buildMCPSection(mcpConfig) {
   }
   return lines2.join("\n");
 }
-function buildFactorySection() {
+function buildFactorySection(agent) {
+  if (agent === "github-copilot") {
+    return [
+      `## Factory Dev Workflow`,
+      ``,
+      `Factory is installed. Skills are in \`factory/skills/\`, templates in \`factory/templates/\`.`,
+      ``,
+      `Read \`factory/README.md\` and \`factory/PROTOCOL.md\` for usage instructions.`,
+      ``,
+      `Available skills:`,
+      `- \`factory-advisor\` \u2014 start or resume the workflow (main entry point)`,
+      `- \`factory-init\` \u2014 initialize project state`,
+      `- \`factory-planner\` \u2014 create story plan`,
+      `- \`factory-executor\` \u2014 execute development tasks`,
+      `- \`factory-verifier\` \u2014 code review`,
+      `- \`factory-completer\` \u2014 finalize and complete work`,
+      ``
+    ].join("\n");
+  }
   return [
     `## Factory Dev Workflow`,
     ``,
@@ -4277,7 +4293,7 @@ function buildCombinedInstructions(domains, mcpConfig, agent, projectPath, facto
   const lines2 = [`# AI Development Instructions`, ``, `> Generated by One-Shot Installer`, ``];
   lines2.push(buildContextRefsSection(domains, agent, contextsDir));
   if (Object.keys(mcpConfig).length > 0) lines2.push(buildMCPSection(mcpConfig));
-  if (factoryInstalled) lines2.push(buildFactorySection());
+  if (factoryInstalled) lines2.push(buildFactorySection(agent));
   return lines2.join("\n");
 }
 
@@ -4288,7 +4304,7 @@ var red2 = (text) => `\x1B[31m${text}\x1B[0m`;
 var write_mcp_config_default = defineStep({
   name: "write-mcp-config",
   label: "Writing MCP configuration",
-  when: (ctx) => (ctx.installed.domainsInstalled?.length ?? 0) > 0,
+  when: (ctx) => Object.keys(ctx.config.mcpConfig).length > 0,
   execute: async (ctx) => {
     const filteredMcpConfig = getFilteredMcpConfig(ctx);
     const target = getAgentMCPTarget(ctx.config.agent);
@@ -4406,7 +4422,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.13";
+var INSTALLER_VERSION = "0.5.15";
 var write_state_default = defineStep({
   name: "write-state",
   label: "Saving installation state",
@@ -4422,7 +4438,7 @@ var write_state_default = defineStep({
       releaseVersion: ctx.config.releaseVersion,
       projectPath: ctx.config.projectPath,
       agent: ctx.config.agent,
-      personas: ctx.config.personas.map((p) => p.id),
+      technologies: ctx.config.technologies.map((p) => p.id),
       domains: ctx.installed.domainsInstalled ?? [],
       mcpServers: mcpServersAdded,
       mcpConfigs: filteredMcpConfig,
@@ -4565,20 +4581,23 @@ async function main() {
 }
 async function collectInputs(options, releaseVersion, factoryAvailable = false) {
   const selectedIds = await esm_default2({
-    message: "Personas:",
+    message: "Technology:",
     instructions: "  Space to select  \xB7  Enter to confirm",
-    choices: options.personas.map((p) => ({
-      name: p.name.replace(/ Developer$/, ""),
-      value: p.id
-    })),
+    choices: [
+      ...options.technologies.map((p) => ({
+        name: p.name.replace(/ Developer$/, ""),
+        value: p.id
+      })),
+      { name: "None", value: "none" }
+    ],
     required: true
   });
-  const selectedPersonas = options.personas.filter((p) => selectedIds.includes(p.id));
+  const selectedTechnologies = options.technologies.filter((p) => selectedIds.includes(p.id));
   const agent = await esm_default5({
     message: "AI coding tool:",
     choices: options.agents
   });
-  const mcpConfig = buildMCPConfiguration(selectedPersonas, options.baseMcpServers, options.mcpServers);
+  const mcpConfig = buildMCPConfiguration(selectedTechnologies, options.baseMcpServers, options.mcpServers);
   let azureDevOpsOrg = "";
   if (mcpConfig["azure-devops"]) {
     const org = await esm_default4({
@@ -4598,7 +4617,7 @@ async function collectInputs(options, releaseVersion, factoryAvailable = false)
     default: (0, import_path8.resolve)(process.cwd())
   });
   return {
-    personas: selectedPersonas,
+    technologies: selectedTechnologies,
     agent,
     azureDevOpsOrg,
     projectPath: (0, import_path8.resolve)(projectInput),
@@ -4609,7 +4628,7 @@ async function collectInputs(options, releaseVersion, factoryAvailable = false)
   };
 }
 async function previewAndConfirm(config, options) {
-  const personaNames = config.personas.map((p) => p.name.replace(/ Developer$/, "")).join(", ");
+  const technologyNames = config.technologies.length > 0 ? config.technologies.map((p) => p.name.replace(/ Developer$/, "")).join(", ") : "None";
   const agentDisplay = options.agents.find((a) => a.value === config.agent)?.name ?? config.agent;
   const instructionFile = getInstructionFilePath3(config.agent);
   const mcpConfigFile = getMCPConfigPath2(config.agent);
@@ -4620,7 +4639,7 @@ async function previewAndConfirm(config, options) {
   const instructionMode = detectMarkerFileMode(instructionFilePath, "<!-- one-shot-installer:start -->");
   const mcpMode = detectMCPFileMode(mcpConfigFilePath);
   const gitignoreMode = detectMarkerFileMode(gitignorePath, "# one-shot-installer:start");
-  const uniqueDomains = [...new Set(config.personas.flatMap((p) => p.domains))];
+  const uniqueDomains = [...new Set(config.technologies.flatMap((p) => p.domains))];
   const domainModes = uniqueDomains.map((d) => ({
     domain: d,
     mode: detectContextMode(config.projectPath, d)
@@ -4628,7 +4647,7 @@ async function previewAndConfirm(config, options) {
   console.log("\n" + "\u2500".repeat(48));
   console.log("  Ready to install");
   console.log("\u2500".repeat(48) + "\n");
-  console.log(`  Personas     ${personaNames}`);
+  console.log(`  Technology   ${technologyNames}`);
   console.log(`  Tool         ${agentDisplay}`);
   console.log(`  Factory      ${config.installFactory ? "yes" : "no"}`);
   console.log(`  Directory    ${config.projectPath}`);

package/package.json

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