@contextstream/mcp-server 0.4.60 → 0.4.62

package/dist/hooks/session-init.js

@@ -7,9 +7,9 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 });
 
 // src/hooks/session-init.ts
-import * as fs from "node:fs";
-import * as path from "node:path";
-import { homedir as homedir2 } from "node:os";
+import * as fs2 from "node:fs";
+import * as path2 from "node:path";
+import { homedir as homedir3 } from "node:os";
 
 // src/version.ts
 import { createRequire } from "module";
@@ -247,7 +247,7 @@ function detectUpdateMethod() {
   return "curl";
 }
 async function runUpdate(method) {
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve3, reject) => {
     let command;
     let args;
     let shell;
@@ -278,13 +278,13 @@ async function runUpdate(method) {
     });
     proc.on("close", (code) => {
       if (code === 0) {
-        resolve2();
+        resolve3();
       } else {
         reject(new Error(`Update process exited with code ${code}`));
       }
     });
     proc.unref();
-    setTimeout(() => resolve2(), 1e3);
+    setTimeout(() => resolve3(), 1e3);
   });
 }
 function writeUpdateMarker(previousVersion, newVersion) {
@@ -372,7 +372,7 @@ var CONTEXTSTREAM_RULES_BOOTSTRAP = `
 | Message | Required |
 |---------|----------|
 | **1st message** | \`init()\` \u2192 \`context(user_message="...")\` |
-| **Every message** | \`context(user_message="...")\` FIRST |
+| **Subsequent messages (default)** | \`context(user_message="...")\` FIRST (narrow read-only bypass when context is fresh and no state-changing tool has run) |
 | **Before file search** | \`search(mode="auto")\` BEFORE Glob/Grep/Read |
 </contextstream_rules>
 
@@ -386,27 +386,25 @@ v${RULES_VERSION}
 `.trim();
 var CONTEXTSTREAM_RULES_DYNAMIC = CONTEXTSTREAM_RULES_BOOTSTRAP;
 var CONTEXTSTREAM_RULES_FULL = `
-## \u{1F6A8} MANDATORY: CALL CONTEXT EVERY MESSAGE \u{1F6A8}
+## \u{1F6A8} MANDATORY STARTUP: CONTEXT-FIRST FLOW \u{1F6A8}
 
 <contextstream_rules>
-**EVERY response MUST start with \`context(user_message="...")\`**
-
 | Message | What to Call |
 |---------|--------------|
-| 1st message | \`init()\` \u2192 \`context(user_message="<msg>")\` |
-| **EVERY message after** | \`context(user_message="<msg>")\` **FIRST** |
-
-**BEFORE Glob/Grep/Read/Search:** \u2192 \`search(mode="auto")\` FIRST
+| **First message in session** | \`init()\` \u2192 \`context(user_message="<msg>")\` BEFORE any other tool |
+| **Subsequent messages (default)** | \`context(user_message="<msg>")\` FIRST, then other tools |
+| **Narrow bypass** | Immediate read-only ContextStream calls are allowed only when prior context is fresh and no state-changing tool has run |
+| **Before Glob/Grep/Read/Search** | \`search(mode="auto", query="...")\` FIRST |
 </contextstream_rules>
 
-**This block MUST appear at the start of EVERY response.** Failing to call \`context()\` means missing rules, lessons, and relevant context.
+Use \`context()\` by default to get task-specific rules, lessons from past mistakes, and relevant decisions.
 
 ---
 
-## Why \`context()\` is MANDATORY Every Message
+## Why Default Context-First
 
-\u274C **WRONG:** "I already called init, I don't need context"
-\u2705 **CORRECT:** \`context()\` is required EVERY message, not just the first
+\u274C **Wrong:** "I already called init, so I can skip context for everything"
+\u2705 **Correct:** \`context()\` is the default first call for subsequent messages, with a narrow read-only bypass when context is still fresh and state is unchanged
 
 **What you lose without \`context()\`:**
 - Dynamic rules matched to your current task
@@ -414,7 +412,7 @@ var CONTEXTSTREAM_RULES_FULL = `
 - Semantically relevant decisions and context
 - Warnings about risky operations
 
-**\`init()\` gives recent items by TIME. \`context()\` finds items RELEVANT to THIS message.**
+**\`init()\` returns recent items by time. \`context()\` finds items semantically relevant to this message.**
 
 ---
 
@@ -920,9 +918,10 @@ var CONTEXTSTREAM_RULES_MINIMAL = `
 ## \u{1F6A8} CRITICAL: These Rules Are Non-Negotiable \u{1F6A8}
 
 <contextstream_protocol>
-**EVERY coding response MUST start with:**
-1. \`init()\` (1st message only) \u2192 then \`context(user_message="<msg>")\`
-2. \`context(user_message="<msg>")\` (EVERY subsequent message)
+**MANDATORY STARTUP:**
+1. First message in session: \`init()\` \u2192 then \`context(user_message="<msg>")\`
+2. Subsequent messages (default): \`context(user_message="<msg>")\` FIRST
+3. Narrow bypass: immediate read-only ContextStream calls are allowed only when prior context is fresh and no state-changing tool has run
 
 **BEFORE Glob/Grep/Read/Search/Explore:**
 \u2192 \`search(mode="auto", query="...")\` FIRST \u2014 local tools ONLY if 0 results
@@ -952,8 +951,9 @@ Rules Version: ${RULES_VERSION}
 
 | When | Call |
 |------|------|
-| 1st message | \`init()\` \u2192 \`context(user_message="...")\` |
-| Every message after | \`context(user_message="...")\` |
+| 1st message in session | \`init()\` \u2192 \`context(user_message="...")\` |
+| Subsequent messages (default) | \`context(user_message="...")\` first |
+| Narrow bypass | Immediate read-only ContextStream calls when context is fresh and no state-changing tool has run |
 | Before ANY file discovery | \`search(mode="auto", query="...")\` |
 | On \`<system-reminder>\` | **Follow instructions inside** |
 | Save important decisions | \`session(action="capture", event_type="decision", ...)\` |
@@ -976,12 +976,10 @@ Rules Version: ${RULES_VERSION}
 - **[RULES_NOTICE]** \u2192 Run \`generate_rules()\`
 - **[VERSION_NOTICE]** \u2192 Tell user to update MCP
 
-## Fast Path (Simple Utilities Only)
+## Read-Only Examples
 
-Skip init/context ONLY for: "list workspaces", "show version", "list reminders"
-\u2192 Just call: \`workspace(action="list")\`, \`help(action="version")\`, etc.
-
-Everything else = full protocol (init \u2192 context \u2192 search \u2192 work)
+Default behavior is context-first. Narrow bypass applies only for immediate read-only ContextStream calls when context is fresh and state is unchanged.
+Examples: \`workspace(action="list"|"get")\`, \`help(action="version"|"tools"|"auth")\`, \`project(action="index_status")\`.
 
 ### Lessons (Past Mistakes)
 
@@ -1070,7 +1068,7 @@ You MUST follow these rules manually - there is no automatic enforcement.
    - Check for [RULES_NOTICE] - update rules if needed
    - **save_exchange=true** saves each conversation turn for later retrieval
 
-4. **NEVER skip init/context** - you will miss critical context
+4. **Default behavior:** call \`context(...)\` first on each message. Narrow bypass is allowed only for immediate read-only ContextStream calls when previous context is still fresh and no state-changing tool has run.
 
 ---
 
@@ -1079,7 +1077,7 @@ You MUST follow these rules manually - there is no automatic enforcement.
 **This editor does NOT have hooks to auto-save transcripts.**
 You MUST save each conversation turn manually:
 
-### On EVERY message (including the first):
+### On MOST messages (including the first):
 \`\`\`
 context(user_message="<user's message>", save_exchange=true, session_id="<session-id>")
 \`\`\`
@@ -1154,6 +1152,28 @@ search(mode="auto", query="what you're looking for")
 **IF ContextStream search returns 0 results or errors:**
 \u2192 Use local tools (Glob/Grep/Read) as fallback
 
+### Choose Search Mode Intelligently:
+- \`auto\` (recommended): query-aware mode selection
+- \`hybrid\`: mixed semantic + keyword retrieval for broad discovery
+- \`semantic\`: conceptual questions ("how does X work?")
+- \`keyword\`: exact text / quoted string
+- \`pattern\`: glob or regex (\`*.ts\`, \`foo\\s+bar\`)
+- \`refactor\`: symbol usage / rename-safe lookup
+- \`exhaustive\`: all occurrences / complete match coverage
+- \`team\`: cross-project team search
+
+### Output Format Hints:
+- Use \`output_format="paths"\` for file listings and rename targets
+- Use \`output_format="count"\` for "how many" queries
+
+### Two-Phase Search Pattern (for precision):
+- Pass 1 (discovery): \`search(mode="auto", query="<concept + module>", output_format="paths", limit=10)\`
+- Pass 2 (precision): use one of:
+  - exact text/symbol: \`search(mode="keyword", query="\\"exact_text\\"", include_content=true)\`
+  - symbol usage: \`search(mode="refactor", query="SymbolName", output_format="paths")\`
+  - all occurrences: \`search(mode="exhaustive", query="symbol_or_text")\`
+- Then use local Read/Grep only on paths returned by ContextStream.
+
 ### When Local Tools Are OK:
 \u2705 Project is not indexed
 \u2705 Index is stale/outdated (>7 days old)
@@ -1338,6 +1358,100 @@ ${options.workspaceId ? `# Workspace ID: ${options.workspaceId}` : ""}
   };
 }
 
