gm-skill 2.0.1645 → 2.0.1647

package/bin/bootstrap.js

@@ -619,25 +619,6 @@ function killPid(pid) {
   return true;
 }
 
-function killRunningDaemons(reason) {
-  const tmp = os.tmpdir();
-  const killedPids = [];
-  for (const pidFile of ['glootie-runner.pid', 'plugkit-runner.pid']) {
-    const pidPath = path.join(tmp, pidFile);
-    if (!fs.existsSync(pidPath)) continue;
-    try {
-      const pid = parseInt(fs.readFileSync(pidPath, 'utf8').trim(), 10);
-      if (killPid(pid)) {
-        killedPids.push(pid);
-        obsEvent('bootstrap', 'daemon.killed', { pid, pidFile, reason });
-      }
-      try { fs.unlinkSync(pidPath); } catch (_) {}
-    } catch (_) {}
-  }
-  return killedPids;
-}
-
-
 function killSpoolWatcherInCwd(reason) {
   try {
     const pidPath = path.join(process.cwd(), '.gm', 'exec-spool', '.watcher.pid');
@@ -656,7 +637,6 @@ function killSpoolWatcherInCwd(reason) {
 function proactiveKillForNewInstall(installedVersion) {
   try {
     const reason = `install:v${installedVersion}`;
-    killRunningDaemons(reason);
     killSpoolWatcherInCwd(reason);
     writeDaemonVersion(installedVersion);
   } catch (_) {}
@@ -672,11 +652,11 @@ function killStaleDaemonIfVersionChanged(wrapperDir) {
   }
   const recorded = readDaemonVersion();
   if (recorded === currentVersion) return;
-  if (recorded) killRunningDaemons(`version_change:${recorded}->${currentVersion}`);
+  if (recorded) killSpoolWatcherInCwd(`version_change:${recorded}->${currentVersion}`);
   writeDaemonVersion(currentVersion);
 }
 
-module.exports = { bootstrap, getWasmPath, cacheRoot, obsEvent, killRunningDaemons, killStaleDaemonIfVersionChanged, killSpoolWatcherInCwd, proactiveKillForNewInstall };
+module.exports = { bootstrap, getWasmPath, cacheRoot, obsEvent, killStaleDaemonIfVersionChanged, killSpoolWatcherInCwd, proactiveKillForNewInstall };
 
 if (require.main === module) {
   const argv = process.argv.slice(2);

package/bin/install.js

@@ -99,7 +99,9 @@ function applyClaudeSettings(home) {
   const { obj, existed, corrupt } = readSettings(settingsPath);
   if (corrupt) {
     const backup = settingsPath + '.bak';
-    try { fs.copyFileSync(settingsPath, backup); err(`existing settings.json was malformed; backed up to ${backup}`); } catch (_) {}
+    try { fs.copyFileSync(settingsPath, backup); } catch (_) {}
+    err(`existing settings.json was malformed; backed up to ${backup} and left untouched (not overwritten with defaults, to avoid discarding your other settings) -- fix the JSON manually, or delete it and re-run to get a fresh settings.json`);
+    return { settingsPath, existed, corrupt: true };
   }
   obj.effortLevel = 'low';
   obj.alwaysThinkingEnabled = false;

package/gm-plugkit/bootstrap.js

@@ -460,24 +460,6 @@ function killPid(pid) {
   return true;
 }
 
-function killRunningDaemons(reason) {
-  const tmp = os.tmpdir();
-  const killedPids = [];
-  for (const pidFile of ['glootie-runner.pid', 'plugkit-runner.pid']) {
-    const pidPath = path.join(tmp, pidFile);
-    if (!fs.existsSync(pidPath)) continue;
-    try {
-      const pid = parseInt(fs.readFileSync(pidPath, 'utf8').trim(), 10);
-      if (killPid(pid)) {
-        killedPids.push(pid);
-        obsEvent('bootstrap', 'daemon.killed', { pid, pidFile, reason });
-      }
-      try { fs.unlinkSync(pidPath); } catch (_) {}
-    } catch (_) {}
-  }
-  return killedPids;
-}
-
 function killSpoolWatcherInCwd(reason) {
   try {
     const pidPath = path.join(process.cwd(), '.gm', 'exec-spool', '.watcher.pid');
@@ -525,7 +507,6 @@ function pruneOldVersions(root, keepVersion) {
 function proactiveKillForNewInstall(installedVersion) {
   try {
     const reason = `install:v${installedVersion}`;
-    killRunningDaemons(reason);
     killSpoolWatcherInCwd(reason);
     writeDaemonVersion(installedVersion);
   } catch (_) {}
@@ -541,7 +522,7 @@ function killStaleDaemonIfVersionChanged() {
   }
   const recorded = readDaemonVersion();
   if (recorded === currentVersion) return;
-  if (recorded) killRunningDaemons(`version_change:${recorded}->${currentVersion}`);
+  if (recorded) killSpoolWatcherInCwd(`version_change:${recorded}->${currentVersion}`);
   writeDaemonVersion(currentVersion);
 }
 
@@ -967,7 +948,7 @@ async function ensureReady(opts) {
   }
 
   if (versionDrift) {
-    try { killRunningDaemons(`version_drift:${installed}->${targetVersion}`); } catch (_) {}
+    try { killSpoolWatcherInCwd(`version_drift:${installed}->${targetVersion}`); } catch (_) {}
   }
 
   ensureWrapperFresh();
@@ -1096,7 +1077,6 @@ module.exports = {
   isReady,
   cacheRoot,
   obsEvent,
-  killRunningDaemons,
   killStaleDaemonIfVersionChanged,
   killSpoolWatcherInCwd,
   proactiveKillForNewInstall,

package/gm-plugkit/package.json

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

@@ -550,9 +550,11 @@ const LEGACY_BROWSER_PORTS_FILE = path.join(TMP_DIR, 'plugkit-browser-ports.json
 const LEGACY_BROWSER_SESSIONS_FILE = path.join(TMP_DIR, 'plugkit-browser-sessions.json');
 
 const __browserRootCache = new Map();
+const BROWSER_ROOT_CACHE_TTL_MS = 60_000;
 function browserRootDir(cwd) {
   const start = path.resolve(cwd || process.cwd());
-  if (__browserRootCache.has(start)) return __browserRootCache.get(start);
+  const cached = __browserRootCache.get(start);
+  if (cached && Date.now() - cached.ts < BROWSER_ROOT_CACHE_TTL_MS) return cached.root;
   let root = start;
   try {
     const r = spawnSync('git', ['rev-parse', '--git-common-dir'], { cwd: start, encoding: 'utf-8', windowsHide: true, timeout: 1500 });
@@ -563,15 +565,18 @@ function browserRootDir(cwd) {
     }
   } catch (_) {}
   root = path.resolve(root);
-  __browserRootCache.set(start, root);
+  __browserRootCache.set(start, { root, ts: Date.now() });
   return root;
 }
 
 function browserStateDir(cwd) {
-  const dir = path.join(browserRootDir(cwd), '.gm', 'exec-spool');
+  const dir = path.join(browserRootDir(cwd), '.gm', 'browser-state');
   try { fs.mkdirSync(dir, { recursive: true }); } catch (_) {}
   return dir;
 }
+function browserStateDirLegacyCoLocated(cwd) {
+  return path.join(browserRootDir(cwd), '.gm', 'exec-spool');
+}
 function browserPortsFile(cwd) { return path.join(browserStateDir(cwd), 'browser-ports.json'); }
 function browserSessionsFile(cwd) { return path.join(browserStateDir(cwd), 'browser-sessions.json'); }
 
@@ -609,14 +614,23 @@ function atomicWriteJson(filePath, obj) {
 function migrateLegacyBrowserState(cwd) {
   const dst1 = browserPortsFile(cwd);
   const dst2 = browserSessionsFile(cwd);
+  const coLocated = browserStateDirLegacyCoLocated(cwd);
+  const coLocatedPorts = path.join(coLocated, 'browser-ports.json');
+  const coLocatedSessions = path.join(coLocated, 'browser-sessions.json');
   try {
-    if (!fs.existsSync(dst1) && fs.existsSync(LEGACY_BROWSER_PORTS_FILE)) {
+    if (!fs.existsSync(dst1) && fs.existsSync(coLocatedPorts)) {
+      const legacy = JSON.parse(fs.readFileSync(coLocatedPorts, 'utf-8'));
+      if (legacy && typeof legacy === 'object') atomicWriteJson(dst1, legacy);
+    } else if (!fs.existsSync(dst1) && fs.existsSync(LEGACY_BROWSER_PORTS_FILE)) {
       const legacy = JSON.parse(fs.readFileSync(LEGACY_BROWSER_PORTS_FILE, 'utf-8'));
       if (legacy && typeof legacy === 'object') atomicWriteJson(dst1, legacy);
     }
   } catch (_) {}
   try {
-    if (!fs.existsSync(dst2) && fs.existsSync(LEGACY_BROWSER_SESSIONS_FILE)) {
+    if (!fs.existsSync(dst2) && fs.existsSync(coLocatedSessions)) {
+      const legacy = JSON.parse(fs.readFileSync(coLocatedSessions, 'utf-8'));
+      if (legacy && typeof legacy === 'object') atomicWriteJson(dst2, legacy);
+    } else if (!fs.existsSync(dst2) && fs.existsSync(LEGACY_BROWSER_SESSIONS_FILE)) {
       const legacy = JSON.parse(fs.readFileSync(LEGACY_BROWSER_SESSIONS_FILE, 'utf-8'));
       if (legacy && typeof legacy === 'object') atomicWriteJson(dst2, legacy);
     }
@@ -2820,8 +2834,10 @@ async function runSpoolWatcher(instance, spoolDir) {
     if (!_ownWrapperSha12) return;
     let reg = {};
     try { reg = JSON.parse(fs.readFileSync(PEER_REGISTRY_PATH, 'utf-8')); } catch (_) { return; }
+    const ownRoot = browserRootDir(process.cwd());
     for (const peerCwd of Object.keys(reg)) {
       if (peerCwd === process.cwd()) continue;
+      if (browserRootDir(peerCwd) !== ownRoot) continue;
       const peerLock = path.join(peerCwd, '.gm', 'exec-spool', '.watcher.lock');
       let content = '';
       try { content = fs.readFileSync(peerLock, 'utf-8').trim(); } catch (_) { continue; }

package/gm.json

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

package/lang/ssh.js

@@ -11,6 +11,12 @@ function loadTarget(targetName) {
   ];
   const cfgPath = candidatesCfg.find(p => fsSync.existsSync(p));
   if (!cfgPath) throw new Error('No ssh-targets.json found at ' + candidatesCfg.join(' or '));
+  if (process.platform !== 'win32') {
+    try {
+      const mode = fsSync.statSync(cfgPath).mode & 0o777;
+      if (mode !== 0o600) fsSync.chmodSync(cfgPath, 0o600);
+    } catch (_) {}
+  }
   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(', '));

package/lib/skill-bootstrap.js

@@ -375,53 +375,40 @@ async function downloadPlugkitBinary(version) {
   }
 }
 
-function findPlugkitWasmPids() {
+function repoStatePidsForCwd() {
   const pids = [];
+  const cwd = process.cwd();
+  for (const rel of [path.join('.gm', 'exec-spool', '.supervisor.pid'), path.join('.gm', 'exec-spool', '.watcher.pid')]) {
+    try {
+      const p = path.join(cwd, rel);
+      if (!fs.existsSync(p)) continue;
+      const pid = parseInt(fs.readFileSync(p, 'utf8').trim(), 10);
+      if (Number.isFinite(pid) && pid > 0) pids.push(String(pid));
+    } catch (_) {}
+  }
   try {
-    if (process.platform === 'win32') {
-      const ps = "Get-CimInstance Win32_Process -Filter \"Name='bun.exe' OR Name='node.exe'\" | Where-Object { $_.CommandLine -match 'plugkit-wasm-wrapper' } | Select-Object -ExpandProperty ProcessId";
-      const output = execFileSync('powershell', ['-NoProfile', '-Command', ps], { encoding: 'utf8', windowsHide: true, timeout: 3000 });
-      for (const line of output.split(/\r?\n/)) {
-        const trimmed = line.trim();
-        if (/^\d+$/.test(trimmed)) pids.push(trimmed);
-      }
-    } else {
-      const output = execSync("ps -eo pid,args", { encoding: 'utf8', timeout: 3000 });
-      const lines = output.split('\n').filter(Boolean);
-      for (const line of lines) {
-        if (!line.includes('plugkit-wasm-wrapper')) continue;
-        const m = line.trim().match(/^(\d+)\s/);
-        if (m) pids.push(m[1]);
-      }
+    const statusPath = path.join(cwd, '.gm', 'exec-spool', '.status.json');
+    if (fs.existsSync(statusPath)) {
+      const status = JSON.parse(fs.readFileSync(statusPath, 'utf-8'));
+      if (Number.isFinite(status.pid) && status.pid > 0) pids.push(String(status.pid));
     }
-  } catch (e) {
-  }
-  return pids;
+  } catch (_) {}
+  return Array.from(new Set(pids));
+}
+
+function findPlugkitWasmPids() {
+  return repoStatePidsForCwd().filter(pid => {
+    try { process.kill(parseInt(pid, 10), 0); return true; } catch (_) { return false; }
+  });
 }
 
 function isProcessRunning() {
-  if (findPlugkitWasmPids().length > 0) return true;
-  try {
-    const supervisorPidFile = path.join(process.cwd(), '.gm', 'exec-spool', '.supervisor.pid');
-    if (!fs.existsSync(supervisorPidFile)) return false;
-    const pid = parseInt(fs.readFileSync(supervisorPidFile, 'utf8').trim(), 10);
-    if (!Number.isFinite(pid) || pid <= 0) return false;
-    try { process.kill(pid, 0); return true; } catch (_) { return false; }
-  } catch (_) { return false; }
+  return findPlugkitWasmPids().length > 0;
 }
 
 function killExistingPlugkit() {
   try {
     const pids = findPlugkitWasmPids();
-    try {
-      const supervisorPidFile = path.join(process.cwd(), '.gm', 'exec-spool', '.supervisor.pid');
-      if (fs.existsSync(supervisorPidFile)) {
-        const sp = parseInt(fs.readFileSync(supervisorPidFile, 'utf8').trim(), 10);
-        if (Number.isFinite(sp) && sp > 0) {
-          try { process.kill(sp, 0); pids.unshift(String(sp)); } catch (_) {}
-        }
-      }
-    } catch (_) {}
     if (pids.length === 0) {
       emitBootstrapEvent('info', 'No existing plugkit WASM watcher to kill');
       return;
@@ -429,9 +416,9 @@ function killExistingPlugkit() {
     for (const pid of pids) {
       try {
         if (process.platform === 'win32') {
-          execSync(`taskkill /F /T /PID ${pid}`, { stdio: 'ignore' });
+          execFileSync('taskkill', ['/F', '/T', '/PID', String(pid)], { stdio: 'ignore', windowsHide: true });
         } else {
-          execSync(`kill -9 ${pid}`, { stdio: 'ignore' });
+          execFileSync('kill', ['-9', String(pid)], { stdio: 'ignore' });
         }
       } catch (e) {
       }

package/lib/spool-dispatch.js

@@ -157,8 +157,18 @@ function unsolicitedDocs(cwd) {
     if (r.status !== 0) return { count: 0, files: [], available: false };
     const flagged = [];
     for (const line of r.stdout.split('\n')) {
-      if (!line.startsWith('?? ')) continue;
-      const rel = line.slice(3).trim();
+      if (!line || line.length < 4) continue;
+      const code = line.slice(0, 2);
+      let rel;
+      if (code === '??') {
+        rel = line.slice(3).trim();
+      } else if (/^[MADRCU ][MADRCU ]$/.test(code)) {
+        const rest = line.slice(3).trim();
+        const arrowIdx = rest.indexOf(' -> ');
+        rel = arrowIdx >= 0 ? rest.slice(arrowIdx + 4).trim() : rest;
+      } else {
+        continue;
+      }
       if (!rel) continue;
       if (!/\.(md|txt)$/i.test(rel)) continue;
       const base = rel.includes('/') ? rel.slice(rel.lastIndexOf('/') + 1) : rel;
@@ -304,8 +314,21 @@ function checkDispatchGates(sessionId, operation, extra) {
 
     if (['bash', 'sh', 'shell', 'zsh', 'powershell', 'ps1'].includes(extra.verb)) {
       const cmd = String((extra.body && (extra.body.command || extra.body.code || extra.body.script)) || extra.command || '').trim();
-      const first = cmd.split(/\s+/)[0] || '';
-      const gitDominant = first === 'git' || /[\\/]git$/.test(first) || cmd.startsWith('git ');
+      const isGitToken = (tok) => tok === 'git' || /[\\/]git(\.exe)?$/i.test(tok);
+      const segments = cmd
+        .split(/&&|\|\||[;&|]|(?<=["'])\s*&\s*(?=["'])/)
+        .map((s) => s.trim())
+        .filter(Boolean);
+      const gitDominant = segments.some((seg) => {
+        const tokens = seg.replace(/^["']|["']$/g, '').split(/\s+/).filter(Boolean);
+        for (let i = 0; i < tokens.length; i++) {
+          const tok = tokens[i].replace(/^["']|["']$/g, '');
+          if (isGitToken(tok)) return true;
+          if (tok === 'env' || tok === 'exec' || tok === 'cd') continue;
+          break;
+        }
+        return false;
+      });
       if (gitDominant) {
         logDeviation('deviation.bash-git-bypass', { verb: extra.verb, cmd: cmd.slice(0, 80) });
         return {

package/lib/spool.js

@@ -63,7 +63,8 @@ function writeSpool(body, lang = 'nodejs', options = {}) {
     code = prelude + body;
   }
 
-  fs.writeFileSync(inFile, code, 'utf8');
+  const fd = fs.openSync(inFile, 'wx');
+  try { fs.writeSync(fd, code, null, 'utf8'); } finally { fs.closeSync(fd); }
 
   return {
     id: taskId,
@@ -80,7 +81,8 @@ function writeSpoolVerb(body, verb, options = {}) {
   const inDir = path.join(baseDir, 'in', validVerb);
   const inFile = path.join(inDir, `${taskId}.txt`);
   fs.mkdirSync(inDir, { recursive: true });
-  fs.writeFileSync(inFile, body, 'utf8');
+  const fd = fs.openSync(inFile, 'wx');
+  try { fs.writeSync(fd, body, null, 'utf8'); } finally { fs.closeSync(fd); }
   return { id: taskId, path: inFile, verb: validVerb };
 }
 

package/package.json

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