gm-skill 2.0.1607 → 2.0.1608

package/bin/gm-shell-validate.js

@@ -10,6 +10,18 @@ const { pathToFileURL } = require('url');
 const ROOT = process.cwd();
 const WITNESS_DIR = path.join(ROOT, '.gm', 'witness');
 
+function freePort() {
+  const net = require('net');
+  return new Promise((resolve, reject) => {
+    const srv = net.createServer();
+    srv.once('error', reject);
+    srv.listen(0, '127.0.0.1', () => {
+      const p = srv.address().port;
+      srv.close(() => resolve(p));
+    });
+  });
+}
+
 function sleep(ms) { return new Promise((r) => setTimeout(r, ms)); }
 function rmrf(p) { try { fs.rmSync(p, { recursive: true, force: true }); } catch (_) {} }
 function write(file, text) { fs.mkdirSync(path.dirname(file), { recursive: true }); fs.writeFileSync(file, text); }
@@ -26,7 +38,7 @@ function which(cmds) {
 async function renderPreview() {
   const preview = fs.mkdtempSync(path.join(os.tmpdir(), 'gm-shell-preview-'));
   fs.mkdirSync(path.join(preview, 'vendor'), { recursive: true });
-  cp.execSync(`powershell.exe -NoProfile -NonInteractive -Command "Copy-Item -Recurse -Force '${path.join(ROOT, 'site', 'vendor', '*')}' '${path.join(preview, 'vendor')}'"`, { stdio: 'ignore', windowsHide: true });
+  fs.cpSync(path.join(ROOT, 'site', 'vendor'), path.join(preview, 'vendor'), { recursive: true });
 
   const renderScript = `
     import { writeFileSync } from 'fs';
@@ -44,17 +56,18 @@ async function renderPreview() {
       }
     };
     const out = await mod.default.render(ctx);
-    writeFileSync(resolve('${preview.replace(/\\/g, '\\\\')}', 'index.html'), out[0].html);
+    writeFileSync(resolve(process.env.GM_SHELL_PREVIEW, 'index.html'), out[0].html);
   `;
   const tmp = path.join(os.tmpdir(), `gm-shell-render-${Date.now()}.mjs`);
   fs.writeFileSync(tmp, renderScript);
-  cp.execFileSync('node', [tmp], { stdio: 'inherit', windowsHide: true });
+  cp.execFileSync('node', [tmp], { stdio: 'inherit', windowsHide: true, env: { ...process.env, GM_SHELL_PREVIEW: preview } });
   try { fs.unlinkSync(tmp); } catch (_) {}
 
-  const server = cp.spawn('python', ['-m', 'http.server', '4210', '--directory', preview], { cwd: ROOT, detached: true, stdio: 'ignore', windowsHide: true });
+  const port = await freePort();
+  const server = cp.spawn('python', ['-m', 'http.server', String(port), '--directory', preview], { cwd: ROOT, detached: true, stdio: 'ignore', windowsHide: true });
   server.unref();
   await sleep(1500);
-  return { preview, port: 4210, serverPid: server.pid };
+  return { preview, port, serverPid: server.pid };
 }
 
 function killServer(pid) {
@@ -96,7 +109,7 @@ return JSON.stringify(result);
   const response = await fetch(relayUrl, {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify({ sessionId: '9', code: script, timeout: 60000, cwd: ROOT }),
+    body: JSON.stringify({ sessionId: `gm-shell-${process.pid}-${Date.now()}`, code: script, timeout: 60000, cwd: ROOT }),
   });
   const result = await response.json();
   const out = result.text || '';

package/gm-plugkit/package.json

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

@@ -1 +1 @@
-0.1.683
+0.1.684

package/gm.json

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

package/lib/spool.js

@@ -55,7 +55,13 @@ function writeSpool(body, lang = 'nodejs', options = {}) {
   fs.mkdirSync(inDir, { recursive: true });
 
   const sessionId = options.sessionId || process.env.CLAUDE_SESSION_ID;
-  const code = sessionId ? `const SESSION_ID = ${JSON.stringify(sessionId)};\n${body}` : body;
+  let code = body;
+  if (sessionId) {
+    const prelude = validLang === 'bash'
+      ? `SESSION_ID=${JSON.stringify(String(sessionId))}\n`
+      : `const SESSION_ID = ${JSON.stringify(sessionId)};\n`;
+    code = prelude + body;
+  }
 
   fs.writeFileSync(inFile, code, 'utf8');
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-skill",
-  "version": "2.0.1607",
+  "version": "2.0.1608",
   "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",
@@ -38,7 +38,18 @@
     "bin/plugkit.sha256",
     "bin/plugkit.version",
     "bin/plugkit.wasm.sha256",
-    "gm-plugkit/",
+    "gm-plugkit/bootstrap.js",
+    "gm-plugkit/browser-idle.js",
+    "gm-plugkit/cli.js",
+    "gm-plugkit/index.js",
+    "gm-plugkit/lang-host-runner.js",
+    "gm-plugkit/package.json",
+    "gm-plugkit/plugkit-wasm-wrapper.js",
+    "gm-plugkit/supervisor.js",
+    "gm-plugkit/plugkit.version",
+    "gm-plugkit/plugkit.sha256",
+    "gm-plugkit/instructions/",
+    "gm-plugkit/scripts/",
     "AGENTS.md",
     "README.md",
     "gm.json"

package/gm-plugkit/browser-idle.test.js

@@ -1,46 +0,0 @@
-const assert = require('assert');
-const { selectIdleBrowserSessions } = require('./browser-idle.js');
-
-const NOW = 1_000_000;
-const LIMIT = 10 * 60 * 1000;
-
-(function onlyPastLimitSelected() {
-  const ports = {
-    active: { pid: 1, lastUse: NOW - 1000 },
-    idle: { pid: 2, lastUse: NOW - (LIMIT + 5000) },
-  };
-  const idle = selectIdleBrowserSessions(ports, NOW, LIMIT);
-  assert.strictEqual(idle.length, 1, 'exactly one idle session selected');
-  assert.strictEqual(idle[0].sid, 'idle', 'the idle session is selected, active untouched');
-})();
-
-(function boundaryIsInclusive() {
-  const ports = { edge: { pid: 1, lastUse: NOW - LIMIT } };
-  const idle = selectIdleBrowserSessions(ports, NOW, LIMIT);
-  assert.strictEqual(idle.length, 1, 'idleMs == limit closes (>=)');
-})();
-
-(function missingLastUseReapedAsStale() {
-  const ports = { orphan: { pid: 1 } };
-  const idle = selectIdleBrowserSessions(ports, NOW, LIMIT);
-  assert.strictEqual(idle.length, 1, 'entry with no lastUse is treated as stale (epoch 0) and reaped');
-  assert.strictEqual(idle[0].sid, 'orphan');
-})();
-
-(function concurrentIsolation() {
-  const ports = {
-    sessA: { pid: 1, lastUse: NOW - 2000 },
-    sessB: { pid: 2, lastUse: NOW - (LIMIT + 1) },
-    sessC: { pid: 3, lastUse: NOW - (LIMIT + 999999) },
-  };
-  const idle = selectIdleBrowserSessions(ports, NOW, LIMIT).map(x => x.sid).sort();
-  assert.deepStrictEqual(idle, ['sessB', 'sessC'], 'only the idle sessions, active sessA preserved');
-})();
-
-(function emptyAndMalformed() {
-  assert.deepStrictEqual(selectIdleBrowserSessions({}, NOW, LIMIT), [], 'empty ports');
-  assert.deepStrictEqual(selectIdleBrowserSessions(null, NOW, LIMIT), [], 'null ports');
-  assert.deepStrictEqual(selectIdleBrowserSessions({ bad: null, str: 'x' }, NOW, LIMIT), [], 'malformed entries skipped');
-})();
-
-console.log('browser-idle.test.js: all assertions passed');

package/gm-plugkit/child-script-alias.test.js

@@ -1,25 +0,0 @@
-const assert = require('assert');
-const fs = require('fs');
-const path = require('path');
-
-const wrapper = fs.readFileSync(path.join(__dirname, 'plugkit-wasm-wrapper.js'), 'utf-8');
-
-const aliasInChildScript = /\bspawnSync\s*\(\s*process\.execPath\s*,\s*\[\s*['"]-e['"]\s*,\s*`[^`]*\b_(?:net|http|https|crypto|childProcess)Module\b[^`]*`/;
-
-(function noParentAliasInChildEvalTemplates() {
-  assert.strictEqual(
-    aliasInChildScript.test(wrapper),
-    false,
-    'no spawnSync(process.execPath, ["-e", `...`]) child-script template may reference a parent-scope _*Module alias; the spawned child has no such binding (use require() inside the template). This regression broke findFreePortSync/isPort*/fetchJsonSync and surfaced only as "could not allocate free port" at browser-spawn time.'
-  );
-})();
-
-(function childTemplatesUseRequire() {
-  const childEvalBlocks = wrapper.match(/spawnSync\s*\(\s*process\.execPath\s*,\s*\[\s*['"]-e['"]\s*,\s*`[^`]*`/g) || [];
-  for (const block of childEvalBlocks) {
-    if (/\brequire\s*\(\s*['"](?:net|http|https)['"]\s*\)/.test(block) || !/\b(?:net|http|https)\b/.test(block)) continue;
-    assert.fail(`child -e template uses a node builtin without require(): ${block.slice(0, 80)}...`);
-  }
-})();
-
-console.log('child-script-alias.test.js: all assertions passed');