gm-skill 2.0.1489 → 2.0.1491

package/gm-plugkit/package.json

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

@@ -677,15 +677,24 @@ function isProfileLocked(profileDir) {
   return true;
 }
 
-function acquireProfileDir(cwd) {
+function sessionProfileSlug(claudeSessionId) {
+  const s = String(claudeSessionId || 'default').replace(/[^a-zA-Z0-9_-]/g, '-').slice(0, 64);
+  return s || 'default';
+}
+
+function sessionProfileDir(cwd, claudeSessionId) {
+  return path.join(cwd, '.gm', `browser-profile-${sessionProfileSlug(claudeSessionId)}`);
+}
+
+function acquireProfileDir(cwd, claudeSessionId) {
   const gmDir = path.join(cwd, '.gm');
   try { fs.mkdirSync(gmDir, { recursive: true }); } catch (_) {}
-  const primary = path.join(gmDir, 'browser-profile');
   ensureGitignored(cwd, '.gm/browser-profile/');
   ensureGitignored(cwd, '.gm/browser-profile-*/');
+  const primary = sessionProfileDir(cwd, claudeSessionId);
   try { fs.mkdirSync(primary, { recursive: true }); } catch (_) {}
   if (!isProfileLocked(primary)) return primary;
-  const fallback = path.join(gmDir, `browser-profile-${process.pid}`);
+  const fallback = path.join(gmDir, `browser-profile-${sessionProfileSlug(claudeSessionId)}-${process.pid}`);
   try { fs.mkdirSync(fallback, { recursive: true }); } catch (_) {}
   return fallback;
 }
@@ -696,15 +705,21 @@ function cleanDeadProfileFragments(cwd) {
     if (!fs.existsSync(gmDir)) return { cleaned: 0 };
     let cleaned = 0;
     for (const name of fs.readdirSync(gmDir)) {
-      const m = name.match(/^browser-profile-(\d+)$/);
-      if (!m) continue;
-      const pid = parseInt(m[1], 10);
-      if (!isProcessAliveSync(pid)) {
-        try {
-          fs.rmSync(path.join(gmDir, name), { recursive: true, force: true });
-          cleaned++;
-        } catch (_) {}
+      if (!/^browser-profile($|-)/.test(name)) continue;
+      const dir = path.join(gmDir, name);
+      const pidM = name.match(/-(\d+)$/);
+      if (pidM) {
+        if (!isProcessAliveSync(parseInt(pidM[1], 10))) {
+          try { fs.rmSync(dir, { recursive: true, force: true }); cleaned++; } catch (_) {}
+        }
+        continue;
       }
+      try {
+        if (fs.existsSync(dir) && !isProfileLocked(dir)) {
+          fs.rmSync(dir, { recursive: true, force: true });
+          cleaned++;
+        }
+      } catch (_) {}
     }
     if (cleaned > 0) {
       logEvent('bootstrap', 'browser-profile.hygiene', { cwd, cleaned });
@@ -982,9 +997,9 @@ function getOrCreateBrowserSession(cwd, claudeSessionId, pw) {
   const sessions = readJsonFile(sessionsFile, {});
   const existing = ports[claudeSessionId];
   if (existing && existing.pid && existing.wsEndpoint) {
-    const wantProfile = path.join(cwd, '.gm', 'browser-profile');
+    const wantProfile = sessionProfileDir(cwd, claudeSessionId);
     const pidOk = isProcessAliveSync(existing.pid);
-    const profileOk = !existing.profileDir || existing.profileDir === wantProfile || existing.profileDir.startsWith(path.join(cwd, '.gm', 'browser-profile'));
+    const profileOk = !existing.profileDir || existing.profileDir === wantProfile || existing.profileDir.startsWith(wantProfile);
     const cdpOk = pidOk && !!fetchJsonSync(`http://127.0.0.1:${existing.port}/json/version`, 1000);
     if (pidOk && profileOk && cdpOk) {
       const pwIds = sessions[claudeSessionId] || [];
@@ -1033,7 +1048,7 @@ function getOrCreateBrowserSession(cwd, claudeSessionId, pw) {
     }
   }
   cleanDeadProfileFragments(cwd);
-  const profileDir = acquireProfileDir(cwd);
+  const profileDir = acquireProfileDir(cwd, claudeSessionId);
   const aliveCdpForProfile = (() => {
     for (const key of Object.keys(ports)) {
       const ent = ports[key];

package/gm-plugkit/supervisor.js

@@ -145,15 +145,18 @@ function spawnWatcher(bootReason) {
     const reason = shutdownReason && shutdownReason.reason;
     const idleClean = reason === 'idle';
     const lockRejected = code === 75;
-    const plannedReasons = new Set(['idle', 'sigterm', 'version-change', 'wrapper-change', 'peer-stale-takeover', 'external-planned']);
-    const isPlanned = plannedReasons.has(reason) || lockRejected;
+    const cleanExit = code === 0;
+    const plannedReasons = new Set(['idle', 'sigterm', 'version-change', 'wrapper-change', 'peer-stale-takeover', 'external-planned', 'process-exit']);
+    const isPlanned = plannedReasons.has(reason) || lockRejected || cleanExit;
     const eventName = idleClean
       ? 'supervisor.watcher-exited-idle'
       : reason === 'version-change'
         ? 'supervisor.watcher-exited-for-update'
         : lockRejected
           ? 'supervisor.watcher-exited-lock-rejected'
-          : 'supervisor.watcher-exited-unexpectedly';
+          : cleanExit
+            ? 'supervisor.watcher-exited-clean'
+            : 'supervisor.watcher-exited-unexpectedly';
     logEvent(eventName, {
       watcher_pid: currentChildPid,
       exit_code: code,

package/gm.json

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

package/package.json

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