harnessed 3.9.17 → 3.9.19

package/dist/cli.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { spawnSync, spawn, execSync } from 'child_process';
 import { existsSync, mkdirSync, renameSync, writeFileSync, readFileSync, readdirSync } from 'fs';
-import { join, dirname, resolve, relative } from 'path';
+import { join, dirname, resolve, sep, relative } from 'path';
 import { homedir } from 'os';
 import { readFile, readdir, unlink, writeFile, stat, rm, cp, mkdir, access, rename } from 'fs/promises';
 import { Type } from '@sinclair/typebox';
@@ -1218,7 +1218,7 @@ var init_auto_install = __esm({
 
 // package.json
 var package_default = {
-  version: "3.9.17"};
+  version: "3.9.19"};
 
 // src/manifest/errors.ts
 function instancePathToKeyPath(instancePath) {
@@ -2057,9 +2057,9 @@ function redactRecord(r) {
 }
 function renderHumanTable(records) {
   const header = `${"ts".padEnd(19)} | ${"phase".padEnd(6)} | ${"category".padEnd(11)} | ${"matched_rule_id".padEnd(20)} | outcome`;
-  const sep = `${"-".repeat(19)}-+-${"-".repeat(6)}-+-${"-".repeat(11)}-+-${"-".repeat(20)}-+--------`;
+  const sep2 = `${"-".repeat(19)}-+-${"-".repeat(6)}-+-${"-".repeat(11)}-+-${"-".repeat(20)}-+--------`;
   console.log(header);
-  console.log(sep);
+  console.log(sep2);
   for (const r of records) {
     const ts = r.ts.slice(0, 19);
     const phase = r.phase.padEnd(6);
@@ -2069,7 +2069,7 @@ function renderHumanTable(records) {
   }
 }
 function pipeToJq(filterExpr, lines) {
-  return new Promise((resolve15, reject) => {
+  return new Promise((resolve14, reject) => {
     const child = spawn("jq", [filterExpr], {
       stdio: ["pipe", "inherit", "inherit"],
       windowsHide: true
@@ -2078,12 +2078,12 @@ function pipeToJq(filterExpr, lines) {
       const e = err2;
       if (e.code === "ENOENT") {
         console.error(t("audit_log.jq_missing"));
-        resolve15(1);
+        resolve14(1);
       } else {
         reject(err2);
       }
     });
-    child.on("close", (code) => resolve15(code ?? 0));
+    child.on("close", (code) => resolve14(code ?? 0));
     child.stdin.write(lines.join("\n"));
     child.stdin.end();
   });
@@ -2740,10 +2740,10 @@ async function spawnCmd(ctx, cmd, args, timeoutMs) {
   child.stderr?.setEncoding("utf8").on("data", (chunk) => {
     stderr += chunk;
   });
-  return await new Promise((resolve15) => {
+  return await new Promise((resolve14) => {
     const timer = setTimeout(() => {
       child.kill("SIGKILL");
-      resolve15({
+      resolve14({
         ok: false,
         phase: "spawn",
         error: {
@@ -2758,7 +2758,7 @@ async function spawnCmd(ctx, cmd, args, timeoutMs) {
     }, effectiveTimeoutMs);
     child.on("error", (err2) => {
       clearTimeout(timer);
-      resolve15({
+      resolve14({
         ok: false,
         phase: "spawn",
         error: {
@@ -2773,7 +2773,7 @@ async function spawnCmd(ctx, cmd, args, timeoutMs) {
     });
     child.on("close", (code) => {
       clearTimeout(timer);
-      resolve15({ ok: true, exitCode: code ?? -1, stdout: stdout2, stderr });
+      resolve14({ ok: true, exitCode: code ?? -1, stdout: stdout2, stderr });
     });
   });
 }
@@ -2801,10 +2801,25 @@ function extractGitCloneTarget(cmd) {
   if (dest.startsWith("/") || /^[A-Z]:[\\/]/i.test(dest)) return dest;
   return null;
 }
+var INSTALLED_INDICATORS = {
+  gsd: ["gsd-progress", "gsd-plan-phase"],
+  "mattpocock-skills": ["diagnose", "tdd", "zoom-out"]
+};
 async function detectNative(ctx) {
   const method = ctx.manifest.spec.install.method;
   const cmd = ctx.manifest.spec.install.cmd;
   const name = ctx.manifest.metadata.name;
+  const indicators = INSTALLED_INDICATORS[name];
+  if (indicators) {
+    for (const ind of indicators) {
+      const dir = join(homedir(), ".claude", "skills", ind);
+      try {
+        await access(dir);
+        return true;
+      } catch {
+      }
+    }
+  }
   if (method === "cc-plugin-marketplace") {
     const m = cmd.match(/(?:claude\s+)?plugin\s+install\s+(\S+)/i);
     const pluginName = m?.[1]?.split("@")[0] ?? name;
@@ -2871,7 +2886,7 @@ async function isAlreadyInstalled(ctx, opts = {}) {
 // src/installers/ccPluginMarketplace.ts
 init_readClaudeConfig();
 function runArgs(claudeArgs, cwd, timeoutMs = 15e3) {
-  return new Promise((resolve15) => {
+  return new Promise((resolve14) => {
     const isWin = process.platform === "win32";
     const child = isWin ? spawn("cmd.exe", ["/c", "claude", ...claudeArgs], { cwd, windowsHide: true }) : spawn("claude", claudeArgs, { cwd, shell: false });
     let stderr = "";
@@ -2880,15 +2895,15 @@ function runArgs(claudeArgs, cwd, timeoutMs = 15e3) {
     });
     const timer = setTimeout(() => {
       child.kill("SIGKILL");
-      resolve15({ exitCode: -1, stderr: `${stderr}[timeout after ${timeoutMs}ms]` });
+      resolve14({ exitCode: -1, stderr: `${stderr}[timeout after ${timeoutMs}ms]` });
     }, timeoutMs);
     child.on("error", (e) => {
       clearTimeout(timer);
-      resolve15({ exitCode: -1, stderr: `${stderr}${e.message}` });
+      resolve14({ exitCode: -1, stderr: `${stderr}${e.message}` });
     });
     child.on("close", (code) => {
       clearTimeout(timer);
-      resolve15({ exitCode: code ?? -1, stderr });
+      resolve14({ exitCode: code ?? -1, stderr });
     });
   });
 }
@@ -3034,7 +3049,7 @@ ${newEntry}
   return { ok: true, backupId: bk.backupId, appliedFiles: [settingsFile] };
 };
 function gitRevParseHead(cwd, timeoutMs = 1e4) {
-  return new Promise((resolve15) => {
+  return new Promise((resolve14) => {
     const isWin = process.platform === "win32";
     const child = isWin ? spawn("cmd.exe", ["/c", "git", "rev-parse", "HEAD"], { cwd, windowsHide: true }) : spawn("git", ["rev-parse", "HEAD"], { cwd, shell: false });
     let stdout2 = "";
@@ -3043,15 +3058,15 @@ function gitRevParseHead(cwd, timeoutMs = 1e4) {
     });
     const timer = setTimeout(() => {
       child.kill("SIGKILL");
-      resolve15({ sha: "", exit: -1 });
+      resolve14({ sha: "", exit: -1 });
     }, timeoutMs);
     child.on("error", () => {
       clearTimeout(timer);
-      resolve15({ sha: "", exit: -1 });
+      resolve14({ sha: "", exit: -1 });
     });
     child.on("close", (code) => {
       clearTimeout(timer);
-      resolve15({ sha: stdout2.trim(), exit: code ?? -1 });
+      resolve14({ sha: stdout2.trim(), exit: code ?? -1 });
     });
   });
 }
@@ -6373,6 +6388,7 @@ function registerStatus(program2) {
     }
   });
 }
+init_harnessedRoot();
 init_path_guard();
 
 // src/uninstallers/lib/runOrPreview.ts
@@ -6558,7 +6574,7 @@ var uninstallNpmCli = async (ctx) => {
   const m = install.cmd.match(/npm\s+(?:install|i)\s+(?:-g\s+)?(\S+)/);
   const pkg = m?.[1] ?? ctx.manifest.metadata.upstream.source;
   const isWin = process.platform === "win32";
-  const result = await new Promise((resolve15) => {
+  const result = await new Promise((resolve14) => {
     const child = isWin ? spawn("cmd.exe", ["/c", "npm", "uninstall", "-g", pkg], { windowsHide: true }) : spawn("npm", ["uninstall", "-g", pkg], { shell: false });
     let stderr = "";
     child.stderr?.setEncoding("utf8").on("data", (c) => {
@@ -6566,15 +6582,15 @@ var uninstallNpmCli = async (ctx) => {
     });
     const timer = setTimeout(() => {
       child.kill("SIGKILL");
-      resolve15({ exitCode: -1, stderr: `${stderr}[timeout]` });
+      resolve14({ exitCode: -1, stderr: `${stderr}[timeout]` });
     }, 3e4);
     child.on("error", (e) => {
       clearTimeout(timer);
-      resolve15({ exitCode: -1, stderr: e.message });
+      resolve14({ exitCode: -1, stderr: e.message });
     });
     child.on("close", (code) => {
       clearTimeout(timer);
-      resolve15({ exitCode: code ?? -1, stderr });
+      resolve14({ exitCode: code ?? -1, stderr });
     });
   });
   if (result.exitCode !== 0) {
@@ -6616,21 +6632,177 @@ async function runUninstall(manifest, opts) {
 }
 
 // src/cli/uninstall.ts
+async function discoverCommandFiles(commandsDir) {
+  const owned = [];
+  let entries;
+  try {
+    entries = await readdir(commandsDir);
+  } catch {
+    return owned;
+  }
+  for (const entry of entries) {
+    if (!entry.endsWith(".md")) continue;
+    const p5 = join(commandsDir, entry);
+    try {
+      const content = await readFile(p5, "utf8");
+      if (shouldOverwriteFile(content)) owned.push(p5);
+    } catch {
+    }
+  }
+  return owned;
+}
+async function checkSettingsEnv(settingsPath3) {
+  try {
+    const raw = await readFile(settingsPath3, "utf8");
+    const data = JSON.parse(raw);
+    const env = data.env ?? {};
+    return {
+      hasAgentTeams: "CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS" in env,
+      hasUserLang: "HARNESSED_USER_LANG" in env
+    };
+  } catch {
+    return { hasAgentTeams: false, hasUserLang: false };
+  }
+}
+async function removeSettingsEnv(settingsPath3) {
+  const raw = await readFile(settingsPath3, "utf8");
+  const data = JSON.parse(raw);
+  const env = data.env ?? {};
+  let changed = false;
+  if ("CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS" in env) {
+    delete env.CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS;
+    changed = true;
+  }
+  if ("HARNESSED_USER_LANG" in env) {
+    delete env.HARNESSED_USER_LANG;
+    changed = true;
+  }
+  if (!changed) return false;
+  if (Object.keys(env).length === 0) delete data.env;
+  else data.env = env;
+  await writeFile(settingsPath3, JSON.stringify(data, null, 2) + "\n", "utf8");
+  return true;
+}
+async function runUnifiedUninstall(home, dryRun) {
+  const commandsDir = join(home, ".claude", "commands");
+  const skillsDir = join(home, ".claude", "skills");
+  const settingsPath3 = join(home, ".claude", "settings.json");
+  const harnessedRoot = getHarnessedRoot();
+  const pkgRoot = getPackageRoot();
+  let workflowNames = [];
+  try {
+    const wfEntries = await readdir(resolve(pkgRoot, "workflows"));
+    const scanResult = await scanWorkflowsNested(resolve(pkgRoot, "workflows"), wfEntries);
+    workflowNames = scanResult.workflows.map((w) => w.name);
+  } catch {
+  }
+  const commandFiles = await discoverCommandFiles(commandsDir);
+  const settingsEnv = await checkSettingsEnv(settingsPath3);
+  const hasSettingsChanges = settingsEnv.hasAgentTeams || settingsEnv.hasUserLang;
+  const skillDirs = [];
+  for (const name of workflowNames) {
+    const dir = join(skillsDir, name);
+    try {
+      await stat(dir);
+      skillDirs.push(dir);
+    } catch {
+    }
+  }
+  const discoverable = commandFiles.length + skillDirs.length + (hasSettingsChanges ? 1 : 0);
+  if (discoverable === 0) {
+    console.log(t("uninstall.unified.nothing"));
+    process.exit(0);
+  }
+  console.log(t("uninstall.unified.header"));
+  if (commandFiles.length > 0)
+    console.log(t("uninstall.unified.commands", { count: commandFiles.length }));
+  if (skillDirs.length > 0) console.log(t("uninstall.unified.skills", { count: skillDirs.length }));
+  if (hasSettingsChanges) console.log(t("uninstall.unified.settings"));
+  console.log(t("uninstall.unified.state_dir"));
+  console.log(t("uninstall.unified.upstream_note"));
+  if (dryRun) {
+    console.log(t("uninstall.unified.dry_run_hint"));
+    process.exit(2);
+  }
+  const answer = await p.confirm({
+    message: t("uninstall.unified.confirm"),
+    initialValue: false
+  });
+  if (p.isCancel(answer) || answer === false) {
+    console.error(t("uninstall.cancelled"));
+    process.exit(2);
+  }
+  console.log(t("uninstall.unified.removing"));
+  const failures = [];
+  let removedCommands = 0;
+  for (const path of commandFiles) {
+    try {
+      await rm(path, { force: true });
+      removedCommands++;
+    } catch (e) {
+      failures.push(`${path}: ${e.message}`);
+    }
+  }
+  let removedSkills = 0;
+  for (const dir of skillDirs) {
+    try {
+      await rm(dir, { recursive: true, force: true });
+      removedSkills++;
+    } catch (e) {
+      failures.push(`${dir}: ${e.message}`);
+    }
+  }
+  let removedSettings = false;
+  if (hasSettingsChanges) {
+    try {
+      removedSettings = await removeSettingsEnv(settingsPath3);
+    } catch (e) {
+      failures.push(`${settingsPath3}: ${e.message}`);
+    }
+  }
+  const normalizedRoot = resolve(harnessedRoot);
+  const claudeDir = join(home, ".claude");
+  if (!normalizedRoot.startsWith(resolve(claudeDir) + sep)) {
+    console.error(`error: state dir ${harnessedRoot} is not under ${claudeDir} \u2014 refusing`);
+    process.exit(1);
+  }
+  let removedStateDir = false;
+  try {
+    await rm(harnessedRoot, { recursive: true, force: true });
+    removedStateDir = true;
+  } catch (e) {
+    failures.push(`${harnessedRoot}: ${e.message}`);
+  }
+  if (removedCommands > 0)
+    console.log(t("uninstall.unified.removed_commands", { count: removedCommands }));
+  if (removedSkills > 0)
+    console.log(t("uninstall.unified.removed_skills", { count: removedSkills }));
+  if (removedSettings) console.log(t("uninstall.unified.removed_settings"));
+  if (removedStateDir) console.log(t("uninstall.unified.removed_state_dir"));
+  if (failures.length > 0) {
+    console.error(t("uninstall.unified.partial_failure", { count: failures.length }));
+    for (const f of failures) console.error(`  ${f}`);
+  }
+  console.log(t("uninstall.unified.complete"));
+  process.exit(0);
+}
 function registerUninstall(program2) {
-  program2.command("uninstall <name>").description("Uninstall an upstream (immediate by default \u2014 use --dry-run for preview)").option("--dry-run", "preview only \u2014 do not delete files (opt-in for advanced users)").option("--yes", "skip interactive confirm (CI / scripts) \u2014 fatal with --dry-run").option("--non-interactive", "alias for --yes (CI compat)").action(async (name, raw) => {
-    const yes = raw.yes === true || raw.nonInteractive === true;
-    if (yes && raw.dryRun) {
-      console.error(
-        `${t("uninstall.yes_dryrun_conflict")}
-${t("uninstall.yes_dryrun_conflict.fix", { name })}`
-      );
-      process.exit(2);
+  program2.command("uninstall [name]").description(
+    "Uninstall an upstream by name, or remove all harnessed own files when no name given"
+  ).option("--dry-run", "preview only \u2014 do not delete files").action(async (name, raw) => {
+    const dryRun = raw.dryRun === true;
+    if (!name) {
+      await runUnifiedUninstall(homedir(), dryRun);
+      return;
     }
     const { resolveAlias: resolveAlias2 } = await Promise.resolve().then(() => (init_aliases(), aliases_exports));
     const resolvedName = resolveAlias2(name) ?? name;
     checkPathSafe(resolvedName);
     const manifestPath = resolve(getPackageRoot(), `manifests/tools/${resolvedName}.yaml`);
-    const skillPackPath = resolve(getPackageRoot(), `manifests/skill-packs/${resolvedName}.yaml`);
+    const skillPackPath = resolve(
+      getPackageRoot(),
+      `manifests/skill-packs/${resolvedName}.yaml`
+    );
     let yamlSrc;
     let chosenPath = manifestPath;
     try {
@@ -6652,25 +6824,25 @@ ${t("install.manifest_not_found.fix", { name: resolvedName })}`
       for (const e of v.errors) console.error(`error: ${e.message} at ${e.path}`);
       process.exit(1);
     }
-    const method = v.manifest.spec.install.method;
-    const dryRun = raw.dryRun === true;
     if (dryRun) {
-      console.log(t("uninstall.dry_run.preview", { name: resolvedName, method }));
+      console.log(
+        t("uninstall.dry_run.preview", {
+          name: resolvedName,
+          method: v.manifest.spec.install.method
+        })
+      );
       console.log(t("uninstall.dry_run.run_hint"));
       process.exit(2);
     }
-    if (!yes) {
-      const answer = await p.confirm({
-        message: t("uninstall.confirm.prompt", { name: resolvedName }),
-        initialValue: false
-      });
-      if (p.isCancel(answer) || answer === false) {
-        console.error(t("uninstall.cancelled"));
-        process.exit(2);
-      }
+    const answer = await p.confirm({
+      message: t("uninstall.confirm.prompt", { name: resolvedName }),
+      initialValue: false
+    });
+    if (p.isCancel(answer) || answer === false) {
+      console.error(t("uninstall.cancelled"));
+      process.exit(2);
     }
-    const opts = { apply: true, dryRun: false, yes };
-    const result = await runUninstall(v.manifest, opts);
+    const result = await runUninstall(v.manifest, { apply: true, dryRun: false, yes: true });
     if ("aborted" in result) {
       console.error(t("install.aborted", { reason: result.reason }));
       process.exit(2);