gm-skill 2.0.1164 → 2.0.1165

package/README.md

@@ -35,7 +35,7 @@ An earlier generation fanned out fifteen per-platform downstream repos (gm-cc, g
 
 ## Version
 
-`2.0.1164` — auto-bumped from the canonical `gm` repo. Every push to `AnEntrypoint/gm` (or any cascading sibling crate) republishes this package.
+`2.0.1165` — 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,6 +56,22 @@ function turnTick(sess, verb, taskBase, phase) {
   if (phase) { t.phases.add(phase); t.lastPhase = phase; }
 }
 
+let __sessCache = { value: '', mtimeMs: 0, readAt: 0 };
+function readCurrentSess() {
+  const now = Date.now();
+  if (now - __sessCache.readAt < 1000) return __sessCache.value;
+  try {
+    const p = path.join(process.cwd(), '.gm', 'exec-spool', '.session-current');
+    const st = fs.statSync(p);
+    if (st.mtimeMs !== __sessCache.mtimeMs) {
+      __sessCache.value = fs.readFileSync(p, 'utf8').trim();
+      __sessCache.mtimeMs = st.mtimeMs;
+    }
+  } catch (_) {}
+  __sessCache.readAt = now;
+  return __sessCache.value || process.env.CLAUDE_SESSION_ID || process.env.GM_SESSION_ID || '';
+}
+
 function logEvent(sub, event, fields) {
   if (process.env.GM_LOG_DISABLE) return;
   try {
@@ -67,7 +83,7 @@ function logEvent(sub, event, fields) {
       sub,
       event,
       pid: process.pid,
-      sess: process.env.CLAUDE_SESSION_ID || process.env.GM_SESSION_ID || '',
+      sess: readCurrentSess(),
       ...fields,
     });
     fs.appendFileSync(path.join(dir, `${sub}.jsonl`), line + '\n');
@@ -83,7 +99,7 @@ function emitOrchestratorEvents(verb, taskBase, resultStr) {
     return;
   }
   const data = parsed.data || {};
-  const sess = process.env.CLAUDE_SESSION_ID || process.env.GM_SESSION_ID || '';
+  const sess = readCurrentSess();
   turnTick(sess, verb, taskBase, data.phase);
   switch (verb) {
     case 'transition':

package/gm.json

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

package/lib/skill-bootstrap.js

@@ -320,6 +320,16 @@ function ensureBuildToolIgnores(cwd) {
   }
 }
 
+function writeSessionSidecar(sessionId) {
+  try {
+    const sess = sessionId || process.env.CLAUDE_SESSION_ID || process.env.GM_SESSION_ID || '';
+    if (!sess) return;
+    const spool = path.join(process.cwd(), '.gm', 'exec-spool');
+    fs.mkdirSync(spool, { recursive: true });
+    fs.writeFileSync(path.join(spool, '.session-current'), sess);
+  } catch (_) {}
+}
+
 function ensureManagedGitignore(cwd) {
   try {
     const gi = gitignorePath(cwd);
@@ -548,6 +558,7 @@ async function bootstrapPlugkit(sessionId, options) {
   try {
     emitBootstrapEvent('info', 'Bootstrap started', { forceLatest });
 
+    writeSessionSidecar(sessionId);
     ensureManagedGitignore(process.cwd());
     ensureBuildToolIgnores(process.cwd());
 

package/lib/spool-dispatch.js

@@ -101,6 +101,11 @@ async function dispatchSpool(cmd, lang, body, timeoutMs, sessionId) {
   fs.mkdirSync(inDir, { recursive: true });
   fs.mkdirSync(outDir, { recursive: true });
 
+  const sess = sessionId || process.env.CLAUDE_SESSION_ID || process.env.GM_SESSION_ID || '';
+  if (sess) {
+    try { fs.writeFileSync(path.join(process.cwd(), '.gm', 'exec-spool', '.session-current'), sess); } catch (_) {}
+  }
+
   const code = sessionId ? `const SESSION_ID = '${sessionId}';\n${body}` : body;
   fs.writeFileSync(inFile, code, 'utf8');
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-skill",
-  "version": "2.0.1164",
+  "version": "2.0.1165",
   "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.1164"
+    "gm-plugkit": "^2.0.1165"
   },
   "engines": {
     "node": ">=16.0.0"