chat-recall 0.7.7 → 0.7.9

package/dist/cli.js

@@ -4892,8 +4892,8 @@ function writeSecrets(secrets) {
   _secretsCache = null;
   const p = secretsPath();
   mkdirSync2(dirname2(p), { recursive: true });
-  const body = "# chat-recall secrets \u2014 NOT committed/synced. Mode 0600.\n" + Object.entries(secrets).filter(([, v]) => v).map(([k, v]) => `${k}=${v}`).join("\n") + "\n";
-  writeFileSync(p, body);
+  const body2 = "# chat-recall secrets \u2014 NOT committed/synced. Mode 0600.\n" + Object.entries(secrets).filter(([, v]) => v).map(([k, v]) => `${k}=${v}`).join("\n") + "\n";
+  writeFileSync(p, body2);
   try {
     chmodSync(p, 384);
   } catch {
@@ -5979,11 +5979,11 @@ async function parseSessionFile(sessionPath, maxMessages = 50) {
         }
         const toolResult = obj.toolUseResult;
         if (toolResult && typeof toolResult === "object" && toolCount < maxMessages) {
-          const resultText = toolResult.result;
+          const resultText2 = toolResult.result;
           const query = toolResult.query;
-          if (resultText && typeof resultText === "string" && isValuableToolResult(resultText, "WebSearch")) {
+          if (resultText2 && typeof resultText2 === "string" && isValuableToolResult(resultText2, "WebSearch")) {
             const searchText = query ? `Search: ${query}
-${resultText}` : resultText;
+${resultText2}` : resultText2;
             content.toolResults.push({
               text: searchText.slice(0, 2e3),
               lineNumber: lineNum,
@@ -7002,7 +7002,7 @@ function gitLogRepo(repo, startIso, endIso) {
       const authorIso = seg.slice(fieldPositions[1] + 1, fieldPositions[2]);
       const authorName = seg.slice(fieldPositions[2] + 1, fieldPositions[3]);
       const subject = seg.slice(fieldPositions[3] + 1, fieldPositions[4]);
-      let body = seg.slice(fieldPositions[4] + 1);
+      let body2 = seg.slice(fieldPositions[4] + 1);
       current = {
         sha,
         shortSha,
@@ -7016,11 +7016,11 @@ function gitLogRepo(repo, startIso, endIso) {
       };
       const recovered = [];
       let m;
-      while (m = TRAILING_NUMSTAT.exec(body)) {
+      while (m = TRAILING_NUMSTAT.exec(body2)) {
         recovered.unshift(m[1]);
-        body = body.slice(0, body.length - m[0].length);
+        body2 = body2.slice(0, body2.length - m[0].length);
       }
-      current.body = body.trim();
+      current.body = body2.trim();
       for (const line of recovered)
         recordNumstat(line);
     } else if (NUMSTAT.test(seg)) {
@@ -7914,7 +7914,7 @@ var init_opencode = __esm({
               });
               const out = d?.state?.output;
               if (out !== void 0 && out !== null) {
-                const body = typeof out === "string" ? out : JSON.stringify(out);
+                const body2 = typeof out === "string" ? out : JSON.stringify(out);
                 events.push({
                   kind: "tool_result",
                   ts,
@@ -7922,9 +7922,9 @@ var init_opencode = __esm({
                   line: lineNum,
                   toolUseId: callId,
                   toolName,
-                  resultBody: body,
+                  resultBody: body2,
                   resultIsError: d?.state?.status === "error",
-                  resultBytes: body.length
+                  resultBytes: body2.length
                 });
               }
             }
@@ -8699,13 +8699,13 @@ var init_codex2 = __esm({
           } else if (obj.type === "response_item" && payload.type === "function_call_output") {
             const callId = String(payload.call_id || "");
             const out = payload.output;
-            let body = "";
+            let body2 = "";
             let isError = false;
             let exitCode;
             if (typeof out === "string")
-              body = out;
+              body2 = out;
             else if (out && typeof out === "object") {
-              body = String(out.content ?? out.output ?? out.stdout ?? out.text ?? "");
+              body2 = String(out.content ?? out.output ?? out.stdout ?? out.text ?? "");
               if (typeof out.exit_code === "number") {
                 exitCode = out.exit_code;
                 isError = exitCode !== 0;
@@ -8717,10 +8717,10 @@ var init_codex2 = __esm({
               tsIso,
               line: lineNum,
               toolUseId: callId,
-              resultBody: body,
+              resultBody: body2,
               resultIsError: isError,
               resultExitCode: exitCode,
-              resultBytes: body.length
+              resultBytes: body2.length
             });
           }
         }
@@ -9742,15 +9742,15 @@ function messagesToEvents(messages, createdAtMs, updatedAtMs) {
         const p = part;
         if (p.type !== "tool-result")
           continue;
-        const body = resultBodyOf(p);
+        const body2 = resultBodyOf(p);
         events.push({
           kind: "tool_result",
           ts: clock,
           line: 0,
           toolUseId: typeof p.toolCallId === "string" ? p.toolCallId : void 0,
-          resultBody: body,
+          resultBody: body2,
           resultIsError: isError,
-          resultBytes: Buffer.byteLength(body, "utf8")
+          resultBytes: Buffer.byteLength(body2, "utf8")
         });
       }
     }
@@ -10613,11 +10613,11 @@ var init_cursor = __esm({
           const events = readComposerEvents(r.composer);
           if (events.length === 0)
             return null;
-          const body = events.map((e) => JSON.stringify(e)).join("\n") + "\n";
+          const body2 = events.map((e) => JSON.stringify(e)).join("\n") + "\n";
           return {
             tool: "cursor",
             mtime: statSync9(r.composer.globalDbPath).mtimeMs,
-            files: [{ name: `${r.composer.composerId}.jsonl`, bytes: Buffer.from(body, "utf8") }]
+            files: [{ name: `${r.composer.composerId}.jsonl`, bytes: Buffer.from(body2, "utf8") }]
           };
         } catch {
           return null;
@@ -10972,9 +10972,29 @@ function findSessionFile(sessionId) {
 function invalidateSessionFileIndex() {
   indexCache = null;
 }
+function indexStillValid(cache4) {
+  const roots = claudeProjectDirs();
+  if (roots.length !== cache4.roots.length || roots.some((r, i) => r !== cache4.roots[i]))
+    return false;
+  for (const [dir, mtime] of cache4.dirs) {
+    if (dirMtime(dir) !== mtime)
+      return false;
+  }
+  return true;
+}
 function sessionFileIndex() {
-  if (indexCache)
-    return indexCache;
+  if (indexCache) {
+    const now = Date.now();
+    if (now - indexCache.checkedAt < INDEX_RECHECK_MS)
+      return indexCache.byId;
+    if (indexStillValid(indexCache)) {
+      indexCache.checkedAt = now;
+      return indexCache.byId;
+    }
+    indexCache = null;
+  }
+  const dirs = /* @__PURE__ */ new Map();
+  const roots = claudeProjectDirs();
   const byId = /* @__PURE__ */ new Map();
   const seenRoots = /* @__PURE__ */ new Set();
   const projectPaths = /* @__PURE__ */ new Map();
@@ -10986,10 +11006,11 @@ function sessionFileIndex() {
     }
     return p;
   };
-  for (const root of claudeProjectDirs()) {
+  for (const root of roots) {
     if (seenRoots.has(root) || !existsSync13(root))
       continue;
     seenRoots.add(root);
+    dirs.set(root, dirMtime(root));
     let entries;
     try {
       entries = readdirSync10(root, { withFileTypes: true });
@@ -11000,6 +11021,7 @@ function sessionFileIndex() {
       if (!entry.isDirectory())
         continue;
       const dir = join15(root, entry.name);
+      dirs.set(dir, dirMtime(dir));
       let names;
       try {
         names = readdirSync10(dir);
@@ -11024,7 +11046,7 @@ function sessionFileIndex() {
     }
   }
   if (scanScopeDepth > 0)
-    indexCache = byId;
+    indexCache = { byId, dirs, roots, checkedAt: Date.now() };
   return byId;
 }
 function findSessionFiles(sessionId) {
@@ -11182,7 +11204,7 @@ function findCodexSessionFileIn(root, sessionId) {
   }
   return scanDir(root);
 }
-var scanScopeDepth, indexCache, readScope, readScopeDepth, derivedScope, geminiCache, MAX_EVENT_LINE_BYTES;
+var scanScopeDepth, indexCache, INDEX_RECHECK_MS, dirMtime, readScope, readScopeDepth, derivedScope, geminiCache, MAX_EVENT_LINE_BYTES;
 var init_live_session_scan = __esm({
   "../engine/dist/core/live-session-scan.js"() {
     "use strict";
@@ -11194,6 +11216,14 @@ var init_live_session_scan = __esm({
     init_project_dir_name();
     scanScopeDepth = 0;
     indexCache = null;
+    INDEX_RECHECK_MS = 1e3;
+    dirMtime = (p) => {
+      try {
+        return statSync11(p).mtimeMs;
+      } catch {
+        return -1;
+      }
+    };
     readScope = null;
     readScopeDepth = 0;
     derivedScope = null;
@@ -11459,15 +11489,36 @@ var init_claude2 = __esm({
       listSessions(opts = {}) {
         const cutoff = opts.sinceMs ?? 0;
         const filter = opts.projectFilter?.toLowerCase();
-        const seen = /* @__PURE__ */ new Set();
-        const out = [];
+        const byId = /* @__PURE__ */ new Map();
         for (const root of claudeProjectDirs()) {
-          this.collectSessionsFromRoot(root, cutoff, filter, seen, out, opts.previews !== false);
+          this.collectSessionsFromRoot(root, filter, byId, opts.previews !== false);
         }
+        const out = [...byId.values()].filter((r) => r.mtime >= cutoff);
         out.sort((a, b) => b.mtime - a.mtime);
         return opts.limit ? out.slice(0, opts.limit) : out;
       }
-      collectSessionsFromRoot(root, cutoff, filter, seen, out, previews) {
+      /**
+       * Add this root's sessions to `byId`. A session resumed under a second
+       * profile has one file in each home under the same id. It is ONE session: the
+       * first home keeps its path, and its mtime is the newest of all copies.
+       *
+       * Each copy was listed as its own ref before. Session 8da8d72b had a primary
+       * copy frozen at 05:55 and a second-home copy growing until 12:00; the walk
+       * handled both refs under one ledger row with two different mtimes, and the
+       * row that shipped nothing stamped the other copy's mtime.
+       */
+      collectSessionsFromRoot(root, filter, byId, previews) {
+        const add = (ref) => {
+          const prior = byId.get(ref.rawId);
+          if (!prior) {
+            byId.set(ref.rawId, ref);
+            return;
+          }
+          if (ref.mtime > prior.mtime) {
+            prior.mtime = ref.mtime;
+            prior.modified = ref.modified;
+          }
+        };
         if (!existsSync15(root))
           return;
         for (const proj of readdirSync11(root, { withFileTypes: true })) {
@@ -11478,6 +11529,7 @@ var init_claude2 = __esm({
           const projPath = join16(root, proj.name);
           const projectPath = resolveProjectDirName(proj.name);
           const indexPath = join16(projPath, "sessions-index.json");
+          const indexed = /* @__PURE__ */ new Set();
           if (existsSync15(indexPath)) {
             try {
               const indexData = JSON.parse(readFileSync10(indexPath, "utf-8"));
@@ -11485,10 +11537,8 @@ var init_claude2 = __esm({
               for (const entry of entries) {
                 if (!entry.fullPath || !existsSync15(entry.fullPath))
                   continue;
-                if ((entry.fileMtime ?? 0) < cutoff)
-                  continue;
-                seen.add(entry.sessionId);
-                out.push({
+                indexed.add(entry.sessionId);
+                add({
                   toolId: "claude",
                   rawId: entry.sessionId,
                   prefixedId: entry.sessionId,
@@ -11515,7 +11565,7 @@ var init_claude2 = __esm({
             if (!f.endsWith(".jsonl") || f === "sessions-index.json")
               continue;
             const sessionId = basename10(f, ".jsonl");
-            if (seen.has(sessionId))
+            if (indexed.has(sessionId))
               continue;
             const fullPath = join16(projPath, f);
             let stat3;
@@ -11524,10 +11574,13 @@ var init_claude2 = __esm({
             } catch {
               continue;
             }
-            if (stat3.mtimeMs < cutoff)
+            const prior = byId.get(sessionId);
+            if (prior) {
+              add({ ...prior, mtime: stat3.mtimeMs, modified: stat3.mtime.toISOString() });
               continue;
+            }
             const firstPrompt = previews ? extractFirstUserPromptSync(fullPath, { maxLength: 200 }) : "";
-            out.push({
+            add({
               toolId: "claude",
               rawId: sessionId,
               prefixedId: sessionId,
@@ -11657,20 +11710,20 @@ var init_claude2 = __esm({
                     text += (text ? "\n" : "") + it.text;
                   } else if (it.type === "tool_result") {
                     const id = typeof it.tool_use_id === "string" ? it.tool_use_id : "";
-                    let body = "";
+                    let body2 = "";
                     const c = it.content;
                     if (typeof c === "string")
-                      body = c;
+                      body2 = c;
                     else if (Array.isArray(c)) {
                       for (const sub of c) {
                         if (sub && typeof sub === "object" && sub.type === "text") {
                           const t = sub.text;
                           if (typeof t === "string")
-                            body += t;
+                            body2 += t;
                         }
                       }
                     }
-                    toolResults.push({ id, body, isError: it.is_error === true });
+                    toolResults.push({ id, body: body2, isError: it.is_error === true });
                   }
                 }
               }
@@ -12606,10 +12659,10 @@ function applyChunkPrivacy(text) {
     out = redactFilePaths(out);
   return out;
 }
-function redactToolResultBody(toolName, body) {
-  if (!body)
-    return body;
-  return `[redacted: ${toolName} output, ${body.length} chars]`;
+function redactToolResultBody(toolName, body2) {
+  if (!body2)
+    return body2;
+  return `[redacted: ${toolName} output, ${body2.length} chars]`;
 }
 var DEFAULT_REDACTION_RULES, SECRET_CONTEXT_RE, HIGH_ENTROPY_TOKEN_RE, cache, CANARY, MAX_PACK_RULES, MAX_PATTERN_LEN, serverPack, globalRegexCache, privacyCache, PATH_REGEX;
 var init_secret_redactor = __esm({
@@ -14839,8 +14892,8 @@ function parseFrontmatter(content) {
     return { body: content };
   const header = content.slice(3, close);
   const afterFence = content.indexOf("\n", close + 1);
-  const body = afterFence === -1 ? "" : content.slice(afterFence + 1);
-  const out = { body };
+  const body2 = afterFence === -1 ? "" : content.slice(afterFence + 1);
+  const out = { body: body2 };
   for (const line of header.split("\n")) {
     const m = line.match(/^\s*([A-Za-z_]+)\s*:\s*(.+?)\s*$/);
     if (!m)
@@ -14932,9 +14985,9 @@ var init_plan_source = __esm({
               const isAgentPlan = planName.includes("-agent-");
               const content = readFileSync15(filePath, "utf-8");
               const fm = parseFrontmatter(content);
-              const body = fm.body;
-              const firstLine = body.split("\n").find((l) => l.trim())?.replace(/^#+\s*/, "").trim() || planName;
-              const projectPath = fm.cwd || this.extractProjectPath(body);
+              const body2 = fm.body;
+              const firstLine = body2.split("\n").find((l) => l.trim())?.replace(/^#+\s*/, "").trim() || planName;
+              const projectPath = fm.cwd || this.extractProjectPath(body2);
               const baseName = planName.replace(/-agent-[a-z0-9]+$/i, "");
               const claudeSessionId = fm.sessionId || (UUID_RE3.test(baseName) ? baseName : void 0);
               yield {
@@ -14944,7 +14997,7 @@ var init_plan_source = __esm({
                 projectPath,
                 filePath,
                 mtime: stat3.mtimeMs,
-                contentPreview: body.slice(0, 300),
+                contentPreview: body2.slice(0, 300),
                 extra: {
                   tool: "claude",
                   isAgentPlan,
@@ -15051,8 +15104,8 @@ var init_plan_source = __esm({
           return [];
         const content = readFileSync15(item.filePath, "utf-8");
         const chunks = [];
-        const { body } = parseFrontmatter(content);
-        const sections = splitByHeaders(body);
+        const { body: body2 } = parseFrontmatter(content);
+        const sections = splitByHeaders(body2);
         for (let i = 0; i < sections.length; i++) {
           const section = sections[i];
           if (!section.text.trim() || section.text.trim().length < 20)
@@ -15685,10 +15738,10 @@ import { homedir as homedir9 } from "os";
 import { join as join26, basename as basename14 } from "path";
 function parseFrontmatter2(content) {
   const fm = {};
-  let body = content;
+  let body2 = content;
   const m = content.match(/^---\r?\n([\s\S]*?)\r?\n---\r?\n([\s\S]*)$/);
   if (m) {
-    body = m[2];
+    body2 = m[2];
     for (const line of m[1].split(/\r?\n/)) {
       const t = line.trim();
       if (!t || t.startsWith("#"))
@@ -15705,7 +15758,7 @@ function parseFrontmatter2(content) {
         fm[k] = v;
     }
   }
-  return { fm, body };
+  return { fm, body: body2 };
 }
 function projectHashToPath(hashDir) {
   return resolveProjectDirName(hashDir);
@@ -15782,9 +15835,9 @@ var init_agent_memory_source = __esm({
         if (!existsSync25(item.filePath))
           return [];
         const content = readFileSync18(item.filePath, "utf-8");
-        const { body } = parseFrontmatter2(content);
+        const { body: body2 } = parseFrontmatter2(content);
         const chunks = [];
-        const sections = splitByHeaders(body);
+        const sections = splitByHeaders(body2);
         for (let i = 0; i < sections.length; i++) {
           const section = sections[i];
           if (!section.text.trim() || section.text.trim().length < 20)
@@ -17428,13 +17481,13 @@ function parseFrontmatter4(text) {
   }
   return { fm, body: m[2] ?? "" };
 }
-function stringifyFrontmatter(fm, body) {
+function stringifyFrontmatter(fm, body2) {
   const lines = Object.entries(fm).filter(([, v]) => v !== void 0 && v !== "").map(([k, v]) => `${k}: ${needsQuote(v) ? JSON.stringify(v) : v}`);
   return `---
 ${lines.join("\n")}
 ---
 
-${body.replace(/^\n+/, "")}`;
+${body2.replace(/^\n+/, "")}`;
 }
 function needsQuote(v) {
   return /[:#]/.test(v) || /^\s|\s$/.test(v);
@@ -17521,11 +17574,11 @@ function parseCommand(content, fallbackName, format) {
       body: t.prompt || ""
     };
   }
-  const { fm, body } = parseFrontmatter4(content);
+  const { fm, body: body2 } = parseFrontmatter4(content);
   return {
     name: fm.name || fallbackName,
     description: fm.description || "",
-    body: body.trim()
+    body: body2.trim()
   };
 }
 var MAX_CHUNK_CHARS12, MAX_BODY_CHARS2, SlashCommandsSource;
@@ -17669,12 +17722,12 @@ function parseAgent(content, fallbackName, format) {
       body: t.developer_instructions || t.instructions || ""
     };
   }
-  const { fm, body } = parseFrontmatter4(content);
+  const { fm, body: body2 } = parseFrontmatter4(content);
   return {
     name: fm.name || fallbackName,
     description: fm.description || "",
     tools: fm.tools || "",
-    body: body.trim()
+    body: body2.trim()
   };
 }
 var MAX_CHUNK_CHARS13, MAX_BODY_CHARS3, SubagentsSource;
@@ -18587,7 +18640,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.7";
+        if (true) CLI_VERSION = "0.7.9";
       } catch {
       }
     }
