gm-skill 2.0.1167 → 2.0.1169

package/README.md

@@ -35,7 +35,7 @@ An earlier generation fanned out fifteen per-platform downstream repos (gm-cc, g
 
 ## Version
 
-`2.0.1167` — auto-bumped from the canonical `gm` repo. Every push to `AnEntrypoint/gm` (or any cascading sibling crate) republishes this package.
+`2.0.1169` — auto-bumped from the canonical `gm` repo. Every push to `AnEntrypoint/gm` (or any cascading sibling crate) republishes this package.
 
 ## Source of truth
 

package/gm-plugkit/plugkit-wasm-wrapper.js

@@ -56,10 +56,11 @@ function turnTick(sess, verb, taskBase, phase) {
   if (phase) { t.phases.add(phase); t.lastPhase = phase; }
 }
 
-let __sessCache = { value: '', mtimeMs: 0, readAt: 0 };
+let __sessCache = { value: '', mtimeMs: 0, readAt: 0, srcMtimeMs: 0 };
 function readCurrentSess() {
   const now = Date.now();
   if (now - __sessCache.readAt < 1000) return __sessCache.value;
+  let found = '';
   try {
     const p = path.join(process.cwd(), '.gm', 'exec-spool', '.session-current');
     const st = fs.statSync(p);
@@ -67,9 +68,24 @@ function readCurrentSess() {
       __sessCache.value = fs.readFileSync(p, 'utf8').trim();
       __sessCache.mtimeMs = st.mtimeMs;
     }
+    found = __sessCache.value;
   } catch (_) {}
+  if (!found) {
+    try {
+      const sp = path.join(process.cwd(), '.gm', 'turn-state.json');
+      const st = fs.statSync(sp);
+      if (st.mtimeMs !== __sessCache.srcMtimeMs) {
+        const obj = JSON.parse(fs.readFileSync(sp, 'utf8'));
+        if (obj && typeof obj.session_id === 'string') found = obj.session_id;
+        __sessCache.srcMtimeMs = st.mtimeMs;
+      } else if (__sessCache.value) {
+        found = __sessCache.value;
+      }
+    } catch (_) {}
+  }
   __sessCache.readAt = now;
-  return __sessCache.value || process.env.CLAUDE_SESSION_ID || process.env.GM_SESSION_ID || '';
+  __sessCache.value = found || process.env.CLAUDE_SESSION_ID || process.env.GM_SESSION_ID || '';
+  return __sessCache.value;
 }
 
 function logEvent(sub, event, fields) {
@@ -1273,8 +1289,10 @@ async function runSpoolWatcher(instance, spoolDir) {
     const files = [];
     try {
       for (const entry of fs.readdirSync(dir)) {
+        if (/\.tmp\.\d+(\.|$)/.test(entry)) continue;
         const fullPath = path.join(dir, entry);
-        const stat = fs.statSync(fullPath);
+        let stat;
+        try { stat = fs.statSync(fullPath); } catch (_) { continue; }
         if (stat.isFile()) {
           files.push(fullPath);
         } else if (stat.isDirectory()) {
@@ -1391,10 +1409,12 @@ async function runSpoolWatcher(instance, spoolDir) {
       let stale = 0;
       const walk = (dir) => {
         for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+          if (/\.tmp\.\d+(\.|$)/.test(entry.name)) continue;
           const fp = path.join(dir, entry.name);
           if (entry.isDirectory()) walk(fp);
           else if (entry.isFile()) {
-            const s = fs.statSync(fp);
+            let s;
+            try { s = fs.statSync(fp); } catch (_) { continue; }
             if (s.mtimeMs < cutoff) {
               const rel = path.relative(inDir, fp);
               const verbDir = path.dirname(rel);

package/gm.json

@@ -1,6 +1,6 @@
 {
   "name": "gm",
-  "version": "2.0.1167",
+  "version": "2.0.1169",
   "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.1167",
+  "version": "2.0.1169",
   "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.1167"
+    "gm-plugkit": "^2.0.1169"
   },
   "engines": {
     "node": ">=16.0.0"