@moglenny/content-workbench-agent 0.1.2 → 0.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moglenny/content-workbench-agent",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Agent installer for Content Workbench CLI, Skills, and MCP configuration",
   "type": "module",
   "bin": {

package/src/bin.mjs

@@ -2,7 +2,7 @@
 
 import { spawn } from "node:child_process";
 import { realpathSync } from "node:fs";
-import { mkdir, rm, stat } from "node:fs/promises";
+import { mkdir, rename, rm, stat } from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
@@ -40,9 +40,12 @@ Options:
   --repo-url <url>             Git repository URL. Defaults to the official content workbench repo.
   --branch <name>              Branch to install from. Defaults to main.
   --repo-dir <path>            Local managed clone path. Defaults to ~/.content-workbench/agent/topic-dashboard.
+  --cli-prefix <path>          User-owned npm prefix for cw. Defaults to ~/.content-workbench/npm.
   --skills-target <path>       Skill install target. Repeatable.
   --mcp-target <path>          Write MCP config snippet to this JSON file.
-  --skip-cli                   Do not install the global cw CLI.
+  --shell-profile <path>       Shell profile that should include cw in PATH.
+  --skip-cli                   Do not install the user-level cw CLI.
+  --skip-shell-profile         Do not add cw to the shell profile PATH.
   --skip-skills                Do not copy Skills.
   --skip-mcp                   Do not write MCP config.
   --api-base-url <url>         Base URL shown in post-install setup guidance.
@@ -92,13 +95,13 @@ export function parseAgentInstallerArgs(argv = process.argv.slice(2)) {
       options.repoDir = path.resolve(expandHome(args[++index] || ""));
       continue;
     }
-    if (arg === "--skills-target" || arg === "--mcp-target" || arg === "--api-base-url") {
+    if (arg === "--skills-target" || arg === "--mcp-target" || arg === "--api-base-url" || arg === "--cli-prefix" || arg === "--shell-profile") {
       const value = args[++index];
       if (!value) throw new Error(`Missing value for ${arg}`);
       options.installArgs.push(arg, value);
       continue;
     }
-    if (arg === "--skip-cli" || arg === "--skip-skills" || arg === "--skip-mcp") {
+    if (arg === "--skip-cli" || arg === "--skip-shell-profile" || arg === "--skip-skills" || arg === "--skip-mcp") {
       options.installArgs.push(arg);
       continue;
     }
@@ -217,6 +220,24 @@ async function runStepWithRetry(step, options) {
   }
 }
 
+async function runSteps(steps, options) {
+  for (const step of steps) {
+    await runStepWithRetry(step, options);
+  }
+}
+
+async function clearManagedRepo(options) {
+  try {
+    await options.removeDir(options.repoDir, { recursive: true, force: true });
+    return null;
+  } catch {
+    const quarantineDir = `${options.repoDir}.broken-${options.now()}`;
+    await options.renameDir(options.repoDir, quarantineDir);
+    options.stdout.write(`Moved inaccessible managed repository to ${quarantineDir}\n`);
+    return quarantineDir;
+  }
+}
+
 function printPlan(plan, stdout) {
   stdout.write(`${plan.dryRun ? "Content Workbench Agent install dry run" : "Content Workbench Agent install"}\n`);
   stdout.write(`Managed repository: ${plan.repoDir}\n`);
@@ -244,15 +265,34 @@ export async function runAgentInstaller(argv = process.argv.slice(2), io = proce
 
   const runner = io.run || run;
   const removeDir = io.removeDir || rm;
+  const renameDir = io.renameDir || rename;
   const wait = io.sleep || sleep;
-  for (const step of plan.steps) {
-    await runStepWithRetry(step, {
-      runner,
-      removeDir,
-      repoDir: options.repoDir,
-      sleep: wait,
-      stdout: io.stdout,
-    });
+  const runnerOptions = {
+    runner,
+    removeDir,
+    renameDir,
+    repoDir: options.repoDir,
+    sleep: wait,
+    now: io.now || Date.now,
+    stdout: io.stdout,
+  };
+
+  if (repoExists) {
+    const updateSteps = plan.steps.slice(0, 3);
+    const installStep = plan.steps.at(-1);
+    try {
+      await runSteps(updateSteps, runnerOptions);
+    } catch {
+      io.stdout.write("Existing managed repository could not be updated. Recreating a clean managed repository...\n");
+      const quarantinedRepoDir = await clearManagedRepo(runnerOptions);
+      const cleanPlan = buildInstallPlan(options, false);
+      await runSteps(cleanPlan.steps, runnerOptions);
+      io.stdout.write("Content Workbench Agent install complete\n");
+      return { ...cleanPlan, recreatedExistingRepo: true, quarantinedRepoDir };
+    }
+    await runSteps([installStep], runnerOptions);
+  } else {
+    await runSteps(plan.steps, runnerOptions);
   }
 
   io.stdout.write("Content Workbench Agent install complete\n");