+// src/hooks/prompt-state.ts
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { homedir as homedir2 } from "node:os";
+var STATE_PATH = path.join(homedir2(), ".contextstream", "prompt-state.json");
+function defaultState() {
+  return { workspaces: {} };
+}
+function nowIso() {
+  return (/* @__PURE__ */ new Date()).toISOString();
+}
+function ensureStateDir() {
+  try {
+    fs.mkdirSync(path.dirname(STATE_PATH), { recursive: true });
+  } catch {
+  }
+}
+function normalizePath(input) {
+  try {
+    return path.resolve(input);
+  } catch {
+    return input;
+  }
+}
+function workspacePathsMatch(a, b) {
+  const left = normalizePath(a);
+  const right = normalizePath(b);
+  return left === right || left.startsWith(`${right}${path.sep}`) || right.startsWith(`${left}${path.sep}`);
+}
+function readState() {
+  try {
+    const content = fs.readFileSync(STATE_PATH, "utf8");
+    const parsed = JSON.parse(content);
+    if (!parsed || typeof parsed !== "object" || !parsed.workspaces) {
+      return defaultState();
+    }
+    return parsed;
+  } catch {
+    return defaultState();
+  }
+}
+function writeState(state) {
+  try {
+    ensureStateDir();
+    fs.writeFileSync(STATE_PATH, JSON.stringify(state, null, 2), "utf8");
+  } catch {
+  }
+}
+function getOrCreateEntry(state, cwd) {
+  if (!cwd.trim()) return null;
+  const exact = state.workspaces[cwd];
+  if (exact) return { key: cwd, entry: exact };
+  for (const [trackedCwd, trackedEntry] of Object.entries(state.workspaces)) {
+    if (workspacePathsMatch(trackedCwd, cwd)) {
+      return { key: trackedCwd, entry: trackedEntry };
+    }
+  }
+  const created = {
+    require_context: false,
+    require_init: false,
+    last_context_at: void 0,
+    last_state_change_at: void 0,
+    updated_at: nowIso()
+  };
+  state.workspaces[cwd] = created;
+  return { key: cwd, entry: created };
+}
+function cleanupStale(maxAgeSeconds) {
+  const state = readState();
+  const now = Date.now();
+  let changed = false;
+  for (const [cwd, entry] of Object.entries(state.workspaces)) {
+    const updated = new Date(entry.updated_at);
+    if (Number.isNaN(updated.getTime())) continue;
+    const ageSeconds = (now - updated.getTime()) / 1e3;
+    if (ageSeconds > maxAgeSeconds) {
+      delete state.workspaces[cwd];
+      changed = true;
+    }
+  }
+  if (changed) {
+    writeState(state);
+  }
+}
+function markInitRequired(cwd) {
+  if (!cwd.trim()) return;
+  const state = readState();
+  const target = getOrCreateEntry(state, cwd);
+  if (!target) return;
+  target.entry.require_init = true;
+  target.entry.updated_at = nowIso();
+  writeState(state);
+}
+
 // src/hooks/session-init.ts
 var ENABLED = process.env.CONTEXTSTREAM_SESSION_INIT_ENABLED !== "false";
 var API_URL = process.env.CONTEXTSTREAM_API_URL || "https://api.contextstream.io";
