driftguard-mcp 0.1.7 → 0.1.9

package/README.md

@@ -1,8 +1,10 @@
 # driftguard-mcp
 
-Real-time AI conversation drift monitor — MCP server for Claude Code, Gemini CLI, Codex CLI, and Cursor.
+Real-time AI conversation drift monitor for Claude Code, Gemini CLI, Codex CLI, and Cursor.
 
-Reads your session directly, scores it across 7 factors, and exposes the result as MCP tools you can call mid-session. No browser, no API keys, no UI — just a score when you need it.
+Long AI sessions degrade — the model fills its context window, starts repeating itself, and loses track of what you originally asked for. driftguard-mcp reads your session file directly, measures the signals that actually predict this, and tells you when to start fresh.
+
+No browser. No API keys. No UI. Works as an MCP server your AI CLI can call mid-session.
 
 ---
 
@@ -16,7 +18,7 @@ driftguard-mcp setup
 `setup` automatically configures all supported AI CLIs on your machine. Restart your AI CLI(s) after running it.
 
 <details>
-<summary>Manual config (if you prefer)</summary>
+<summary>Manual config</summary>
 
 ### Claude Code — `~/.claude.json`
 
@@ -44,17 +46,12 @@ driftguard-mcp setup
 }
 ```
 
-### Codex CLI — `~/.codex/config.json`
+### Codex CLI — `~/.codex/config.toml`
 
-```json
-{
-  "mcpServers": {
-    "driftguard": {
-      "command": "driftguard-mcp",
-      "env": { "DRIFTCLI_ADAPTER": "codex" }
-    }
-  }
-}
+```toml
+[mcp_servers.driftguard]
+command = "driftguard-mcp"
+env.DRIFTCLI_ADAPTER = "codex"
 ```
 
 ### Cursor — `~/.cursor/mcp.json`
@@ -70,9 +67,7 @@ driftguard-mcp setup
 }
 ```
 
-> 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.
+> **`DRIFTCLI_ADAPTER`** tells driftguard-mcp which CLI's sessions to read. `driftguard-mcp setup` sets this automatically.
 
 </details>
 
@@ -80,62 +75,104 @@ driftguard-mcp setup
 
 ## Usage
 
-Call the tools directly from any session:
+Call these tools from any session:
 
-- **`get_drift()`** — check the current drift score
-- **`get_handoff()`** — generate a handoff prompt when drift is high
-- **`get_trend()`** — see the full score history for this session
+- **`get_drift()`** — check if the session is degrading
+- **`get_handoff()`** — write a `handoff.md` to continue in a fresh session
+- **`get_trend()`** — full score history with sparkline
 
 ---
 
-## What is drift?
+## What it looks like
 
-Long AI sessions degrade. The model starts repeating itself, losing track of the original goal, hedging more, and producing inconsistent code. driftguard-mcp measures this in real time across 7 factors:
+**Healthy session:**
 
-| Factor | What it measures |
-|--------|-----------------|
-| Context Saturation | How full the context window is getting |
-| Topic Scatter | How far the conversation has wandered from its starting topics |
-| Uncertainty Signals | Hedging language density |
-| Code Inconsistency | Conflicting patterns across code blocks |
-| Repetition | Rehashing of earlier content |
-| Goal Distance | Drift from the original user intent |
-| Confidence Drift | Declining confidence over the session |
+```
+✅  Context is healthy.
 
-Score thresholds: **fresh** 0–29 | **warming** 30–60 | **drifting** 61–80 | **polluted** 81–100
+  Context depth         ███░░░░░░░   28
+  Repetition            ██░░░░░░░░   15
 
----
+Score: 12/100 · 14 messages
+```
 
-## Tools
+**Session that needs a reset:**
 
-### `get_drift()`
+```
+⚠️  Start fresh now — context is full and responses are repeating heavily.
 
-Returns the current drift score and factor breakdown for the active session. When drift exceeds the warn threshold, a handoff prompt is included automatically so you can start fresh without a separate call.
+  Context depth         █████████░   88
+  Repetition            ████████░░   72
+  Length collapse       █████░░░░░   48
 
