chat-recall 0.7.12 → 0.7.14

package/dist/cli.js

@@ -7118,7 +7118,7 @@ function markersFromTurns(sessionId, turns) {
   const prompts = turns.filter((t) => t.kind === "user" && t.text).map((t) => ({ line: t.line, ts: t.ts, tsIso: t.tsIso, ...markPrompt(t.text) }));
   return { v: MARKERS_VERSION, sessionId, prompts, summary: summarizeMarkers(prompts) };
 }
-var PROFANITY, PROFANITY_LOOSE, APPROVAL_HEAD, NEG_HEAD, QUESTION_HEAD, DIRECTIVE_HEAD, CLARIFY_PHRASES, FRUSTRATED_PHRASES, MARKERS_VERSION;
+var PROFANITY, PROFANITY_LOOSE, APPROVAL_HEAD, NEG_HEAD, QUESTION_HEAD, DIRECTIVE_HEAD, CLARIFY_PHRASES, FRUSTRATED_PHRASES, MARKERS_VERSION, MARKERS_TURN_OPTS;
 var init_session_sentiment = __esm({
   "../engine/dist/core/session-sentiment.js"() {
     "use strict";
@@ -7132,6 +7132,7 @@ var init_session_sentiment = __esm({
     CLARIFY_PHRASES = /\b(?:wdym|what do you mean|explain|clarify|what is|what's|huh\??|i don'?t understand)\b/i;
     FRUSTRATED_PHRASES = /\b(?:why (?:the )?(?:fuck|hell)|wtf|are you (?:kidding|serious)|stop slacking|stop making|why did you|why didn'?t you|i (?:fucking )?(?:asked|told you)|are you (?:listening|even)|come\s*on|just\s+do)\b/i;
     MARKERS_VERSION = 3;
+    MARKERS_TURN_OPTS = { maxTurns: 5e4, userMax: Number.POSITIVE_INFINITY };
   }
 });
 
@@ -7307,7 +7308,7 @@ function extractTurnsAny(sessionId, opts = {}) {
   const backend = getBackendForId(sessionId);
   if (!backend)
     return { sessionId, found: false, turns: [], startMs: 0, endMs: 0 };
-  return memoInSessionScope(`turns:${sessionId}:${opts.maxTurns ?? ""}:${opts.assistantMax ?? ""}`, () => backend.extractTurns(sessionId, opts));
+  return memoInSessionScope(`turns:${sessionId}:${opts.maxTurns ?? ""}:${opts.assistantMax ?? ""}:${opts.userMax ?? ""}`, () => backend.extractTurns(sessionId, opts));
 }
 function replaySessionAny(sessionId) {
   const backend = getBackendForId(sessionId);
@@ -7519,6 +7520,7 @@ function shorten(text, max) {
 function extractTurnsFromEvents(sessionId, events, opts = {}) {
   const maxTurns = opts.maxTurns ?? DEFAULT_MAX_TURNS;
   const assistantMax = opts.assistantMax ?? DEFAULT_ASSISTANT_MAX;
+  const userMax = opts.userMax ?? DEFAULT_USER_MAX;
   const turns = [];
   let startMs = 0, endMs = 0;
   let found = false;
@@ -7536,7 +7538,7 @@ function extractTurnsFromEvents(sessionId, events, opts = {}) {
         ts: e.ts,
         tsIso: e.tsIso,
         line: e.line,
-        text: shorten(e.text, DEFAULT_USER_MAX)
+        text: shorten(e.text, userMax)
       });
     } else if (e.kind === "assistant_text" && e.text) {
       turns.push({
@@ -10954,12 +10956,14 @@ function lineKey(line) {
   try {
     const o = JSON.parse(line);
     if (typeof o?.uuid === "string" && o.uuid)
-      return { key: `u:${o.uuid}`, singleton: false };
-    if (typeof o?.type === "string" && SINGLETON_META.has(o.type))
-      return { key: `m:${o.type}`, singleton: true };
+      return { key: `u:${o.uuid}`, meta: false, json: true };
+    return { key: `h:${sha1(line)}`, meta: typeof o?.type === "string" && STATE_META.has(o.type), json: true };
   } catch {
   }
-  return { key: `h:${sha1(line)}`, singleton: false };
+  return { key: `h:${sha1(line)}`, meta: false, json: false };
+}
+function isHalfWritten(line, currentLines) {
+  return currentLines.some((c) => c.length > line.length && c.startsWith(line));
 }
 function mergeLineText(shadowText, currentText) {
   const shadowLines = shadowText.split("\n").filter((l) => l.trim());
@@ -10967,27 +10971,24 @@ function mergeLineText(shadowText, currentText) {
   const currentKeys = /* @__PURE__ */ new Set();
   for (const l of currentLines)
     currentKeys.add(lineKey(l).key);
-  const shadowKeys = /* @__PURE__ */ new Set();
-  for (const l of shadowLines)
-    shadowKeys.add(lineKey(l).key);
-  let recovered = 0;
-  for (const k of shadowKeys)
-    if (!currentKeys.has(k))
-      recovered++;
-  if (recovered === 0) {
-    return { text: currentText.endsWith("\n") ? currentText : currentText + "\n", recovered: 0, totalRecords: currentKeys.size };
-  }
-  const out = [];
-  const emitted = /* @__PURE__ */ new Set();
+  const kept = [];
+  const keptKeys = /* @__PURE__ */ new Set();
+  const counted = /* @__PURE__ */ new Set();
   for (const l of shadowLines) {
-    const { key: key2, singleton } = lineKey(l);
-    if (singleton && currentKeys.has(key2))
-      continue;
-    if (emitted.has(key2))
+    const { key: key2, meta, json } = lineKey(l);
+    if (!json && isHalfWritten(l, currentLines))
       continue;
-    out.push(l);
-    emitted.add(key2);
+    kept.push(l);
+    keptKeys.add(key2);
+    if (!meta && !currentKeys.has(key2))
+      counted.add(key2);
   }
+  const recovered = counted.size;
+  if (recovered === 0) {
+    return { text: currentText.endsWith("\n") ? currentText : currentText + "\n", recovered: 0, totalRecords: currentKeys.size };
+  }
+  const out = [...kept];
+  const emitted = keptKeys;
   for (const l of currentLines) {
     const { key: key2 } = lineKey(l);
     if (emitted.has(key2))
@@ -11172,14 +11173,14 @@ function shadowSizeOnDisk(tool, rawId) {
     return 0;
   }
 }
-var WHOLE_FILE_TOOLS, SINGLETON_META, lastLiveFingerprint;
+var WHOLE_FILE_TOOLS, STATE_META, lastLiveFingerprint;
 var init_shadow = __esm({
   "../engine/dist/transcript/shadow.js"() {
     "use strict";
     init_paths();
     init_raw();
     WHOLE_FILE_TOOLS = /* @__PURE__ */ new Set(["cursor"]);
-    SINGLETON_META = /* @__PURE__ */ new Set(["mode", "permission-mode", "ai-title", "last-prompt", "pr-link", "summary"]);
+    STATE_META = /* @__PURE__ */ new Set(["mode", "permission-mode", "ai-title", "last-prompt", "pr-link", "summary"]);
     lastLiveFingerprint = /* @__PURE__ */ new Map();
   }
 });
@@ -18936,7 +18937,7 @@ var init_http = __esm({
       CLI_VERSION = JSON.parse(readFileSync31(new URL("../package.json", import.meta.url), "utf-8")).version || CLI_VERSION;
     } catch {
       try {
-        if (true) CLI_VERSION = "0.7.12";
+        if (true) CLI_VERSION = "0.7.14";
       } catch {
       }
     }
@@ -18980,7 +18981,7 @@ function collectDerivedRows(ref, mtime, count, maxRowBytes) {
           if (!fullOutcome) fullOutcome = computeOutcome(id);
           if (fullOutcome.found) data = fullOutcome.commits;
         } else if (kind === "markers") {
-          const turns = extractTurnsAny(id, { maxTurns: 5e4 });
+          const turns = extractTurnsAny(id, MARKERS_TURN_OPTS);
           data = markersFromTurns(id, turns.turns);
         }
       } catch {
@@ -19434,7 +19435,7 @@ var init_telemetry = __esm({
     init_sync_client();
     cliVersion2 = () => {
       try {
-        return true ? "0.7.12" : "dev";
+        return true ? "0.7.14" : "dev";
       } catch {
         return "dev";
       }
@@ -21815,7 +21816,7 @@ var init_sync_client = __esm({
       ownVersion = JSON.parse(readFileSync35(join42(dir, "../package.json"), "utf-8")).version || ownVersion;
     } catch {
       try {
-        if (true) ownVersion = "0.7.12";
+        if (true) ownVersion = "0.7.14";
       } catch {
       }
     }
@@ -25977,7 +25978,7 @@ var init_intent_drain = __esm({
       ownVersion2 = JSON.parse(readFileSync45(join56(dir, "../package.json"), "utf-8")).version || ownVersion2;
     } catch {
       try {
-        if (true) ownVersion2 = "0.7.12";
+        if (true) ownVersion2 = "0.7.14";
       } catch {
       }
     }
@@ -28044,17 +28045,21 @@ function safeSlice(s, start, end) {
   const hi = end < s.length && /[\uD800-\uDBFF]/.test(s[end - 1] ?? "") ? end + 1 : end;
   return s.slice(lo, hi);
 }
-function body(text, line, opts) {
-  if (opts.full || text.length <= BODY_LIMIT)
-    return indent(text);
+function headTail(text, how) {
+  if (text.length <= BODY_LIMIT)
+    return [text];
   const lines = text.split("\n").length;
   const cut = text.length - 2 * EDGE;
-  const how = opts.expandHint ? ` ${opts.expandHint(line)}` : "";
   return [
-    indent(safeSlice(text, 0, EDGE)),
-    `${INDENT}\u2026 ${cut} characters cut (${text.length} in all, ${lines} lines).${how} \u2026`,
-    indent(safeSlice(text, text.length - EDGE, text.length))
-  ].join("\n");
+    safeSlice(text, 0, EDGE),
+    `\u2026 ${cut} characters cut (${text.length} in all, ${lines} lines).${how ? ` ${how}` : ""} \u2026`,
+    safeSlice(text, text.length - EDGE, text.length)
+  ];
+}
+function body(text, line, opts) {
+  if (opts.full)
+    return indent(text);
+  return headTail(text, opts.expandHint?.(line)).map(indent).join("\n");
 }
 function resultText(result) {
   if (typeof result === "string")

package/dist/derived.js

@@ -22,7 +22,7 @@
 import { withSessionReadCache } from '@chat-recall/engine/core/live-session-scan.js';
 import { replaySessionAny, extractTurnsAny } from '@chat-recall/engine/core/session-multi-tool.js';
 import { computeOutcome } from '@chat-recall/engine/core/session-outcome.js';
-import { markersFromTurns } from '@chat-recall/engine/core/session-sentiment.js';
+import { markersFromTurns, MARKERS_TURN_OPTS } from '@chat-recall/engine/core/session-sentiment.js';
 import { redactDeep } from './redact-deep.js';
 /** Which compute rows a session ships. */
 export const COMPUTE_KINDS = ['diff', 'outcome', 'commits', 'markers'];
@@ -57,7 +57,7 @@ export function collectDerivedRows(ref, mtime, count, maxRowBytes) {
                 else if (kind === 'markers') {
                     // Analysis-only use of the turns extractor (R4) — markers need
                     // per-prompt line/ts, not render fidelity.
-                    const turns = extractTurnsAny(id, { maxTurns: 50_000 });
+                    const turns = extractTurnsAny(id, MARKERS_TURN_OPTS);
                     data = markersFromTurns(id, turns.turns);
                 }
             }

package/dist/derived.js.map

@@ -1 +1 @@
-{"version":3,"file":"derived.js","sourceRoot":"","sources":["../src/derived.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"derived.js","sourceRoot":"","sources":["../src/derived.ts"],"names":[],"mappings":"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"}

package/dist/mcp-relay.js

@@ -192,7 +192,7 @@ function bridge(input, output, sock, exit, opts = {}) {
 }
 
 // src/mcp-relay.ts
-var VERSION = true ? "0.7.12" : "0.0.0";
+var VERSION = true ? "0.7.14" : "0.0.0";
 var SERVER_URL = new URL("./mcp.js", import.meta.url);
 var SERVER_PATH = fileURLToPath(SERVER_URL);
 var START_TIMEOUT_MS = 15e3;

package/dist/mcp.js

@@ -6035,7 +6035,7 @@ function markersFromTurns(sessionId, turns) {
   const prompts = turns.filter((t) => t.kind === "user" && t.text).map((t) => ({ line: t.line, ts: t.ts, tsIso: t.tsIso, ...markPrompt(t.text) }));
   return { v: MARKERS_VERSION, sessionId, prompts, summary: summarizeMarkers(prompts) };
 }
-var PROFANITY, PROFANITY_LOOSE, APPROVAL_HEAD, NEG_HEAD, QUESTION_HEAD, DIRECTIVE_HEAD, CLARIFY_PHRASES, FRUSTRATED_PHRASES, MARKERS_VERSION;
+var PROFANITY, PROFANITY_LOOSE, APPROVAL_HEAD, NEG_HEAD, QUESTION_HEAD, DIRECTIVE_HEAD, CLARIFY_PHRASES, FRUSTRATED_PHRASES, MARKERS_VERSION, MARKERS_TURN_OPTS;
 var init_session_sentiment = __esm({
   "../engine/dist/core/session-sentiment.js"() {
     "use strict";
@@ -6049,6 +6049,7 @@ var init_session_sentiment = __esm({
     CLARIFY_PHRASES = /\b(?:wdym|what do you mean|explain|clarify|what is|what's|huh\??|i don'?t understand)\b/i;
     FRUSTRATED_PHRASES = /\b(?:why (?:the )?(?:fuck|hell)|wtf|are you (?:kidding|serious)|stop slacking|stop making|why did you|why didn'?t you|i (?:fucking )?(?:asked|told you)|are you (?:listening|even)|come\s*on|just\s+do)\b/i;
     MARKERS_VERSION = 3;
+    MARKERS_TURN_OPTS = { maxTurns: 5e4, userMax: Number.POSITIVE_INFINITY };
   }
 });
 
@@ -6274,6 +6275,7 @@ function shorten(text, max) {
 function extractTurnsFromEvents(sessionId, events, opts = {}) {
   const maxTurns = opts.maxTurns ?? DEFAULT_MAX_TURNS;
   const assistantMax = opts.assistantMax ?? DEFAULT_ASSISTANT_MAX;
+  const userMax = opts.userMax ?? DEFAULT_USER_MAX;
   const turns = [];
   let startMs = 0, endMs = 0;
   let found = false;
@@ -6291,7 +6293,7 @@ function extractTurnsFromEvents(sessionId, events, opts = {}) {
         ts: e.ts,
         tsIso: e.tsIso,
         line: e.line,
-        text: shorten(e.text, DEFAULT_USER_MAX)
+        text: shorten(e.text, userMax)
       });
     } else if (e.kind === "assistant_text" && e.text) {
       turns.push({
@@ -9655,7 +9657,7 @@ function extractTurnsAny(sessionId, opts = {}) {
   const backend = getBackendForId(sessionId);
   if (!backend)
     return { sessionId, found: false, turns: [], startMs: 0, endMs: 0 };
-  return memoInSessionScope(`turns:${sessionId}:${opts.maxTurns ?? ""}:${opts.assistantMax ?? ""}`, () => backend.extractTurns(sessionId, opts));
+  return memoInSessionScope(`turns:${sessionId}:${opts.maxTurns ?? ""}:${opts.assistantMax ?? ""}:${opts.userMax ?? ""}`, () => backend.extractTurns(sessionId, opts));
 }
 function replaySessionAny(sessionId) {
   const backend = getBackendForId(sessionId);
@@ -12020,12 +12022,14 @@ function lineKey(line) {
   try {
     const o = JSON.parse(line);
     if (typeof o?.uuid === "string" && o.uuid)
-      return { key: `u:${o.uuid}`, singleton: false };
-    if (typeof o?.type === "string" && SINGLETON_META.has(o.type))
-      return { key: `m:${o.type}`, singleton: true };
+      return { key: `u:${o.uuid}`, meta: false, json: true };
+    return { key: `h:${sha1(line)}`, meta: typeof o?.type === "string" && STATE_META.has(o.type), json: true };
   } catch {
   }
-  return { key: `h:${sha1(line)}`, singleton: false };
+  return { key: `h:${sha1(line)}`, meta: false, json: false };
+}
+function isHalfWritten(line, currentLines) {
+  return currentLines.some((c) => c.length > line.length && c.startsWith(line));
 }
 function mergeLineText(shadowText, currentText) {
   const shadowLines = shadowText.split("\n").filter((l) => l.trim());
@@ -12033,27 +12037,24 @@ function mergeLineText(shadowText, currentText) {
   const currentKeys = /* @__PURE__ */ new Set();
   for (const l of currentLines)
     currentKeys.add(lineKey(l).key);
-  const shadowKeys = /* @__PURE__ */ new Set();
-  for (const l of shadowLines)
-    shadowKeys.add(lineKey(l).key);
-  let recovered = 0;
-  for (const k of shadowKeys)
-    if (!currentKeys.has(k))
-      recovered++;
-  if (recovered === 0) {
-    return { text: currentText.endsWith("\n") ? currentText : currentText + "\n", recovered: 0, totalRecords: currentKeys.size };
-  }
-  const out = [];
-  const emitted = /* @__PURE__ */ new Set();
+  const kept = [];
+  const keptKeys = /* @__PURE__ */ new Set();
+  const counted = /* @__PURE__ */ new Set();
   for (const l of shadowLines) {
-    const { key: key2, singleton } = lineKey(l);
-    if (singleton && currentKeys.has(key2))
-      continue;
-    if (emitted.has(key2))
+    const { key: key2, meta, json } = lineKey(l);
+    if (!json && isHalfWritten(l, currentLines))
       continue;
-    out.push(l);
-    emitted.add(key2);
+    kept.push(l);
+    keptKeys.add(key2);
+    if (!meta && !currentKeys.has(key2))
+      counted.add(key2);
+  }
+  const recovered = counted.size;
+  if (recovered === 0) {
+    return { text: currentText.endsWith("\n") ? currentText : currentText + "\n", recovered: 0, totalRecords: currentKeys.size };
   }
+  const out = [...kept];
+  const emitted = keptKeys;
   for (const l of currentLines) {
     const { key: key2 } = lineKey(l);
     if (emitted.has(key2))
@@ -12183,14 +12184,14 @@ function shadowUncompressedBytes(tool, rawId) {
     }
   }
 }
-var WHOLE_FILE_TOOLS, SINGLETON_META;
+var WHOLE_FILE_TOOLS, STATE_META;
 var init_shadow = __esm({
   "../engine/dist/transcript/shadow.js"() {
     "use strict";
     init_paths();
     init_raw();
     WHOLE_FILE_TOOLS = /* @__PURE__ */ new Set(["cursor"]);
-    SINGLETON_META = /* @__PURE__ */ new Set(["mode", "permission-mode", "ai-title", "last-prompt", "pr-link", "summary"]);
+    STATE_META = /* @__PURE__ */ new Set(["mode", "permission-mode", "ai-title", "last-prompt", "pr-link", "summary"]);
   }
 });
 
@@ -12938,9 +12939,9 @@ function judgeHealth(h, now = Date.now()) {
       return (a.t.lastOkAt ?? 0) - (b.t.lastOkAt ?? 0);
     });
     const worst = ranked[0];
-    const when = worst.t.lastOkAt ? `${ago(now - worst.t.lastOkAt)} ago` : "never";
+    const when2 = worst.t.lastOkAt ? `${ago(now - worst.t.lastOkAt)} ago` : "never";
     const why = worst.t.lastError ? ` (${worst.t.lastError})` : "";
-    reasons.push(`nothing has synced since ${when}${why}`);
+    reasons.push(`nothing has synced since ${when2}${why}`);
   }
   if (reasons.length === 0)
     return { ok: true, summary: null, reasons: [] };
@@ -19844,7 +19845,7 @@ var init_http = __esm({
       CLI_VERSION = JSON.parse(readFileSync36(new URL("../package.json", import.meta.url), "utf-8")).version || CLI_VERSION;
     } catch {
       try {
-        if (true) CLI_VERSION = "0.7.12";
+        if (true) CLI_VERSION = "0.7.14";
       } catch {
       }
     }
@@ -19888,7 +19889,7 @@ function collectDerivedRows(ref, mtime, count, maxRowBytes) {
           if (!fullOutcome) fullOutcome = computeOutcome(id);
           if (fullOutcome.found) data = fullOutcome.commits;
         } else if (kind === "markers") {
-          const turns = extractTurnsAny(id, { maxTurns: 5e4 });
+          const turns = extractTurnsAny(id, MARKERS_TURN_OPTS);
           data = markersFromTurns(id, turns.turns);
         }
       } catch {
@@ -20342,7 +20343,7 @@ var init_telemetry = __esm({
     init_sync_client();
     cliVersion2 = () => {
       try {
-        return true ? "0.7.12" : "dev";
+        return true ? "0.7.14" : "dev";
       } catch {
         return "dev";
       }
@@ -22505,7 +22506,7 @@ var init_sync_client = __esm({
       ownVersion = JSON.parse(readFileSync38(join49(dir, "../package.json"), "utf-8")).version || ownVersion;
     } catch {
       try {
-        if (true) ownVersion = "0.7.12";
+        if (true) ownVersion = "0.7.14";
       } catch {
       }
     }
@@ -23982,8 +23983,8 @@ function formatDigest(input, summaryChars = 400) {
   const { row, outcome, related, resumeCmd } = input;
   const lines = [];
   lines.push(`### ${digestTitle(row)}`);
-  const when = (row.modified || "").slice(0, 16).replace("T", " ");
-  lines.push(`**Project:** ${projectName(row.projectPath) || "(unknown)"} \xB7 **Tool:** ${row.tool || "claude"}` + (when ? ` \xB7 **Modified:** ${when}` : "") + ` \xB7 \`${row.sessionId}\``);
+  const when2 = (row.modified || "").slice(0, 16).replace("T", " ");
+  lines.push(`**Project:** ${projectName(row.projectPath) || "(unknown)"} \xB7 **Tool:** ${row.tool || "claude"}` + (when2 ? ` \xB7 **Modified:** ${when2}` : "") + ` \xB7 \`${row.sessionId}\``);
   if (outcome) {
     const edits = outcome.fileCount > 0 ? ` \xB7 ${outcome.fileCount} file(s) +${outcome.totalLinesAdded}/\u2212${outcome.totalLinesRemoved}` : "";
     const commits = outcome.commits && outcome.commits.totalCommits > 0 ? ` \xB7 ${outcome.commits.totalCommits} commit(s)` : "";
@@ -24043,17 +24044,21 @@ function safeSlice(s, start, end) {
   const hi = end < s.length && /[\uD800-\uDBFF]/.test(s[end - 1] ?? "") ? end + 1 : end;
   return s.slice(lo, hi);
 }
-function body(text, line, opts) {
-  if (opts.full || text.length <= BODY_LIMIT)
-    return indent(text);
+function headTail(text, how) {
+  if (text.length <= BODY_LIMIT)
+    return [text];
   const lines = text.split("\n").length;
   const cut = text.length - 2 * EDGE;
-  const how = opts.expandHint ? ` ${opts.expandHint(line)}` : "";
   return [
-    indent(safeSlice(text, 0, EDGE)),
-    `${INDENT}\u2026 ${cut} characters cut (${text.length} in all, ${lines} lines).${how} \u2026`,
-    indent(safeSlice(text, text.length - EDGE, text.length))
-  ].join("\n");
+    safeSlice(text, 0, EDGE),
+    `\u2026 ${cut} characters cut (${text.length} in all, ${lines} lines).${how ? ` ${how}` : ""} \u2026`,
+    safeSlice(text, text.length - EDGE, text.length)
+  ];
+}
+function body(text, line, opts) {
+  if (opts.full)
+    return indent(text);
+  return headTail(text, opts.expandHint?.(line)).map(indent).join("\n");
 }
 function resultText(result) {
   if (typeof result === "string")
@@ -24175,6 +24180,59 @@ function findShowMessages(messages, query) {
   return messages.filter((m) => searchableText(m).toLowerCase().includes(needle));
 }
 
+// ../engine/dist/mcp/prompts-render.js
+var fold = (s) => s.toLowerCase().replace(/\s+/g, " ");
+function when(p, sessionMs) {
+  if (p.ts && p.ts > 0)
+    return p.ts;
+  const parsed = p.tsIso ? Date.parse(p.tsIso) : NaN;
+  return Number.isFinite(parsed) ? parsed : sessionMs;
+}
+function newestFirst(a, b) {
+  if (b.at !== a.at)
+    return b.at - a.at;
+  if (a.row.sessionId === b.row.sessionId)
+    return b.row.line - a.row.line;
+  return 0;
+}
+function matching(rows, query) {
+  const q = query ? fold(query.trim()) : "";
+  return rows.filter((p) => p.text && p.text.trim() && (!q || fold(p.text).includes(q)));
+}
+function selectPrompts(rows, opts) {
+  return matching(rows, opts.query).map((row) => ({ row, at: when(row, 0) })).sort(newestFirst).slice(0, Math.max(0, opts.limit)).map((x) => x.row);
+}
+async function collectAcrossSessions(feed, fetchPrompts, opts) {
+  const limit = Math.max(0, opts.limit);
+  let kept = [];
+  for (const s of feed) {
+    if (kept.length >= limit && s.modifiedMs < kept[kept.length - 1].at)
+      break;
+    const rows = await fetchPrompts(s.sessionId);
+    if (!rows)
+      continue;
+    for (const row of matching(rows, opts.query))
+      kept.push({ row, at: when(row, s.modifiedMs) });
+    kept = kept.sort(newestFirst).slice(0, limit);
+  }
+  return kept.map((x) => x.row);
+}
+function renderPrompts(rows, opts) {
+  const what = opts.query ? `, containing "${opts.query.trim()}"` : "";
+  const lines = [`# User prompts (${rows.length}${what}, newest first)
+`];
+  for (const p of rows) {
+    const t = p.tsIso?.slice(0, 16).replace("T", " ") || "";
+    const markerSuffix = opts.withMarkers && p.markers.length ? ` _[${p.markers.join(", ")}]_` : "";
+    lines.push(`- **${p.sessionId}** L${p.line}${t ? ` \xB7 ${t}` : ""}${markerSuffix}`);
+    const how = `Call recall_show with session_id "${p.sessionId}" and expand_line ${p.line} for the whole text.`;
+    for (const part of headTail(p.text, how)) {
+      lines.push(part.split("\n").map((l) => `  ${l}`).join("\n"));
+    }
+  }
+  return lines.join("\n");
+}
+
 // ../engine/dist/mcp/show-freshness.js
 init_tool_backend();
 init_transcript();
@@ -24411,14 +24469,14 @@ function trialEndingBanner(state2, serverBase) {
   const days = state2.trialDaysLeft;
   if (typeof days !== "number" || days > TRIAL_WARN_DAYS)
     return null;
-  const when = days <= 0 ? "today" : days === 1 ? "tomorrow" : `in ${days} days`;
+  const when2 = days <= 0 ? "today" : days === 1 ? "tomorrow" : `in ${days} days`;
   const account = `${serverBase.replace(/\/+$/, "")}/app?view=account`;
   return [
     // No trial LENGTH here. It is FREE_TRIAL_DAYS on the server, so a "7-day
     // trial" written into the CLI is a number that drifts the first time that is
     // tuned — and this file already carries two sentences that went stale that
     // exact way. Days REMAINING comes from the server and is always right.
-    `\u23F3 TRIAL ENDS ${when.toUpperCase()} \u2014 this chat-recall account is on the free trial.`,
+    `\u23F3 TRIAL ENDS ${when2.toUpperCase()} \u2014 this chat-recall account is on the free trial.`,
     "When it ends, recall switches off: searches and session reads stop, and new sessions stop syncing.",
     "Nothing is deleted \u2014 the history is kept and export keeps working.",
     `Tell the user now, and give them this link to subscribe or see the account: ${account}`
@@ -25200,7 +25258,8 @@ var RecallImprovementsSchema = z.object({
 var RecallUserPromptsSchema = z.object({
   session_id: z.string().optional().describe("If set, only that session's prompts"),
   since_days: z.number().optional().default(7).describe("When session_id is omitted, look back this many days"),
-  limit: z.number().optional().default(50).describe("Maximum prompts to return"),
+  limit: z.number().optional().default(50).describe("Maximum prompts to return, newest first"),
+  query: z.string().optional().describe("Keep only the prompts that contain this text (no case)"),
   with_markers: z.boolean().optional().default(true).describe("Tag each prompt with sentiment / corrective markers (interrupt, frustrated, correction, approval, \u2026). Set false to revert to legacy text-only output.")
 });
 function resolveRecordScope(params) {
@@ -26299,15 +26358,18 @@ write.`,
       // ── User-prompts / decision-record ──
       {
         name: "recall_user_prompts",
-        description: `List the human-typed prompts from a session (or recent sessions). Tool results
-and system banners are stripped \u2014 you get only what the user actually wrote. Useful for "what was
-I asking yesterday?" or "what did I tell the agent in this session?".`,
+        description: `List the human-typed prompts from a session (or recent sessions), newest first.
+Tool results and system banners are stripped \u2014 you get only what the user actually wrote. Useful for
+"what was I asking yesterday?" or "what did I tell the agent in this session?". Pass \`query\` for
+"did I say X?": it keeps only the prompts that contain that text. Each prompt prints whole up to 2000
+characters; a longer one prints its start and end and the recall_show expand_line call for the rest.`,
         inputSchema: {
           type: "object",
           properties: {
             session_id: { type: "string", description: "If set, only that session's prompts" },
             since_days: { type: "number", default: 7, description: "How far back to look, in days." },
-            limit: { type: "number", default: 50, description: "Maximum prompts to return, newest first." }
+            limit: { type: "number", default: 50, description: "Maximum prompts to return, newest first." },
+            query: { type: "string", description: "Keep only the prompts that contain this text. Case and runs of whitespace are ignored." }
           }
         }
       },
@@ -27472,9 +27534,9 @@ _Edits stayed local or window was off \u2014 try increasing buffer_minutes._` }]
           const r = remote.results[i];
           const kind = r.chunkType?.match(/:(\w+):imp([0-9])/);
           const tag = kind ? ` \xB7 ${kind[1]} (imp${kind[2]})` : "";
-          const when = r.mtime ? ` \xB7 ${new Date(r.mtime).toISOString().slice(0, 10)}` : "";
+          const when2 = r.mtime ? ` \xB7 ${new Date(r.mtime).toISOString().slice(0, 10)}` : "";
           lines.push(`## #${i + 1} [${r.sourceType}${tag}] ${(r.title || r.itemId).slice(0, 90)}`);
-          lines.push(`**id:** \`${r.itemId}\`${when}${r.projectPath ? ` \xB7 ${r.projectPath}` : ""}`);
+          lines.push(`**id:** \`${r.itemId}\`${when2}${r.projectPath ? ` \xB7 ${r.projectPath}` : ""}`);
           if (r.sourceType === "session")
             lines.push(`_fetch: recall_context / recall_show "${r.itemId}"_`);
           const snippets = (r.matchedChunks?.length ? r.matchedChunks.map((c) => c.text) : [r.text]).filter(Boolean).slice(0, 3);
@@ -27766,8 +27828,8 @@ _Edits stayed local or window was off \u2014 try increasing buffer_minutes._` }]
           const total = rows.reduce((n, r) => n + r.sessions, 0);
           lines.push(`## ${member} \u2014 ${total} session(s)`);
           for (const r of [...rows].sort((x, y) => y.lastMtime - x.lastMtime)) {
-            const when = r.lastMtime ? new Date(r.lastMtime).toISOString().slice(0, 10) : "????";
-            lines.push(`- ${r.projectId} \xB7 ${r.sessions} session(s) \xB7 last active ${when}`);
+            const when2 = r.lastMtime ? new Date(r.lastMtime).toISOString().slice(0, 10) : "????";
+            lines.push(`- ${r.projectId} \xB7 ${r.sessions} session(s) \xB7 last active ${when2}`);
           }
           lines.push("");
         }
@@ -28448,54 +28510,35 @@ ${JSON.stringify(r, null, 2)}
       case "recall_user_prompts": {
         const params = RecallUserPromptsSchema.parse(args);
         requireRemote();
-        const renderPrompts = (rows) => {
-          const lines = [`# User prompts (${rows.length})
-`];
-          for (const p of rows) {
-            const t = p.tsIso?.slice(0, 16).replace("T", " ") || "";
-            const snippet = p.text.length > 240 ? p.text.slice(0, 240) + "\u2026" : p.text;
-            const markerSuffix = params.with_markers && p.markers.length ? ` _[${p.markers.join(", ")}]_` : "";
-            lines.push(`- **${p.sessionId}** L${p.line}${t ? ` \xB7 ${t}` : ""}${markerSuffix}`);
-            lines.push(`  ${snippet.replace(/\n/g, " ")}`);
-          }
-          return lines.join("\n");
-        };
+        const toRows = (sessionId, prompts) => prompts.map((p) => ({ sessionId, line: p.line, ts: p.ts, tsIso: p.tsIso, markers: p.markers || [], text: p.text }));
+        const select = { limit: params.limit, query: params.query };
+        const render = (rows) => renderPrompts(rows, { withMarkers: params.with_markers, query: params.query });
+        const none = params.query ? `No user prompts contain "${params.query.trim()}".` : "No user prompts found.";
         if (params.session_id) {
           const soft = await remoteGetSoft(`/api/conversations/${encodeURIComponent(params.session_id)}/markers`);
           if (!soft.data) {
             return { content: [{ type: "text", text: soft.message || (soft.status === 404 ? `Session ${params.session_id} not found.` : `Prompts not synced yet for ${params.session_id}.`) }] };
           }
-          const rows = soft.data.prompts.filter((p) => p.text && p.text.trim()).slice(0, params.limit).map((p) => ({ sessionId: params.session_id, line: p.line, tsIso: p.tsIso, markers: p.markers || [], text: p.text }));
-          if (rows.length === 0) {
-            return { content: [{ type: "text", text: "No user prompts found." }] };
-          }
-          return { content: [{ type: "text", text: renderPrompts(rows) }] };
+          const rows = selectPrompts(toRows(params.session_id, soft.data.prompts), select);
+          return { content: [{ type: "text", text: rows.length ? render(rows) : none }] };
         }
         const sinceHours = params.since_days * 24;
         const recent = await remoteGetQS("/api/conversations/recent", { limit: 200, since_hours: sinceHours });
-        const sessionIds = (recent.sessions || []).map((s) => s.sessionId);
-        if (sessionIds.length === 0) {
-          return { content: [{ type: "text", text: "No user prompts found." }] };
-        }
-        const collected = [];
-        for (const sid of sessionIds) {
-          if (collected.length >= params.limit)
-            break;
+        const feed = (recent.sessions || []).map((s) => ({
+          sessionId: s.sessionId,
+          modifiedMs: s.fileMtime || (s.modified ? Date.parse(s.modified) : 0) || 0
+        }));
+        if (feed.length === 0) {
+          return { content: [{ type: "text", text: none }] };
+        }
+        const collected = await collectAcrossSessions(feed, async (sid) => {
           const soft = await remoteGetSoft(`/api/conversations/${encodeURIComponent(sid)}/markers`);
-          if (!soft.data)
-            continue;
-          for (const p of soft.data.prompts) {
-            if (!p.text || !p.text.trim())
-              continue;
-            collected.push({ sessionId: sid, line: p.line, tsIso: p.tsIso, markers: p.markers || [], text: p.text });
-            if (collected.length >= params.limit)
-              break;
-          }
-        }
+          return soft.data ? toRows(sid, soft.data.prompts) : null;
+        }, select);
         if (collected.length === 0) {
-          return { content: [{ type: "text", text: "No user prompts found (none of the recent sessions have synced markers yet)." }] };
+          return { content: [{ type: "text", text: params.query ? none : "No user prompts found (none of the recent sessions have synced markers yet)." }] };
         }
-        return { content: [{ type: "text", text: renderPrompts(collected) }] };
+        return { content: [{ type: "text", text: render(collected) }] };
       }
       // ── Decision recording ────────────────────────────────────
       case "recall_decision_record": {
@@ -29091,9 +29134,9 @@ _Tell the user \u2014 this changes how future sessions treat their repo._` }] };
         }
         const lines = [`# Files resembling \`${params.filename}\` (${data.hits.length})`, "_You may have built this before._\n"];
         for (const h of data.hits) {
-          const when = h.mtime ? new Date(h.mtime).toISOString().slice(0, 10) : "";
+          const when2 = h.mtime ? new Date(h.mtime).toISOString().slice(0, 10) : "";
           lines.push(`- \`${h.file}\` \u2014 ${h.reason} (score ${h.score})`);
-          lines.push(`  ${h.project || "(no project)"} \xB7 ${h.sessionId}${when ? ` \xB7 ${when}` : ""}`);
+          lines.push(`  ${h.project || "(no project)"} \xB7 ${h.sessionId}${when2 ? ` \xB7 ${when2}` : ""}`);
         }
         return { content: [{ type: "text", text: lines.join("\n") }] };
       }
@@ -29135,8 +29178,8 @@ _Tell the user \u2014 this changes how future sessions treat their repo._` }] };
           const lines = [`# ${params.source_type} items (${data.items.length})
 `];
           for (const it of data.items) {
-            const when = it.mtime ? new Date(it.mtime).toISOString().slice(0, 10) : "";
-            lines.push(`- **${it.id}**${it.title ? ` \u2014 ${it.title}` : ""}${when ? ` \xB7 ${when}` : ""}`);
+            const when2 = it.mtime ? new Date(it.mtime).toISOString().slice(0, 10) : "";
+            lines.push(`- **${it.id}**${it.title ? ` \u2014 ${it.title}` : ""}${when2 ? ` \xB7 ${when2}` : ""}`);
           }
           return { content: [{ type: "text", text: lines.join("\n") }] };
         }
@@ -29454,7 +29497,7 @@ function installCrashGuards() {
     reportClientEvent2("mcp_crash", { message: err.stack || err.message });
   });
 }
-var RELAY_VERSION = true ? "0.7.12" : "0.0.0";
+var RELAY_VERSION = true ? "0.7.14" : "0.0.0";
 function daemonIdleSecs() {
   const raw = process.env.CHAT_RECALL_DAEMON_IDLE_SECS;
   if (raw === void 0) return 900;

package/dist/scan-worker.js

@@ -5829,7 +5829,7 @@ function markersFromTurns(sessionId, turns) {
   const prompts = turns.filter((t) => t.kind === "user" && t.text).map((t) => ({ line: t.line, ts: t.ts, tsIso: t.tsIso, ...markPrompt(t.text) }));
   return { v: MARKERS_VERSION, sessionId, prompts, summary: summarizeMarkers(prompts) };
 }
-var PROFANITY, PROFANITY_LOOSE, APPROVAL_HEAD, NEG_HEAD, QUESTION_HEAD, DIRECTIVE_HEAD, CLARIFY_PHRASES, FRUSTRATED_PHRASES, MARKERS_VERSION;
+var PROFANITY, PROFANITY_LOOSE, APPROVAL_HEAD, NEG_HEAD, QUESTION_HEAD, DIRECTIVE_HEAD, CLARIFY_PHRASES, FRUSTRATED_PHRASES, MARKERS_VERSION, MARKERS_TURN_OPTS;
 var init_session_sentiment = __esm({
   "../engine/dist/core/session-sentiment.js"() {
     "use strict";
@@ -5843,6 +5843,7 @@ var init_session_sentiment = __esm({
     CLARIFY_PHRASES = /\b(?:wdym|what do you mean|explain|clarify|what is|what's|huh\??|i don'?t understand)\b/i;
     FRUSTRATED_PHRASES = /\b(?:why (?:the )?(?:fuck|hell)|wtf|are you (?:kidding|serious)|stop slacking|stop making|why did you|why didn'?t you|i (?:fucking )?(?:asked|told you)|are you (?:listening|even)|come\s*on|just\s+do)\b/i;
     MARKERS_VERSION = 3;
+    MARKERS_TURN_OPTS = { maxTurns: 5e4, userMax: Number.POSITIVE_INFINITY };
   }
 });
 
@@ -6068,6 +6069,7 @@ function shorten(text, max) {
 function extractTurnsFromEvents(sessionId, events, opts = {}) {
   const maxTurns = opts.maxTurns ?? DEFAULT_MAX_TURNS;
   const assistantMax = opts.assistantMax ?? DEFAULT_ASSISTANT_MAX;
+  const userMax = opts.userMax ?? DEFAULT_USER_MAX;
   const turns = [];
   let startMs = 0, endMs = 0;
   let found = false;
@@ -6085,7 +6087,7 @@ function extractTurnsFromEvents(sessionId, events, opts = {}) {
         ts: e.ts,
         tsIso: e.tsIso,
         line: e.line,
-        text: shorten(e.text, DEFAULT_USER_MAX)
+        text: shorten(e.text, userMax)
       });
     } else if (e.kind === "assistant_text" && e.text) {
       turns.push({
@@ -9444,7 +9446,7 @@ function extractTurnsAny(sessionId, opts = {}) {
   const backend = getBackendForId(sessionId);
   if (!backend)
     return { sessionId, found: false, turns: [], startMs: 0, endMs: 0 };
-  return memoInSessionScope(`turns:${sessionId}:${opts.maxTurns ?? ""}:${opts.assistantMax ?? ""}`, () => backend.extractTurns(sessionId, opts));
+  return memoInSessionScope(`turns:${sessionId}:${opts.maxTurns ?? ""}:${opts.assistantMax ?? ""}:${opts.userMax ?? ""}`, () => backend.extractTurns(sessionId, opts));
 }
 function replaySessionAny(sessionId) {
   const backend = getBackendForId(sessionId);
@@ -10493,12 +10495,14 @@ function lineKey(line) {
   try {
     const o = JSON.parse(line);
     if (typeof o?.uuid === "string" && o.uuid)
-      return { key: `u:${o.uuid}`, singleton: false };
-    if (typeof o?.type === "string" && SINGLETON_META.has(o.type))
-      return { key: `m:${o.type}`, singleton: true };
+      return { key: `u:${o.uuid}`, meta: false, json: true };
+    return { key: `h:${sha1(line)}`, meta: typeof o?.type === "string" && STATE_META.has(o.type), json: true };
   } catch {
   }
-  return { key: `h:${sha1(line)}`, singleton: false };
+  return { key: `h:${sha1(line)}`, meta: false, json: false };
+}
+function isHalfWritten(line, currentLines) {
+  return currentLines.some((c) => c.length > line.length && c.startsWith(line));
 }
 function mergeLineText(shadowText, currentText) {
   const shadowLines = shadowText.split("\n").filter((l) => l.trim());
@@ -10506,27 +10510,24 @@ function mergeLineText(shadowText, currentText) {
   const currentKeys = /* @__PURE__ */ new Set();
   for (const l of currentLines)
     currentKeys.add(lineKey(l).key);
-  const shadowKeys = /* @__PURE__ */ new Set();
-  for (const l of shadowLines)
-    shadowKeys.add(lineKey(l).key);
-  let recovered = 0;
-  for (const k of shadowKeys)
-    if (!currentKeys.has(k))
-      recovered++;
-  if (recovered === 0) {
-    return { text: currentText.endsWith("\n") ? currentText : currentText + "\n", recovered: 0, totalRecords: currentKeys.size };
-  }
-  const out = [];
-  const emitted = /* @__PURE__ */ new Set();
+  const kept = [];
+  const keptKeys = /* @__PURE__ */ new Set();
+  const counted = /* @__PURE__ */ new Set();
   for (const l of shadowLines) {
-    const { key, singleton } = lineKey(l);
-    if (singleton && currentKeys.has(key))
-      continue;
-    if (emitted.has(key))
+    const { key, meta, json } = lineKey(l);
+    if (!json && isHalfWritten(l, currentLines))
       continue;
-    out.push(l);
-    emitted.add(key);
+    kept.push(l);
+    keptKeys.add(key);
+    if (!meta && !currentKeys.has(key))
+      counted.add(key);
+  }
+  const recovered = counted.size;
+  if (recovered === 0) {
+    return { text: currentText.endsWith("\n") ? currentText : currentText + "\n", recovered: 0, totalRecords: currentKeys.size };
   }
+  const out = [...kept];
+  const emitted = keptKeys;
   for (const l of currentLines) {
     const { key } = lineKey(l);
     if (emitted.has(key))
@@ -10536,13 +10537,13 @@ function mergeLineText(shadowText, currentText) {
   }
   return { text: out.join("\n") + "\n", recovered, totalRecords: out.length };
 }
-var SINGLETON_META;
+var STATE_META;
 var init_shadow = __esm({
   "../engine/dist/transcript/shadow.js"() {
     "use strict";
     init_paths();
     init_raw();
-    SINGLETON_META = /* @__PURE__ */ new Set(["mode", "permission-mode", "ai-title", "last-prompt", "pr-link", "summary"]);
+    STATE_META = /* @__PURE__ */ new Set(["mode", "permission-mode", "ai-title", "last-prompt", "pr-link", "summary"]);
   }
 });
 
@@ -11114,7 +11115,7 @@ function collectDerivedRows(ref, mtime, count, maxRowBytes) {
           if (!fullOutcome) fullOutcome = computeOutcome(id);
           if (fullOutcome.found) data = fullOutcome.commits;
         } else if (kind === "markers") {
-          const turns = extractTurnsAny(id, { maxTurns: 5e4 });
+          const turns = extractTurnsAny(id, MARKERS_TURN_OPTS);
           data = markersFromTurns(id, turns.turns);
         }
       } catch {

package/dist/watch.js

@@ -6850,12 +6850,14 @@ function lineKey(line) {
   try {
     const o = JSON.parse(line);
     if (typeof o?.uuid === "string" && o.uuid)
-      return { key: `u:${o.uuid}`, singleton: false };
-    if (typeof o?.type === "string" && SINGLETON_META.has(o.type))
-      return { key: `m:${o.type}`, singleton: true };
+      return { key: `u:${o.uuid}`, meta: false, json: true };
+    return { key: `h:${sha1(line)}`, meta: typeof o?.type === "string" && STATE_META.has(o.type), json: true };
   } catch {
   }
-  return { key: `h:${sha1(line)}`, singleton: false };
+  return { key: `h:${sha1(line)}`, meta: false, json: false };
+}
+function isHalfWritten(line, currentLines) {
+  return currentLines.some((c) => c.length > line.length && c.startsWith(line));
 }
 function mergeLineText(shadowText, currentText) {
   const shadowLines = shadowText.split("\n").filter((l) => l.trim());
@@ -6863,27 +6865,24 @@ function mergeLineText(shadowText, currentText) {
   const currentKeys = /* @__PURE__ */ new Set();
   for (const l of currentLines)
     currentKeys.add(lineKey(l).key);
-  const shadowKeys = /* @__PURE__ */ new Set();
-  for (const l of shadowLines)
-    shadowKeys.add(lineKey(l).key);
-  let recovered = 0;
-  for (const k of shadowKeys)
-    if (!currentKeys.has(k))
-      recovered++;
-  if (recovered === 0) {
-    return { text: currentText.endsWith("\n") ? currentText : currentText + "\n", recovered: 0, totalRecords: currentKeys.size };
-  }
-  const out = [];
-  const emitted = /* @__PURE__ */ new Set();
+  const kept = [];
+  const keptKeys = /* @__PURE__ */ new Set();
+  const counted = /* @__PURE__ */ new Set();
   for (const l of shadowLines) {
-    const { key: key2, singleton } = lineKey(l);
-    if (singleton && currentKeys.has(key2))
+    const { key: key2, meta, json } = lineKey(l);
+    if (!json && isHalfWritten(l, currentLines))
       continue;
-    if (emitted.has(key2))
-      continue;
-    out.push(l);
-    emitted.add(key2);
+    kept.push(l);
+    keptKeys.add(key2);
+    if (!meta && !currentKeys.has(key2))
+      counted.add(key2);
+  }
+  const recovered = counted.size;
+  if (recovered === 0) {
+    return { text: currentText.endsWith("\n") ? currentText : currentText + "\n", recovered: 0, totalRecords: currentKeys.size };
   }
+  const out = [...kept];
+  const emitted = keptKeys;
   for (const l of currentLines) {
     const { key: key2 } = lineKey(l);
     if (emitted.has(key2))
@@ -7068,14 +7067,14 @@ function shadowSizeOnDisk(tool, rawId) {
     return 0;
   }
 }
-var WHOLE_FILE_TOOLS, SINGLETON_META, lastLiveFingerprint;
+var WHOLE_FILE_TOOLS, STATE_META, lastLiveFingerprint;
 var init_shadow = __esm({
   "../engine/dist/transcript/shadow.js"() {
     "use strict";
     init_paths();
     init_raw();
     WHOLE_FILE_TOOLS = /* @__PURE__ */ new Set(["cursor"]);
-    SINGLETON_META = /* @__PURE__ */ new Set(["mode", "permission-mode", "ai-title", "last-prompt", "pr-link", "summary"]);
+    STATE_META = /* @__PURE__ */ new Set(["mode", "permission-mode", "ai-title", "last-prompt", "pr-link", "summary"]);
     lastLiveFingerprint = /* @__PURE__ */ new Map();
   }
 });
@@ -7457,7 +7456,7 @@ function markersFromTurns(sessionId, turns) {
   const prompts = turns.filter((t) => t.kind === "user" && t.text).map((t) => ({ line: t.line, ts: t.ts, tsIso: t.tsIso, ...markPrompt(t.text) }));
   return { v: MARKERS_VERSION, sessionId, prompts, summary: summarizeMarkers(prompts) };
 }
-var PROFANITY, PROFANITY_LOOSE, APPROVAL_HEAD, NEG_HEAD, QUESTION_HEAD, DIRECTIVE_HEAD, CLARIFY_PHRASES, FRUSTRATED_PHRASES, MARKERS_VERSION;
+var PROFANITY, PROFANITY_LOOSE, APPROVAL_HEAD, NEG_HEAD, QUESTION_HEAD, DIRECTIVE_HEAD, CLARIFY_PHRASES, FRUSTRATED_PHRASES, MARKERS_VERSION, MARKERS_TURN_OPTS;
 var init_session_sentiment = __esm({
   "../engine/dist/core/session-sentiment.js"() {
     "use strict";
@@ -7471,6 +7470,7 @@ var init_session_sentiment = __esm({
     CLARIFY_PHRASES = /\b(?:wdym|what do you mean|explain|clarify|what is|what's|huh\??|i don'?t understand)\b/i;
     FRUSTRATED_PHRASES = /\b(?:why (?:the )?(?:fuck|hell)|wtf|are you (?:kidding|serious)|stop slacking|stop making|why did you|why didn'?t you|i (?:fucking )?(?:asked|told you)|are you (?:listening|even)|come\s*on|just\s+do)\b/i;
     MARKERS_VERSION = 3;
+    MARKERS_TURN_OPTS = { maxTurns: 5e4, userMax: Number.POSITIVE_INFINITY };
   }
 });
 
@@ -7646,7 +7646,7 @@ function extractTurnsAny(sessionId, opts = {}) {
   const backend = getBackendForId(sessionId);
   if (!backend)
     return { sessionId, found: false, turns: [], startMs: 0, endMs: 0 };
-  return memoInSessionScope(`turns:${sessionId}:${opts.maxTurns ?? ""}:${opts.assistantMax ?? ""}`, () => backend.extractTurns(sessionId, opts));
+  return memoInSessionScope(`turns:${sessionId}:${opts.maxTurns ?? ""}:${opts.assistantMax ?? ""}:${opts.userMax ?? ""}`, () => backend.extractTurns(sessionId, opts));
 }
 function replaySessionAny(sessionId) {
   const backend = getBackendForId(sessionId);
@@ -8054,6 +8054,7 @@ function shorten(text, max) {
 function extractTurnsFromEvents(sessionId, events, opts = {}) {
   const maxTurns = opts.maxTurns ?? DEFAULT_MAX_TURNS;
   const assistantMax = opts.assistantMax ?? DEFAULT_ASSISTANT_MAX;
+  const userMax = opts.userMax ?? DEFAULT_USER_MAX;
   const turns = [];
   let startMs = 0, endMs = 0;
   let found = false;
@@ -8071,7 +8072,7 @@ function extractTurnsFromEvents(sessionId, events, opts = {}) {
         ts: e.ts,
         tsIso: e.tsIso,
         line: e.line,
-        text: shorten(e.text, DEFAULT_USER_MAX)
+        text: shorten(e.text, userMax)
       });
     } else if (e.kind === "assistant_text" && e.text) {
       turns.push({
@@ -18483,7 +18484,7 @@ var init_http = __esm({
       CLI_VERSION = JSON.parse(readFileSync32(new URL("../package.json", import.meta.url), "utf-8")).version || CLI_VERSION;
     } catch {
       try {
-        if (true) CLI_VERSION = "0.7.12";
+        if (true) CLI_VERSION = "0.7.14";
       } catch {
       }
     }
@@ -18527,7 +18528,7 @@ function collectDerivedRows(ref, mtime, count, maxRowBytes) {
           if (!fullOutcome) fullOutcome = computeOutcome(id);
           if (fullOutcome.found) data = fullOutcome.commits;
         } else if (kind === "markers") {
-          const turns = extractTurnsAny(id, { maxTurns: 5e4 });
+          const turns = extractTurnsAny(id, MARKERS_TURN_OPTS);
           data = markersFromTurns(id, turns.turns);
         }
       } catch {
@@ -18977,7 +18978,7 @@ var init_telemetry = __esm({
     init_sync_client();
     cliVersion = () => {
       try {
-        return true ? "0.7.12" : "dev";
+        return true ? "0.7.14" : "dev";
       } catch {
         return "dev";
       }
@@ -21110,7 +21111,7 @@ var init_sync_client = __esm({
       ownVersion = JSON.parse(readFileSync35(join42(dir, "../package.json"), "utf-8")).version || ownVersion;
     } catch {
       try {
-        if (true) ownVersion = "0.7.12";
+        if (true) ownVersion = "0.7.14";
       } catch {
       }
     }
@@ -24247,7 +24248,7 @@ try {
   ownVersion2 = JSON.parse(readFileSync39(join48(dir, "../package.json"), "utf-8")).version || ownVersion2;
 } catch {
   try {
-    if (true) ownVersion2 = "0.7.12";
+    if (true) ownVersion2 = "0.7.14";
   } catch {
   }
 }
@@ -24632,7 +24633,7 @@ async function runCollectorMigration(opts) {
 init_sync_ledger();
 init_collector_health();
 import { existsSync as existsSync50, readFileSync as readFileSync45, statSync as statSync45 } from "fs";
-var CLI_VERSION3 = true ? "0.7.12" : "0.0.0";
+var CLI_VERSION3 = true ? "0.7.14" : "0.0.0";
 var DEBOUNCE_MS = 5e3;
 var PLANS_DIR = claudeBackend.plansDir();
 var TASKS_DIR = claudeBackend.tasksDir();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chat-recall",
-  "version": "0.7.12",
+  "version": "0.7.14",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/munhq/chat-recall.git"