harnessed 3.9.7 → 3.9.9

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.7"};
+  version: "3.9.9"};
 
 // src/manifest/errors.ts
 function instancePathToKeyPath(instancePath) {
@@ -4357,6 +4379,13 @@ var installCcHookAdd = async (ctx) => {
   await updateInstalled(ctx.cwd, ctx.manifest.metadata.name, "", "");
   return { ok: true, backupId: bk.backupId, appliedFiles: [settingsPath3] };
 };
+
+// src/installers/lib/idempotent.ts
+init_readClaudeConfig();
+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 +4410,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,16 +4469,83 @@ 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;
+function extractSkillName(cmd, fallback) {
+  const m = cmd.match(/\bskills(?:@\S+)?\s+add\s+(\S+)/i);
+  if (!m?.[1]) return fallback;
+  const seg = m[1].split("/");
+  return seg[seg.length - 1] ?? fallback;
+}
+function extractGitCloneTarget(cmd) {
+  const idx = cmd.indexOf("git clone");
+  if (idx < 0) return null;
+  const tail = cmd.slice(idx + "git clone".length).trim();
+  const tokens = tail.split(/\s+/);
+  let i = 0;
+  while (i < tokens.length && tokens[i]?.startsWith("-")) {
+    i += tokens[i]?.includes("=") ? 1 : 2;
+  }
+  const dest = tokens[i + 1];
+  if (!dest || dest === "&&" || dest === ";" || dest === "|") return null;
+  if (dest.startsWith("~/")) return join(homedir(), dest.slice(2));
+  if (dest.startsWith("/") || /^[A-Z]:[\\/]/i.test(dest)) return dest;
+  return null;
+}
+async function detectNative(ctx) {
+  const method = ctx.manifest.spec.install.method;
+  const cmd = ctx.manifest.spec.install.cmd;
+  const name = ctx.manifest.metadata.name;
+  if (method === "cc-plugin-marketplace") {
+    const m = cmd.match(/(?:claude\s+)?plugin\s+install\s+(\S+)/i);
+    const pluginName = m?.[1]?.split("@")[0] ?? name;
+    try {
+      return await isPluginRegistered(pluginName);
+    } catch {
+      return false;
+    }
+  }
+  if (method === "npx-skill-installer") {
+    const skillName = extractSkillName(cmd, name);
+    const skillMd = join(homedir(), ".claude", "skills", skillName, "SKILL.md");
+    try {
+      await access(skillMd);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+  if (method === "git-clone-with-setup") {
+    const target = extractGitCloneTarget(cmd);
+    if (!target) return false;
+    try {
+      await access(target);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+  if (method === "npm-cli") {
+    const skillDir = join(homedir(), ".claude", "skills", name);
+    try {
+      await access(skillDir);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+  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 native = await detectNative(ctx);
+  if (native) return true;
   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;
-  }
+  if (!("exitCode" in r)) return false;
   return r.exitCode === 0;
 }
 
@@ -4581,7 +4683,7 @@ ${newEntry}
     const r1 = await runArgs(["plugin", "marketplace", "add", parsed.marketplaceRef], spawnCwd);
     stepOneStderr = r1.stderr;
   }
-  const r2 = await runArgs(installArgs, spawnCwd);
+  const r2 = await runArgs(installArgs, spawnCwd, 6e4);
   if (r2.exitCode !== 0) {
     return {
       ok: false,
@@ -4856,6 +4958,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 +5097,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;
@@ -5181,7 +5289,7 @@ var installNpmCli = async (ctx) => {
   await updateInstalled(ctx.cwd, ctx.manifest.metadata.name, install.npm_version, "");
   return { ok: true, backupId: bk.backupId, appliedFiles: [] };
 };
-function extractSkillName(cmd, fallback) {
+function extractSkillName2(cmd, fallback) {
   const m = cmd.match(/\bskills(?:@\S+)?\s+add\s+(\S+)/i);
   if (!m || m[1] === void 0) return fallback;
   const ref = m[1];
@@ -5212,21 +5320,6 @@ var installNpxSkillInstaller = async (ctx) => {
   if (await isAlreadyInstalled(ctx)) {
     return { ok: true, alreadyInstalled: true, backupId: "noop-idempotent" };
   }
-  if (!/\bskills@(?!latest\b)\S+/.test(install.cmd)) {
-    return {
-      ok: false,
-      phase: "preflight",
-      error: {
-        ...err(
-          ctx,
-          "/spec/install/cmd",
-          `npx-skill-installer cmd must reference a pinned skills@<version> (got: '${install.cmd.slice(0, 100)}'); @latest is forbidden for reproducibility (ADR 0001)`,
-          "skills-pin-required"
-        ),
-        suggest: "change `skills@latest` \u2192 `skills@1.5.7` (current research-pinned stable)"
-      }
-    };
-  }
   if (!/\B--copy\b/.test(install.cmd) || !/\B--global\b/.test(install.cmd)) {
     return {
       ok: false,
@@ -5243,7 +5336,7 @@ var installNpxSkillInstaller = async (ctx) => {
     };
   }
   const name = ctx.manifest.metadata.name;
-  const skillSegment = extractSkillName(install.cmd, name);
+  const skillSegment = extractSkillName2(install.cmd, name);
   const skillDir = join(homedir(), ".claude", "skills", skillSegment);
   const skillMdPath = join(skillDir, "SKILL.md");
   const plan = {
@@ -6110,7 +6203,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 +6222,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 };
@@ -6303,7 +6398,7 @@ 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;
@@ -6323,7 +6418,8 @@ Force-update pass complete: ${b2.installed.length} installed / ${b2.alreadyInsta
           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 n of b2.skipped) console.log(`  [B*] skipped            ${n}`);
+          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}`);
         }
       }
@@ -6604,7 +6700,7 @@ var uninstallNpmCli = async (ctx) => {
   }
   return { ok: true, removedPaths: [pkg] };
 };
-function extractSkillName2(cmd, fallback) {
+function extractSkillName3(cmd, fallback) {
   const m = cmd.match(/\bskills(?:@\S+)?\s+add\s+(\S+)/i);
   if (!m || m[1] === void 0) return fallback;
   const ref = m[1];
@@ -6619,7 +6715,7 @@ var uninstallNpxSkillInstaller = async (ctx) => {
   const abort = dryRunGate(ctx);
   if (abort) return abort;
   const name = ctx.manifest.metadata.name;
-  const skillName = extractSkillName2(install.cmd, name);
+  const skillName = extractSkillName3(install.cmd, name);
   const skillDir = join(homedir(), ".claude", "skills", skillName);
   await rm(skillDir, { recursive: true, force: true, maxRetries: 3 });
   return { ok: true, removedPaths: [skillDir] };