context-mode 1.0.111 → 1.0.113

package/hooks/session-helpers.mjs

@@ -5,43 +5,80 @@
  *
  * All functions accept an optional `opts` parameter for platform-specific
  * configuration. Defaults to Claude Code settings for backward compatibility.
+ *
+ * ─── PATH / HASH HELPERS ARE BOUND, NOT REIMPLEMENTED ──────────────────
+ * Hash + worktree-suffix + legacy migration logic lives in TypeScript at
+ * `src/session/db.ts` and is bundled to `hooks/session-db.bundle.mjs` by
+ * the existing esbuild step in `npm run bundle`. This file imports those
+ * exports via the bundle so the JS hooks and the TS server cannot drift
+ * again — the same drift that produced rounds 5 and 6 of case-fold fixes.
+ *
+ * Bundle-first / build-fallback resolution mirrors the pattern in
+ * `session-loaders.mjs` for marketplace installs that ship `build/`
+ * artifacts instead of pre-built bundles.
  */
 
-import { execFileSync } from "node:child_process";
-import { createHash } from "node:crypto";
-import { join } from "node:path";
-import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { join, dirname } from "node:path";
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { homedir, tmpdir } from "node:os";
+import { fileURLToPath, pathToFileURL } from "node:url";
+
+// ─────────────────────────────────────────────────────────
+// Bundle binding — single source of truth for path/hash logic.
+// ─────────────────────────────────────────────────────────
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+async function loadSessionDbModule() {
+  // Bundle is co-located with this file in published installs.
+  const bundlePath = join(__dirname, "session-db.bundle.mjs");
+  if (existsSync(bundlePath)) {
+    return await import(pathToFileURL(bundlePath).href);
+  }
+  // Marketplace fallback: build/session/db.js when bundles are absent.
+  const buildPath = join(__dirname, "..", "build", "session", "db.js");
+  return await import(pathToFileURL(buildPath).href);
+}
+
+const _sessionDb = await loadSessionDbModule();
+const {
+  hashProjectDirCanonical,
+  hashProjectDirLegacy,
+  normalizeWorktreePath,
+  resolveSessionPath: _resolveSessionPath,
+  getWorktreeSuffix: _getWorktreeSuffixBundle,
+} = _sessionDb;
+
+// ─────────────────────────────────────────────────────────
+// Cross-process worktree-suffix cache — hook-fork-only optimisation.
+// ─────────────────────────────────────────────────────────
+//
+// The TS bundle's getWorktreeSuffix has an in-process cache, but every
+// Pre/PostToolUse hook is a fresh `node` fork — that cache is dead on
+// arrival. The marker file in tmpdir keyed by sha256(projectDir) lets
+// subsequent forks short-circuit the 12-50ms `git worktree list` cost.
+// The marker filename uses the canonical hash (case-folded on Mac/Win)
+// so two terminals with different casing of the same physical worktree
+// share one marker (and one cached suffix) — same correctness guarantee
+// as the canonical DB filename.
 
-/**
- * Returns the worktree suffix for session path isolation.
- * Mirrors the logic in src/server.ts — kept in sync manually since
- * hooks run as plain .mjs (no TypeScript build step).
- *
- * Two-level cache:
- *   1. In-process module cache — same hook fire calls this 3× (db,
- *      events, cleanup paths) so cache hits 2 of 3 cold within process.
- *   2. Cross-process marker file in tmpdir keyed by sha256(cwd) — every
- *      Pre/PostToolUse hook is a fresh node fork; without this each fire
- *      pays 12-50ms for `git worktree list` on Linux/macOS, 50-150ms on
- *      Windows where fork+exec is heavier.
- *
- * Marker filename uses sha256(cwd) so it is alphanumeric — safe across
- * Windows path/filename rules. tmpdir() resolves correctly on all 3 OS.
- */
 let _wtCacheInProcess;
