gm-skill 2.0.1180 → 2.0.1188

package/README.md

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

package/bin/plugkit.wasm.sha256

@@ -1 +1 @@
-9dd65bfeb7037f9d883a3064d22fab4a34581e8fde962aa8dfe20141fbb2dd1c  plugkit.wasm
+cce5625d938fff3d9c726b7ae3bb8b96a3ee6b0ecc616a2854fddbca4c4e464e  plugkit.wasm

package/gm-plugkit/bootstrap.js

@@ -295,26 +295,6 @@ function platformKey() {
   return (a === 'arm64' || a === 'aarch64') ? 'linux-arm64' : 'linux-x64';
 }
 
-function rtkBinaryName() {
-  const key = platformKey();
-  return key.startsWith('win32') ? `rtk-${key}.exe` : `rtk-${key}`;
-}
-
-function readRtkVersion() {
-  const p = path.join(wrapperDir, 'rtk.version');
-  if (!fs.existsSync(p)) return null;
-  const v = fs.readFileSync(p, 'utf8').trim();
-  return v || null;
-}
-
-function rtkCacheDir(root, plugkitVerDir) {
-  const rtkVer = readRtkVersion();
-  if (!rtkVer) return plugkitVerDir;
-  const dir = path.join(root, `rtk-v${rtkVer}`);
-  ensureDir(dir);
-  return dir;
-}
-
 function healIfShaMatches(binPath, expectedSha, sentinelPath, partialPath, kind) {
   if (!fs.existsSync(binPath)) return false;
   if (partialPath) { try { if (fs.existsSync(partialPath)) fs.unlinkSync(partialPath); } catch (_) {} }
@@ -402,7 +382,7 @@ function isLockStale(lockPath) {
   return false;
 }
 
-function pruneOldVersions(root, keepVersion, keepRtkVersion) {
+function pruneOldVersions(root, keepVersion) {
   try {
     const entries = fs.readdirSync(root);
     for (const e of entries) {
@@ -410,7 +390,6 @@ function pruneOldVersions(root, keepVersion, keepRtkVersion) {
       const isRtk = e.startsWith('rtk-v');
       if (!isPlugkit && !isRtk) continue;
       if (isPlugkit && e === `v${keepVersion}`) continue;
-      if (isRtk && keepRtkVersion && e === `rtk-v${keepRtkVersion}`) continue;
       const dir = path.join(root, e);
       const lock = path.join(dir, '.lock');
       if (fs.existsSync(lock) && !isLockStale(lock)) continue;
@@ -447,101 +426,6 @@ function killStaleDaemonIfVersionChanged() {
 }
 
 
-function resolveCachedRtk() {
-  const version = readVersionFile();
-  const root = (() => {
-    try { const r = cacheRoot(); ensureDir(r); return r; }
-    catch (_) { const r = fallbackCacheRoot(); ensureDir(r); return r; }
-  })();
-  const plugkitVerDir = path.join(root, `v${version}`);
-  const cacheDir = rtkCacheDir(root, plugkitVerDir);
-  const rtkPath = path.join(cacheDir, rtkBinaryName());
-  const rtkOk = path.join(cacheDir, '.rtk-ok');
-  if (fs.existsSync(rtkPath) && fs.existsSync(rtkOk)) return rtkPath;
-  return null;
-}
-
-async function bootstrapRtk(plugkitVerDir, plugkitVersion, silent, root) {
-  const rtkName = rtkBinaryName();
-  const cacheDir = rtkCacheDir(root || cacheRoot(), plugkitVerDir);
-  const rtkPath = path.join(cacheDir, rtkName);
-  const rtkOk = path.join(cacheDir, '.rtk-ok');
-  if (fs.existsSync(rtkPath) && fs.existsSync(rtkOk)) {
-    if (!silent) log(`rtk cache hit: ${rtkPath}`);
-    return rtkPath;
-  }
-  const rtkSha = readShaManifest();
-  // rtk.sha256 may be in a separate file
-  const rtkShaPath = path.join(wrapperDir, 'rtk.sha256');
-  let expected = null;
-  if (fs.existsSync(rtkShaPath)) {
-    expected = fs.readFileSync(rtkShaPath, 'utf8').trim();
-  }
-  const tmp = `${rtkPath}.partial`;
-  if (healIfShaMatches(rtkPath, expected, rtkOk, tmp, 'rtk')) {
-    if (!silent) log(`rtk cache heal (sha match): ${rtkPath}`);
-    return rtkPath;
-  }
-  const RTKS_RELEASE_REPO = 'AnEntrypoint/plugkit-bin';
-  const url = `https://github.com/${RTKS_RELEASE_REPO}/releases/download/v${plugkitVersion}/${rtkName}`;
-  const startMs = Date.now();
-  let lastErr;
-  for (let attempt = 1; attempt <= MAX_ATTEMPTS; attempt++) {
-    try {
-      log(`rtk download attempt ${attempt}/${MAX_ATTEMPTS}: ${url}`);
-      const result = spawnSync(
-        'curl',
-        ['-fSL', '--max-time', String(Math.floor(ATTEMPT_TIMEOUT_MS / 1000)), '-o', tmp, url],
-        { stdio: 'pipe', timeout: ATTEMPT_TIMEOUT_MS + 5000, windowsHide: true }
-      );
-      if (result.error) throw result.error;
-      if (result.status !== 0) throw new Error(`curl failed with status ${result.status}`);
-      break;
-    } catch (err) {
-      lastErr = err;
-      log(`rtk attempt ${attempt} failed: ${err.message}`);
-      obsEvent('bootstrap', 'rtk.download.attempt_failed', { attempt, max: MAX_ATTEMPTS, err: String(err.message || err) });
-      if (attempt < MAX_ATTEMPTS) {
-        const wait = BACKOFF_MS[attempt - 1] || 120000;
-        log(`backing off ${wait}ms`);
-        await new Promise(r => setTimeout(r, wait));
-      }
-    }
-  }
-  if (lastErr) throw lastErr;
-  if (expected) {
-    const got = await sha256OfFile(tmp);
-    if (got !== expected) {
-      try { fs.unlinkSync(tmp); } catch (_) {}
-      throw new Error(`rtk sha256 mismatch: expected ${expected}, got ${got}`);
-    }
-  }
-  try { fs.renameSync(tmp, rtkPath); }
-  catch (err) {
-    if (err.code === 'EEXIST' || err.code === 'EPERM') {
-      try { fs.unlinkSync(rtkPath); } catch (_) {}
-      fs.renameSync(tmp, rtkPath);
-    } else throw err;
-  }
-  if (os.platform() !== 'win32') { try { fs.chmodSync(rtkPath, 0o755); } catch (_) {} }
-  fs.writeFileSync(rtkOk, new Date().toISOString());
-  log(`installed ${rtkPath}`);
-  obsEvent('bootstrap', 'install.done', { path: rtkPath, plugkit_version: plugkitVersion, rtk_version: readRtkVersion() || plugkitVersion, kind: 'rtk', dur_ms: Date.now() - startMs });
-  return rtkPath;
-}
-
-function spawnDetachedRtkFetch() {
-  try {
-    const child = spawn(process.execPath, [__filename, '--rtk-only'], {
-      detached: true, stdio: 'ignore', windowsHide: true,
-    });
-    child.unref();
-    obsEvent('bootstrap', 'rtk.detached.spawned', { pid: child.pid });
-  } catch (err) {
-    log(`rtk detach spawn failed: ${err.message}`);
-  }
-}
-
 async function bootstrap(opts) {
   opts = opts || {};
   const version = readVersionFile();
@@ -587,7 +471,6 @@ async function bootstrap(opts) {
 
   if (healIfShaMatches(finalPath, expectedSha, okSentinel, partialPath, 'plugkit-wasm')) {
     obsEvent('bootstrap', 'decision.heal', { reason: 'sha-match', path: finalPath });
-    spawnDetachedRtkFetch();
     copyWasmToGmTools(finalPath, version);
     clearBootstrapError();
     return finalPath;
@@ -604,8 +487,7 @@ async function bootstrap(opts) {
     }
     if (healIfShaMatches(finalPath, expectedSha, okSentinel, partialPath, 'plugkit-wasm')) {
       obsEvent('bootstrap', 'decision.heal', { reason: 'sha-match-under-lock', path: finalPath });
-      spawnDetachedRtkFetch();
-      copyWasmToGmTools(finalPath, version);
+        copyWasmToGmTools(finalPath, version);
       clearBootstrapError();
       return finalPath;
     }
@@ -663,8 +545,7 @@ async function bootstrap(opts) {
     log(`decision: fetch reason: install-complete (${finalPath})`);
     obsEvent('bootstrap', 'install.done', { path: finalPath, version, kind: 'plugkit-wasm' });
     proactiveKillForNewInstall(version);
-    pruneOldVersions(root, version, readRtkVersion());
-    spawnDetachedRtkFetch();
+    pruneOldVersions(root, version);
     copyWasmToGmTools(finalPath, version);
     clearBootstrapError();
     return finalPath;
@@ -901,15 +782,12 @@ module.exports = {
   getBinaryPath,
   startSpoolDaemon,
   isReady,
-  rtkBinaryName,
   cacheRoot,
   obsEvent,
   killRunningDaemons,
   killStaleDaemonIfVersionChanged,
   killSpoolWatcherInCwd,
   proactiveKillForNewInstall,
-  resolveCachedRtk,
-  bootstrapRtk,
   readDaemonVersion,
   writeDaemonVersion,
   daemonVersionSentinel,
@@ -919,21 +797,11 @@ if (require.main === module) {
   (async () => {
     try {
       const args = process.argv.slice(2);
-      if (args.includes('--rtk-only')) {
-        const version = readVersionFile();
-        let root = cacheRoot();
-        try { ensureDir(root); }
-        catch (_) { root = fallbackCacheRoot(); ensureDir(root); }
-        const verDir = path.join(root, `v${version}`);
-        ensureDir(verDir);
-        await bootstrapRtk(verDir, version, true, root);
-        process.exit(0);
-      } else if (args.includes('--status')) {
+      if (args.includes('--status')) {
         console.log(JSON.stringify({
           ready: isReady(),
           wasmPath: getWasmPath(),
           daemonVersion: readDaemonVersion(),
-          cachedRtk: resolveCachedRtk(),
         }));
         process.exit(0);
       } else {

package/gm.json

@@ -1,6 +1,6 @@
 {
   "name": "gm",
-  "version": "2.0.1180",
+  "version": "2.0.1188",
   "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.426"
+  "plugkitVersion": "0.1.431"
 }

package/lib/skill-bootstrap.js

@@ -322,10 +322,18 @@ function ensureBuildToolIgnores(cwd) {
 
 function writeSessionSidecar(sessionId) {
   try {
-    const sess = sessionId || process.env.CLAUDE_SESSION_ID || process.env.GM_SESSION_ID || '';
-    if (!sess) return;
     const spool = path.join(process.cwd(), '.gm', 'exec-spool');
     fs.mkdirSync(spool, { recursive: true });
+    let sess = sessionId || process.env.CLAUDE_SESSION_ID || process.env.GM_SESSION_ID || '';
+    if (!sess) {
+      const fallbackFile = path.join(spool, '.session-fallback');
+      try { sess = fs.readFileSync(fallbackFile, 'utf8').trim(); } catch (_) {}
+      if (!sess) {
+        const cwdHash = require('crypto').createHash('sha1').update(process.cwd()).digest('hex').slice(0, 8);
+        sess = `machine-${cwdHash}-${Date.now().toString(36)}`;
+        try { fs.writeFileSync(fallbackFile, sess); } catch (_) {}
+      }
+    }
     fs.writeFileSync(path.join(spool, '.session-current'), sess);
   } catch (_) {}
 }

package/lib/spool-dispatch.js

@@ -101,10 +101,20 @@ async function dispatchSpool(cmd, lang, body, timeoutMs, sessionId) {
   fs.mkdirSync(inDir, { recursive: true });
   fs.mkdirSync(outDir, { recursive: true });
 
-  const sess = sessionId || process.env.CLAUDE_SESSION_ID || process.env.GM_SESSION_ID || '';
-  if (sess) {
-    try { fs.writeFileSync(path.join(process.cwd(), '.gm', 'exec-spool', '.session-current'), sess); } catch (_) {}
-  }
+  let sess = sessionId || process.env.CLAUDE_SESSION_ID || process.env.GM_SESSION_ID || '';
+  try {
+    const spoolDir = path.join(process.cwd(), '.gm', 'exec-spool');
+    if (!sess) {
+      const fallbackFile = path.join(spoolDir, '.session-fallback');
+      try { sess = fs.readFileSync(fallbackFile, 'utf8').trim(); } catch (_) {}
+      if (!sess) {
+        const cwdHash = require('crypto').createHash('sha1').update(process.cwd()).digest('hex').slice(0, 8);
+        sess = `machine-${cwdHash}-${Date.now().toString(36)}`;
+        try { fs.writeFileSync(fallbackFile, sess); } catch (_) {}
+      }
+    }
+    fs.writeFileSync(path.join(spoolDir, '.session-current'), sess);
+  } catch (_) {}
 
   const code = sessionId ? `const SESSION_ID = '${sessionId}';\n${body}` : body;
   fs.writeFileSync(inFile, code, 'utf8');

package/package.json

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