gm-codex 2.0.967 → 2.0.969

package/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-codex",
-  "version": "2.0.967",
+  "version": "2.0.969",
   "description": "State machine agent with hooks, skills, and automated git enforcement",
   "author": {
     "name": "AnEntrypoint",

package/bin/bootstrap.js

@@ -27,7 +27,7 @@ function log(msg) {
 function probeBinaryVersion(binPath) {
   try {
     const { spawnSync } = require('child_process');
-    const r = spawnSync(binPath, ['--version'], { timeout: 3000, encoding: 'utf8' });
+    const r = spawnSync(binPath, ['--version'], { timeout: 3000, encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe'], windowsHide: true });
     if (r.error) return null;
     const text = `${r.stdout || ''} ${r.stderr || ''}`.trim();
     const m = text.match(/(\d+\.\d+\.\d+)/);
@@ -183,9 +183,7 @@ function acquireLock(lockPath) {
         continue;
       }
       if (Date.now() - start > ATTEMPT_TIMEOUT_MS) throw new Error(`lock wait timeout: ${lockPath}`);
-      const waitMs = 2000;
-      const deadline = Date.now() + waitMs;
-      while (Date.now() < deadline) {}
+      try { const { spawnSync } = require('child_process'); spawnSync(process.execPath, ['-e', 'setTimeout(()=>{}, 2000)'], { timeout: 2500, killSignal: 'SIGKILL', stdio: 'ignore', windowsHide: true }); } catch (_) {}
     }
   }
 }
@@ -382,8 +380,7 @@ async function bootstrap(opts) {
       if (!opts.silent) log(`cache heal (sha match): ${finalPath}${actualVersion ? ` (matches pin v${version})` : ''}`);
       proactiveKillForNewInstall(version, finalPath);
       pruneOldVersions(root, version, readRtkVersion(wrapperDir));
-      try { await bootstrapRtk(verDir, version, wrapperDir, opts.silent, root); }
-      catch (err) { log(`rtk fetch skipped: ${err.message}`); }
+      spawnDetachedRtkFetch(wrapperDir);
       return finalPath;
     }
   }
@@ -400,8 +397,7 @@ async function bootstrap(opts) {
       log(`cache heal (sha match) under lock: ${finalPath}`);
       proactiveKillForNewInstall(version, finalPath);
       pruneOldVersions(root, version, readRtkVersion(wrapperDir));
-      try { await bootstrapRtk(verDir, version, wrapperDir, opts.silent, root); }
-      catch (err) { log(`rtk fetch skipped: ${err.message}`); }
+      spawnDetachedRtkFetch(wrapperDir);
       return finalPath;
     }
 
@@ -461,14 +457,28 @@ async function bootstrap(opts) {
     obsEvent('bootstrap', 'install.done', { path: finalPath, version, kind: 'plugkit' });
     proactiveKillForNewInstall(version, finalPath);
     pruneOldVersions(root, version, readRtkVersion(wrapperDir));
-    try { await bootstrapRtk(verDir, version, wrapperDir, opts.silent, root); }
-    catch (err) { log(`rtk fetch skipped: ${err.message}`); }
+    spawnDetachedRtkFetch(wrapperDir);
     return finalPath;
   } finally {
     releaseLock(lockPath);
   }
 }
 
+function spawnDetachedRtkFetch(wrapperDir) {
+  try {
+    const { spawn } = require('child_process');
+    const child = spawn(process.execPath, [__filename, '--rtk-only', '--wrapper-dir', wrapperDir], {
+      detached: true,
+      stdio: 'ignore',
+      windowsHide: true,
+    });
+    child.unref();
+    obsEvent('bootstrap', 'rtk.detached.spawned', { pid: child.pid, wrapperDir });
+  } catch (err) {
+    log(`rtk detach spawn failed: ${err.message}`);
+  }
+}
+
 function rtkCacheDir(root, wrapperDir, plugkitVerDir) {
   const rtkVer = readRtkVersion(wrapperDir);
   if (!rtkVer) return plugkitVerDir;
@@ -613,7 +623,7 @@ function listRunningPlugkitImagePaths() {
     if (os.platform() === 'win32') {
       let parsed = null;
       try {
-        const p = spawnSync('powershell', ['-NoProfile', '-NonInteractive', '-Command', "Get-Process plugkit* -ErrorAction SilentlyContinue | Select-Object Id,Path | ConvertTo-Json -Compress"], { windowsHide: true, encoding: 'utf8', timeout: 5000, killSignal: 'SIGKILL' });
+        const p = spawnSync('powershell', ['-NoProfile', '-NonInteractive', '-Command', "Get-Process plugkit* -ErrorAction SilentlyContinue | Select-Object Id,Path | ConvertTo-Json -Compress"], { windowsHide: true, encoding: 'utf8', timeout: 5000, killSignal: 'SIGKILL', stdio: ['ignore', 'pipe', 'pipe'] });
         const text = ((p && p.stdout) || '').trim();
         if (text) {
           const j = JSON.parse(text);
@@ -628,7 +638,7 @@ function listRunningPlugkitImagePaths() {
           out.push({ pid, path: (item.Path || '').trim() });
         }
       } else {
-        const r = spawnSync('tasklist', ['/FI', 'IMAGENAME eq plugkit*', '/FO', 'CSV', '/NH'], { windowsHide: true, encoding: 'utf8', timeout: 5000, killSignal: 'SIGKILL' });
+        const r = spawnSync('tasklist', ['/FI', 'IMAGENAME eq plugkit*', '/FO', 'CSV', '/NH'], { windowsHide: true, encoding: 'utf8', timeout: 5000, killSignal: 'SIGKILL', stdio: ['ignore', 'pipe', 'pipe'] });
         const text = (r && r.stdout) || '';
         const seen = new Set();
         for (const line of text.split(/\r?\n/)) {
@@ -654,7 +664,7 @@ function listRunningPlugkitImagePaths() {
         out.push({ pid, path: imagePath });
       }
     } else {
-      const r = spawnSync('ps', ['-axo', 'pid=,comm='], { encoding: 'utf8' });
+      const r = spawnSync('ps', ['-axo', 'pid=,comm='], { encoding: 'utf8', timeout: 5000, killSignal: 'SIGKILL', stdio: ['ignore', 'pipe', 'pipe'] });
       const text = (r && r.stdout) || '';
       for (const line of text.split(/\r?\n/)) {
         const m = line.match(/^\s*(\d+)\s+(.+?)\s*$/);
@@ -663,7 +673,7 @@ function listRunningPlugkitImagePaths() {
         const pid = parseInt(m[1], 10);
         let imagePath = '';
         try {
-          const p = spawnSync('ps', ['-p', String(pid), '-o', 'command='], { encoding: 'utf8' });
+          const p = spawnSync('ps', ['-p', String(pid), '-o', 'command='], { encoding: 'utf8', timeout: 3000, killSignal: 'SIGKILL', stdio: ['ignore', 'pipe', 'pipe'] });
           imagePath = ((p && p.stdout) || '').trim().split(/\s+/)[0] || '';
         } catch (_) {}
         out.push({ pid, path: imagePath });
@@ -732,7 +742,28 @@ function killStaleDaemonIfVersionChanged(wrapperDir) {
 module.exports = { bootstrap, resolveCachedBinary, resolveCachedRtk, platformKey, binaryName, rtkBinaryName, cacheRoot, obsEvent, killRunningDaemons, killStaleDaemonIfVersionChanged, killSpoolWatcherInCwd, proactiveKillForNewInstall };
 
 if (require.main === module) {
-  bootstrap({ silent: false })
-    .then(p => { process.stdout.write(p + '\n'); process.exit(0); })
-    .catch(err => { log(`FATAL: ${err.message}`); obsEvent('bootstrap', 'fatal', { err: String(err.message || err) }); process.exit(1); });
+  const argv = process.argv.slice(2);
+  if (argv.includes('--rtk-only')) {
+    const wIdx = argv.indexOf('--wrapper-dir');
+    const wrapperDir = wIdx >= 0 ? argv[wIdx + 1] : __dirname;
+    (async () => {
+      try {
+        const version = readVersionFile(wrapperDir);
+        let root = cacheRoot();
+        try { ensureDir(root); }
+        catch (_) { root = fallbackCacheRoot(); ensureDir(root); }
+        const verDir = path.join(root, `v${version}`);
+        ensureDir(verDir);
+        await bootstrapRtk(verDir, version, wrapperDir, true, root);
+        process.exit(0);
+      } catch (err) {
+        obsEvent('bootstrap', 'rtk.detached.failed', { err: String(err.message || err) });
+        process.exit(1);
+      }
+    })();
+  } else {
+    bootstrap({ silent: false })
+      .then(p => { process.stdout.write(p + '\n'); process.exit(0); })
+      .catch(err => { log(`FATAL: ${err.message}`); obsEvent('bootstrap', 'fatal', { err: String(err.message || err) }); process.exit(1); });
+  }
 }

package/bin/plugkit.js

@@ -7,6 +7,30 @@ const { bootstrap, resolveCachedBinary, resolveCachedRtk, obsEvent, killStaleDae
 
 const dir = __dirname;
 
+function readPinnedVersion() {
+  try { return fs.readFileSync(path.join(dir, 'plugkit.version'), 'utf8').trim(); } catch (_) { return null; }
+}
+
+function probeCachedVersion(binPath) {
+  try {
+    const r = spawnSync(binPath, ['--version'], { timeout: 3000, encoding: 'utf8', windowsHide: true });
+    if (r.error) return null;
+    const text = `${r.stdout || ''} ${r.stderr || ''}`.trim();
+    const m = text.match(/(\d+\.\d+\.\d+)/);
+    return m ? m[1] : null;
+  } catch (_) { return null; }
+}
+
+async function resolveBinaryWithPinCheck() {
+  const cached = resolveCachedBinary({ wrapperDir: dir });
+  if (!cached) return null;
+  const pin = readPinnedVersion();
+  if (!pin) return cached;
+  const got = probeCachedVersion(cached);
+  if (got && got === pin) return cached;
+  try { return await bootstrap({ wrapperDir: dir, silent: true }); } catch (_) { return cached; }
+}
+
 function envWithRtkOnPath() {
   const rtkPath = resolveCachedRtk({ wrapperDir: dir });
   if (!rtkPath) return process.env;
@@ -49,7 +73,7 @@ async function main() {
       // below — fall through to the spawn path so the actual handler runs.
       if (!bin) process.exit(0);
     } else if (isHook) {
-      bin = resolveCachedBinary({ wrapperDir: dir }) || legacyFallback();
+      bin = (await resolveBinaryWithPinCheck()) || legacyFallback();
       if (!bin) {
         process.stderr.write(`[plugkit] hook ${hookSubcmd} skipped: binary not yet installed. Bootstrap will run on session-start.\n`);
         obsEvent('plugkit_wrapper', 'hook_skip_uncached', { argv: args.slice(0, 4), dur_ms: Date.now() - startedAt });

package/gm.json

@@ -1,6 +1,6 @@
 {
   "name": "gm",
-  "version": "2.0.967",
+  "version": "2.0.969",
   "description": "State machine agent with hooks, skills, and automated git enforcement",
   "author": "AnEntrypoint",
   "license": "MIT",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-codex",
-  "version": "2.0.967",
+  "version": "2.0.969",
   "description": "State machine agent with hooks, skills, and automated git enforcement",
   "author": "AnEntrypoint",
   "license": "MIT",

package/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "gm",
-  "version": "2.0.967",
+  "version": "2.0.969",
   "description": "State machine agent with hooks, skills, and automated git enforcement",
   "author": {
     "name": "AnEntrypoint",

package/skills/gm/SKILL.md

@@ -50,13 +50,17 @@ One subagent per fact, fan out in parallel — batching dilutes the signal. The
 
 ## Execution order
 
-1. Recall (`exec:recall` via Bash) — cheapest
-2. Code execution — write to `.gm/exec-spool/in/<lang>/<N>.<ext>` (nodejs, python, bash, typescript, go, rust, c, cpp, java, deno); spool watcher runs and streams to `out/<N>.out` (stdout) + `out/<N>.err` (stderr), with `out/<N>.json` metadata sidecar at completion
-3. Codebase search (`exec:codesearch` via Bash) — 90% of lookups
+The spool is the universal dispatch surface. Write a file to `.gm/exec-spool/in/<lang-or-verb>/<N>.<ext>`; the watcher executes and streams `out/<N>.out` + `out/<N>.err` + `out/<N>.json`. Languages: nodejs, python, bash, typescript, go, rust, c, cpp, java, deno. Verbs: codesearch, recall, memorize, wait, sleep, status, close, browser, runner, type, kill-port, forget, feedback, learn-status, learn-debug, learn-build, discipline, pause, health.
+
+Order of cheapness:
+
+1. Recall — `in/recall/<N>.txt` with the query
+2. Codebase search — `in/codesearch/<N>.txt` with two-word query, 90% of lookups
+3. Code execution — `in/<lang>/<N>.<ext>`
 4. Web (`WebFetch`, `WebSearch`) — env facts not in codebase
 5. User — last resort
 
-Bash accepts ONLY git commands and utility verbs (`exec:recall`, `exec:codesearch`, `exec:memorize`, `exec:wait`, `exec:browser`, etc.). All code execution goes via the spool. Never `Bash(node/npm/npx/bun)`. `git push` triggers auto CI watch via Stop hook.
+Bash accepts ONLY git commands directly (`git status`, `git commit`, `git push`, `git log`, `gh ...`). Everything else — code AND every utility verb — dispatches via the spool. Never `Bash(node/npm/npx/bun)`, never `Bash(exec:<anything>)`. `git push` triggers auto CI watch via Stop hook.
 
 Skill chain: `planning` → `gm-execute` → `gm-emit` → `gm-complete` → `update-docs`.
 

package/skills/gm-complete/SKILL.md

@@ -54,7 +54,7 @@ Long-running probes split into navigate-call → `exec:wait N` → probe-call to
 
 Exempt only when: change is server-only with zero browser-facing surface, OR the repository has no browser surface at all (pure CLI / library). Exemption requires explicit tag in the response: `BROWSER EXEMPT: <reason — must reference diff paths showing zero browser-facing surface>`. Default posture is NOT exempt — burden is on the agent to prove exemption with diff evidence.
 
-Pre-flight: run `git diff --name-only origin/main..HEAD` and grep for `client/|docs/|\.html$|\.glsl$|\.frag$|\.vert$`. Any hit AND no `exec:browser` block in this session → mandatory regression to `gm-execute`.
+Pre-flight: run `git diff --name-only origin/main..HEAD` directly via Bash, then dispatch a nodejs spool file that reads the diff list and filters lines matching `client/|docs/|\.html$|\.glsl$|\.frag$|\.vert$`. Any hit AND no `exec:browser` block in this session → mandatory regression to `gm-execute`.
 
 ## Integration test gate
 

package/skills/gm-execute/SKILL.md

@@ -40,13 +40,13 @@ Spend on `.prd` items in descending order of consequence-if-wrong × distance-fr
 
 ## Code execution
 
-Code runs through the file-spool, not Bash. Write a file to `.gm/exec-spool/in/<lang>/<N>.<ext>` (e.g. `in/nodejs/42.js`, `in/python/43.py`, `in/bash/44.sh`); the spool watcher executes and streams stdout to `out/<N>.out`, stderr to `out/<N>.err`, then writes `out/<N>.json` metadata sidecar at completion (taskId, lang, ok, exitCode, durationMs, timedOut, startedAt, endedAt). Both streams return as systemMessage with `--- stdout ---` / `--- stderr ---` separators. Languages: nodejs (default), bash, python, typescript, go, rust, c, cpp, java, deno. File I/O via a nodejs spool file + `require('fs')`. Git directly in Bash. Utility verbs (`exec:recall`, `exec:codesearch`, `exec:memorize`, `exec:wait`, `exec:sleep`, `exec:browser`, etc.) DO run via Bash with the verb on line 1 and arg on line 2. Never `Bash(node/npm/npx/bun)`.
+Code AND utility verbs both run through the file-spool. Write a file to `.gm/exec-spool/in/<lang-or-verb>/<N>.<ext>` — language stems (`in/nodejs/42.js`, `in/python/43.py`, `in/bash/44.sh`, plus typescript, go, rust, c, cpp, java, deno) or verb stems (`in/codesearch/45.txt`, `in/recall/46.txt`, `in/memorize/47.md`, plus wait, sleep, status, close, browser, runner, type, kill-port, forget, feedback, learn-status, learn-debug, learn-build, discipline, pause, health). The spool watcher executes and streams stdout to `out/<N>.out`, stderr to `out/<N>.err`, then writes `out/<N>.json` metadata sidecar at completion (taskId, lang, ok, exitCode, durationMs, timedOut, startedAt, endedAt). Both streams return as systemMessage with `--- stdout ---` / `--- stderr ---` separators. File I/O via a nodejs spool file + `require('fs')`. Only `git` and `gh` run directly in Bash. Never `Bash(node/npm/npx/bun)`, never `Bash(exec:<anything>)`.
 
-Pack runs: `Promise.allSettled`, each idea own try/catch, under 12s per call. Runner: `exec:runner\n{start|stop|status}`.
+Pack runs: `Promise.allSettled`, each idea own try/catch, under 12s per call. Runner: write `in/runner/<N>.txt` with body `start` | `stop` | `status`.
 
 Every exec daemonizes. The hook tails the task logfile up to 30s wall-clock and returns whatever is there — short tasks complete inside the window and look synchronous; long tasks return a task_id with partial output. Continue with `exec:tail` (drain, bounded), `exec:watch` (resume blocking until match or timeout), or `exec:close` (terminate). Never re-spawn a long task to check on it — that orphans the first one. `exec:wait` is a pure timer; `exec:sleep` blocks on a specific task's output; `exec:watch` is the match-or-timeout primitive. Every execution-platform RPC returns the live list of running tasks for this session — close stragglers via `exec:close\n<id>` so the list stays scannable. Session-end (clear/logout/prompt_input_exit) kills the session's tasks; compaction/handoff preserves them.
 
-Utility verbs (`exec:wait`, `exec:sleep`, `exec:status`, `exec:close`, `exec:pause`, `exec:type`, `exec:runner`, `exec:kill-port`, `exec:recall`, `exec:memorize`, `exec:forget`) take their argument on the next line. Inline form (`exec:status <id>`) is denied by the hook.
+Every utility verb dispatches via `in/<verb>/<N>.txt`; the body of the file is the verb's argument. There is no inline form and no Bash-prefix form — both are denied by the hook.
 
 ## Codebase search
 

package/skills/planning/SKILL.md

@@ -103,7 +103,7 @@ The 200 lines are a *budget* for maximum surface coverage, not a target. Subsyst
 
 ## Execution norms encoded in the plan
 
-Code execution writes to `.gm/exec-spool/in/<lang>/<N>.<ext>`; the spool watcher runs the file and streams to `out/<N>.out` (stdout) + `out/<N>.err` (stderr) line-by-line, then writes `out/<N>.json` metadata (exitCode, durationMs, timedOut, startedAt, endedAt) at completion. Both streams return as systemMessage with `--- stdout ---` / `--- stderr ---` separators. `in/` and `out/` are wiped at session start and at real-exit session end. Utility verbs (`exec:recall`, `exec:codesearch`, `exec:memorize`, `exec:wait`, etc.) and `git` run directly via Bash. Never `Bash(node/npm/npx/bun)`. Spool paths in nodejs files are platform-literal — use `os.tmpdir()` and `path.join`. The spool enforces per-task timeouts; on timeout, partial output is preserved and the watcher emits `[exec timed out after Nms; partial output above]`.
+Code execution AND utility verbs both write to `.gm/exec-spool/in/<lang-or-verb>/<N>.<ext>`. Languages live under `in/<lang>/` (nodejs, python, bash, typescript, go, rust, c, cpp, java, deno); verbs live under `in/<verb>/` (codesearch, recall, memorize, wait, sleep, status, close, browser, runner, type, kill-port, forget, feedback, learn-status, learn-debug, learn-build, discipline, pause, health). The spool watcher runs the file and streams to `out/<N>.out` (stdout) + `out/<N>.err` (stderr) line-by-line, then writes `out/<N>.json` metadata (exitCode, durationMs, timedOut, startedAt, endedAt) at completion. Both streams return as systemMessage with `--- stdout ---` / `--- stderr ---` separators. `in/` and `out/` are wiped at session start and at real-exit session end. Only `git` (and `gh`) run directly via Bash; never `Bash(node/npm/npx/bun)`, never `Bash(exec:<anything>)`. Spool paths in nodejs files are platform-literal — use `os.tmpdir()` and `path.join`. The spool enforces per-task timeouts; on timeout, partial output is preserved and the watcher emits `[exec timed out after Nms; partial output above]`.
 
 `exec:codesearch` only — Grep/Glob/Find/Explore are hook-blocked. Start two words, change/add one per pass, minimum four attempts before concluding absent.