harnessed 3.9.6 → 3.9.8

package/dist/cli.mjs

@@ -789,11 +789,33 @@ async function isMcpServerRegistered(name) {
   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);
+  try {
+    const path = join(homedir(), ".claude", "plugins", "installed_plugins.json");
+    const raw = await readFile(path, "utf8");
+    const parsed = JSON.parse(raw);
+    const plugins = parsed.plugins;
+    if (plugins && typeof plugins === "object") {
+      if (Object.hasOwn(plugins, pluginName)) return true;
+      if (Object.keys(plugins).some((k) => k.split("@")[0] === pluginName)) return true;
+    }
+  } catch {
+  }
+  for (const path of [
+    join(homedir(), ".claude", "settings.json"),
+    join(homedir(), ".claude.json")
+  ]) {
+    try {
+      const raw = await readFile(path, "utf8");
+      const parsed = JSON.parse(raw);
+      const plugins = parsed.enabledPlugins;
+      if (plugins && typeof plugins === "object") {
+        if (Object.hasOwn(plugins, pluginName)) return true;
+        if (Object.keys(plugins).some((k) => k.split("@")[0] === pluginName)) return true;
+      }
+    } catch {
+    }
+  }
+  return false;
 }
 var init_readClaudeConfig = __esm({
   "src/installers/lib/readClaudeConfig.ts"() {
@@ -1200,7 +1222,7 @@ var init_auto_install = __esm({
 
 // package.json
 var package_default = {
-  version: "3.9.6"};
+  version: "3.9.8"};
 
 // src/manifest/errors.ts
 function instancePathToKeyPath(instancePath) {
@@ -4357,6 +4379,10 @@ var installCcHookAdd = async (ctx) => {
   await updateInstalled(ctx.cwd, ctx.manifest.metadata.name, "", "");
   return { ok: true, backupId: bk.backupId, appliedFiles: [settingsPath3] };
 };
+function expandTildeForWindows(cmd) {
+  const home = homedir().replace(/\\/g, "/");
+  return cmd.replace(/(^|[\s"'`(])~\//g, `$1${home}/`);
+}
 var DEFAULT_VERIFY_TIMEOUT_MS = 15e3;
 var DEFAULT_INSTALL_TIMEOUT_MS = 6e4;
 async function spawnCmd(ctx, cmd, args, timeoutMs) {
@@ -4381,7 +4407,13 @@ async function spawnCmd(ctx, cmd, args, timeoutMs) {
   const cwd = installCfg.cwd ?? ctx.cwd;
   let child;
   if (process.platform === "win32") {
-    child = spawn("cmd.exe", ["/c", cmd, ...args], { cwd, env, windowsHide: true });
+    const expandedCmd = expandTildeForWindows(cmd);
+    const expandedArgs = args.map(expandTildeForWindows);
+    child = spawn("cmd.exe", ["/c", expandedCmd, ...expandedArgs], {
+      cwd,
+      env,
+      windowsHide: true
+    });
   } else {
     const joined = args.length > 0 ? `${cmd} ${args.join(" ")}` : cmd;
     child = spawn("/bin/sh", ["-c", joined], { cwd, env });
@@ -4434,8 +4466,10 @@ async function spawnCmd(ctx, cmd, args, timeoutMs) {
 
 // src/installers/lib/idempotent.ts
 var IDEMPOTENT_CHECK_TIMEOUT_MS = 1e4;
-async function isAlreadyInstalled(ctx) {
-  if (ctx.opts.updateInstalled === true) return false;
+async function isAlreadyInstalled(ctx, opts = {}) {
+  const honorUpdateFlag = opts.honorUpdateFlag !== false;
+  if (honorUpdateFlag && ctx.opts.updateInstalled === true) return false;
+  if (ctx.opts.dryRun) return false;
   const idempotentCmd = ctx.manifest.spec.install.idempotent_check;
   if (typeof idempotentCmd !== "string" || idempotentCmd.length === 0) {
     return false;
@@ -4856,6 +4890,9 @@ var installMcpHttpAdd = 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, { honorUpdateFlag: false })) {
+    return { ok: true, alreadyInstalled: true, backupId: "noop-idempotent" };
+  }
   const name = ctx.manifest.metadata.name;
   const url = extractUrl(install.cmd);
   if (!url) {
@@ -4992,6 +5029,9 @@ var installMcpStdioAdd = 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, { honorUpdateFlag: false })) {
+    return { ok: true, alreadyInstalled: true, backupId: "noop-idempotent" };
+  }
   const name = ctx.manifest.metadata.name;
   const pkg = ctx.manifest.metadata.upstream.source;
   const ver = install.npm_version;
@@ -6110,7 +6150,7 @@ async function runStepBInstall(manifestPaths, runOpts = {}) {
       }
       const name = v.manifest.metadata.name;
       const r = await runInstall(v.manifest, opts);
-      if ("aborted" in r) return { status: "skipped", name };
+      if ("aborted" in r) return { status: "skipped", name, reason: r.reason };
       if (r.ok && "alreadyInstalled" in r && r.alreadyInstalled)
         return { status: "already-installed", name };
       if (r.ok) return { status: "installed", name };
@@ -6129,8 +6169,10 @@ async function runStepBInstall(manifestPaths, runOpts = {}) {
     };
     if (v.status === "installed") installed.push(v.name);
     else if (v.status === "already-installed") alreadyInstalled.push(v.name);
-    else if (v.status === "skipped") skipped.push(v.name);
-    else
+    else if (v.status === "skipped") {
+      const skipReason = v.reason ?? "unknown";
+      skipped.push({ name: v.name, reason: skipReason });
+    } else
       failed.push(`${v.name}: ${v.reason}`);
   }
   return { installed, alreadyInstalled, skipped, failed, elapsedMs: Date.now() - start };
@@ -6285,20 +6327,9 @@ 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, { updateInstalled: updateInstalled2 });
+    const forceFirstPass = raw.updateInstalled === true;
+    const b = await runStepBInstall(manifestPaths, { updateInstalled: forceFirstPass });
     const stepBMs = (b.elapsedMs / 1e3).toFixed(1);
     console.log(
       t("setup.step_b_complete", {
@@ -6314,8 +6345,32 @@ function registerSetup(program2) {
       console.log(
         `  [B] already-installed  ${n} \u2014 run \`/mcp\` in Claude Code to verify connection`
       );
-    for (const n of b.skipped) console.log(`  [B] skipped            ${n}`);
+    for (const s of b.skipped) console.log(`  [B] skipped            ${s.name} \u2014 ${s.reason}`);
     for (const n of b.failed) console.error(`  [B] failed             ${n}`);
+    if (!forceFirstPass && !dryRun && raw.nonInteractive !== true && b.alreadyInstalled.length > 0) {
+      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 ${b.alreadyInstalled.length} already-installed plugin(s) listed above? (MCP servers excluded \u2014 they ignore force-update)`,
+          initialValue: false
+        });
+        if (!isCancel5(ans) && ans === true) {
+          const b2 = await runStepBInstall(manifestPaths, { updateInstalled: true });
+          const stepB2Ms = (b2.elapsedMs / 1e3).toFixed(1);
+          console.log(
+            `
+Force-update pass complete: ${b2.installed.length} installed / ${b2.alreadyInstalled.length} still-already-installed (MCP) / ${b2.skipped.length} skipped / ${b2.failed.length} failed [parallel ${stepB2Ms}s]`
+          );
+          for (const n of b2.installed) console.log(`  [B*] installed          ${n}`);
+          for (const n of b2.alreadyInstalled)
+            console.log(`  [B*] already-installed  ${n} (MCP / no force-update)`);
+          for (const s of b2.skipped)
+            console.log(`  [B*] skipped            ${s.name} \u2014 ${s.reason}`);
+          for (const n of b2.failed) console.error(`  [B*] failed             ${n}`);
+        }
+      }
+    }
     console.log(
       t("setup.complete", {
         skills: skillsInstalled,