+Score: 84/100 · 67 messages
+
+→ Call get_handoff() to write handoff.md before starting fresh.
 ```
-Drift Score: 59 WARMING
-Messages: 42
-
-Factor breakdown:
-  contextSaturation: 72.0
-  topicScatter: 50.0
-  uncertaintySignals: 31.0
-  codeInconsistency: 12.0
-  repetition: 0.0
-  goalDistance: 44.0
-  confidenceDrift: 2.0
-
-Context is healthy.
-Trend (last 8): ▁▃▅▆▇  +12 over 8 checks ↗
+
+The score leads with a plain-English recommendation. The two bars that matter most — context depth and repetition — always appear. Others only show when they're contributing something meaningful.
+
+---
+
+## Handoff workflow
+
+When drift is high, call `get_handoff()`. The AI writes a `handoff.md` in your project root using its full session context:
+
+```markdown
+## What we accomplished
+Implemented JWT authentication with refresh token rotation. Added middleware,
+updated the user model, wrote integration tests. All tests passing.
+
+## Current state
+Auth flow is working end-to-end. Rate limiting is stubbed but not implemented.
+The `/refresh` endpoint has a known edge case with concurrent requests (see TODO in auth.ts:142).
+
+## Files modified
+- src/middleware/auth.ts — JWT verify + refresh logic
+- src/models/user.ts — added refreshToken field + index
+- src/routes/auth.ts — /login, /logout, /refresh endpoints
+- tests/integration/auth.test.ts — 14 new tests
+
+## Open questions / next steps
+- Implement rate limiting on /login (decided on: 5 attempts per 15 min)
+- Fix concurrent refresh edge case
+- Add token blacklist for logout
+
+## Context for next session
+Using jsonwebtoken@9, refresh tokens stored in DB (not Redis — decision was made
+to keep it simple for now). Access token TTL: 15min. Refresh TTL: 7 days.
 ```
 
-### `get_handoff()`
+Load `handoff.md` at the start of your next session. You continue without losing context.
+
+---
+
+## What it measures
+
+The score is driven primarily by two signals that reliably predict context degradation:
+
+| Factor | Weight | What it measures |
+|--------|--------|-----------------|
+| **Context depth** | 37% | Token volume in the session (real API counts for Claude and Gemini) |
+| **Repetition** | 37% | 3-gram overlap across recent assistant responses — the model recycling its own output |
+| Response length collapse | 15% | Assistant responses getting shorter over time |
+| Goal distance | 8% | Vocabulary drift from your stated goal (pass `goal` param to activate) |
+| Uncertainty signals | 2% | Explicit self-corrections ("I was wrong", "let me correct that") |
+| Confidence drift | 1% | Hedging language trend (early vs late responses) |
 
-Generates a structured handoff prompt. Summarises top topics, recent messages, and the last code block. Paste it into a new session in any supported AI CLI to continue without losing context.
+Context depth and repetition together are the clearest signs the model is running out of useful context. The others contribute supporting signal but don't dominate the score.
+
+---
 
-### `get_trend()`
+## `get_drift()` options
+
+Pass an optional `goal` string to anchor the goal distance measurement to a specific objective:
+
+```
+get_drift({ goal: "build a JWT authentication system" })
+```
 
-Shows the full drift history for the current session — sparkline, score sequence, peak, average, and trajectory.
+Without it, goal distance returns 0 (no anchor = no measurement).
 
 ---
 
@@ -159,35 +196,35 @@ Both are plain JSON. All fields are optional.
 
 | Preset | Best for |
 |--------|----------|
-| `coding` | Focused coding sessions — weights code consistency and repetition |
+| `coding` | Focused coding sessions |
 | `research` | Research or planning — weights topic stability and goal alignment |
 | `brainstorm` | Brainstorming — relaxed topic scatter penalty |
-| `strict` | Equal weight across all seven factors |
+| `strict` | Equal weight across all six factors |
 
 ### All options
 
 | Key | Default | Description |
 |-----|---------|-------------|
-| `preset` | — | Named weight preset (see above) |
+| `preset` | — | Named weight preset |
 | `weights` | — | Per-factor weight overrides, applied on top of preset |
-| `warnThreshold` | `60` | Score at which `get_drift()` warns and includes a handoff prompt |
-| `storage.enabled` | `true` | Persist drift snapshots for `get_trend()` and sparklines |
+| `warnThreshold` | `60` | Score threshold for warnings |
+| `storage.enabled` | `true` | Persist drift snapshots for `get_trend()` |
 | `storage.directory` | `~/.driftcli/history` | Override snapshot storage path |
-| `sessionResolution.cacheTtlMs` | `5000` | How long to cache the resolved session file (ms) |
+| `sessionResolution.cacheTtlMs` | `5000` | Session file cache TTL (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_ADAPTER` | Pin to a specific CLI: `claude`, `gemini`, or `codex`. Set automatically by `setup`. |
 | `DRIFTCLI_SESSION_ID` | Force a specific session UUID (Claude Code only). |
-| `DRIFTCLI_HOME` | Override the home directory used for session file discovery. |
+| `DRIFTCLI_HOME` | Override home directory for session file discovery. |
 
 ---
 
 ## CLI watcher
 