@@ -1345,13 +1459,13 @@ var API_KEY = process.env.CONTEXTSTREAM_API_KEY || "";
 var WORKSPACE_ID = null;
 var PROJECT_ID = null;
 function loadConfigFromMcpJson(cwd) {
-  let searchDir = path.resolve(cwd);
+  let searchDir = path2.resolve(cwd);
   for (let i = 0; i < 5; i++) {
     if (!API_KEY) {
-      const mcpPath = path.join(searchDir, ".mcp.json");
-      if (fs.existsSync(mcpPath)) {
+      const mcpPath = path2.join(searchDir, ".mcp.json");
+      if (fs2.existsSync(mcpPath)) {
         try {
-          const content = fs.readFileSync(mcpPath, "utf-8");
+          const content = fs2.readFileSync(mcpPath, "utf-8");
           const config = JSON.parse(content);
           const csEnv = config.mcpServers?.contextstream?.env;
           if (csEnv?.CONTEXTSTREAM_API_KEY) {
@@ -1368,10 +1482,10 @@ function loadConfigFromMcpJson(cwd) {
       }
     }
     if (!WORKSPACE_ID || !PROJECT_ID) {
-      const csConfigPath = path.join(searchDir, ".contextstream", "config.json");
-      if (fs.existsSync(csConfigPath)) {
+      const csConfigPath = path2.join(searchDir, ".contextstream", "config.json");
+      if (fs2.existsSync(csConfigPath)) {
         try {
-          const content = fs.readFileSync(csConfigPath, "utf-8");
+          const content = fs2.readFileSync(csConfigPath, "utf-8");
           const csConfig = JSON.parse(content);
           if (csConfig.workspace_id && !WORKSPACE_ID) {
             WORKSPACE_ID = csConfig.workspace_id;
@@ -1383,15 +1497,15 @@ function loadConfigFromMcpJson(cwd) {
         }
       }
     }
-    const parentDir = path.dirname(searchDir);
+    const parentDir = path2.dirname(searchDir);
     if (parentDir === searchDir) break;
     searchDir = parentDir;
   }
   if (!API_KEY) {
-    const homeMcpPath = path.join(homedir2(), ".mcp.json");
-    if (fs.existsSync(homeMcpPath)) {
+    const homeMcpPath = path2.join(homedir3(), ".mcp.json");
+    if (fs2.existsSync(homeMcpPath)) {
       try {
-        const content = fs.readFileSync(homeMcpPath, "utf-8");
+        const content = fs2.readFileSync(homeMcpPath, "utf-8");
         const config = JSON.parse(content);
         const csEnv = config.mcpServers?.contextstream?.env;
         if (csEnv?.CONTEXTSTREAM_API_KEY) {
@@ -1469,7 +1583,9 @@ function formatContext(ctx, options = {}) {
     }
   }
   if (!ctx) {
-    parts.push('\nNo stored context found. Call `mcp__contextstream__context(user_message="starting new session")` to initialize.');
+    parts.push(
+      '\nNo saved context found yet. On the first message in this session call `mcp__contextstream__init(...)` then `mcp__contextstream__context(user_message="starting new session")`.'
+    );
     return parts.join("\n");
   }
   if (ctx.lessons && ctx.lessons.length > 0) {
@@ -1497,7 +1613,9 @@ function formatContext(ctx, options = {}) {
     }
   }
   parts.push("\n---");
-  parts.push('Call `mcp__contextstream__context(user_message="...")` for task-specific context.');
+  parts.push(
+    'On the first message in a new session call `mcp__contextstream__init(...)` then `mcp__contextstream__context(user_message="...")`. After that, call `mcp__contextstream__context(user_message="...")` on every message.'
+  );
   return parts.join("\n");
 }
 var CONTEXTSTREAM_START_MARKER = "<!-- BEGIN ContextStream -->";
@@ -1508,10 +1626,10 @@ function regenerateRuleFiles(folderPath) {
   for (const editor of editors) {
     const rule = generateRuleContent(editor, { mode: "bootstrap" });
     if (!rule) continue;
-    const filePath = path.join(folderPath, rule.filename);
-    if (!fs.existsSync(filePath)) continue;
+    const filePath = path2.join(folderPath, rule.filename);
+    if (!fs2.existsSync(filePath)) continue;
     try {
-      const existing = fs.readFileSync(filePath, "utf8");
+      const existing = fs2.readFileSync(filePath, "utf8");
       const startIdx = existing.indexOf(CONTEXTSTREAM_START_MARKER);
       const endIdx = existing.indexOf(CONTEXTSTREAM_END_MARKER);
       if (startIdx === -1 || endIdx === -1 || endIdx <= startIdx) continue;
@@ -1521,7 +1639,7 @@ function regenerateRuleFiles(folderPath) {
 ${rule.content.trim()}
 ${CONTEXTSTREAM_END_MARKER}`;
       const merged = [before, newBlock, after].filter((p) => p.length > 0).join("\n\n");
-      fs.writeFileSync(filePath, merged.trim() + "\n", "utf8");
+      fs2.writeFileSync(filePath, merged.trim() + "\n", "utf8");
       updated++;
     } catch {
     }
@@ -1546,6 +1664,8 @@ async function runSessionInitHook() {
     process.exit(0);
   }
   const cwd = input.cwd || process.cwd();
+  cleanupStale(360);
+  markInitRequired(cwd);
   loadConfigFromMcpJson(cwd);
   const updateMarker = checkUpdateMarker();
   if (updateMarker) {

package/dist/hooks/user-prompt-submit.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 
 // src/hooks/user-prompt-submit.ts
-import * as fs from "node:fs";
-import * as path from "node:path";
-import { homedir as homedir2 } from "node:os";
+import * as fs2 from "node:fs";
+import * as path2 from "node:path";
+import { homedir as homedir3 } from "node:os";
 
 // src/version.ts
 import { createRequire } from "module";
@@ -173,21 +173,126 @@ When mentioning the update, provide these commands (user can choose their prefer
 Be helpful but not annoying - frame it positively as access to new capabilities rather than criticism.`;
 }
 
+// src/hooks/prompt-state.ts
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { homedir as homedir2 } from "node:os";
+var STATE_PATH = path.join(homedir2(), ".contextstream", "prompt-state.json");
+function defaultState() {
+  return { workspaces: {} };
+}
+function nowIso() {
+  return (/* @__PURE__ */ new Date()).toISOString();
+}
+function ensureStateDir() {
+  try {
+    fs.mkdirSync(path.dirname(STATE_PATH), { recursive: true });
+  } catch {
+  }
+}
+function normalizePath(input) {
+  try {
+    return path.resolve(input);
+  } catch {
+    return input;
+  }
+}
+function workspacePathsMatch(a, b) {
+  const left = normalizePath(a);
+  const right = normalizePath(b);
+  return left === right || left.startsWith(`${right}${path.sep}`) || right.startsWith(`${left}${path.sep}`);
+}
+function readState() {
+  try {
+    const content = fs.readFileSync(STATE_PATH, "utf8");
+    const parsed = JSON.parse(content);
+    if (!parsed || typeof parsed !== "object" || !parsed.workspaces) {
+      return defaultState();
+    }
+    return parsed;
+  } catch {
+    return defaultState();
+  }
+}
+function writeState(state) {
+  try {
+    ensureStateDir();
+    fs.writeFileSync(STATE_PATH, JSON.stringify(state, null, 2), "utf8");
+  } catch {
+  }
+}
+function getOrCreateEntry(state, cwd) {
+  if (!cwd.trim()) return null;
+  const exact = state.workspaces[cwd];
+  if (exact) return { key: cwd, entry: exact };
+  for (const [trackedCwd, trackedEntry] of Object.entries(state.workspaces)) {
+    if (workspacePathsMatch(trackedCwd, cwd)) {
+      return { key: trackedCwd, entry: trackedEntry };
+    }
+  }
+  const created = {
+    require_context: false,
+    require_init: false,
+    last_context_at: void 0,
+    last_state_change_at: void 0,
+    updated_at: nowIso()
+  };
+  state.workspaces[cwd] = created;
+  return { key: cwd, entry: created };
+}
+function cleanupStale(maxAgeSeconds) {
+  const state = readState();
+  const now = Date.now();
+  let changed = false;
+  for (const [cwd, entry] of Object.entries(state.workspaces)) {
+    const updated = new Date(entry.updated_at);
+    if (Number.isNaN(updated.getTime())) continue;
+    const ageSeconds = (now - updated.getTime()) / 1e3;
+    if (ageSeconds > maxAgeSeconds) {
+      delete state.workspaces[cwd];
+      changed = true;
+    }
+  }
+  if (changed) {
+    writeState(state);
+  }
+}
+function markContextRequired(cwd) {
+  if (!cwd.trim()) return;
+  const state = readState();
+  const target = getOrCreateEntry(state, cwd);
+  if (!target) return;
+  target.entry.require_context = true;
+  target.entry.updated_at = nowIso();
+  writeState(state);
+}
+function markInitRequired(cwd) {
+  if (!cwd.trim()) return;
+  const state = readState();
+  const target = getOrCreateEntry(state, cwd);
+  if (!target) return;
+  target.entry.require_init = true;
+  target.entry.updated_at = nowIso();
+  writeState(state);
+}
+
 // src/hooks/user-prompt-submit.ts
 var ENABLED = process.env.CONTEXTSTREAM_REMINDER_ENABLED !== "false";
 var API_URL = process.env.CONTEXTSTREAM_API_URL || "https://api.contextstream.io";
 var API_KEY = process.env.CONTEXTSTREAM_API_KEY || "";
 var WORKSPACE_ID = null;
 var PROJECT_ID = null;
-var REMINDER = `[CONTEXTSTREAM] Call mcp__contextstream__context(user_message="...", save_exchange=true, session_id="<session-id>") FIRST before any other tool. Response contains dynamic rules, lessons, preferences. For search: use search(mode="auto") if indexed, else local tools.
+var REMINDER = `[CONTEXTSTREAM] On the first message in every session call mcp__contextstream__init(...), then call mcp__contextstream__context(user_message="...", save_exchange=true, session_id="<session-id>") FIRST before any other tool. On subsequent messages, default to context first. Narrow bypass is allowed only for immediate read-only ContextStream calls when prior context is fresh and no state-changing tool has run. Response contains dynamic rules, lessons, preferences.
+COMMON MEMORY CALLS: list docs via memory(action="list_docs"), list lessons via session(action="get_lessons"), list plans via session(action="list_plans"), list tasks/todos via memory(action="list_tasks"|"list_todos").
 [END]`;
 var FULL_REMINDER = `[CONTEXTSTREAM RULES - MANDATORY]
 
-1. FIRST: Call mcp__contextstream__context(user_message="...", save_exchange=true, session_id="<session-id>") before ANY other tool
+1. FIRST MESSAGE IN SESSION: Call mcp__contextstream__init(...) then mcp__contextstream__context(user_message="...", save_exchange=true, session_id="<session-id>")
    - Returns: dynamic rules, lessons from past mistakes, relevant context
    - Check response for: [LESSONS_WARNING], [RULES_NOTICE], preferences
    - save_exchange=true saves each conversation turn for later retrieval
    - Use a consistent session_id for the entire conversation (generate once on first message)
+   - On subsequent messages, default to context() first. Narrow bypass: immediate read-only ContextStream calls when context is fresh and no state-changing tool has run.
 
 2. FOR CODE SEARCH: Check index status, then search appropriately
    \u26A0\uFE0F BEFORE searching: mcp__contextstream__project(action="index_status")
@@ -218,13 +323,13 @@ var ENHANCED_REMINDER_HEADER = `\u2B21 ContextStream \u2014 Smart Context & Memo
 
 `;
 function loadConfigFromMcpJson(cwd) {
-  let searchDir = path.resolve(cwd);
+  let searchDir = path2.resolve(cwd);
   for (let i = 0; i < 5; i++) {
     if (!API_KEY) {
-      const mcpPath = path.join(searchDir, ".mcp.json");
-      if (fs.existsSync(mcpPath)) {
+      const mcpPath = path2.join(searchDir, ".mcp.json");
+      if (fs2.existsSync(mcpPath)) {
         try {
-          const content = fs.readFileSync(mcpPath, "utf-8");
+          const content = fs2.readFileSync(mcpPath, "utf-8");
           const config = JSON.parse(content);
           const csEnv = config.mcpServers?.contextstream?.env;
           if (csEnv?.CONTEXTSTREAM_API_KEY) {
@@ -241,10 +346,10 @@ function loadConfigFromMcpJson(cwd) {
       }
     }
     if (!WORKSPACE_ID || !PROJECT_ID) {
-      const csConfigPath = path.join(searchDir, ".contextstream", "config.json");
-      if (fs.existsSync(csConfigPath)) {
+      const csConfigPath = path2.join(searchDir, ".contextstream", "config.json");
+      if (fs2.existsSync(csConfigPath)) {
         try {
-          const content = fs.readFileSync(csConfigPath, "utf-8");
+          const content = fs2.readFileSync(csConfigPath, "utf-8");
           const csConfig = JSON.parse(content);
           if (csConfig.workspace_id && !WORKSPACE_ID) {
             WORKSPACE_ID = csConfig.workspace_id;
@@ -256,15 +361,15 @@ function loadConfigFromMcpJson(cwd) {
         }
       }
     }
-    const parentDir = path.dirname(searchDir);
+    const parentDir = path2.dirname(searchDir);
     if (parentDir === searchDir) break;
     searchDir = parentDir;
   }
   if (!API_KEY) {
-    const homeMcpPath = path.join(homedir2(), ".mcp.json");
-    if (fs.existsSync(homeMcpPath)) {
+    const homeMcpPath = path2.join(homedir3(), ".mcp.json");
+    if (fs2.existsSync(homeMcpPath)) {
       try {
-        const content = fs.readFileSync(homeMcpPath, "utf-8");
+        const content = fs2.readFileSync(homeMcpPath, "utf-8");
         const config = JSON.parse(content);
         const csEnv = config.mcpServers?.contextstream?.env;
         if (csEnv?.CONTEXTSTREAM_API_KEY) {
@@ -280,7 +385,7 @@ function loadConfigFromMcpJson(cwd) {
 }
 function readTranscriptFile(transcriptPath) {
   try {
-    const content = fs.readFileSync(transcriptPath, "utf-8");
+    const content = fs2.readFileSync(transcriptPath, "utf-8");
     const lines = content.trim().split("\n");
     const messages = [];
     for (const line of lines) {
@@ -688,6 +793,11 @@ async function runUserPromptSubmitHook() {
   }
   const editorFormat = detectEditorFormat(input);
   const cwd = input.cwd || process.cwd();
+  cleanupStale(180);
+  markContextRequired(cwd);
+  if (isNewSession(input, editorFormat)) {
+    markInitRequired(cwd);
+  }
   if (editorFormat === "claude") {
     loadConfigFromMcpJson(cwd);
     let context = REMINDER;