gm-skill 2.0.1220 → 2.0.1222

package/README.md

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

package/bin/plugkit.version

@@ -1 +1 @@
-0.1.448
+0.1.449

package/bin/plugkit.wasm.sha256

@@ -1 +1 @@
-9bafe43d985cebd33c63433b532a7f396599905fa1d90c9f411ea292f10fd7c1  plugkit.wasm
+0cac0a48e7346d2f75779c9972efe47c3f4ab38063a077660906a53028d2e70a  plugkit.wasm

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

@@ -49,7 +49,7 @@ const SPOOL_POLL_PATTERNS = [
   /\\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.';
+const SPOOL_POLL_REASON = 'spool polling and bash-reads of .gm/exec-spool/ are forbidden — plugkit is synchronous from your view, and the Read tool is the canonical way to inspect spool files. Specific replacements:\\n\\n- Instead of \`cat .gm/exec-spool/.status.json\` → use the Read tool: \`Read .gm/exec-spool/.status.json\`\\n- Instead of \`ls .gm/exec-spool/out/\` → check the specific response file you wrote, e.g. \`Read .gm/exec-spool/out/<verb>-<N>.json\`\\n- Instead of \`cat .gm/exec-spool/.watcher.log\` → use the Read tool with offset for tailing\\n- Instead of \`sleep N; cat .gm/exec-spool/<...>\` → just Read the response file directly; if it doesn\\'t exist yet, the watcher is dead (Read .gm/exec-spool/.status.json — fresh ts means alive) or the verb is slow (Read .gm/exec-spool/.watcher.log for the dispatch trace)\\n\\nYou are the state machine. Plugkit serves the response the moment you write the request file. If you find yourself thinking "let me just check whether the file is there yet" — use Read. If you find yourself thinking "the watcher might have died" — Read .gm/exec-spool/.status.json. Bash on .gm/exec-spool/ is wrong every single time.';
 
 function stripHeredocsAndStringLiterals(command) {
   let s = String(command);
@@ -78,6 +78,17 @@ function isBrowserRunningFileLocal(rel) {
   return false;
 }
 
+function hashFileShortLocal(cwd, rel) {
+  try {
+    const fs = require('fs');
+    const path = require('path');
+    const crypto = require('crypto');
+    const abs = path.isAbsolute(rel) ? rel : path.join(cwd, rel);
+    const buf = fs.readFileSync(abs);
+    return crypto.createHash('sha256').update(buf).digest('hex').slice(0, 12);
+  } catch (_) { return ''; }
+}
+
 function recordBrowserEditLocal(cwd, filePath) {
   try {
     const fs = require('fs');
@@ -89,8 +100,11 @@ function recordBrowserEditLocal(cwd, filePath) {
     fs.mkdirSync(path.dirname(editsFile), { recursive: true });
     let list = [];
     try { list = JSON.parse(fs.readFileSync(editsFile, 'utf8')); if (!Array.isArray(list)) list = []; } catch (_) {}
-    const entry = { file: rel.replace(/\\\\/g, '/'), ts: Date.now() };
-    if (!list.some(e => e && e.file === entry.file)) list.push(entry);
+    const relPath = rel.replace(/\\\\/g, '/');
+    const hash = hashFileShortLocal(cwd, relPath);
+    const idx = list.findIndex(e => e && e.file === relPath);
+    const entry = { file: relPath, ts: Date.now(), hash };
+    if (idx === -1) list.push(entry); else list[idx] = entry;
     fs.writeFileSync(editsFile, JSON.stringify(list));
     return true;
   } catch (_) { return false; }
@@ -282,11 +296,29 @@ function dispatchVerbToWasmInternal(instance, verb, body) {
   }
 }
 
-function tryAutoRecallForTurnEntry(instance, sess, cwd) {
+const AUTO_RECALL_STOPWORDS = new Set([
+  'the','a','an','and','or','but','if','then','else','for','of','to','in','on','at','by','with','from','as','is','are','was','were','be','been','being','have','has','had','do','does','did','will','would','should','could','can','may','might','must','shall',
+  'look','check','see','use','make','run','get','set','put','take','give','find','show','tell','let','keep','try','add','new','old','this','that','these','those','it','its','their','there','here','about','into','over','under','also','just','some','any','all','more','less','most','past','minutes','minute','hours','hour','seconds','second','days','day',
+]);
+
+function deriveFallbackQuery(prompt) {
   try {
-    const prompt = readUserPromptForRecall(cwd);
-    if (!prompt) return null;
-    const out = dispatchVerbToWasmInternal(instance, 'auto-recall', prompt);
+    const tokens = String(prompt).toLowerCase().split(/[^a-z0-9_]+/).filter(Boolean);
+    const freq = new Map();
+    for (const t of tokens) {
+      if (t.length < 4) continue;
+      if (AUTO_RECALL_STOPWORDS.has(t)) continue;
+      freq.set(t, (freq.get(t) || 0) + 1);
+    }
+    const ranked = Array.from(freq.entries()).sort((a, b) => b[1] - a[1] || a[0].localeCompare(b[0]));
+    const top = ranked.slice(0, 3).map(([w]) => w);
+    return top.join(' ');
+  } catch (_) { return ''; }
+}
+
+function dispatchAutoRecall(instance, queryPrompt) {
+  try {
+    const out = dispatchVerbToWasmInternal(instance, 'auto-recall', queryPrompt);
     if (!out) return null;
     let parsed;
     try { parsed = JSON.parse(out); } catch (_) { return null; }
@@ -297,8 +329,61 @@ function tryAutoRecallForTurnEntry(instance, sess, cwd) {
     }
     if (!inner || typeof inner !== 'object') return null;
     const hits = Array.isArray(inner.results) ? inner.results : (Array.isArray(inner.hits) ? inner.hits : []);
-    const payload = { query: inner.query || '', hits, fired_at: new Date().toISOString(), turn_entry: true };
-    logEvent('plugkit', 'auto_recall.turn-entry', { sess, query: payload.query, count: hits.length });
+    return { query: inner.query || '', hits };
+  } catch (_) { return null; }
+}
+
+function tryAutoRecallForTurnEntry(instance, sess, cwd) {
+  try {
+    const prompt = readUserPromptForRecall(cwd);
+    let emptyPromptFallback = false;
+    let effectivePrompt = prompt;
+    if (!prompt || !String(prompt).trim()) {
+      emptyPromptFallback = true;
+      const key = sess || '(no-session)';
+      const t = _turns.get(key);
+      const phase = (t && t.lastPhase) || 'PLAN';
+      const phaseQueryMap = {
+        PLAN: 'PLAN orient',
+        EXECUTE: 'EXECUTE work',
+        EMIT: 'EMIT closure',
+        VERIFY: 'VERIFY trajectory',
+        COMPLETE: 'COMPLETE residual',
+      };
+      effectivePrompt = phaseQueryMap[phase] || 'PLAN orient';
+    }
+    const primary = dispatchAutoRecall(instance, effectivePrompt);
+    const fallbackQuery = deriveFallbackQuery(effectivePrompt);
+    let fallback = null;
+    if (fallbackQuery && fallbackQuery !== (primary && primary.query)) {
+      fallback = dispatchAutoRecall(instance, fallbackQuery);
+    }
+    const seen = new Set();
+    const merged = [];
+    for (const src of [primary, fallback]) {
+      if (!src || !Array.isArray(src.hits)) continue;
+      for (const h of src.hits) {
+        const id = h && (h.id || h.hash || h.key || JSON.stringify(h));
+        if (id && seen.has(id)) continue;
+        if (id) seen.add(id);
+        merged.push(h);
+      }
+    }
+    const queries = [];
+    if (primary && primary.query) queries.push(primary.query);
+    if (fallback && fallback.query && !queries.includes(fallback.query)) queries.push(fallback.query);
+    const payload = {
+      query: (primary && primary.query) || effectivePrompt || '',
+      queries,
+      hits: merged.slice(0, 20),
+      fired_at: new Date().toISOString(),
+      turn_entry: true,
+    };
+    if (emptyPromptFallback) {
+      payload.fallback_reason = 'empty-prompt';
+      if (!payload.query) payload.query = effectivePrompt;
+    }
+    logEvent('plugkit', 'auto_recall.turn-entry', { sess, queries, count: merged.length });
     return payload;
   } catch (e) {
     logEvent('plugkit', 'auto_recall.error', { sess, error: String(e && e.message || e) });
@@ -1224,6 +1309,7 @@ function makeHostFunctions(instanceRef) {
         const lang = opts.lang || 'nodejs';
         const cwd = opts.cwd || process.cwd();
         const rawTimeout = opts.timeoutMs;
+        const MIN_TIMEOUT_MS = 100;
         if (rawTimeout === undefined || rawTimeout === null || typeof rawTimeout !== 'number' || !Number.isFinite(rawTimeout) || rawTimeout <= 0 || !Number.isInteger(rawTimeout)) {
           return writeWasmJson(instanceRef.value, {
             ok: false,
@@ -1233,6 +1319,15 @@ function makeHostFunctions(instanceRef) {
             received: rawTimeout === undefined ? null : rawTimeout,
           });
         }
+        if (rawTimeout < MIN_TIMEOUT_MS) {
+          return writeWasmJson(instanceRef.value, {
+            ok: false,
+            error: 'timeoutMs below floor',
+            min: MIN_TIMEOUT_MS,
+            received: rawTimeout,
+            paper_ref: '§20',
+          });
+        }
         const timeoutMs = rawTimeout;
         let cmd, args;
         if (lang === 'nodejs' || lang === 'js') { cmd = process.execPath; args = ['-e', code]; }
@@ -1800,10 +1895,23 @@ async function runSpoolWatcher(instance, spoolDir) {
 
       if (verb === 'browser') {
         try {
-          const witnessFile = path.join(process.cwd(), '.gm', 'exec-spool', '.turn-browser-witnessed');
+          const cwd_ = process.cwd();
+          const editsFile = path.join(cwd_, '.gm', 'exec-spool', '.turn-browser-edits.json');
+          const witnessFile = path.join(cwd_, '.gm', 'exec-spool', '.turn-browser-witnessed');
           fs.mkdirSync(path.dirname(witnessFile), { recursive: true });
-          fs.writeFileSync(witnessFile, JSON.stringify({ ts: Date.now(), task: taskBase, dur_ms }));
-          logEvent('plugkit', 'browser.witness-marked', { task: taskBase });
+          let edits = [];
+          try { edits = JSON.parse(fs.readFileSync(editsFile, 'utf8')); if (!Array.isArray(edits)) edits = []; } catch (_) {}
+          const witnessed_hashes = {};
+          for (const e of edits) {
+            if (!e || !e.file) continue;
+            try {
+              const abs = path.isAbsolute(e.file) ? e.file : path.join(cwd_, e.file);
+              const buf = fs.readFileSync(abs);
+              witnessed_hashes[e.file] = crypto.createHash('sha256').update(buf).digest('hex').slice(0, 12);
+            } catch (_) { witnessed_hashes[e.file] = ''; }
+          }
+          fs.writeFileSync(witnessFile, JSON.stringify({ ts: Date.now(), task: taskBase, dur_ms, witnessed_hashes }));
+          logEvent('plugkit', 'browser.witness-marked', { task: taskBase, files: Object.keys(witnessed_hashes) });
         } catch (_) {}
       }
 

package/gm.json

@@ -1,6 +1,6 @@
 {
   "name": "gm",
-  "version": "2.0.1220",
+  "version": "2.0.1222",
   "description": "Spool-dispatch orchestration engine with unified state machine, skills, and automated git enforcement",
   "author": "AnEntrypoint",
   "license": "MIT",
@@ -17,5 +17,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "plugkitVersion": "0.1.448"
+  "plugkitVersion": "0.1.449"
 }

package/lib/skill-bootstrap.js

@@ -342,7 +342,7 @@ const SPOOL_POLL_PATTERNS = [
   /\\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.';
+const SPOOL_POLL_REASON = 'spool polling and bash-reads of .gm/exec-spool/ are forbidden — plugkit is synchronous from your view, and the Read tool is the canonical way to inspect spool files. Specific replacements:\\n\\n- Instead of \`cat .gm/exec-spool/.status.json\` → use the Read tool: \`Read .gm/exec-spool/.status.json\`\\n- Instead of \`ls .gm/exec-spool/out/\` → check the specific response file you wrote, e.g. \`Read .gm/exec-spool/out/<verb>-<N>.json\`\\n- Instead of \`cat .gm/exec-spool/.watcher.log\` → use the Read tool with offset for tailing\\n- Instead of \`sleep N; cat .gm/exec-spool/<...>\` → just Read the response file directly; if it doesn\\'t exist yet, the watcher is dead (Read .gm/exec-spool/.status.json — fresh ts means alive) or the verb is slow (Read .gm/exec-spool/.watcher.log for the dispatch trace)\\n\\nYou are the state machine. Plugkit serves the response the moment you write the request file. If you find yourself thinking "let me just check whether the file is there yet" — use Read. If you find yourself thinking "the watcher might have died" — Read .gm/exec-spool/.status.json. Bash on .gm/exec-spool/ is wrong every single time.';
 
 function stripHeredocsAndStringLiterals(command) {
   let s = String(command);

package/lib/spool-dispatch.js

@@ -77,6 +77,14 @@ function browserWitnessFile(cwd) {
   return path.join(cwd || process.cwd(), '.gm', 'exec-spool', '.turn-browser-witnessed');
 }
 
+function hashFileShort(root, rel) {
+  try {
+    const abs = path.isAbsolute(rel) ? rel : path.join(root, rel);
+    const buf = fs.readFileSync(abs);
+    return require('crypto').createHash('sha256').update(buf).digest('hex').slice(0, 12);
+  } catch (_) { return ''; }
+}
+
 function recordBrowserEdit(cwd, filePath) {
   try {
     const root = cwd || process.cwd();
@@ -87,8 +95,11 @@ function recordBrowserEdit(cwd, filePath) {
     fs.mkdirSync(path.dirname(f), { recursive: true });
     let list = [];
     try { list = JSON.parse(fs.readFileSync(f, 'utf8')); if (!Array.isArray(list)) list = []; } catch (_) {}
-    const entry = { file: rel.replace(/\\/g, '/'), ts: Date.now() };
-    if (!list.some(e => e && e.file === entry.file)) list.push(entry);
+    const relPath = rel.replace(/\\/g, '/');
+    const hash = hashFileShort(root, relPath);
+    const idx = list.findIndex(e => e && e.file === relPath);
+    const entry = { file: relPath, ts: Date.now(), hash };
+    if (idx === -1) list.push(entry); else list[idx] = entry;
     fs.writeFileSync(f, JSON.stringify(list));
     return true;
   } catch (_) { return false; }
@@ -103,12 +114,27 @@ function clearBrowserTurnMarkers(cwd) {
 
 function markBrowserWitnessed(cwd, meta) {
   try {
-    const f = browserWitnessFile(cwd);
+    const root = cwd || process.cwd();
+    const f = browserWitnessFile(root);
     fs.mkdirSync(path.dirname(f), { recursive: true });
-    fs.writeFileSync(f, JSON.stringify({ ts: Date.now(), ...(meta || {}) }));
+    const edits = readBrowserEdits(root);
+    const witnessed_hashes = {};
+    for (const e of edits) {
+      if (!e || !e.file) continue;
+      witnessed_hashes[e.file] = hashFileShort(root, e.file);
+    }
+    fs.writeFileSync(f, JSON.stringify({ ts: Date.now(), witnessed_hashes, ...(meta || {}) }));
   } catch (_) {}
 }
 
+function readBrowserWitness(cwd) {
+  try {
+    const f = browserWitnessFile(cwd);
+    if (!fs.existsSync(f)) return null;
+    return JSON.parse(fs.readFileSync(f, 'utf8'));
+  } catch (_) { return null; }
+}
+
 function readBrowserEdits(cwd) {
   try {
     const f = browserEditsFile(cwd);
@@ -267,7 +293,7 @@ const SPOOL_POLL_PATTERNS = [
   /\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). Polling with sleep+cat/ls/Test-Path treats plugkit as an async worker; bare cat/ls of the spool dir treats it as a shell artifact. It is neither. You are the state machine; plugkit serves the response the moment you write the request, and Read is how you observe the result.';
+const SPOOL_POLL_REASON = 'spool polling and bash-reads of .gm/exec-spool/ are forbidden — plugkit is synchronous from your view, and the Read tool is the canonical way to inspect spool files. Specific replacements:\n\n- Instead of `cat .gm/exec-spool/.status.json` → use the Read tool: `Read .gm/exec-spool/.status.json`\n- Instead of `ls .gm/exec-spool/out/` → check the specific response file you wrote, e.g. `Read .gm/exec-spool/out/<verb>-<N>.json`\n- Instead of `cat .gm/exec-spool/.watcher.log` → use the Read tool with offset for tailing\n- Instead of `sleep N; cat .gm/exec-spool/<...>` → just Read the response file directly; if it doesn\'t exist yet, the watcher is dead (Read .gm/exec-spool/.status.json — fresh ts means alive) or the verb is slow (Read .gm/exec-spool/.watcher.log for the dispatch trace)\n\nYou are the state machine. Plugkit serves the response the moment you write the request file. If you find yourself thinking "let me just check whether the file is there yet" — use Read. If you find yourself thinking "the watcher might have died" — Read .gm/exec-spool/.status.json. Bash on .gm/exec-spool/ is wrong every single time.';
 
 function stripHeredocsAndStringLiterals(command) {
   let s = String(command);
@@ -354,6 +380,29 @@ function checkDispatchGates(sessionId, operation, extra) {
       const shown = files.slice(0, 5).join(', ') + (files.length > 5 ? `, +${files.length - 5} more` : '');
       residuals.push(`Browser Witness required: you edited ${shown} without dispatching the browser verb to witness the change in a live page. Per paper §23 this is non-negotiable. Either dispatch browser to verify the edit works in-browser, or revert the changes.`);
       logDeviation('deviation.browser-witness-missing', { files, operation });
+    } else if (browserEdits.length > 0 && isBrowserWitnessed(cwd)) {
+      const witness = readBrowserWitness(cwd) || {};
+      const wh = witness.witnessed_hashes || {};
+      const mismatches = [];
+      for (const e of browserEdits) {
+        if (!e || !e.file) continue;
+        const witnessed = wh[e.file];
+        if (!witnessed) {
+          mismatches.push({ file: e.file, reason: 'no witnessed hash recorded (file edited after witness, or witness predates edit)' });
+          continue;
+        }
+        const current = hashFileShort(cwd || process.cwd(), e.file);
+        if (current !== witnessed) {
+          mismatches.push({ file: e.file, witnessed_hash: witnessed, current_hash: current || '(unreadable)' });
+        }
+      }
+      if (mismatches.length > 0) {
+        const summary = mismatches.slice(0, 3).map(m =>
+          `${m.file} (witnessed=${m.witnessed_hash || 'none'}, current=${m.current_hash || '(none)'}${m.reason ? '; ' + m.reason : ''})`
+        ).join('; ');
+        residuals.push(`Browser Witness hash mismatch: you witnessed file(s) at one state, but their current content differs. Either the witness was on a different state or the file was reverted/re-edited without re-witnessing. Re-run the browser verb against the current state. Mismatches: ${summary}${mismatches.length > 3 ? `, +${mismatches.length - 3} more` : ''}`);
+        logDeviation('deviation.browser-witness-hash-mismatch', { mismatches, operation });
+      }
     }
     if (residuals.length > 0) {
       logDeviation('deviation.gate-deny', { operation, reason: 'stop-gate residuals', residuals });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-skill",
-  "version": "2.0.1220",
+  "version": "2.0.1222",
   "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.1220"
+    "gm-plugkit": "^2.0.1222"
   },
   "engines": {
     "node": ">=16.0.0"