chat-recall 0.7.15 → 0.7.17

package/dist/watch.js

@@ -6963,18 +6963,20 @@ function updateShadow(sessionId, exp, prebuilt) {
   const curHash = containerSrcHash(current);
   if (!prior) {
     current.srcHash = curHash;
+    current.mergeVersion = SHADOW_MERGE_VERSION;
     try {
       writeShadowContainer(tool, rawId, current);
     } catch {
     }
     return { status: "created", sessionId, tool, container: current, recovered: 0, path };
   }
-  if (prior.srcHash && prior.srcHash === curHash) {
+  if (prior.srcHash && prior.srcHash === curHash && prior.mergeVersion === SHADOW_MERGE_VERSION) {
     return { status: "unchanged", sessionId, tool, container: prior, recovered: 0, path };
   }
   const merged = mergeContainer(prior, current);
-  if (merged.status !== "unchanged" || prior.srcHash !== curHash) {
+  if (merged.status !== "unchanged" || prior.srcHash !== curHash || prior.mergeVersion !== SHADOW_MERGE_VERSION) {
     merged.container.srcHash = curHash;
+    merged.container.mergeVersion = SHADOW_MERGE_VERSION;
     try {
       writeShadowContainer(tool, rawId, merged.container);
     } catch {
@@ -7067,7 +7069,7 @@ function shadowSizeOnDisk(tool, rawId) {
     return 0;
   }
 }
-var WHOLE_FILE_TOOLS, STATE_META, lastLiveFingerprint;
+var WHOLE_FILE_TOOLS, STATE_META, SHADOW_MERGE_VERSION, lastLiveFingerprint;
 var init_shadow = __esm({
   "../engine/dist/transcript/shadow.js"() {
     "use strict";
@@ -7075,6 +7077,7 @@ var init_shadow = __esm({
     init_raw();
     WHOLE_FILE_TOOLS = /* @__PURE__ */ new Set(["cursor"]);
     STATE_META = /* @__PURE__ */ new Set(["mode", "permission-mode", "ai-title", "last-prompt", "pr-link", "summary"]);
+    SHADOW_MERGE_VERSION = 2;
     lastLiveFingerprint = /* @__PURE__ */ new Map();
   }
 });
@@ -7973,7 +7976,64 @@ var init_first_prompt = __esm({
 });
 
 // ../engine/dist/core/backends/tail-read.js
-import { openSync as openSync5, readSync as readSync5, closeSync as closeSync5, statSync as statSync6 } from "node:fs";
+import { openSync as openSync5, readSync as readSync5, closeSync as closeSync5, statSync as statSync6, fstatSync } from "node:fs";
+function readAt(fd, pos, len) {
+  const buf = Buffer.alloc(len);
+  let got = 0;
+  while (got < len) {
+    const n = readSync5(fd, buf, got, len - got, pos + got);
+    if (n <= 0)
+      break;
+    got += n;
+  }
+  return buf.subarray(0, got);
+}
+function linesBeforeOffset(path, offset) {
+  if (offset <= 0)
+    return 0;
+  let fd = null;
+  try {
+    fd = openSync5(path, "r");
+    const ino = fstatSync(fd).ino;
+    const known = lineCounts.get(path);
+    let pos = 0;
+    let lines = 0;
+    if (known && known.ino === ino && known.offset <= offset) {
+      const edgeStart2 = Math.max(0, known.offset - EDGE_BYTES);
+      if (readAt(fd, edgeStart2, known.offset - edgeStart2).equals(known.edge)) {
+        pos = known.offset;
+        lines = known.lines;
+      }
+    }
+    const block = Buffer.allocUnsafe(SKIP_SCAN_BYTES);
+    while (pos < offset) {
+      const n = readSync5(fd, block, 0, Math.min(SKIP_SCAN_BYTES, offset - pos), pos);
+      if (n <= 0)
+        return void 0;
+      for (let i = block.indexOf(10, 0); i >= 0 && i < n; i = block.indexOf(10, i + 1))
+        lines++;
+      pos += n;
+    }
+    const edgeStart = Math.max(0, offset - EDGE_BYTES);
+    const edge = readAt(fd, edgeStart, offset - edgeStart);
+    if (lineCounts.size >= LINE_COUNT_CACHE_MAX && !lineCounts.has(path)) {
+      const oldest = lineCounts.keys().next().value;
+      if (oldest !== void 0)
+        lineCounts.delete(oldest);
+    }
+    lineCounts.set(path, { offset, lines, ino, edge });
+    return lines;
+  } catch {
+    return void 0;
+  } finally {
+    if (fd !== null) {
+      try {
+        closeSync5(fd);
+      } catch {
+      }
+    }
+  }
+}
 function readTailFromOffset(path, offset, maxBytes = TAIL_READ_MAX_BYTES) {
   let size = 0;
   try {
@@ -8001,7 +8061,7 @@ function readTailFromOffset(path, offset, maxBytes = TAIL_READ_MAX_BYTES) {
     const lastNl = slice.lastIndexOf(10);
     if (lastNl >= 0) {
       const text = slice.subarray(0, lastNl + 1).toString("utf-8");
-      return { text, newOffset: offset + lastNl + 1 };
+      return { text, newOffset: offset + lastNl + 1, baseLine: linesBeforeOffset(path, offset) };
     }
     if (offset + got >= size)
       return { text: "", newOffset: offset };
@@ -8034,12 +8094,15 @@ function findNewline(fd, from, size) {
   }
   return -1;
 }
-var TAIL_READ_MAX_BYTES, SKIP_SCAN_BYTES;
+var TAIL_READ_MAX_BYTES, SKIP_SCAN_BYTES, lineCounts, LINE_COUNT_CACHE_MAX, EDGE_BYTES;
 var init_tail_read = __esm({
   "../engine/dist/core/backends/tail-read.js"() {
     "use strict";
     TAIL_READ_MAX_BYTES = 16 * 1024 * 1024;
     SKIP_SCAN_BYTES = 1024 * 1024;
+    lineCounts = /* @__PURE__ */ new Map();
+    LINE_COUNT_CACHE_MAX = 2048;
+    EDGE_BYTES = 64;
   }
 });
 
@@ -18269,6 +18332,7 @@ function persistLedgerData(server, serverData) {
   const data = load();
   data[server] = serverData;
   persist(data);
+  flushLedger();
 }
 function unackedCursorAttemptCount() {
   return unackedCursorAttempts;
@@ -18551,7 +18615,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.15";
+        if (true) CLI_VERSION = "0.7.17";
       } catch {
       }
     }
@@ -19045,7 +19109,7 @@ var init_telemetry = __esm({
     init_sync_client();
     cliVersion = () => {
       try {
-        return true ? "0.7.15" : "dev";
+        return true ? "0.7.17" : "dev";
       } catch {
         return "dev";
       }
@@ -20284,7 +20348,8 @@ async function syncToTargetInScope(cred, opts = {}) {
       clearTimeout(timer);
     }
   };
-  const postChunkedHead = async (conv, fileSize) => {
+  const postChunkedHead = async (head, fileSize) => {
+    const conv = { ...head, chunk_head: true };
     const headers = { "content-type": "application/json" };
     if (cred.token) headers.authorization = `Bearer ${cred.token}`;
     const ac = new AbortController();
@@ -20300,9 +20365,10 @@ async function syncToTargetInScope(cred, opts = {}) {
       const body = await res.json().catch(() => ({}));
       const id = conv.session_id;
       const guarded = (body.shrink_guarded ?? []).find((g) => g.session_id === id);
+      const staged = (body.rebuild_staged ?? []).includes(id);
       const mtime = conv.mtime;
       try {
-        if (!guarded) {
+        if (staged || !guarded) {
           markSynced(base3, [{ id, mtime, offset: conv.from_offset, size: conv.from_offset, acked: true }]);
         } else if (typeof guarded.o === "number" && guarded.o > 0 && guarded.o <= fileSize) {
           markSynced(base3, [{ id, mtime, offset: guarded.o, size: guarded.o, acked: true }]);
@@ -21035,8 +21101,13 @@ async function buildConversationTail(ref, fromOffset, opts = {}) {
   const backend = getBackendForId(ref.prefixedId);
   if (!backend?.readFromOffset) return null;
   const mapPath = opts.mapPath ?? ((p) => p);
-  const { text: tailText, newOffset, skippedBytes } = await backend.readFromOffset(ref.prefixedId, fromOffset, SYNC_CHUNK_BYTES);
+  const { text: tailText, newOffset, skippedBytes, baseLine } = await backend.readFromOffset(ref.prefixedId, fromOffset, SYNC_CHUNK_BYTES);
   if (newOffset <= fromOffset) return null;
+  const fileSize = backend.fileSize?.(ref.prefixedId) ?? 0;
+  const position = {
+    ...typeof baseLine === "number" ? { base_line: baseLine } : {},
+    final: fileSize > 0 && newOffset >= fileSize
+  };
   const messages = skippedBytes ? [] : parseTailMessages(ref.toolId, tailText);
   const textMessages = messages.filter((m) => m.role !== "summary" && m.content?.trim());
   const hasContent = textMessages.length > 0 || messages.some((m) => m.toolCalls?.length);
@@ -21049,6 +21120,7 @@ async function buildConversationTail(ref, fromOffset, opts = {}) {
         append: true,
         base_offset: fromOffset,
         from_offset: newOffset,
+        ...position,
         redacted_text: "",
         envelope: { v: TRANSCRIPT_VERSION, messages: [], subagents: [] },
         mtime: Math.floor(ref.mtime) || 0
@@ -21095,6 +21167,7 @@ async function buildConversationTail(ref, fromOffset, opts = {}) {
       // equals its stored synced-through offset.
       from_offset: newOffset,
       // where it ends → new synced-through offset.
+      ...position,
       redacted_text: redactedText,
       envelope,
       mtime: Math.floor(ref.mtime) || 0
@@ -21178,7 +21251,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.15";
+        if (true) ownVersion = "0.7.17";
       } catch {
       }
     }
@@ -24315,7 +24388,7 @@ try {
   ownVersion2 = JSON.parse(readFileSync39(join48(dir, "../package.json"), "utf-8")).version || ownVersion2;
 } catch {
   try {
-    if (true) ownVersion2 = "0.7.15";
+    if (true) ownVersion2 = "0.7.17";
   } catch {
   }
 }
@@ -24700,7 +24773,7 @@ async function runCollectorMigration(opts) {
 init_sync_ledger();
 init_collector_health();
 import { existsSync as existsSync50, readFileSync as readFileSync45, statSync as statSync46 } from "fs";
-var CLI_VERSION3 = true ? "0.7.15" : "0.0.0";
+var CLI_VERSION3 = true ? "0.7.17" : "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.15",
+  "version": "0.7.17",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/munhq/chat-recall.git"