gm-skill 2.0.1479 → 2.0.1481

package/gm-plugkit/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-plugkit",
-  "version": "2.0.1479",
+  "version": "2.0.1481",
   "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/gm-plugkit/plugkit-wasm-wrapper.js

@@ -2771,6 +2771,14 @@ async function runSpoolWatcher(instance, spoolDir) {
       console.log(`[dispatch] → verb=${verb} task=${taskBase} body=${bodyBytes.length}b`);
       logEvent('plugkit', 'dispatch.start', { verb, task: taskBase, body_bytes: bodyBytes.length, cwd: process.cwd() });
 
+      // Network-bound git verbs block the event loop for the duration of a push/fetch (~30s),
+      // so the 5s heartbeat cannot fire and the supervisor would reap the watcher as hung
+      // (the VERB ABORT). Stamp a busy_until window before the synchronous dispatch so the
+      // supervisor's heartbeat-stale check honors it, exactly as the browser runner does.
+      if (verb === 'git_finalize' || verb === 'git_push' || verb === 'git_fetch') {
+        try { _writeStatusBusy(90000); } catch (_) {}
+      }
+
       if (verb === 'memorize-fire' || verb === 'transition' || verb === 'prd-resolve' || verb === 'mutable-resolve') {
         try { autoRecordBrowserEditsFromBody(body, process.cwd(), taskBase, verb); } catch (_) {}
       }

package/gm-plugkit/supervisor.js

@@ -195,7 +195,15 @@ function checkWatcherHealth() {
     });
     return;
   }
-  const age = Date.now() - (status.ts || 0);
+  const now = Date.now();
+  // A long synchronous verb (git_finalize's ~30s network push, a chromium spawn)
+  // blocks the heartbeat write. The verb advertises busy_until in .status.json; while
+  // that is in the future the watcher is busy, not hung — reaping it kills the verb
+  // mid-flight (the VERB ABORT). Honor busy_until exactly as the agent boot probe does.
+  if (status.busy_until && status.busy_until > now) {
+    return;
+  }
+  const age = now - (status.ts || 0);
   if (age > STATUS_STALE_MS) {
     logEvent('supervisor.heartbeat-stale', {
       watcher_pid: currentChildPid,

package/gm.json

@@ -1,6 +1,6 @@
 {
   "name": "gm",
-  "version": "2.0.1479",
+  "version": "2.0.1481",
   "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.1479",
+  "version": "2.0.1481",
   "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",