wkappbot-code 0.3.20 → 0.3.22

package/bin/wkappbot-code.js

@@ -205,6 +205,13 @@ function installBin(o) {
   // need no core and still refuse the risky classes, but the install reports the missing core as a FAILED part (0.3.13).
   if (r.status === 3) return { ok: false, degraded: true, dest, note: "core not fetched (release host unreachable); hooks + lite harness run without it -- rerun wkappbot-code install once github.com is reachable" };
   if (r.status !== 0) return { ok: false, dest, note: "wk-bin-acquire rc " + r.status };
+  // Core recognizes this marker beside the actual executable; no Core rebuild needed.
+  if (IS_WIN) {
+    const core = join(target, "wkappbot-core.exe");
+    if (!existsSync(core)) return { ok: false, dest, note: "Windows core missing after acquire: " + core };
+    try { writeFileSync(join(target, ".wkappbot-code-install"), "wkappbot-code npm install\n"); }
+    catch (e) { return { ok: false, dest, note: "npm license marker: " + e.message }; }
+  }
   // Put `wkappbot` on PATH beside wkappbot-code itself, unless that name is already taken by someone else.
   let link = "";
   const ld = linkDir();
@@ -571,6 +578,12 @@ function uninstall(o) {
     if (body.includes(core)) { rmSync(cmdShim, { force: true }); linkRemoved = cmdShim; log("shim: removed " + cmdShim + " (it called the core this install placed)"); }
     else log("shim: kept " + cmdShim + " (it no longer calls " + core + ")");
   }
+  // Undo only our npm license marker; do not alter a marker owned by another installer.
+  if (IS_WIN && st.bin?.ok) {
+    const marker = join(dirname(core), ".wkappbot-code-install");
+    try { if (existsSync(marker) && readFileSync(marker, "utf8") === "wkappbot-code npm install\n") { rmSync(marker); log("bin: removed npm license marker " + marker); } }
+    catch (e) { rc = 1; log("bin: could not remove npm license marker (" + e.message + ")"); }
+  }
   // 3d. the AI CLIs this install added (lib/ai-clis.js), never one the user had before
   removeAiClis((st.aiClis && st.aiClis.installed) || [], log, process.env, undefined, (st.aiClis && st.aiClis.prefix) || "");
   // 4. the harness dirs we created, the plugin entry and our config folder
@@ -578,6 +591,7 @@ function uninstall(o) {
   const rmTree = (p, what) => {
     const r = rmTreeHard(p); if (r.ok) { if (what) log(what + ": removed " + p); return; }
     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)); }
   };
   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");

package/lib/python-acquire.js

@@ -10,7 +10,7 @@
 // Spec: wkappbot skill read harness-installer-owns-all-setup
 import { spawnSync } from "node:child_process";
 import { createHash } from "node:crypto";
