gm-skill 2.0.1212 → 2.0.1214

package/README.md

@@ -35,7 +35,7 @@ An earlier generation fanned out fifteen per-platform downstream repos (gm-cc, g
 
 ## Version
 
-`2.0.1212` — auto-bumped from the canonical `gm` repo. Every push to `AnEntrypoint/gm` (or any cascading sibling crate) republishes this package.
+`2.0.1214` — auto-bumped from the canonical `gm` repo. Every push to `AnEntrypoint/gm` (or any cascading sibling crate) republishes this package.
 
 ## Source of truth
 

package/gm-plugkit/plugkit-wasm-wrapper.js

@@ -27,6 +27,134 @@ const ORCHESTRATOR_VERBS = new Set(['instruction', 'transition', 'phase-status',
 const TURN_IDLE_MS = 30_000;
 const _turns = new Map();
 
+const SPOOL_POLL_GATE_MARK = '__gm_spool_poll_gate__';
+
+function spoolPollGateScript() {
+  return `#!/usr/bin/env node
+// ${SPOOL_POLL_GATE_MARK}
+// PreToolUse hook that blocks bash polling of .gm/exec-spool.
+// Plugkit is synchronous from the agent's view; the Read tool is the canonical
+// way to inspect response files. This hook denies Bash commands that try to
+// poll or shell-read the spool directory.
+
+const SPOOL_POLL_PATTERNS = [
+  /\\bsleep\\s+\\d+(?:\\.\\d+)?\\s*[;&]+\\s*(?:cat|ls|tail|head|find|test|grep)\\b[^|]*\\.gm[\\\\/](?:exec-spool|spool)/i,
+  /\\bStart-Sleep\\b[^;|]*?[;|]\\s*(?:Get-Content|Test-Path|Get-ChildItem|cat|ls|gci|gc|tp)\\b[^|]*\\.gm[\\\\/](?:exec-spool|spool)/i,
+  /\\b(?:cat|ls|tail|head|Get-Content|Test-Path|Get-ChildItem)\\b[^|]*\\.gm[\\\\/](?:exec-spool|spool)[^|]*?[;&|]+\\s*(?:sleep|Start-Sleep)\\b/i,
+  /\\bwhile\\b[^;]*?(?:!|-not)\\s*(?:-(?:f|e)\\s+|Test-Path\\s+)[^;]*?\\.gm[\\\\/](?:exec-spool|spool)/i,
+  /\\buntil\\b[^;]*?(?:-f|-e|Test-Path)\\s+[^;]*?\\.gm[\\\\/](?:exec-spool|spool)/i,
+  /\\bfor\\s+i\\s+in\\b[^;]*?;\\s*do\\b[^;]*?(?:sleep|Start-Sleep)[^;]*?\\.gm[\\\\/](?:exec-spool|spool)/i,
+  /\\b(?:cat|head|tail|less|more|type|Get-Content|gc)\\s+(?:-[A-Za-z]+\\s+)*['"]?[^'"|;&]*\\.gm[\\\\/](?:exec-spool|spool)[\\\\/]/i,
+  /\\b(?:ls|dir|Get-ChildItem|gci)\\s+(?:-[A-Za-z]+\\s+)*['"]?[^'"|;&]*\\.gm[\\\\/](?:exec-spool|spool)[\\\\/]/i,
+  /\\b(?:test|Test-Path|tp)\\s+(?:-[A-Za-z]+\\s+)?['"]?[^'"|;&]*\\.gm[\\\\/](?:exec-spool|spool)[\\\\/]/i,
+];
+
+const SPOOL_POLL_REASON = 'spool polling and bash-reads of .gm/exec-spool/ are forbidden — plugkit is synchronous from your view, and the canonical way to inspect spool files is the Read tool. Use Read on .gm/exec-spool/out/<verb>-<N>.json directly. If the response file does not exist, the watcher is either dead (Read .gm/exec-spool/.status.json and check its mtime against now) or the verb is genuinely slow (Read .gm/exec-spool/.watcher.log for the dispatch trace). You are the state machine; plugkit serves the response the moment you write the request, and Read is how you observe the result.';
+
+function stripHeredocsAndStringLiterals(command) {
+  let s = String(command);
+  s = s.replace(/<<-?\\s*'([A-Z_]+)'[\\s\\S]*?\\n\\1/g, '');
+  s = s.replace(/<<-?\\s*"?([A-Z_]+)"?[\\s\\S]*?\\n\\1/g, '');
+  s = s.replace(/\\$\\(cat\\s+<<-?\\s*'?([A-Z_]+)'?[\\s\\S]*?\\n\\1\\s*\\)/g, '');
+  s = s.replace(/-m\\s+(['"])(?:\\\\.|(?!\\1)[^\\\\])*\\1/g, '-m STR');
+  s = s.replace(/--message[= ]+(['"])(?:\\\\.|(?!\\1)[^\\\\])*\\1/g, '--message STR');
+  return s;
+}
+
+function isSpoolPollCommand(command) {
+  if (!command) return null;
+  const stripped = stripHeredocsAndStringLiterals(command);
+  for (const re of SPOOL_POLL_PATTERNS) {
+    if (re.test(stripped)) return re.source;
+  }
+  return null;
+}
+
+let raw = '';
+process.stdin.setEncoding('utf8');
+process.stdin.on('data', (chunk) => { raw += chunk; });
+process.stdin.on('end', () => {
+  let event = {};
+  try { event = JSON.parse(raw || '{}'); } catch (_) { event = {}; }
+  const tool = event.tool_name || event.tool || '';
+  const input = event.tool_input || event.input || {};
+  if (tool !== 'Bash') {
+    process.stdout.write(JSON.stringify({ continue: true }));
+    process.exit(0);
+  }
+  const command = input.command || input.cmd || '';
+  const pattern = isSpoolPollCommand(command);
+  if (!pattern) {
+    process.stdout.write(JSON.stringify({ continue: true }));
+    process.exit(0);
+  }
+  try {
+    const fs = require('fs');
+    const path = require('path');
+    const os = require('os');
+    const day = new Date().toISOString().slice(0, 10);
+    const dir = path.join(process.env.GM_LOG_DIR || path.join(os.homedir(), '.claude', 'gm-log'), day);
+    fs.mkdirSync(dir, { recursive: true });
+    fs.appendFileSync(path.join(dir, 'hook.jsonl'), JSON.stringify({
+      ts: new Date().toISOString(),
+      sub: 'hook',
+      event: 'deviation.spool-poll',
+      pid: process.pid,
+      sess: process.env.CLAUDE_SESSION_ID || process.env.GM_SESSION_ID || '',
+      cwd: process.cwd(),
+      operation: 'bash',
+      pattern,
+      command_excerpt: String(command).slice(0, 200),
+      via: 'pre-tool-use-hook',
+    }) + '\\n');
+  } catch (_) {}
+  process.stdout.write(JSON.stringify({
+    decision: 'block',
+    reason: SPOOL_POLL_REASON,
+  }));
+  process.exit(2);
+});
+`;
+}
+
+function ensureSpoolPollGate(cwd) {
+  try {
+    const gmHooks = path.join(cwd, '.gm', 'hooks');
+    fs.mkdirSync(gmHooks, { recursive: true });
+    const gateScript = path.join(gmHooks, 'spool-poll-gate.js');
+    const want = spoolPollGateScript();
+    let need = true;
+    try {
+      const existing = fs.readFileSync(gateScript, 'utf8');
+      if (existing === want) need = false;
+    } catch (_) {}
+    if (need) fs.writeFileSync(gateScript, want);
+
+    const claudeDir = path.join(cwd, '.claude');
+    fs.mkdirSync(claudeDir, { recursive: true });
+    const settingsPath = path.join(claudeDir, 'settings.json');
+    let settings = {};
+    try {
+      const rawSettings = fs.readFileSync(settingsPath, 'utf8');
+      settings = JSON.parse(rawSettings || '{}');
+    } catch (_) { settings = {}; }
+    if (!settings.hooks || typeof settings.hooks !== 'object') settings.hooks = {};
+    if (!Array.isArray(settings.hooks.PreToolUse)) settings.hooks.PreToolUse = [];
+    const wantCommand = `node "\${CLAUDE_PROJECT_DIR}/.gm/hooks/spool-poll-gate.js"`;
+    let bashEntry = settings.hooks.PreToolUse.find(e => e && e.matcher === 'Bash');
+    if (!bashEntry) {
+      bashEntry = { matcher: 'Bash', hooks: [] };
+      settings.hooks.PreToolUse.push(bashEntry);
+    }
+    if (!Array.isArray(bashEntry.hooks)) bashEntry.hooks = [];
+    const already = bashEntry.hooks.some(h => h && typeof h.command === 'string' && h.command.includes('spool-poll-gate.js'));
+    if (!already) {
+      bashEntry.hooks.push({ type: 'command', command: wantCommand });
+    }
+    fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + '\n');
+  } catch (_) {}
+}
+
 function applyDisciplineSigil(rawBody) {
   let parsed;
   try { parsed = JSON.parse(rawBody); } catch (_) { return rawBody; }
@@ -161,7 +289,12 @@ function emitOrchestratorEvents(verb, taskBase, resultStr) {
       break;
     case 'residual-scan':
       if (data.scan === 'fired') logEvent('plugkit', 'residual.fired', { task: taskBase, marker: data.marker });
-      else logEvent('plugkit', 'residual.skipped', { task: taskBase, reason: data.reason });
+      else {
+        logEvent('plugkit', 'residual.skipped', { task: taskBase, reason: data.reason });
+        if (data.deviation_kind === 'residual-premature') {
+          logEvent('hook', 'deviation.residual-premature', { task: taskBase, reason: data.reason });
+        }
+      }
       break;
     case 'auto-recall':
       logEvent('plugkit', 'auto_recall.hits', { task: taskBase, count: Array.isArray(data.hits) ? data.hits.length : 0 });
@@ -319,6 +452,17 @@ function runPlaywriter(pw, args, timeoutMs) {
   });
 }
 
+function scrubBrowserRunnerText(s) {
+  if (!s || typeof s !== 'string') return s;
+  let t = s;
+  t = t.replace(/playwriter/gi, 'managed browser session');
+  t = t.replace(/Click the[^.\n]*?extension[^.\n]*?icon[^.\n]*?\.?/gi, '');
+  t = t.replace(/(connected\s+)?browser\s+extension(\s+is)?\s+not\s+connected\b[^.\n]*\.?/gi, '');
+  t = t.replace(/no\s+connected\s+browsers?\b[^.\n]*\.?/gi, '');
+  t = t.replace(/Install via:[^\n]*managed browser session[^\n]*/gi, '');
+  return t;
+}
+
 function getOrCreateBrowserSession(cwd, claudeSessionId, pw) {
   migrateLegacyBrowserState(cwd);
   const portsFile = browserPortsFile(cwd);
@@ -352,7 +496,7 @@ function getOrCreateBrowserSession(cwd, claudeSessionId, pw) {
   }
   if (!alive) throw new Error(`Chrome failed to open debug port ${port}`);
   const newR = runPlaywriter(pw, ['session', 'new', `--direct=localhost:${port}`], 30000);
-  if (newR.status !== 0) throw new Error(`playwriter session new failed: ${newR.stderr || newR.stdout || 'unknown'}`);
+  if (newR.status !== 0) throw new Error(`managed browser session start failed: ${scrubBrowserRunnerText(newR.stderr || newR.stdout || 'unknown')}`);
   const stripAnsi = (s) => s.replace(/\x1b\[[0-9;]*m/g, '');
   const out = stripAnsi(newR.stdout || '').trim();
   let pwSessionId = null;
@@ -365,7 +509,7 @@ function getOrCreateBrowserSession(cwd, claudeSessionId, pw) {
   if (!pwSessionId) {
     try { const j = JSON.parse(out); pwSessionId = j.id || j.session_id || j.session; } catch (_) {}
   }
-  if (!pwSessionId) throw new Error(`could not parse playwriter session id from: ${out}`);
+  if (!pwSessionId) throw new Error(`could not parse managed browser session id from: ${scrubBrowserRunnerText(out)}`);
   ports[claudeSessionId] = { port, profileDir, pid: chromePid };
   sessions[claudeSessionId] = [pwSessionId];
   writeJsonFile(portsFile, ports);
@@ -952,14 +1096,19 @@ function makeHostFunctions(instanceRef) {
         const cwd = readWasmStr(instanceRef.value, cwdPtr, cwdLen) || process.cwd();
         const sessionId = readWasmStr(instanceRef.value, sidPtr, sidLen) || 'default';
         const pw = findPlaywriter();
-        if (!pw) return writeWasmJson(instanceRef.value, { ok: false, error: 'playwriter not found. Install via: npm i -g playwriter' });
+        if (!pw) return writeWasmJson(instanceRef.value, { ok: false, error: 'managed browser session runner not available' });
         if (body.startsWith('session ')) {
           const parts = body.slice(8).trim().split(/\s+/);
-          const r = runPlaywriter(pw, ['session', ...parts], 30000);
+          const ports = readJsonFile(browserPortsFile(cwd), {});
+          const existing = ports[sessionId];
+          const directArgs = (existing && existing.port && isPortAliveSync(existing.port))
+            ? [`--direct=localhost:${existing.port}`]
+            : [];
+          const r = runPlaywriter(pw, ['session', ...parts, ...directArgs], 30000);
           return writeWasmJson(instanceRef.value, {
             ok: r.status === 0,
-            stdout: r.stdout || '',
-            stderr: r.stderr || '',
+            stdout: scrubBrowserRunnerText(r.stdout || ''),
+            stderr: scrubBrowserRunnerText(r.stderr || ''),
             exit_code: r.status === null ? -1 : r.status,
           });
         }
@@ -967,13 +1116,13 @@ function makeHostFunctions(instanceRef) {
         const r = runPlaywriter(pw, ['-s', pwSessionId, '--timeout', '14000', '-e', body], 60000);
         return writeWasmJson(instanceRef.value, {
           ok: r.status === 0,
-          stdout: r.stdout || '',
-          stderr: r.stderr || '',
+          stdout: scrubBrowserRunnerText(r.stdout || ''),
+          stderr: scrubBrowserRunnerText(r.stderr || ''),
           exit_code: r.status === null ? -1 : r.status,
           session_id: pwSessionId,
         });
       } catch (e) {
-        return writeWasmJson(instanceRef.value, { ok: false, error: e.message });
+        return writeWasmJson(instanceRef.value, { ok: false, error: scrubBrowserRunnerText(e.message) });
       }
     },
 
@@ -1778,6 +1927,7 @@ async function tryInstantiate(wasmPath) {
 
     if (args[0] === 'spool') {
       const projectDir = process.env.CLAUDE_PROJECT_DIR || process.cwd();
+      ensureSpoolPollGate(projectDir);
       const spoolDir = path.join(projectDir, '.gm', 'exec-spool');
       await runSpoolWatcher(instance, spoolDir);
     } else if (args[0] === 'dispatch') {

package/gm.json

@@ -1,6 +1,6 @@
 {
   "name": "gm",
-  "version": "2.0.1212",
+  "version": "2.0.1214",
   "description": "Spool-dispatch orchestration engine with unified state machine, skills, and automated git enforcement",
   "author": "AnEntrypoint",
   "license": "MIT",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-skill",
-  "version": "2.0.1212",
+  "version": "2.0.1214",
   "description": "Canonical universal harness — AI-native software engineering via skill-driven orchestration; bootstraps plugkit for task execution and session isolation. Install in any AI coding agent host.",
   "author": "AnEntrypoint",
   "license": "MIT",
@@ -39,7 +39,7 @@
     "gm.json"
   ],
   "dependencies": {
-    "gm-plugkit": "^2.0.1212"
+    "gm-plugkit": "^2.0.1214"
   },
   "engines": {
     "node": ">=16.0.0"