geneseed 3.1.0 → 3.1.2

package/js/{uninstall.mjs → maintain/uninstall.mjs}

@@ -35,11 +35,11 @@
  * `move` where it has `unlink`, plus an inverse; splitting them would have duplicated the
  * owned-file walk and the ancestor prune a fourth time.
  *
- * NO SPAWN. `bin/geneseed-cli.mjs`'s `child_process` allow-list names `js/doctor.mjs` and one
- * argv, and this module does not extend it: every operation here is a filesystem call. That
- * matters more than usual for this verb — shelling the uninstall out to a Python interpreter
- * would be byte-identical in every cell of the matrix, and the allow-list plus
- * `test_uninstall_removes_an_install_with_no_python_on_path` are what refute it.
+ * NO SPAWN. `ALLOWED_SPAWNS` in `tests/unit/hook_cli.test.mjs` is the table of every module
+ * allowed to reach `child_process` and the argv each may use; this module has no row and
+ * does not want one, because every operation here is a filesystem call. That matters more
+ * than usual for this verb: shelling the uninstall out to an interpreter would have been
+ * byte-identical in every cell of the matrix, so only the allow-list refutes it.
  */
 import {
   existsSync, lstatSync, mkdirSync, readdirSync, renameSync, rmSync, rmdirSync, statSync,
@@ -47,25 +47,25 @@ import {
 } from 'node:fs';
 import path from 'node:path';
 
-import { hookRunnerEntry } from '../bin/geneseed.mjs';
+import { hookRunnerEntry } from '../../bin/build-driver.mjs';
 import { confirm } from './setup.mjs';
 import {
-  claudeCfg, claudeReadManifest, doctrinesOfDir, emitHostScopeOf, installKind, installState,
+  claudeCfg, claudeReadManifest, doctrinesOfDir, emitHostScopeOf, excludedRulesOfDir, installKind,
+  installState,
   registeredTargets, readMaybe, DISABLED_STASH,
-} from './installs.mjs';
+} from '../hosts/installs.mjs';
 import {
-  GLOBAL_MANIFEST, HOSTS, VERSION_MARKER, expanduser, opencodeConfigDir, pyResolve,
-} from './hosts.mjs';
-import { mcpCommented } from './mcp.mjs';
+  GLOBAL_MANIFEST, HOSTS, VERSION_MARKER, expanduser, opencodeConfigDir, resolvePath,
+} from '../hosts/hosts.mjs';
+import { mcpCommented } from '../hosts/mcp.mjs';
 import {
   managedBlockRead, managedBlockRemove, managedBlockWrite, mergeClaudeSettings,
   opencodeTarget, readJsonc, settingsIntegrityCheck, wireClaudeExcludes,
   unwireClaudeExcludes, unwireClaudeSettings,
-} from './settings.mjs';
-import {
-  comparePaths, indexOfEq, jsonDumps, jsonDumpsIndent, pyEq, pyIsAbsolute, pyPrint,
-  pyPrintErr, readText, within, writeText,
-} from './lib/fs.mjs';
+} from '../hosts/settings.mjs';
+import { printOut, printErr, readText, writeText } from '../lib/fs.mjs';
+import { indexOfDeepEqual, jsonDumps, jsonDumpsIndent, deepEquals } from '../lib/json.mjs';
+import { comparePaths, isAbsolutePath, within } from '../lib/paths.mjs';
 
 const isDir = (p) => { try { return statSync(p).isDirectory(); } catch { return false; } };
 const isFile = (p) => { try { return statSync(p).isFile(); } catch { return false; } };
@@ -172,7 +172,7 @@ function unlinkOwned(base, owned, label = '') {
       // `f"{rel} ({e})"`. `str(OSError)` and an `Error.message` word the same fault
       // differently, and no cell can reach this: it needs a file that exists, is a file, and
       // cannot be unlinked. Recorded rather than papered over — the same standing item
-      // `js/excludes.mjs` carries for its `could not remove <stub>` branch.
+      // `js/inspect/excludes.mjs` carries for its `could not remove <stub>` branch.
       failed.push(`${label}${rel} (${e && e.message ? e.message : e})`);
     }
   }
