gm-skill 2.0.1596 → 2.0.1597

package/bin/gm-shell-validate.js

@@ -5,6 +5,7 @@ const fs = require('fs');
 const path = require('path');
 const cp = require('child_process');
 const os = require('os');
+const { pathToFileURL } = require('url');
 
 const ROOT = process.cwd();
 const WITNESS_DIR = path.join(ROOT, '.gm', 'witness');
@@ -30,7 +31,7 @@ async function renderPreview() {
   const renderScript = `
     import { writeFileSync } from 'fs';
     import { resolve } from 'path';
-    const mod = await import('file:///C:/dev/gm/site/theme.mjs');
+    const mod = await import(${JSON.stringify(pathToFileURL(path.join(ROOT, 'site', 'theme.mjs')).href)});
     const ctx = {
       readGlobal: (k) => {
         if (k === 'site') return { title: 'gm', tagline: "more coushin' for the pushin'", description: 'local browser OS surface', glyph: 'g', accent_from: '#7ee787', accent_to: '#56d364' };
@@ -53,11 +54,20 @@ async function renderPreview() {
   const server = cp.spawn('python', ['-m', 'http.server', '4210', '--directory', preview], { cwd: ROOT, detached: true, stdio: 'ignore', windowsHide: true });
   server.unref();
   await sleep(1500);
-  return { preview, port: 4210 };
+  return { preview, port: 4210, serverPid: server.pid };
+}
+
+function killServer(pid) {
+  if (!pid) return;
+  try {
+    if (process.platform === 'win32') cp.execFileSync('taskkill', ['/F', '/T', '/PID', String(pid)], { stdio: 'ignore', windowsHide: true });
+    else process.kill(pid, 'SIGTERM');
+  } catch (_) {}
 }
 
 async function main() {
-  const { preview, port } = await renderPreview();
+  const { preview, port, serverPid } = await renderPreview();
+  try {
   const witness = path.join(os.tmpdir(), `gm-shell-witness-${Date.now()}.js`);
   const witnessOut = path.join(WITNESS_DIR, `gm-shell-${Date.now()}.json`);
   write(witness, `
@@ -112,6 +122,9 @@ return JSON.stringify(result);
   fs.writeFileSync(witnessOut, JSON.stringify({ preview, port, output: out.trim(), parsed }, null, 2));
   try { fs.unlinkSync(witness); } catch (_) {}
   rmrf(preview);
+  } finally {
+    killServer(serverPid);
+  }
 }
 
 main().catch((e) => {

package/bin/gm-validate.js

@@ -189,7 +189,7 @@ async function validateEmbed() {
   }
   const lats = v.calls.map(c => c.latency_ms).sort((a, b) => a - b);
   v.p50_ms = lats[Math.floor(lats.length * 0.5)] || 0;
-  v.p95_ms = lats[Math.max(0, lats.length - 1)] || 0;
+  v.p95_ms = lats[Math.max(0, Math.ceil(lats.length * 0.95) - 1)] || 0;
 
   const r = await dispatch('recall', { query: 'gm-validate witness', namespace: 'validate', limit: 3 }, 60000);
   const rd = (r.response && (r.response.data || r.response)) || {};
@@ -238,6 +238,7 @@ async function validateBrowserEmbed() {
     serveProc.unref();
   } catch (e) { v.errors.push('serve spawn: ' + e.message); return v; }
 
+  try {
   const t0 = Date.now();
   let ready = false;
   while (Date.now() - t0 < 20000) {
@@ -278,7 +279,7 @@ return out;
   try {
     const tmpScript = path.join(os.tmpdir(), 'gm-validate-' + Date.now() + '.js');
     fs.writeFileSync(tmpScript, script);
-    const out = cp.execSync('playwriter -s ' + sessionId + ' --timeout 60000 -e "' + script.replace(/\\/g, '\\\\').replace(/"/g, '\\"').replace(/\n/g, ' ') + '"', { encoding: 'utf8', windowsHide: true, maxBuffer: 4 * 1024 * 1024 });
+    const out = cp.execFileSync(pw, ['-s', sessionId, '--timeout', '60000', '-f', tmpScript], { encoding: 'utf8', windowsHide: true, maxBuffer: 4 * 1024 * 1024 });
     try { fs.unlinkSync(tmpScript); } catch (_) {}
     const m = out.match(/\{[\s\S]*\}\s*$/);
     if (m) { try { res = JSON.parse(m[0]); } catch (_) {} }
@@ -290,7 +291,7 @@ return out;
     v.calls = res.mems;
     const lats = res.mems.map(c => c.latency_ms).sort((a, b) => a - b);
     v.p50_ms = Math.round(lats[Math.floor(lats.length * 0.5)] || 0);
-    v.p95_ms = Math.round(lats[Math.max(0, lats.length - 1)] || 0);
+    v.p95_ms = Math.round(lats[Math.max(0, Math.ceil(lats.length * 0.95) - 1)] || 0);
     const rows = (res.recall && (res.recall.rows || res.recall.hits)) || [];
     v.recall_top_text = (rows[0] && (rows[0].text || rows[0].content)) || '';
     const allOk = v.calls.every(c => c.ok);
@@ -298,6 +299,14 @@ return out;
     if (!allOk) v.errors.push('not all browser memorize calls ok');
   }
   return v;
+  } finally {
+    if (serveProc && serveProc.pid) {
+      try {
+        if (process.platform === 'win32') cp.execFileSync('taskkill', ['/F', '/T', '/PID', String(serveProc.pid)], { stdio: 'ignore', windowsHide: true });
+        else process.kill(serveProc.pid, 'SIGTERM');
+      } catch (_) {}
+    }
+  }
 }
 
 (async () => {

package/gm-plugkit/cli.js

@@ -101,7 +101,7 @@ function killStaleWatchers() {
     for (const s of stale) {
       try {
         if (process.platform === 'win32') {
-          cp.execFileSync('taskkill', ['/F', '/PID', String(s.pid)], { stdio: 'ignore', windowsHide: true });
+          cp.execFileSync('taskkill', ['/F', '/T', '/PID', String(s.pid)], { stdio: 'ignore', windowsHide: true });
         } else {
           process.kill(s.pid, 'SIGTERM');
         }

package/gm-plugkit/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-plugkit",
-  "version": "2.0.1596",
+  "version": "2.0.1597",
   "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

@@ -836,7 +836,7 @@ function isPortAliveSync(port) {
 }
 
 function sleepSync(ms) {
-  spawnSync(process.execPath, ['-e', `setTimeout(()=>{}, ${ms})`], { timeout: ms + 2000 });
+  Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, Math.max(0, ms | 0));
 }
 
 function playwriterHomeFor(cwd, claudeSessionId) {
@@ -1049,7 +1049,7 @@ function purgeProfileLockFiles(profileDir) {
 
 function sleepSyncMs(ms) {
   if (ms <= 0) return;
-  spawnSync(process.execPath, ['-e', `setTimeout(()=>process.exit(0),${ms})`], { timeout: ms + 500, windowsHide: true });
+  Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms | 0);
 }
 
 function gracefulCloseBrowser(entry, reason) {

package/gm.json

@@ -1,6 +1,6 @@
 {
   "name": "gm",
-  "version": "2.0.1596",
+  "version": "2.0.1597",
   "description": "Spool-dispatch orchestration engine with unified state machine, skills, and automated git enforcement",
   "author": "AnEntrypoint",
   "license": "MIT",

package/lang/ssh.js

@@ -75,19 +75,23 @@ function runSsh(target, cmd, onData) {
   return new Promise((resolve, reject) => {
     const { Client } = resolveSsh2();
     const ssh = new Client();
-    let out = '';
+    let stdout = '';
+    let stderr = '';
     let done = false;
 
-    const finish = (text) => {
-      if (!done) { done = true; ssh.end(); resolve(text != null ? text : out.trimEnd()); }
+    const finish = (extra) => {
+      if (!done) {
+        done = true;
+        ssh.end();
+        resolve({ stdout: stdout.trimEnd(), stderr: stderr.trimEnd(), timedOut: false, ...extra });
+      }
     };
 
     const timeout = setTimeout(() => {
       if (!done) {
         done = true;
         try { ssh.end(); } catch (_) {}
-        const partial = out.trimEnd();
-        resolve(partial ? `${partial}\n[ssh timed out after 55s; output above is partial]` : '[ssh timed out after 55s; no output]');
+        resolve({ stdout: stdout.trimEnd(), stderr: (stderr + '\n[ssh timed out after 55s; output is partial]').trimEnd(), timedOut: true });
       }
     }, 55000);
 
@@ -96,12 +100,12 @@ function runSsh(target, cmd, onData) {
         if (err) { clearTimeout(timeout); ssh.end(); reject(err); return; }
         stream.on('data', d => {
           const s = d.toString();
-          out += s;
+          stdout += s;
           if (onData) onData(s, 'stdout');
         });
         stream.stderr.on('data', d => {
           const s = d.toString();
-          out += s;
+          stderr += s;
           if (onData) onData(s, 'stderr');
         });
         stream.on('close', () => { clearTimeout(timeout); finish(); });
@@ -133,8 +137,8 @@ async function runBackground(target, cmd) {
     rpcCall(port, 'appendOutput', { taskId, type, data }).catch(() => {});
   };
 
-  runSsh(target, cmd, onData).then(out => {
-    rpcCall(port, 'completeTask', { taskId, result: { success: true, exitCode: 0, stdout: out, stderr: '', error: null } }).catch(() => {});
+  runSsh(target, cmd, onData).then(r => {
+    rpcCall(port, 'completeTask', { taskId, result: { success: !r.timedOut, exitCode: r.timedOut ? 124 : 0, stdout: r.stdout, stderr: r.stderr, error: r.timedOut ? 'ssh timed out after 55s' : null } }).catch(() => {});
   }).catch(err => {
     rpcCall(port, 'completeTask', { taskId, result: { success: false, exitCode: 1, stdout: '', stderr: err.message, error: err.message } }).catch(() => {});
   });
@@ -163,7 +167,9 @@ module.exports = {
         }
       }
 
-      return await runSsh(target, cmd, null);
+      const r = await runSsh(target, cmd, null);
+      const combined = [r.stdout, r.stderr].filter(Boolean).join('\n');
+      return combined || (r.timedOut ? '[ssh timed out after 55s; no output]' : '');
     }
   },
   context: `=== exec:ssh ===

package/lib/skill-bootstrap.js

@@ -423,7 +423,7 @@ function killExistingPlugkit() {
     for (const pid of pids) {
       try {
         if (process.platform === 'win32') {
-          execSync(`taskkill /F /PID ${pid}`, { stdio: 'ignore' });
+          execSync(`taskkill /F /T /PID ${pid}`, { stdio: 'ignore' });
         } else {
           execSync(`kill -9 ${pid}`, { stdio: 'ignore' });
         }

package/lib/spool.js

@@ -7,8 +7,9 @@ function getSpoolBaseDir() {
   return path.join(cwd, '.gm', 'exec-spool');
 }
 
+let taskIdSeq = 0;
 function generateTaskId() {
-  return `${Date.now()}-${Math.random().toString(16).slice(2, 8)}`;
+  return `${process.pid}-${Date.now()}-${(taskIdSeq++).toString(36)}`;
 }
 
 function validateLang(lang) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-skill",
-  "version": "2.0.1596",
+  "version": "2.0.1597",
   "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",