gm-plugkit 2.0.1226 → 2.0.1228

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-plugkit",
-  "version": "2.0.1226",
+  "version": "2.0.1228",
   "description": "Bootstrap and daemon-spawn tool for gm plugkit binary. Downloads the correct platform binary, verifies SHA256, and starts the spool watcher daemon. Includes plugkit-wasm-wrapper for WASM-based spool watching.",
   "main": "index.js",
   "bin": {

package/plugkit-wasm-wrapper.js

@@ -47,6 +47,9 @@ const SPOOL_POLL_PATTERNS = [
   /\\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,
+  /\\bfind\\b[^|]*['"]?[^'"|;&]*\\.gm[\\\\/](?:exec-spool|spool)\\b/i,
+  /\\b(?:stat|file|wc|Get-Item|gi|Get-Acl|Resolve-Path|Select-String|sls)\\b[^|]*['"]?[^'"|;&]*\\.gm[\\\\/](?:exec-spool|spool)[\\\\/]?/i,
+  /\\b(?:xargs|parallel|fzf)\\b[^|]*\\.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 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.';
@@ -741,19 +744,36 @@ function isPortReachableSync(host, port, timeoutMs) {
     s.on('connect', () => { done = true; s.destroy(); process.exit(0); });
     s.on('error', () => { if (!done) process.exit(1); });
     setTimeout(() => { if (!done) { s.destroy(); process.exit(1); } }, ${timeoutMs || 800});
-  `], { timeout: (timeoutMs || 800) + 2000 });
+  `], { timeout: (timeoutMs || 800) + 2000, windowsHide: true });
   return r.status === 0;
 }
 
-let _acptoapiBoot = { spawned_at: 0, pid: null };
+let _acptoapiBoot = { spawned_at: 0, pid: null, last_check_ts: 0, last_check_ok: false };
 function ensureAcptoapi() {
   const host = '127.0.0.1';
   const port = 4800;
   try {
-    if (isPortReachableSync(host, port, 500)) {
-      _acptoapiBoot = { spawned_at: 0, pid: null, status: 'already-running' };
+    // Two-strike port check: localhost connect can race against node cold-
+    // start on Windows. If the first check fails, retry once with a longer
+    // timeout before declaring the port dead. iter9 sniff reported 29
+    // bootstrap.acptoapi.spawned events in 30m despite acptoapi being alive
+    // on :4800 (HTTP 200) — the check flaked under heartbeat-tick load.
+    let reachable = isPortReachableSync(host, port, 1500);
+    if (!reachable) {
+      reachable = isPortReachableSync(host, port, 3000);
+    }
+    if (reachable) {
+      const wasDown = _acptoapiBoot.spawned_at > 0 || !_acptoapiBoot.last_check_ok;
+      _acptoapiBoot = { spawned_at: 0, pid: null, status: 'already-running', last_check_ts: Date.now(), last_check_ok: true };
+      // Only log on transitions (down → up) so the heartbeat doesn't spam
+      // bootstrap.jsonl every 60s with redundant "alive" events.
+      if (wasDown) {
+        logEvent('bootstrap', 'acptoapi.heartbeat-ok', { port, transition: 'down-to-up' });
+      }
       return;
     }
+    _acptoapiBoot.last_check_ok = false;
+    _acptoapiBoot.last_check_ts = Date.now();
     if (_acptoapiBoot.spawned_at && Date.now() - _acptoapiBoot.spawned_at < 30000) {
       return;
     }
@@ -766,7 +786,9 @@ function ensureAcptoapi() {
       shell: false,
     });
     child.unref();
-    _acptoapiBoot = { spawned_at: Date.now(), pid: child.pid, status: 'spawned' };
+    _acptoapiBoot.spawned_at = Date.now();
+    _acptoapiBoot.pid = child.pid;
+    _acptoapiBoot.status = 'spawned';
     logEvent('bootstrap', 'acptoapi.spawned', { pid: child.pid, port });
   } catch (e) {
     logEvent('bootstrap', 'acptoapi.spawn-failed', { error: e && e.message });