gm-skill 2.0.1293 → 2.0.1295

package/README.md

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

package/bin/plugkit.wasm.sha256

@@ -1 +1 @@
-d22156c2ef672875557c91649ddc0dfb86a403b431bbdb2b5048ab8870b95dd5  plugkit.wasm
+8d3e95567b644e3ad4429bfa1026220eaf3674afa317dc511997ec52fff5c8e8  plugkit.wasm

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

@@ -877,10 +877,25 @@ function cosineSim(a, b) {
   return dot / (Math.sqrt(na) * Math.sqrt(nb));
 }
 
+let __wasmAbortFlag = { aborted: false, code: 0 };
 function createWasiShim(instanceRef) {
   const getMemory = () => instanceRef.value.exports.memory.buffer;
   const shim = {
-    proc_exit: (code) => process.exit(code),
+    proc_exit: (code) => {
+      __wasmAbortFlag.aborted = true;
+      __wasmAbortFlag.code = code;
+      try {
+        const spoolDir = spoolDirForSentinel();
+        fs.mkdirSync(spoolDir, { recursive: true });
+        fs.writeFileSync(path.join(spoolDir, '.wasm-abort.json'), JSON.stringify({
+          ts: Date.now(),
+          exit_code: code,
+          verb_in_flight: __currentVerbContext,
+        }));
+      } catch (_) {}
+      try { console.error(`[plugkit-wasm] wasm proc_exit(${code}) intercepted; throwing to abort current verb without killing watcher`); } catch (_) {}
+      throw new Error(`wasm proc_exit(${code}) during verb ${__currentVerbContext && __currentVerbContext.verb}`);
+    },
     fd_write: (fd, iovs_ptr, iovs_len, nwritten_ptr) => {
       try {
         const buf = getMemory();
@@ -2024,6 +2039,27 @@ async function runSpoolWatcher(instance, spoolDir) {
     if (isProcessed(key)) return;
     markProcessed(key);
 
+    if (__wasmAbortFlag.aborted) {
+      try {
+        const taskBase = path.basename(filePath, path.extname(filePath));
+        const relPath = path.relative(inDir, filePath);
+        const dir = path.dirname(relPath);
+        const verb = dir === '.' ? taskBase : dir;
+        const outName = dir === '.' ? `${taskBase}.json` : `${verb}-${taskBase}.json`;
+        fs.writeFileSync(path.join(outDir, outName), JSON.stringify({
+          ok: false,
+          error: `wasm aborted earlier (exit_code=${__wasmAbortFlag.code}); watcher will respawn`,
+          wasm_aborted: true,
+        }));
+        try { fs.unlinkSync(filePath); } catch (_) {}
+      } catch (_) {}
+      unmarkProcessed(key);
+      emitShutdownReason('wasm-abort-graceful', new Error(`wasm proc_exit(${__wasmAbortFlag.code}) earlier; clean watcher restart`));
+      try { console.error('[plugkit-wasm] exiting after wasm abort to allow supervisor respawn'); } catch (_) {}
+      setTimeout(() => process.exit(2), 100).unref();
+      return;
+    }
+
     try {
       const content = fs.readFileSync(filePath, 'utf8');
       const relPath = path.relative(inDir, filePath);

package/gm.json

@@ -1,6 +1,6 @@
 {
   "name": "gm",
-  "version": "2.0.1293",
+  "version": "2.0.1295",
   "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.479"
+  "plugkitVersion": "0.1.480"
 }

package/lang/browser.js

@@ -9,12 +9,9 @@ function findPlugkit() {
   const home = os.homedir();
   const candidates = [
     path.join(__dirname, '..', 'bin', 'plugkit.js'),
+    path.join(home, '.gm-tools', 'plugkit.js'),
     path.join(home, '.claude', 'gm-tools', 'plugkit.js'),
-    path.join(home, '.claude', 'plugins', 'marketplaces', 'gm-cc', 'bin', 'plugkit.js'),
   ];
-  if (process.env.CLAUDE_PLUGIN_ROOT) {
-    candidates.push(path.join(process.env.CLAUDE_PLUGIN_ROOT, 'bin', 'plugkit.js'));
-  }
   for (const p of candidates) {
     if (fsSync.existsSync(p)) return p;
   }

package/lang/ssh.js

@@ -5,8 +5,12 @@ const fsSync = require('fs');
 const http = require('http');
 
 function loadTarget(targetName) {
-  const cfgPath = path.join(os.homedir(), '.claude', 'ssh-targets.json');
-  if (!fsSync.existsSync(cfgPath)) throw new Error('No ssh-targets.json found at ' + cfgPath);
+  const candidatesCfg = [
+    path.join(os.homedir(), '.gm-tools', 'ssh-targets.json'),
+    path.join(os.homedir(), '.claude', 'ssh-targets.json'),
+  ];
+  const cfgPath = candidatesCfg.find(p => fsSync.existsSync(p));
+  if (!cfgPath) throw new Error('No ssh-targets.json found at ' + candidatesCfg.join(' or '));
   const cfg = JSON.parse(fsSync.readFileSync(cfgPath, 'utf8'));
   const name = targetName || 'default';
   if (!cfg[name]) throw new Error('No target \'' + name + '\' in ssh-targets.json. Available: ' + Object.keys(cfg).join(', '));
@@ -26,6 +30,7 @@ function parseCommand(code) {
 
 function resolveSsh2() {
   const candidates = [
+    path.join(os.homedir(), '.gm-tools', 'node_modules', 'ssh2'),
     path.join(os.homedir(), '.claude', 'gm-tools', 'node_modules', 'ssh2'),
     path.join(os.homedir(), '.claude', 'plugins', 'node_modules', 'ssh2'),
     'ssh2',
@@ -33,7 +38,7 @@ function resolveSsh2() {
   for (const p of candidates) {
     try { return require(p); } catch (_) {}
   }
-  throw new Error('ssh2 not found. Run: cd ~/.claude/gm-tools && npm install ssh2');
+  throw new Error('ssh2 not found. Install into ~/.gm-tools/ with: mkdir -p ~/.gm-tools && cd ~/.gm-tools && npm install ssh2');
 }
 
 function getRunnerPort() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-skill",
-  "version": "2.0.1293",
+  "version": "2.0.1295",
   "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",
@@ -41,7 +41,7 @@
     "gm.json"
   ],
   "dependencies": {
-    "gm-plugkit": "^2.0.1293"
+    "gm-plugkit": "^2.0.1295"
   },
   "engines": {
     "node": ">=16.0.0"

package/scripts/watch-cascade.js

@@ -1,166 +0,0 @@
-#!/usr/bin/env node
-'use strict';
-
-const { execSync, spawnSync } = require('child_process');
-
-const REPOS = {
-  'rs-exec':       'AnEntrypoint/rs-exec',
-  'rs-codeinsight':'AnEntrypoint/rs-codeinsight',
-  'rs-search':     'AnEntrypoint/rs-search',
-  'rs-plugkit':    'AnEntrypoint/rs-plugkit',
-  'gm':            'AnEntrypoint/gm',
-  'gm-cc':         'AnEntrypoint/gm-cc',
-};
-
-const POLL_MS = 20000;
-const TIMEOUT_MS = 30 * 60 * 1000;
-
-function gh(args) {
-  const r = spawnSync('gh', args, { encoding: 'utf8' });
-  if (r.status !== 0) throw new Error(r.stderr.trim() || `gh ${args.join(' ')} failed`);
-  return r.stdout.trim();
-}
-
-function latestRun(repo) {
-  const out = gh(['run', 'list', '--repo', repo, '--limit', '1', '--json', 'databaseId,status,conclusion,name,headBranch,createdAt']);
-  const rows = JSON.parse(out);
-  return rows[0] || null;
-}
-
-function getGmCcSha() {
-  return gh(['api', 'repos/AnEntrypoint/gm-cc/git/refs/heads/main', '--jq', '.object.sha']);
-}
-
-function getInstalledSha() {
-  const os = require('os');
-  const path = require('path');
-  const fs = require('fs');
-  const base = path.join(os.homedir(), '.claude/plugins/cache/gm-cc/gm');
-  if (!fs.existsSync(base)) return null;
-  const dirs = fs.readdirSync(base).filter(d => /^[0-9a-f]{12,}$/.test(d));
-  dirs.sort((a, b) => {
-    try {
-      const av = JSON.parse(fs.readFileSync(path.join(base, a, 'gm.json'), 'utf8')).version || '0';
-      const bv = JSON.parse(fs.readFileSync(path.join(base, b, 'gm.json'), 'utf8')).version || '0';
-      return bv.localeCompare(av, undefined, { numeric: true });
-    } catch { return 0; }
-  });
-  if (!dirs[0]) return null;
-  const gm = JSON.parse(fs.readFileSync(path.join(base, dirs[0], 'gm.json'), 'utf8'));
-  return { hash: dirs[0], version: gm.version, plugkitVersion: gm.plugkitVersion };
-}
-
-function getPlugkitVersion() {
-  const fs = require('fs');
-  const cargo = 'C:/dev/rs-plugkit/Cargo.toml';
-  if (!fs.existsSync(cargo)) return null;
-  const m = fs.readFileSync(cargo, 'utf8').match(/^version\s*=\s*"([^"]+)"/m);
-  return m ? m[1] : null;
-}
-
-function validate(label, fn) {
-  try {
-    const result = fn();
-    console.log(`  ✓ ${label}: ${result}`);
-    return true;
-  } catch (e) {
-    console.log(`  ✗ ${label}: ${e.message}`);
-    return false;
-  }
-}
-
-async function watchRun(repo, runId, label) {
-  const start = Date.now();
-  while (Date.now() - start < TIMEOUT_MS) {
-    const out = gh(['run', 'view', String(runId), '--repo', repo, '--json', 'status,conclusion']);
-    const { status, conclusion } = JSON.parse(out);
-    process.stdout.write(`\r  ${label}: ${status} ${conclusion || ''}    `);
-    if (status === 'completed') {
-      process.stdout.write('\n');
-      if (conclusion !== 'success') throw new Error(`${label} concluded: ${conclusion}`);
-      return;
-    }
-    await sleep(POLL_MS);
-  }
-  throw new Error(`${label} timed out after ${TIMEOUT_MS / 60000}min`);
-}
-
-function sleep(ms) { return new Promise(r => setTimeout(r, ms)); }
-
-async function waitForNewRun(repo, label, afterTime, maxWaitMs = 5 * 60 * 1000) {
-  const start = Date.now();
-  while (Date.now() - start < maxWaitMs) {
-    const run = latestRun(repo);
-    if (run && new Date(run.createdAt).getTime() > afterTime) return run;
-    process.stdout.write(`\r  Waiting for ${label} run to appear...    `);
-    await sleep(POLL_MS);
-  }
-  process.stdout.write('\n');
-  throw new Error(`No new run appeared in ${repo} within ${maxWaitMs / 60000}min`);
-}
-
-async function main() {
-  const triggerTime = Date.now();
-
-  console.log('\n=== Cascade Watcher ===');
-  console.log('Monitoring full pipeline: rs-{exec,codeinsight,search} → rs-plugkit → gm → gm-cc\n');
-
-  console.log('[1] Baseline');
-  const baseGmCcSha = getGmCcSha();
-  const baseInstalled = getInstalledSha();
-  const basePlugkitVersion = getPlugkitVersion();
-  console.log(`  gm-cc HEAD:       ${baseGmCcSha}`);
-  console.log(`  installed hash:   ${baseInstalled ? baseInstalled.hash : 'unknown'} (gm v${baseInstalled?.version}, plugkit v${baseInstalled?.plugkitVersion})`);
-  console.log(`  local plugkit:    v${basePlugkitVersion}`);
-
-  console.log('\n[2] rs-plugkit Release run');
-  const plugkitRun = await waitForNewRun('AnEntrypoint/rs-plugkit', 'rs-plugkit Release', triggerTime - 10 * 60 * 1000);
-  console.log(`  Run #${plugkitRun.databaseId} "${plugkitRun.name}" on ${plugkitRun.headBranch}`);
-  await watchRun('AnEntrypoint/rs-plugkit', plugkitRun.databaseId, 'rs-plugkit Release');
-
-  console.log('\n[3] Validate rs-plugkit version bumped');
-  validate('rs-plugkit Cargo.toml version', () => {
-    const v = getPlugkitVersion();
-    if (!v) throw new Error('Could not read');
-    return `v${v}`;
-  });
-
-  validate('gm-starter/gm.json plugkitVersion', () => {
-    const fs = require('fs');
-    const p = 'C:/dev/plugforge/gm-starter/gm.json';
-    if (!fs.existsSync(p)) throw new Error('file not found');
-    const j = JSON.parse(fs.readFileSync(p, 'utf8'));
-    return `v${j.plugkitVersion}`;
-  });
-
-  console.log('\n[4] gm Build & Publish run');
-  const afterPlugkit = Date.now();
-  const pfRun = await waitForNewRun('AnEntrypoint/gm', 'Build & Publish Plugins', afterPlugkit - 3 * 60 * 1000);
-  console.log(`  Run #${pfRun.databaseId} "${pfRun.name}" on ${pfRun.headBranch}`);
-  await watchRun('AnEntrypoint/gm', pfRun.databaseId, 'Build & Publish Plugins');
-
-  console.log('\n[5] Validate gm-cc updated');
-  const newGmCcSha = getGmCcSha();
-  validate('gm-cc HEAD changed', () => {
-    if (newGmCcSha === baseGmCcSha) throw new Error(`still ${baseGmCcSha}`);
-    return newGmCcSha;
-  });
-
-  console.log('\n[6] Validate local installed plugin (requires /plugin + /reload-plugins)');
-  const installed = getInstalledSha();
-  validate('installed hash matches gm-cc HEAD prefix', () => {
-    if (!installed) throw new Error('no installed plugin found');
-    if (!newGmCcSha.startsWith(installed.hash)) throw new Error(`installed ${installed.hash} != gm-cc ${newGmCcSha.slice(0, 12)}`);
-    return `${installed.hash} (gm v${installed.version}, plugkit v${installed.plugkitVersion})`;
-  });
-
-  console.log('\n=== Cascade complete ===');
-  console.log(`  gm-cc: ${baseGmCcSha.slice(0, 12)} → ${newGmCcSha.slice(0, 12)}`);
-  if (installed && newGmCcSha.startsWith(installed.hash)) {
-    console.log('  Local plugin is up to date.');
-  } else {
-    console.log('  ⚠  Run /plugin then /reload-plugins to update local cache.');
-  }
-}
-
-main().catch(e => { console.error('\nFATAL:', e.message); process.exit(1); });