@henols/vice-mcp 1.0.0 → 1.1.0

package/prerequisites.json

@@ -0,0 +1,416 @@
+{
+  "schemaVersion": 1,
+  "tools": {
+    "x64sc": {
+      "id": "x64sc",
+      "location": {
+        "envVar": "VICE_BIN",
+        "fileOverridable": true
+      },
+      "kind": "executable",
+      "unblocks": {
+        "skills": [
+          "c64-program-recon",
+          "c64-ram-capture",
+          "vice-wedge-triage"
+        ],
+        "mcp": [
+          "c1541.bam",
+          "c1541.dir",
+          "c1541.entry",
+          "c1541.chain",
+          "c1541.read",
+          "petcat.decode"
+        ]
+      },
+      "remedies": {
+        "linux": [
+          {
+            "ecosystem": "debian-trixie",
+            "text": "sudo apt install vice (enable the contrib component first — VICE ships there, not main; a stock debian:trixie installation has no vice candidate until it is)",
+            "provenance": "carried",
+            "source": "README.md:101"
+          },
+          {
+            "ecosystem": "debian-forky",
+            "text": "sudo apt install vice (same contrib-component requirement as trixie)",
+            "provenance": "carried",
+            "source": "README.md:102"
+          },
+          {
+            "ecosystem": "ubuntu-2510",
+            "text": "sudo apt install vice (enable multiverse first)",
+            "provenance": "carried",
+            "source": "README.md:103"
+          },
+          {
+            "ecosystem": "arch",
+            "text": "sudo pacman -S vice",
+            "provenance": "carried",
+            "source": "README.md:104"
+          },
+          {
+            "ecosystem": "fedora-rpmfusion",
+            "text": "enable RPM Fusion Non-Free, then sudo dnf install vice",
+            "provenance": "carried",
+            "source": "README.md:105"
+          },
+          {
+            "ecosystem": "alpine-edge",
+            "text": "enable the edge/testing repo, then apk add vice",
+            "provenance": "carried",
+            "source": "README.md:106"
+          },
+          {
+            "ecosystem": "homebrew",
+            "text": "brew install vice",
+            "provenance": "carried",
+            "source": "README.md:107"
+          }
+        ],
+        "darwin": [
+          {
+            "ecosystem": "homebrew",
+            "text": "brew install vice",
+            "provenance": "carried",
+            "source": "README.md:107"
+          }
+        ],
+        "win32": [
+          {
+            "ecosystem": "windows-official",
+            "text": "download the GTK3/SDL2 win64 zip",
+            "provenance": "carried",
+            "source": "README.md:108"
+          }
+        ]
+      }
+    },
+    "c1541": {
+      "id": "c1541",
+      "location": {
+        "fileOverridable": true
+      },
+      "kind": "executable",
+      "unblocks": {
+        "skills": [
+          "c64-disk-access"
+        ],
+        "mcp": [
+          "c1541.bam",
+          "c1541.dir",
+          "c1541.entry",
+          "c1541.chain",
+          "c1541.read"
+        ]
+      },
+      "remedies": {
+        "linux": [
+          {
+            "ecosystem": "debian-trixie",
+            "text": "sudo apt install vice (enable the contrib component first — VICE ships there, not main; a stock debian:trixie installation has no vice candidate until it is)",
+            "provenance": "carried",
+            "source": "README.md:101"
+          },
+          {
+            "ecosystem": "debian-forky",
+            "text": "sudo apt install vice (same contrib-component requirement as trixie)",
+            "provenance": "carried",
+            "source": "README.md:102"
+          },
+          {
+            "ecosystem": "ubuntu-2510",
+            "text": "sudo apt install vice (enable multiverse first)",
+            "provenance": "carried",
+            "source": "README.md:103"
+          },
+          {
+            "ecosystem": "arch",
+            "text": "sudo pacman -S vice",
+            "provenance": "carried",
+            "source": "README.md:104"
+          },
+          {
+            "ecosystem": "fedora-rpmfusion",
+            "text": "enable RPM Fusion Non-Free, then sudo dnf install vice",
+            "provenance": "carried",
+            "source": "README.md:105"
+          },
+          {
+            "ecosystem": "alpine-edge",
+            "text": "enable the edge/testing repo, then apk add vice",
+            "provenance": "carried",
+            "source": "README.md:106"
+          },
+          {
+            "ecosystem": "homebrew",
+            "text": "brew install vice",
+            "provenance": "carried",
+            "source": "README.md:107"
+          }
+        ],
+        "darwin": [
+          {
+            "ecosystem": "homebrew",
+            "text": "brew install vice",
+            "provenance": "carried",
+            "source": "README.md:107"
+          }
+        ],
+        "win32": [
+          {
+            "ecosystem": "windows-official",
+            "text": "download the GTK3/SDL2 win64 zip",
+            "provenance": "carried",
+            "source": "README.md:108"
+          }
+        ]
+      }
+    },
+    "petcat": {
+      "id": "petcat",
+      "location": {
+        "fileOverridable": true
+      },
+      "kind": "executable",
+      "unblocks": {
+        "skills": [
+          "c64-petcat",
+          "c64-program-recon"
+        ],
+        "mcp": [
+          "petcat.decode"
+        ]
+      },
+      "remedies": {
+        "linux": [
+          {
+            "ecosystem": "debian-trixie",
+            "text": "sudo apt install vice (enable the contrib component first — VICE ships there, not main; a stock debian:trixie installation has no vice candidate until it is)",
+            "provenance": "carried",
+            "source": "README.md:101"
+          },
+          {
+            "ecosystem": "debian-forky",
+            "text": "sudo apt install vice (same contrib-component requirement as trixie)",
+            "provenance": "carried",
+            "source": "README.md:102"
+          },
+          {
+            "ecosystem": "ubuntu-2510",
+            "text": "sudo apt install vice (enable multiverse first)",
+            "provenance": "carried",
+            "source": "README.md:103"
+          },
+          {
+            "ecosystem": "arch",
+            "text": "sudo pacman -S vice",
+            "provenance": "carried",
+            "source": "README.md:104"
+          },
+          {
+            "ecosystem": "fedora-rpmfusion",
+            "text": "enable RPM Fusion Non-Free, then sudo dnf install vice",
+            "provenance": "carried",
+            "source": "README.md:105"
+          },
+          {
+            "ecosystem": "alpine-edge",
+            "text": "enable the edge/testing repo, then apk add vice",
+            "provenance": "carried",
+            "source": "README.md:106"
+          },
+          {
+            "ecosystem": "homebrew",
+            "text": "brew install vice",
+            "provenance": "carried",
+            "source": "README.md:107"
+          }
+        ],
+        "darwin": [
+          {
+            "ecosystem": "homebrew",
+            "text": "brew install vice",
+            "provenance": "carried",
+            "source": "README.md:107"
+          }
+        ],
+        "win32": [
+          {
+            "ecosystem": "windows-official",
+            "text": "download the GTK3/SDL2 win64 zip",
+            "provenance": "carried",
+            "source": "README.md:108"
+          }
+        ]
+      }
+    },
+    "acme": {
+      "id": "acme",
+      "location": {
+        "envVar": "ACME_BIN",
+        "fileOverridable": true
+      },
+      "kind": "executable",
+      "unblocks": {
+        "skills": [
+          "acme-build"
+        ],
+        "mcp": [
+          "acme.build"
+        ]
+      },
+      "remedies": {
+        "linux": [
+          {
+            "ecosystem": "ubuntu",
+            "text": "sudo apt-get install -y acme",
+            "provenance": "measured",
+            "source": ".github/workflows/ci.yml:78"
+          },
+          {
+            "ecosystem": "debian",
+            "text": "sudo apt-get install -y acme",
+            "provenance": "carried",
+            "source": ".github/workflows/ci.yml:48"
+          }
+        ],
+        "universal": [
+          {
+            "ecosystem": "generic",
+            "text": "Install ACME.",
+            "provenance": "carried",
+            "source": "src/skills/acme-build/SKILL.md:254"
+          }
+        ]
+      }
+    },
+    "acme-lib": {
+      "id": "acme-lib",
+      "location": {
+        "envVar": "ACME",
+        "fileOverridable": true
+      },
+      "kind": "directory",
+      "marker": "cbm/c64/vic.a",
+      "unblocks": {
+        "skills": [
+          "acme-build"
+        ],
+        "mcp": [
+          "acme.build"
+        ]
+      },
+      "remedies": {
+        "universal": [
+          {
+            "ecosystem": "generic",
+            "text": "export ACME=<dir holding cbm/c64/vic.a>.",
+            "provenance": "carried",
+            "source": "src/skills/acme-build/SKILL.md:255"
+          }
+        ]
+      }
+    },
+    "ghidra": {
+      "id": "ghidra",
+      "location": {
+        "envVar": "GHIDRA_HOME",
+        "fileOverridable": true
+      },
+      "kind": "directory",
+      "marker": "support/analyzeHeadless",
+      "unblocks": {
+        "skills": [
+          "c64-program-recon"
+        ],
+        "mcp": [
+          "ghidra.analyze",
+          "ghidra.installExtension"
+        ]
+      },
+      "remedies": {
+        "universal": [
+          {
+            "ecosystem": "generic",
+            "text": "Set the GHIDRA_HOME environment variable to name a Ghidra installation directory.",
+            "provenance": "carried",
+            "source": "src/mcp/vice/host-tool.mts:1352"
+          }
+        ]
+      }
+    },
+    "dxa": {
+      "id": "dxa",
+      "location": {
+        "fileOverridable": false,
+        "reason": "dxa is vendored and built by this project, so an override could only select a binary it did not build and did not pin."
+      },
+      "kind": "executable",
+      "unblocks": {
+        "skills": [
+          "routine-queue-walker"
+        ],
+        "mcp": [
+          "dxa.disassemble"
+        ]
+      },
+      "remedies": {
+        "universal": [
+          {
+            "ecosystem": "generic",
+            "text": "bash vendor/dxa/build.bash build",
+            "provenance": "carried",
+            "source": "src/mcp/vice/host-tool.mts:1472"
+          }
+        ]
+      }
+    },
+    "node": {
+      "id": "node",
+      "versionFloor": ">=24.0.0",
+      "location": {
+        "fileOverridable": false,
+        "reason": "vice-launcher.sh is bash and reads VICE_BROKER_NODE before any working Node exists to parse JSON with."
+      },
+      "kind": "executable",
+      "unblocks": {
+        "skills": [
+          "acme-build",
+          "c64-disk-access",
+          "c64-memory-mapping",
+          "c64-petcat",
+          "c64-program-recon",
+          "c64-provenance-diff",
+          "c64-ram-capture",
+          "routine-queue-walker",
+          "vice-wedge-triage"
+        ],
+        "mcp": [
+          "acme.build",
+          "ghidra.analyze",
+          "oracle.probe",
+          "oracle.run",
+          "dxa.disassemble",
+          "ghidra.installExtension",
+          "c1541.bam",
+          "c1541.dir",
+          "c1541.entry",
+          "c1541.chain",
+          "c1541.read",
+          "petcat.decode"
+        ]
+      },
+      "remedies": {
+        "universal": [
+          {
+            "ecosystem": "generic",
+            "text": "Install Node >= v24 and put it on PATH, or set VICE_BROKER_NODE to an absolute path to one.",
+            "provenance": "carried",
+            "source": "src/mcp/vice/resources/vice-launcher.sh:219"
+          }
+        ]
+      }
+    }
+  }
+}