@@ -19086,7 +19139,7 @@ var init_telemetry = __esm({
     init_sync_client();
     cliVersion2 = () => {
       try {
-        return true ? "0.7.7" : "dev";
+        return true ? "0.7.9" : "dev";
       } catch {
         return "dev";
       }
@@ -19103,9 +19156,12 @@ __export(collector_health_exports, {
   STALE_AFTER_MS: () => STALE_AFTER_MS,
   applySyncOutcome: () => applySyncOutcome,
   collectorHealthPath: () => collectorHealthPath,
+  crashesAtBoot: () => crashesAtBoot,
   judgeHealth: () => judgeHealth,
+  markCleanExit: () => markCleanExit,
   progressLine: () => progressLine,
   readCollectorHealth: () => readCollectorHealth,
+  recentCrashes: () => recentCrashes,
   reportWalkProgress: () => reportWalkProgress,
   updateCollectorHealth: () => updateCollectorHealth,
   writeCollectorHealth: () => writeCollectorHealth
@@ -19174,6 +19230,20 @@ function reportWalkProgress(p) {
   lastProgressWrite = now;
   updateCollectorHealth({ progress: p });
 }
+function crashesAtBoot(prior, procStart) {
+  const history = (prior?.crashes ?? []).filter((t) => typeof t === "number");
+  if (!prior)
+    return history;
+  const leftOnPurpose = typeof prior.cleanExitAt === "number" && prior.cleanExitAt >= prior.startedAt;
+  return leftOnPurpose ? history : [...history, procStart];
+}
+function recentCrashes(crashes, now = Date.now()) {
+  const cutoff = now - 36e5;
+  return [...new Set(crashes.filter((t) => t > cutoff))].sort((a, b) => a - b).slice(-20);
+}
+function markCleanExit(now = Date.now()) {
+  updateCollectorHealth({ cleanExitAt: now });
+}
 function judgeHealth(h, now = Date.now()) {
   if (!h)
     return { ok: true, summary: null, reasons: [] };
@@ -19183,7 +19253,7 @@ function judgeHealth(h, now = Date.now()) {
     reasons.push(`the collector has not reported for ${ago(silent)} \u2014 it may not be running`);
   }
   if (h.restartsLastHour >= CRASHLOOP_RESTARTS) {
-    reasons.push(`it restarted ${h.restartsLastHour} times in the last hour`);
+    reasons.push(`it crashed ${h.restartsLastHour} times in the last hour`);
   }
   const targets = Object.entries(h.targets ?? {});
   const stale = targets.filter(([, t]) => t.lastOkAt === null || now - t.lastOkAt > STALE_AFTER_MS);
@@ -19258,20 +19328,20 @@ async function probeServer(base3, opts = {}) {
   if (res.status === 404 || res.status === 410) return { kind: "moved", status: res.status };
   if (res.status >= 500) return { kind: "server_error", status: res.status };
   if (!res.ok) return { kind: "moved", status: res.status };
-  let body;
+  let body2;
   try {
-    body = await res.text();
+    body2 = await res.text();
   } catch (err) {
     return { kind: "unreachable", error: describeCause(err), reason: classifyUnreachable(err) };
   }
   let parsed;
   try {
-    parsed = JSON.parse(body);
+    parsed = JSON.parse(body2);
   } catch {
-    return { kind: "not_api", status: res.status, snippet: body.trim().slice(0, 60) };
+    return { kind: "not_api", status: res.status, snippet: body2.trim().slice(0, 60) };
   }
   if (typeof parsed?.apiVersion !== "number") {
-    return { kind: "not_api", status: res.status, snippet: body.trim().slice(0, 60) };
+    return { kind: "not_api", status: res.status, snippet: body2.trim().slice(0, 60) };
   }
   return {
     kind: "ok",
@@ -19390,7 +19460,7 @@ function reportClientEvent(kind, opts = {}) {
   try {
     const targets = loadAllCredentials();
     if (!targets.length) return;
-    const body = JSON.stringify({
+    const body2 = JSON.stringify({
       events: [{
         ts: Date.now(),
         kind: String(kind).slice(0, 64),
@@ -19407,7 +19477,7 @@ function reportClientEvent(kind, opts = {}) {
       void fetch(`${t.serverUrl.replace(/\/+$/, "")}/api/client-events`, {
         method: "POST",
         headers,
-        body,
+        body: body2,
         signal: AbortSignal.timeout(3e3)
       }).catch(() => {
       });
@@ -19821,10 +19891,10 @@ async function fetchTenantSecurityConfig(cred) {
     let tenantRules = [];
     let rulePackVersion = null;
     if (rulesRes.ok) {
-      const body = await rulesRes.json().catch(() => ({}));
-      const enabled = (body.rules || []).filter((r) => r.enabled !== false);
+      const body2 = await rulesRes.json().catch(() => ({}));
+      const enabled = (body2.rules || []).filter((r) => r.enabled !== false);
       tenantRules = enabled;
-      const packSpec = body.pack?.rules ? { version: body.pack.version, rules: body.pack.rules.map((r) => ({ name: r.name, regex: r.regex, flags: r.flags, redact: true, source: r.source })) } : { version: body.version, rules: enabled.filter((r) => r.redact === true).map((r) => ({ name: r.name, regex: r.regex, redact: true, source: "tenant" })) };
+      const packSpec = body2.pack?.rules ? { version: body2.pack.version, rules: body2.pack.rules.map((r) => ({ name: r.name, regex: r.regex, flags: r.flags, redact: true, source: r.source })) } : { version: body2.version, rules: enabled.filter((r) => r.redact === true).map((r) => ({ name: r.name, regex: r.regex, redact: true, source: "tenant" })) };
       lastServerPackSpec = { version: packSpec.version || "", rules: packSpec.rules };
       const pack = installServerRulePack(packSpec);
       rulePackVersion = serverRulePackVersion();
@@ -19832,20 +19902,20 @@ async function fetchTenantSecurityConfig(cred) {
         console.error(`[sync] server redaction rule "${r.name}" ignored: ${r.reason}`);
       }
       if (pack.accepted > 0) {
-        const rev = body.pack?.revision ? `, rev ${body.pack.revision}` : "";
+        const rev = body2.pack?.revision ? `, rev ${body2.pack.revision}` : "";
         console.error(`[sync] ${pack.accepted} server redaction rule(s) active (pack ${rulePackVersion}${rev})`);
       }
     }
     let verifySecrets = true;
     if (settingsRes?.ok) {
-      const body = await settingsRes.json().catch(() => ({}));
-      if (typeof body.verifySecrets === "boolean") verifySecrets = body.verifySecrets;
-      if (typeof body.telemetry === "boolean") {
-        setTelemetryEligible(base3, body.telemetry);
+      const body2 = await settingsRes.json().catch(() => ({}));
+      if (typeof body2.verifySecrets === "boolean") verifySecrets = body2.verifySecrets;
+      if (typeof body2.telemetry === "boolean") {
+        setTelemetryEligible(base3, body2.telemetry);
         try {
           const prior = readCollectorHealth()?.telemetryEligible ?? {};
           updateCollectorHealth({
-            telemetryEligible: { ...prior, [base3]: { allowed: body.telemetry, at: Date.now() } }
+            telemetryEligible: { ...prior, [base3]: { allowed: body2.telemetry, at: Date.now() } }
           });
         } catch {
         }
@@ -19904,14 +19974,14 @@ async function fetchTenantSyncConfig(cred) {
       return EMPTY_SYNC_CONFIG;
     }
     if (!res.ok) return lastKnownSyncConfig(base3, `HTTP ${res.status}`);
-    const body = await res.json().catch(() => ({}));
+    const body2 = await res.json().catch(() => ({}));
     const config2 = {
-      excludeTools: Array.isArray(body.excludeTools) ? body.excludeTools.filter((t) => typeof t === "string") : [],
-      excludeProjects: Array.isArray(body.excludeProjects) ? body.excludeProjects.filter((p) => typeof p === "string") : [],
+      excludeTools: Array.isArray(body2.excludeTools) ? body2.excludeTools.filter((t) => typeof t === "string") : [],
+      excludeProjects: Array.isArray(body2.excludeProjects) ? body2.excludeProjects.filter((p) => typeof p === "string") : [],
       // Ids only — installSourceExclusions drops anything else, so a server
       // sending a path cannot make this collector read it.
-      excludeSources: Array.isArray(body.excludeSources) ? body.excludeSources.filter((x) => typeof x === "string") : [],
-      approveSources: Array.isArray(body.approveSources) ? body.approveSources.filter((x) => typeof x === "string") : []
+      excludeSources: Array.isArray(body2.excludeSources) ? body2.excludeSources.filter((x) => typeof x === "string") : [],
+      approveSources: Array.isArray(body2.approveSources) ? body2.approveSources.filter((x) => typeof x === "string") : []
     };
     const applied = installSourceExclusions(config2.excludeSources);
     if (applied.excluded > 0) {
@@ -20306,9 +20376,9 @@ async function syncToTargetInScope(cred, opts = {}) {
   const maxInflight = explicitThrottle ? 1 : isLocalHost(cred.serverUrl) ? Math.max(LOCAL_INFLIGHT, advertised ?? 0) : advertised ?? REMOTE_INFLIGHT_FALLBACK;
   const UPLOAD_TIMEOUT_MS = Number(process.env.CHAT_RECALL_UPLOAD_TIMEOUT_MS) || 9e4;
   const gzipBody = serverAcceptsGzipBody(cred.serverUrl);
-  const post = async (body) => {
+  const post = async (body2) => {
     const payload = (() => {
-      const withProgress = walkProgressForUpload ? { ...body, progress: walkProgressForUpload } : body;
+      const withProgress = walkProgressForUpload ? { ...body2, progress: walkProgressForUpload } : body2;
       const json = JSON.stringify(withProgress);
       const raw = Buffer.from(json, "utf8");
       return gzipBody ? gzipSync3(raw, { level: 6 }) : raw;
@@ -20332,25 +20402,25 @@ async function syncToTargetInScope(cred, opts = {}) {
         });
         if (res.ok) {
           acceptedUploads.set(cred.serverUrl, (acceptedUploads.get(cred.serverUrl) ?? 0) + 1);
-          const body2 = await res.json().catch(() => ({}));
-          if (typeof body2.telemetry === "boolean") {
-            setTelemetryEligible(base3, body2.telemetry);
+          const body3 = await res.json().catch(() => ({}));
+          if (typeof body3.telemetry === "boolean") {
+            setTelemetryEligible(base3, body3.telemetry);
             try {
               const prior = readCollectorHealth()?.telemetryEligible ?? {};
               updateCollectorHealth({
-                telemetryEligible: { ...prior, [base3]: { allowed: body2.telemetry, at: Date.now() } }
+                telemetryEligible: { ...prior, [base3]: { allowed: body3.telemetry, at: Date.now() } }
               });
             } catch {
             }
           }
-          const adv = body2.limits?.ingestConcurrencyPerTenant;
+          const adv = body3.limits?.ingestConcurrencyPerTenant;
           if (typeof adv === "number" && Number.isFinite(adv) && adv >= 1) {
             setServerIngestConcurrency(base3, Math.floor(adv));
           }
-          if (body2.cli && body2.cli.version) {
+          if (body3.cli && body3.cli.version) {
             const { planAutoUpdate: planAutoUpdate2, runAutoUpdate: runAutoUpdate2, sweepStaleStaging: sweepStaleStaging2 } = await Promise.resolve().then(() => (init_auto_update(), auto_update_exports));
             const authHeaders = cred.token ? { authorization: `Bearer ${cred.token}` } : {};
-            const plan = planAutoUpdate2(base3, { cli: body2.cli }, ownVersion, process.env.CHAT_RECALL_AUTO_UPDATE);
+            const plan = planAutoUpdate2(base3, { cli: body3.cli }, ownVersion, process.env.CHAT_RECALL_AUTO_UPDATE);
             sweepStaleStaging2();
             if (plan.update) {
               void runAutoUpdate2(base3, authHeaders, ownVersion).catch(() => {
@@ -20367,13 +20437,13 @@ async function syncToTargetInScope(cred, opts = {}) {
         if (res.status === 402) {
           let detail = text;
           try {
-            const body2 = JSON.parse(text);
-            detail = body2.error ?? text;
-            if (body2.detail) detail += `
-  ${body2.detail}`;
-            if (body2.resetsAt) detail += ` (resets ${new Date(body2.resetsAt).toISOString().slice(0, 10)})`;
-            if (body2.upgradeUrl) detail += `
-  ${body2.upgradeUrl}`;
+            const body3 = JSON.parse(text);
+            detail = body3.error ?? text;
+            if (body3.detail) detail += `
+  ${body3.detail}`;
+            if (body3.resetsAt) detail += ` (resets ${new Date(body3.resetsAt).toISOString().slice(0, 10)})`;
+            if (body3.upgradeUrl) detail += `
+  ${body3.upgradeUrl}`;
           } catch {
           }
           throw classedError("payment_required", `sync paused by the server: ${detail}`);
@@ -20402,7 +20472,7 @@ async function syncToTargetInScope(cred, opts = {}) {
   let poolError = null;
   const MAX_INFLIGHT_BYTES = (Number(process.env.CHAT_RECALL_MAX_INFLIGHT_MB) || 32) * 1024 * 1024;
   let inflightBytes = 0;
-  const submit = async (body, after, bytesHint = 0) => {
+  const submit = async (body2, after, bytesHint = 0) => {
     while (inflight.size > 0 && (inflight.size >= maxInflight || inflightBytes + bytesHint > MAX_INFLIGHT_BYTES)) {
       await Promise.race(inflight);
     }
@@ -20410,7 +20480,7 @@ async function syncToTargetInScope(cred, opts = {}) {
     inflightBytes += bytesHint;
     let task;
     task = (async () => {
-      await post(body);
+      await post(body2);
       after();
     })().catch((e) => {
       poolError = poolError ?? e;
@@ -20477,18 +20547,18 @@ async function syncToTargetInScope(cred, opts = {}) {
         signal: ac.signal
       });
       if (!res.ok) throw new Error(`append sync failed: HTTP ${res.status} ${await res.text().catch(() => "")}`);
-      const body = await res.json().catch(() => ({}));
-      if (body.cli && body.cli.version) {
+      const body2 = await res.json().catch(() => ({}));
+      if (body2.cli && body2.cli.version) {
         const { planAutoUpdate: planAutoUpdate2, runAutoUpdate: runAutoUpdate2, sweepStaleStaging: sweepStaleStaging2 } = await Promise.resolve().then(() => (init_auto_update(), auto_update_exports));
         const authHeaders = cred.token ? { authorization: `Bearer ${cred.token}` } : {};
-        const plan = planAutoUpdate2(base3, { cli: body.cli }, ownVersion, process.env.CHAT_RECALL_AUTO_UPDATE);
+        const plan = planAutoUpdate2(base3, { cli: body2.cli }, ownVersion, process.env.CHAT_RECALL_AUTO_UPDATE);
         sweepStaleStaging2();
         if (plan.update) {
           void runAutoUpdate2(base3, authHeaders, ownVersion).catch(() => {
           });
         }
       }
-      const fullNeeded = new Set(body.full_resync_needed ?? []);
+      const fullNeeded = new Set(body2.full_resync_needed ?? []);
       const acked = convs.filter((c) => !fullNeeded.has(c.session_id));
       if (acked.length > 0) {
         try {
@@ -20523,9 +20593,9 @@ async function syncToTargetInScope(cred, opts = {}) {
         signal: ac.signal
       });
       if (!res.ok) throw new Error(`chunked head sync failed: HTTP ${res.status} ${await res.text().catch(() => "")}`);
-      const body = await res.json().catch(() => ({}));
+      const body2 = await res.json().catch(() => ({}));
       const id = conv.session_id;
-      const guarded = (body.shrink_guarded ?? []).find((g) => g.session_id === id);
+      const guarded = (body2.shrink_guarded ?? []).find((g) => g.session_id === id);
       const mtime = conv.mtime;
       try {
         if (!guarded) {
@@ -21402,7 +21472,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.7";
+        if (true) ownVersion = "0.7.9";
       } catch {
       }
     }
@@ -21481,8 +21551,8 @@ async function fetchNpmLatest() {
       headers: { accept: "application/vnd.npm.install-v1+json" }
     }, 5e3);
     if (!res.ok) return null;
-    const body = await res.json();
-    const v = body["dist-tags"]?.latest;
+    const body2 = await res.json();
+    const v = body2["dist-tags"]?.latest;
     return typeof v === "string" && v ? v : null;
   } catch {
     return null;
@@ -21664,9 +21734,9 @@ function envHome(varName, fallback) {
   const v = process.env[varName];
   return v && v.trim() ? v.trim() : fallback;
 }
-function writeFileMkdir(path, body) {
+function writeFileMkdir(path, body2) {
   mkdirSync12(dirname21(path), { recursive: true });
-  writeFileSync12(path, body);
+  writeFileSync12(path, body2);
 }
 function readJsonObject(path) {
   const raw = readFileSync37(path, "utf-8");
@@ -21748,8 +21818,8 @@ function registerCodexToml(path, spec) {
   const lines = prev.length ? prev.split("\n") : [];
   const start = lines.findIndex((l) => l.trim() === CODEX_HEADER);
   if (start === -1) {
-    const body = prev.length ? prev.replace(/\n*$/, "\n") + "\n" + block : block;
-    writeFileMkdir(path, body);
+    const body2 = prev.length ? prev.replace(/\n*$/, "\n") + "\n" + block : block;
+    writeFileMkdir(path, body2);
     return { id, label, path, state: "created" };
   }
   let end = lines.length;
@@ -22290,8 +22360,8 @@ function parseCommandText(content, format, fallbackName) {
     const t = parseScalarToml(content);
     return { name: t.name || fallbackName, description: t.description || "", body: t.prompt || "" };
   }
-  const { fm, body } = parseFrontmatter4(content);
-  return { name: fm.name || fallbackName, description: fm.description || "", body: body.trim() };
+  const { fm, body: body2 } = parseFrontmatter4(content);
+  return { name: fm.name || fallbackName, description: fm.description || "", body: body2.trim() };
 }
 function parseAgentText(content, format, fallbackName) {
   if (format === "toml") {
@@ -22302,8 +22372,8 @@ function parseAgentText(content, format, fallbackName) {
       body: t.developer_instructions || t.instructions || ""
     };
   }
-  const { fm, body } = parseFrontmatter4(content);
-  return { name: fm.name || fallbackName, description: fm.description || "", tools: fm.tools, body: body.trim() };
+  const { fm, body: body2 } = parseFrontmatter4(content);
+  return { name: fm.name || fallbackName, description: fm.description || "", tools: fm.tools, body: body2.trim() };
 }
 function readCommand(filePath, format) {
   return parseCommandText(readFileSync40(filePath, "utf-8"), format, base(filePath));
@@ -22960,8 +23030,8 @@ function planPull(rows, opts = {}) {
         continue;
       const extra2 = parseExtra(row);
       const name2 = extra2.skillName || row.title;
-      const body = extra2.body;
-      if (!name2 || typeof body !== "string" || !body.trim()) {
+      const body2 = extra2.body;
+      if (!name2 || typeof body2 !== "string" || !body2.trim()) {
         seenUnsupported.set("skill", (seenUnsupported.get("skill") || 0) + 1);
         continue;
       }
@@ -22970,7 +23040,7 @@ function planPull(rows, opts = {}) {
       const prev2 = skillsByName.get(name2);
       if (!prev2 || rank >= 0 && (prev2.rank < 0 || rank < prev2.rank)) {
         skillsByName.set(name2, {
-          body,
+          body: body2,
           rank,
           truncated: extra2.bodyTruncated === true,
           redacted: extra2.bodySecretsRedacted === true
@@ -22983,8 +23053,8 @@ function planPull(rows, opts = {}) {
         continue;
       const extra2 = parseExtra(row);
       const name2 = extra2[type === "agent" ? "agentName" : "commandName"] || row.title;
-      const body = extra2.body;
-      if (!name2 || typeof body !== "string" || !body.trim() || extra2.bodyTruncated === true) {
+      const body2 = extra2.body;
+      if (!name2 || typeof body2 !== "string" || !body2.trim() || extra2.bodyTruncated === true) {
         seenUnsupported.set(type, (seenUnsupported.get(type) || 0) + 1);
         continue;
       }
@@ -22994,7 +23064,7 @@ function planPull(rows, opts = {}) {
       const prev2 = bucket.get(name2);
       if (!prev2 || rank >= 0 && (prev2.rank < 0 || rank < prev2.rank)) {
         bucket.set(name2, {
-          body,
+          body: body2,
           rank,
           format: extra2.format === "toml" ? "toml" : "md",
           redacted: extra2.bodySecretsRedacted === true
@@ -23063,7 +23133,7 @@ function executePull(rows, opts = {}) {
   const explicit = new Set(opts.explicit ?? []);
   const { mcps, skills, codecs, unsupported } = planPull(rows, opts);
   const outcomes = [];
-  for (const { name, body, truncated, redacted, tools } of skills) {
+  for (const { name, body: body2, truncated, redacted, tools } of skills) {
     for (const tool of tools) {
       const dir = join51(skillsDirFor(tool), name);
       const file = join51(dir, "SKILL.md");
@@ -23081,17 +23151,17 @@ function executePull(rows, opts = {}) {
       }
       try {
         mkdirSync16(dir, { recursive: true });
-        writeFileSync16(file, body);
+        writeFileSync16(file, body2);
         outcomes.push({ type: "skill", name, tool, status: "written", path: file, redactedContent: redacted });
       } catch (e) {
         outcomes.push({ type: "skill", name, tool, status: "failed", reason: e instanceof Error ? e.message : "write failed" });
       }
     }
   }
-  for (const { type, name, body, format, redacted, tools } of codecs) {
+  for (const { type, name, body: body2, format, redacted, tools } of codecs) {
     let art;
     try {
-      art = type === "agent" ? parseAgentText(body, format, name) : parseCommandText(body, format, name);
+      art = type === "agent" ? parseAgentText(body2, format, name) : parseCommandText(body2, format, name);
     } catch (e) {
       for (const tool of tools) {
         outcomes.push({ type, name, tool, status: "failed", reason: `could not parse the stored body: ${e instanceof Error ? e.message : "failed"}` });
@@ -24370,11 +24440,11 @@ async function collectCode(opts) {
     for (const block of log22.split("\0END\0")) {
       if (!block.includes("\0"))
         continue;
-      const [h, body] = [block.slice(0, block.indexOf("\0")).trim(), block.slice(block.indexOf("\0") + 1)];
+      const [h, body2] = [block.slice(0, block.indexOf("\0")).trim(), block.slice(block.indexOf("\0") + 1)];
       if (!h)
         continue;
       totalCommits++;
-      if (AI_RE.test(body)) {
+      if (AI_RE.test(body2)) {
         aiCommits++;
         try {
           const files2 = execSync4(`git -C "${ws}" show --format= --name-only ${h}`, { encoding: "utf8", timeout: 2e4, maxBuffer: 64 * 1024 * 1024, stdio: ["ignore", "pipe", "ignore"] });
@@ -25417,8 +25487,8 @@ async function runPull(base3, opts) {
     try {
       const res = await fetchWithTimeout(`${base3}/api/toolkit/browse/${type}?limit=1000`, { headers });
       if (!res.ok) continue;
-      const body = await res.json();
-      for (const it of body.items || []) rows.push(it);
+      const body2 = await res.json();
+      for (const it of body2.items || []) rows.push(it);
     } catch {
     }
   }
@@ -25563,7 +25633,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.7";
+        if (true) ownVersion2 = "0.7.9";
       } catch {
       }
     }
@@ -25604,7 +25674,7 @@ function context(opts = {}) {
     throw new TeamConfigError("Not joined to a team. Run `chat-recall team join <invite-token>`.");
   return { serverUrl: t.serverUrl, token, handle: t.memberHandle ?? "", teamId: t.teamId };
 }
-async function http(ctx, method, path, body) {
+async function http(ctx, method, path, body2) {
   const url = ctx.serverUrl.replace(/\/+$/, "") + path;
   const r = await fetch(url, {
     method,
@@ -25613,7 +25683,7 @@ async function http(ctx, method, path, body) {
       "Content-Type": "application/json",
       "Accept": "application/json"
     },
-    body: body == null ? void 0 : JSON.stringify(body)
+    body: body2 == null ? void 0 : JSON.stringify(body2)
   });
   const text = await r.text();
   let parsed = void 0;
@@ -25750,10 +25820,10 @@ var init_team_client = __esm({
     TeamHttpError = class extends Error {
       status;
       body;
-      constructor(msg, status, body) {
+      constructor(msg, status, body2) {
         super(msg);
         this.status = status;
-        this.body = body;
+        this.body = body2;
       }
     };
   }
@@ -25846,8 +25916,8 @@ async function mergePullResult(opts) {
       report.skipped.push({ artifactId: a.id, path: "(no installed target tool)", reason: "no-target-tool" });
       continue;
     }
-    const body = Buffer.from(a.bodyB64, "base64");
-    const sha = createHash14("sha256").update(body).digest("hex");
+    const body2 = Buffer.from(a.bodyB64, "base64");
+    const sha = createHash14("sha256").update(body2).digest("hex");
     for (const tool of targets) {
       const path = installPathFor(a, tool);
       if (!path)
@@ -25860,7 +25930,7 @@ async function mergePullResult(opts) {
           continue;
         }
         mkdirSync20(dirname27(path), { recursive: true });
-        writeFileSync20(path, body);
+        writeFileSync20(path, body2);
         pending.push({ artifactId: a.id, tool, artifactType: a.type, artifactName: a.name, sha256: sha, installedAt: Date.now() });
         report.written.push({ artifactId: a.id, path });
       } catch (err) {
@@ -26166,7 +26236,7 @@ function context2() {
     throw new VaultConfigError(`Env var ${s.tokenRef} is not set.`);
   return { serverUrl: s.serverUrl, teamId: s.teamId, token };
 }
-async function api(ctx, method, path, body) {
+async function api(ctx, method, path, body2) {
   const doFetch = () => fetch(ctx.serverUrl.replace(/\/+$/, "") + path, {
     method,
     headers: {
@@ -26174,7 +26244,7 @@ async function api(ctx, method, path, body) {
       "Content-Type": "application/json",
       "Accept": "application/json"
     },
-    body: body == null ? void 0 : JSON.stringify(body)
+    body: body2 == null ? void 0 : JSON.stringify(body2)
   });
   let r;
   try {
@@ -26253,13 +26323,13 @@ async function vaultEnableWithRemote(passphrase, remote, opts = {}) {
       body: JSON.stringify({ saltHex: result.saltHex, keyId: result.keyId })
     });
     if (r.status === 409) {
-      const body = await r.json();
-      if (body.saltHex && body.saltHex !== result.saltHex) {
-        const redone = vaultEnable(passphrase, { existingSaltHex: body.saltHex });
-        if (body.keyId && body.keyId !== redone.keyId) {
+      const body2 = await r.json();
+      if (body2.saltHex && body2.saltHex !== result.saltHex) {
+        const redone = vaultEnable(passphrase, { existingSaltHex: body2.saltHex });
+        if (body2.keyId && body2.keyId !== redone.keyId) {
           throw new VaultPassphraseMismatchError("Another device published a vault with a different passphrase. Nothing was changed here.");
         }
-        return { ...redone, saltSource: "server", keyIdMatches: body.keyId ? true : void 0 };
+        return { ...redone, saltSource: "server", keyIdMatches: body2.keyId ? true : void 0 };
       }
     }
   } catch (err) {
@@ -26421,10 +26491,10 @@ var init_vault_client = __esm({
     VaultHttpError = class extends Error {
       status;
       body;
-      constructor(msg, status, body) {
+      constructor(msg, status, body2) {
         super(msg);
         this.status = status;
-        this.body = body;
+        this.body = body2;
       }
     };
     uploadKey = (sessionId, tool) => `${sessionId}\0${tool}`;
@@ -27321,15 +27391,15 @@ async function deviceLogin(opts, onPrompt) {
         code_verifier: codeVerifier
       })
     });
-    const body = await res.json().catch(() => ({}));
-    if (res.ok && typeof body.access_token === "string") {
+    const body2 = await res.json().catch(() => ({}));
+    if (res.ok && typeof body2.access_token === "string") {
       return {
-        accessToken: body.access_token,
-        refreshToken: typeof body.refresh_token === "string" ? body.refresh_token : void 0,
-        expiresIn: typeof body.expires_in === "number" ? body.expires_in : 0
+        accessToken: body2.access_token,
+        refreshToken: typeof body2.refresh_token === "string" ? body2.refresh_token : void 0,
+        expiresIn: typeof body2.expires_in === "number" ? body2.expires_in : 0
       };
     }
-    const err = body.error;
+    const err = body2.error;
     if (err === "authorization_pending") continue;
     if (err === "slow_down") {
       interval += 5e3;
@@ -27369,14 +27439,14 @@ async function betterAuthDeviceLogin(serverUrl, onPrompt) {
         client_id: BETTER_AUTH_CLI_CLIENT_ID
       })
     });
-    const body = await res.json().catch(() => ({}));
-    if (res.ok && typeof body.access_token === "string") {
+    const body2 = await res.json().catch(() => ({}));
+    if (res.ok && typeof body2.access_token === "string") {
       return {
-        accessToken: body.access_token,
-        expiresIn: typeof body.expires_in === "number" ? body.expires_in : 0
+        accessToken: body2.access_token,
+        expiresIn: typeof body2.expires_in === "number" ? body2.expires_in : 0
       };
     }
-    const err = body.error;
+    const err = body2.error;
     if (err === "authorization_pending") continue;
     if (err === "slow_down") {
       interval += 5e3;
@@ -27466,8 +27536,8 @@ async function selectSessions(target, opts, fetchImpl = fetch) {
       headers: { authorization: `Bearer ${target.token}` }
     });
     if (!res.ok) throw new Error(`list failed: HTTP ${res.status}`);
-    const body = await res.json();
-    const page = body.sessions ?? [];
+    const body2 = await res.json();
+    const page = body2.sessions ?? [];
     if (page.length === 0) break;
     for (const row of page) {
       if (!row.sessionId) continue;
@@ -27550,9 +27620,9 @@ async function restoreSessions(ids, opts = {}) {
           body: JSON.stringify({ session_ids: unique.slice(i, i + BATCH) })
         });
         if (!res.ok) throw new Error(`HTTP ${res.status}`);
-        const body = await res.json();
-        restored += body.restored ?? 0;
-        notDeleted += (body.notDeleted ?? []).length;
+        const body2 = await res.json();
+        restored += body2.restored ?? 0;
+        notDeleted += (body2.notDeleted ?? []).length;
       }
       out.perTarget[t.serverUrl] = { restored, notDeleted };
       best = Math.max(best, restored);
@@ -27618,6 +27688,104 @@ function resumeCommandFor(sessionId, tool) {
   }
 }
 
+// ../engine/dist/mcp/show-render.js
+var BODY_LIMIT = 2e3;
+var EDGE = 100;
+var INDENT = "    ";
+var oneLine = (v) => String(v).replace(/\s*\n\s*/g, " \u23CE ");
+var indent = (text) => text.split("\n").map((l) => INDENT + l).join("\n");
+function safeSlice(s, start, end) {
+  const lo = start > 0 && /[\uDC00-\uDFFF]/.test(s[start] ?? "") ? start - 1 : start;
+  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);
+  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");
+}
+function resultText(result) {
+  if (typeof result === "string")
+    return result;
+  if (Array.isArray(result)) {
+    return result.map((b) => {
+      if (b?.type === "text")
+        return String(b.text ?? "");
+      if (b?.type === "image")
+        return "[image]";
+      if (b?.type === "tool_reference")
+        return `[tool_reference: ${b.tool_name ?? ""}]`;
+      return JSON.stringify(b);
+    }).join("\n");
+  }
+  return JSON.stringify(result);
+}
+function renderToolCall(tc, line, opts) {
+  const inp = tc.input && typeof tc.input === "object" ? tc.input : {};
+  const out = [];
+  if (tc.name === "Bash" && inp.command !== void 0) {
+    const desc = inp.description ? `  # ${oneLine(inp.description)}` : "";
+    out.push(`[Bash]${desc}
+  $ ${oneLine(inp.command)}`);
+  } else if (inp.file_path !== void 0) {
+    const inline = {};
+    const blocks = [];
+    for (const [k, v] of Object.entries(inp)) {
+      if (k === "file_path")
+        continue;
+      if (typeof v === "string" && (v.includes("\n") || v.length > 120))
+        blocks.push([k, v]);
+      else
+        inline[k] = v;
+    }
+    const opts_ = Object.keys(inline).length ? ` ${JSON.stringify(inline)}` : "";
+    out.push(`[${tc.name}] ${inp.file_path}${opts_}`);
+    for (const [k, v] of blocks)
+      out.push(`  ${k}:`, body(v, line, opts));
+  } else if (typeof tc.input === "string") {
+    out.push(`[${tc.name}]`, body(tc.input, line, opts));
+  } else {
+    const json = JSON.stringify(tc.input ?? {});
+    if (opts.full || json.length <= BODY_LIMIT)
+      out.push(`[${tc.name}] ${oneLine(json)}`);
+    else
+      out.push(`[${tc.name}]`, body(json, line, opts));
+  }
+  if (tc.result !== void 0) {
+    out.push(tc.isError ? "  \u2192 error:" : "  \u2192 result:", body(resultText(tc.result), line, opts));
+  }
+  return out.join("\n");
+}
+function renderShowMessages(messages, opts = {}) {
+  const out = [];
+  for (const msg of messages) {
+    const text = msg.content ?? "";
+    const thinking = msg.thinking ?? "";
+    const calls = msg.toolCalls ?? [];
+    if (!text.trim() && !thinking.trim() && !calls.length && msg.thinking !== void 0)
+      continue;
+    out.push(`**${msg.role}** (line ${msg.line})`);
+    if (thinking.trim())
+      out.push(`_(thinking)_
+${thinking}`);
+    if (text.trim())
+      out.push(text);
+    for (const tc of calls)
+      out.push(renderToolCall(tc, msg.line, opts));
+    if (!text.trim() && !thinking.trim() && !calls.length)
+      out.push("_(empty)_");
+    out.push("");
+  }
+  return out;
+}
+
 // src/cli.ts
 init_paths();
 init_claude2();
@@ -27850,38 +28018,38 @@ async function serverGetSoft(path) {
   const t = requireTarget();
   const res = await fetch(t.base + path, { headers: t.token ? { authorization: `Bearer ${t.token}` } : {} });
   if (res.status === 202 || res.status === 404) {
-    const body = await res.json().catch(() => ({}));
-    return { status: res.status, data: null, message: body.message };
+    const body2 = await res.json().catch(() => ({}));
+    return { status: res.status, data: null, message: body2.message };
   }
   if (!res.ok) throw new Error(`server ${path}: HTTP ${res.status} ${await res.text().catch(() => "")}`);
   return { status: res.status, data: await readJsonBody(res, t.base, `GET ${path}`) };
 }
-async function serverPost(path, body) {
+async function serverPost(path, body2) {
   const t = requireTarget();
   const res = await fetch(t.base + path, {
     method: "POST",
     headers: t.token ? { "content-type": "application/json", authorization: `Bearer ${t.token}` } : { "content-type": "application/json" },
-    body: JSON.stringify(body)
+    body: JSON.stringify(body2)
   });
   if (!res.ok) throw new Error(`server ${path}: HTTP ${res.status} ${await res.text().catch(() => "")}`);
   return readJsonBody(res, t.base, `POST ${path}`);
 }
-async function serverPatch(path, body) {
+async function serverPatch(path, body2) {
   const t = requireTarget();
   const res = await fetch(t.base + path, {
     method: "PATCH",
     headers: t.token ? { "content-type": "application/json", authorization: `Bearer ${t.token}` } : { "content-type": "application/json" },
-    body: JSON.stringify(body)
+    body: JSON.stringify(body2)
   });
   if (!res.ok) throw new Error(`server ${path}: HTTP ${res.status} ${await res.text().catch(() => "")}`);
   return readJsonBody(res, t.base, `PATCH ${path}`);
 }
-async function serverDelete(path, body) {
+async function serverDelete(path, body2) {
   const t = requireTarget();
   const res = await fetch(t.base + path, {
     method: "DELETE",
     headers: t.token ? { "content-type": "application/json", authorization: `Bearer ${t.token}` } : { "content-type": "application/json" },
-    body: JSON.stringify(body)
+    body: JSON.stringify(body2)
   });
   if (!res.ok) throw new Error(`server ${path}: HTTP ${res.status} ${await res.text().catch(() => "")}`);
   return readJsonBody(res, t.base, `DELETE ${path}`);
@@ -28168,15 +28336,15 @@ program.command("init").description("Set up chat-recall: connect to your server,
               continue;
             }
             const text = await res.text();
-            let body;
+            let body2;
             try {
-              body = JSON.parse(text);
+              body2 = JSON.parse(text);
             } catch {
               askFailed.push(`${t.serverUrl} (not JSON: ${JSON.stringify(text.trim().slice(0, 40))})`);
               continue;
             }
             answered++;
-            for (const it of body.items || []) rows.push(it);
+            for (const it of body2.items || []) rows.push(it);
           } catch (e) {
             askFailed.push(`${t.serverUrl} (${describeProbeError(e)})`);
           }
@@ -28425,7 +28593,7 @@ program.command("optimize").description("Deprecated: storage is server-side now,
   console.log(chalk2.dim("Run `chat-recall sync` to ship sessions; the server manages its own storage."));
   process.exit(0);
 });
-program.command("show <session_id>").description("Show conversation content from a session (requires login)").option("-m, --messages <number>", "Number of messages to show", "10").option("-f, --full", "Show full conversation (all messages)", false).action(async (sessionId, options) => {
+program.command("show <session_id>").description("Show conversation content from a session (requires login)").option("-m, --messages <number>", "Number of messages to show", "10").option("-f, --full", "Show full conversation (all messages)", false).option("-l, --line <number>", "Show only the message at this line, with every tool input and result whole").action(async (sessionId, options) => {
   try {
     const soft = await serverGetSoft(`/api/conversations/${encodeURIComponent(sessionId)}?limit=0`);
     if (!soft.data || soft.data.messages.length === 0) {
@@ -28435,20 +28603,21 @@ program.command("show <session_id>").description("Show conversation content from
     const messagesList = soft.data.messages;
     console.log(chalk2.bold("Session:"), sessionId);
     console.log();
-    const maxMessages = parseInt(options.messages, 10);
-    const displayMessages = options.full ? messagesList : messagesList.slice(0, maxMessages);
-    for (const msg of displayMessages) {
-      const text = msg.content;
-      if (msg.role === "user") {
-        console.log(`${chalk2.bold.blue("User")} ${chalk2.dim(`(line ${msg.line})`)}`);
-      } else if (msg.role === "assistant") {
-        console.log(`${chalk2.bold.green("Assistant")} ${chalk2.dim(`(line ${msg.line})`)}`);
-      } else {
-        console.log(chalk2.bold.yellow(msg.role));
+    if (options.line !== void 0) {
+      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)}.`));
+        process.exit(1);
       }
-      console.log(text);
-      console.log();
+      console.log(renderShowMessages([hit], { full: true }).join("\n"));
+      return;
     }
+    const maxMessages = parseInt(options.messages, 10);
+    const displayMessages = options.full ? messagesList : messagesList.slice(0, maxMessages);
+    const expandHint = (line) => `Run chat-recall show ${sessionId} --line ${line} for the whole text.`;
+    console.log(renderShowMessages(displayMessages, { expandHint }).join("\n"));
     console.log(chalk2.dim(`Showing ${displayMessages.length} of ${messagesList.length} messages. Use --full for the complete conversation.`));
     {
       const rc = resumeCommandFor(sessionId);
@@ -28661,8 +28830,8 @@ program.command("feedback").argument("<message...>", "what you want to say \u201
       signal: AbortSignal.timeout(1e4)
     });
     if (!res.ok) {
-      const body = await res.json().catch(() => ({}));
-      console.error(chalk2.red(`Could not send: ${body.error || res.status}`));
+      const body2 = await res.json().catch(() => ({}));
+      console.error(chalk2.red(`Could not send: ${body2.error || res.status}`));
       process.exitCode = 1;
       return;
     }
@@ -29079,8 +29248,8 @@ program.command("verify").description("Check that the server holds everything th
       if (token) headers.authorization = `Bearer ${token}`;
       const res = await fetchWithTimeout2(`${server}/api/status/archives`, { headers }, 12e4);
       if (!res.ok) throw new Error(`${server}: HTTP ${res.status} from /api/status/archives`);
-      const body = await res.json();
-      return new Map((body.archives || []).map((a) => [a.id, Number(a.size) || 0]));
+      const body2 = await res.json();
+      return new Map((body2.archives || []).map((a) => [a.id, Number(a.size) || 0]));
     }
   };
   let exitCode = 0;
@@ -29132,8 +29301,8 @@ ${t.serverUrl}`));
               console.log(`      ${f.sessionId.slice(0, 8)}  server records unavailable (HTTP ${res.status})`);
               continue;
             }
-            const body = await res.json();
-            serverIds = new Set(body.records || []);
+            const body2 = await res.json();
+            serverIds = new Set(body2.records || []);
           } catch (e) {
             console.log(`      ${f.sessionId.slice(0, 8)}  record fetch failed: ${e instanceof Error ? e.message : e}`);
             continue;
@@ -29453,8 +29622,8 @@ toolkit.command("pull").description("Install artifacts this device is missing, f
           headers: t.token ? { authorization: `Bearer ${t.token}` } : {}
         });
         if (!res.ok) continue;
-        const body = await res.json();
-        for (const it of body.items || []) rows.push(it);
+        const body2 = await res.json();
+        for (const it of body2.items || []) rows.push(it);
       } catch (err) {
         console.log(chalk2.dim(`  (${t.serverUrl} ${type}: ${err instanceof Error ? err.message : err})`));
       }
@@ -29696,13 +29865,13 @@ team.command("publish <type> <name> <file>").description("Publish a local file a
     process.exit(1);
   }
   const { readFileSync: readFileSync50 } = await import("fs");
-  const body = readFileSync50(file);
+  const body2 = readFileSync50(file);
   const { teamPublish: teamPublish2 } = await Promise.resolve().then(() => (init_team_client(), team_client_exports));
   const a = await teamPublish2({
     type,
     tool: opts.tool,
     name,
-    body,
+    body: body2,
     pinnedTo: opts.pinnedTo
   });
   console.log(chalk2.green(`\u2713 Published ${chalk2.bold(type + "/" + name)} v${a.version}`));
@@ -29995,13 +30164,13 @@ program.command("task-hook").description("Move a board card when a prompt or a c
         4e3
       );
       if (!res.ok) return null;
-      const body = await res.json().catch(() => ({}));
-      return body.task ?? null;
+      const body2 = await res.json().catch(() => ({}));
+      return body2.task ?? null;
     };
-    const patchCard = async (id, body) => {
+    const patchCard = async (id, body2) => {
       const res = await fetchWithTimeout2(
         `${target.base}/api/tasks/${encodeURIComponent(id)}`,
-        { method: "PATCH", headers, body: JSON.stringify(body) },
+        { method: "PATCH", headers, body: JSON.stringify(body2) },
         6e3
       );
       return res.ok;
@@ -30166,8 +30335,8 @@ program.command("install-hooks").description("Install Claude Code hooks (Stop +
     for (const target of reg.guardTargets()) {
       if (!existsSync58(target.configPath)) continue;
       if (target.tool === "opencode") {
-        const body = readFileSync50(target.configPath, "utf-8");
-        if (!body.includes("chat-recall install-hooks")) continue;
+        const body2 = readFileSync50(target.configPath, "utf-8");
+        if (!body2.includes("chat-recall install-hooks")) continue;
         unlinkSync4(target.configPath);
         removed += 1;
       } else {