-function workTreeMarkerPath(cwd) {
-  const hash = createHash("sha256").update(cwd).digest("hex").slice(0, 16);
-  return join(tmpdir(), `cm-wt-${hash}.txt`);
+
+function workTreeMarkerPath(projectDir) {
+  return join(
+    tmpdir(),
+    `cm-wt-${hashProjectDirCanonical(normalizeWorktreePath(projectDir))}.txt`,
+  );
 }
 
-function getWorktreeSuffix() {
+function getWorktreeSuffix(projectDir = process.cwd()) {
   const envSuffix = process.env.CONTEXT_MODE_SESSION_SUFFIX;
-  const cwd = process.cwd();
+  const normalizedProjectDir = normalizeWorktreePath(projectDir);
 
   if (
     _wtCacheInProcess &&
-    _wtCacheInProcess.cwd === cwd &&
+    _wtCacheInProcess.projectDir === normalizedProjectDir &&
     _wtCacheInProcess.envSuffix === envSuffix
   ) {
     return _wtCacheInProcess.suffix;
@@ -52,31 +89,23 @@ function getWorktreeSuffix() {
     suffix = envSuffix ? `__${envSuffix}` : "";
   } else {
     // Try cross-process marker first.
-    const markerPath = workTreeMarkerPath(cwd);
+    const markerPath = workTreeMarkerPath(projectDir);
     try {
       suffix = readFileSync(markerPath, "utf-8");
-      _wtCacheInProcess = { cwd, envSuffix, suffix };
+      _wtCacheInProcess = { projectDir: normalizedProjectDir, envSuffix, suffix };
       return suffix;
     } catch {
-      // marker missing → compute below
+      // marker missing → delegate to bundle for the canonical computation.
     }
 
-    suffix = "";
+    // Single source of truth: the bundle's getWorktreeSuffix runs the
+    // git subprocess, the case-fold comparison, and the suffix hashing.
+    // We just persist the result so other forks can skip the git call.
     try {
-      const mainWorktree = execFileSync(
-        "git",
-        ["worktree", "list", "--porcelain"],
-        { encoding: "utf-8", timeout: 2000, stdio: ["ignore", "pipe", "ignore"] },
-      )
-        .split(/\r?\n/)
-        .find((l) => l.startsWith("worktree "))
-        ?.replace("worktree ", "")
-        ?.trim();
-      if (mainWorktree && cwd !== mainWorktree) {
-        suffix = `__${createHash("sha256").update(cwd).digest("hex").slice(0, 8)}`;
-      }
+      suffix = _getWorktreeSuffixBundle(projectDir);
     } catch {
       // git not available or not a git repo — no suffix
+      suffix = "";
     }
 
     // Best-effort write so subsequent hook forks short-circuit.
@@ -87,10 +116,14 @@ function getWorktreeSuffix() {
     }
   }
 
-  _wtCacheInProcess = { cwd, envSuffix, suffix };
+  _wtCacheInProcess = { projectDir: normalizedProjectDir, envSuffix, suffix };
   return suffix;
 }
 
+// ─────────────────────────────────────────────────────────
+// Platform options (hook-only — the server doesn't fork hooks).
+// ─────────────────────────────────────────────────────────
+
 /** Claude Code platform options (default). */
 const CLAUDE_OPTS = {
   configDir: ".claude",
@@ -228,42 +261,46 @@ export function getSessionId(input, opts = CLAUDE_OPTS) {
   return `pid-${process.ppid}`;
 }
 
+// ─────────────────────────────────────────────────────────
+// Per-project file paths — thin wrappers around resolveSessionPath.
+// ─────────────────────────────────────────────────────────
+
+function _resolveProjectFile(opts, projectDirOverride, ext) {
+  const projectDir = normalizeWorktreePath(projectDirOverride ?? getProjectDir(opts));
+  const sessionsDir = join(resolveConfigDir(opts), "context-mode", "sessions");
+  mkdirSync(sessionsDir, { recursive: true });
+  return _resolveSessionPath({
+    projectDir,
+    sessionsDir,
+    suffix: getWorktreeSuffix(projectDir),
+    ext,
+  });
+}
+
 /**
  * Return the per-project session DB path.
  * Creates the directory if it doesn't exist.
- * Path: ~/<configDir>/context-mode/sessions/<SHA256(projectDir)[:16]>.db
+ * Path: ~/<configDir>/context-mode/sessions/<canonicalHash><suffix>.db
  */
-export function getSessionDBPath(opts = CLAUDE_OPTS) {
-  const projectDir = getProjectDir(opts);
-  const hash = createHash("sha256").update(projectDir).digest("hex").slice(0, 16);
-  const dir = join(resolveConfigDir(opts), "context-mode", "sessions");
-  mkdirSync(dir, { recursive: true });
-  return join(dir, `${hash}${getWorktreeSuffix()}.db`);
+export function getSessionDBPath(opts = CLAUDE_OPTS, projectDirOverride) {
+  return _resolveProjectFile(opts, projectDirOverride, ".db");
 }
 
 /**
  * Return the per-project session events file path.
  * Used by sessionstart hook (write) and MCP server (read + auto-index).
- * Path: ~/<configDir>/context-mode/sessions/<SHA256(projectDir)[:16]>-events.md
+ * Path: ~/<configDir>/context-mode/sessions/<canonicalHash><suffix>-events.md
  */
-export function getSessionEventsPath(opts = CLAUDE_OPTS) {
-  const projectDir = getProjectDir(opts);
-  const hash = createHash("sha256").update(projectDir).digest("hex").slice(0, 16);
-  const dir = join(resolveConfigDir(opts), "context-mode", "sessions");
-  mkdirSync(dir, { recursive: true });
-  return join(dir, `${hash}${getWorktreeSuffix()}-events.md`);
+export function getSessionEventsPath(opts = CLAUDE_OPTS, projectDirOverride) {
+  return _resolveProjectFile(opts, projectDirOverride, "-events.md");
 }
 
 /**
  * Return the per-project cleanup flag path.
  * Used to detect true fresh starts vs --continue (which fires startup+resume).
- * Path: ~/<configDir>/context-mode/sessions/<SHA256(projectDir)[:16]>.cleanup
+ * Path: ~/<configDir>/context-mode/sessions/<canonicalHash><suffix>.cleanup
  */
-export function getCleanupFlagPath(opts = CLAUDE_OPTS) {
-  const projectDir = getProjectDir(opts);
-  const hash = createHash("sha256").update(projectDir).digest("hex").slice(0, 16);
-  const dir = join(resolveConfigDir(opts), "context-mode", "sessions");
-  mkdirSync(dir, { recursive: true });
-  return join(dir, `${hash}${getWorktreeSuffix()}.cleanup`);
+export function getCleanupFlagPath(opts = CLAUDE_OPTS, projectDirOverride) {
+  return _resolveProjectFile(opts, projectDirOverride, ".cleanup");
 }
 

package/hooks/sessionstart.mjs

@@ -81,7 +81,31 @@ await runHook(async () => {
           additionalContext += "\n\n" + autoInjection;
         }
 
-        // Write session-resume event
+        // D2 PRD Phase 6.2: emit snapshot-consumed with bytes_returned=snapshot.length.
+        // The resumed snapshot bytes ARE returned to the model — that's the whole
+        // point of resume — so account them on bytes_returned, not bytes_avoided.
+        try {
+          const resumeRow = (resume && resume.snapshot)
+            ? resume
+            : (db.getResume?.(sessionId) ?? null);
+          const snapshotBytes = resumeRow?.snapshot?.length ?? 0;
+
+          db.insertEvent(
+            sessionId,
+            {
+              type: "snapshot-consumed",
+              category: "session-resume",
+              data: `Session resumed from ${source}. Snapshot ${snapshotBytes} bytes injected.`,
+              priority: 1,
+            },
+            "SessionStart",
+            undefined,
+            { bytesAvoided: 0, bytesReturned: snapshotBytes },
+          );
+        } catch { /* best-effort */ }
+
+        // Legacy resume_completed event retained for back-compat with existing
+        // analytics consumers that filter on `type === 'resume_completed'`.
         try {
           db.insertEvent(
             sessionId,
@@ -140,7 +164,32 @@ await runHook(async () => {
       // If cleanup flag exists from a PREVIOUS startup that was never followed by
       // resume, that was a true fresh start — aggressively wipe all data.
       db.cleanupOldSessions(7);
-      db.db.exec(`DELETE FROM session_events WHERE session_id NOT IN (SELECT session_id FROM session_meta)`);
+      // Bug fix: the unconditional DELETE below USED to wipe ALL orphan
+      // events (any session_id missing from session_meta). On a power-outage
+      // restart this destroyed 1000+ events of real Claude Code work whose
+      // UUID session_ids hadn't yet had their session_meta row written
+      // (timing window between insertEvent and ensureSession). See
+      // tests/session/cleanup-preserves-live-uuid-events.test.ts.
+      //
+      // Now: protect anything that LOOKS like a real session UUID
+      // (4 dashes per RFC 4122 8-4-4-4-12), unless it's already older than
+      // the 7-day cleanup horizon. Detection-probe orphans like 'pid-12345'
+      // (no UUID shape) are still wiped aggressively — they're noise.
+      // Loose 4-dash shape `*-*-*-*-*`. Claude Code session_ids are UUIDs
+      // (5 dash-separated segments) and match. `pid-XXXXX` probes have one
+      // dash and don't match → wiped aggressively. We deliberately keep
+      // this loose so adapters that may eventually share this DB (or reuse
+      // this hook with hybrid `claude-code-...`-style IDs across 15
+      // platforms) aren't accidentally classified as orphans. The 7-day
+      // fallback still wipes truly abandoned UUIDs.
+      db.db.exec(`
+        DELETE FROM session_events
+         WHERE session_id NOT IN (SELECT session_id FROM session_meta)
+           AND (
+             session_id NOT GLOB '*-*-*-*-*'              -- pid-XXX probes etc.
+             OR created_at < datetime('now', '-7 day')    -- truly abandoned UUIDs
+           )
+      `);
 
       // Proactively capture CLAUDE.md files — Claude Code loads them as system
       // context at startup, invisible to PostToolUse hooks. We read them from

package/hooks/vscode-copilot/posttooluse.mjs

@@ -33,7 +33,7 @@ try {
   const { resolveProjectAttributions } = await loadProjectAttribution();
   const { SessionDB } = await loadSessionDB();
 
-  const dbPath = getSessionDBPath(OPTS);
+  const dbPath = getSessionDBPath(OPTS, projectDir);
   const db = new SessionDB({ dbPath });
   const sessionId = getSessionId(input, OPTS);
 

package/hooks/vscode-copilot/precompact.mjs

@@ -10,7 +10,7 @@ import "../ensure-deps.mjs";
  */
 
 import { createSessionLoaders } from "../session-loaders.mjs";
-import { readStdin, parseStdin, getSessionId, getSessionDBPath, VSCODE_OPTS } from "../session-helpers.mjs";
+import { readStdin, parseStdin, getSessionId, getSessionDBPath, getInputProjectDir, VSCODE_OPTS } from "../session-helpers.mjs";
 import { appendFileSync } from "node:fs";
 import { join, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -24,11 +24,12 @@ const DEBUG_LOG = join(homedir(), ".vscode", "context-mode", "precompact-debug.l
 try {
   const raw = await readStdin();
   const input = parseStdin(raw);
+  const projectDir = getInputProjectDir(input, OPTS);
 
   const { buildResumeSnapshot } = await loadSnapshot();
   const { SessionDB } = await loadSessionDB();
 
-  const dbPath = getSessionDBPath(OPTS);
+  const dbPath = getSessionDBPath(OPTS, projectDir);
   const db = new SessionDB({ dbPath });
   const sessionId = getSessionId(input, OPTS);
 

package/hooks/vscode-copilot/sessionstart.mjs

@@ -26,7 +26,7 @@ const ROUTING_BLOCK = createRoutingBlock(toolNamer);
 import { writeSessionEventsFile, buildSessionDirective, getSessionEvents } from "../session-directive.mjs";
 import {
   readStdin, parseStdin, getSessionId, getSessionDBPath, getSessionEventsPath, getCleanupFlagPath,
-  getProjectDir, VSCODE_OPTS,
+  getInputProjectDir, VSCODE_OPTS,
 } from "../session-helpers.mjs";
 import { join } from "node:path";
 import { readFileSync, unlinkSync } from "node:fs";
@@ -42,10 +42,11 @@ try {
   const raw = await readStdin();
   const input = parseStdin(raw);
   const source = input.source ?? "startup";
+  const projectDir = getInputProjectDir(input, OPTS);
 
   if (source === "compact") {
     const { SessionDB } = await loadSessionDB();
-    const dbPath = getSessionDBPath(OPTS);
+    const dbPath = getSessionDBPath(OPTS, projectDir);
     const db = new SessionDB({ dbPath });
     const sessionId = getSessionId(input, OPTS);
     const resume = db.getResume(sessionId);
@@ -56,38 +57,37 @@ try {
 
     const events = getSessionEvents(db, sessionId);
     if (events.length > 0) {
-      const eventMeta = writeSessionEventsFile(events, getSessionEventsPath(OPTS));
+      const eventMeta = writeSessionEventsFile(events, getSessionEventsPath(OPTS, projectDir));
       additionalContext += buildSessionDirective("compact", eventMeta, toolNamer);
     }
 
     db.close();
   } else if (source === "resume") {
-    try { unlinkSync(getCleanupFlagPath(OPTS)); } catch { /* no flag */ }
+    try { unlinkSync(getCleanupFlagPath(OPTS, projectDir)); } catch { /* no flag */ }
 
     const { SessionDB } = await loadSessionDB();
-    const dbPath = getSessionDBPath(OPTS);
+    const dbPath = getSessionDBPath(OPTS, projectDir);
     const db = new SessionDB({ dbPath });
 
     // Filter events to the session being resumed (cross-session bleed guard).
     const sessionId = getSessionId(input, OPTS);
     const events = sessionId ? getSessionEvents(db, sessionId) : [];
     if (events.length > 0) {
-      const eventMeta = writeSessionEventsFile(events, getSessionEventsPath(OPTS));
+      const eventMeta = writeSessionEventsFile(events, getSessionEventsPath(OPTS, projectDir));
       additionalContext += buildSessionDirective("resume", eventMeta, toolNamer);
     }
 
     db.close();
   } else if (source === "startup") {
     const { SessionDB } = await loadSessionDB();
-    const dbPath = getSessionDBPath(OPTS);
+    const dbPath = getSessionDBPath(OPTS, projectDir);
     const db = new SessionDB({ dbPath });
-    try { unlinkSync(getSessionEventsPath(OPTS)); } catch { /* no stale file */ }
+    try { unlinkSync(getSessionEventsPath(OPTS, projectDir)); } catch { /* no stale file */ }
 
     db.cleanupOldSessions(7);
     db.db.exec(`DELETE FROM session_events WHERE session_id NOT IN (SELECT session_id FROM session_meta)`);
 
     const sessionId = getSessionId(input, OPTS);
-    const projectDir = getProjectDir(OPTS);
     db.ensureSession(sessionId, projectDir);
 
     // VSCode Copilot's canonical project-level instruction file.

package/openclaw.plugin.json

@@ -3,7 +3,7 @@
   "name": "Context Mode",
   "kind": "tool",
   "description": "OpenClaw plugin that saves 98% of your context window. Sandboxed code execution in 11 languages, FTS5 knowledge base with BM25 ranking, and intent-driven search.",
-  "version": "1.0.111",
+  "version": "1.0.113",
   "sandbox": {
     "mode": "permissive",
     "filesystem_access": "full",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "context-mode",
-  "version": "1.0.111",
+  "version": "1.0.113",
   "type": "module",
   "description": "MCP plugin that saves 98% of your context window. Works with Claude Code, Gemini CLI, VS Code Copilot, OpenCode, and Codex CLI. Sandboxed code execution, FTS5 knowledge base, and intent-driven search.",
   "author": "Mert Koseoğlu",
@@ -29,7 +29,7 @@
   "homepage": "https://github.com/mksglu/context-mode#readme",
   "pi": {
     "extensions": [
-      "./build/pi-extension.js"
+      "./build/adapters/pi/extension.js"
     ],
     "skills": [
       "./skills"
@@ -37,15 +37,20 @@
   },
   "openclaw": {
     "extensions": [
-      "./build/openclaw-plugin.js"
+      "./build/adapters/openclaw/plugin.js"
     ]
   },
+  "omp": {
+    "name": "context-mode",
+    "description": "Save 98% of your context window in OMP — sandboxed code execution, FTS5 search, hard-block curl/wget, session continuity across compaction.",
+    "hooks": "./build/adapters/omp/plugin.js"
+  },
   "bugs": "https://github.com/mksglu/context-mode/issues",
-  "main": "./build/opencode-plugin.js",
+  "main": "./build/adapters/opencode/plugin.js",
   "exports": {
-    ".": "./build/opencode-plugin.js",
-    "./plugin": "./build/opencode-plugin.js",
-    "./openclaw": "./build/openclaw-plugin.js",
+    ".": "./build/adapters/opencode/plugin.js",
+    "./plugin": "./build/adapters/opencode/plugin.js",
+    "./openclaw": "./build/adapters/openclaw/plugin.js",
     "./cli": "./cli.bundle.mjs"
   },
   "bin": {
@@ -81,12 +86,13 @@
     "build": "tsc && node -e \"if(process.platform!=='win32'){require('fs').chmodSync('build/cli.js',0o755)}\" && npm run bundle",
     "bundle": "esbuild src/server.ts --bundle --platform=node --target=node18 --format=esm --outfile=server.bundle.mjs --external:better-sqlite3 --external:turndown --external:turndown-plugin-gfm --external:@mixmark-io/domino --minify && esbuild src/cli.ts --bundle --platform=node --target=node18 --format=esm --outfile=cli.bundle.mjs --external:better-sqlite3 --minify && esbuild src/session/extract.ts --bundle --platform=node --target=node18 --format=esm --outfile=hooks/session-extract.bundle.mjs --minify && esbuild src/session/snapshot.ts --bundle --platform=node --target=node18 --format=esm --outfile=hooks/session-snapshot.bundle.mjs --minify && esbuild src/session/db.ts --bundle --platform=node --target=node18 --format=esm --outfile=hooks/session-db.bundle.mjs --external:better-sqlite3 --minify",
     "version-sync": "node scripts/version-sync.mjs",
-    "version": "node scripts/version-sync.mjs && git add .claude-plugin/plugin.json .claude-plugin/marketplace.json .openclaw-plugin/openclaw.plugin.json .openclaw-plugin/package.json openclaw.plugin.json .pi/extensions/context-mode/package.json",
+    "version": "node scripts/version-sync.mjs && git add package.json .claude-plugin/plugin.json .claude-plugin/marketplace.json .openclaw-plugin/openclaw.plugin.json .openclaw-plugin/package.json openclaw.plugin.json .pi/extensions/context-mode/package.json",
     "prepublishOnly": "npm run build",
     "dev": "npx tsx src/server.ts",
     "setup": "npx tsx src/cli.ts setup",
     "doctor": "npx tsx src/cli.ts doctor",
     "typecheck": "tsc --noEmit",
+    "pretest": "npm run build",
     "test": "vitest run",
     "test:watch": "vitest",
     "benchmark": "npx tsx tests/benchmark.ts",