-For a live terminal dashboard that polls every 3 seconds, open a separate terminal and run:
+Live terminal dashboard, polls every 3 seconds:
 
 ```bash
 driftguard-mcp watch
@@ -199,7 +236,7 @@ driftguard-mcp watch
 
 | CLI | Status |
 |-----|--------|
-| Claude Code | Supported |
-| Gemini CLI | Supported |
-| Codex CLI | Supported |
-| Cursor | Supported (monitors Claude Code / Gemini / Codex sessions) |
+| Claude Code | ✅ Supported — real token counts |
+| Gemini CLI | ✅ Supported — real token counts |
+| Codex CLI | ✅ Supported — estimated token counts |
+| Cursor | ✅ Supported (monitors Claude Code / Gemini / Codex sessions) |

package/dist/bin.js

@@ -40,6 +40,9 @@ function parseTimestamp(raw) {
   }
   return Date.now();
 }
+function isNoise(text) {
+  return NOISE_PATTERNS.some((p) => p.test(text));
+}
 function parseJSONL(filePath) {
   const raw = fs.readFileSync(filePath, "utf-8");
   const lines = raw.split("\n").filter((l) => l.trim());
@@ -48,6 +51,10 @@ function parseJSONL(filePath) {
   for (const line of lines) {
     try {
       const entry = JSON.parse(line);
+      if (entry.type === "system" && entry.subtype === "compact_boundary") {
+        messages.length = 0;
+        continue;
+      }
       if (entry.type !== "user" && entry.type !== "assistant") continue;
       const content = entry.message?.content;
       let text = "";
@@ -68,12 +75,22 @@ function parseJSONL(filePath) {
         }
       }
       if (!text.trim()) continue;
+      if (isNoise(text)) continue;
+      let inputTokens;
+      if (entry.type === "assistant") {
+        const usage = entry.message?.usage;
+        if (usage) {
+          const total = (usage.input_tokens ?? 0) + (usage.cache_creation_input_tokens ?? 0) + (usage.cache_read_input_tokens ?? 0);
+          if (total > 0) inputTokens = total;
+        }
+      }
       messages.push({
         id: entry.uuid,
         role: entry.message.role,
         content: text,
         timestamp: parseTimestamp(entry.timestamp),
-        ...toolTokens > 0 ? { toolTokens } : {}
+        ...toolTokens > 0 ? { toolTokens } : {},
+        ...inputTokens !== void 0 ? { inputTokens } : {}
       });
     } catch {
       skipped++;
@@ -189,13 +206,18 @@ function findLatestSession() {
   }
   return latestFile;
 }
-var fs, path, os;
+var fs, path, os, NOISE_PATTERNS;
 var init_claude_parser = __esm({
   "src/watchers/claude-parser.ts"() {
     "use strict";
     fs = __toESM(require("fs"));
     path = __toESM(require("path"));
     os = __toESM(require("os"));
+    NOISE_PATTERNS = [
+      /^Tool loaded\.\s*$/,
+      /^MCP server connected\.\s*$/,
+      /^MCP server disconnected\.\s*$/
+    ];
   }
 });
 
@@ -529,44 +551,23 @@ var init_types = __esm({
   "src/core/types.ts"() {
     "use strict";
     DEFAULT_WEIGHTS = {
-      contextSaturation: 0.2,
-      topicScatter: 0.12,
-      uncertaintySignals: 0.15,
-      codeInconsistency: 0.08,
-      repetition: 0.2,
-      goalDistance: 0.15,
-      confidenceDrift: 0.1
+      contextSaturation: 0.37,
+      uncertaintySignals: 0.02,
+      repetition: 0.37,
+      goalDistance: 0.08,
+      confidenceDrift: 0.01,
+      responseLengthCollapse: 0.15
     };
   }
 });
 
 // src/core/topic-analyzer.ts
-function calculateTopicEntropy(messages) {
-  if (messages.length < 3) return 0;
-  const capped = messages.length > TOPIC_ENTROPY_MSG_CAP ? messages.slice(-TOPIC_ENTROPY_MSG_CAP) : messages;
-  const windows = createWindows(capped, 3);
-  if (windows.length < 2) return 0;
-  const corpus = windows.map((w) => w.join(" "));
-  const tfidfVectors = buildTfidfVectors(corpus);
-  const consecutiveSims = [];
-  for (let i = 1; i < tfidfVectors.length; i++) {
-    consecutiveSims.push(cosineSimilarity(tfidfVectors[i - 1], tfidfVectors[i]));
-  }
-  const avgConsecutive = consecutiveSims.reduce((a, b) => a + b, 0) / consecutiveSims.length;
-  const wideSims = [];
-  for (let i = 3; i < tfidfVectors.length; i += 3) {
-    wideSims.push(cosineSimilarity(tfidfVectors[i - 3], tfidfVectors[i]));
-  }
-  const avgWide = wideSims.length > 0 ? wideSims.reduce((a, b) => a + b, 0) / wideSims.length : avgConsecutive;
-  const blendedSimilarity = avgConsecutive * 0.6 + avgWide * 0.4;
-  const entropy = Math.round((1 - blendedSimilarity) * 100);
-  return Math.min(100, Math.max(0, entropy));
-}
 function calculateAnchorDrift(messages, userGoal) {
+  if (!userGoal) return 0;
   if (messages.length < 4) return 0;
   const userMessages = messages.filter((m) => m.role === "user");
   if (userMessages.length < 2) return 0;
-  const anchorDoc = userGoal ? userGoal : userMessages.slice(0, Math.min(2, userMessages.length)).map((m) => m.content).join(" ");
+  const anchorDoc = userGoal;
   const recentMessages = messages.slice(-3);
   const recentDoc = recentMessages.map((m) => m.content).join(" ");
   if (!anchorDoc.trim() || !recentDoc.trim()) return 0;
@@ -579,25 +580,12 @@ function calculateAnchorDrift(messages, userGoal) {
   return Math.max(0, isNaN(score) ? 0 : score);
 }
 function calculateGoalDriftCheckpoints(messages, userGoal) {
-  if (messages.length < 4) {
-    return {
-      checkpoints: [],
-      trajectory: "stable",
-      averageScore: 0,
-      startToEndDrift: 0
-    };
-  }
+  const empty = { checkpoints: [], trajectory: "stable", averageScore: 0, startToEndDrift: 0 };
+  if (!userGoal) return empty;
+  if (messages.length < 4) return empty;
   const userMessages = messages.filter((m) => m.role === "user");
-  if (userMessages.length < 2) {
-    return {
-      checkpoints: [],
-      trajectory: "stable",
-      averageScore: 0,
-      startToEndDrift: 0
-    };
-  }
-  const anchorTexts = userGoal ? [userGoal] : userMessages.slice(0, Math.min(2, userMessages.length));
-  const anchorDoc = Array.isArray(anchorTexts) ? anchorTexts.map((m) => typeof m === "string" ? m : m.content).join(" ") : anchorTexts;
+  if (userMessages.length < 2) return empty;
+  const anchorDoc = userGoal;
   if (!anchorDoc.trim()) {
     return {
       checkpoints: [],
@@ -733,17 +721,6 @@ function tokenize(text) {
   const withoutCode = text.replace(/```[\s\S]*?```/g, " ");
   return withoutCode.toLowerCase().replace(/[^a-z0-9\s]/g, " ").split(/\s+/).filter((w) => w.length >= 4 && !STOP_WORDS.has(w));
 }
-function createWindows(messages, windowSize) {
-  const windows = [];
-  for (let i = 0; i <= messages.length - windowSize; i++) {
-    const windowTexts = messages.slice(i, i + windowSize).map((m) => {
-      const withoutCode = m.content.replace(/```[\s\S]*?```/g, " ");
-      return withoutCode.toLowerCase().replace(/[^a-z0-9\s]/g, " ").split(/\s+/).filter((w) => w.length >= 4 && !STOP_WORDS.has(w));
-    }).flat();
-    windows.push(windowTexts);
-  }
-  return windows;
-}
 function extractNgrams(text, n = 3) {
   const tokens = tokenize(text).filter((w) => !/^\d/.test(w));
   if (tokens.length < n) return /* @__PURE__ */ new Set();
@@ -785,11 +762,10 @@ function countWordSyllables(word) {
   if (clean.endsWith("le") && clean.length > 2 && !/[aeiouy]/.test(clean[clean.length - 3])) count++;
   return Math.max(1, count);
 }
-var TOPIC_ENTROPY_MSG_CAP, STOP_WORDS;
+var STOP_WORDS;
 var init_topic_analyzer = __esm({
   "src/core/topic-analyzer.ts"() {
     "use strict";
-    TOPIC_ENTROPY_MSG_CAP = 150;
     STOP_WORDS = /* @__PURE__ */ new Set([
       "about",
       "after",
@@ -1153,14 +1129,8 @@ var init_topic_analyzer = __esm({
 // src/core/contradiction-detector.ts
 function countContradictions(assistantMessages) {
   let count = 0;
-  for (let i = 0; i < assistantMessages.length; i++) {
-    const msg = assistantMessages[i];
-    const text = msg.content.toLowerCase();
-    count += countPatternMatches(text, CORRECTION_PATTERNS);
-    if (i > 0) {
-      const prevText = assistantMessages[i - 1].content.toLowerCase();
-      count += detectReversals(prevText, text);
-    }
+  for (const msg of assistantMessages) {
+    count += countPatternMatches(msg.content.toLowerCase(), CORRECTION_PATTERNS);
   }
   return count;
 }
@@ -1172,24 +1142,7 @@ function countPatternMatches(text, patterns) {
   }
   return count;
 }
-function detectReversals(prevText, currentText) {
-  let reversals = 0;
-  const hasReversalSignal = currentText.includes("actually") || currentText.includes("however") || currentText.includes("but ") || currentText.includes("instead") || // Dutch
-  currentText.includes("eigenlijk") || currentText.includes("echter") || currentText.includes("maar ") || // German
-  currentText.includes("eigentlich") || currentText.includes("allerdings") || currentText.includes("aber ") || currentText.includes("stattdessen") || // French
-  currentText.includes("en fait") || currentText.includes("cependant") || currentText.includes("mais ") || currentText.includes("plut\xF4t") || // Spanish
-  currentText.includes("en realidad") || currentText.includes("sin embargo") || currentText.includes("pero ") || currentText.includes("en cambio") || // Portuguese
-  currentText.includes("na verdade") || currentText.includes("no entanto") || currentText.includes("mas ") || currentText.includes("em vez");
-  if (hasReversalSignal) {
-    for (const negation of NEGATION_PAIRS) {
-      if (prevText.includes(negation.positive) && currentText.includes(negation.negative)) {
-        reversals++;
-      }
-    }
-  }
-  return reversals;
-}
-var CORRECTION_PATTERNS, NEGATION_PAIRS;
+var CORRECTION_PATTERNS;
 var init_contradiction_detector = __esm({
   "src/core/contradiction-detector.ts"() {
     "use strict";
@@ -1266,43 +1219,6 @@ var init_contradiction_detector = __esm({
       /meu erro/gi,
       /eu (?:me enganei|me confundi|errei)/gi
     ];
-    NEGATION_PAIRS = [
-      // English
-      { positive: "you should", negative: "you shouldn't" },
-      { positive: "you should", negative: "you should not" },
-      { positive: "recommend", negative: "don't recommend" },
-      { positive: "recommend", negative: "do not recommend" },
-      { positive: "best practice", negative: "not.+best practice" },
-      { positive: "you can", negative: "you can't" },
-      { positive: "you can", negative: "you cannot" },
-      { positive: "safe to", negative: "not safe to" },
-      { positive: "correct", negative: "incorrect" },
-      // Dutch
-      { positive: "je moet", negative: "je moet niet" },
-      { positive: "je kunt", negative: "je kunt niet" },
-      { positive: "aanbevolen", negative: "niet aanbevolen" },
-      { positive: "veilig", negative: "niet veilig" },
-      // German
-      { positive: "du solltest", negative: "du solltest nicht" },
-      { positive: "du kannst", negative: "du kannst nicht" },
-      { positive: "empfohlen", negative: "nicht empfohlen" },
-      { positive: "sicher", negative: "nicht sicher" },
-      // French
-      { positive: "vous devriez", negative: "vous ne devriez pas" },
-      { positive: "vous pouvez", negative: "vous ne pouvez pas" },
-      { positive: "recommand\xE9", negative: "pas recommand\xE9" },
-      { positive: "correct", negative: "pas correct" },
-      // Spanish
-      { positive: "deber\xEDas", negative: "no deber\xEDas" },
-      { positive: "puedes", negative: "no puedes" },
-      { positive: "recomendado", negative: "no recomendado" },
-      { positive: "seguro", negative: "no es seguro" },
-      // Portuguese
-      { positive: "voc\xEA deveria", negative: "voc\xEA n\xE3o deveria" },
-      { positive: "voc\xEA pode", negative: "voc\xEA n\xE3o pode" },
-      { positive: "recomendado", negative: "n\xE3o recomendado" },
-      { positive: "seguro", negative: "n\xE3o \xE9 seguro" }
-    ];
   }
 });
 
@@ -1336,38 +1252,8 @@ function trackConfidenceTrend(messages) {
   const trendScore = Math.max(0, lateAvg - earlyAvg);
   return Math.round(trendScore);
 }
-function detectNegationReversals(messages) {
-  const assistantMessages = messages.filter((m) => m.role === "assistant");
-  if (assistantMessages.length < 2) return 0;
-  let reversalCount = 0;
-  for (const msg of assistantMessages) {
-    const lower = msg.content.toLowerCase();
-    for (const pattern of HEDGING_PATTERNS.negationPatterns) {
-      const regex = new RegExp(`\\b${pattern}\\b`, "gi");
-      if (regex.test(lower)) {
-        reversalCount += 1;
-        break;
-      }
-    }
-  }
-  const baseScore = reversalCount / assistantMessages.length * 50;
-  const lateReversals = assistantMessages.slice(-Math.ceil(assistantMessages.length / 3));
-  const lateReversalCount = lateReversals.filter((m) => {
-    const lower = m.content.toLowerCase();
-    return HEDGING_PATTERNS.negationPatterns.some((p) => new RegExp(`\\b${p}\\b`, "i").test(lower));
-  }).length;
-  const lateBonus = lateReversalCount / Math.max(lateReversals.length, 1) * 30;
-  return Math.min(100, Math.round(baseScore + lateBonus));
-}
 function calculateConfidenceDrift(messages) {
-  if (messages.length < 2) return 0;
-  const hedgingScore = messages.filter((m) => m.role === "assistant").reduce((sum, m) => sum + detectHedgingLanguage(m.content), 0) / Math.max(messages.filter((m) => m.role === "assistant").length, 1);
-  const trendScore = trackConfidenceTrend(messages);
-  const reversalScore = detectNegationReversals(messages);
-  const composite = Math.round(
-    hedgingScore * 0.4 + trendScore * 0.35 + reversalScore * 0.25
-  );
-  return Math.min(100, composite);
+  return Math.min(100, trackConfidenceTrend(messages));
 }
 var HEDGING_PATTERNS;
 var init_confidence_analyzer = __esm({
@@ -1378,7 +1264,6 @@ var init_confidence_analyzer = __esm({
       modalUncertainty: [
         "might",
         "may",
-        "could",
         "could be",
         "appears to be",
         "seems to be",
@@ -1388,23 +1273,14 @@ var init_confidence_analyzer = __esm({
         "arguably",
         "allegedly"
       ],
-      // Adverbs of uncertainty
+      // Adverbs of genuine uncertainty
       uncertainAdverbs: [
         "probably",
         "likely",
         "perhaps",
         "maybe",
-        "somewhat",
-        "relatively",
-        "quite",
-        "fairly",
-        "rather",
         "approximately",
-        "roughly",
-        "sort of",
-        "kind of",
-        "a bit",
-        "a little"
+        "roughly"
       ],
       // Epistemic markers (subjective speech)
       epistemicMarkers: [
@@ -1415,35 +1291,10 @@ var init_confidence_analyzer = __esm({
         "it seems",
         "it appears",
         "I would say",
-        "I'd say"
-      ],
-      // Downgraders (reduce force of statement)
-      downgraders: [
-        "just",
-        "only",
-        "merely",
-        "simply",
-        "barely",
-        "scarcely",
-        "somewhat",
-        "not quite",
-        "not entirely",
-        "not fully"
-      ],
-      // Negation reversals (contradicting prior claims)
-      negationPatterns: [
-        "actually",
-        "wait",
-        "hold on",
-        "correction",
-        "let me correct",
-        "upon reflection",
-        "on second thought",
-        "rethinking",
-        "mistake",
-        "I was wrong",
-        "I apologize",
-        "I retract"
+        "I'd say",
+        "I'm not sure",
+        "I'm not certain",
+        "I'm unsure"
       ]
     };
   }
@@ -1463,15 +1314,14 @@ function calculateDrift(messages, weights = DEFAULT_WEIGHTS, userGoal) {
   }
   const factors = {
     contextSaturation: calcMessageDecay(messages),
-    topicScatter: calculateTopicEntropy(messages),
     uncertaintySignals: calcContradictionScore(messages),
-    codeInconsistency: calcCodeInconsistency(messages),
     repetition: calcRepetition(messages),
     goalDistance: calculateAnchorDrift(messages, userGoal),
-    confidenceDrift: calculateConfidenceDrift(messages)
+    confidenceDrift: calculateConfidenceDrift(messages),
+    responseLengthCollapse: calcResponseLengthCollapse(messages)
   };
   const score = Math.min(100, Math.max(0, Math.round(
-    factors.contextSaturation * weights.contextSaturation + factors.topicScatter * weights.topicScatter + factors.uncertaintySignals * weights.uncertaintySignals + factors.codeInconsistency * weights.codeInconsistency + factors.repetition * weights.repetition + factors.goalDistance * weights.goalDistance + factors.confidenceDrift * weights.confidenceDrift
+    factors.contextSaturation * weights.contextSaturation + factors.uncertaintySignals * weights.uncertaintySignals + factors.repetition * weights.repetition + factors.goalDistance * weights.goalDistance + factors.confidenceDrift * weights.confidenceDrift + factors.responseLengthCollapse * weights.responseLengthCollapse
   )));
   const level = scoreToLevel(score);
   const sessionDuration = messages[messages.length - 1].timestamp - messages[0].timestamp;
@@ -1531,16 +1381,6 @@ function calcContradictionScore(messages) {
   const score = Math.min(100, totalContradictions / 5 * 80);
   return Math.round(score);
 }
-function calcCodeInconsistency(messages) {
-  const codeBlocks = extractCodeBlocks(messages);
-  if (codeBlocks.length < 2) return 0;
-  const languages = new Set(
-    codeBlocks.map((b) => b.language).filter((l) => l !== "unknown")
-  );
-  if (languages.size <= 1) return 0;
-  const score = Math.min(100, Math.round(15 + (languages.size - 1) * 20));
-  return score;
-}
 function calcRepetition(messages) {
   if (messages.length < 8) return 0;
   const assistantMsgs = messages.filter((m) => m.role === "assistant").slice(-25);
@@ -1630,24 +1470,21 @@ function charSimilarity(a, b) {
   const bigramScore = union === 0 ? 1 : intersection / union;
   return Math.max(positionalScore, bigramScore);
 }
-function extractCodeBlocks(messages) {
-  const blocks = [];
-  for (const msg of messages) {
-    for (const match of msg.content.matchAll(/```(\w*)\n([\s\S]*?)```/g)) {
-      const language = detectLanguage(match[1], match[2]);
-      blocks.push({ language, content: match[2] });
-    }
-  }
-  return blocks;
-}
-function detectLanguage(label, content) {
-  if (label) return label.toLowerCase();
-  if (content.includes("import React") || content.includes("useState")) return "jsx";
-  if (content.includes("def ") && content.includes(":")) return "python";
-  if (content.includes("func ") && content.includes("{")) return "go";
-  if (content.includes("fn ") && content.includes("->")) return "rust";
-  if (content.includes("function") || content.includes("const ")) return "javascript";
-  return "unknown";
+function calcResponseLengthCollapse(messages) {
+  const assistantMsgs = messages.filter((m) => m.role === "assistant" && m.content.trim().length > 10);
+  if (assistantMsgs.length < 6) return 0;
+  const quarter = Math.max(2, Math.floor(assistantMsgs.length / 4));
+  const earlyMsgs = assistantMsgs.slice(0, quarter);
+  const lateMsgs = assistantMsgs.slice(-quarter);
+  const avgWords = (msgs) => msgs.reduce((sum, m) => sum + m.content.split(/\s+/).filter((w) => w.length > 0).length, 0) / msgs.length;
+  const earlyAvg = avgWords(earlyMsgs);
+  const lateAvg = avgWords(lateMsgs);
+  if (earlyAvg === 0) return 0;
+  const ratio = lateAvg / earlyAvg;
+  if (ratio >= 0.7) return 0;
+  if (ratio >= 0.5) return Math.round((0.7 - ratio) / 0.2 * 40);
+  if (ratio >= 0.3) return Math.round(40 + (0.5 - ratio) / 0.2 * 35);
+  return Math.min(100, Math.round(75 + (0.3 - ratio) / 0.3 * 25));
 }
 function generateRecommendations(score, factors) {
   const recs = [];
@@ -1658,15 +1495,9 @@ function generateRecommendations(score, factors) {
   if (factors.contextSaturation > 50) {
     recs.push("Long conversation \u2014 consider starting fresh with a summary of key decisions.");
   }
-  if (factors.topicScatter > 50) {
-    recs.push("Multiple topics detected \u2014 try to keep one topic per conversation.");
-  }
   if (factors.uncertaintySignals > 40) {
     recs.push("AI is self-correcting frequently \u2014 context may be confused. Re-state your requirements.");
   }
-  if (factors.codeInconsistency > 30) {
-    recs.push("Multiple languages/frameworks in one chat \u2014 start a new chat for each tech stack.");
-  }
   if (factors.repetition > 30) {
     recs.push("AI is repeating itself \u2014 context is degrading. Start a new conversation.");
   }
@@ -1676,6 +1507,9 @@ function generateRecommendations(score, factors) {
   if (factors.confidenceDrift > 40) {
     recs.push("AI confidence is declining \u2014 context may be becoming unreliable. Verify assumptions.");
   }
+  if (factors.responseLengthCollapse > 40) {
+    recs.push("AI responses are getting shorter \u2014 may be losing context depth. Consider starting fresh.");
+  }
   if (score > 80) {
     recs.push("Strongly recommend starting a new conversation. Copy your key context first.");
   }
@@ -1687,12 +1521,11 @@ function emptyAnalysis(weights) {
     level: "fresh",
     factors: {
       contextSaturation: 0,
-      topicScatter: 0,
       uncertaintySignals: 0,
-      codeInconsistency: 0,
       repetition: 0,
       goalDistance: 0,
-      confidenceDrift: 0
+      confidenceDrift: 0,
+      responseLengthCollapse: 0
     },
     weights,
     messageCount: 0,
@@ -1771,45 +1604,41 @@ var init_config = __esm({
     os4 = __toESM(require("os"));
     init_types();
     WEIGHT_PRESETS = {
-      /** Equal importance across all seven factors. */
+      /** Equal importance across all six factors. */
       strict: {
-        contextSaturation: 1 / 7,
-        topicScatter: 1 / 7,
-        uncertaintySignals: 1 / 7,
-        codeInconsistency: 1 / 7,
-        repetition: 1 / 7,
-        goalDistance: 1 / 7,
-        confidenceDrift: 1 / 7
+        contextSaturation: 1 / 6,
+        uncertaintySignals: 1 / 6,
+        repetition: 1 / 6,
+        goalDistance: 1 / 6,
+        confidenceDrift: 1 / 6,
+        responseLengthCollapse: 1 / 6
       },
-      /** Emphasises code consistency and repetition — good for focused coding sessions. */
+      /** Emphasises repetition, length collapse, and context depth — good for focused coding sessions. */
       coding: {
-        contextSaturation: 0.2,
-        topicScatter: 0.08,
+        contextSaturation: 0.24,
         uncertaintySignals: 0.1,
-        codeInconsistency: 0.22,
-        repetition: 0.25,
-        goalDistance: 0.1,
-        confidenceDrift: 0.05
+        repetition: 0.29,
+        goalDistance: 0.18,
+        confidenceDrift: 0.07,
+        responseLengthCollapse: 0.12
       },
-      /** Emphasises topic stability and goal alignment — good for research or planning. */
+      /** Emphasises goal alignment — good for research or planning. */
       research: {
         contextSaturation: 0.15,
-        topicScatter: 0.2,
         uncertaintySignals: 0.15,
-        codeInconsistency: 0.05,
-        repetition: 0.15,
-        goalDistance: 0.25,
-        confidenceDrift: 0.05
+        repetition: 0.13,
+        goalDistance: 0.45,
+        confidenceDrift: 0.07,
+        responseLengthCollapse: 0.05
       },
-      /** Forgiving preset for brainstorming — topic scatter is not penalised heavily. */
+      /** Forgiving preset for brainstorming. */
       brainstorm: {
-        contextSaturation: 0.25,
-        topicScatter: 0.05,
-        uncertaintySignals: 0.15,
-        codeInconsistency: 0.05,
+        contextSaturation: 0.22,
+        uncertaintySignals: 0.13,
         repetition: 0.25,
-        goalDistance: 0.1,
-        confidenceDrift: 0.15
+        goalDistance: 0.12,
+        confidenceDrift: 0.18,
+        responseLengthCollapse: 0.1
       }
     };
     DEFAULT_CONFIG = {
@@ -2004,12 +1833,11 @@ var init_ui = __esm({
     };
     FACTOR_LABELS = {
       contextSaturation: "Context Saturation",
-      topicScatter: "Topic Scatter",
       uncertaintySignals: "Uncertainty",
-      codeInconsistency: "Code Inconsistency",
       repetition: "Repetition",
       goalDistance: "Goal Distance",
-      confidenceDrift: "Confidence Drift"
+      confidenceDrift: "Confidence Drift",
+      responseLengthCollapse: "Length Collapse"
     };
   }
 });
@@ -2157,6 +1985,55 @@ var mcp_server_exports = {};
 __export(mcp_server_exports, {
   main: () => main
 });
+function bar2(score, width = 10) {
+  const filled = Math.round(Math.min(100, Math.max(0, score)) / 100 * width);
+  return "\u2588".repeat(filled) + "\u2591".repeat(width - filled);
+}
+function buildDriftOutput(analysis, messageCount, trendLine, adapterTag) {
+  const { factors, score } = analysis;
+  const needsFreshNow = factors.contextSaturation > 70 || factors.repetition > 65;
+  const needsFreshSoon = factors.contextSaturation > 50 || factors.repetition > 45;
+  const warming = factors.contextSaturation > 35 || factors.repetition > 30;
+  let headline;
+  if (needsFreshNow) {
+    const reasons = [];
+    if (factors.contextSaturation > 70) reasons.push("context is full");
+    if (factors.repetition > 65) reasons.push("responses are repeating heavily");
+    headline = `\u26A0\uFE0F  Start fresh now \u2014 ${reasons.join(" and ")}.`;
+  } else if (needsFreshSoon) {
+    const reasons = [];
+    if (factors.contextSaturation > 50) reasons.push("context is getting deep");
+    if (factors.repetition > 45) reasons.push("some repetition detected");
+    headline = `\u{1F7E1}  Start fresh soon \u2014 ${reasons.join(" and ")}.`;
+  } else if (warming) {
+    headline = `\u{1F7E1}  Context is warming up \u2014 no action needed yet.`;
+  } else {
+    headline = `\u2705  Context is healthy.`;
+  }
+  const rows = [];
+  const row = (label, val) => {
+    rows.push(`  ${label.padEnd(20)} ${bar2(val)}  ${String(Math.round(val)).padStart(3)}`);
+  };
+  row("Context depth", factors.contextSaturation);
+  row("Repetition", factors.repetition);
+  if (factors.responseLengthCollapse > 5) row("Length collapse", factors.responseLengthCollapse);
+  if (factors.goalDistance > 20) row("Goal distance", factors.goalDistance);
+  if (factors.uncertaintySignals > 10) row("Uncertainty", factors.uncertaintySignals);
+  if (factors.confidenceDrift > 10) row("Confidence drift", factors.confidenceDrift);
+  const lines = [
+    headline,
+    "",
+    ...rows,
+    "",
+    `Score: ${score}/100 \xB7 ${messageCount} messages${adapterTag}`
+  ];
+  if (trendLine) lines.push(trendLine);
+  const shouldHandoff = factors.contextSaturation > 60 || factors.repetition > 50;
+  if (shouldHandoff) {
+    lines.push("", "\u2192 Call get_handoff() to write handoff.md before starting fresh.");
+  }
+  return lines.join("\n");
+}
 function buildHandoff() {
   return [
     `Please write a \`handoff.md\` file in the current working directory with the following structure:`,