@@ -181,12 +181,12 @@ function unlinkOwned(base, owned, label = '') {
 
 /** The two WARNs every reversal prints when an owned file survives. Identical in all three. */
 function warnSurvivors(failed) {
-  pyPrintErr('[uninstall] WARN: could not remove '
+  printErr('[uninstall] WARN: could not remove '
     + `${failed.length} owned file(s): ${failed.join(', ')}\n`);
 }
 
 function warnMarkersKept() {
-  pyPrintErr('[uninstall] WARN: the manifest and markers were KEPT so '
+  printErr('[uninstall] WARN: the manifest and markers were KEPT so '
     + '`geneseed uninstall` can be retried once the file(s) are '
     + 'unlocked/removable.\n');
 }
@@ -215,7 +215,7 @@ export function unmergeOpencodeJson(p, entry) {
   const instr = cfg.instructions;
   if (!Array.isArray(instr) || !instr.includes(entry)) return false;
   if (path.extname(target) === '.jsonc' && hadComments) {
-    pyPrint(`[uninstall] ${path.basename(target)} has comments — not rewriting it. Remove `
+    printOut(`[uninstall] ${path.basename(target)} has comments — not rewriting it. Remove `
       + `this from its "instructions" by hand: ${jsonDumps(entry)}\n`);
     return false;
   }
@@ -264,7 +264,7 @@ function settingsFile(cfg, managed) {
 /** `_harness_mcp._claude_md_path` — where the manifest says the managed block lives. */
 function claudeMdPath(cfg, managed) {
   const rel = ((managed && managed.claude_md) || {}).rel || 'CLAUDE.md';
-  return pyResolve(path.join(cfg, rel));
+  return resolvePath(path.join(cfg, rel));
 }
 
 /** A manifest's `managed` map, or `{}` — the Python's `isinstance(..., dict)` guard. */
@@ -360,7 +360,7 @@ function mcpLoadOpencode(p) {
  *
  * A global install wires the ABSOLUTE posix path; a project install wires the relative
  * `…/AGENT.md` the emit recorded, read back off the live config so a bundle sub-dir layout
- * round-trips. `pyIsAbsolute` and not `path.isAbsolute`: they disagree on Windows for a
+ * round-trips. `isAbsolutePath` and not `path.isAbsolute`: they disagree on Windows for a
  * ROOTLESS `/repo/AGENT.md`, which Python keeps and `path.isAbsolute` would have skipped.
  */
 export function installAgentEntry(root, kind) {
@@ -382,7 +382,7 @@ export function installAgentEntry(root, kind) {
 export function installAgentEntryOf(instr) {
   if (Array.isArray(instr)) {
     for (const e of instr) {
-      if (typeof e === 'string' && !pyIsAbsolute(e) && path.basename(e) === 'AGENT.md') return e;
+      if (typeof e === 'string' && !isAbsolutePath(e) && path.basename(e) === 'AGENT.md') return e;
     }
   }
   return 'AGENT.md';
@@ -508,7 +508,7 @@ export function installUninstall(root, host = 'opencode', scope = 'global', memo
   if (survivors.length || failed.length) {
     if (survivors.length && !failed.length) {
       // With `failed` set the reversal already warned twice — no third overlapping WARN.
-      pyPrintErr('[uninstall] WARN: could not fully remove the install — still present: '
+      printErr('[uninstall] WARN: could not fully remove the install — still present: '
         + `${survivors.join(', ')}. The install marker was KEPT so you can retry `
         + '`geneseed uninstall` once the file(s) are unlocked/removable.\n');
     }
@@ -544,7 +544,7 @@ export function projectQualifies(root, host) {
   const cfg = path.join(root, spec.projectMarker);
   if (!isDir(cfg)) return false;
   try {
-    if (pyResolve(cfg) === pyResolve(spec.configDir())) return false;
+    if (resolvePath(cfg) === resolvePath(spec.configDir())) return false;
   } catch { /* as the Python's bare `except Exception: pass` */ }
   if (isFile(path.join(cfg, GLOBAL_MANIFEST))) return true;
   const hs = emitHostScopeOf(root);
@@ -568,7 +568,7 @@ export function uninstallResolve(targetArg) {
   const globalHit = (p) => {
     for (const spec of HOSTS) {
       try {
-        if (p === pyResolve(spec.configDir())) return [spec.host, 'global', p];
+        if (p === resolvePath(spec.configDir())) return [spec.host, 'global', p];
       } catch { continue; }
     }
     return null;
@@ -580,7 +580,7 @@ export function uninstallResolve(targetArg) {
     return null;
   };
   if (targetArg) {
-    const p = pyResolve(expanduser(targetArg));
+    const p = resolvePath(expanduser(targetArg));
     const hit = globalHit(p);
     if (hit) return hit;
     for (const spec of HOSTS) {
@@ -594,7 +594,7 @@ export function uninstallResolve(targetArg) {
   // `.resolve()` so the cwd fallback matches every other branch and the registry, which
   // stores resolved paths — a short-form (8.3) cwd, as Windows CI hands back for %TEMP%,
   // would otherwise return a root that LOOKS different from the identical directory.
-  const hit = projectHit(pyResolve(process.cwd()));
+  const hit = projectHit(resolvePath(process.cwd()));
   if (hit) return hit;
   return ['opencode', 'global', opencodeConfigDir()];
 }
@@ -608,11 +608,11 @@ export function uninstallResolve(targetArg) {
  * rediscovered from, and the just-removed root is excluded.
  */
 export function survivingProjectInstalls(removedRoot) {
-  const rroot = pyResolve(removedRoot);
+  const rroot = resolvePath(removedRoot);
   const out = [];
   for (const [host, scope, root] of registeredTargets()) {
     if (scope !== 'project') continue;
-    try { if (pyResolve(root) === rroot) continue; } catch { /* as the Python's except OSError */ }
+    try { if (resolvePath(root) === rroot) continue; } catch { /* as the Python's except OSError */ }
     out.push([host, scope, root]);
   }
   return out;
@@ -622,10 +622,10 @@ export function survivingProjectInstalls(removedRoot) {
 export function printSurvivingProjectInventory(removedRoot) {
   const survivors = survivingProjectInstalls(removedRoot);
   if (!survivors.length) return;
-  pyPrint(`[uninstall] ${survivors.length} project install(s) remain — the global removal `
+  printOut(`[uninstall] ${survivors.length} project install(s) remain — the global removal `
     + 'does not affect them (each is self-contained):\n');
   for (const [host, scope, root] of survivors) {
-    pyPrint(`  - ${root} (${host}:${scope}) — remove with: `
+    printOut(`  - ${root} (${host}:${scope}) — remove with: `
       + `geneseed uninstall --target "${root}" --yes\n`);
   }
 }
@@ -639,8 +639,8 @@ export function printSurvivingProjectInventory(removedRoot) {
 export function printOtherHostHits(root, removedHost) {
   for (const spec of HOSTS) {
     if (spec.host !== removedHost && projectQualifies(root, spec.host)) {
-      pyPrint(`[uninstall] also found ${spec.host}:project here — run \`harness `
-        + 'uninstall\` again to remove it.\n');
+      printOut(`[uninstall] also found ${spec.host}:project here — run \`harness `
+        + 'uninstall` again to remove it.\n');
     }
   }
 }
@@ -648,7 +648,7 @@ export function printOtherHostHits(root, removedHost) {
 /**
  * `_harness_setup._confirm`, and the only interactive read this verb makes.
  *
- * MOVED TO `js/setup.mjs` IN P5i, where the Python's own owner is: `_confirm` lives in
+ * MOVED TO `js/maintain/setup.mjs` IN P5i, where the Python's own owner is: `_confirm` lives in
  * `_harness_setup` beside the `_ask` it is built on, and `setup` is its second caller. The
  * body stayed here for one phase because a helper with one caller is not shared yet; the
  * rule this port uses is that the SECOND owner is what moves it, and a byte gate is what
@@ -673,8 +673,8 @@ export function cmdUninstall(args) {
   if (hit === null) {
     // `uninstallResolve(null)` never returns null — it falls back to the OpenCode global
     // default — so reaching here means `--target` was given and was not recognised.
-    const targetDesc = pyResolve(expanduser(args.target));
-    pyPrintErr(`[uninstall] no Geneseed install detected at ${targetDesc}.\n`
+    const targetDesc = resolvePath(expanduser(args.target));
+    printErr(`[uninstall] no Geneseed install detected at ${targetDesc}.\n`
       + '[uninstall] pass --target <repo> for a project install (.opencode/.claude/'
       + '.bob/.github) or --target <config dir> for a global one.\n');
     return 1;
@@ -683,60 +683,60 @@ export function cmdUninstall(args) {
   if (installState(root, host, scope) === 'absent') {
     const where = scope === 'project' && host !== 'opencode'
       ? ` under ${hostSpec(host).projectMarker}/` : '';
-    pyPrintErr(`[uninstall] no ${host}:${scope} Geneseed install at ${root} `
+    printErr(`[uninstall] no ${host}:${scope} Geneseed install at ${root} `
       + `(no ${GLOBAL_MANIFEST}${where}).\n`);
     return 1;
   }
   const data = installDataDir(root, host, scope);
   const stores = ['memory', 'notebook'].filter((n) => isDir(path.join(data, n)));
-  pyPrint(`[uninstall] target: ${root} (${host}:${scope})\n`);
+  printOut(`[uninstall] target: ${root} (${host}:${scope})\n`);
   if (host === 'copilot') {
-    pyPrint('[uninstall] removes: agents/, skills/, markers, and the '
+    printOut('[uninstall] removes: agents/, skills/, markers, and the '
       + `${hostSpec(host).agentFile} managed block (Copilot has no `
       + 'settings.json/hooks to unwire; your own .github files are kept).\n');
   } else if (host === 'claude' || host === 'bob') {
-    pyPrint('[uninstall] removes: agents/, skills/, markers, the '
+    printOut('[uninstall] removes: agents/, skills/, markers, the '
       + `${hostSpec(host).agentFile} managed block, and Geneseed's `
       + 'settings.json hooks/excludes (your own keys/hooks are kept).\n');
   } else if (scope === 'global') {
-    pyPrint('[uninstall] removes: AGENT.md, agents/, skills/, plugins/, markers, and the '
+    printOut('[uninstall] removes: AGENT.md, agents/, skills/, plugins/, markers, and the '
       + 'opencode.json instructions entry.\n');
   } else {
-    pyPrint('[uninstall] removes: AGENT.md, .opencode/, laws/, agents/, skills/, and the '
+    printOut('[uninstall] removes: AGENT.md, .opencode/, laws/, agents/, skills/, and the '
       + 'opencode.json instructions entry.\n');
   }
-  pyPrint('[uninstall] memory/ and notebook/ are kept in place (never deleted here)'
+  printOut('[uninstall] memory/ and notebook/ are kept in place (never deleted here)'
     + (stores.length ? ' — --archive-memory sets both aside.' : '.') + '\n');
   if (stores.length && args.archiveMemory) {
-    pyPrint(`[uninstall] ${stores.join(' + ')}: will be ARCHIVED to a sibling `
+    printOut(`[uninstall] ${stores.join(' + ')}: will be ARCHIVED to a sibling `
       + 'archived-<name>/<timestamp>/ (never deleted)\n');
   }
   if (!args.yes) {
     if (!process.stdin.isTTY) {
-      pyPrintErr('[uninstall] refusing to proceed without --yes (non-interactive).\n');
+      printErr('[uninstall] refusing to proceed without --yes (non-interactive).\n');
       return 1;
     }
     if (!confirm('Proceed with uninstall?', false)) {
-      pyPrint('[uninstall] cancelled — nothing removed.\n');
+      printOut('[uninstall] cancelled — nothing removed.\n');
       return 0;
     }
   }
   const memory = args.archiveMemory ? 'archive' : 'keep';
   const s = installUninstall(root, host, scope, memory);
   if (!(s.ok ?? true)) {
-    pyPrintErr(`[uninstall] failed: ${s.error || 'unknown error'}\n`);
+    printErr(`[uninstall] failed: ${s.error || 'unknown error'}\n`);
     return 1;
   }
   const archived = s.archived || [];
   const mem = archived.length ? `archived -> ${archived.join(', ')}` : 'kept in place';
   const cfgfile = host === 'opencode' ? 'opencode.json' : 'settings.json';
   if (s.incomplete && s.incomplete.length) {
-    pyPrint(`[uninstall] INCOMPLETE — removed ${s.removed} file(s), but `
+    printOut(`[uninstall] INCOMPLETE — removed ${s.removed} file(s), but `
       + `${s.incomplete.length} item(s) survived (see the WARN above); `
       + 'the install marker was kept — retry `geneseed uninstall` once they\'re '
       + `removable. ${cfgfile} updated where needed; memory/notebook ${mem}.\n`);
   } else {
-    pyPrint(`[uninstall] done — removed ${s.removed} file(s); ${cfgfile} updated where `
+    printOut(`[uninstall] done — removed ${s.removed} file(s); ${cfgfile} updated where `
       + `needed; memory/notebook ${mem}. Start a new session to apply.\n`);
   }
   if (scope === 'global') printSurvivingProjectInventory(root);
@@ -835,8 +835,8 @@ function installMoveList(root, kind) {
   } else {
     rels = ownedOf(claudeReadManifest(root)).filter((r) => r !== VERSION_MARKER);
   }
-  const rroot = pyResolve(root);
-  return rels.filter((r) => r && within(pyResolve(path.resolve(rroot, r)), rroot));
+  const rroot = resolvePath(root);
+  return rels.filter((r) => r && within(resolvePath(path.resolve(rroot, r)), rroot));
 }
 
 /**
@@ -862,9 +862,9 @@ export function installReaddEntry(target, entry) {
   const [cfg, hadComments] = readJsonc(raw);
   if (typeof cfg !== 'object' || cfg === null || Array.isArray(cfg)) return false;
   const instr = Array.isArray(cfg.instructions) ? cfg.instructions : [];
-  if (indexOfEq(instr, entry) >= 0) return false;
+  if (indexOfDeepEqual(instr, entry) >= 0) return false;
   if (path.extname(target) === '.jsonc' && hadComments) {
-    pyPrint(`[activate] ${path.basename(target)} has comments — not rewriting it. Add this `
+    printOut(`[activate] ${path.basename(target)} has comments — not rewriting it. Add this `
       + `to its "instructions" by hand: ${jsonDumps(entry)}\n`);
     return false;
   }
@@ -1032,10 +1032,14 @@ function remergeClaudeHooks(cfg, root = cfg) {
   // config dir (`.github/copilot-instructions.md`), and on a global install the two are the
   // same directory anyway. Both silent ⇒ `null` ⇒ the gate stays.
   const doctrines = doctrinesOfDir(root) ?? doctrinesOfDir(cfg);
+  // Same two-carrier read for the second axis, and its own default: an absent line means
+  // NOTHING excluded, so a reactivate can only ever restore a gate, never remove one.
+  const excluded = excludedRulesOfDir(root).length ? excludedRulesOfDir(root)
+    : excludedRulesOfDir(cfg);
   const [, claims] = mergeClaudeSettings(settingsFile(cfg, managed), 'global',
-    managed.settings_hooks ?? null, hookRunnerEntry(), doctrines);
+    managed.settings_hooks ?? null, hookRunnerEntry(), doctrines, excluded);
   // `and data` — a manifest that did not parse is not one to write back.
-  if (!pyEq(claims, managed.settings_hooks ?? null) && Object.keys(data).length > 0) {
+  if (!deepEquals(claims, managed.settings_hooks ?? null) && Object.keys(data).length > 0) {
     managed.settings_hooks = claims;
     data.managed = managed;
     const tmp = path.join(cfg, `${GLOBAL_MANIFEST}.tmp`);
@@ -1058,9 +1062,9 @@ function claudeDeactivate(root, scope = 'global', host = 'claude') {
   const man = claudeReadManifest(cfg);
   const managed = managedOf(man);
   const stash = path.join(cfg, DISABLED_STASH, host);
-  const rroot = pyResolve(cfg);
+  const rroot = resolvePath(cfg);
   const rels = ownedOf(man).filter((r) => r && r !== VERSION_MARKER
-    && within(pyResolve(path.resolve(rroot, r)), rroot));
+    && within(resolvePath(path.resolve(rroot, r)), rroot));
   const done = [];
   for (const rel of rels) {
     const src = path.join(cfg, rel);

package/js/{update.mjs → maintain/update.mjs}

@@ -1,5 +1,5 @@
 /**
- * `rituals/_update.py` — self-update: `git pull` the install's own origin, validate, rebuild.
+ * Self-update: `git pull` the install's own origin, validate, rebuild.
  *
  * The verb this whole port exists for. Every other subcommand can be Python for one more
  * release; `upgrade` is the one operation a "no Python needed" install cannot delegate,
@@ -31,9 +31,10 @@
  * `tests/test_pure_function_parity.py`; the heartbeat and the hard deadline are gated by
  * neither and are declared in the P8a handoff.
  *
- * NOT HERE, DELIBERATELY: `sync_self`, `main` (the launchers' self-heal entry) and
- * `cmd_bootstrap` are P8b's, and `update`'s row in `js/web/jobs.mjs`' `NOT_PORTED_ACTIONS`
- * is P8c's one-line payment. `parseOrigin` is ported in full here even though only `upgrade`
+ * ALSO HERE, SINCE P8b: `syncSelf`/`cmdSyncSelf` and the bootstrap step runner
+ * (`cmdBootstrap`, `bootstrapPlain`) at the bottom of this file. Still NOT here: `main`, the
+ * launchers' self-heal entry. `NOT_PORTED_ACTIONS` in `js/web/jobs.mjs` is empty now — every
+ * action row crosses. `parseOrigin` is ported in full here even though only `upgrade`
  * needs its fallback, because P8c's docs `about` kind needs the slug half and splitting one
  * pure function across two phases is how a second classifier gets written.
  */
@@ -42,33 +43,32 @@ import { cpSync, existsSync, mkdirSync, rmSync, statSync } from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 
-import { ROOT } from './checkout.mjs';
-import { exportImprovements, flushExportNotes } from './diff.mjs';
-import { opencodeConfigDir } from './hosts.mjs';
-import {
-  PY_SPACE, appendText, copyFile, pyInt, pyPathStr, pyPrint, pyPrintErr, pyStripSpace, pyWhich,
-  readText, writeText,
-} from './lib/fs.mjs';
-import { NO_WINDOW } from './lib/proc.mjs';
-import { restartDaemon } from './web/server.mjs';
+import { ROOT } from '../build/source.mjs';
+import { exportImprovements, flushExportNotes } from '../inspect/diff.mjs';
+import { opencodeConfigDir } from '../hosts/hosts.mjs';
+import { appendText, copyFile, printOut, printErr, readText, writeText } from '../lib/fs.mjs';
+import { toPlatformPath, which } from '../lib/paths.mjs';
+import { WHITESPACE, parseIntStrict, stripWhitespace } from '../lib/text.mjs';
+import { NO_WINDOW } from '../lib/proc.mjs';
+import { restartDaemon } from '../web/daemon.mjs';
 
 /**
  * `_CREDS_RE` / `_redact_url_creds` — strip a `user[:token]@` userinfo out of any URL in
  * `text` so a tokened remote never reaches a log line or an HTTP response.
  *
- * `PY_SPACE` rather than `\s`: the class is NEGATED, so the two definitions disagree about
+ * `WHITESPACE` rather than `\s`: the class is NEGATED, so the two definitions disagree about
  * whether a `\uFEFF` or a `\u001c` ends the userinfo. Unreachable through a git remote and
  * spelled correctly anyway, for the reason `js/lib/fs.mjs` gives — an approximated
  * primitive is the one that is wrong the day something reaches it.
  */
-const CREDS_RE = new RegExp(`(://)[^/@${PY_SPACE}]+@`, 'g');
+const CREDS_RE = new RegExp(`(://)[^/@${WHITESPACE}]+@`, 'g');
 
 export function redactUrlCreds(text) {
   return (text || '').replace(CREDS_RE, '$1');
 }
 
-// `_NO_WINDOW` was defined here and PRIVATE to this module, which is how `js/doctor.mjs`
-// and `js/hooks.mjs` came to spawn without it — see `js/lib/proc.mjs` for the flag, the
+// `_NO_WINDOW` was defined here and PRIVATE to this module, which is how `js/inspect/doctor.mjs`
+// and `js/hosts/hooks.mjs` came to spawn without it — see `js/lib/proc.mjs` for the flag, the
 // capturing-only rule behind it, and why a miss here is invisible to every byte gate.
 
 /** `subprocess.run(..., capture_output=True, encoding="utf-8")` reads in UNIVERSAL NEWLINES. */
@@ -84,7 +84,7 @@ export const DEFAULT_ORIGIN = { url: 'https://github.com/Arylmera/Geneseed',
  * which-guarded, no-window, stripped + credential-redacted, NEVER raises. Returns
  * `[rc, out, err]`; `rc` is null when git is absent or the spawn failed.
  *
- * `pyWhich` and not a bare `'git'`: the reference answers `(None, "", "")` — which
+ * `which` and not a bare `'git'`: the reference answers `(None, "", "")` — which
  * `preflight` reports as "git is not installed or not on PATH" — when the lookup misses,
  * and a port that let the OS resolve the name would get an ENOENT instead and have to guess
  * which of the two it was.
@@ -94,7 +94,7 @@ export const DEFAULT_ORIGIN = { url: 'https://github.com/Arylmera/Geneseed',
  * "clean enough".
  */
 export function gitRun(args, { timeout = 10, network = false } = {}) {
-  const exe = pyWhich('git');
+  const exe = which('git');
   if (!exe) return [null, '', ''];
   const cmd = ['-C', String(ROOT)];
   let env;
@@ -112,8 +112,8 @@ export function gitRun(args, { timeout = 10, network = false } = {}) {
   // the arm the reference reaches for every other failure.
   if (r.error || r.status === null) return [null, '', ''];
   return [r.status,
-    redactUrlCreds(pyStripSpace(universal(r.stdout))),
-    redactUrlCreds(pyStripSpace(universal(r.stderr)))];
+    redactUrlCreds(stripWhitespace(universal(r.stdout))),
+    redactUrlCreds(stripWhitespace(universal(r.stderr)))];
 }
 
 /**
@@ -130,7 +130,7 @@ function urlsplitHostPath(o) {
   // A scheme is `[A-Za-z][A-Za-z0-9+.-]*` before the first `:` — and only then. `urlsplit`
   // leaves `foo:bar` alone when `foo` is not a legal scheme, which is what keeps an scp-form
   // remote out of this branch (the caller checks for that shape first anyway).
-  const m = /^([A-Za-z][A-Za-z0-9+.\-]*):(.*)$/s.exec(rest);
+  const m = /^([A-Za-z][A-Za-z0-9+.-]*):(.*)$/s.exec(rest);
   if (m) rest = m[2];
   let netloc = '';
   if (rest.startsWith('//')) {
@@ -153,7 +153,7 @@ function urlsplitHostPath(o) {
  * Userinfo and port dropped from the url; slug set only for a two-segment github.com path.
  */
 export function parseOrigin(origin) {
-  const o = pyStripSpace(origin || '');
+  const o = stripWhitespace(origin || '');
   let host = '';
   let p = '';
   if (!o.includes('://') && o.includes('@') && o.split('@').slice(1).join('@').includes(':')) {
@@ -220,9 +220,9 @@ export function preflight() {
   return pre('ready');
 }
 
-/** `_fetch_timeout()`. `pyInt` is null where `int()` raises, which is the `except` arm. */
+/** `_fetch_timeout()`. `parseIntStrict` is null where `int()` raises, which is the `except` arm. */
 export function fetchTimeout() {
-  const n = pyInt(process.env.GENESEED_NET_TIMEOUT ?? '120');
+  const n = parseIntStrict(process.env.GENESEED_NET_TIMEOUT ?? '120');
   if (n === null) return 120;
   return Math.max(30, n);
 }
@@ -235,8 +235,8 @@ export function fetchTimeout() {
  * (`rev-list --count` prints ASCII). Reproducing the crash would be reproducing a bug; the
  * divergence is confined to input git cannot emit and is recorded rather than matched.
  */
-export function pyCount(s) {
-  const t = pyStripSpace(s || '');
+export function countOccurrences(s) {
+  const t = stripWhitespace(s || '');
   return /^[0-9]+$/.test(t) ? Number(t) : 0;
 }
 
@@ -269,7 +269,7 @@ export function killTree(child) {
 export function fetchPhases(rawLines, last = '') {
   const out = [];
   for (const raw of rawLines) {
-    const line = redactUrlCreds(pyStripSpace(raw));
+    const line = redactUrlCreds(stripWhitespace(raw));
     if (!line) continue;
     const phase = line.split(':')[0];
     if (phase !== last) {
@@ -292,7 +292,7 @@ export function fetchPhases(rawLines, last = '') {
  * since P6h.
  */
 export async function fetchStreaming(log = null) {
-  const exe = pyWhich('git');
+  const exe = which('git');
   if (!exe) return [null, 'git is not installed or not on PATH'];
   const timeout = fetchTimeout();
   const args = ['-C', String(ROOT),
@@ -323,7 +323,7 @@ export async function fetchStreaming(log = null) {
     const [emit, next] = fetchPhases(parts, last);
     last = next;
     for (const p of parts) {
-      const s = redactUrlCreds(pyStripSpace(p));
+      const s = redactUrlCreds(stripWhitespace(p));
       if (s) lines.push(s);
     }
     if (log) for (const l of emit) log(`[geneseed]   ${l}`);
@@ -373,8 +373,8 @@ export async function measureUpstream(log = null) {
   if (rc !== 0) return ['fetch_failed', 0, err];
   const [, aheadRaw] = gitRun(['rev-list', '--count', '@{u}..HEAD']);
   const [, behindRaw] = gitRun(['rev-list', '--count', 'HEAD..@{u}']);
-  const ahead = pyCount(aheadRaw);
-  const behind = pyCount(behindRaw);
+  const ahead = countOccurrences(aheadRaw);
+  const behind = countOccurrences(behindRaw);
   if (ahead > 0) {
     const [mrc] = gitRun(['merge-base', 'HEAD', '@{u}']);
     return [mrc === 0 ? 'diverged' : 'unrelated', 0, ''];
@@ -412,8 +412,8 @@ export function runDoctor(cand) {
   // `stderr=subprocess.STDOUT` — the reference gives the child ONE handle, so its two
   // streams are interleaved in write order and arrive as `proc.stdout`. `spawnSync` has no
   // way to hand two descriptors the same pipe, so the two are concatenated instead: equal
-  // whenever the child writes to only one of them, which `doctor` does (`js/doctor.mjs`
-  // reports every problem through `pyPrint`), and the reason the two doctor cells below are
+  // whenever the child writes to only one of them, which `doctor` does (`js/inspect/doctor.mjs`
+  // reports every problem through `printOut`), and the reason the two doctor cells below are
   // the gate on this rather than a comment. If a future check reports on stderr the
   // ORDERING here is what would differ, not the content.
   return [r.status === 0, universal(r.stdout) + universal(r.stderr)];
@@ -454,7 +454,7 @@ export function logfile() {
   // `Path(env)`, stringified with the platform separator when `upgrade` prints it — the same
   // rule `GENESEED_OUT` needed. No cell can set this (`cell_env` clears every `GENESEED_*`
   // and no upgrade cell re-adds it), so it is spelled from the rule rather than from a gate.
-  if (env) return pyPathStr(env);
+  if (env) return toPlatformPath(env);
   return path.join(os.homedir(), '.geneseed-install.log');
 }
 
@@ -471,7 +471,7 @@ export class Log {
   }
 
   call(msg) {
-    pyPrint(`${msg}\n`);
+    printOut(`${msg}\n`);
     if (this.path !== null) {
       try { appendText(this.path, `${msg}\n`); } catch { /* OSError: pass */ }
     }
@@ -485,7 +485,7 @@ export function resolveEmit(cfg, out) {
   for (const marker of [path.join(String(cfg), '.geneseed-emit'),
     path.join(String(out), '.geneseed-emit')]) {
     try {
-      const val = pyStripSpace(readText(marker));
+      const val = stripWhitespace(readText(marker));
       if (val) return val;
     } catch { /* OSError: pass */ }
   }
@@ -497,7 +497,7 @@ export function markerTheme(cfg, out) {
   for (const marker of [path.join(String(cfg), '.geneseed-theme'),
     path.join(String(out), '.geneseed-theme')]) {
     try {
-      const val = pyStripSpace(readText(marker));
+      const val = stripWhitespace(readText(marker));
       if (val) return val;
     } catch { /* OSError: pass */ }
   }
@@ -570,11 +570,11 @@ export async function rebuildBundle(here, out, theme, emit, rootDir, log) {
   else if (emit === 'opencode-global') buildArgs.push('--emit', 'opencode-global');
   log(`[geneseed] rebuilding bundle -> ${out} (theme: ${theme || 'config default'}, emit: ${emit}) ...`);
   await drainStdout();
-  // THE GENERATOR, RE-EXECUTED. `js/generate.mjs`'s `cmdBuild` calls `driverMain` in-process
+  // THE GENERATOR, RE-EXECUTED. `js/build/generate.mjs`'s `cmdBuild` calls `driverMain` in-process
   // and is right to — nothing has changed under it. Here the source on disk was replaced
   // three statements ago, so this must be a new process reading the new files.
   const proc = spawnSync(process.execPath,
-    [path.join(String(here), 'bin', 'geneseed.mjs'), ...buildArgs],
+    [path.join(String(here), 'bin', 'build-driver.mjs'), ...buildArgs],
     { cwd: String(here), stdio: 'inherit' });
   if (proc.status !== 0) return proc.status === null ? 1 : proc.status;
   // If a web daemon is running, bounce it so the new source and the freshly rebuilt web/dist
@@ -623,13 +623,13 @@ export async function upgrade(ref = null, themeArg = null) {
       + 'current branch (tag/branch pinning was removed with the zip path).');
   }
   const here = String(ROOT);
-  // `Path(os.environ.get(...) or ...)`, and `pyPathStr` is the `Path(str)` half of it: the
+  // `Path(os.environ.get(...) or ...)`, and `toPlatformPath` is the `Path(str)` half of it: the
   // reference stringifies with the PLATFORM separator, so a `GENESEED_OUT` spelled
   // `C:/x/bundle` — which is how a JSON config, a shell script and this harness's own
   // `{sb/}` placeholder all spell it — reaches the log as `C:\x\bundle`. Six cells differed
   // on exactly that and nothing else.
-  const out = pyPathStr(process.env.GENESEED_OUT || path.join(path.dirname(here), 'Harness'));
-  const rootDir = pyPathStr(process.env.GENESEED_ROOT || path.dirname(out));
+  const out = toPlatformPath(process.env.GENESEED_OUT || path.join(path.dirname(here), 'Harness'));
+  const rootDir = toPlatformPath(process.env.GENESEED_ROOT || path.dirname(out));
   const cfg = opencodeConfigDir();
   const emit = resolveEmit(cfg, out);
 
@@ -647,7 +647,7 @@ export async function upgrade(ref = null, themeArg = null) {
     return p.kind === 'info' ? 3 : 1;
   }
 
-  log(`[geneseed] fetching from origin (git: ${pyWhich('git') || 'git'}, `
+  log(`[geneseed] fetching from origin (git: ${which('git') || 'git'}, `
     + `timeout: ${fetchTimeout()}s) ...`);
   const [code, behind, err] = await measureUpstream(log);
   if (code === 'fetch_failed') {
@@ -715,11 +715,11 @@ export async function cmdUpgrade(args) {
   try {
     const [ipath] = exportImprovements();
     if (ipath) {
-      pyPrint(`[upgrade] deployed harness carries local edits — saved to ${ipath}\n`);
-      pyPrint('[upgrade] hand that file to your agent to back-port them into src/.\n');
+      printOut(`[upgrade] deployed harness carries local edits — saved to ${ipath}\n`);
+      printOut('[upgrade] hand that file to your agent to back-port them into src/.\n');
     }
   } catch (e) {
-    pyPrintErr(`[upgrade] ⚠️  could not export local edits (${e && e.message ? e.message : e}) — `
+    printErr(`[upgrade] ⚠️  could not export local edits (${e && e.message ? e.message : e}) — `
       + 'run `geneseed diff --out FILE` before upgrading to keep them.\n');
   }
   let { ref } = args;
@@ -862,17 +862,17 @@ async function bootstrapPlain() {
   let failed = false;
   for (let i = 0; i < steps.length; i += 1) {
     const [title, cmd, step] = steps[i];
-    pyPrint(`[geneseed] step ${i + 1}/${steps.length}: ${title} ...\n`);
-    // eslint-disable-next-line no-await-in-loop
+    printOut(`[geneseed] step ${i + 1}/${steps.length}: ${title} ...\n`);
+     
     const rc = await step();
     if (rc !== 0 && rc !== 3) {
       failed = true;
       for (const ln of diagnoseFailedStep(i + 1, steps.length, title, cmd, rc, '')) {
-        pyPrint(`${ln}\n`);
+        printOut(`${ln}\n`);
       }
     }
   }
-  if (!failed) pyPrint('[geneseed] ✓ update complete.\n');
+  if (!failed) printOut('[geneseed] ✓ update complete.\n');
   return failed;
 }