chat-recall 0.7.9 → 0.7.11

package/dist/cli.js

@@ -4568,6 +4568,72 @@ var init_banners = __esm({
   }
 });
 
+// ../engine/dist/core/claude-prompt-origin.js
+function originFromText(text) {
+  const head = text.trimStart();
+  for (const [prefix, origin] of INJECTED_PREFIXES) {
+    if (head.startsWith(prefix))
+      return origin;
+  }
+  return "human";
+}
+function declaredOrigin(value) {
+  if (!value || typeof value !== "object")
+    return void 0;
+  const kind = value.kind;
+  return typeof kind === "string" && kind ? kind : void 0;
+}
+function userRecordOrigin(obj, text) {
+  if (obj.isSidechain === true)
+    return "subagent";
+  const declared = declaredOrigin(obj.origin);
+  if (declared && declared !== "human")
+    return declared;
+  if (obj.isMeta === true)
+    return "meta";
+  if (declared === "human")
+    return "human";
+  return originFromText(text);
+}
+function queuedCommandPrompt(obj) {
+  if (obj.type !== "attachment")
+    return null;
+  const att = obj.attachment;
+  if (!att || att.type !== "queued_command")
+    return null;
+  const text = promptText(att.prompt);
+  if (!text)
+    return null;
+  if (obj.isSidechain === true)
+    return { text, origin: "subagent" };
+  const declared = declaredOrigin(att.origin);
+  if (declared)
+    return { text, origin: declared };
+  return { text, origin: att.humanTurn === true ? "human" : originFromText(text) };
+}
+function promptText(prompt) {
+  if (typeof prompt === "string")
+    return prompt;
+  if (!Array.isArray(prompt))
+    return "";
+  return prompt.filter((b) => !!b && typeof b === "object" && b.type === "text" && typeof b.text === "string").map((b) => b.text).join("\n");
+}
+function isPersonMessage(m) {
+  return m.role === "user" && !m.origin;
+}
+var INJECTED_PREFIXES;
+var init_claude_prompt_origin = __esm({
+  "../engine/dist/core/claude-prompt-origin.js"() {
+    "use strict";
+    INJECTED_PREFIXES = [
+      ["<task-notification", "task-notification"],
+      ["<agent-message", "peer"],
+      ["Another Claude session sent a message:", "peer"],
+      ["Stop hook feedback:", "hook"]
+    ];
+  }
+});
+
 // ../engine/dist/core/project-path-match.js
 function canonicalProjectPath(p) {
   return (p || "").trim().replace(/\\/g, "/").replace(/[-_]/g, "/").replace(/\/{2,}/g, "/").replace(/\/+$/, "").toLowerCase();
@@ -5809,7 +5875,8 @@ async function parseSessionFile(sessionPath, maxMessages = 50) {
   const filesToParse = hasSubagentsDir(sessionPath) ? [sessionPath, ...getSubagentPaths(sessionPath)] : [sessionPath];
   let userCount = 0;
   const seenPrompts = /* @__PURE__ */ new Set();
-  const recordPrompt = (raw, line, dedupe = false) => {
+  const pendingQueued = /* @__PURE__ */ new Set();
+  const recordPrompt = (raw, line, via = "record") => {
     if (userCount >= maxMessages)
       return;
     const withoutReminders = raw.replace(/<system-reminder>[\s\S]*?<\/system-reminder>/g, "");
@@ -5818,8 +5885,14 @@ async function parseSessionFile(sessionPath, maxMessages = 50) {
     const cleanedText = stripInjectedBanners(withoutReminders).trim();
     if (cleanedText.length < 10)
       return;
-    if (dedupe && seenPrompts.has(cleanedText))
+    if (via === "enqueue") {
+      if (seenPrompts.has(cleanedText))
+        return;
+      pendingQueued.add(cleanedText);
+    } else if (pendingQueued.has(cleanedText)) {
+      pendingQueued.delete(cleanedText);
       return;
+    }
     seenPrompts.add(cleanedText);
     content.userMessages.push({ text: cleanedText, lineNumber: line, contentType: "user" });
     userCount++;
@@ -5904,12 +5977,16 @@ async function parseSessionFile(sessionPath, maxMessages = 50) {
               text = textParts.join("\n");
             }
           }
-          if (text)
+          if (text && userRecordOrigin(obj, text) === "human")
             recordPrompt(text, lineNum);
         } else if (msgType === "queue-operation") {
-          if (obj.operation === "enqueue" && typeof obj.content === "string") {
-            recordPrompt(obj.content, lineNum, true);
+          if (obj.operation === "enqueue" && typeof obj.content === "string" && originFromText(obj.content) === "human") {
+            recordPrompt(obj.content, lineNum, "enqueue");
           }
+        } else if (msgType === "attachment") {
+          const queued = queuedCommandPrompt(obj);
+          if (queued?.origin === "human")
+            recordPrompt(queued.text, lineNum, "delivery");
         } else if (msgType === "assistant") {
           const msg = obj.message;
           if (!msg || typeof msg !== "object")
@@ -6013,6 +6090,7 @@ var init_session = __esm({
   "../engine/dist/parsers/session.js"() {
     "use strict";
     init_banners();
+    init_claude_prompt_origin();
     init_claude2();
     init_tool_paths();
     init_project_dir_name();
@@ -6177,7 +6255,16 @@ function messagesFromRawLines(raw) {
       const cleaned = stripBanners(text);
       if (!cleaned)
         continue;
-      messages.push({ line, role: "user", content: cleaned, timestamp });
+      const origin = userRecordOrigin(obj, cleaned);
+      messages.push({ line, role: "user", content: cleaned, timestamp, ...origin === "human" ? {} : { origin } });
+    } else if (obj.type === "attachment") {
+      const queued = queuedCommandPrompt(obj);
+      if (!queued)
+        continue;
+      const cleaned = stripBanners(queued.text);
+      if (!cleaned)
+        continue;
+      messages.push({ line, role: "user", content: cleaned, timestamp, ...queued.origin === "human" ? {} : { origin: queued.origin } });
     } else if (obj.type === "assistant") {
       const blocks = Array.isArray(obj.message?.content) ? obj.message.content : [];
       const thinkingBlock = blocks.find((c) => c?.type === "thinking");
@@ -6273,6 +6360,7 @@ var init_claude = __esm({
   "../engine/dist/transcript/claude.js"() {
     "use strict";
     init_logger();
+    init_claude_prompt_origin();
     log2 = createLogger("transcript-claude");
     INJECTED_BANNERS2 = [
       /MCP issues detected\. ?Run \/mcp list for status\.?/g,
@@ -6885,10 +6973,15 @@ function summarizeMarkers(marked) {
   }
   return counts;
 }
-var PROFANITY, PROFANITY_LOOSE, APPROVAL_HEAD, NEG_HEAD, QUESTION_HEAD, DIRECTIVE_HEAD, CLARIFY_PHRASES, FRUSTRATED_PHRASES;
+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 init_session_sentiment = __esm({
   "../engine/dist/core/session-sentiment.js"() {
     "use strict";
+    init_claude_prompt_origin();
     PROFANITY = /\b(fuck(?:ing|er|ed)?|shit|ffs|wtf|bullshit|crap|damn(?:it)?|hell)\b/i;
     PROFANITY_LOOSE = /\b(fu[ckj]+(?:ing|er|ed|c?k)?|fukc|fucj|sht|fk|wt[ft])\b/i;
     APPROVAL_HEAD = /^(?:yes|y|ok(?:ay)?|sure|alright|fine|i\s*approve|approved|go\s*(?:on|ahead)|do\s*it|continue|please\s*do|sounds?\s*good|let'?s\s*go|ship\s*it|👍|✓+)\b/i;
@@ -6897,6 +6990,7 @@ var init_session_sentiment = __esm({
     DIRECTIVE_HEAD = /^(?:please\s+)?(?:use|implement|build|make|add|create|fix|remove|delete|update|refactor|run|deploy|push|merge|test|check|investigate|find|search|show|list|generate|set\s+up|ensure)\b/i;
     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 = 2;
   }
 });
 
@@ -11365,6 +11459,7 @@ var init_claude2 = __esm({
     init_first_prompt();
     init_tail_read();
     init_project_dir_name();
+    init_claude_prompt_origin();
     init_generic_engine();
     UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
     ClaudeBackend = class {
@@ -11672,6 +11767,15 @@ var init_claude2 = __esm({
       }
       appendEventsFromText(events, raw, mtime, startLine) {
         let lineNum = startLine;
+        const queued = /* @__PURE__ */ new Map();
+        const superseded = /* @__PURE__ */ new Set();
+        const pushPrompt = (e) => {
+          const pending = queued.get(e.text);
+          const earlier = pending?.shift();
+          if (earlier)
+            superseded.add(earlier);
+          events.push(e);
+        };
         {
           for (const line of raw.split("\n")) {
             lineNum++;
@@ -11687,13 +11791,26 @@ var init_claude2 = __esm({
             const ts = tsIso ? Date.parse(tsIso) || mtime : mtime;
             if (obj.type === "queue-operation") {
               if (obj.operation === "enqueue" && typeof obj.content === "string") {
-                const queued = stripReminders(obj.content);
-                if (queued && !queued.startsWith("<task-notification")) {
-                  events.push({ kind: "user", ts, tsIso, line: lineNum, text: queued });
+                const text = stripReminders(obj.content);
+                if (text && originFromText(text) === "human") {
+                  const e = { kind: "user", ts, tsIso, line: lineNum, text };
+                  events.push(e);
+                  const list = queued.get(text);
+                  if (list)
+                    list.push(e);
+                  else
+                    queued.set(text, [e]);
                 }
               }
               continue;
             }
+            const delivered = queuedCommandPrompt(obj);
+            if (delivered) {
+              const text = stripReminders(delivered.text);
+              if (text && delivered.origin === "human")
+                pushPrompt({ kind: "user", ts, tsIso, line: lineNum, text });
+              continue;
+            }
             if (obj.type === "user") {
               const msg = obj.message;
               const content = msg?.content;
@@ -11728,8 +11845,9 @@ var init_claude2 = __esm({
                 }
               }
               const spoken = stripReminders(text);
-              if (spoken)
-                events.push({ kind: "user", ts, tsIso, line: lineNum, text: spoken });
+              if (spoken && userRecordOrigin(obj, spoken) === "human") {
+                pushPrompt({ kind: "user", ts, tsIso, line: lineNum, text: spoken });
+              }
               for (const tr of toolResults) {
                 events.push({
                   kind: "tool_result",
@@ -11778,6 +11896,13 @@ var init_claude2 = __esm({
             }
           }
         }
+        if (superseded.size > 0) {
+          let w = 0;
+          for (const e of events)
+            if (!superseded.has(e))
+              events[w++] = e;
+          events.length = w;
+        }
         return lineNum;
       }
       // ── Per-session operations — all delegate to the generic engine ─
@@ -18521,7 +18646,7 @@ var init_sync_fields = __esm({
 import { existsSync as existsSync39, mkdirSync as mkdirSync7, openSync as openSync8, writeFileSync as writeFileSync6, readFileSync as readFileSync30, rmSync as rmSync4, statSync as statSync35, closeSync as closeSync8 } from "fs";
 import { dirname as dirname16, join as join39 } from "path";
 function acquireIndexLock(opts) {
-  const lockPath = lockFilePath();
+  const lockPath = lockFilePath(opts.file);
   mkdirSync7(dirname16(lockPath), { recursive: true });
   if (existsSync39(lockPath)) {
     if (!stealStaleLock(lockPath, opts.staleAfterMs ?? 10 * 6e4)) {
@@ -18563,8 +18688,8 @@ function acquireIndexLock(opts) {
     }
   };
 }
-function lockFilePath() {
-  return join39(getIndexDir(), ".compact.lock");
+function lockFilePath(file = ".compact.lock") {
+  return join39(getIndexDir(), file);
 }
 function stealStaleLock(lockPath, staleAfterMs) {
   try {
@@ -18640,7 +18765,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.9";
+        if (true) CLI_VERSION = "0.7.11";
       } catch {
       }
     }
@@ -18685,8 +18810,7 @@ function collectDerivedRows(ref, mtime, count, maxRowBytes) {
           if (fullOutcome.found) data = fullOutcome.commits;
         } else if (kind === "markers") {
           const turns = extractTurnsAny(id, { maxTurns: 5e4 });
-          const prompts = turns.turns.filter((t) => t.kind === "user" && t.text).map((t) => ({ line: t.line, ts: t.ts, tsIso: t.tsIso, ...markPrompt(t.text) }));
-          data = { sessionId: id, prompts, summary: summarizeMarkers(prompts) };
+          data = markersFromTurns(id, turns.turns);
         }
       } catch {
         data = null;
@@ -19139,7 +19263,7 @@ var init_telemetry = __esm({
     init_sync_client();
     cliVersion2 = () => {
       try {
-        return true ? "0.7.9" : "dev";
+        return true ? "0.7.11" : "dev";
       } catch {
         return "dev";
       }
@@ -19157,6 +19281,7 @@ __export(collector_health_exports, {
   applySyncOutcome: () => applySyncOutcome,
   collectorHealthPath: () => collectorHealthPath,
   crashesAtBoot: () => crashesAtBoot,
+  firstSyncInProgress: () => firstSyncInProgress,
   judgeHealth: () => judgeHealth,
   markCleanExit: () => markCleanExit,
   progressLine: () => progressLine,
@@ -19189,7 +19314,11 @@ function progressLine(h) {
   if (!p || p.complete || p.total <= 0)
     return null;
   const pct = Math.min(99, Math.floor(100 * p.done / p.total));
-  return `first sync in progress \u2014 ${p.done.toLocaleString()} of ${p.total.toLocaleString()} sessions (${pct}%)`;
+  return `${p.first ? "first sync" : "sync"} in progress \u2014 ${p.done.toLocaleString()} of ${p.total.toLocaleString()} sessions (${pct}%)`;
+}
+function firstSyncInProgress(h) {
+  const p = h?.progress;
+  return !!p && p.first === true && !p.complete && p.total > 0;
 }
 function collectorHealthPath() {
   return healthPath();
@@ -19502,6 +19631,8 @@ var init_client_events = __esm({
 // src/auto-update.ts
 var auto_update_exports = {};
 __export(auto_update_exports, {
+  LOCKED_REASON: () => LOCKED_REASON,
+  STOPPING_REASON: () => STOPPING_REASON,
   clearUpdateFailures: () => clearUpdateFailures,
   compareVersions: () => compareVersions,
   executeAutoUpdate: () => executeAutoUpdate,
@@ -19513,8 +19644,10 @@ __export(auto_update_exports, {
   planAutoUpdate: () => planAutoUpdate,
   readUpdateState: () => readUpdateState,
   resolveNpm: () => resolveNpm,
+  restartCommand: () => restartCommand,
   runAutoUpdate: () => runAutoUpdate,
   runningPrefix: () => runningPrefix,
+  stopAutoUpdates: () => stopAutoUpdates,
   sweepStaleStaging: () => sweepStaleStaging,
   tarballUrl: () => tarballUrl
 });
@@ -19610,6 +19743,10 @@ async function executeAutoUpdate(plan, deps) {
   };
   const tgz = join41(dir, "chat-recall.tgz");
   writeFileSync8(tgz, buf);
+  if (deps.stopping?.()) {
+    discardStaging();
+    return { updated: false, reason: STOPPING_REASON };
+  }
   try {
     deps.install(tgz);
   } catch (e) {
@@ -19624,9 +19761,11 @@ async function executeAutoUpdate(plan, deps) {
       reason: `install reported success but ${landed} is still on disk (wanted ${plan.to}) \u2014 the package that runs is not the one npm wrote. Reinstall by hand: npm install -g ${plan.url}`
     };
   }
-  try {
-    deps.restart(deps.platform ?? process.platform);
-  } catch {
+  if (!deps.stopping?.()) {
+    try {
+      deps.restart(deps.platform ?? process.platform);
+    } catch {
+    }
   }
   return { updated: true, reason: `updated ${plan.from} \u2192 ${plan.to}`, from: plan.from, to: plan.to };
 }
@@ -19685,10 +19824,18 @@ function realInstall(tgz) {
     npmInstall(npm, ["install", "-g", "--prefix", join41(homedir15(), ".local"), tgz]);
   }
 }
+function acquireUpdateLock() {
+  return acquireIndexLock({ kind: "auto-update", file: ".update.lock", staleAfterMs: 10 * 6e4 });
+}
+function restartCommand(platform2) {
+  if (platform2 === "linux") return { cmd: "systemctl --user --no-block restart chat-recall-watch.service" };
+  if (platform2 === "darwin") return { cmd: "launchctl kickstart -k gui/$(id -u)/com.chat-recall.watch", shell: "/bin/bash" };
+  if (platform2 === "win32") return { cmd: "schtasks /End /TN chat-recall-watch & schtasks /Run /TN chat-recall-watch" };
+  return null;
+}
 function realRestart(platform2) {
-  if (platform2 === "linux") execSync2("systemctl --user restart chat-recall-watch.service", { stdio: "ignore" });
-  else if (platform2 === "darwin") execSync2("launchctl kickstart -k gui/$(id -u)/com.chat-recall.watch", { stdio: "ignore", shell: "/bin/bash" });
-  else if (platform2 === "win32") execSync2("schtasks /End /TN chat-recall-watch & schtasks /Run /TN chat-recall-watch", { stdio: "ignore" });
+  const c = restartCommand(platform2);
+  if (c) execSync2(c.cmd, { stdio: "ignore", ...c.shell ? { shell: c.shell } : {} });
 }
 function updateStatePath() {
   const dir = process.env.CHAT_RECALL_DATA_DIR || join41(homedir15(), ".chat-recall");
@@ -19721,6 +19868,9 @@ function noteUpdateFailure(target) {
 function clearUpdateFailures() {
   writeUpdateState({});
 }
+function stopAutoUpdates() {
+  stopRequested = true;
+}
 async function runAutoUpdate(base3, authHeaders, ownVersion3, deps) {
   let caps;
   try {
@@ -19747,12 +19897,28 @@ async function runAutoUpdate(base3, authHeaders, ownVersion3, deps) {
   if (target && hasGivenUpOn(target)) {
     return { updated: false, reason: `gave up installing ${plan.to} after ${GIVE_UP_AFTER} failed attempts \u2014 run \`npm install -g chat-recall\` by hand` };
   }
-  const result = await executeAutoUpdate(plan, {
-    download: deps?.download ?? realDownload,
-    install: deps?.install ?? realInstall,
-    restart: deps?.restart ?? realRestart,
-    platform: deps?.platform
-  });
+  const stopping = deps?.stopping ?? (() => stopRequested);
+  if (stopping()) return { updated: false, reason: STOPPING_REASON };
+  const lock = (deps?.acquireLock ?? acquireUpdateLock)();
+  if (!lock) return { updated: false, reason: LOCKED_REASON };
+  let result;
+  try {
+    const onDisk = (deps?.onDisk ?? installedVersion)();
+    if (onDisk && plan.to && compareVersions(onDisk, plan.to) >= 0) {
+      return { updated: false, reason: `already current: ${onDisk} is on disk` };
+    }
+    result = await executeAutoUpdate(plan, {
+      download: deps?.download ?? realDownload,
+      install: deps?.install ?? realInstall,
+      restart: deps?.restart ?? realRestart,
+      platform: deps?.platform,
+      verify: deps?.verify,
+      stopping
+    });
+  } finally {
+    lock.release();
+  }
+  if (result.reason === STOPPING_REASON) return result;
   if (!result.updated) {
     const failures = target ? noteUpdateFailure(target) : 1;
     if (failures <= GIVE_UP_AFTER) {
@@ -19768,14 +19934,18 @@ async function runAutoUpdate(base3, authHeaders, ownVersion3, deps) {
   }
   return result;
 }
-var tarballUrl, GIVE_UP_AFTER, reportedStandingSkip;
+var tarballUrl, GIVE_UP_AFTER, reportedStandingSkip, STOPPING_REASON, LOCKED_REASON, stopRequested;
 var init_auto_update = __esm({
   "src/auto-update.ts"() {
     "use strict";
     init_http();
+    init_index_lock();
     tarballUrl = (base3, version2) => `${base3.replace(/\/+$/, "")}/install/${version2 ? `chat-recall-${version2}.tgz` : "chat-recall.tgz"}`;
     GIVE_UP_AFTER = 3;
     reportedStandingSkip = /* @__PURE__ */ new Set();
+    STOPPING_REASON = "not installed: this process is shutting down";
+    LOCKED_REASON = "another process is installing an update";
+    stopRequested = false;
   }
 });
 
@@ -20726,7 +20896,8 @@ async function syncToTargetInScope(cred, opts = {}) {
   }
   trace?.("conversation walk start");
   const walkStartedAt = Date.now();
-  reportWalkProgress({ done: 0, total: slice.length, startedAt: walkStartedAt, complete: false });
+  const firstWalk = (ledger ?? getSyncedRows(base3)).size === 0;
+  reportWalkProgress({ done: 0, total: slice.length, startedAt: walkStartedAt, complete: false, first: firstWalk });
   walkProgressForUpload = { done: 0, total: slice.length, complete: false };
   let traceN = 0;
   let considered = 0;
@@ -20734,7 +20905,7 @@ async function syncToTargetInScope(cred, opts = {}) {
     await new Promise((resolve3) => setImmediate(resolve3));
     considered++;
     const walkDone = considered >= slice.length;
-    reportWalkProgress({ done: considered, total: slice.length, startedAt: walkStartedAt, complete: walkDone });
+    reportWalkProgress({ done: considered, total: slice.length, startedAt: walkStartedAt, complete: walkDone, first: firstWalk });
     walkProgressForUpload = { done: considered, total: slice.length, complete: walkDone };
     if (trace && ++traceN % 500 === 0) trace(`walk ${traceN}/${slice.length} \xB7 at ${ref.prefixedId}`);
     localSessionIds.add(ref.prefixedId);
@@ -21006,7 +21177,7 @@ async function syncToTargetInScope(cred, opts = {}) {
     }
   }
   if (opts.prune) await post({ prune_empty_sessions: true });
-  reportWalkProgress({ done: slice.length, total: slice.length, startedAt: walkStartedAt, complete: true });
+  reportWalkProgress({ done: slice.length, total: slice.length, startedAt: walkStartedAt, complete: true, first: firstWalk });
   walkProgressForUpload = { done: slice.length, total: slice.length, complete: true };
   return {
     uploaded: convBatch.sent + appendResults.uploaded,
@@ -21137,7 +21308,7 @@ async function buildConversationSync(ref, mtime, opts = {}) {
   if (!transcript) return null;
   const textMessages = transcript.messages.filter((m) => m.role !== "summary" && m.content?.trim());
   if (textMessages.length === 0 && !transcript.messages.some((m) => m.toolCalls?.length)) return null;
-  const firstUser = textMessages.find((m) => m.role === "user");
+  const firstUser = textMessages.find(isPersonMessage);
   if (isInternalToolPrompt(firstUser?.content)) return null;
   const count = { redactions: 0 };
   const envelope = redactDeep(
@@ -21146,7 +21317,7 @@ async function buildConversationSync(ref, mtime, opts = {}) {
   );
   let projectPath = ref.projectPath;
   const meta = { messageCount: textMessages.length };
-  if (textMessages.filter((m) => m.role === "user").length <= 1) meta.oneShot = true;
+  if (textMessages.filter(isPersonMessage).length <= 1) meta.oneShot = true;
   try {
     const cwd = ref.fullPath ? readCwdFromJsonl(ref.fullPath) : "";
     if (cwd) projectPath = cwd;
@@ -21298,7 +21469,7 @@ async function buildConversationSync(ref, mtime, opts = {}) {
       envelope,
       raw_b64,
       raw_size,
-      first_prompt: envTexts.find((m) => m.role === "user")?.content?.slice(0, 200),
+      first_prompt: envTexts.find(isPersonMessage)?.content?.slice(0, 200),
       // Byte offset this FULL sync is synced THROUGH (file size at build time,
       // or the end of the bounded tail for an oversized session). The server
       // stores it as the envelope's `o`; the ledger records the SAME value
@@ -21354,7 +21525,7 @@ async function buildConversationTail(ref, fromOffset, opts = {}) {
       bytes: 0
     };
   }
-  const firstUser = textMessages.find((m) => m.role === "user");
+  const firstUser = textMessages.find(isPersonMessage);
   if (isInternalToolPrompt(firstUser?.content)) return null;
   const count = { redactions: 0 };
   const envelope = redactDeep(
@@ -21431,6 +21602,7 @@ var ownVersion, ERROR_CLASS, STANDING_FAILURE, walkProgressForUpload, lastServer
 var init_sync_client = __esm({
   "src/sync-client.ts"() {
     "use strict";
+    init_claude_prompt_origin();
     init_credentials_env();
     init_secret_redactor();
     init_source_discovery();
@@ -21472,7 +21644,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.9";
+        if (true) ownVersion = "0.7.11";
       } catch {
       }
     }
@@ -23676,7 +23848,7 @@ function extractCorrections(messages, cap = 5) {
   const seen = /* @__PURE__ */ new Set();
   let userTurns = 0;
   for (const msg of messages) {
-    if (msg.role !== "user") continue;
+    if (!isPersonMessage(msg)) continue;
     userTurns++;
     if (userTurns === 1) continue;
     if (isNoiseUserMessage(msg.content)) continue;
@@ -23782,6 +23954,7 @@ var CORRECTION_STARTS, CORRECTION_CONTAINS, TERMINAL_STATUSES;
 var init_escalate = __esm({
   "src/escalate.ts"() {
     "use strict";
+    init_claude_prompt_origin();
     CORRECTION_STARTS = [
       /^no+\b[,.! ]/i,
       /^(nope|wrong|incorrect|not quite|not right)\b/i,
@@ -25633,7 +25806,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.9";
+        if (true) ownVersion2 = "0.7.11";
       } catch {
       }
     }
@@ -27650,17 +27823,18 @@ var init_bulk_delete = __esm({
 });
 
 // ../engine/dist/core/resume-command.js
+var SESSION_ID_PREFIXES = {
+  codex: "codex_",
+  opencode: "opencode_",
+  agy: "agy_",
+  cursor: "cursor_",
+  gemini: "gemini_"
+};
 function toolOfSessionId(sessionId) {
-  if (sessionId.startsWith("codex_"))
-    return "codex";
-  if (sessionId.startsWith("opencode_"))
-    return "opencode";
-  if (sessionId.startsWith("agy_"))
-    return "agy";
-  if (sessionId.startsWith("cursor_"))
-    return "cursor";
-  if (sessionId.startsWith("gemini_"))
-    return "gemini";
+  for (const [tool, prefix] of Object.entries(SESSION_ID_PREFIXES)) {
+    if (sessionId.startsWith(prefix))
+      return tool;
+  }
   return "claude";
 }
 function resumeCommandFor(sessionId, tool) {
@@ -27771,7 +27945,7 @@ function renderShowMessages(messages, opts = {}) {
     const calls = msg.toolCalls ?? [];
     if (!text.trim() && !thinking.trim() && !calls.length && msg.thinking !== void 0)
       continue;
-    out.push(`**${msg.role}** (line ${msg.line})`);
+    out.push(msg.origin ? `**${msg.role}** (line ${msg.line}, written by the harness: ${msg.origin})` : `**${msg.role}** (line ${msg.line})`);
     if (thinking.trim())
       out.push(`_(thinking)_
 ${thinking}`);
@@ -27785,6 +27959,13 @@ ${thinking}`);
   }
   return out;
 }
+function nearestMessageLines(messages, line, count = 4) {
+  return [...new Set(messages.map((m) => m.line))].sort((a, b) => Math.abs(a - line) - Math.abs(b - line) || a - b).slice(0, count).sort((a, b) => a - b);
+}
+function noMessageAtLine(messages, line, sessionId) {
+  const near = nearestMessageLines(messages, line);
+  return `No message at line ${line} in ${sessionId}. The nearest messages are at lines ${near.join(", ")}.`;
+}
 
 // src/cli.ts
 init_paths();
@@ -28541,7 +28722,7 @@ program.command("search <query>").description("Search your server for relevant s
         (c) => c.chunkType !== "summary" && c.chunkType !== "first_prompt"
       );
       if (chunk) {
-        const label = chunk.chunkType === "assistant" ? "Discussed" : chunk.chunkType === "user_context" ? "Asked about" : chunk.chunkType === "tool_result" ? "Tool result" : "Context";
+        const label = chunk.chunkType === "assistant" ? "Discussed" : chunk.chunkType === "user_context" ? "Asked about" : chunk.chunkType === "tool_result" ? "Tool result" : chunk.chunkType === "harness" ? "Harness message" : "Context";
         let text = chunk.text.replace(/\n/g, " ").trim();
         if (text.length > 150) text = text.slice(0, 150) + "...";
         console.log(`   ${chalk2.magenta(label + ":")} ${text}`);
@@ -28607,8 +28788,7 @@ program.command("show <session_id>").description("Show conversation content from
       const line = parseInt(options.line, 10);
       const hit = messagesList.find((m) => m.line === line);
       if (!hit) {
-        const lines = messagesList.map((m) => m.line);
-        console.log(chalk2.yellow(`No message at line ${options.line}. Its lines run from ${Math.min(...lines)} to ${Math.max(...lines)}.`));
+        console.log(chalk2.yellow(noMessageAtLine(messagesList, line, sessionId)));
         process.exit(1);
       }
       console.log(renderShowMessages([hit], { full: true }).join("\n"));