gm-skill 2.0.1959 → 2.0.1960

package/gm-plugkit/bootstrap.js

@@ -6,6 +6,7 @@ const path = require('path');
 const os = require('os');
 const crypto = require('crypto');
 const { spawn, spawnSync } = require('child_process');
+const { logEvent: _sharedLogEvent } = require('./gm-log');
 
 function resolveWindowsExe(cmd) {
   if (process.platform !== 'win32') return cmd;
@@ -39,19 +40,7 @@ function log(msg) {
 }
 
 function obsEvent(subsystem, event, fields) {
-  if (process.env.GM_LOG_DISABLE) return;
-  try {
-    const root = process.env.GM_LOG_DIR || path.join(os.homedir(), '.claude', 'gm-log');
-    const day = new Date().toISOString().slice(0, 10);
-    const dir = path.join(root, day);
-    fs.mkdirSync(dir, { recursive: true });
-    const line = JSON.stringify({
-      ts: new Date().toISOString(), sub: subsystem, event,
-      pid: process.pid, sess: process.env.CLAUDE_SESSION_ID || process.env.GM_SESSION_ID || '',
-      ...fields,
-    });
-    fs.appendFileSync(path.join(dir, `${subsystem}.jsonl`), line + '\n');
-  } catch (_) {}
+  _sharedLogEvent(subsystem, event, fields, { cwd: false });
 }
 
 function writeBootstrapError(spec) {

package/gm-plugkit/gm-log.js

@@ -0,0 +1,38 @@
+'use strict';
+
+const fs = require('fs');
+const os = require('os');
+const path = require('path');
+
+const GM_LOG_ROOT = process.env.GM_LOG_DIR || path.join(os.homedir(), '.claude', 'gm-log');
+
+function currentSess() {
+  return process.env.CLAUDE_SESSION_ID || process.env.GM_SESSION_ID || '';
+}
+
+function logEvent(sub, event, fields, opts) {
+  if (process.env.GM_LOG_DISABLE) return;
+  try {
+    const day = new Date().toISOString().slice(0, 10);
+    const dir = path.join(GM_LOG_ROOT, day);
+    fs.mkdirSync(dir, { recursive: true });
+    const safeFields = { ...(fields || {}) };
+    if (Object.prototype.hasOwnProperty.call(safeFields, 'pid')) {
+      safeFields.child_pid = safeFields.pid;
+      delete safeFields.pid;
+    }
+    const rec = {
+      ts: new Date().toISOString(),
+      sub,
+      event,
+      pid: process.pid,
+      sess: (opts && opts.sess) || currentSess(),
+    };
+    if (!opts || opts.cwd !== false) rec.cwd = process.cwd();
+    if (opts && opts.role) rec.role = opts.role;
+    Object.assign(rec, safeFields);
+    fs.appendFileSync(path.join(dir, `${sub}.jsonl`), JSON.stringify(rec) + '\n');
+  } catch (_) {}
+}
+
+module.exports = { GM_LOG_ROOT, currentSess, logEvent };

package/gm-plugkit/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-plugkit",
-  "version": "2.0.1959",
+  "version": "2.0.1960",
   "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": {
@@ -13,6 +13,7 @@
     "bootstrap.js",
     "supervisor.js",
     "plugkit-wasm-wrapper.js",
+    "gm-log.js",
     "plugkit.version",
     "plugkit.sha256",
     "instructions/"

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

@@ -12,6 +12,9 @@ const _netModule = net;
 const _httpModule = http;
 const _httpsModule = https;
 import { fileURLToPath } from 'url';
+import _gmLog from './gm-log.js';
+const _sharedLogEvent = _gmLog.logEvent;
+const _sharedGmLogRoot = _gmLog.GM_LOG_ROOT;
 
 let _writeStatusBusy = () => {};
 let _lastBusyUntil = 0;
@@ -38,7 +41,7 @@ const GM_TOOLS_ROOT = resolveGmToolsRoot();
 const KV_DIR = path.join(GM_TOOLS_ROOT, 'kv');
 fs.mkdirSync(KV_DIR, { recursive: true });
 
-const GM_LOG_ROOT = process.env.GM_LOG_DIR || path.join(os.homedir(), '.claude', 'gm-log');
+const GM_LOG_ROOT = _sharedGmLogRoot;
 const ORCHESTRATOR_VERBS = new Set(['instruction', 'transition', 'phase-status', 'prd-add', 'prd-resolve', 'prd-list', 'mutable-add', 'mutable-resolve', 'mutable-list', 'memorize-fire', 'residual-scan', 'auto-recall']);
 
 const TURN_IDLE_MS = 30_000;
@@ -472,27 +475,7 @@ const __lockRejectedEmitAt = new Map();
 
 
 function logEvent(sub, event, fields) {
-  if (process.env.GM_LOG_DISABLE) return;
-  try {
-    const day = new Date().toISOString().slice(0, 10);
-    const dir = path.join(GM_LOG_ROOT, day);
-    fs.mkdirSync(dir, { recursive: true });
-    const safeFields = { ...(fields || {}) };
-    if (Object.prototype.hasOwnProperty.call(safeFields, 'pid')) {
-      safeFields.child_pid = safeFields.pid;
-      delete safeFields.pid;
-    }
-    const line = JSON.stringify({
-      ts: new Date().toISOString(),
-      sub,
-      event,
-      pid: process.pid,
-      cwd: process.cwd(),
-      sess: readCurrentSess(),
-      ...safeFields,
-    });
-    fs.appendFileSync(path.join(dir, `${sub}.jsonl`), line + '\n');
-  } catch (_) {}
+  _sharedLogEvent(sub, event, fields, { sess: readCurrentSess() });
 }
 
 function emitOrchestratorEvents(verb, taskBase, resultStr) {

package/gm-plugkit/supervisor.js

@@ -7,6 +7,7 @@ const os = require('os');
 const crypto = require('crypto');
 const { spawn, spawnSync } = require('child_process');
 const { gmToolsDir } = require('./bootstrap');
+const { logEvent: _sharedLogEvent, GM_LOG_ROOT: _sharedGmLogRoot } = require('./gm-log');
 
 function wrapperSha12OnDisk() {
   try {
@@ -24,7 +25,7 @@ const SHUTDOWN_REASON_PATH = path.join(spoolDir, '.shutdown-reason.json');
 const SUPERVISOR_PATH = path.join(spoolDir, '.supervisor.json');
 const SUPERVISOR_PID_PATH = path.join(spoolDir, '.supervisor.pid');
 const LOG_PATH = path.join(spoolDir, '.watcher.log');
-const GM_LOG_ROOT = process.env.GM_LOG_DIR || path.join(os.homedir(), '.claude', 'gm-log');
+const GM_LOG_ROOT = _sharedGmLogRoot;
 
 const POLL_INTERVAL_MS = 10_000;
 const STATUS_STALE_MS = 30_000;
@@ -34,22 +35,7 @@ const BURST_BACKOFF_MS = 60_000;
 const VERSION_DRIFT_COOLDOWN_MS = 60_000;
 
 function logEvent(event, fields) {
-  try {
-    const day = new Date().toISOString().slice(0, 10);
-    const dir = path.join(GM_LOG_ROOT, day);
-    fs.mkdirSync(dir, { recursive: true });
-    const line = JSON.stringify({
-      ts: new Date().toISOString(),
-      sub: 'plugkit',
-      event,
-      pid: process.pid,
-      sess: process.env.CLAUDE_SESSION_ID || '',
-      cwd: process.cwd(),
-      role: 'supervisor',
-      ...fields,
-    }) + '\n';
-    fs.appendFileSync(path.join(dir, 'plugkit.jsonl'), line);
-  } catch (e) { try { console.error('[supervisor] logEvent write failed:', e); } catch (_) {} }
+  _sharedLogEvent('plugkit', event, fields, { sess: process.env.CLAUDE_SESSION_ID || '', role: 'supervisor' });
 }
 
 function writeSupervisorStatus(state, extra) {

package/gm.json

@@ -1,6 +1,6 @@
 {
   "name": "gm",
-  "version": "2.0.1959",
+  "version": "2.0.1960",
   "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.1959",
+  "version": "2.0.1960",
   "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",
@@ -43,6 +43,7 @@
     "gm-plugkit/package.json",
     "gm-plugkit/plugkit-wasm-wrapper.js",
     "gm-plugkit/supervisor.js",
+    "gm-plugkit/gm-log.js",
     "gm-plugkit/plugkit.version",
     "gm-plugkit/plugkit.sha256",
     "gm-plugkit/instructions/",