harnessed 3.9.4 → 3.9.6

package/dist/cli.mjs

@@ -762,6 +762,43 @@ var init_check_mattpocock_skills = __esm({
     INSTALL_COMMANDS2 = ["npx skills@latest add mattpocock/skills"];
   }
 });
+function getUserClaudeJsonPath() {
+  return join(homedir(), ".claude.json");
+}
+async function readUserClaudeJson() {
+  const path = getUserClaudeJsonPath();
+  let raw;
+  try {
+    raw = await readFile(path, "utf8");
+  } catch (err2) {
+    if (err2.code === "ENOENT") return {};
+    throw err2;
+  }
+  try {
+    const parsed = JSON.parse(raw);
+    if (parsed === null || typeof parsed !== "object") return {};
+    return parsed;
+  } catch {
+    return {};
+  }
+}
+async function isMcpServerRegistered(name) {
+  const config = await readUserClaudeJson();
+  const servers = config.mcpServers;
+  if (!servers || typeof servers !== "object") return false;
+  return Object.hasOwn(servers, name);
+}
+async function isPluginRegistered(pluginName) {
+  const config = await readUserClaudeJson();
+  const plugins = config.enabledPlugins;
+  if (!plugins || typeof plugins !== "object") return false;
+  if (Object.hasOwn(plugins, pluginName)) return true;
+  return Object.keys(plugins).some((k) => k.split("@")[0] === pluginName);
+}
+var init_readClaudeConfig = __esm({
+  "src/installers/lib/readClaudeConfig.ts"() {
+  }
+});
 
 // src/cli/lib/check-mcp-availability.ts
 var check_mcp_availability_exports = {};
