context-mode 1.0.107 → 1.0.108

package/hooks/ensure-deps.mjs

@@ -22,11 +22,28 @@
 import { existsSync, copyFileSync } from "node:fs";
 import { execSync } from "node:child_process";
 import { resolve, dirname } from "node:path";
-import { fileURLToPath } from "node:url";
+import { fileURLToPath, pathToFileURL } from "node:url";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const root = resolve(__dirname, "..");
 
+// Shared 3-layer heal helper (also used by scripts/postinstall.mjs).
+// Lazy-loaded via dynamic import so older installs and synthetic test
+// harnesses (e.g. tests/session-hooks-smoke) — which don't ship
+// `scripts/heal-better-sqlite3.mjs` — degrade to a no-op instead of
+// crashing the hook with ERR_MODULE_NOT_FOUND. Best-effort posture
+// matches the rest of this module.
+async function healBetterSqlite3Binding(pkgRoot) {
+  try {
+    const helperPath = resolve(__dirname, "..", "scripts", "heal-better-sqlite3.mjs");
+    if (!existsSync(helperPath)) return { healed: false, reason: "helper-missing" };
+    const mod = await import(pathToFileURL(helperPath).href);
+    return mod.healBetterSqlite3Binding(pkgRoot);
+  } catch {
+    return { healed: false, reason: "helper-error" };
+  }
+}
+
 const NATIVE_DEPS = ["better-sqlite3"];
 const NATIVE_BINARIES = {
   "better-sqlite3": ["build", "Release", "better_sqlite3.node"],
@@ -46,7 +63,7 @@ function hasModernSqlite() {
   return major > 22 || (major === 22 && minor >= 5);
 }
 
-export function ensureDeps() {
+export async function ensureDeps() {
   // Bun ships bun:sqlite and never needs better-sqlite3
   if (typeof globalThis.Bun !== "undefined") return;
   for (const pkg of NATIVE_DEPS) {
@@ -62,14 +79,11 @@ export function ensureDeps() {
         });
       } catch { /* best effort — hook degrades gracefully without DB */ }
     } else if (!existsSync(resolve(pkgDir, ...NATIVE_BINARIES[pkg]))) {
-      // Package installed but native binary missing (e.g., npm ignore-scripts=true)
-      try {
-        execSync(`${process.platform === "win32" ? "npm.cmd" : "npm"} rebuild ${pkg} --ignore-scripts=false`, {
-          cwd: root,
-          stdio: "pipe",
-          timeout: 120000,
-        });
-      } catch { /* best effort — hook degrades gracefully without DB */ }
+      // Package installed but native binary missing (e.g., npm ignore-scripts=true,
+      // or Windows where `npm rebuild` falls through to node-gyp without MSVC — #408).
+      // Delegate to the shared 3-layer heal (single source of truth, also used by
+      // scripts/postinstall.mjs).
+      try { await healBetterSqlite3Binding(root); } catch { /* helper already best-effort */ }
     }
   }
 }
@@ -188,6 +202,8 @@ export function codesignBinary(binaryPath) {
   }
 }
 
-// Auto-run on import (like suppress-stderr.mjs)
-ensureDeps();
+// Auto-run on import (like suppress-stderr.mjs).
+// Top-level await ensures the heal completes before the importer's next
+// statement runs (which is typically `new Database(...)`).
+await ensureDeps();
 ensureNativeCompat(root);

package/hooks/posttooluse.mjs

@@ -1,6 +1,4 @@
 #!/usr/bin/env node
-import "./suppress-stderr.mjs";
-import "./ensure-deps.mjs";
 /**
  * PostToolUse hook for context-mode session continuity.
  *
@@ -8,98 +6,110 @@ import "./ensure-deps.mjs";
  * them in the per-project SessionDB for later resume snapshot building.
  *
  * Must be fast (<20ms). No network, no LLM, just SQLite writes.
+ *
+ * Crash-resilience: wrapped via runHook (#414).
  */
 
