driftguard-mcp 0.1.5 → 0.1.7

package/README.md

@@ -24,7 +24,8 @@ driftguard-mcp setup
 {
   "mcpServers": {
     "driftguard": {
-      "command": "driftguard-mcp"
+      "command": "driftguard-mcp",
+      "env": { "DRIFTCLI_ADAPTER": "claude" }
     }
   }
 }
@@ -36,7 +37,8 @@ driftguard-mcp setup
 {
   "mcpServers": {
     "driftguard": {
-      "command": "driftguard-mcp"
+      "command": "driftguard-mcp",
+      "env": { "DRIFTCLI_ADAPTER": "gemini" }
     }
   }
 }
@@ -48,7 +50,8 @@ driftguard-mcp setup
 {
   "mcpServers": {
     "driftguard": {
-      "command": "driftguard-mcp"
+      "command": "driftguard-mcp",
+      "env": { "DRIFTCLI_ADAPTER": "codex" }
     }
   }
 }
@@ -60,13 +63,16 @@ driftguard-mcp setup
 {
   "mcpServers": {
     "driftguard": {
-      "command": "driftguard-mcp"
+      "command": "driftguard-mcp",
+      "env": { "DRIFTCLI_ADAPTER": "claude" }
     }
   }
 }
 ```
 
-> Note: Cursor drift is calculated from any active Claude Code, Gemini CLI, or Codex CLI sessions on your machine — not from Cursor's own conversation history.
+> Note: Cursor drift is calculated from Claude Code sessions on your machine — not from Cursor's own conversation history.
+
+> **`DRIFTCLI_ADAPTER`** tells driftguard-mcp which CLI's sessions to read. Without it, the server falls back to whichever session file was modified most recently, which may be from a different CLI. `driftguard-mcp setup` sets this automatically.
 
 </details>
 
@@ -169,6 +175,14 @@ Both are plain JSON. All fields are optional.
 | `storage.directory` | `~/.driftcli/history` | Override snapshot storage path |
 | `sessionResolution.cacheTtlMs` | `5000` | How long to cache the resolved session file (ms) |
 
+### Environment variables
+
+| Variable | Description |
+|----------|-------------|
+| `DRIFTCLI_ADAPTER` | Pin session lookup to a specific CLI: `claude`, `gemini`, or `codex`. Set automatically by `driftguard-mcp setup`. |
+| `DRIFTCLI_SESSION_ID` | Force a specific session UUID (Claude Code only). |
+| `DRIFTCLI_HOME` | Override the home directory used for session file discovery. |
+
 ---
 
 ## CLI watcher

package/dist/bin.js

@@ -235,39 +235,65 @@ var init_gemini_adapter = __esm({
         this.name = "gemini";
       }
       canParse(filePath) {
-        return filePath.includes(".gemini") && filePath.endsWith(".jsonl");
+        return filePath.includes(".gemini") && filePath.endsWith(".json");
       }
       parse(filePath) {
         const raw = fs2.readFileSync(filePath, "utf-8");
-        const lines = raw.split("\n").filter((l) => l.trim());
+        let session;
+        try {
+          session = JSON.parse(raw);
+        } catch {
+          return [];
+        }
+        if (!Array.isArray(session.messages)) return [];
         const messages = [];
         let index = 0;
-        for (const line of lines) {
-          try {
-            const entry = JSON.parse(line);
-            if (entry.role !== "user" && entry.role !== "model") continue;
-            const parts = entry.parts ?? [];
-            const text = parts.map((p) => p.text ?? "").join("\n").trim();
-            if (!text) continue;
-            let toolTokens = 0;
-            for (const part of parts) {
-              if (part.functionCall?.args) {
-                toolTokens += Math.round(JSON.stringify(part.functionCall.args).length / 4);
-              }
-              if (part.functionResponse?.response) {
-                toolTokens += Math.round(JSON.stringify(part.functionResponse.response).length / 4);
+        let pendingToolTokens = 0;
+        let pendingInputTokens;
+        for (const msg of session.messages) {
+          if (msg.type !== "user" && msg.type !== "gemini") continue;
+          let content;
+          if (typeof msg.content === "string") {
+            content = msg.content.trim();
+          } else if (Array.isArray(msg.content)) {
+            content = msg.content.map((p) => p.text ?? "").join("\n").trim();
+          } else {
+            continue;
+          }
+          if (!content && msg.type === "gemini") {
+            pendingToolTokens += msg.tokens?.tool ?? 0;
+            pendingToolTokens += msg.tokens?.thoughts ?? 0;
+            if ((msg.tokens?.tool ?? 0) === 0 && msg.toolCalls?.length) {
+              for (const tc of msg.toolCalls) {
+                if (tc.args) pendingToolTokens += Math.round(JSON.stringify(tc.args).length / 4);
+                if (tc.result) pendingToolTokens += Math.round(JSON.stringify(tc.result).length / 4);
               }
             }
-            const ts = entry.timestamp ? new Date(entry.timestamp).getTime() : Date.now();
-            messages.push({
-              id: `gemini-${index++}`,
-              role: entry.role === "model" ? "assistant" : "user",
-              content: text,
-              timestamp: isFinite(ts) ? ts : Date.now(),
-              ...toolTokens > 0 ? { toolTokens } : {}
-            });
-          } catch {
+            if (msg.tokens?.input) pendingInputTokens = msg.tokens.input;
+            continue;
+          }
+          if (!content) continue;
+          const role = msg.type === "gemini" ? "assistant" : "user";
+          const ts = msg.timestamp ? new Date(msg.timestamp).getTime() : Date.now();
+          let toolTokens = pendingToolTokens + (msg.tokens?.tool ?? 0);
+          pendingToolTokens = 0;
+          toolTokens += msg.tokens?.thoughts ?? 0;
+          if ((msg.tokens?.tool ?? 0) === 0 && msg.toolCalls?.length) {
+            for (const tc of msg.toolCalls) {
+              if (tc.args) toolTokens += Math.round(JSON.stringify(tc.args).length / 4);
+              if (tc.result) toolTokens += Math.round(JSON.stringify(tc.result).length / 4);
+            }
           }
+          const inputTokens = msg.tokens?.input ?? pendingInputTokens;
+          pendingInputTokens = void 0;
+          messages.push({
+            id: `gemini-${index++}`,
+            role,
+            content,
+            timestamp: isFinite(ts) ? ts : Date.now(),
+            ...toolTokens > 0 ? { toolTokens } : {},
+            ...inputTokens !== void 0 ? { inputTokens } : {}
+          });
         }
         return messages;
       }
@@ -289,10 +315,12 @@ var init_gemini_adapter = __esm({
             }
           });
           for (const dir of sessionDirs) {
+            const chatsDir = path2.join(dir, "chats");
+            if (!fs2.existsSync(chatsDir)) continue;
             try {
-              const files = fs2.readdirSync(dir).filter((f) => f.endsWith(".jsonl"));
+              const files = fs2.readdirSync(chatsDir).filter((f) => f.endsWith(".json"));
               for (const file of files) {
-                const fullPath = path2.join(dir, file);
+                const fullPath = path2.join(chatsDir, file);
                 try {
                   const mtime = fs2.statSync(fullPath).mtimeMs;
                   if (mtime > latestTime) {
@@ -337,49 +365,40 @@ var init_codex_adapter = __esm({
         const messages = [];
         let index = 0;
         let pendingToolTokens = 0;
+        let pendingInputTokens;
         for (const line of lines) {
           try {
             const entry = JSON.parse(line);
-            if (entry.role === "tool") {
-              const resultText = typeof entry.content === "string" ? entry.content : "";
-              pendingToolTokens += Math.round(resultText.length / 4);
+            if (entry.type !== "event_msg" || !entry.payload) continue;
+            const payload = entry.payload;
+            if (payload.type === "token_count") {
+              const tc = payload;
+              const usage = tc.info?.total_token_usage;
+              if (usage?.input_tokens) pendingInputTokens = usage.input_tokens;
+              if (usage?.reasoning_output_tokens) pendingToolTokens += usage.reasoning_output_tokens;
               continue;
             }
-            if (entry.role !== "user" && entry.role !== "assistant") continue;
-            let text = "";
-            let toolTokens = pendingToolTokens;
-            pendingToolTokens = 0;
-            if (typeof entry.content === "string") {
-              text = entry.content.trim();
-            } else if (Array.isArray(entry.content)) {
-              for (const block of entry.content) {
-                if (block.type === "text" && typeof block.text === "string") {
-                  text += (text ? "\n" : "") + block.text.trim();
-                } else if (block.type === "tool_use" && block.input) {
-                  toolTokens += Math.round(JSON.stringify(block.input).length / 4);
-                }
-              }
-              text = text.trim();
-            }
-            if (entry.tool_calls) {
-              for (const tc of entry.tool_calls) {
-                if (tc.function?.arguments) {
-                  toolTokens += Math.round(tc.function.arguments.length / 4);
-                }
-              }
+            if (payload.type === "ExecCommandEnd") {
+              const output = payload.aggregated_output ?? "";
+              pendingToolTokens += Math.round(output.length / 4);
+              continue;
             }
+            if (payload.type !== "user_message" && payload.type !== "agent_message") continue;
+            const text = (payload.message ?? "").trim();
             if (!text) continue;
-            let ts = Date.now();
-            if (entry.timestamp) {
-              const parsed = typeof entry.timestamp === "number" ? entry.timestamp : new Date(entry.timestamp).getTime();
-              if (isFinite(parsed)) ts = parsed;
-            }
+            const role = payload.type === "agent_message" ? "assistant" : "user";
+            const ts = entry.timestamp ? new Date(entry.timestamp).getTime() : Date.now();
+            const toolTokens = pendingToolTokens;
+            pendingToolTokens = 0;
+            const inputTokens = pendingInputTokens;
+            pendingInputTokens = void 0;
             messages.push({
               id: `codex-${index++}`,
-              role: entry.role,
+              role,
               content: text,
-              timestamp: ts,
-              ...toolTokens > 0 ? { toolTokens } : {}
+              timestamp: isFinite(ts) ? ts : Date.now(),
+              ...toolTokens > 0 ? { toolTokens } : {},
+              ...inputTokens !== void 0 ? { inputTokens } : {}
             });
           } catch {
           }
@@ -424,6 +443,11 @@ var init_codex_adapter = __esm({
 function detectAdapter(filePath) {
   return ADAPTERS.find((a) => a.canParse(filePath)) ?? ADAPTERS[0];
 }
+function getPinnedAdapter() {
+  const name = process.env.DRIFTCLI_ADAPTER;
+  if (!name) return null;
+  return ADAPTERS.find((a) => a.name === name) ?? null;
+}
 var ADAPTERS;
 var init_adapter_registry = __esm({
   "src/watchers/adapter-registry.ts"() {
@@ -453,7 +477,8 @@ var init_session_resolver = __esm({
         if (this.cached && this.cached.expiresAt > Date.now()) {
           return this.cached.file;
         }
-        const result = this.resolveFromEnv() ?? this.resolveFromCwd() ?? findLatestSession();
+        const pinned = getPinnedAdapter();
+        const result = this.resolveFromEnv() ?? this.resolveFromCwd(pinned) ?? (pinned ? pinned.findLatest() : findLatestSession());
         if (result) {
           this.cached = { file: result, expiresAt: Date.now() + this.cacheTtlMs };
         } else {
@@ -470,7 +495,8 @@ var init_session_resolver = __esm({
       invalidate() {
         this.cached = null;
       }
-      resolveFromCwd() {
+      resolveFromCwd(pinned) {
+        if (pinned && pinned.name !== "claude") return null;
         const file = findSessionByCwd();
         if (file && process.env.DRIFTCLI_DEBUG) {
           const slug = file.split(/[\\/]/).slice(-2, -1)[0];
@@ -718,15 +744,6 @@ function createWindows(messages, windowSize) {
   }
   return windows;
 }
-function extractTopTerms(messages, n = 5) {
-  const freq = /* @__PURE__ */ new Map();
-  for (const msg of messages) {
-    for (const term of tokenize(msg.content)) {
-      freq.set(term, (freq.get(term) ?? 0) + 1);
-    }
-  }
-  return [...freq.entries()].sort((a, b) => b[1] - a[1]).slice(0, n).map(([term]) => term);
-}
 function extractNgrams(text, n = 3) {
   const tokens = tokenize(text).filter((w) => !/^\d/.test(w));
   if (tokens.length < n) return /* @__PURE__ */ new Set();
@@ -1473,11 +1490,16 @@ function calculateDrift(messages, weights = DEFAULT_WEIGHTS, userGoal) {
 }
 function calcMessageDecay(messages) {
   let totalTokens = 0;
-  for (const msg of messages) {
-    const words = msg.content.split(/\s+/).filter((w) => w.length > 0).length;
-    const hasCode = msg.content.includes("```");
-    const tokenEstimate = Math.round(words * 1.3 * (hasCode ? 1.5 : 1));
-    totalTokens += tokenEstimate + (msg.toolTokens ?? 0);
+  const latestInputTokens = [...messages].reverse().find((m) => (m.inputTokens ?? 0) > 0)?.inputTokens;
+  if (latestInputTokens !== void 0) {
+    totalTokens = latestInputTokens;
+  } else {
+    for (const msg of messages) {
+      const words = msg.content.split(/\s+/).filter((w) => w.length > 0).length;
+      const hasCode = msg.content.includes("```");
+      const tokenEstimate = Math.round(words * 1.3 * (hasCode ? 1.5 : 1));
+      totalTokens += tokenEstimate + (msg.toolTokens ?? 0);
+    }
   }
   if (totalTokens < 500) return 0;
   let score = Math.min(100, Math.round(15 * Math.log(totalTokens / 1500)));