@@ -769,17 +806,15 @@ __export(check_mcp_availability_exports, {
   checkMcpAvailability: () => checkMcpAvailability
 });
 async function checkMcpAvailability() {
-  const settingsPath3 = join(homedir(), ".claude", "settings.json");
-  let installed = [];
-  let missing = [...TARGET_SERVERS];
-  try {
-    const raw = await readFile(settingsPath3, "utf8");
-    const parsed = JSON.parse(raw);
-    const servers = parsed.mcpServers ?? {};
-    const serverNames = Object.keys(servers);
-    installed = TARGET_SERVERS.filter((s) => serverNames.includes(s));
-    missing = TARGET_SERVERS.filter((s) => !installed.includes(s));
-  } catch {
+  const installed = [];
+  const missing = [];
+  for (const s of TARGET_SERVERS) {
+    const present = await isMcpServerRegistered(s);
+    if (present) {
+      installed.push(s);
+    } else {
+      missing.push(s);
+    }
   }
   if (missing.length === 0) {
     return {
@@ -788,35 +823,26 @@ async function checkMcpAvailability() {
       message: `all 3 installed: ${installed.join(", ")}`
     };
   }
-  const installCommands = missing.map((s) => SERVER_INSTALL_COMMANDS[s]);
   if (installed.length === 0) {
     return {
       name: "MCP servers (tavily/exa/chrome-devtools)",
       status: "warn",
-      message: "none of 3 target MCP servers installed in ~/.claude/settings.json",
-      fix: "install via per-server transport-specific command (see install_commands); harnessed routes web-search to tavily/exa per workflows/judgments/web-search-routing.yaml \u2014 without them, falls back to WebFetch/WebSearch built-in (degraded but functional)",
-      install_commands: installCommands
+      message: "none of 3 target MCP servers registered in ~/.claude.json",
+      fix: "run `harnessed setup` to install via Step B (manifests/tools/{tavily,exa,chrome-devtools}-mcp.yaml)"
     };
   }
   return {
     name: "MCP servers (tavily/exa/chrome-devtools)",
     status: "warn",
     message: `${installed.length}/3 installed: ${installed.join(", ")}; missing: ${missing.join(", ")}`,
-    fix: `install missing via per-server command (see install_commands): ${missing.join(", ")}`,
-    install_commands: installCommands
+    fix: "run `harnessed setup` to install missing MCPs via Step B"
   };
 }
-var TARGET_SERVERS, SERVER_INSTALL_COMMANDS;
+var TARGET_SERVERS;
 var init_check_mcp_availability = __esm({
   "src/cli/lib/check-mcp-availability.ts"() {
-    TARGET_SERVERS = ["tavily-remote-mcp", "exa", "chrome-devtools"];
-    SERVER_INSTALL_COMMANDS = {
-      "tavily-remote-mcp": "claude mcp add tavily-remote-mcp --transport http https://mcp.tavily.com/mcp/",
-      exa: "claude mcp add --transport http exa https://mcp.exa.ai/mcp",
-      // chrome-devtools: official Claude marketplace direct install (v3.9.2 dogfood
-      // confirmed — was assumed npx in v3.9.1 SPEC, corrected to official marketplace).
-      "chrome-devtools": "claude plugin install chrome-devtools-mcp"
-    };
+    init_readClaudeConfig();
+    TARGET_SERVERS = ["tavily-mcp", "exa-mcp", "chrome-devtools-mcp"];
   }
 });
 
@@ -1174,7 +1200,7 @@ var init_auto_install = __esm({
 
 // package.json
 var package_default = {
-  version: "3.9.4"};
+  version: "3.9.6"};
 
 // src/manifest/errors.ts
 function instancePathToKeyPath(instancePath) {
@@ -4331,39 +4357,98 @@ var installCcHookAdd = async (ctx) => {
   await updateInstalled(ctx.cwd, ctx.manifest.metadata.name, "", "");
   return { ok: true, backupId: bk.backupId, appliedFiles: [settingsPath3] };
 };
-function getUserClaudeJsonPath() {
-  return join(homedir(), ".claude.json");
-}
-async function readUserClaudeJson() {
-  const path = getUserClaudeJsonPath();
-  let raw;
-  try {
-    raw = await readFile(path, "utf8");
-  } catch (err2) {
-    if (err2.code === "ENOENT") return {};
-    throw err2;
+var DEFAULT_VERIFY_TIMEOUT_MS = 15e3;
+var DEFAULT_INSTALL_TIMEOUT_MS = 6e4;
+async function spawnCmd(ctx, cmd, args, timeoutMs) {
+  const violation = checkCmdString(cmd);
+  if (violation) {
+    return {
+      ok: false,
+      phase: "preflight",
+      error: {
+        file: ctx.manifest.metadata.name,
+        path: "/spec/install/cmd",
+        message: `shell escape detected at spawn boundary: '${violation.label}' (${violation.hint}) \u2014 refusing to execute. v0.1 forbids dynamic shell evaluation; this is a defense-in-depth gate after schema validation.`,
+        line: null,
+        column: null,
+        keyword: "security-gate-bypass"
+      }
+    };
   }
-  try {
-    const parsed = JSON.parse(raw);
-    if (parsed === null || typeof parsed !== "object") return {};
-    return parsed;
-  } catch {
-    return {};
+  const installCfg = ctx.manifest.spec.install;
+  const effectiveTimeoutMs = timeoutMs ?? DEFAULT_INSTALL_TIMEOUT_MS;
+  const env = { ...process.env, ...installCfg.env ?? {} };
+  const cwd = installCfg.cwd ?? ctx.cwd;
+  let child;
+  if (process.platform === "win32") {
+    child = spawn("cmd.exe", ["/c", cmd, ...args], { cwd, env, windowsHide: true });
+  } else {
+    const joined = args.length > 0 ? `${cmd} ${args.join(" ")}` : cmd;
+    child = spawn("/bin/sh", ["-c", joined], { cwd, env });
   }
+  let stdout2 = "";
+  let stderr = "";
+  child.stdout?.setEncoding("utf8").on("data", (chunk) => {
+    stdout2 += chunk;
+  });
+  child.stderr?.setEncoding("utf8").on("data", (chunk) => {
+    stderr += chunk;
+  });
+  return await new Promise((resolve15) => {
+    const timer = setTimeout(() => {
+      child.kill("SIGKILL");
+      resolve15({
+        ok: false,
+        phase: "spawn",
+        error: {
+          file: ctx.manifest.metadata.name,
+          path: "/spec/install/cmd",
+          message: `spawn timed out after ${effectiveTimeoutMs}ms (cmd: ${cmd}); partial stderr: ${stderr.slice(0, 200)}`,
+          line: null,
+          column: null,
+          keyword: "spawn-timeout"
+        }
+      });
+    }, effectiveTimeoutMs);
+    child.on("error", (err2) => {
+      clearTimeout(timer);
+      resolve15({
+        ok: false,
+        phase: "spawn",
+        error: {
+          file: ctx.manifest.metadata.name,
+          path: "/spec/install/cmd",
+          message: `spawn failed: ${err2.message}`,
+          line: null,
+          column: null,
+          keyword: "spawn-error"
+        }
+      });
+    });
+    child.on("close", (code) => {
+      clearTimeout(timer);
+      resolve15({ ok: true, exitCode: code ?? -1, stdout: stdout2, stderr });
+    });
+  });
 }
-async function isMcpServerRegistered(name) {
-  const config = await readUserClaudeJson();
-  const servers = config.mcpServers;
-  if (!servers || typeof servers !== "object") return false;
-  return Object.hasOwn(servers, name);
-}
-async function isPluginRegistered(pluginName) {
-  const config = await readUserClaudeJson();
-  const plugins = config.enabledPlugins;
-  if (!plugins || typeof plugins !== "object") return false;
-  if (Object.hasOwn(plugins, pluginName)) return true;
-  return Object.keys(plugins).some((k) => k.split("@")[0] === pluginName);
+
+// src/installers/lib/idempotent.ts
+var IDEMPOTENT_CHECK_TIMEOUT_MS = 1e4;
+async function isAlreadyInstalled(ctx) {
+  if (ctx.opts.updateInstalled === true) return false;
+  const idempotentCmd = ctx.manifest.spec.install.idempotent_check;
+  if (typeof idempotentCmd !== "string" || idempotentCmd.length === 0) {
+    return false;
+  }
+  const r = await spawnCmd(ctx, idempotentCmd, [], IDEMPOTENT_CHECK_TIMEOUT_MS);
+  if (!("exitCode" in r)) {
+    return false;
+  }
+  return r.exitCode === 0;
 }
+
+// src/installers/ccPluginMarketplace.ts
+init_readClaudeConfig();
 function runArgs(claudeArgs, cwd, timeoutMs = 15e3) {
   return new Promise((resolve15) => {
     const isWin = process.platform === "win32";
@@ -4424,6 +4509,9 @@ var installCcPluginMarketplace = async (ctx) => {
     const e = pre.errors[0] ?? err(ctx, "/", "preflight failed (no detail)", "preflight");
     return { ok: false, phase: "preflight", error: e };
   }
+  if (await isAlreadyInstalled(ctx)) {
+    return { ok: true, alreadyInstalled: true, backupId: "noop-idempotent" };
+  }
   const parsed = parseCmd(install.cmd);
   if (!parsed) {
     return {
@@ -4524,82 +4612,6 @@ ${newEntry}
   await updateInstalled(ctx.cwd, ctx.manifest.metadata.name, install.git_ref, "");
   return { ok: true, backupId: bk.backupId, appliedFiles: [settingsFile] };
 };
-var DEFAULT_VERIFY_TIMEOUT_MS = 15e3;
-var DEFAULT_INSTALL_TIMEOUT_MS = 6e4;
-async function spawnCmd(ctx, cmd, args, timeoutMs) {
-  const violation = checkCmdString(cmd);
-  if (violation) {
-    return {
-      ok: false,
-      phase: "preflight",
-      error: {
-        file: ctx.manifest.metadata.name,
-        path: "/spec/install/cmd",
-        message: `shell escape detected at spawn boundary: '${violation.label}' (${violation.hint}) \u2014 refusing to execute. v0.1 forbids dynamic shell evaluation; this is a defense-in-depth gate after schema validation.`,
-        line: null,
-        column: null,
-        keyword: "security-gate-bypass"
-      }
-    };
-  }
-  const installCfg = ctx.manifest.spec.install;
-  const effectiveTimeoutMs = timeoutMs ?? DEFAULT_INSTALL_TIMEOUT_MS;
-  const env = { ...process.env, ...installCfg.env ?? {} };
-  const cwd = installCfg.cwd ?? ctx.cwd;
-  let child;
-  if (process.platform === "win32") {
-    child = spawn("cmd.exe", ["/c", cmd, ...args], { cwd, env, windowsHide: true });
-  } else {
-    const joined = args.length > 0 ? `${cmd} ${args.join(" ")}` : cmd;
-    child = spawn("/bin/sh", ["-c", joined], { cwd, env });
-  }
-  let stdout2 = "";
-  let stderr = "";
-  child.stdout?.setEncoding("utf8").on("data", (chunk) => {
-    stdout2 += chunk;
-  });
-  child.stderr?.setEncoding("utf8").on("data", (chunk) => {
-    stderr += chunk;
-  });
-  return await new Promise((resolve15) => {
-    const timer = setTimeout(() => {
-      child.kill("SIGKILL");
-      resolve15({
-        ok: false,
-        phase: "spawn",
-        error: {
-          file: ctx.manifest.metadata.name,
-          path: "/spec/install/cmd",
-          message: `spawn timed out after ${effectiveTimeoutMs}ms (cmd: ${cmd}); partial stderr: ${stderr.slice(0, 200)}`,
-          line: null,
-          column: null,
-          keyword: "spawn-timeout"
-        }
-      });
-    }, effectiveTimeoutMs);
-    child.on("error", (err2) => {
-      clearTimeout(timer);
-      resolve15({
-        ok: false,
-        phase: "spawn",
-        error: {
-          file: ctx.manifest.metadata.name,
-          path: "/spec/install/cmd",
-          message: `spawn failed: ${err2.message}`,
-          line: null,
-          column: null,
-          keyword: "spawn-error"
-        }
-      });
-    });
-    child.on("close", (code) => {
-      clearTimeout(timer);
-      resolve15({ ok: true, exitCode: code ?? -1, stdout: stdout2, stderr });
-    });
-  });
-}
-
-// src/installers/gitCloneWithSetup.ts
 function gitRevParseHead(cwd, timeoutMs = 1e4) {
   return new Promise((resolve15) => {
     const isWin = process.platform === "win32";
@@ -4669,6 +4681,9 @@ var installGitCloneWithSetup = async (ctx) => {
     const e = pre.errors[0] ?? err(ctx, "/", "preflight failed (no detail)", "preflight");
     return { ok: false, phase: "preflight", error: e };
   }
+  if (await isAlreadyInstalled(ctx)) {
+    return { ok: true, alreadyInstalled: true, backupId: "noop-idempotent" };
+  }
   if (!/^[a-f0-9]{7,40}$/.test(install.git_ref)) {
     return {
       ok: false,
@@ -4786,6 +4801,7 @@ var installGitCloneWithSetup = async (ctx) => {
 };
 
 // src/installers/mcpHttpAdd.ts
+init_readClaudeConfig();
 function resolveEnvVars(value) {
   const pattern = /\$\{([A-Z_][A-Z0-9_]*)\}/g;
   let resolved = value;
@@ -4954,6 +4970,7 @@ ${newEntry}
 };
 
 // src/installers/mcpStdioAdd.ts
+init_readClaudeConfig();
 var installMcpStdioAdd = async (ctx) => {
   const install = ctx.manifest.spec.install;
   if (install.method !== "mcp-stdio-add") {
@@ -5094,6 +5111,9 @@ var installNpmCli = async (ctx) => {
     const e = pre.errors[0] ?? err(ctx, "/", "preflight failed (no detail)", "preflight");
     return { ok: false, phase: "preflight", error: e };
   }
+  if (await isAlreadyInstalled(ctx)) {
+    return { ok: true, alreadyInstalled: true, backupId: "noop-idempotent" };
+  }
   let level = detectLevel(install.cmd);
   let cmd = install.cmd;
   const plan = { files: [] };
@@ -5189,6 +5209,9 @@ var installNpxSkillInstaller = async (ctx) => {
     const e = pre.errors[0] ?? err(ctx, "/", "preflight failed (no detail)", "preflight");
     return { ok: false, phase: "preflight", error: e };
   }
+  if (await isAlreadyInstalled(ctx)) {
+    return { ok: true, alreadyInstalled: true, backupId: "noop-idempotent" };
+  }
   if (!/\bskills@(?!latest\b)\S+/.test(install.cmd)) {
     return {
       ok: false,
@@ -5403,12 +5426,6 @@ ${t("install.manifest_not_found.fix", { name: resolvedName })}`
     process.exit(1);
   });
 }
-var PHASE_21 = /* @__PURE__ */ new Set([
-  "cc-plugin-marketplace",
-  "git-clone-with-setup",
-  "npx-skill-installer",
-  "mcp-http-add"
-]);
 async function listBaseManifests(cwd) {
   const out = [];
   for (const d of ["manifests/tools", "manifests/skill-packs"]) {
@@ -5451,11 +5468,6 @@ function registerInstallBase(program2) {
         continue;
       }
       const name = v.manifest.metadata.name;
-      const method = v.manifest.spec.install.method;
-      if (PHASE_21.has(method)) {
-        skipped.push({ name, reason: `deferred phase 2.1 (${method})` });
-        continue;
-      }
       const r = await runInstall(v.manifest, opts);
       if ("aborted" in r) skipped.push({ name, reason: `aborted: ${r.reason}` });
       else if (r.ok && "alreadyInstalled" in r && r.alreadyInstalled) alreadyInstalled.push(name);
@@ -5464,7 +5476,7 @@ function registerInstallBase(program2) {
     }
     console.log(
       `
-  installed: ${installed.length} / already-installed: ${alreadyInstalled.length} / skipped (deferred installer methods awaiting phase 2.1): ${skipped.length} / failed: ${failed.length}`
+  installed: ${installed.length} / already-installed: ${alreadyInstalled.length} / skipped (user-aborted): ${skipped.length} / failed: ${failed.length}`
     );
     for (const i of installed) console.log(`  installed          ${i}`);
     for (const a of alreadyInstalled)
@@ -6054,12 +6066,6 @@ async function scanWorkflowsNested(workflowsDir, entries) {
 }
 
 // src/cli/lib/setup-helpers.ts
-var PHASE_212 = /* @__PURE__ */ new Set([
-  "cc-plugin-marketplace",
-  "git-clone-with-setup",
-  "npx-skill-installer",
-  "mcp-http-add"
-]);
 async function warnIfAgentTeamsMissing() {
   const r = await checkAgentTeams();
   if (r.status !== "missing") return;
@@ -6075,14 +6081,15 @@ async function warnIfAgentTeamsMissing() {
 async function scanWorkflowsWithSkill(workflowsDir, entries) {
   return scanWorkflowsNested(workflowsDir, entries);
 }
-async function runStepBInstall(manifestPaths) {
+async function runStepBInstall(manifestPaths, runOpts = {}) {
   const opts = {
     apply: true,
     dryRun: false,
     system: false,
     nonInteractive: true,
     fullDiff: false,
-    color: "auto"
+    color: "auto",
+    updateInstalled: runOpts.updateInstalled === true
   };
   const start = Date.now();
   const settled = await Promise.allSettled(
@@ -6102,8 +6109,6 @@ async function runStepBInstall(manifestPaths) {
         };
       }
       const name = v.manifest.metadata.name;
-      const method = v.manifest.spec.install.method;
-      if (PHASE_212.has(method)) return { status: "skipped", name };
       const r = await runInstall(v.manifest, opts);
       if ("aborted" in r) return { status: "skipped", name };
       if (r.ok && "alreadyInstalled" in r && r.alreadyInstalled)
@@ -6149,7 +6154,10 @@ function registerSetup(program2) {
   ).option("--dry-run", "preview only \u2014 do not write to disk (opt-in for advanced users)").option(
     "--user-lang <code>",
     "override detected OS locale for env.HARNESSED_USER_LANG (en | zh-Hans / zh-CN / zh-TW)"
-  ).option("--non-interactive", "skip all confirm prompts (CI / scripted setup)").option("--no-auto-install", "do not prompt to auto-install missing plugins (advisory only)").action(async (raw) => {
+  ).option("--non-interactive", "skip all confirm prompts (CI / scripted setup)").option("--no-auto-install", "do not prompt to auto-install missing plugins (advisory only)").option(
+    "--update-installed",
+    "force re-install already-installed plugins (excludes MCP servers); default: skip if installed"
+  ).action(async (raw) => {
     const dryRun = raw.dryRun === true;
     const pkgRoot = getPackageRoot();
     const workflowsDir = resolve(pkgRoot, "workflows");
@@ -6277,8 +6285,20 @@ function registerSetup(program2) {
     } else {
       console.warn(t("setup.step_d.skipped", { message: dResult.message }));
     }
+    let updateInstalled2 = raw.updateInstalled === true;
+    if (!updateInstalled2 && !dryRun && raw.nonInteractive !== true) {
+      const isTty = process.stdin.isTTY === true && process.stdout.isTTY === true;
+      if (isTty) {
+        const { confirm: confirm4, isCancel: isCancel5 } = await import('@clack/prompts');
+        const ans = await confirm4({
+          message: "Update already-installed third-party plugins? (excludes MCP servers)",
+          initialValue: false
+        });
+        if (!isCancel5(ans) && ans === true) updateInstalled2 = true;
+      }
+    }
     const manifestPaths = await listBaseManifests2(pkgRoot);
-    const b = await runStepBInstall(manifestPaths);
+    const b = await runStepBInstall(manifestPaths, { updateInstalled: updateInstalled2 });
     const stepBMs = (b.elapsedMs / 1e3).toFixed(1);
     console.log(
       t("setup.step_b_complete", {