@@ -2183,7 +2060,7 @@ async function main() {
   const transport = new import_stdio.StdioServerTransport();
   await server.connect(transport);
 }
-var path9, import_server, import_stdio, import_types3, config, resolver, storage, server, LEVEL_EMOJI2;
+var path9, import_server, import_stdio, import_types3, config, resolver, storage, server;
 var init_mcp_server = __esm({
   "src/mcp-server.ts"() {
     "use strict";
@@ -2193,7 +2070,6 @@ var init_mcp_server = __esm({
     import_types3 = require("@modelcontextprotocol/sdk/types.js");
     init_session_resolver();
     init_drift_calculator();
-    init_types();
     init_config();
     init_storage();
     init_ui();
@@ -2208,8 +2084,16 @@ var init_mcp_server = __esm({
       tools: [
         {
           name: "get_drift",
-          description: "Returns the current drift score and factor breakdown for the active Claude Code session. Call this to check if the conversation context is degrading.",
-          inputSchema: { type: "object", properties: {} }
+          description: 'Returns the current drift score and factor breakdown for the active Claude Code session. Call this to check if the conversation context is degrading. Optionally pass a "goal" string to anchor goalDistance scoring to a specific objective.',
+          inputSchema: {
+            type: "object",
+            properties: {
+              goal: {
+                type: "string",
+                description: "Optional: the user's original goal or task for this session. Improves goalDistance accuracy."
+              }
+            }
+          }
         },
         {
           name: "get_handoff",
@@ -2223,12 +2107,6 @@ var init_mcp_server = __esm({
         }
       ]
     }));
-    LEVEL_EMOJI2 = {
-      fresh: "\u{1F7E2}",
-      warming: "\u{1F7E1}",
-      drifting: "\u{1F534}",
-      polluted: "\u26AB"
-    };
     server.setRequestHandler(import_types3.CallToolRequestSchema, async (request) => {
       let sessionFile;
       try {
@@ -2256,9 +2134,8 @@ var init_mcp_server = __esm({
         chatId: "cli",
         ...m.toolTokens !== void 0 ? { toolTokens: m.toolTokens } : {}
       }));
-      const analysis = calculateDrift(chatMessages, config.weights);
-      const level = scoreToLevel(analysis.score);
-      const emoji = LEVEL_EMOJI2[level] ?? "\u2753";
+      const goal = typeof request.params.arguments?.goal === "string" ? request.params.arguments.goal : void 0;
+      const analysis = calculateDrift(chatMessages, config.weights, goal);
       const adapterTag = adapter.name !== "claude" ? ` (${adapter.name})` : "";
       if (request.params.name === "get_drift") {
         let trendLine = "";
@@ -2274,22 +2151,7 @@ var init_mcp_server = __esm({
             trendLine = `Trend (last ${scores.length}): ${sparkline(scores)}  ${sign}${delta} over ${scores.length} checks ${arrow}`;
           }
         }
-        const factors = Object.entries(analysis.factors).map(([k, v]) => `  ${k}: ${v.toFixed(1)}`).join("\n");
-        const isDegrading = analysis.score > config.warnThreshold;
-        const lines = [
-          `Drift Score: ${analysis.score} ${emoji} ${level.toUpperCase()}${adapterTag}`,
-          `Messages: ${messages.length}`,
-          ``,
-          `Factor breakdown:`,
-          factors,
-          ``,
-          isDegrading ? `\u26A0\uFE0F Context is degrading.` : `Context is healthy.`
-        ];
-        if (trendLine) lines.push(``, trendLine);
-        if (isDegrading) {
-          lines.push(``, `---`, buildHandoff());
-        }
-        return { content: [{ type: "text", text: lines.join("\n") }] };
+        return { content: [{ type: "text", text: buildDriftOutput(analysis, messages.length, trendLine, adapterTag) }] };
       }
       if (request.params.name === "get_handoff") {
         return { content: [{ type: "text", text: buildHandoff() }] };

package/package.json

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