@@ -2059,38 +2081,57 @@ var setup_exports = {};
 __export(setup_exports, {
   setup: () => setup
 });
-function setup() {
+function setupToml(target, update) {
+  const existing = fs6.existsSync(target.filePath) ? fs6.readFileSync(target.filePath, "utf-8") : "";
+  if (existing.includes("[mcp_servers.driftguard]")) {
+    if (!update) {
+      console.log(`  ${target.name}: already configured (use --update to overwrite)`);
+      return;
+    }
+    const stripped = existing.replace(/\n\[mcp_servers\.driftguard\][^\[]*/s, "");
+    fs6.writeFileSync(target.filePath, stripped.trimEnd() + TOML_ENTRY(target.adapter), "utf-8");
+  } else {
+    fs6.writeFileSync(target.filePath, existing.trimEnd() + TOML_ENTRY(target.adapter), "utf-8");
+  }
+  console.log(`  ${target.name}: configured (${target.filePath})`);
+}
+function setupJson(target, update) {
+  let config2 = {};
+  if (fs6.existsSync(target.filePath)) {
+    try {
+      config2 = JSON.parse(fs6.readFileSync(target.filePath, "utf-8"));
+    } catch {
+      console.log(`  ${target.name}: skipped \u2014 could not parse ${target.filePath}`);
+      return;
+    }
+  }
+  const servers = config2.mcpServers ?? {};
+  if (servers.driftguard && !update) {
+    console.log(`  ${target.name}: already configured (use --update to overwrite)`);
+    return;
+  }
+  config2.mcpServers = { ...servers, driftguard: { command: "driftguard-mcp", env: { DRIFTCLI_ADAPTER: target.adapter } } };
+  const dir = path8.dirname(target.filePath);
+  if (!fs6.existsSync(dir)) fs6.mkdirSync(dir, { recursive: true });
+  fs6.writeFileSync(target.filePath, JSON.stringify(config2, null, 2) + "\n", "utf-8");
+  console.log(`  ${target.name}: configured (${target.filePath})`);
+}
+function setup(update = false) {
   console.log("driftguard-mcp setup\n");
   for (const target of TARGETS) {
     try {
-      const dir = path8.dirname(target.filePath);
-      let config2 = {};
-      if (fs6.existsSync(target.filePath)) {
-        try {
-          config2 = JSON.parse(fs6.readFileSync(target.filePath, "utf-8"));
-        } catch {
-          console.log(`  ${target.name}: skipped \u2014 could not parse ${target.filePath}`);
-          continue;
-        }
-      }
-      const servers = config2.mcpServers ?? {};
-      if (servers.driftguard) {
-        console.log(`  ${target.name}: already configured`);
-        continue;
+      if (target.format === "toml") {
+        setupToml(target, update);
+      } else {
+        setupJson(target, update);
       }
-      config2.mcpServers = { ...servers, driftguard: MCP_ENTRY };
-      if (!fs6.existsSync(dir)) {
-        fs6.mkdirSync(dir, { recursive: true });
-      }
-      fs6.writeFileSync(target.filePath, JSON.stringify(config2, null, 2) + "\n", "utf-8");
-      console.log(`  ${target.name}: configured (${target.filePath})`);
     } catch (err) {
       console.log(`  ${target.name}: failed \u2014 ${err instanceof Error ? err.message : err}`);
     }
   }
   console.log("\nDone. Restart your AI CLI to activate the tools.");
 }
-var fs6, path8, os6, TARGETS, MCP_ENTRY;
+var fs6, path8, os6, TARGETS, TOML_ENTRY;
 var init_setup = __esm({
   "src/setup.ts"() {
     "use strict";
@@ -2098,14 +2139,16 @@ var init_setup = __esm({
     path8 = __toESM(require("path"));
     os6 = __toESM(require("os"));
     TARGETS = [
-      { name: "Claude Code", filePath: path8.join(os6.homedir(), ".claude.json") },
-      { name: "Gemini CLI", filePath: path8.join(os6.homedir(), ".gemini", "settings.json") },
-      { name: "Codex CLI", filePath: path8.join(os6.homedir(), ".codex", "config.json") },
-      { name: "Cursor", filePath: path8.join(os6.homedir(), ".cursor", "mcp.json") }
+      { name: "Claude Code", filePath: path8.join(os6.homedir(), ".claude.json"), adapter: "claude", format: "json" },
+      { name: "Gemini CLI", filePath: path8.join(os6.homedir(), ".gemini", "settings.json"), adapter: "gemini", format: "json" },
+      { name: "Codex CLI", filePath: path8.join(os6.homedir(), ".codex", "config.toml"), adapter: "codex", format: "toml" },
+      { name: "Cursor", filePath: path8.join(os6.homedir(), ".cursor", "mcp.json"), adapter: "claude", format: "json" }
     ];
-    MCP_ENTRY = {
-      command: "driftguard-mcp"
-    };
+    TOML_ENTRY = (adapter) => `
+[mcp_servers.driftguard]
+command = "driftguard-mcp"
+env.DRIFTCLI_ADAPTER = "${adapter}"
+`;
   }
 });
 
@@ -2114,52 +2157,27 @@ var mcp_server_exports = {};
 __export(mcp_server_exports, {
   main: () => main
 });
-function buildHandoff(analysis, messages, chatMessages, emoji, level) {
-  const durationMs = analysis.sessionDuration;
-  const durationMin = durationMs > 0 ? Math.round(durationMs / 6e4) : null;
-  const durationStr = durationMin !== null ? durationMin >= 60 ? `${Math.floor(durationMin / 60)}h ${durationMin % 60}m` : `${durationMin}m` : "unknown duration";
-  const topTerms = extractTopTerms(chatMessages, 6);
-  const topicsStr = topTerms.length > 0 ? topTerms.join(", ") : "not enough content to determine";
-  const recentUserMessages = messages.filter((m) => m.role === "user").slice(-3).map((m, i) => `${i + 1}. ${m.content.slice(0, 200)}${m.content.length > 200 ? "\u2026" : ""}`).join("\n");
-  let lastCodeSnippet = "";
-  for (let i = messages.length - 1; i >= 0; i--) {
-    const match = [...messages[i].content.matchAll(/```(\w*)\n([\s\S]*?)```/g)].pop();
-    if (match) {
-      const lang = match[1] || "";
-      const code = match[2].split("\n").slice(0, 20).join("\n");
-      lastCodeSnippet = `\`\`\`${lang}
-${code}
-\`\`\``;
-      break;
-    }
-  }
-  const lines = [
-    `## Context Handoff`,
+function buildHandoff() {
+  return [
+    `Please write a \`handoff.md\` file in the current working directory with the following structure:`,
     ``,
-    `**Drift:** ${analysis.score}/100 ${emoji} ${level.toUpperCase()} | **Messages:** ${messages.length} | **Duration:** ${durationStr}`,
+    `## What we accomplished`,
+    `A clear summary of everything completed this session.`,
     ``,
-    `**Top topics:** ${topicsStr}`,
-    ``,
-    `**Recent focus (last 3 user messages):**`,
-    recentUserMessages
-  ];
-  if (lastCodeSnippet) {
-    lines.push(``, `**Last code context:**`, lastCodeSnippet);
-  }
-  lines.push(
+    `## Current state`,
+    `Where things stand right now \u2014 what's working, what's broken, what's in progress.`,
     ``,
-    `---`,
-    `*Paste the section below into your new session to restore context.*`,
+    `## Files modified`,
+    `List of files changed this session and what changed in each.`,
     ``,
-    `**Continuing from a previous session** (drift was ${analysis.score}/100, ${messages.length} messages, ${durationStr}).`,
-    `Main topics: ${topicsStr}.`,
+    `## Open questions / next steps`,
+    `Anything unresolved, pending decisions, or what should be done next.`,
     ``,
-    `Recent questions:`,
-    recentUserMessages,
+    `## Context for next session`,
+    `Key decisions, constraints, or background a fresh session needs to continue without losing context.`,
     ``,
-    `Please continue from here.`
-  );
-  return lines.join("\n");
+    `Write the file now.`
+  ].join("\n");
 }
 async function main() {
   const transport = new import_stdio.StdioServerTransport();
@@ -2176,7 +2194,6 @@ var init_mcp_server = __esm({
     init_session_resolver();
     init_drift_calculator();
     init_types();
-    init_topic_analyzer();
     init_config();
     init_storage();
     init_ui();
@@ -2270,16 +2287,12 @@ var init_mcp_server = __esm({
         ];
         if (trendLine) lines.push(``, trendLine);
         if (isDegrading) {
-          lines.push(
-            ``,
-            `---`,
-            buildHandoff(analysis, messages, chatMessages, emoji, level)
-          );
+          lines.push(``, `---`, buildHandoff());
         }
         return { content: [{ type: "text", text: lines.join("\n") }] };
       }
       if (request.params.name === "get_handoff") {
-        return { content: [{ type: "text", text: buildHandoff(analysis, messages, chatMessages, emoji, level) }] };
+        return { content: [{ type: "text", text: buildHandoff() }] };
       }
       if (request.params.name === "get_trend") {
         if (!storage) {
@@ -2306,7 +2319,7 @@ if (command === "watch") {
   run2();
 } else if (command === "setup") {
   const { setup: setup2 } = (init_setup(), __toCommonJS(setup_exports));
-  setup2();
+  setup2(process.argv.includes("--update"));
 } else {
   const { main: main2 } = (init_mcp_server(), __toCommonJS(mcp_server_exports));
   main2().catch(console.error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "driftguard-mcp",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Real-time AI conversation drift monitor — MCP server for Claude Code, Gemini CLI, Codex CLI, and Cursor",
   "main": "dist/bin.js",
   "bin": {