chat-recall 0.7.9 → 0.7.10

package/dist/watch.js

@@ -134,6 +134,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();
@@ -5716,7 +5782,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, "");
@@ -5725,8 +5792,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++;
@@ -5811,12 +5884,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")
@@ -5920,6 +5997,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();
@@ -6008,7 +6086,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");
@@ -6104,6 +6191,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,
@@ -7224,10 +7312,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;
@@ -7236,6 +7329,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;
   }
 });
 
@@ -8102,6 +8196,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 {
@@ -8409,6 +8504,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++;
@@ -8424,13 +8528,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;
@@ -8465,8 +8582,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",
@@ -8515,6 +8633,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 ─
@@ -18187,7 +18312,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.9";
+        if (true) CLI_VERSION = "0.7.10";
       } catch {
       }
     }
@@ -18232,8 +18357,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;
@@ -18682,7 +18806,7 @@ var init_telemetry = __esm({
     init_sync_client();
     cliVersion = () => {
       try {
-        return true ? "0.7.9" : "dev";
+        return true ? "0.7.10" : "dev";
       } catch {
         return "dev";
       }
@@ -20026,7 +20150,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(base2)).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;
@@ -20034,7 +20159,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);
@@ -20306,7 +20431,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,
@@ -20437,7 +20562,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(
@@ -20446,7 +20571,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;
@@ -20598,7 +20723,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
@@ -20654,7 +20779,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(
@@ -20731,6 +20856,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();
@@ -20772,7 +20898,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.10";
       } catch {
       }
     }
@@ -23909,7 +24035,7 @@ try {
   ownVersion2 = JSON.parse(readFileSync39(join48(dir, "../package.json"), "utf-8")).version || ownVersion2;
 } catch {
   try {
-    if (true) ownVersion2 = "0.7.9";
+    if (true) ownVersion2 = "0.7.10";
   } catch {
   }
 }
@@ -24294,7 +24420,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.9" : "0.0.0";
+var CLI_VERSION3 = true ? "0.7.10" : "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.9",
+  "version": "0.7.10",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/munhq/chat-recall.git"

package/skills/chat-recall/SKILL.md

@@ -74,7 +74,7 @@ directly.
 Every `recall_*` tool. `packages/cli/src/skills-catalog.test.ts` fails when a
 tool is registered and never named here, so adding a tool means placing it.
 
-**Resume / cold start** — `recall_smart_resume` (structured resume bundle; needs a session id), `recall_recent` (list recent sessions), `recall_wake_up` (identity + high-signal facts), `recall_context` (structured dump of one session), `recall_show` (raw slice — returns 10 messages unless you raise `max_messages`), `recall_summary` (AI summary + outcome).
+**Resume / cold start** — `recall_smart_resume` (structured resume bundle; needs a session id), `recall_recent` (list recent sessions), `recall_wake_up` (identity + high-signal facts), `recall_context` (structured dump of one session), `recall_show` (raw slice — `query` finds a message and its line, `around_line` reads around it; returns 10 messages unless you raise `max_messages`), `recall_summary` (AI summary + outcome).
 **Search** — `recall_search` (sessions; `include_outcome`, `like_session`), `recall_memory_search` (every memory type), `recall_memory_item` (read ONE item found by search, or browse a source type), `recall_user_prompts` (what the user actually typed), `recall_subagent_search` (inside subagent transcripts, whose work never reaches the main conversation), `recall_redundant_files` (before writing a new file, check you have not written one like it already).
 **Project** — `recall_project_context` (rich dump), `recall_weekly_digest`, `recall_analytics_summary`, `recall_outcome_summary` (how many recent sessions actually shipped), `recall_code_findings` / `recall_code_actions` / `recall_code_projects` / `recall_code_index` / `recall_recommendations`.
 

package/skills/chat-recall-find/SKILL.md

@@ -39,8 +39,10 @@ description: >-
 
 Every tool here takes a NAMED `session_id` (not a positional argument).
 
-- `mcp__chat-recall__recall_show` — read the session slice (`around_line`,
-  `from_end`). Each message comes back in full, with its tool calls and
+- `mcp__chat-recall__recall_show` — read the session slice. To find one
+  message, pass `query` with words from it: the reply gives the line of each
+  match. Then pass that line as `around_line`, or read the newest messages with
+  `from_end`. Do not guess line numbers. Each message comes back in full, with its tool calls and
   results. A body over 2000 characters shows its ends and the `expand_line`
   that returns it whole. It returns **10 messages
   by default**: raise `max_messages` before telling the user what a session

package/skills/chat-recall-resume/SKILL.md

@@ -47,7 +47,9 @@ Once you have a session id:
 - `mcp__chat-recall__recall_context` — structured context (requests, decisions,
   files, tools).
 - `mcp__chat-recall__recall_show` — raw slice; `from_end: N` for the last N
-  messages. Each message comes back in full, code and commands included, with
+  messages, `query` to find a message by its words and get its line,
+  `around_line` to read around that line. If the reply says that sync is
+  behind, run `recall_index` before you read the transcript file. Each message comes back in full, code and commands included, with
   its tool results. A body over 2000 characters shows its ends; pass
   `expand_line` to get it whole. It
   returns 10 messages unless you raise `max_messages`, so don't read a partial