harnessed 3.9.8 → 3.9.9

package/dist/cli.mjs

@@ -1222,7 +1222,7 @@ var init_auto_install = __esm({
 
 // package.json
 var package_default = {
-  version: "3.9.8"};
+  version: "3.9.9"};
 
 // src/manifest/errors.ts
 function instancePathToKeyPath(instancePath) {
@@ -4379,6 +4379,9 @@ 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}/`);
@@ -4466,18 +4469,83 @@ async function spawnCmd(ctx, cmd, args, timeoutMs) {
 
 // src/installers/lib/idempotent.ts
 var IDEMPOTENT_CHECK_TIMEOUT_MS = 1e4;
+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;
 }
 
@@ -4615,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,
@@ -5221,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];
@@ -5252,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,
@@ -5283,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 = {
@@ -6647,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];
@@ -6662,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] };