-import { copyFileSync, existsSync, mkdirSync, readFileSync, readdirSync } from "node:fs";
+import { copyFileSync, existsSync, mkdirSync, readFileSync, readdirSync, unlinkSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
 import { pickPython, stubWarning } from "./python-pick.js";
@@ -58,13 +58,13 @@ function setUserPath(dir, run, env) {
 export function ensurePython(o = {}) {
   const env = o.env || process.env, log = o.log || (() => {}), run = o.run || realRun;
   const platform = o.platform || process.platform, exists = o.exists || existsSync, list = o.list || readdirSync;
-  const home = o.home || homedir(), read = o.read || readFileSync;
+  const home = o.home || homedir(), read = o.read || readFileSync, EMB = o.embed || EMBED;
   const report = (ok, msg, extra = {}) => { log((ok ? "OK python " : "FAIL python: ") + msg); return { ok, note: msg, ...extra }; };
   try {
     let p = pickPython({ env, run: o.probeRun });
     const warn = stubWarning(p.stubs);
     if (p.cmd) {
-      const v = run(p.cmd, [...p.args, "-c", "import sys;print(sys.version.split()[0]);print(sys.executable)"], env, { shell: platform === "win32" });
+      const v = run(p.cmd, [...p.args, "-c", "import sys;print(sys.version.split()[0]);print(sys.executable)"], env);  // no shell: see python-pick.js
       const [ver, exe] = String((v && v.stdout) || "").trim().split(/\r?\n/);
       return report(true, (ver || "3") + " " + (exe || p.cmd), { cmd: p.cmd, args: p.args, via: "present" });
     }
@@ -81,12 +81,18 @@ export function ensurePython(o = {}) {
     if (!dir) {
       const target = join(home, ".wk-harness", "python"), zip = join(home, ".wk-harness", "python-embed.zip");
       mkdirSync(target, { recursive: true });
-      const dl = run("curl", ["-fsSL", "--retry", "6", "--retry-delay", "5", "-m", "300", "-o", zip, EMBED.url], env);
-      if (!dl || dl.status !== 0) return report(false, "winget gave no Python and the download of " + EMBED.url + " failed (curl rc " + (dl ? dl.status : "?") + ")", { via: "none" });
+      const dl = run("curl", ["-fsSL", "--retry", "6", "--retry-delay", "5", "-m", "300", "-o", zip, EMB.url], env);
+      if (!dl || dl.status !== 0) return report(false, "winget gave no Python and the download of " + EMB.url + " failed (curl rc " + (dl ? dl.status : "?") + ")", { via: "none" });
       const sum = createHash("sha256").update(read(zip)).digest("hex");
-      if (sum !== EMBED.sha256) return report(false, "the embeddable zip sha256 " + sum + " is not the pinned " + EMBED.sha256, { via: "none" });
-      const ux = run("tar", ["-xf", zip, "-C", target], env);
-      if (!ux || ux.status !== 0) return report(false, "could not unpack " + zip + " (tar rc " + (ux ? ux.status : "?") + ")", { via: "none" });
+      if (sum !== EMB.sha256) return report(false, "the embeddable zip sha256 " + sum + " is not the pinned " + EMB.sha256, { via: "none" });
+      // Windows: the bsdtar in System32 reads a zip; the GNU tar of Git Bash, first on PATH there, cannot (rc 128, 0.3.20)
+      const tarExe = platform === "win32" ? join(env.SystemRoot || env.windir || "C:\\Windows", "System32", "tar.exe") : "tar";
+      let ux = run(tarExe, ["-xf", zip, "-C", target], env);
+      if ((!ux || ux.status !== 0) && platform === "win32")
+        ux = run("powershell.exe", ["-NoProfile", "-NonInteractive", "-Command", "Expand-Archive -Force -LiteralPath $env:WK_ZIP -DestinationPath $env:WK_DEST"], { ...env, WK_ZIP: zip, WK_DEST: target });
+      if (!ux || ux.status !== 0) return report(false, "could not unpack " + zip + " (" + tarExe + " rc " + (ux ? ux.status : "?") + ")", { via: "none" });
+      // the zip's pythonXY._pth keeps the script folder off sys.path, so harness scripts could not import their siblings
+      try { for (const n of list(target)) if (/^python\d*\._pth$/i.test(n)) (o.unlink || unlinkSync)(join(target, n)); } catch {}
       dir = target; via = "embed";
     }
     // 3. a python3.exe beside python.exe (winget and the zip ship only python.exe, so `python3` would still hit the

package/lib/python-pick.js

@@ -8,10 +8,17 @@
 import { spawnSync } from "node:child_process";
 
 export const CANDIDATES = [["python3"], ["python"], ["py", "-3"]];
+// Windows asks python and py -3 first: python.org and tool-cache installs ship python.exe with no python3.exe, so
+// python3 there is usually the WindowsApps stub (spokesman order 2026-11-10).
+export const candidatesFor = (platform) => (platform === "win32" ? [["python"], ["py", "-3"], ["python3"]] : CANDIDATES);
 const PROBE = ["-c", "import sys;print(sys.version_info[0])"];
 const STORE_RE = /Microsoft Store|WindowsApps|app execution alias/i;
 
-const realRun = (cmd, args, env) => spawnSync(cmd, args, { encoding: "utf8", env, timeout: 15000, shell: process.platform === "win32", windowsHide: true });
+// NEVER a shell: on win32 shell:true handed the probe to cmd.exe unquoted, so the ";" and "(" of -c broke it and every
+// REAL Python failed (0.3.20, SDK os-qa 42730232937 win-x64). Node finds python.exe and py.exe on PATH by itself, and
+// a WindowsApps stub still runs and exits 9009.
+export const spawnOpts = (env, timeout = 15000) => ({ encoding: "utf8", env, timeout, shell: false, windowsHide: true });
+const realRun = (cmd, args, env) => spawnSync(cmd, args, spawnOpts(env));
 
 // -> { cmd, args, stubs: [names] } ; cmd "" when no working Python 3 exists.
 export function pickPython(o = {}) {
@@ -20,7 +27,7 @@ export function pickPython(o = {}) {
     const r = run(env.PYTHON_CMD, PROBE, env);
     if (r && r.status === 0 && String(r.stdout || "").trim() === "3") return { cmd: env.PYTHON_CMD, args: [], stubs };
   }
-  for (const [cmd, ...pre] of CANDIDATES) {
+  for (const [cmd, ...pre] of candidatesFor(o.platform || process.platform)) {
     const r = run(cmd, [...pre, ...PROBE], env);
     if (!r) continue;
     const out = String(r.stdout || "") + String(r.stderr || "");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wkappbot-code",
-  "version": "0.3.20",
+  "version": "0.3.22",
   "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": {