-import { readStdin, parseStdin, getSessionId, getSessionDBPath, getInputProjectDir } from "./session-helpers.mjs";
-import { createSessionLoaders, attributeAndInsertEvents } from "./session-loaders.mjs";
-import { dirname, resolve } from "node:path";
-import { fileURLToPath } from "node:url";
-import { readFileSync, unlinkSync } from "node:fs";
-import { tmpdir } from "node:os";
+import { runHook } from "./run-hook.mjs";
 
-// Resolve absolute path for imports — relative dynamic imports can fail
-// when Claude Code invokes hooks from a different working directory.
-const HOOK_DIR = dirname(fileURLToPath(import.meta.url));
-const { loadSessionDB, loadExtract, loadProjectAttribution } = createSessionLoaders(HOOK_DIR);
+await runHook(async () => {
+  const {
+    readStdin,
+    parseStdin,
+    getSessionId,
+    getSessionDBPath,
+    getInputProjectDir,
+  } = await import("./session-helpers.mjs");
+  const { createSessionLoaders, attributeAndInsertEvents } = await import("./session-loaders.mjs");
+  const { dirname, resolve } = await import("node:path");
+  const { fileURLToPath } = await import("node:url");
+  const { readFileSync, unlinkSync } = await import("node:fs");
+  const { tmpdir } = await import("node:os");
 
-try {
-  const raw = await readStdin();
-  const input = parseStdin(raw);
-  const projectDir = getInputProjectDir(input);
+  // Resolve absolute path for imports — relative dynamic imports can fail
+  // when Claude Code invokes hooks from a different working directory.
+  const HOOK_DIR = dirname(fileURLToPath(import.meta.url));
+  const { loadSessionDB, loadExtract, loadProjectAttribution } = createSessionLoaders(HOOK_DIR);
 
-  const { extractEvents } = await loadExtract();
-  const { resolveProjectAttributions } = await loadProjectAttribution();
-  const { SessionDB } = await loadSessionDB();
+  try {
+    const raw = await readStdin();
+    const input = parseStdin(raw);
+    const projectDir = getInputProjectDir(input);
 
-  const dbPath = getSessionDBPath();
-  const db = new SessionDB({ dbPath });
-  const sessionId = getSessionId(input);
+    const { extractEvents } = await loadExtract();
+    const { resolveProjectAttributions } = await loadProjectAttribution();
+    const { SessionDB } = await loadSessionDB();
 
-  // Ensure session meta exists
-  db.ensureSession(sessionId, projectDir);
+    const dbPath = getSessionDBPath();
+    const db = new SessionDB({ dbPath });
+    const sessionId = getSessionId(input);
 
-  // Extract and store events
-  const events = extractEvents({
-    tool_name: input.tool_name,
-    tool_input: input.tool_input ?? {},
-    tool_response: typeof input.tool_response === "string"
-      ? input.tool_response
-      : JSON.stringify(input.tool_response ?? ""),
-    tool_output: input.tool_output,
-  });
+    // Ensure session meta exists
+    db.ensureSession(sessionId, projectDir);
 
-  attributeAndInsertEvents(db, sessionId, events, input, projectDir, "PostToolUse", resolveProjectAttributions);
+    // Extract and store events
+    const events = extractEvents({
+      tool_name: input.tool_name,
+      tool_input: input.tool_input ?? {},
+      tool_response: typeof input.tool_response === "string"
+        ? input.tool_response
+        : JSON.stringify(input.tool_response ?? ""),
+      tool_output: input.tool_output,
+    });
 
-  // ─── Category 18: Rejected-approach — read PreToolUse marker ───
-  try {
-    const rejectedPath = resolve(tmpdir(), `context-mode-rejected-${sessionId}.txt`);
-    let rejectedData;
-    try {
-      rejectedData = readFileSync(rejectedPath, "utf-8").trim();
-      unlinkSync(rejectedPath);
-    } catch { /* no marker */ }
-    if (rejectedData) {
-      const colonIdx = rejectedData.indexOf(":");
-      const rejTool = colonIdx > 0 ? rejectedData.slice(0, colonIdx) : rejectedData;
-      const rejReason = colonIdx > 0 ? rejectedData.slice(colonIdx + 1) : "denied";
-      db.insertEvent(sessionId, {
-        type: "rejected",
-        category: "rejected-approach",
-        data: `${rejTool}: ${rejReason}`,
-        priority: 2,
-      }, "PreToolUse");
-    }
-  } catch { /* best-effort */ }
+    attributeAndInsertEvents(db, sessionId, events, input, projectDir, "PostToolUse", resolveProjectAttributions);
 
-  // ─── Category 27: Latency — read cross-hook marker and emit event if slow ───
-  try {
-    const toolName = input.tool_name ?? "";
-    if (toolName) {
-      const markerPath = resolve(tmpdir(), `context-mode-latency-${sessionId}-${toolName}.txt`);
-      let startTime;
+    // ─── Category 18: Rejected-approach — read PreToolUse marker ───
+    try {
+      const rejectedPath = resolve(tmpdir(), `context-mode-rejected-${sessionId}.txt`);
+      let rejectedData;
       try {
-        startTime = parseInt(readFileSync(markerPath, "utf-8").trim(), 10);
-        unlinkSync(markerPath);
-      } catch {
-        // No marker — pretooluse didn't write one or already consumed
+        rejectedData = readFileSync(rejectedPath, "utf-8").trim();
+        unlinkSync(rejectedPath);
+      } catch { /* no marker */ }
+      if (rejectedData) {
+        const colonIdx = rejectedData.indexOf(":");
+        const rejTool = colonIdx > 0 ? rejectedData.slice(0, colonIdx) : rejectedData;
+        const rejReason = colonIdx > 0 ? rejectedData.slice(colonIdx + 1) : "denied";
+        db.insertEvent(sessionId, {
+          type: "rejected",
+          category: "rejected-approach",
+          data: `${rejTool}: ${rejReason}`,
+          priority: 2,
+        }, "PreToolUse");
       }
-      if (startTime && !isNaN(startTime)) {
-        const duration = Date.now() - startTime;
-        if (duration > 5000) {
-          db.insertEvent(sessionId, {
-            type: "tool_latency",
-            category: "latency",
-            data: `${toolName}: ${duration}ms`,
-            priority: 3,
-          }, "PostToolUse");
+    } catch { /* best-effort */ }
+
+    // ─── Category 27: Latency — read cross-hook marker and emit event if slow ───
+    try {
+      const toolName = input.tool_name ?? "";
+      if (toolName) {
+        const markerPath = resolve(tmpdir(), `context-mode-latency-${sessionId}-${toolName}.txt`);
+        let startTime;
+        try {
+          startTime = parseInt(readFileSync(markerPath, "utf-8").trim(), 10);
+          unlinkSync(markerPath);
+        } catch {
+          // No marker — pretooluse didn't write one or already consumed
+        }
+        if (startTime && !isNaN(startTime)) {
+          const duration = Date.now() - startTime;
+          if (duration > 5000) {
+            db.insertEvent(sessionId, {
+              type: "tool_latency",
+              category: "latency",
+              data: `${toolName}: ${duration}ms`,
+              priority: 3,
+            }, "PostToolUse");
+          }
         }
       }
-    }
-  } catch { /* latency tracking is best-effort */ }
+    } catch { /* latency tracking is best-effort */ }
 
-  db.close();
-} catch {
-  // PostToolUse must never block the session — silent fallback
-}
+    db.close();
+  } catch {
+    // PostToolUse must never block the session — silent fallback
+  }
 
-// PostToolUse hooks don't need hookSpecificOutput
+  // PostToolUse hooks don't need hookSpecificOutput
+});

package/hooks/precompact.mjs

@@ -1,66 +1,76 @@
 #!/usr/bin/env node
-import "./suppress-stderr.mjs";
-import "./ensure-deps.mjs";
 /**
  * PreCompact hook for context-mode session continuity.
  *
  * Triggered when Claude Code is about to compact the conversation.
  * Reads all captured session events, builds a priority-sorted resume
  * snapshot (<2KB XML), and stores it for injection after compact.
+ *
+ * Crash-resilience: wrapped via runHook (#414).
  */
 
-import { readStdin, parseStdin, getSessionId, getSessionDBPath, resolveConfigDir } from "./session-helpers.mjs";
-import { createSessionLoaders } from "./session-loaders.mjs";
-import { appendFileSync } from "node:fs";
-import { join, dirname } from "node:path";
-import { fileURLToPath } from "node:url";
+import { runHook } from "./run-hook.mjs";
 
-// Resolve absolute path for imports
-const HOOK_DIR = dirname(fileURLToPath(import.meta.url));
-const { loadSessionDB, loadSnapshot } = createSessionLoaders(HOOK_DIR);
-const DEBUG_LOG = join(resolveConfigDir(), "context-mode", "precompact-debug.log");
+await runHook(async () => {
+  const {
+    readStdin,
+    parseStdin,
+    getSessionId,
+    getSessionDBPath,
+    resolveConfigDir,
+  } = await import("./session-helpers.mjs");
+  const { createSessionLoaders } = await import("./session-loaders.mjs");
+  const { appendFileSync } = await import("node:fs");
+  const { join, dirname } = await import("node:path");
+  const { fileURLToPath } = await import("node:url");
 
-try {
-  const raw = await readStdin();
-  const input = parseStdin(raw);
+  // Resolve absolute path for imports
+  const HOOK_DIR = dirname(fileURLToPath(import.meta.url));
+  const { loadSessionDB, loadSnapshot } = createSessionLoaders(HOOK_DIR);
+  const DEBUG_LOG = join(resolveConfigDir(), "context-mode", "precompact-debug.log");
 
-  const { buildResumeSnapshot } = await loadSnapshot();
-  const { SessionDB } = await loadSessionDB();
+  try {
+    const raw = await readStdin();
+    const input = parseStdin(raw);
 
-  const dbPath = getSessionDBPath();
-  const db = new SessionDB({ dbPath });
-  const sessionId = getSessionId(input);
+    const { buildResumeSnapshot } = await loadSnapshot();
+    const { SessionDB } = await loadSessionDB();
 
-  // Get all events for this session
-  const events = db.getEvents(sessionId);
+    const dbPath = getSessionDBPath();
+    const db = new SessionDB({ dbPath });
+    const sessionId = getSessionId(input);
 
-  if (events.length > 0) {
-    const stats = db.getSessionStats(sessionId);
-    const snapshot = buildResumeSnapshot(events, {
-      compactCount: (stats?.compact_count ?? 0) + 1,
-    });
+    // Get all events for this session
+    const events = db.getEvents(sessionId);
 
-    db.upsertResume(sessionId, snapshot, events.length);
-    db.incrementCompactCount(sessionId);
+    if (events.length > 0) {
+      const stats = db.getSessionStats(sessionId);
+      const snapshot = buildResumeSnapshot(events, {
+        compactCount: (stats?.compact_count ?? 0) + 1,
+      });
 
-    // Write compaction category event for analytics
-    const fileEvents = events.filter(e => e.category === "file");
-    db.insertEvent(sessionId, {
-      type: "compaction_summary",
-      category: "compaction",
-      data: `Session compacted. ${events.length} events, ${fileEvents.length} files touched.`,
-      priority: 1,
-    }, "PreCompact");
-  }
+      db.upsertResume(sessionId, snapshot, events.length);
+      db.incrementCompactCount(sessionId);
 
-  db.close();
-} catch (err) {
-  try {
-    appendFileSync(DEBUG_LOG, `[${new Date().toISOString()}] ${err.message}\n`);
-  } catch {
-    // Silent fallback
+      // Write compaction category event for analytics
+      const fileEvents = events.filter(e => e.category === "file");
+      db.insertEvent(sessionId, {
+        type: "compaction_summary",
+        category: "compaction",
+        data: `Session compacted. ${events.length} events, ${fileEvents.length} files touched.`,
+        priority: 1,
+      }, "PreCompact");
+    }
+
+    db.close();
+  } catch (err) {
+    try {
+      appendFileSync(DEBUG_LOG, `[${new Date().toISOString()}] ${err.message}\n`);
+    } catch {
+      // Silent fallback
+    }
   }
-}
 
-// PreCompact doesn't need hookSpecificOutput
-console.log(JSON.stringify({}));
+  // PreCompact doesn't need hookSpecificOutput
+  console.log(JSON.stringify({}));
+});