package/prg-image.ts

@@ -34,7 +34,7 @@
 // `flatImageOrigin` from here with a plain top-level import, and `vice-proxy.ts`
 // imports `anno-tools.ts` statically. `anno-coverage.ts` (the byte-coverage
 // census) imports `decodeRawData`, `parsePrg` and `flatImageOrigin` for the
-// same three facts on the CLI's route. `scripts/check-npm-packages.mjs` walks
+// same three facts on the CLI's route. The published closure once walked
 // that closure over `files[]` and fails the pack the moment a reachable module
 // sits outside the listed set.
 //

package/repo-root.ts

@@ -200,17 +200,21 @@ export function repoRoot({ from = HERE, env = process.env, exists = existsSync }
  *     deployed launcher path), and vice.ts + vice-broker-client.ts, both via
  *     `supervisorDir()` (`supervisor`, the broker state directory -- one
  *     writer, two readers).
- *   - FOUR files cannot import this container-side module at all, so each
+ *   - FIVE files cannot import this container-side module at all, so each
  *     joins `".c64-re-tools"` with its own trailing segment(s) directly,
  *     matching this function's shape by CONVENTION, never by shared code:
  *     install-resources.ts's `installTargetDir()` (`bin` -- module-cycle
  *     avoidance, since THIS file's own bottom-of-module call invokes it),
  *     vice-broker.mts's `parseArgs()` state-dir fallback (`supervisor` --
