context-mode 1.0.101 → 1.0.104

package/hooks/gemini-cli/sessionstart.mjs

@@ -16,7 +16,7 @@ import { createToolNamer } from "../core/tool-naming.mjs";
 
 const toolNamer = createToolNamer("gemini-cli");
 const ROUTING_BLOCK = createRoutingBlock(toolNamer);
-import { writeSessionEventsFile, buildSessionDirective, getSessionEvents, getLatestSessionEvents } from "../session-directive.mjs";
+import { writeSessionEventsFile, buildSessionDirective, getSessionEvents } from "../session-directive.mjs";
 import {
   readStdin, parseStdin, getSessionId, getSessionDBPath, getSessionEventsPath, getCleanupFlagPath,
   getProjectDir, GEMINI_OPTS,
@@ -63,7 +63,12 @@ try {
     const dbPath = getSessionDBPath(OPTS);
     const db = new SessionDB({ dbPath });
 
-    const events = getLatestSessionEvents(db);
+    // Filter events to the session being resumed. Falling back to
+    // getLatestSessionEvents(db) leaks events from any other session whose
+    // session_meta.started_at is more recent — observed cross-session bleed
+    // when a different session started after this one and before the resume.
+    const sessionId = getSessionId(input, OPTS);
+    const events = sessionId ? getSessionEvents(db, sessionId) : [];
     if (events.length > 0) {
       const eventMeta = writeSessionEventsFile(events, getSessionEventsPath(OPTS));
       additionalContext += buildSessionDirective("resume", eventMeta, toolNamer);

package/hooks/jetbrains-copilot/sessionstart.mjs

@@ -17,7 +17,7 @@ import { createToolNamer } from "../core/tool-naming.mjs";
 
 const toolNamer = createToolNamer("jetbrains-copilot");
 const ROUTING_BLOCK = createRoutingBlock(toolNamer);
-import { writeSessionEventsFile, buildSessionDirective, getSessionEvents, getLatestSessionEvents } from "../session-directive.mjs";
+import { writeSessionEventsFile, buildSessionDirective, getSessionEvents } from "../session-directive.mjs";
 import {
   readStdin, parseStdin, getSessionId, getSessionDBPath, getSessionEventsPath, getCleanupFlagPath,
   getProjectDir, JETBRAINS_OPTS,
@@ -63,7 +63,12 @@ try {
     const dbPath = getSessionDBPath(OPTS);
     const db = new SessionDB({ dbPath });
 
-    const events = getLatestSessionEvents(db);
+    // Filter events to the session being resumed. Falling back to
+    // getLatestSessionEvents(db) leaks events from any other session whose
+    // session_meta.started_at is more recent — observed cross-session bleed
+    // when a different session started after this one and before the resume.
+    const sessionId = getSessionId(input, OPTS);
+    const events = sessionId ? getSessionEvents(db, sessionId) : [];
     if (events.length > 0) {
       const eventMeta = writeSessionEventsFile(events, getSessionEventsPath(OPTS));
       additionalContext += buildSessionDirective("resume", eventMeta, toolNamer);

package/hooks/normalize-hooks.mjs

@@ -0,0 +1,184 @@
+// normalize-hooks.mjs — fixes #378
+//
+// Static committed files (hooks/hooks.json, .claude-plugin/plugin.json) ship
+// with `${CLAUDE_PLUGIN_ROOT}` placeholder + bare `node` command. On Windows
+// + Claude Code this triggers cjs/loader:1479 errors because:
+//   1. bare `node` may not resolve via PATH (Git Bash, see #369)
+//   2. `${CLAUDE_PLUGIN_ROOT}` resolution can hit MSYS path mangling (#372)
+//   3. backslash paths get corrupted in shell quoting
+//
+// Our buildNodeCommand() fix handles dynamically-generated settings.json but
+// not the static committed files. Solution: start.mjs detects the placeholder
+// pattern on every MCP boot and rewrites with absolute paths using
+// process.execPath + forward slashes. Idempotent — only rewrites when needed.
+// Survives upgrades because it runs at every start.
+
+import { existsSync, readFileSync, writeFileSync } from "node:fs";
+import { resolve } from "node:path";
+
+const PLACEHOLDER = "${CLAUDE_PLUGIN_ROOT}";
+
+/** Convert any path string to forward slashes (MSYS-safe). */
+function fwd(p) {
+  return String(p).replace(/\\/g, "/");
+}
+
+/**
+ * Pure detection: does this content contain an unresolved CLAUDE_PLUGIN_ROOT
+ * placeholder that should be normalized?
+ */
+export function needsHookNormalization(content) {
+  if (!content || typeof content !== "string") return false;
+  return content.includes(PLACEHOLDER);
+}
+
+/**
+ * Rewrite hooks.json content. Replaces:
+ *   - `node "${CLAUDE_PLUGIN_ROOT}/x.mjs"` →
+ *     `"<execPath>" "<pluginRoot>/x.mjs"`  (forward slashes, double-quoted)
+ *
+ * Pure function — takes content + paths, returns new content.
+ * Idempotent — leaves already-normalized content unchanged.
+ */
+export function normalizeHooksJson(content, nodePath, pluginRoot) {
+  if (!needsHookNormalization(content)) return content;
+
+  const safeNode = fwd(nodePath);
+  const safeRoot = fwd(pluginRoot);
+
+  let parsed;
+  try {
+    parsed = JSON.parse(content);
+  } catch {
+    return content;
+  }
+
+  const hooks = parsed?.hooks;
+  if (!hooks || typeof hooks !== "object") return content;
+
+  let mutated = false;
+  for (const eventName of Object.keys(hooks)) {
+    const matchers = hooks[eventName];
+    if (!Array.isArray(matchers)) continue;
+    for (const matcher of matchers) {
+      const inner = matcher?.hooks;
+      if (!Array.isArray(inner)) continue;
+      for (const h of inner) {
+        if (typeof h?.command !== "string") continue;
+        if (!h.command.includes(PLACEHOLDER)) continue;
+        // Replace placeholder with absolute root (forward-slash).
+        let next = h.command.replaceAll(PLACEHOLDER, safeRoot);
+        // Replace bare `node ` prefix with quoted execPath. Match both
+        // `node ` and `node\t` at start, with optional surrounding whitespace.
+        next = next.replace(/^\s*node\s+/, `"${safeNode}" `);
+        h.command = next;
+        mutated = true;
+      }
+    }
+  }
+
+  if (!mutated) return content;
+
+  // Preserve 2-space indent (matches committed format).
+  return JSON.stringify(parsed, null, 2);
+}
+
+/**
+ * Rewrite plugin.json mcpServers. Replaces:
+ *   - `command: "node"` → `command: "<execPath-fwd>"`
+ *   - `args: ["${CLAUDE_PLUGIN_ROOT}/start.mjs"]` →
+ *     `args: ["<pluginRoot-fwd>/start.mjs"]`
+ *
+ * Idempotent.
+ */
+export function normalizePluginJson(content, nodePath, pluginRoot) {
+  if (!needsHookNormalization(content)) return content;
+
+  const safeNode = fwd(nodePath);
+  const safeRoot = fwd(pluginRoot);
+
+  let parsed;
+  try {
+    parsed = JSON.parse(content);
+  } catch {
+    return content;
+  }
+
+  const servers = parsed?.mcpServers;
+  if (!servers || typeof servers !== "object") return content;
+
+  let mutated = false;
+  for (const name of Object.keys(servers)) {
+    const srv = servers[name];
+    if (!srv || typeof srv !== "object") continue;
+
+    if (Array.isArray(srv.args)) {
+      const before = srv.args;
+      const after = before.map((a) =>
+        typeof a === "string" && a.includes(PLACEHOLDER)
+          ? a.replaceAll(PLACEHOLDER, safeRoot)
+          : a,
+      );
+      if (after.some((v, i) => v !== before[i])) {
+        srv.args = after;
+        mutated = true;
+      }
+    }
+
+    if (srv.command === "node" && mutated) {
+      // Only swap bare `node` when we also rewrote args — otherwise we'd
+      // touch user-customized server entries unrelated to placeholders.
+      srv.command = safeNode;
+    }
+  }
+
+  if (!mutated) return content;
+  return JSON.stringify(parsed, null, 2);
+}
+
+/**
+ * Apply normalization to hooks.json and plugin.json on startup.
+ *
+ * Options:
+ *   - pluginRoot: absolute path to plugin install dir (e.g. __dirname of start.mjs)
+ *   - nodePath:   process.execPath
+ *   - platform:   process.platform (only "win32" triggers a write)
+ *
+ * Best-effort — never throws.
+ */
+export function normalizeHooksOnStartup({ pluginRoot, nodePath, platform }) {
+  if (platform !== "win32") return;
+  if (!pluginRoot || !nodePath) return;
+
+  // hooks/hooks.json
+  try {
+    const hooksPath = resolve(pluginRoot, "hooks", "hooks.json");
+    if (existsSync(hooksPath)) {
+      const original = readFileSync(hooksPath, "utf-8");
+      if (needsHookNormalization(original)) {
+        const next = normalizeHooksJson(original, nodePath, pluginRoot);
+        if (next !== original) {
+          writeFileSync(hooksPath, next, "utf-8");
+        }
+      }
+    }
+  } catch {
+    /* best effort */
+  }
+
+  // .claude-plugin/plugin.json
+  try {
+    const pluginPath = resolve(pluginRoot, ".claude-plugin", "plugin.json");
+    if (existsSync(pluginPath)) {
+      const original = readFileSync(pluginPath, "utf-8");
+      if (needsHookNormalization(original)) {
+        const next = normalizePluginJson(original, nodePath, pluginRoot);
+        if (next !== original) {
+          writeFileSync(pluginPath, next, "utf-8");
+        }
+      }
+    }
+  } catch {
+    /* best effort */
+  }
+}

package/hooks/session-db.bundle.mjs

@@ -1,4 +1,4 @@
-import{createRequire as b}from"node:module";import{existsSync as N,unlinkSync as y,renameSync as D}from"node:fs";import{tmpdir as O}from"node:os";import{join as A}from"node:path";var p=class{#t;constructor(t){this.#t=t}pragma(t){let e=this.#t.prepare(`PRAGMA ${t}`).all();if(!e||e.length===0)return;if(e.length>1)return e;let n=Object.values(e[0]);return n.length===1?n[0]:e[0]}exec(t){let s="",e=null;for(let o=0;o<t.length;o++){let a=t[o];if(e)s+=a,a===e&&(e=null);else if(a==="'"||a==='"')s+=a,e=a;else if(a===";"){let c=s.trim();c&&this.#t.prepare(c).run(),s=""}else s+=a}let n=s.trim();return n&&this.#t.prepare(n).run(),this}prepare(t){let s=this.#t.prepare(t);return{run:(...e)=>s.run(...e),get:(...e)=>{let n=s.get(...e);return n===null?void 0:n},all:(...e)=>s.all(...e),iterate:(...e)=>s.iterate(...e)}}transaction(t){return this.#t.transaction(t)}close(){this.#t.close()}},_=class{#t;constructor(t){this.#t=t}pragma(t){let e=this.#t.prepare(`PRAGMA ${t}`).all();if(!e||e.length===0)return;if(e.length>1)return e;let n=Object.values(e[0]);return n.length===1?n[0]:e[0]}exec(t){return this.#t.exec(t),this}prepare(t){let s=this.#t.prepare(t);return{run:(...e)=>s.run(...e),get:(...e)=>s.get(...e),all:(...e)=>s.all(...e),iterate:(...e)=>typeof s.iterate=="function"?s.iterate(...e):s.all(...e)[Symbol.iterator]()}}transaction(t){return(...s)=>{this.#t.exec("BEGIN");try{let e=t(...s);return this.#t.exec("COMMIT"),e}catch(e){throw this.#t.exec("ROLLBACK"),e}}}close(){this.#t.close()}},u=null;function w(){if(!u){let i=b(import.meta.url);if(globalThis.Bun){let t=i(["bun","sqlite"].join(":")).Database;u=function(e,n){let o=new t(e,{readonly:n?.readonly,create:!0}),a=new p(o);return n?.timeout&&a.pragma(`busy_timeout = ${n.timeout}`),a}}else if(process.platform==="linux")try{let{DatabaseSync:t}=i(["node","sqlite"].join(":"));u=function(e,n){let o=new t(e,{readOnly:n?.readonly??!1});return new _(o)}}catch{u=i("better-sqlite3")}else u=i("better-sqlite3")}return u}function T(i){i.pragma("journal_mode = WAL"),i.pragma("synchronous = NORMAL");try{i.pragma("mmap_size = 268435456")}catch{}}function h(i){if(!N(i))for(let t of["-wal","-shm"])try{y(i+t)}catch{}}function C(i){for(let t of["","-wal","-shm"])try{y(i+t)}catch{}}function l(i){try{i.pragma("wal_checkpoint(TRUNCATE)")}catch{}try{i.close()}catch{}}function f(i="context-mode"){return A(O(),`${i}-${process.pid}.db`)}function I(i,t=[100,500,2e3]){let s;for(let e=0;e<=t.length;e++)try{return i()}catch(n){let o=n instanceof Error?n.message:String(n);if(!o.includes("SQLITE_BUSY")&&!o.includes("database is locked"))throw n;if(s=n instanceof Error?n:new Error(o),e<t.length){let a=t[e],c=Date.now();for(;Date.now()-c<a;);}}throw new Error(`SQLITE_BUSY: database is locked after ${t.length} retries. Original error: ${s?.message}`)}function U(i){return i.includes("SQLITE_CORRUPT")||i.includes("SQLITE_NOTADB")||i.includes("database disk image is malformed")||i.includes("file is not a database")}function M(i){let t=Date.now();for(let s of["","-wal","-shm"])try{D(i+s,`${i}${s}.corrupt-${t}`)}catch{}}var d=Symbol.for("__context_mode_live_dbs__"),m=(()=>{let i=globalThis;return i[d]||(i[d]=new Set,process.on("exit",()=>{for(let t of i[d])l(t);i[d].clear()})),i[d]})(),E=class{#t;#e;constructor(t){let s=w();this.#t=t,h(t);let e;try{e=new s(t,{timeout:3e4}),T(e)}catch(n){let o=n instanceof Error?n.message:String(n);if(U(o)){M(t),h(t);try{e=new s(t,{timeout:3e4}),T(e)}catch(a){throw new Error(`Failed to create fresh DB after renaming corrupt file: ${a instanceof Error?a.message:String(a)}`)}}else throw n}this.#e=e,m.add(this.#e),this.initSchema(),this.prepareStatements()}get db(){return this.#e}get dbPath(){return this.#t}close(){m.delete(this.#e),l(this.#e)}withRetry(t){return I(t)}cleanup(){m.delete(this.#e),l(this.#e),C(this.#t)}};import{createHash as R}from"node:crypto";import{execFileSync as x}from"node:child_process";function K(){let i=process.env.CONTEXT_MODE_SESSION_SUFFIX;if(i!==void 0)return i?`__${i}`:"";try{let t=process.cwd(),s=x("git",["worktree","list","--porcelain"],{encoding:"utf-8",timeout:2e3,stdio:["ignore","pipe","ignore"]}).split(/\r?\n/).find(e=>e.startsWith("worktree "))?.replace("worktree ","")?.trim();if(s&&t!==s)return`__${R("sha256").update(t).digest("hex").slice(0,8)}`}catch{}return""}var k=1e3,F=5,r={insertEvent:"insertEvent",getEvents:"getEvents",getEventsByType:"getEventsByType",getEventsByPriority:"getEventsByPriority",getEventsByTypeAndPriority:"getEventsByTypeAndPriority",getEventCount:"getEventCount",getLatestAttributedProject:"getLatestAttributedProject",checkDuplicate:"checkDuplicate",evictLowestPriority:"evictLowestPriority",updateMetaLastEvent:"updateMetaLastEvent",ensureSession:"ensureSession",getSessionStats:"getSessionStats",incrementCompactCount:"incrementCompactCount",upsertResume:"upsertResume",getResume:"getResume",markResumeConsumed:"markResumeConsumed",deleteEvents:"deleteEvents",deleteMeta:"deleteMeta",deleteResume:"deleteResume",getOldSessions:"getOldSessions",searchEvents:"searchEvents"},L=class extends E{constructor(t){super(t?.dbPath??f("session"))}stmt(t){return this.stmts.get(t)}initSchema(){try{let s=this.db.pragma("table_xinfo(session_events)").find(e=>e.name==="data_hash");s&&s.hidden!==0&&this.db.exec("DROP TABLE session_events")}catch{}this.db.exec(`
+import{createRequire as I}from"node:module";import{existsSync as U,unlinkSync as v,renameSync as M}from"node:fs";import{tmpdir as x}from"node:os";import{join as F}from"node:path";var g=class{#t;constructor(t){this.#t=t}pragma(t){let e=this.#t.prepare(`PRAGMA ${t}`).all();if(!e||e.length===0)return;if(e.length>1)return e;let r=Object.values(e[0]);return r.length===1?r[0]:e[0]}exec(t){let s="",e=null;for(let o=0;o<t.length;o++){let a=t[o];if(e)s+=a,a===e&&(e=null);else if(a==="'"||a==='"')s+=a,e=a;else if(a===";"){let c=s.trim();c&&this.#t.prepare(c).run(),s=""}else s+=a}let r=s.trim();return r&&this.#t.prepare(r).run(),this}prepare(t){let s=this.#t.prepare(t);return{run:(...e)=>s.run(...e),get:(...e)=>{let r=s.get(...e);return r===null?void 0:r},all:(...e)=>s.all(...e),iterate:(...e)=>s.iterate(...e)}}transaction(t){return this.#t.transaction(t)}close(){this.#t.close()}},h=class{#t;constructor(t){this.#t=t}pragma(t){let e=this.#t.prepare(`PRAGMA ${t}`).all();if(!e||e.length===0)return;if(e.length>1)return e;let r=Object.values(e[0]);return r.length===1?r[0]:e[0]}exec(t){return this.#t.exec(t),this}prepare(t){let s=this.#t.prepare(t);return{run:(...e)=>s.run(...e),get:(...e)=>s.get(...e),all:(...e)=>s.all(...e),iterate:(...e)=>typeof s.iterate=="function"?s.iterate(...e):s.all(...e)[Symbol.iterator]()}}transaction(t){return(...s)=>{this.#t.exec("BEGIN");try{let e=t(...s);return this.#t.exec("COMMIT"),e}catch(e){throw this.#t.exec("ROLLBACK"),e}}}close(){this.#t.close()}},d=null;function B(){if(!d){let i=I(import.meta.url);if(globalThis.Bun){let t=i(["bun","sqlite"].join(":")).Database;d=function(e,r){let o=new t(e,{readonly:r?.readonly,create:!0}),a=new g(o);return r?.timeout&&a.pragma(`busy_timeout = ${r.timeout}`),a}}else if(process.platform==="linux")try{let{DatabaseSync:t}=i(["node","sqlite"].join(":"));d=function(e,r){let o=new t(e,{readOnly:r?.readonly??!1});return new h(o)}}catch{d=i("better-sqlite3")}else d=i("better-sqlite3")}return d}function b(i){i.pragma("journal_mode = WAL"),i.pragma("synchronous = NORMAL");try{i.pragma("mmap_size = 268435456")}catch{}}function N(i){if(!U(i))for(let t of["-wal","-shm"])try{v(i+t)}catch{}}function P(i){for(let t of["","-wal","-shm"])try{v(i+t)}catch{}}function y(i){try{i.pragma("wal_checkpoint(TRUNCATE)")}catch{}try{i.close()}catch{}}function C(i="context-mode"){return F(x(),`${i}-${process.pid}.db`)}function k(i,t=[100,500,2e3]){let s;for(let e=0;e<=t.length;e++)try{return i()}catch(r){let o=r instanceof Error?r.message:String(r);if(!o.includes("SQLITE_BUSY")&&!o.includes("database is locked"))throw r;if(s=r instanceof Error?r:new Error(o),e<t.length){let a=t[e],c=Date.now();for(;Date.now()-c<a;);}}throw new Error(`SQLITE_BUSY: database is locked after ${t.length} retries. Original error: ${s?.message}`)}function j(i){return i.includes("SQLITE_CORRUPT")||i.includes("SQLITE_NOTADB")||i.includes("database disk image is malformed")||i.includes("file is not a database")}function X(i){let t=Date.now();for(let s of["","-wal","-shm"])try{M(i+s,`${i}${s}.corrupt-${t}`)}catch{}}var m=Symbol.for("__context_mode_live_dbs__"),p=(()=>{let i=globalThis;return i[m]||(i[m]=new Set,process.on("exit",()=>{for(let t of i[m])y(t);i[m].clear()})),i[m]})(),T=class{#t;#e;constructor(t){let s=B();this.#t=t,N(t);let e;try{e=new s(t,{timeout:3e4}),b(e)}catch(r){let o=r instanceof Error?r.message:String(r);if(j(o)){X(t),N(t);try{e=new s(t,{timeout:3e4}),b(e)}catch(a){throw new Error(`Failed to create fresh DB after renaming corrupt file: ${a instanceof Error?a.message:String(a)}`)}}else throw r}this.#e=e,p.add(this.#e),this.initSchema(),this.prepareStatements()}get db(){return this.#e}get dbPath(){return this.#t}close(){p.delete(this.#e),y(this.#e)}withRetry(t){return k(t)}cleanup(){p.delete(this.#e),y(this.#e),P(this.#t)}};import{createHash as f}from"node:crypto";import{execFileSync as W}from"node:child_process";var l;function z(){let i=process.env.CONTEXT_MODE_SESSION_SUFFIX,t=process.cwd();if(l&&l.cwd===t&&l.envSuffix===i)return l.suffix;let s="";if(i!==void 0)s=i?`__${i}`:"";else try{let e=W("git",["worktree","list","--porcelain"],{encoding:"utf-8",timeout:2e3,stdio:["ignore","pipe","ignore"]}).split(/\r?\n/).find(r=>r.startsWith("worktree "))?.replace("worktree ","")?.trim();e&&t!==e&&(s=`__${f("sha256").update(t).digest("hex").slice(0,8)}`)}catch{}return l={cwd:t,envSuffix:i,suffix:s},s}function J(){l=void 0}var O=1e3,D=5,n={insertEvent:"insertEvent",getEvents:"getEvents",getEventsByType:"getEventsByType",getEventsByPriority:"getEventsByPriority",getEventsByTypeAndPriority:"getEventsByTypeAndPriority",getEventCount:"getEventCount",getLatestAttributedProject:"getLatestAttributedProject",checkDuplicate:"checkDuplicate",evictLowestPriority:"evictLowestPriority",updateMetaLastEvent:"updateMetaLastEvent",ensureSession:"ensureSession",getSessionStats:"getSessionStats",incrementCompactCount:"incrementCompactCount",upsertResume:"upsertResume",getResume:"getResume",markResumeConsumed:"markResumeConsumed",deleteEvents:"deleteEvents",deleteMeta:"deleteMeta",deleteResume:"deleteResume",getOldSessions:"getOldSessions",searchEvents:"searchEvents",incrementToolCall:"incrementToolCall",getToolCallTotals:"getToolCallTotals",getToolCallByTool:"getToolCallByTool"},A=class extends T{constructor(t){super(t?.dbPath??C("session"))}stmt(t){return this.stmts.get(t)}initSchema(){try{let s=this.db.pragma("table_xinfo(session_events)").find(e=>e.name==="data_hash");s&&s.hidden!==0&&this.db.exec("DROP TABLE session_events")}catch{}this.db.exec(`
       CREATE TABLE IF NOT EXISTS session_events (
         id INTEGER PRIMARY KEY AUTOINCREMENT,
         session_id TEXT NOT NULL,
@@ -35,48 +35,67 @@ import{createRequire as b}from"node:module";import{existsSync as N,unlinkSync as
         created_at TEXT NOT NULL DEFAULT (datetime('now')),
         consumed INTEGER NOT NULL DEFAULT 0
       );
-    `);try{let t=this.db.pragma("table_xinfo(session_events)"),s=new Set(t.map(e=>e.name));s.has("project_dir")||this.db.exec("ALTER TABLE session_events ADD COLUMN project_dir TEXT NOT NULL DEFAULT ''"),s.has("attribution_source")||this.db.exec("ALTER TABLE session_events ADD COLUMN attribution_source TEXT NOT NULL DEFAULT 'unknown'"),s.has("attribution_confidence")||this.db.exec("ALTER TABLE session_events ADD COLUMN attribution_confidence REAL NOT NULL DEFAULT 0"),this.db.exec("CREATE INDEX IF NOT EXISTS idx_session_events_project ON session_events(session_id, project_dir)")}catch{}}prepareStatements(){this.stmts=new Map;let t=(s,e)=>{this.stmts.set(s,this.db.prepare(e))};t(r.insertEvent,`INSERT INTO session_events (
+
+      CREATE TABLE IF NOT EXISTS tool_calls (
+        session_id TEXT NOT NULL,
+        tool TEXT NOT NULL,
+        calls INTEGER NOT NULL DEFAULT 0,
+        bytes_returned INTEGER NOT NULL DEFAULT 0,
+        updated_at TEXT NOT NULL DEFAULT (datetime('now')),
+        PRIMARY KEY (session_id, tool)
+      );
+
+      CREATE INDEX IF NOT EXISTS idx_tool_calls_session ON tool_calls(session_id);
+    `);try{let t=this.db.pragma("table_xinfo(session_events)"),s=new Set(t.map(e=>e.name));s.has("project_dir")||this.db.exec("ALTER TABLE session_events ADD COLUMN project_dir TEXT NOT NULL DEFAULT ''"),s.has("attribution_source")||this.db.exec("ALTER TABLE session_events ADD COLUMN attribution_source TEXT NOT NULL DEFAULT 'unknown'"),s.has("attribution_confidence")||this.db.exec("ALTER TABLE session_events ADD COLUMN attribution_confidence REAL NOT NULL DEFAULT 0"),this.db.exec("CREATE INDEX IF NOT EXISTS idx_session_events_project ON session_events(session_id, project_dir)")}catch{}}prepareStatements(){this.stmts=new Map;let t=(s,e)=>{this.stmts.set(s,this.db.prepare(e))};t(n.insertEvent,`INSERT INTO session_events (
          session_id, type, category, priority, data,
          project_dir, attribution_source, attribution_confidence,
          source_hook, data_hash
        )
-       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`),t(r.getEvents,`SELECT id, session_id, type, category, priority, data,
+       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`),t(n.getEvents,`SELECT id, session_id, type, category, priority, data,
               project_dir, attribution_source, attribution_confidence,
               source_hook, created_at, data_hash
-       FROM session_events WHERE session_id = ? ORDER BY id ASC LIMIT ?`),t(r.getEventsByType,`SELECT id, session_id, type, category, priority, data,
+       FROM session_events WHERE session_id = ? ORDER BY id ASC LIMIT ?`),t(n.getEventsByType,`SELECT id, session_id, type, category, priority, data,
               project_dir, attribution_source, attribution_confidence,
               source_hook, created_at, data_hash
-       FROM session_events WHERE session_id = ? AND type = ? ORDER BY id ASC LIMIT ?`),t(r.getEventsByPriority,`SELECT id, session_id, type, category, priority, data,
+       FROM session_events WHERE session_id = ? AND type = ? ORDER BY id ASC LIMIT ?`),t(n.getEventsByPriority,`SELECT id, session_id, type, category, priority, data,
               project_dir, attribution_source, attribution_confidence,
               source_hook, created_at, data_hash
-       FROM session_events WHERE session_id = ? AND priority >= ? ORDER BY id ASC LIMIT ?`),t(r.getEventsByTypeAndPriority,`SELECT id, session_id, type, category, priority, data,
+       FROM session_events WHERE session_id = ? AND priority >= ? ORDER BY id ASC LIMIT ?`),t(n.getEventsByTypeAndPriority,`SELECT id, session_id, type, category, priority, data,
               project_dir, attribution_source, attribution_confidence,
               source_hook, created_at, data_hash
-       FROM session_events WHERE session_id = ? AND type = ? AND priority >= ? ORDER BY id ASC LIMIT ?`),t(r.getEventCount,"SELECT COUNT(*) AS cnt FROM session_events WHERE session_id = ?"),t(r.getLatestAttributedProject,`SELECT project_dir
+       FROM session_events WHERE session_id = ? AND type = ? AND priority >= ? ORDER BY id ASC LIMIT ?`),t(n.getEventCount,"SELECT COUNT(*) AS cnt FROM session_events WHERE session_id = ?"),t(n.getLatestAttributedProject,`SELECT project_dir
        FROM session_events
        WHERE session_id = ? AND project_dir != ''
        ORDER BY id DESC
-       LIMIT 1`),t(r.checkDuplicate,`SELECT 1 FROM (
+       LIMIT 1`),t(n.checkDuplicate,`SELECT 1 FROM (
          SELECT type, data_hash FROM session_events
          WHERE session_id = ? ORDER BY id DESC LIMIT ?
        ) AS recent
        WHERE recent.type = ? AND recent.data_hash = ?
-       LIMIT 1`),t(r.evictLowestPriority,`DELETE FROM session_events WHERE id = (
+       LIMIT 1`),t(n.evictLowestPriority,`DELETE FROM session_events WHERE id = (
          SELECT id FROM session_events WHERE session_id = ?
          ORDER BY priority ASC, id ASC LIMIT 1
-       )`),t(r.updateMetaLastEvent,`UPDATE session_meta
+       )`),t(n.updateMetaLastEvent,`UPDATE session_meta
        SET last_event_at = datetime('now'), event_count = event_count + 1
-       WHERE session_id = ?`),t(r.ensureSession,"INSERT OR IGNORE INTO session_meta (session_id, project_dir) VALUES (?, ?)"),t(r.getSessionStats,`SELECT session_id, project_dir, started_at, last_event_at, event_count, compact_count
-       FROM session_meta WHERE session_id = ?`),t(r.incrementCompactCount,"UPDATE session_meta SET compact_count = compact_count + 1 WHERE session_id = ?"),t(r.upsertResume,`INSERT INTO session_resume (session_id, snapshot, event_count)
+       WHERE session_id = ?`),t(n.ensureSession,"INSERT OR IGNORE INTO session_meta (session_id, project_dir) VALUES (?, ?)"),t(n.getSessionStats,`SELECT session_id, project_dir, started_at, last_event_at, event_count, compact_count
+       FROM session_meta WHERE session_id = ?`),t(n.incrementCompactCount,"UPDATE session_meta SET compact_count = compact_count + 1 WHERE session_id = ?"),t(n.upsertResume,`INSERT INTO session_resume (session_id, snapshot, event_count)
        VALUES (?, ?, ?)
        ON CONFLICT(session_id) DO UPDATE SET
          snapshot = excluded.snapshot,
          event_count = excluded.event_count,
          created_at = datetime('now'),
-         consumed = 0`),t(r.getResume,"SELECT snapshot, event_count, consumed FROM session_resume WHERE session_id = ?"),t(r.markResumeConsumed,"UPDATE session_resume SET consumed = 1 WHERE session_id = ?"),t(r.deleteEvents,"DELETE FROM session_events WHERE session_id = ?"),t(r.deleteMeta,"DELETE FROM session_meta WHERE session_id = ?"),t(r.deleteResume,"DELETE FROM session_resume WHERE session_id = ?"),t(r.searchEvents,`SELECT id, session_id, category, type, data, created_at
+         consumed = 0`),t(n.getResume,"SELECT snapshot, event_count, consumed FROM session_resume WHERE session_id = ?"),t(n.markResumeConsumed,"UPDATE session_resume SET consumed = 1 WHERE session_id = ?"),t(n.deleteEvents,"DELETE FROM session_events WHERE session_id = ?"),t(n.deleteMeta,"DELETE FROM session_meta WHERE session_id = ?"),t(n.deleteResume,"DELETE FROM session_resume WHERE session_id = ?"),t(n.searchEvents,`SELECT id, session_id, category, type, data, created_at
        FROM session_events
        WHERE project_dir = ?
          AND (data LIKE '%' || ? || '%' ESCAPE '\\' OR category LIKE '%' || ? || '%' ESCAPE '\\')
          AND (? IS NULL OR category = ?)
        ORDER BY id ASC
-       LIMIT ?`),t(r.getOldSessions,"SELECT session_id FROM session_meta WHERE started_at < datetime('now', ? || ' days')")}insertEvent(t,s,e="PostToolUse",n){let o=R("sha256").update(s.data).digest("hex").slice(0,16).toUpperCase(),a=String(n?.projectDir??s.project_dir??"").trim(),c=String(n?.source??s.attribution_source??"unknown"),g=Number(n?.confidence??s.attribution_confidence??0),S=Number.isFinite(g)?Math.max(0,Math.min(1,g)):0,v=this.db.transaction(()=>{if(this.stmt(r.checkDuplicate).get(t,F,s.type,o))return;this.stmt(r.getEventCount).get(t).cnt>=k&&this.stmt(r.evictLowestPriority).run(t),this.stmt(r.insertEvent).run(t,s.type,s.category,s.priority,s.data,a,c,S,e,o),this.stmt(r.updateMetaLastEvent).run(t)});this.withRetry(()=>v())}getEvents(t,s){let e=s?.limit??1e3,n=s?.type,o=s?.minPriority;return n&&o!==void 0?this.stmt(r.getEventsByTypeAndPriority).all(t,n,o,e):n?this.stmt(r.getEventsByType).all(t,n,e):o!==void 0?this.stmt(r.getEventsByPriority).all(t,o,e):this.stmt(r.getEvents).all(t,e)}getEventCount(t){return this.stmt(r.getEventCount).get(t).cnt}getLatestAttributedProjectDir(t){return this.stmt(r.getLatestAttributedProject).get(t)?.project_dir||null}searchEvents(t,s,e,n){try{let o=t.replace(/[%_]/g,c=>"\\"+c),a=n??null;return this.stmt(r.searchEvents).all(e,o,o,a,a,s)}catch{return[]}}ensureSession(t,s){this.stmt(r.ensureSession).run(t,s)}getSessionStats(t){return this.stmt(r.getSessionStats).get(t)??null}incrementCompactCount(t){this.stmt(r.incrementCompactCount).run(t)}upsertResume(t,s,e){this.stmt(r.upsertResume).run(t,s,e??0)}getResume(t){return this.stmt(r.getResume).get(t)??null}markResumeConsumed(t){this.stmt(r.markResumeConsumed).run(t)}deleteSession(t){this.db.transaction(()=>{this.stmt(r.deleteEvents).run(t),this.stmt(r.deleteResume).run(t),this.stmt(r.deleteMeta).run(t)})()}cleanupOldSessions(t=7){let s=`-${t}`,e=this.stmt(r.getOldSessions).all(s);for(let{session_id:n}of e)this.deleteSession(n);return e.length}};export{L as SessionDB,K as getWorktreeSuffix};
+       LIMIT ?`),t(n.getOldSessions,"SELECT session_id FROM session_meta WHERE started_at < datetime('now', ? || ' days')"),t(n.incrementToolCall,`INSERT INTO tool_calls (session_id, tool, calls, bytes_returned)
+       VALUES (?, ?, 1, ?)
+       ON CONFLICT(session_id, tool) DO UPDATE SET
+         calls = calls + 1,
+         bytes_returned = bytes_returned + excluded.bytes_returned,
+         updated_at = datetime('now')`),t(n.getToolCallTotals,`SELECT COALESCE(SUM(calls), 0) AS calls,
+              COALESCE(SUM(bytes_returned), 0) AS bytes_returned
+       FROM tool_calls WHERE session_id = ?`),t(n.getToolCallByTool,`SELECT tool, calls, bytes_returned
+       FROM tool_calls WHERE session_id = ? ORDER BY calls DESC`)}insertEvent(t,s,e="PostToolUse",r){let o=f("sha256").update(s.data).digest("hex").slice(0,16).toUpperCase(),a=String(r?.projectDir??s.project_dir??"").trim(),c=String(r?.source??s.attribution_source??"unknown"),u=Number(r?.confidence??s.attribution_confidence??0),_=Number.isFinite(u)?Math.max(0,Math.min(1,u)):0,E=this.db.transaction(()=>{if(this.stmt(n.checkDuplicate).get(t,D,s.type,o))return;this.stmt(n.getEventCount).get(t).cnt>=O&&this.stmt(n.evictLowestPriority).run(t),this.stmt(n.insertEvent).run(t,s.type,s.category,s.priority,s.data,a,c,_,e,o),this.stmt(n.updateMetaLastEvent).run(t)});this.withRetry(()=>E())}bulkInsertEvents(t,s,e="PostToolUse",r){if(!s||s.length===0)return;if(s.length===1){this.insertEvent(t,s[0],e,r?.[0]);return}let o=s.map((c,u)=>{let _=f("sha256").update(c.data).digest("hex").slice(0,16).toUpperCase(),E=r?.[u],S=String(E?.projectDir??c.project_dir??"").trim(),L=String(E?.source??c.attribution_source??"unknown"),R=Number(E?.confidence??c.attribution_confidence??0),w=Number.isFinite(R)?Math.max(0,Math.min(1,R)):0;return{event:c,dataHash:_,projectDir:S,attributionSource:L,attributionConfidence:w}}),a=this.db.transaction(()=>{let c=this.stmt(n.getEventCount).get(t).cnt;for(let u of o)this.stmt(n.checkDuplicate).get(t,D,u.event.type,u.dataHash)||(c>=O?this.stmt(n.evictLowestPriority).run(t):c++,this.stmt(n.insertEvent).run(t,u.event.type,u.event.category,u.event.priority,u.event.data,u.projectDir,u.attributionSource,u.attributionConfidence,e,u.dataHash));this.stmt(n.updateMetaLastEvent).run(t)});this.withRetry(()=>a())}getEvents(t,s){let e=s?.limit??1e3,r=s?.type,o=s?.minPriority;return r&&o!==void 0?this.stmt(n.getEventsByTypeAndPriority).all(t,r,o,e):r?this.stmt(n.getEventsByType).all(t,r,e):o!==void 0?this.stmt(n.getEventsByPriority).all(t,o,e):this.stmt(n.getEvents).all(t,e)}getEventCount(t){return this.stmt(n.getEventCount).get(t).cnt}getLatestAttributedProjectDir(t){return this.stmt(n.getLatestAttributedProject).get(t)?.project_dir||null}searchEvents(t,s,e,r){try{let o=t.replace(/[%_]/g,c=>"\\"+c),a=r??null;return this.stmt(n.searchEvents).all(e,o,o,a,a,s)}catch{return[]}}ensureSession(t,s){this.stmt(n.ensureSession).run(t,s)}getSessionStats(t){return this.stmt(n.getSessionStats).get(t)??null}incrementCompactCount(t){this.stmt(n.incrementCompactCount).run(t)}upsertResume(t,s,e){this.stmt(n.upsertResume).run(t,s,e??0)}getResume(t){return this.stmt(n.getResume).get(t)??null}markResumeConsumed(t){this.stmt(n.markResumeConsumed).run(t)}getLatestSessionId(){try{return this.db.prepare("SELECT session_id FROM session_meta ORDER BY started_at DESC LIMIT 1").get()?.session_id??null}catch{return null}}incrementToolCall(t,s,e=0){let r=Number.isFinite(e)&&e>0?Math.round(e):0;try{this.stmt(n.incrementToolCall).run(t,s,r)}catch{}}getToolCallStats(t){try{let s=this.stmt(n.getToolCallTotals).get(t),e=this.stmt(n.getToolCallByTool).all(t),r={};for(let o of e)r[o.tool]={calls:o.calls,bytesReturned:o.bytes_returned};return{totalCalls:s?.calls??0,totalBytesReturned:s?.bytes_returned??0,byTool:r}}catch{return{totalCalls:0,totalBytesReturned:0,byTool:{}}}}deleteSession(t){this.db.transaction(()=>{this.stmt(n.deleteEvents).run(t),this.stmt(n.deleteResume).run(t),this.stmt(n.deleteMeta).run(t)})()}cleanupOldSessions(t=7){let s=`-${t}`,e=this.stmt(n.getOldSessions).all(s);for(let{session_id:r}of e)this.deleteSession(r);return e.length}};export{A as SessionDB,J as _resetWorktreeSuffixCacheForTests,z as getWorktreeSuffix};

package/hooks/session-extract.bundle.mjs

@@ -1,2 +1,2 @@
-function i(t){return t==null?"":String(t)}function g(t){return t==null?"":typeof t=="string"?t:JSON.stringify(t)}function b(t){let{tool_name:e,tool_input:o,tool_response:s}=t,r=[];if(e==="Read"){let n=String(o.file_path??"");return/CLAUDE\.md$|\.claude[\\/]/i.test(n)&&(r.push({type:"rule",category:"rule",data:i(n),priority:1}),s&&s.length>0&&r.push({type:"rule_content",category:"rule",data:i(s),priority:1})),r.push({type:"file_read",category:"file",data:i(n),priority:1}),r}if(e==="Edit"){let n=String(o.file_path??"");return r.push({type:"file_edit",category:"file",data:i(n),priority:1}),r}if(e==="NotebookEdit"){let n=String(o.notebook_path??"");return r.push({type:"file_edit",category:"file",data:i(n),priority:1}),r}if(e==="Write"){let n=String(o.file_path??"");return r.push({type:"file_write",category:"file",data:i(n),priority:1}),r}if(e==="Glob"){let n=String(o.pattern??"");return r.push({type:"file_glob",category:"file",data:i(n),priority:3}),r}if(e==="Grep"){let n=String(o.pattern??""),c=String(o.path??"");return r.push({type:"file_search",category:"file",data:i(`${n} in ${c}`),priority:3}),r}return r}function f(t){if(t.tool_name!=="Bash")return[];let o=String(t.tool_input.command??"").match(/\bcd\s+("([^"]+)"|'([^']+)'|(\S+))/);if(!o)return[];let s=o[2]??o[3]??o[4]??"";return[{type:"cwd",category:"cwd",data:i(s),priority:2}]}function y(t){let{tool_name:e,tool_input:o,tool_response:s,tool_output:r}=t,n=String(s??""),c=r?.isError===!0;return!(e==="Bash"&&/exit code [1-9]|error:|Error:|FAIL|failed/i.test(n))&&!c?[]:[{type:"error_tool",category:"error",data:i(n),priority:2}]}var h=[{pattern:/\bgit\s+checkout\b/,operation:"branch"},{pattern:/\bgit\s+commit\b/,operation:"commit"},{pattern:/\bgit\s+merge\s+\S+/,operation:"merge"},{pattern:/\bgit\s+rebase\b/,operation:"rebase"},{pattern:/\bgit\s+stash\b/,operation:"stash"},{pattern:/\bgit\s+push\b/,operation:"push"},{pattern:/\bgit\s+pull\b/,operation:"pull"},{pattern:/\bgit\s+log\b/,operation:"log"},{pattern:/\bgit\s+diff\b/,operation:"diff"},{pattern:/\bgit\s+status\b/,operation:"status"},{pattern:/\bgit\s+branch\b/,operation:"branch"},{pattern:/\bgit\s+reset\b/,operation:"reset"},{pattern:/\bgit\s+add\b/,operation:"add"},{pattern:/\bgit\s+cherry-pick\b/,operation:"cherry-pick"},{pattern:/\bgit\s+tag\b/,operation:"tag"},{pattern:/\bgit\s+fetch\b/,operation:"fetch"},{pattern:/\bgit\s+clone\b/,operation:"clone"},{pattern:/\bgit\s+worktree\b/,operation:"worktree"}];function _(t){if(t.tool_name!=="Bash")return[];let e=String(t.tool_input.command??""),o=h.find(s=>s.pattern.test(e));return o?[{type:"git",category:"git",data:i(o.operation),priority:2}]:[]}function m(t){return new Set(["TodoWrite","TaskCreate","TaskUpdate"]).has(t.tool_name)?[{type:t.tool_name==="TaskUpdate"?"task_update":t.tool_name==="TaskCreate"?"task_create":"task",category:"task",data:i(JSON.stringify(t.tool_input)),priority:1}]:[]}function S(t){if(t.tool_name==="EnterPlanMode")return[{type:"plan_enter",category:"plan",data:"entered plan mode",priority:2}];if(t.tool_name==="ExitPlanMode"){let e=[],o=t.tool_input.allowedPrompts,s=Array.isArray(o)&&o.length>0?`exited plan mode (allowed: ${g(o.map(n=>typeof n=="object"&&n!==null&&"prompt"in n?String(n.prompt):String(n)).join(", "))})`:"exited plan mode";e.push({type:"plan_exit",category:"plan",data:i(s),priority:2});let r=String(t.tool_response??"").toLowerCase();return r.includes("approved")||r.includes("approve")?e.push({type:"plan_approved",category:"plan",data:"plan approved by user",priority:1}):(r.includes("rejected")||r.includes("decline")||r.includes("denied"))&&e.push({type:"plan_rejected",category:"plan",data:i(`plan rejected: ${t.tool_response??""}`),priority:2}),e}if(t.tool_name==="Write"||t.tool_name==="Edit"){let e=String(t.tool_input.file_path??"");if(/[/\\]\.claude[/\\]plans[/\\]/.test(e))return[{type:"plan_file_write",category:"plan",data:i(`plan file: ${e.split(/[/\\]/).pop()??e}`),priority:2}]}return[]}var E=[/\bsource\s+\S*activate\b/,/\bexport\s+\w+=/,/\bnvm\s+use\b/,/\bpyenv\s+(shell|local|global)\b/,/\bconda\s+activate\b/,/\brbenv\s+(shell|local|global)\b/,/\bnpm\s+install\b/,/\bnpm\s+ci\b/,/\bpip\s+install\b/,/\bbun\s+install\b/,/\byarn\s+(add|install)\b/,/\bpnpm\s+(add|install)\b/,/\bcargo\s+(install|add)\b/,/\bgo\s+(install|get)\b/,/\brustup\b/,/\basdf\b/,/\bvolta\b/,/\bdeno\s+install\b/];function k(t){if(t.tool_name!=="Bash")return[];let e=String(t.tool_input.command??"");if(!E.some(r=>r.test(e)))return[];let s=e.replace(/\bexport\s+(\w+)=\S*/g,"export $1=***");return[{type:"env",category:"env",data:i(s),priority:2}]}function v(t){if(t.tool_name!=="Skill")return[];let e=String(t.tool_input.skill??"");return[{type:"skill",category:"skill",data:i(e),priority:2}]}function x(t){if(!t.tool_response?.includes("Error")&&!t.tool_output?.isError)return[];let e=String(t.tool_response||""),o=[/not supported/i,/cannot/i,/does not support/i,/FAIL/i,/refused/i,/permission denied/i,/incompatible/i];for(let s of o){let r=e.match(s);if(r){let n=e.toLowerCase().indexOf(r[0].toLowerCase()),c=e.slice(Math.max(0,n-50),Math.min(e.length,n+200)).trim();return[{type:"constraint_discovered",category:"constraint",data:i(c),priority:2}]}}return[]}function w(t){if(t.tool_name!=="Agent")return[];let e=i(String(t.tool_input.prompt??t.tool_input.description??"")),o=t.tool_response?i(String(t.tool_response)):"",s=o.length>0;return[{type:s?"subagent_completed":"subagent_launched",category:"subagent",data:i(s?`[completed] ${e} \u2192 ${o}`:`[launched] ${e}`),priority:s?2:3}]}function R(t){let{tool_name:e,tool_input:o,tool_response:s}=t;if(!e.startsWith("mcp__"))return[];let r=e.split("__"),n=r[r.length-1]||e,c=Object.values(o).find(d=>typeof d=="string"),p=c?`: ${i(String(c))}`:"",u=s&&s.length>0?`
-response: ${i(s)}`:"";return[{type:"mcp",category:"mcp",data:i(`${n}${p}${u}`),priority:3}]}function A(t){if(t.tool_name!=="AskUserQuestion")return[];let e=t.tool_input.questions,o=Array.isArray(e)&&e.length>0?String(e[0].question??""):"",s=i(String(t.tool_response??"")),r=o?`Q: ${i(o)} \u2192 A: ${s}`:`answer: ${s}`;return[{type:"decision_question",category:"decision",data:i(r),priority:2}]}function I(t){if(t.tool_name!=="Agent")return[];if(!t.tool_response||t.tool_response.length===0)return[];let e=t.tool_response.length>500?t.tool_response.slice(0,500):t.tool_response;return[{type:"agent_finding",category:"agent-finding",data:i(e),priority:2}]}function T(t){let e=[g(t.tool_input),i(t.tool_response)].join(" ");if(e.length===0)return[];let o=new Set,s=e.match(/https?:\/\/[^\s)]+/g);if(s)for(let n of s)n=n.replace(/["'})\],;.]+$/,""),/localhost|127\.0\.0\.1/i.test(n)||o.add(n);let r=e.match(/(?<!\w)#(\d+)/g);if(r)for(let n of r)o.add(n);return o.size===0?[]:[{type:"external_ref",category:"external-ref",data:i(Array.from(o).join(", ")),priority:3}]}function $(t){if(t.tool_name!=="EnterWorktree")return[];let e=String(t.tool_input.name??"unnamed");return[{type:"worktree",category:"env",data:i(`entered worktree: ${e}`),priority:2}]}var H=[/\b(don'?t|do not|never|always|instead|rather|prefer)\b/i,/\b(use|switch to|go with|pick|choose)\s+\w+\s+(instead|over|not)\b/i,/\b(no,?\s+(use|do|try|make))\b/i,/\b(hayır|hayir|evet|böyle|boyle|degil|değil|yerine|kullan)\b/i];function P(t){return H.some(o=>o.test(t))?[{type:"decision",category:"decision",data:i(t),priority:2}]:[]}var N=[/\b(act as|you are|behave like|pretend|role of|persona)\b/i,/\b(senior|staff|principal|lead)\s+(engineer|developer|architect)\b/i,/\b(gibi davran|rolünde|olarak çalış)\b/i];function C(t){return N.some(o=>o.test(t))?[{type:"role",category:"role",data:i(t),priority:3}]:[]}var L=[{mode:"investigate",pattern:/\b(why|how does|explain|understand|what is|analyze|debug|look into)\b/i},{mode:"implement",pattern:/\b(create|add|build|implement|write|make|develop|fix)\b/i},{mode:"discuss",pattern:/\b(think about|consider|should we|what if|pros and cons|opinion)\b/i},{mode:"review",pattern:/\b(review|check|audit|verify|test|validate)\b/i}];function B(t){let e=L.find(({pattern:o})=>o.test(t));return e?[{type:"intent",category:"intent",data:i(e.mode),priority:4}]:[]}var O=[/\bblocked on\b/i,/\bwaiting for\b/i,/\bneed\s+\S+\s+before\b/i,/\bcan'?t proceed until\b/i,/\bdepends on\b/i,/\bblocked\b/i,/\bbekliyor\b/i,/\bbekliyorum\b/i],F=[/\bunblocked\b/i,/\bresolved\b/i,/\bgot the\s+\S+/i,/\bis ready now\b/i,/\bcan proceed\b/i];function j(t){let e=[];return F.some(r=>r.test(t))?(e.push({type:"blocker_resolved",category:"blocked-on",data:i(t),priority:2}),e):(O.some(r=>r.test(t))&&e.push({type:"blocker",category:"blocked-on",data:i(t),priority:2}),e)}function D(t){return t.length<=1024?[]:[{type:"data",category:"data",data:i(t),priority:4}]}var a=null;function M(t){let{tool_name:e,tool_response:o,tool_output:s}=t,r=String(o??""),n=s?.isError===!0;if(e==="Bash"&&/exit code [1-9]|error:|Error:|FAIL|failed/i.test(r)||n)return a={tool:e,error:r.slice(0,200),callsSince:0},[];if(!a)return[];if(a.callsSince++,a.callsSince>10)return a=null,[];let p=e===a.tool,u=a.tool==="Read"&&(e==="Edit"||e==="Write");if(p||u){let d={type:"error_resolved",category:"error-resolution",data:i(`Error in ${a.tool}: ${a.error} \u2192 Fixed`),priority:2};return a=null,[d]}return[]}function q(){a=null}var l=[];function W(t){return`${t.length}:${t.slice(0,20)}`}function U(t){let{tool_name:e,tool_input:o}=t,s=W(JSON.stringify(o).slice(0,200));if(l.push({tool:e,inputHash:s}),l.length>50&&l.splice(0,l.length-50),l.length<3)return[];let r=0;for(let n=l.length-1;n>=0&&(l[n].tool===e&&l[n].inputHash===s);n--)r++;return r>=3?(l.splice(l.length-r),[{type:"retry_detected",category:"iteration-loop",data:i(`${e} called ${r} times with similar input`),priority:2}]):[]}function G(){l.length=0}function K(t){try{let e=[];return e.push(...b(t)),e.push(...f(t)),e.push(...y(t)),e.push(..._(t)),e.push(...k(t)),e.push(...m(t)),e.push(...S(t)),e.push(...v(t)),e.push(...w(t)),e.push(...R(t)),e.push(...A(t)),e.push(...x(t)),e.push(...$(t)),e.push(...I(t)),e.push(...T(t)),e.push(...M(t)),e.push(...U(t)),e}catch{return[]}}function z(t){try{let e=[];return e.push(...P(t)),e.push(...C(t)),e.push(...B(t)),e.push(...j(t)),e.push(...D(t)),e}catch{return[]}}export{K as extractEvents,z as extractUserEvents,q as resetErrorResolutionState,G as resetIterationLoopState};
+function s(t){return t==null?"":String(t)}function f(t){return t==null?"":typeof t=="string"?t:JSON.stringify(t)}function b(t){let{tool_name:e,tool_input:o,tool_response:i}=t,r=[];if(e==="Read"){let n=String(o.file_path??"");return(/(?:CLAUDE|AGENTS(?:\.override)?|GEMINI|QWEN|KIRO)\.md$/i.test(n)||/\/copilot-instructions\.md$/i.test(n)||/\/context-mode\.mdc$/i.test(n)||/\.claude[\\/]/i.test(n)||/[\\/]memor(?:y|ies)[\\/][^\\/]+\.md$/i.test(n))&&(r.push({type:"rule",category:"rule",data:s(n),priority:1}),i&&i.length>0&&r.push({type:"rule_content",category:"rule",data:s(i),priority:1})),r.push({type:"file_read",category:"file",data:s(n),priority:1}),r}if(e==="Edit"){let n=String(o.file_path??"");return r.push({type:"file_edit",category:"file",data:s(n),priority:1}),r}if(e==="NotebookEdit"){let n=String(o.notebook_path??"");return r.push({type:"file_edit",category:"file",data:s(n),priority:1}),r}if(e==="Write"){let n=String(o.file_path??"");return r.push({type:"file_write",category:"file",data:s(n),priority:1}),r}if(e==="Glob"){let n=String(o.pattern??"");return r.push({type:"file_glob",category:"file",data:s(n),priority:3}),r}if(e==="Grep"){let n=String(o.pattern??""),a=String(o.path??"");return r.push({type:"file_search",category:"file",data:s(`${n} in ${a}`),priority:3}),r}return r}function y(t){if(t.tool_name!=="Bash")return[];let o=String(t.tool_input.command??"").match(/\bcd\s+("([^"]+)"|'([^']+)'|(\S+))/);if(!o)return[];let i=o[2]??o[3]??o[4]??"";return[{type:"cwd",category:"cwd",data:s(i),priority:2}]}function h(t){let{tool_name:e,tool_input:o,tool_response:i,tool_output:r}=t,n=String(i??""),a=r?.isError===!0;return!(e==="Bash"&&/exit code [1-9]|error:|Error:|FAIL|failed/i.test(n))&&!a?[]:[{type:"error_tool",category:"error",data:s(n),priority:2}]}var _=[{pattern:/\bgit\s+checkout\b/,operation:"branch"},{pattern:/\bgit\s+commit\b/,operation:"commit"},{pattern:/\bgit\s+merge\s+\S+/,operation:"merge"},{pattern:/\bgit\s+rebase\b/,operation:"rebase"},{pattern:/\bgit\s+stash\b/,operation:"stash"},{pattern:/\bgit\s+push\b/,operation:"push"},{pattern:/\bgit\s+pull\b/,operation:"pull"},{pattern:/\bgit\s+log\b/,operation:"log"},{pattern:/\bgit\s+diff\b/,operation:"diff"},{pattern:/\bgit\s+status\b/,operation:"status"},{pattern:/\bgit\s+branch\b/,operation:"branch"},{pattern:/\bgit\s+reset\b/,operation:"reset"},{pattern:/\bgit\s+add\b/,operation:"add"},{pattern:/\bgit\s+cherry-pick\b/,operation:"cherry-pick"},{pattern:/\bgit\s+tag\b/,operation:"tag"},{pattern:/\bgit\s+fetch\b/,operation:"fetch"},{pattern:/\bgit\s+clone\b/,operation:"clone"},{pattern:/\bgit\s+worktree\b/,operation:"worktree"}];function m(t){if(t.tool_name!=="Bash")return[];let e=String(t.tool_input.command??""),o=_.find(i=>i.pattern.test(e));return o?[{type:"git",category:"git",data:s(o.operation),priority:2}]:[]}function S(t){return new Set(["TodoWrite","TaskCreate","TaskUpdate"]).has(t.tool_name)?[{type:t.tool_name==="TaskUpdate"?"task_update":t.tool_name==="TaskCreate"?"task_create":"task",category:"task",data:s(JSON.stringify(t.tool_input)),priority:1}]:[]}function E(t){if(t.tool_name==="EnterPlanMode")return[{type:"plan_enter",category:"plan",data:"entered plan mode",priority:2}];if(t.tool_name==="ExitPlanMode"){let e=[],o=t.tool_input.allowedPrompts,i=Array.isArray(o)&&o.length>0?`exited plan mode (allowed: ${f(o.map(n=>typeof n=="object"&&n!==null&&"prompt"in n?String(n.prompt):String(n)).join(", "))})`:"exited plan mode";e.push({type:"plan_exit",category:"plan",data:s(i),priority:2});let r=String(t.tool_response??"").toLowerCase();return r.includes("approved")||r.includes("approve")?e.push({type:"plan_approved",category:"plan",data:"plan approved by user",priority:1}):(r.includes("rejected")||r.includes("decline")||r.includes("denied"))&&e.push({type:"plan_rejected",category:"plan",data:s(`plan rejected: ${t.tool_response??""}`),priority:2}),e}if(t.tool_name==="Write"||t.tool_name==="Edit"){let e=String(t.tool_input.file_path??"");if(/[/\\]\.claude[/\\]plans[/\\]/.test(e))return[{type:"plan_file_write",category:"plan",data:s(`plan file: ${e.split(/[/\\]/).pop()??e}`),priority:2}]}return[]}var k=[/\bsource\s+\S*activate\b/,/\bexport\s+\w+=/,/\bnvm\s+use\b/,/\bpyenv\s+(shell|local|global)\b/,/\bconda\s+activate\b/,/\brbenv\s+(shell|local|global)\b/,/\bnpm\s+install\b/,/\bnpm\s+ci\b/,/\bpip\s+install\b/,/\bbun\s+install\b/,/\byarn\s+(add|install)\b/,/\bpnpm\s+(add|install)\b/,/\bcargo\s+(install|add)\b/,/\bgo\s+(install|get)\b/,/\brustup\b/,/\basdf\b/,/\bvolta\b/,/\bdeno\s+install\b/];function v(t){if(t.tool_name!=="Bash")return[];let e=String(t.tool_input.command??"");if(!k.some(r=>r.test(e)))return[];let i=e.replace(/\bexport\s+(\w+)=\S*/g,"export $1=***");return[{type:"env",category:"env",data:s(i),priority:2}]}function x(t){if(t.tool_name!=="Skill")return[];let e=String(t.tool_input.skill??"");return[{type:"skill",category:"skill",data:s(e),priority:2}]}function w(t){if(!t.tool_response?.includes("Error")&&!t.tool_output?.isError)return[];let e=String(t.tool_response||""),o=[/not supported/i,/cannot/i,/does not support/i,/FAIL/i,/refused/i,/permission denied/i,/incompatible/i];for(let i of o){let r=e.match(i);if(r){let n=e.toLowerCase().indexOf(r[0].toLowerCase()),a=e.slice(Math.max(0,n-50),Math.min(e.length,n+200)).trim();return[{type:"constraint_discovered",category:"constraint",data:s(a),priority:2}]}}return[]}function R(t){if(t.tool_name!=="Agent")return[];let e=s(String(t.tool_input.prompt??t.tool_input.description??"")),o=t.tool_response?s(String(t.tool_response)):"",i=o.length>0;return[{type:i?"subagent_completed":"subagent_launched",category:"subagent",data:s(i?`[completed] ${e} \u2192 ${o}`:`[launched] ${e}`),priority:i?2:3}]}function T(t){let{tool_name:e,tool_input:o,tool_response:i}=t;if(!e.startsWith("mcp__"))return[];let r=e.split("__"),n=r[r.length-1]||e,a=Object.values(o).find(d=>typeof d=="string"),p=a?`: ${s(String(a))}`:"",u=i&&i.length>0?`
+response: ${s(i)}`:"";return[{type:"mcp",category:"mcp",data:s(`${n}${p}${u}`),priority:3}]}var A=2048;function I(t,e){if(Buffer.byteLength(t,"utf8")<=e)return{value:t,truncated:!1};let o=Buffer.from(t,"utf8"),i=e;for(;i>0&&(o[i]&192)===128;)i--;return{value:o.subarray(0,i).toString("utf8"),truncated:!0}}var $=/(authorization|auth_token|access_token|refresh_token|bearer|token|secret|password|passwd|pwd|api[-_]?key|apikey|cookie|set-cookie|signature|private[-_]?key|client[-_]?secret|x[-_]?api[-_]?key)/i,H="[REDACTED]";function g(t,e=new WeakSet){if(t==null||typeof t!="object")return t;if(e.has(t))return"[CIRCULAR]";e.add(t);let o;if(Array.isArray(t))o=t.map(i=>g(i,e));else{let i={};for(let[r,n]of Object.entries(t))$.test(r)?i[r]=H:i[r]=g(n,e);o=i}return e.delete(t),o}function N(t){let{tool_name:e,tool_input:o}=t;if(!e.startsWith("mcp__"))return[];let i=g(o??{}),r;try{r=JSON.stringify(i)}catch{r="{}"}let{value:n,truncated:a}=I(r,A),p=a?`{"tool_name":${JSON.stringify(e)},"params_raw":${JSON.stringify(n)},"truncated":true}`:`{"tool_name":${JSON.stringify(e)},"params":${n}}`;return[{type:"mcp_tool_call",category:"mcp_tool_call",data:s(p),priority:4}]}function C(t){if(t.tool_name!=="AskUserQuestion")return[];let e=t.tool_input.questions,o=Array.isArray(e)&&e.length>0?String(e[0].question??""):"",i=s(String(t.tool_response??"")),r=o?`Q: ${s(o)} \u2192 A: ${i}`:`answer: ${i}`;return[{type:"decision_question",category:"decision",data:s(r),priority:2}]}function P(t){if(t.tool_name!=="Agent")return[];if(!t.tool_response||t.tool_response.length===0)return[];let e=t.tool_response.length>500?t.tool_response.slice(0,500):t.tool_response;return[{type:"agent_finding",category:"agent-finding",data:s(e),priority:2}]}function O(t){let e=[f(t.tool_input),s(t.tool_response)].join(" ");if(e.length===0)return[];let o=new Set,i=e.match(/https?:\/\/[^\s)]+/g);if(i)for(let n of i)n=n.replace(/["'})\],;.]+$/,""),/localhost|127\.0\.0\.1/i.test(n)||o.add(n);let r=e.match(/(?<!\w)#(\d+)/g);if(r)for(let n of r)o.add(n);return o.size===0?[]:[{type:"external_ref",category:"external-ref",data:s(Array.from(o).join(", ")),priority:3}]}function B(t){if(t.tool_name!=="EnterWorktree")return[];let e=String(t.tool_input.name??"unnamed");return[{type:"worktree",category:"env",data:s(`entered worktree: ${e}`),priority:2}]}var L=[/\b(don'?t|do not|never|always|instead|rather|prefer)\b/i,/\b(use|switch to|go with|pick|choose)\s+\w+\s+(instead|over|not)\b/i,/\b(no,?\s+(use|do|try|make))\b/i,/\b(hayır|hayir|evet|böyle|boyle|degil|değil|yerine|kullan)\b/i];function j(t){return L.some(o=>o.test(t))?[{type:"decision",category:"decision",data:s(t),priority:2}]:[]}var D=[/\b(act as|you are|behave like|pretend|role of|persona)\b/i,/\b(senior|staff|principal|lead)\s+(engineer|developer|architect)\b/i,/\b(gibi davran|rolünde|olarak çalış)\b/i];function M(t){return D.some(o=>o.test(t))?[{type:"role",category:"role",data:s(t),priority:3}]:[]}var W=[{mode:"investigate",pattern:/\b(why|how does|explain|understand|what is|analyze|debug|look into)\b/i},{mode:"implement",pattern:/\b(create|add|build|implement|write|make|develop|fix)\b/i},{mode:"discuss",pattern:/\b(think about|consider|should we|what if|pros and cons|opinion)\b/i},{mode:"review",pattern:/\b(review|check|audit|verify|test|validate)\b/i}];function F(t){let e=W.find(({pattern:o})=>o.test(t));return e?[{type:"intent",category:"intent",data:s(e.mode),priority:4}]:[]}var U=[/\bblocked on\b/i,/\bwaiting for\b/i,/\bneed\s+\S+\s+before\b/i,/\bcan'?t proceed until\b/i,/\bdepends on\b/i,/\bblocked\b/i,/\bbekliyor\b/i,/\bbekliyorum\b/i],G=[/\bunblocked\b/i,/\bresolved\b/i,/\bgot the\s+\S+/i,/\bis ready now\b/i,/\bcan proceed\b/i];function J(t){let e=[];return G.some(r=>r.test(t))?(e.push({type:"blocker_resolved",category:"blocked-on",data:s(t),priority:2}),e):(U.some(r=>r.test(t))&&e.push({type:"blocker",category:"blocked-on",data:s(t),priority:2}),e)}function K(t){return t.length<=1024?[]:[{type:"data",category:"data",data:s(t),priority:4}]}var c=null;function q(t){let{tool_name:e,tool_response:o,tool_output:i}=t,r=String(o??""),n=i?.isError===!0;if(e==="Bash"&&/exit code [1-9]|error:|Error:|FAIL|failed/i.test(r)||n)return c={tool:e,error:r.slice(0,200),callsSince:0},[];if(!c)return[];if(c.callsSince++,c.callsSince>10)return c=null,[];let p=e===c.tool,u=c.tool==="Read"&&(e==="Edit"||e==="Write");if(p||u){let d={type:"error_resolved",category:"error-resolution",data:s(`Error in ${c.tool}: ${c.error} \u2192 Fixed`),priority:2};return c=null,[d]}return[]}function V(){c=null}var l=[];function z(t){return`${t.length}:${t.slice(0,20)}`}function Q(t){let{tool_name:e,tool_input:o}=t,i=z(JSON.stringify(o).slice(0,200));if(l.push({tool:e,inputHash:i}),l.length>50&&l.splice(0,l.length-50),l.length<3)return[];let r=0;for(let n=l.length-1;n>=0&&(l[n].tool===e&&l[n].inputHash===i);n--)r++;return r>=3?(l.splice(l.length-r),[{type:"retry_detected",category:"iteration-loop",data:s(`${e} called ${r} times with similar input`),priority:2}]):[]}function Y(){l.length=0}function X(t){try{let e=[];return e.push(...b(t)),e.push(...y(t)),e.push(...h(t)),e.push(...m(t)),e.push(...v(t)),e.push(...S(t)),e.push(...E(t)),e.push(...x(t)),e.push(...R(t)),e.push(...T(t)),e.push(...N(t)),e.push(...C(t)),e.push(...w(t)),e.push(...B(t)),e.push(...P(t)),e.push(...O(t)),e.push(...q(t)),e.push(...Q(t)),e}catch{return[]}}function Z(t){try{let e=[];return e.push(...j(t)),e.push(...M(t)),e.push(...F(t)),e.push(...J(t)),e.push(...K(t)),e}catch{return[]}}export{X as extractEvents,Z as extractUserEvents,V as resetErrorResolutionState,Y as resetIterationLoopState};

package/hooks/session-helpers.mjs

@@ -10,37 +10,85 @@
 import { execFileSync } from "node:child_process";
 import { createHash } from "node:crypto";
 import { join } from "node:path";
-import { mkdirSync } from "node:fs";
-import { homedir } from "node:os";
+import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { homedir, tmpdir } from "node:os";
 
 /**
  * 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 getWorktreeSuffix() {
   const envSuffix = process.env.CONTEXT_MODE_SESSION_SUFFIX;
-  if (envSuffix !== undefined) {
-    return envSuffix ? `__${envSuffix}` : "";
+  const cwd = process.cwd();
+
+  if (
+    _wtCacheInProcess &&
+    _wtCacheInProcess.cwd === cwd &&
+    _wtCacheInProcess.envSuffix === envSuffix
+  ) {
+    return _wtCacheInProcess.suffix;
   }
-  try {
-    const cwd = process.cwd();
-    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) {
-      return `__${createHash("sha256").update(cwd).digest("hex").slice(0, 8)}`;
+
+  let suffix;
+  if (envSuffix !== undefined) {
+    suffix = envSuffix ? `__${envSuffix}` : "";
+  } else {
+    // Try cross-process marker first.
+    const markerPath = workTreeMarkerPath(cwd);
+    try {
+      suffix = readFileSync(markerPath, "utf-8");
+      _wtCacheInProcess = { cwd, envSuffix, suffix };
+      return suffix;
+    } catch {
+      // marker missing → compute below
+    }
+
+    suffix = "";
+    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)}`;
+      }
+    } catch {
+      // git not available or not a git repo — no suffix
+    }
+
+    // Best-effort write so subsequent hook forks short-circuit.
+    try {
+      writeFileSync(markerPath, suffix, "utf-8");
+    } catch {
+      // tmpdir not writable — degrade gracefully
     }
-  } catch {
-    // git not available or not a git repo — no suffix
   }
-  return "";
+
+  _wtCacheInProcess = { cwd, envSuffix, suffix };
+  return suffix;
 }
 
 /** Claude Code platform options (default). */

package/hooks/session-loaders.mjs

@@ -74,8 +74,14 @@ export function attributeAndInsertEvents(db, sessionId, events, input, projectDi
     workspaceRoots: Array.isArray(input.workspace_roots) ? input.workspace_roots : [],
     lastKnownProjectDir,
   });
-  for (let i = 0; i < events.length; i++) {
-    db.insertEvent(sessionId, events[i], hookName, attributions[i]);
+  // Prefer bulk path (single transaction = single WAL commit). Falls back
+  // to per-event insert for older SessionDB instances that lack bulkInsertEvents.
+  if (typeof db.bulkInsertEvents === "function") {
+    db.bulkInsertEvents(sessionId, events, hookName, attributions);
+  } else {
+    for (let i = 0; i < events.length; i++) {
+      db.insertEvent(sessionId, events[i], hookName, attributions[i]);
+    }
   }
   return attributions;
 }

package/hooks/sessionstart.mjs

@@ -22,7 +22,7 @@ import { buildAutoInjection } from "./auto-injection.mjs";
 const toolNamer = createToolNamer("claude-code");
 const ROUTING_BLOCK = createRoutingBlock(toolNamer);
 import { readStdin, parseStdin, getSessionId, getSessionDBPath, getSessionEventsPath, getCleanupFlagPath, resolveConfigDir } from "./session-helpers.mjs";
-import { writeSessionEventsFile, buildSessionDirective, getSessionEvents, getLatestSessionEvents } from "./session-directive.mjs";
+import { writeSessionEventsFile, buildSessionDirective, getSessionEvents } from "./session-directive.mjs";
 import { createSessionLoaders } from "./session-loaders.mjs";
 import { join, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -82,7 +82,13 @@ try {
     const dbPath = getSessionDBPath();
     const db = new SessionDB({ dbPath });
 
-    const events = getLatestSessionEvents(db);
+    // Filter events to the session being resumed. Falling back to
+    // getLatestSessionEvents(db) leaks events from any other session whose
+    // session_meta.started_at is more recent — observed cross-session bleed
+    // when a different worktree session started after this one and before
+    // the resume.
+    const sessionId = getSessionId(input);
+    const events = sessionId ? getSessionEvents(db, sessionId) : [];
     if (events.length > 0) {
       const eventMeta = writeSessionEventsFile(events, getSessionEventsPath());
       additionalContext += buildSessionDirective("resume", eventMeta, toolNamer);

package/hooks/vscode-copilot/sessionstart.mjs

@@ -17,7 +17,7 @@ import { createToolNamer } from "../core/tool-naming.mjs";
 
 const toolNamer = createToolNamer("vscode-copilot");
 const ROUTING_BLOCK = createRoutingBlock(toolNamer);
-import { writeSessionEventsFile, buildSessionDirective, getSessionEvents, getLatestSessionEvents } from "../session-directive.mjs";
+import { writeSessionEventsFile, buildSessionDirective, getSessionEvents } from "../session-directive.mjs";
 import {
   readStdin, parseStdin, getSessionId, getSessionDBPath, getSessionEventsPath, getCleanupFlagPath,
   getProjectDir, VSCODE_OPTS,
@@ -63,7 +63,12 @@ try {
     const dbPath = getSessionDBPath(OPTS);
     const db = new SessionDB({ dbPath });
 
-    const events = getLatestSessionEvents(db);
+    // Filter events to the session being resumed. Falling back to
+    // getLatestSessionEvents(db) leaks events from any other session whose
+    // session_meta.started_at is more recent — observed cross-session bleed
+    // when a different session started after this one and before the resume.
+    const sessionId = getSessionId(input, OPTS);
+    const events = sessionId ? getSessionEvents(db, sessionId) : [];
     if (events.length > 0) {
       const eventMeta = writeSessionEventsFile(events, getSessionEventsPath(OPTS));
       additionalContext += buildSessionDirective("resume", eventMeta, toolNamer);

package/insight/src/routes/index.tsx

@@ -568,6 +568,7 @@ function generateCategoryInsights(c: CategoryAnalyticsData): Insight[] {
 function Dashboard() {
   const [data, setData] = useState<AnalyticsData | null>(null);
   const [catData, setCatData] = useState<CategoryAnalyticsData | null>(null);
+  const [showAllInsights, setShowAllInsights] = useState(false);
   useEffect(() => {
     api.analytics().then(setData);
     api.categoryAnalytics().then(setCatData).catch(() => {}); // graceful — catData stays null, sections hidden
@@ -580,7 +581,6 @@ function Dashboard() {
   // Sort: critical first, then warning, positive, neutral
   const SEV_ORDER = { critical: 0, warning: 1, positive: 2, neutral: 3 };
   allInsights.sort((a, b) => (SEV_ORDER[a.severity] ?? 4) - (SEV_ORDER[b.severity] ?? 4));
-  const [showAllInsights, setShowAllInsights] = useState(false);
   const insights = showAllInsights ? allInsights : allInsights.slice(0, 8);
 
   // Compute derived values