wkappbot-code 0.3.27 → 0.3.29

package/bin/wkappbot-code.js

@@ -41,7 +41,7 @@ import {
 import { homedir, tmpdir } from "node:os";
 import { dirname, isAbsolute, join, relative, resolve } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
-import { quietCheck, runUpdate, updateRow } from "../lib/update.js"; import { rmTreeHard } from "../lib/rmtree.js"; import { plainFileUrl } from "../lib/fileurl.js"; import { removeStaleWkskill } from "../lib/stale-wkskill.js"; import { checkPath, installBothLinks, removeCreatedLinks } from "../lib/doctor-path.js";
+import { quietCheck, runUpdate, updateRow } from "../lib/update.js"; import { rmTreeHard, waitForArchive } from "../lib/rmtree.js"; import { plainFileUrl } from "../lib/fileurl.js"; import { removeStaleWkskill } from "../lib/stale-wkskill.js"; import { checkPath, installBothLinks, removeCreatedLinks } from "../lib/doctor-path.js";
 import { applySets, askEach, buildConfig, configRow, detect, lineDiff, printDetected } from "../lib/config.js";
 import { aiCliRows, installAiClis, removeAiClis } from "../lib/ai-clis.js";
 import { providerCli, providerRow } from "../lib/providers.js";
@@ -380,15 +380,16 @@ function installPlugin(o, kih, kihSource) {
     const side = join(dirname(target), "wkappbot-code.json");
     writeFileSync(side, JSON.stringify(buildConfig({}, it, tmpl), null, 2) + "\n");
     log(target + " is not plain JSON; left untouched, wrote " + side + " -- merge its plugin entry by hand");
-    return;
+    return null;
   }
   const text = JSON.stringify(buildConfig(user, it, tmpl), null, 2) + "\n";
-  let note = "";
+  let note = "", backup = null;   // backup: the opencode.json copy THIS install takes; install records it, uninstall removes exactly that (0.3.29)
   if (raw && text === raw) note = " (unchanged)";
   else {
     if (raw) {
       const bak = target + ".bak-" + stamp();
       copyFileSync(target, bak);
+      backup = bak;
       note = " (merged; backup " + bak + ")";
     }
     for (const l of lineDiff(raw, text)) log("diff " + l);
@@ -397,14 +398,16 @@ function installPlugin(o, kih, kihSource) {
   }
   log("plugin: " + url);
   log("config: " + target + note);
+  return backup;
 }
 
 // The machine state an uninstall must give back, recorded ONCE (a re-install never overwrites the first record, or
 // it would record our own dispatcher as the "prior" hooksPath). Shim paths are those install may create.
 function shimCandidates() {
-  return [join(linkDir(), "wkappbot"), join(linkDir(), "wkappbot-core"), join(HARNESS_LINKS(), "wk-verify"), join(HARNESS_LINKS(), "wk-verify.cmd")];   // wkappbot-core: the harness install.sh links it beside wkappbot (SDK e2e nopwsh u1: local-bin= vs local-bin=wkappbot-core)   // Windows (Git Bash) .cmd twins from harness-install.sh: recorded like the rest, so uninstall removes them, never a user file
+  return [join(linkDir(), "wkappbot"), join(linkDir(), "wkappbot-core"), join(linkDir(), "wkappbot.cmd"), join(linkDir(), "wkappbot-core.cmd"), join(HARNESS_LINKS(), "wk-verify"), join(HARNESS_LINKS(), "wk-verify.cmd")];   // wkappbot-core: the harness install.sh links it beside wkappbot (SDK e2e nopwsh u1: local-bin= vs local-bin=wkappbot-core)   // Windows (Git Bash) .cmd twins from harness-install.sh: recorded like the rest, so uninstall removes them, never a user file
 }
 const PRE_SETTINGS = () => join(STATE_HOME(), "settings.pre-install.json");
+function settingsBackup() { const bak = SETTINGS() + ".bak-" + stamp(); copyFileSync(SETTINGS(), bak); log("settings: backup " + bak); return bak; }
 function recordPrior(prev) {
   if (prev && prev.prior) return prev.prior;
   // The user's settings.json as it was, byte for byte: uninstall gives these bytes back when nothing else changed.
@@ -433,6 +436,8 @@ function install(o) {
   let bad = 0;
   // 0.3.13 (owner 2026-11-09: Git Bash is a required tool too): bash, sh, curl, tar and git first; on Windows a Git that
   // is not on PATH is used from its folder, and a missing one is installed with winget (lib/prereq.js)
+  // 0.3.29 (2026-11-12, spokesman order after SDK gate run 43227049219): uninstall waits (bounded 15 s) for a RECORDED archive pid before it removes the harness copy (lib/rmtree.js waitForArchive; the detached archive child starts from cwd / with the script fd closed), so no EPERM on .claude/hooks/wkharness-run.sh; install records st.opencodeBackups and uninstall leaves no opencode.json.bak-<stamp> of its own.
+  // 0.3.28 (owner 2026-11-12 via the spokesman): uninstall removes only the settings backup the install recorded (st.settingsBackup); the .cmd twins of the core links are shim candidates; the clean-baseline guard no longer reads --model of non-delegating commands; doctor sets process.exitCode.
   st.prereq = ensurePrereqs({ log });
   if (!st.prereq.ok) bad++;
   // 0.3.20 (owner 2026-11-09): a real Python before any step runs python -- the Store alias stub made install exit 49
@@ -466,6 +471,8 @@ function install(o) {
   const kih = (st.harness.mode === "web" && st.harness.ok) ? st.harness.dir : kihDir(o);
   // 0.3.13 (owner 2026-11-09): read the Claude settings first, then point every harness hook at the SAME harness the
   // plugin uses, on both roads (web harness or checkout); the user's own hooks stay; bad JSON is reported, not touched.
+  // the one settings.json copy install takes before it edits the file: uninstall removes this recorded copy and no other
+  st.settingsBackup = prev.settingsBackup || (o.harness && existsSync(SETTINGS()) ? settingsBackup() : null);
   st.hooks = o.harness ? wireClaudeHooks({ settings: SETTINGS(), kih, pwsh: !!ps, log }) : { skipped: true };
   // the compressed allow list (lib/allow-compact.js): five harness-own prefixes, never the wide rows learned on the owner's seats
   st.allows = (o.harness && o.allows) ? addAllows(SETTINGS(), prev.allows || {}, log) : (prev.allows || { skipped: true });
@@ -480,7 +487,8 @@ function install(o) {
   }
   st.skills = o.skills ? installSkills(o, dest) : { skipped: true };
   if (o.skills && !st.skills.ok) { bad++; log("skills: FAILED -- " + (st.skills.note || "on-load missing from the HQ")); }
-  installPlugin(o, kih, (st.harness.mode === "web" && st.harness.ok) ? "web harness" : "harness checkout");
+  // 0.3.29: the opencode.json copy a merge takes is recorded (like st.settingsBackup); uninstall removes exactly the recorded copies, never a user's own .bak-*
+  { const ob = installPlugin(o, kih, (st.harness.mode === "web" && st.harness.ok) ? "web harness" : "harness checkout"); st.opencodeBackups = [...(prev.opencodeBackups || []), ...(ob ? [ob] : [])]; }
   st.kihDir = kih;
   // The shims this install created (absent before, present now): uninstall removes exactly these.
   st.shims = [...new Set([...(prev.shims || []), ...shimCandidates().filter((p) => (existsSync(p) || isSymlink(p)) && !st.prior.shimsExisting.includes(p))])];
@@ -546,7 +554,6 @@ function uninstall(o) {
         }
       }
       if (removed || restored) {
-        copyFileSync(sp, sp + ".bak-" + stamp());
         if (pr.settingsExisted === false && !Object.keys(d).length) { rmSync(sp); log("settings: removed " + sp + " (it did not exist before install)"); }
         else {
           const same = pre && JSON.stringify(sortKeys(pre)) === JSON.stringify(sortKeys(d));
@@ -557,6 +564,8 @@ function uninstall(o) {
       } else log("settings: no harness hook in " + sp);
     } catch (e) { rc = 1; log("settings: " + sp + " is not plain JSON, left untouched (" + e.message + ")"); }
   }
+  // the settings copy install recorded (only that one) goes with the uninstall; a user's own settings.json.bak-* stays
+  if (st.settingsBackup && existsSync(st.settingsBackup)) { rmSync(st.settingsBackup, { force: true }); log("settings: removed the backup install recorded, " + st.settingsBackup); }
   // 3. the shims install created
   for (const p of st.shims || []) {
     if (isSymlink(p) || existsSync(p)) { rmSync(p, { force: true }); log("shim: removed " + p); }
@@ -595,6 +604,8 @@ function uninstall(o) {
     rc = 1; log((what || "remove") + ": could not remove " + p + " -- blocked by " + r.blockers.slice(0, 5).join("; ") + " -- delete it by hand");
     if (IS_WIN) { const d = spawnSync("tasklist.exe", ["/v"], { encoding: "utf8", timeout: 15000 }); log("remove diagnostics (process list, not file owners): " + String(d.stdout || d.stderr || "").slice(0, 4000)); }
   };
+  // (B) the detached per-turn archive child may still hold .claude/hooks/wkharness-run.sh (Windows EPERM): wait for its RECORDED pid first.
+  if (existsSync(HARNESS_DIR())) { const w = waitForArchive(HARNESS_DIR()); if (w.waited) log("harness: waited " + w.waited + " ms for the archive child" + (w.alive.length ? " (pid " + w.alive.join(",") + " still running)" : "")); }
   if (st.harness && st.harness.mode === "web" && pr.harnessDirExisted !== true && existsSync(HARNESS_DIR())) rmTree(HARNESS_DIR(), "harness");
   if (pr.hooksDirExisted !== true && existsSync(HOOKS_DIR())) rmTree(HOOKS_DIR(), "push-gate");
   const cfgFile = join(configDir(o), "opencode.json");
@@ -602,12 +613,14 @@ function uninstall(o) {
     const c = JSON.parse(readFileSync(cfgFile, "utf8"));
     const keep = (c.plugin || []).filter((p) => !String(Array.isArray(p) ? p[0] : p).includes("wisdom-kernel"));
     if (keep.length !== (c.plugin || []).length) {
-      copyFileSync(cfgFile, cfgFile + ".bak-" + stamp());
+      // 0.3.29 (spokesman ruling 2026-11-12): no backup of OUR OWN edit -- it left an opencode.json.bak-<stamp> behind. Only our entry goes.
       if (keep.length) c.plugin = keep; else delete c.plugin;
       writeFileSync(cfgFile, JSON.stringify(c, null, 2) + "\n");
       log("config: plugin entry removed from " + cfgFile);
     }
   } catch {}
+  // the opencode.json copies install recorded (and only those) go with the uninstall; a user's own opencode.json.bak-* stays
+  for (const b of (st.opencodeBackups || [])) { try { if (existsSync(b)) { rmSync(b, { force: true }); log("config: removed the backup install recorded, " + b); } } catch (e) { log("config: could not remove " + b + " (" + e.message + ")"); } }
   rmTree(STATE_HOME());
   rmTree(join(configDir(o), "wkappbot-code"));
   log("uninstall done." + (linkRemoved ? " Removed the link " + linkRemoved + "." : "") + " Kept: opencode-ai, the wkappbot core (" + core + ") and its skills, and this CLI (npm rm -g wkappbot-code)");
@@ -730,7 +743,7 @@ switch (o.cmd) {
     console.log("wkappbot-code " + PKG.version + " (opencode-ai " + OPENCODE_VERSION + ")"); process.exit(0);
   case "install": process.exit(install(o));
   case "uninstall": process.exit(uninstall(o));
-  case "doctor": process.exit(doctor(o));
+  case "doctor": process.exitCode = doctor(o); break;
   case "update": process.exit(upd());
   case "config": installPlugin(o, kihDir(o), kihCheckout(o) ? "harness checkout" : "web harness"); process.exit(0);
   default:

package/lib/fileurl.js

@@ -1,4 +1,5 @@
 // fileurl.js -- a file:// base that curl can open on every platform.
+// VERIFIED 2026-11-12 (kih ROOT 3): selftest-rmtree.mjs case r4 (plainFileUrl decodes %7E to ~, an https base is untouched) PASS in RESULT 8/8.
 // pathToFileURL percent-encodes "~" ("RUNNER~1" -> "RUNNER%7E1") and Windows curl does not decode a file:// path, so a
 // Windows profile with a short name, a space or a non-ASCII letter failed to read the harness. plainFileUrl hands curl the plain path.
 import { fileURLToPath } from "node:url";

package/lib/rmtree.js

@@ -1,10 +1,32 @@
 // rmtree.js -- delete a tree on a platform that releases a just-closed handle late (Windows: EBUSY/EPERM/ENOTEMPTY).
 // rmTreeHard(p, rm) -> { ok, blockers[] }: a long bounded retry first, then a per-entry pass that names what stays.
-import { existsSync, lstatSync, readdirSync, rmSync } from "node:fs";
+import { existsSync, lstatSync, readdirSync, readFileSync, rmSync } from "node:fs";
 import { join } from "node:path";
 
 const sleepMs = (ms) => { try { Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms); } catch { /* no wait available */ } };
 
+// waitForArchive(harnessDir, opts) -> { waited, alive[] }: the detached per-turn archive child (tools/wk-hippo-archive.sh) records its
+// pid in <harnessDir>/.tmp/hippo-archive/archive-SID.pid and removes it on exit. A Windows uninstall that runs inside that child's
+// lifetime hits EPERM on .claude/hooks/wkharness-run.sh, so uninstall waits (bounded) for every RECORDED pid to leave first.
+// isAlive and sleep are injectable so the selftest fakes a held handle. A pid file whose pid is dead is stale and ignored.
+const defaultAlive = (pid) => { try { process.kill(pid, 0); return true; } catch (e) { return !!e && e.code === "EPERM"; } };
+export function waitForArchive(harnessDir, opts = {}) {
+  const isAlive = opts.isAlive || defaultAlive, maxMs = opts.maxMs ?? 15000, gap = opts.gap || 250, nap = opts.sleep || sleepMs;
+  const dir = join(harnessDir, ".tmp", "hippo-archive");
+  const pids = () => {
+    let names = []; try { names = readdirSync(dir).filter((n) => /\.pid$/.test(n)); } catch { return []; }
+    const out = [];
+    for (const n of names) {
+      let pid = 0; try { pid = parseInt(String(readFileSync(join(dir, n), "utf8")).trim(), 10); } catch { /* unreadable */ }
+      if (pid > 0 && isAlive(pid)) out.push(pid);
+    }
+    return out;
+  };
+  let alive = pids(), waited = 0;
+  while (alive.length && waited < maxMs) { nap(gap); waited += gap; alive = pids(); }
+  return { waited, alive };
+}
+
 // rm is injectable so the selftest can fake a held handle (default: fs.rmSync with Node's own retry)
 export function rmTreeHard(p, rm = (q, o) => rmSync(q, o), opts = {}) {
   const tries = opts.tries || 6, gap = opts.gap || 1000;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wkappbot-code",
-  "version": "0.3.27",
+  "version": "0.3.29",
   "description": "wkappbot-code -- Wisdom Kernel: the pinned OpenCode bridge plus the reflex harness plugin, the wkappbot core, the web harness and the latest public skills in one install",
   "type": "module",
   "scripts": {