- *     host-bound, compiled separately by build.ts), host-tool.mts's
- *     `oracle.run` scratch directory (`runs/oracle` -- host-bound), and
+ *     host-bound, compiled separately by build.ts) and its `run()` tool-
+ *     location deps (the bare root -- same host-bound reason), host-tool.mts's
+ *     `oracle.run` scratch directory (`runs/oracle` -- host-bound),
  *     ghidra-project.mts's `ghidraRunsRoot()`/`ghidraRunsRealRoot()`
  *     (`runs/ghidra` -- host-bound, reached through a symlinked alias
- *     handle, see below). Every one of these four must keep its literal
+ *     handle, see below), and backend-detect.mts's `resolvedBackend()`
+ *     cwd-relative fallback (the bare root -- host-bound, and the ONE place
+ *     the emulator binary's own location is resolved, Phase 60 LOC-01/LOC-02).
+ *     Every one of these five must keep its literal
  *     equal to `join(toolsDir(...), <same segments>)`, by convention, or the
  *     two halves of this codebase silently disagree on where the root is.
  *
@@ -218,8 +222,8 @@ export function repoRoot({ from = HERE, env = process.env, exists = existsSync }
  * files that call this function directly -- it is host-bound
  * (ghidra-project.mts) and cannot import this file at all.
  *
- * The literal string ".c64-re-tools" therefore has exactly 6 non-comment
- * occurrences in this codebase, across 5 files. repo-root.test.ts's census
+ * The literal string ".c64-re-tools" therefore has exactly 10 non-comment
+ * occurrences in this codebase, across 6 files. repo-root.test.ts's census
  * gate reads BOTH the count and this file list straight out of this
  * sentence and the bullet list below -- never duplicated by hand a second
  * time in the test -- and compares both against the real tree, with a
@@ -229,10 +233,17 @@ export function repoRoot({ from = HERE, env = process.env, exists = existsSync }
  *   - repo-root.ts -- this definition, the line below (1)
  *   - install-resources.ts -- `installTargetDir()`'s `bin` join (1)
  *   - vice-broker.mts -- `parseArgs()`'s state-dir fallback, BOTH branches
- *     of one ternary on the same line (2)
+ *     of one ternary on the same line (2), plus `run()`'s `toolsDir` for the
+ *     once-per-process emulator-binary resolution (1) = 3
  *   - ghidra-project.mts -- `GHIDRA_RUNS_HANDLE_TARGET`, the alias handle's
  *     relative symlink target (1)
- *   - host-tool.mts -- `oracle.run`'s scratch-directory join (1)
+ *   - host-tool.mts -- `oracle.run`'s scratch-directory join (1), plus
+ *     Phase 60 (LOC-01, plan 60-03)'s `HostToolLocator` plumbing:
+ *     `locatorFrom()`'s `process.cwd()`-derived fallback (1) and
+ *     `runHostTool()`'s own locator built from its already-resolved
+ *     `repoRootAbs` (1) = 3
+ *   - backend-detect.mts -- `resolvedBackend()`'s cwd-relative `toolsDir`
+ *     fallback, used only when no caller supplied one (1)
  *
  * The Ghidra alias handle: a non-dotted sibling of this root
  * (`<repoRoot>/c64-re-tools`, no leading dot), a symlink whose RELATIVE

package/resources/backend-detect.mjs

@@ -47,8 +47,34 @@
 //     is the exact failure class the 2026-08-01 triple-launch outage came
 //     from (D-03/T-02-25) -- unchanged reasoning from before this plan, only
 //     the mechanism inside resolvedBackend() changed.
+//
+// Phase 60 (LOC-01/LOC-02, PD-01/PD-02/PD-03): resolvedBackend() gains a real
+// VALUE dependency on the tool-location seam (tool-location.mts) for the
+// emulator binary's own resolution -- when neither `viceBin` nor
+// `resolveBinPath` is injected, resolution goes through the seam's
+// `resolveTool("x64sc", ...)` instead of this file's own ordering, so a
+// `.c64-re-tools/tools.json` entry for `x64sc` now changes what this broker
+// actually spawns. `defaultResolveBinPath()` collapses into a thin wrapper
+// over the seam's own exported `resolveOnPath()` -- the first of Phase 59
+// D-02's three independent `$PATH`-walk copies to collapse.
+//
+// This file ships two ways (see the cache-section comment below): unbuilt,
+// imported directly by container-side .ts (vice-proxy.ts's own `import *
+// as backendDetect from "./backend-detect.mts"`), and compiled into
+// resources/ for the host (vice-broker.mts's own `./backend-detect.mjs`
+// value import). A STATIC `import ... from "./tool-location.mjs"` would
+// resolve in only the SECOND form -- that file exists as a real sibling
+// only once both are compiled into resources/, never beside the unbuilt
+// source. Loading it instead through node:module's `createRequire()`
+// (`toolLocationSeam()` below) defers resolution to the call site rather
+// than parse time, so trying the compiled sibling first and falling back to
+// the unbuilt source sibling keeps this ONE seam call working in both
+// shipped forms -- one implementation, no #ifdef-style split, and every
+// existing unbuilt importer of this file needs no change at all.
 import { existsSync, readFileSync, writeFileSync, chmodSync, renameSync, mkdirSync, statSync, } from "node:fs";
-import { join, resolve as resolvePath } from "node:path";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+import { createRequire } from "node:module";
 /** The client-side capability-decision schema version stamped into every
  * capability record this module writes (see BackendCacheRecord's own field
  * comment). BUMP THIS whenever the client's capability probing or the
@@ -124,20 +150,36 @@ function writeCacheRecordAtomic(supervisorDir, record) {
     writeFileSync(tmpPath, JSON.stringify(record, null, 2) + "\n");
     renameSync(tmpPath, finalPath);
 }
+/** This module's own directory. Computed once, purely to seed
+ * `toolLocationSeam()`'s two-candidate join below -- mirrors
+ * `tool-location.mts`'s own `HERE` constant and its `readDeclaration()`
+ * "beside `here`, take the first that exists" idiom exactly. */
+const HERE = dirname(fileURLToPath(import.meta.url));
+/** Loads the tool-location seam through `node:module`'s `createRequire()`
+ * rather than a static ESM import -- see this file's own header for why a
+ * static specifier cannot work in both of this file's two shipped forms.
+ * `require()` resolves at THIS call site, not at parse time, so trying the
+ * compiled resources/ sibling first and falling back to the unbuilt source
+ * sibling (the exact two-candidate order `tool-location.mts`'s own
+ * `readDeclaration()` already uses for `prerequisites.json`) lets the SAME
+ * source file resolve correctly whichever way this file itself was loaded.
+ * Never memoised here -- `resolvedBackend()`'s own `memoisedResult` already
+ * ensures this runs at most once in the one production path that reaches
+ * it, and a test process that resets that memo between scenarios must be
+ * free to call this again, cheaply, rather than replay a stale answer. */
+function toolLocationSeam() {
+    const req = createRequire(import.meta.url);
+    const specifier = existsSync(join(HERE, "tool-location.mjs")) ? "./tool-location.mjs" : "./tool-location.mts";
+    return req(specifier);
+}
+/** Reduced (Phase 60) to a thin wrapper over the seam's own exported
+ * `resolveOnPath()` -- the first of Phase 59 D-02's three independent
+ * `$PATH`-walk copies to collapse. Kept as a named function (rather than
+ * inlined at its one call site) only because `ResolvedBackendDeps.resolveBinPath`
+ * needs a real default to fall back to when a caller supplies `viceBin` but
+ * not this override (PD-02). */
 function defaultResolveBinPath(bin, env) {
-    if (bin.includes("/")) {
-        const abs = resolvePath(bin);
-        return existsSync(abs) ? abs : null;
-    }
-    const pathEnv = env.PATH ?? "";
-    for (const dir of pathEnv.split(":")) {
-        if (!dir)
-            continue;
-        const candidate = join(dir, bin);
-        if (existsSync(candidate))
-            return candidate;
-    }
-    return null;
+    return toolLocationSeam().resolveOnPath(bin, env).path;
 }
 function defaultStat(resolvedPath) {
     try {
@@ -190,11 +232,41 @@ export function resolvedBackend(deps = {}) {
     if (memoisedResult !== null)
         return memoisedResult;
     const env = deps.env ?? process.env;
-    const viceBin = deps.viceBin ?? env.VICE_BIN ?? "x64sc";
-    const resolveBinPath = deps.resolveBinPath ?? defaultResolveBinPath;
     const stat = deps.stat ?? defaultStat;
     const now = deps.now ?? (() => Date.now());
-    const resolvedPath = resolveBinPath(viceBin, env);
+    let viceBin;
+    let resolvedPath;
+    // Phase 60 gap closure (LOC-03, PD-13): non-null only in the PD-01 branch
+    // below, and only when the seam itself refused. Carried verbatim onto the
+    // returned result's own `locationRefusal` field (see that field's own doc
+    // comment for why); this module reads no environment variable to compose
+    // it, and reads none to name it here either.
+    let locationRefusal = null;
+    if (deps.viceBin !== undefined || deps.resolveBinPath !== undefined) {
+        // PD-02: an explicit override bypasses the seam entirely -- byte-for-byte
+        // the same behaviour every existing injected test case already exercises.
+        viceBin = deps.viceBin ?? "x64sc";
+        const resolveBinPath = deps.resolveBinPath ?? defaultResolveBinPath;
+        resolvedPath = resolveBinPath(viceBin, env);
+    }
+    else {
+        // PD-01: resolvedBackend() gains the tools.json layer internally by
+        // calling the seam; it keeps no ordering of its own. The seam's WHOLE
+        // result is taken here (PD-13), not only its `path`: the display name
+        // handed to binPathFields() below falls back to the seam's own
+        // `envCandidate` -- the value the developer actually wrote -- when the
+        // seam reports one, and to the literal "x64sc" only when it does not
+        // (retiring the hardcoded display name IN-01 logged). `refusal` is
+        // carried onto `locationRefusal` above unchanged.
+        const projectRoot = deps.projectRoot ?? (deps.supervisorDir !== undefined ? dirname(dirname(deps.supervisorDir)) : process.cwd());
+        const toolsDir = deps.toolsDir ?? (deps.supervisorDir !== undefined ? dirname(deps.supervisorDir) : join(process.cwd(), ".c64-re-tools"));
+        const locate = deps.locate ?? toolLocationSeam().resolveTool;
+        const locateDeps = { toolsDir, projectRoot, env };
+        const locateResult = locate("x64sc", locateDeps);
+        resolvedPath = locateResult.path;
+        viceBin = locateResult.envCandidate ?? "x64sc";
+        locationRefusal = locateResult.refusal;
+    }
     const identity = resolvedPath ? stat(resolvedPath) : null;
     const cacheEligible = resolvedPath !== null && identity !== null && typeof deps.supervisorDir === "string";
     if (cacheEligible) {
@@ -213,7 +285,7 @@ export function resolvedBackend(deps = {}) {
             });
         }
     }
-    const result = { backend: "stock", ...binPathFields(resolvedPath, viceBin) };
+    const result = { backend: "stock", ...binPathFields(resolvedPath, viceBin), locationRefusal };
     memoisedResult = result;
     return result;
 }

package/resources/broker-launch.mjs

@@ -320,7 +320,13 @@ export function buildViceArgs(port, { backend, mcpHost, binmonHost, viceArgsEnv,
 function spawnAndRecordInstance(reason, port, deps) {
     const spawnFn = deps.spawn ?? ((cmd, args, opts) => nodeSpawn(cmd, args, opts));
     const now = deps.now ?? (() => Date.now());
-    const viceBin = deps.viceBin ?? process.env.VICE_BIN ?? "x64sc";
+    // Phase 60 (LOC-02): no environment-variable fallback here any more -- the
+    // real broker resolves the binary ONCE at startup through backend-detect.mts's
+    // resolvedBackend() (which itself now consults the tool-location seam) and
+    // threads that SAME value down through deps.viceBin on every call. The
+    // literal "x64sc" default below is only ever reached by a caller (a test)
+    // that supplies neither.
+    const viceBin = deps.viceBin ?? "x64sc";
     const backend = deps.backend ?? "stock";
     // The ONE construction site for a fresh InstanceRecord asserts the
     // invariant every downstream consumer (HeldLease, textConnect(), etc.) was
@@ -1156,7 +1162,10 @@ function launchSupervised(reason, port, deps, crashTimes, backoffMs, remoteMonit
     const logDir = deps.epoch.instanceLogDirFor(deps.stateDir, port);
     mkdirSync(logDir, { recursive: true });
     const epoch = deps.epoch.nextEpochFor(supervisorDir);
-    const viceBin = deps.viceBin ?? process.env.VICE_BIN ?? "x64sc";
+    // Phase 60 (LOC-02): same narrowing as spawnAndRecordInstance() above --
+    // no environment-variable fallback here, the real broker always threads
+    // its once-resolved viceBin down through deps.viceBin.
+    const viceBin = deps.viceBin ?? "x64sc";
     // Timestamp PLUS the epoch number: Date.now() alone can collide across
     // two respawns inside the same millisecond when the injected sleepMs
     // resolves immediately (exactly what this module's own tests do to stay

package/resources/ghidra-project.mjs

@@ -366,8 +366,8 @@ const SLAFILE_ATTR_PATTERN = /\bslafile\s*=\s*"([^"]*)"/;
  * whether that `slafile` exists on disk beside its own `.ldefs` -- a SORTED
  * list (by `id`) so any assertion over the result is order-independent.
  *
- * `ghidraHome` is an explicit parameter, never read from
- * `process.env.GHIDRA_HOME` internally, so the whole function is drivable
+ * `ghidraHome` is an explicit parameter; this function never reads the
+ * `GHIDRA_HOME` environment variable internally, so the whole function is drivable
  * against a synthetic directory tree with no real Ghidra installation
  * present.
  *