gm-skill 2.0.1147 → 2.0.1148

package/README.md

@@ -35,7 +35,7 @@ An earlier generation fanned out fifteen per-platform downstream repos (gm-cc, g
 
 ## Version
 
-`2.0.1147` — auto-bumped from the canonical `gm` repo. Every push to `AnEntrypoint/gm` (or any cascading sibling crate) republishes this package.
+`2.0.1148` — 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/cli.js

@@ -1,18 +1,52 @@
 #!/usr/bin/env node
 'use strict';
 
-const { ensureReady, startSpoolDaemon, getBinaryPath, isReady } = require('./bootstrap');
+const fs = require('fs');
+const path = require('path');
+const { ensureReady, startSpoolDaemon } = require('./bootstrap');
 
 const usage = `gm-plugkit — Bootstrap and daemon-spawn for gm plugkit binary.
 
 Usage:
   bun x gm-plugkit@latest          Bootstrap + start spool daemon
-  bun x gm-plugkit@latest --daemon  Same as default
-  bun x gm-plugkit@latest --binary  Print binary path only
-  bun x gm-plugkit@latest --status  JSON status check
-  bun x gm-plugkit@latest --help    Show this help
+  bun x gm-plugkit@latest spool    Same as default (explicit)
+  bun x gm-plugkit@latest --daemon Same as default
+  bun x gm-plugkit@latest --binary Print binary path only
+  bun x gm-plugkit@latest --status JSON status check
+  bun x gm-plugkit@latest --help   Show this help
 `;
 
+function spoolDir() {
+  const projectDir = process.env.CLAUDE_PROJECT_DIR || process.cwd();
+  return path.join(projectDir, '.gm', 'exec-spool');
+}
+
+function ensureSpoolDir() {
+  try { fs.mkdirSync(spoolDir(), { recursive: true }); } catch (_) {}
+}
+
+function writeCliStatus(spec) {
+  try {
+    ensureSpoolDir();
+    fs.writeFileSync(
+      path.join(spoolDir(), '.cli-status.json'),
+      JSON.stringify({ ts: new Date().toISOString(), pid: process.pid, ...spec }, null, 2)
+    );
+  } catch (_) {}
+}
+
+function writeCliError(phase, err) {
+  try {
+    ensureSpoolDir();
+    const msg = err && err.message ? err.message : String(err);
+    const stack = err && err.stack ? err.stack : null;
+    fs.writeFileSync(
+      path.join(spoolDir(), '.bootstrap-error.json'),
+      JSON.stringify({ ts: new Date().toISOString(), pid: process.pid, error_phase: phase, error_message: msg, stack }, null, 2)
+    );
+  } catch (_) {}
+}
+
 (async () => {
   const args = process.argv.slice(2);
 
@@ -21,28 +55,54 @@ Usage:
     process.exit(0);
   }
 
+  ensureSpoolDir();
+  writeCliStatus({ phase: 'starting', args });
+
+  let bootstrapResult;
   try {
-    const result = await ensureReady();
-    if (!result.ok) {
-      console.error('Bootstrap failed:', result.error);
-      process.exit(1);
-    }
-
-    const daemon = startSpoolDaemon();
-    if (!daemon.ok) {
-      console.error('Daemon start failed:', daemon.error);
-      process.exit(1);
-    }
-
-    console.log(JSON.stringify({
-      ok: true,
-      binary: result.binaryPath,
-      daemon: daemon,
-      message: 'plugkit ready, spool watcher running'
-    }));
-    process.exit(0);
+    bootstrapResult = await ensureReady();
+  } catch (err) {
+    writeCliError('ensure-ready', err);
+    console.error('Bootstrap failed:', err.message);
+    process.exit(1);
+  }
+
+  if (!bootstrapResult || !bootstrapResult.ok) {
+    const errMsg = (bootstrapResult && bootstrapResult.error) || 'ensureReady returned non-ok';
+    writeCliError('ensure-ready', new Error(errMsg));
+    console.error('Bootstrap failed:', errMsg);
+    process.exit(1);
+  }
+
+  writeCliStatus({ phase: 'bootstrapped', version: bootstrapResult.version, binary: bootstrapResult.binaryPath });
+
+  let daemon;
+  try {
+    daemon = startSpoolDaemon();
   } catch (err) {
-    console.error('gm-plugkit failed:', err.message);
+    writeCliError('start-daemon', err);
+    console.error('Daemon start failed:', err.message);
     process.exit(1);
   }
-})();
+
+  if (!daemon || !daemon.ok) {
+    const errMsg = (daemon && daemon.error) || 'startSpoolDaemon returned non-ok';
+    writeCliError('start-daemon', new Error(errMsg));
+    console.error('Daemon start failed:', errMsg);
+    process.exit(1);
+  }
+
+  writeCliStatus({ phase: 'ready', version: bootstrapResult.version, daemon_pid: daemon.pid, log: daemon.logPath });
+
+  console.log(JSON.stringify({
+    ok: true,
+    binary: bootstrapResult.binaryPath,
+    daemon,
+    message: 'plugkit ready, spool watcher running'
+  }));
+  process.exit(0);
+})().catch((err) => {
+  writeCliError('uncaught', err);
+  console.error('gm-plugkit failed:', err && err.message ? err.message : err);
+  process.exit(1);
+});

package/gm.json

@@ -1,6 +1,6 @@
 {
   "name": "gm",
-  "version": "2.0.1147",
+  "version": "2.0.1148",
   "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.1147",
+  "version": "2.0.1148",
   "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.1147"
+    "gm-plugkit": "^2.0.1148"
   },
   "engines": {
     "node": ">=16.0.0"

package/skills/gm-skill/SKILL.md

@@ -18,7 +18,11 @@ bun x gm-plugkit@latest spool > /dev/null 2>&1 &
 
 If `bun` is not available, fall back to `npx -y gm-plugkit@latest spool > /dev/null 2>&1 &` or to the local wrapper if it's already installed: `node ~/.claude/gm-tools/plugkit-wasm-wrapper.js spool > /dev/null 2>&1 &`. The wrapper has a self-heal: if it detects a `LinkError` or missing wasm at instantiation, it re-runs bootstrap automatically and retries.
 
-Wait 2 seconds, verify `.status.json` is fresh. Then proceed.
+Wait 2 seconds, then verify boot:
+
+- Read `.gm/exec-spool/.cli-status.json` — the launcher writes its phase here (`starting` → `bootstrapped` → `ready`). Present with `phase: "ready"` = good.
+- Read `.gm/exec-spool/.status.json` — the watcher writes its heartbeat here every 5s. Fresh `ts` (within 15s) = watcher alive.
+- If neither file exists or `.cli-status.json` is stuck at an earlier phase, read `.gm/exec-spool/.bootstrap-error.json` — the launcher writes `{error_phase, error_message, stack}` on any failure even when stdout/stderr were redirected to `/dev/null`. Also read `.gm/exec-spool/.watcher.log` for the post-spawn trace. Surface the error to the user; do not retry blindly.
 
 ## Plugkit version updates