chat-recall 0.7.16 → 0.7.18

package/dist/mcp.js

@@ -2034,7 +2034,7 @@ var require_thread_stream = __commonJS({
     var { version: version2 } = require_package();
     var { EventEmitter } = __require("events");
     var { Worker: Worker2 } = __require("worker_threads");
-    var { join: join53 } = __require("path");
+    var { join: join54 } = __require("path");
     var { pathToFileURL } = __require("url");
     var { wait } = require_wait();
     var {
@@ -2077,7 +2077,7 @@ var require_thread_stream = __commonJS({
     function createWorker(stream, opts) {
       const { filename, workerData } = opts;
       const bundlerOverrides = "__bundlerPathsOverrides" in globalThis ? globalThis.__bundlerPathsOverrides : {};
-      const toExecute = bundlerOverrides["thread-stream-worker"] || join53(__dirname, "lib", "worker.js");
+      const toExecute = bundlerOverrides["thread-stream-worker"] || join54(__dirname, "lib", "worker.js");
       const worker = new Worker2(toExecute, {
         ...opts.workerOpts,
         trackUnmanagedFds: false,
@@ -2480,7 +2480,7 @@ var require_transport = __commonJS({
     "use strict";
     var { createRequire: createRequire3 } = __require("module");
     var getCallers = require_caller();
-    var { join: join53, isAbsolute: isAbsolute3, sep: sep4 } = __require("node:path");
+    var { join: join54, isAbsolute: isAbsolute3, sep: sep4 } = __require("node:path");
     var sleep = require_atomic_sleep();
     var onExit = require_on_exit_leak_free();
     var ThreadStream = require_thread_stream();
@@ -2543,7 +2543,7 @@ var require_transport = __commonJS({
         throw new Error("only one of target or targets can be specified");
       }
       if (targets) {
-        target = bundlerOverrides["pino-worker"] || join53(__dirname, "worker.js");
+        target = bundlerOverrides["pino-worker"] || join54(__dirname, "worker.js");
         options.targets = targets.filter((dest) => dest.target).map((dest) => {
           return {
             ...dest,
@@ -2561,7 +2561,7 @@ var require_transport = __commonJS({
           });
         });
       } else if (pipeline) {
-        target = bundlerOverrides["pino-worker"] || join53(__dirname, "worker.js");
+        target = bundlerOverrides["pino-worker"] || join54(__dirname, "worker.js");
         options.pipelines = [pipeline.map((dest) => {
           return {
             ...dest,
@@ -2583,7 +2583,7 @@ var require_transport = __commonJS({
           return origin;
         }
         if (origin === "pino/file") {
-          return join53(__dirname, "..", "file.js");
+          return join54(__dirname, "..", "file.js");
         }
         let fixTarget2;
         for (const filePath of callers) {
@@ -3572,7 +3572,7 @@ var require_safe_stable_stringify = __commonJS({
               return circularValue;
             }
             let res = "";
-            let join53 = ",";
+            let join54 = ",";
             const originalIndentation = indentation;
             if (Array.isArray(value)) {
               if (value.length === 0) {
@@ -3586,7 +3586,7 @@ var require_safe_stable_stringify = __commonJS({
                 indentation += spacer;
                 res += `
 ${indentation}`;
-                join53 = `,
+                join54 = `,
 ${indentation}`;
               }
               const maximumValuesToStringify = Math.min(value.length, maximumBreadth);
@@ -3594,13 +3594,13 @@ ${indentation}`;
               for (; i < maximumValuesToStringify - 1; i++) {
                 const tmp2 = stringifyFnReplacer(String(i), value, stack, replacer, spacer, indentation);
                 res += tmp2 !== void 0 ? tmp2 : "null";
-                res += join53;
+                res += join54;
               }
               const tmp = stringifyFnReplacer(String(i), value, stack, replacer, spacer, indentation);
               res += tmp !== void 0 ? tmp : "null";
               if (value.length - 1 > maximumBreadth) {
                 const removedKeys = value.length - maximumBreadth - 1;
-                res += `${join53}"... ${getItemCount(removedKeys)} not stringified"`;
+                res += `${join54}"... ${getItemCount(removedKeys)} not stringified"`;
               }
               if (spacer !== "") {
                 res += `
@@ -3621,7 +3621,7 @@ ${originalIndentation}`;
             let separator = "";
             if (spacer !== "") {
               indentation += spacer;
-              join53 = `,
+              join54 = `,
 ${indentation}`;
               whitespace = " ";
             }
@@ -3635,13 +3635,13 @@ ${indentation}`;
               const tmp = stringifyFnReplacer(key3, value, stack, replacer, spacer, indentation);
               if (tmp !== void 0) {
                 res += `${separator}${strEscape(key3)}:${whitespace}${tmp}`;
-                separator = join53;
+                separator = join54;
               }
             }
             if (keyLength > maximumBreadth) {
               const removedKeys = keyLength - maximumBreadth;
               res += `${separator}"...":${whitespace}"${getItemCount(removedKeys)} not stringified"`;
-              separator = join53;
+              separator = join54;
             }
             if (spacer !== "" && separator.length > 1) {
               res = `
@@ -3682,7 +3682,7 @@ ${originalIndentation}`;
             }
             const originalIndentation = indentation;
             let res = "";
-            let join53 = ",";
+            let join54 = ",";
             if (Array.isArray(value)) {
               if (value.length === 0) {
                 return "[]";
@@ -3695,7 +3695,7 @@ ${originalIndentation}`;
                 indentation += spacer;
                 res += `
 ${indentation}`;
-                join53 = `,
+                join54 = `,
 ${indentation}`;
               }
               const maximumValuesToStringify = Math.min(value.length, maximumBreadth);
@@ -3703,13 +3703,13 @@ ${indentation}`;
               for (; i < maximumValuesToStringify - 1; i++) {
                 const tmp2 = stringifyArrayReplacer(String(i), value[i], stack, replacer, spacer, indentation);
                 res += tmp2 !== void 0 ? tmp2 : "null";
-                res += join53;
+                res += join54;
               }
               const tmp = stringifyArrayReplacer(String(i), value[i], stack, replacer, spacer, indentation);
               res += tmp !== void 0 ? tmp : "null";
               if (value.length - 1 > maximumBreadth) {
                 const removedKeys = value.length - maximumBreadth - 1;
-                res += `${join53}"... ${getItemCount(removedKeys)} not stringified"`;
+                res += `${join54}"... ${getItemCount(removedKeys)} not stringified"`;
               }
               if (spacer !== "") {
                 res += `
@@ -3722,7 +3722,7 @@ ${originalIndentation}`;
             let whitespace = "";
             if (spacer !== "") {
               indentation += spacer;
-              join53 = `,
+              join54 = `,
 ${indentation}`;
               whitespace = " ";
             }
@@ -3731,7 +3731,7 @@ ${indentation}`;
               const tmp = stringifyArrayReplacer(key3, value[key3], stack, replacer, spacer, indentation);
               if (tmp !== void 0) {
                 res += `${separator}${strEscape(key3)}:${whitespace}${tmp}`;
-                separator = join53;
+                separator = join54;
               }
             }
             if (spacer !== "" && separator.length > 1) {
@@ -3789,20 +3789,20 @@ ${originalIndentation}`;
               indentation += spacer;
               let res2 = `
 ${indentation}`;
-              const join54 = `,
+              const join55 = `,
 ${indentation}`;
               const maximumValuesToStringify = Math.min(value.length, maximumBreadth);
               let i = 0;
               for (; i < maximumValuesToStringify - 1; i++) {
                 const tmp2 = stringifyIndent(String(i), value[i], stack, spacer, indentation);
                 res2 += tmp2 !== void 0 ? tmp2 : "null";
-                res2 += join54;
+                res2 += join55;
               }
               const tmp = stringifyIndent(String(i), value[i], stack, spacer, indentation);
               res2 += tmp !== void 0 ? tmp : "null";
               if (value.length - 1 > maximumBreadth) {
                 const removedKeys = value.length - maximumBreadth - 1;
-                res2 += `${join54}"... ${getItemCount(removedKeys)} not stringified"`;
+                res2 += `${join55}"... ${getItemCount(removedKeys)} not stringified"`;
               }
               res2 += `
 ${originalIndentation}`;
@@ -3818,16 +3818,16 @@ ${originalIndentation}`;
               return '"[Object]"';
             }
             indentation += spacer;
-            const join53 = `,
+            const join54 = `,
 ${indentation}`;
             let res = "";
             let separator = "";
             let maximumPropertiesToStringify = Math.min(keyLength, maximumBreadth);
             if (isTypedArrayWithEntries(value)) {
-              res += stringifyTypedArray(value, join53, maximumBreadth);
+              res += stringifyTypedArray(value, join54, maximumBreadth);
               keys = keys.slice(value.length);
               maximumPropertiesToStringify -= value.length;
-              separator = join53;
+              separator = join54;
             }
             if (deterministic) {
               keys = sort(keys, comparator);
@@ -3838,13 +3838,13 @@ ${indentation}`;
               const tmp = stringifyIndent(key3, value[key3], stack, spacer, indentation);
               if (tmp !== void 0) {
                 res += `${separator}${strEscape(key3)}: ${tmp}`;
-                separator = join53;
+                separator = join54;
               }
             }
             if (keyLength > maximumBreadth) {
               const removedKeys = keyLength - maximumBreadth;
               res += `${separator}"...": "${getItemCount(removedKeys)} not stringified"`;
-              separator = join53;
+              separator = join54;
             }
             if (separator !== "") {
               res = `
@@ -11680,6 +11680,7 @@ var init_from_events = __esm({
 // ../engine/dist/transcript/raw.js
 var raw_exports = {};
 __export(raw_exports, {
+  RAW_PARSE_MAX_BYTES: () => RAW_PARSE_MAX_BYTES,
   archiveRawSession: () => archiveRawSession,
   buildRawContainer: () => buildRawContainer,
   containerSrcHash: () => containerSrcHash,
@@ -11979,11 +11980,11 @@ async function archiveRawSession(store2, sessionId) {
   return await store2.putRawSession(sessionId, exp.tool, Math.floor(exp.mtime), gz, size);
 }
 function detectForkPredecessor(sessionPath) {
-  const { readFileSync: readFileSync44, readdirSync: readdirSync34 } = requireFs();
-  const { dirname: dirname21, join: join53, basename: basename24 } = requirePath();
+  const { readFileSync: readFileSync45, readdirSync: readdirSync34 } = requireFs();
+  const { dirname: dirname21, join: join54, basename: basename24 } = requirePath();
   let text;
   try {
-    text = readFileSync44(sessionPath, "utf-8");
+    text = readFileSync45(sessionPath, "utf-8");
   } catch {
     return null;
   }
@@ -12017,7 +12018,7 @@ function detectForkPredecessor(sessionPath) {
     if (!f.endsWith(".jsonl") || f === self || f === "sessions-index.json")
       continue;
     try {
-      if (readFileSync44(join53(dir, f), "utf-8").includes(`"uuid":"${headParent}"`)) {
+      if (readFileSync45(join54(dir, f), "utf-8").includes(`"uuid":"${headParent}"`)) {
         return basename24(f, ".jsonl");
       }
     } catch {
@@ -12031,7 +12032,7 @@ function requireFs() {
 function requirePath() {
   return pathMod;
 }
-var MARKER_QUOTE;
+var RAW_PARSE_MAX_BYTES, MARKER_QUOTE;
 var init_raw = __esm({
   "../engine/dist/transcript/raw.js"() {
     "use strict";
@@ -12039,6 +12040,7 @@ var init_raw = __esm({
     init_claude2();
     init_codex2();
     init_from_events();
+    RAW_PARSE_MAX_BYTES = 40 * 1024 * 1024;
     MARKER_QUOTE = /\[REDACTED:[A-Za-z0-9_-]+\]"/g;
   }
 });
@@ -12195,18 +12197,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: path2 };
   }
-  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: path2 };
   }
   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 {
@@ -12244,7 +12248,7 @@ function shadowUncompressedBytes(tool, rawId) {
     }
   }
 }
-var WHOLE_FILE_TOOLS, STATE_META;
+var WHOLE_FILE_TOOLS, STATE_META, SHADOW_MERGE_VERSION;
 var init_shadow = __esm({
   "../engine/dist/transcript/shadow.js"() {
     "use strict";
@@ -12252,6 +12256,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;
   }
 });
 
@@ -19731,6 +19736,11 @@ function markSynced(server, rows) {
       base2.s = s;
     }
     if (r.hash !== void 0) base2.h = r.hash;
+    const completesChunked = cursorFromCaller && r.chunkFinal === true && prev?.k === 1;
+    if (cursorFromCaller && (r.full || completesChunked) && o > 0) base2.F = o;
+    else if (prev?.F !== void 0) base2.F = prev.F;
+    if (cursorFromCaller && r.chunkedHead) base2.k = 1;
+    else if (prev?.k && !completesChunked && !(cursorFromCaller && r.full)) base2.k = 1;
     forServer[r.id] = base2;
   }
   persist(data);
@@ -19787,6 +19797,14 @@ function markFieldFullPassDone(server, field) {
   delete st.force[field.name];
   persistReconcile(data);
 }
+function forgetFullCoverage(server, sessionId) {
+  const data = load();
+  const row = data[server]?.[sessionId];
+  if (!row || typeof row !== "object") return;
+  delete row.F;
+  delete row.h;
+  persist(data);
+}
 function markFullResync(server, sessionId) {
   const data = load();
   const forServer = data[server];
@@ -19795,7 +19813,11 @@ function markFullResync(server, sessionId) {
   delete forServer[sessionId];
   persist(data);
 }
-function syncMode(row, mtime, fileSize, extractorVersion, isAppendOnly) {
+function fullCoveredOffset(row) {
+  if (row.F !== void 0) return row.F;
+  return row.h ? row.s ?? 0 : 0;
+}
+function syncMode(row, mtime, fileSize, extractorVersion, isAppendOnly, nowMs = Date.now()) {
   if (!row) return "full";
   if (row.v < extractorVersion) return "full";
   const offset = row.o ?? 0;
@@ -19803,10 +19825,13 @@ function syncMode(row, mtime, fileSize, extractorVersion, isAppendOnly) {
   if (process.env.CHAT_RECALL_TAIL_APPEND !== "0" && isAppendOnly && fileSize > 0 && offset > 0 && fileSize > (row.s ?? 0)) {
     return "append";
   }
+  if (isAppendOnly && offset > 0 && fileSize > 0 && fileSize === (row.s ?? 0) && !row.k && fullCoveredOffset(row) < offset && nowMs - Math.floor(mtime) >= SETTLE_QUIET_MS) {
+    return "full";
+  }
   if (row.m >= Math.floor(mtime)) return "skip";
   return "full";
 }
-var ledgerPath, cache3, base, diskStamp, rowKey, LEDGER_FLUSH_MS, pendingWrite, flushTimer, itemVersionsPath, itemVersionsCache, inventoryPath, unackedCursorAttempts, reconcilePath, reconcileCache;
+var ledgerPath, cache3, base, diskStamp, rowKey, LEDGER_FLUSH_MS, pendingWrite, flushTimer, itemVersionsPath, itemVersionsCache, inventoryPath, unackedCursorAttempts, reconcilePath, reconcileCache, SETTLE_QUIET_MS;
 var init_sync_ledger = __esm({
   "src/sync-ledger.ts"() {
     "use strict";
@@ -19826,6 +19851,7 @@ var init_sync_ledger = __esm({
     unackedCursorAttempts = 0;
     reconcilePath = () => join46(getDataDir(), "sync-field-reconcile.json");
     reconcileCache = null;
+    SETTLE_QUIET_MS = 2 * 60 * 60 * 1e3;
   }
 });
 
@@ -19971,7 +19997,7 @@ var init_http = __esm({
       CLI_VERSION = JSON.parse(readFileSync36(new URL("../package.json", import.meta.url), "utf-8")).version || CLI_VERSION;
     } catch {
       try {
-        if (true) CLI_VERSION = "0.7.16";
+        if (true) CLI_VERSION = "0.7.18";
       } catch {
       }
     }
@@ -20469,7 +20495,7 @@ var init_telemetry = __esm({
     init_sync_client();
     cliVersion2 = () => {
       try {
-        return true ? "0.7.16" : "dev";
+        return true ? "0.7.18" : "dev";
       } catch {
         return "dev";
       }
@@ -20479,6 +20505,150 @@ var init_telemetry = __esm({
   }
 });
 
+// src/raw-archive-parts.ts
+import { createReadStream as createReadStream4, createWriteStream as createWriteStream2, openSync as openSync10, readSync as readSync8, closeSync as closeSync10, rmSync as rmSync5, statSync as statSync42 } from "node:fs";
+import { tmpdir as tmpdir3 } from "node:os";
+import { join as join48 } from "node:path";
+import { randomBytes } from "node:crypto";
+import { createGzip } from "node:zlib";
+import { once } from "node:events";
+import { readFileSync as readFileSync37 } from "node:fs";
+async function* fileLines(path2) {
+  let rest = "";
+  const decoder = new TextDecoder("utf-8");
+  for await (const chunk of createReadStream4(path2, { highWaterMark: 1024 * 1024 })) {
+    rest += decoder.decode(chunk, { stream: true });
+    let nl = rest.indexOf("\n");
+    while (nl >= 0) {
+      yield rest.slice(0, nl + 1);
+      rest = rest.slice(nl + 1);
+      nl = rest.indexOf("\n");
+    }
+  }
+  rest += decoder.decode();
+  if (rest) yield rest;
+}
+function* textLines(text) {
+  let at = 0;
+  while (at < text.length) {
+    const nl = text.indexOf("\n", at);
+    const end = nl < 0 ? text.length : nl + 1;
+    yield text.slice(at, end);
+    at = end;
+  }
+}
+async function writeArchiveFile(source, meta, redact, dir = tmpdir3()) {
+  const path2 = join48(dir, `cr-archive-${randomBytes(8).toString("hex")}.json.gz`);
+  const gzip = createGzip({ level: 6 });
+  const out = createWriteStream2(path2, { mode: 384 });
+  const done = once(out, "finish");
+  gzip.pipe(out);
+  let size = 0;
+  const write = async (s) => {
+    size += Buffer.byteLength(s);
+    if (!gzip.write(s)) await once(gzip, "drain");
+  };
+  try {
+    await write(`{"v":1,"tool":${JSON.stringify(meta.tool)},"mtime":${Math.floor(meta.mtime)},"files":[`);
+    for (const [i, f] of source.files.entries()) {
+      await write(`${i ? "," : ""}{"name":${JSON.stringify(f.name)},"text":"`);
+      const whole = () => source.kind === "memory" ? f.text : readFileSync37(f.path, "utf-8");
+      if (!f.name.endsWith(".jsonl")) {
+        await write(escapeJson(redact(whole())));
+      } else {
+        const lines = source.kind === "memory" ? textLines(f.text) : fileLines(f.path);
+        for await (const line of lines) {
+          const nl = line.endsWith("\n");
+          const body2 = nl ? line.slice(0, -1) : line;
+          await write(escapeJson((body2 ? redactJsonLine(body2, redact) : body2) + (nl ? "\n" : "")));
+        }
+      }
+      await write('"}');
+    }
+    await write("]}");
+    gzip.end();
+    await done;
+  } catch (err) {
+    gzip.destroy();
+    out.destroy();
+    rmSync5(path2, { force: true });
+    throw err;
+  }
+  return { path: path2, gzSize: statSync42(path2).size, size };
+}
+async function putPart(url, body2) {
+  let last;
+  for (let attempt = 1; attempt <= PART_ATTEMPTS; attempt++) {
+    const ac = new AbortController();
+    const timer = setTimeout(() => ac.abort(), PART_TIMEOUT_MS);
+    try {
+      const r = await fetch(url, { method: "PUT", body: body2, signal: ac.signal });
+      const etag = r.headers.get("etag");
+      if (r.ok && etag) return etag;
+      last = new Error(`part PUT answered ${r.status}`);
+      if (r.status === 403 || r.status === 404) break;
+    } catch (err) {
+      last = err;
+    } finally {
+      clearTimeout(timer);
+    }
+  }
+  throw last instanceof Error ? last : new Error(String(last));
+}
+async function uploadArchiveFile(base2, token, args) {
+  const headers = { "content-type": "application/json" };
+  if (token) headers.authorization = `Bearer ${token}`;
+  const post = async (path2, body2) => {
+    const r = await fetch(`${base2}/api/sync/raw-upload/${path2}`, { method: "POST", headers, body: JSON.stringify(body2) });
+    const json = await r.json().catch(() => ({}));
+    return { status: r.status, json };
+  };
+  const start = await post("start", {
+    session_id: args.sessionId,
+    tool: args.tool,
+    mtime: Math.floor(args.mtime),
+    size: args.file.size,
+    gz_size: args.file.gzSize,
+    project_id: args.projectId,
+    project_path: args.projectPath
+  });
+  if (start.status === 501 || start.status === 404) return "unsupported";
+  if (start.status !== 200) throw new Error(`raw upload start answered ${start.status}: ${start.json.error ?? ""}`);
+  if (start.json.result === "unchanged" || start.json.result === "shrink-protected") return start.json.result;
+  const urls = start.json.urls;
+  const partBytes = Number(start.json.part_bytes);
+  const parts = [];
+  const fd = openSync10(args.file.path, "r");
+  try {
+    for (const [i, url] of urls.entries()) {
+      const len = Math.min(partBytes, args.file.gzSize - i * partBytes);
+      const buf = Buffer.allocUnsafe(len);
+      let got = 0;
+      while (got < len) {
+        const n = readSync8(fd, buf, got, len - got, i * partBytes + got);
+        if (n <= 0) break;
+        got += n;
+      }
+      parts.push({ part_number: i + 1, etag: await putPart(url, buf.subarray(0, got)) });
+    }
+  } finally {
+    closeSync10(fd);
+  }
+  const done = await post("complete", { session_id: args.sessionId, upload_id: start.json.upload_id, parts });
+  if (done.status !== 200) throw new Error(`raw upload complete answered ${done.status}: ${done.json.error ?? ""}`);
+  return done.json.result;
+}
+var escapeJson, PART_TIMEOUT_MS, PART_ATTEMPTS;
+var init_raw_archive_parts = __esm({
+  "src/raw-archive-parts.ts"() {
+    "use strict";
+    init_transcript();
+    escapeJson = (s) => JSON.stringify(s).slice(1, -1);
+    PART_TIMEOUT_MS = 12e4;
+    PART_ATTEMPTS = 3;
+  }
+});
+
 // src/server-probe.ts
 var server_probe_exports = {};
 __export(server_probe_exports, {
@@ -20640,11 +20810,11 @@ __export(auto_update_exports, {
   tarballUrl: () => tarballUrl
 });
 import { execSync as execSync4, execFileSync as execFileSync3 } from "node:child_process";
-import { readFileSync as readFileSync37, existsSync as existsSync45 } from "node:fs";
+import { readFileSync as readFileSync38, existsSync as existsSync45 } from "node:fs";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
-import { writeFileSync as writeFileSync9, mkdtempSync as mkdtempSync3, rmSync as rmSync5, readdirSync as readdirSync31, statSync as statSync42, mkdirSync as mkdirSync12 } from "node:fs";
-import { join as join48, dirname as dirname19, sep as sep3, posix as pathPosix, win32 as pathWin32 } from "node:path";
-import { tmpdir as tmpdir3, homedir as homedir17 } from "node:os";
+import { writeFileSync as writeFileSync9, mkdtempSync as mkdtempSync3, rmSync as rmSync6, readdirSync as readdirSync31, statSync as statSync43, mkdirSync as mkdirSync12 } from "node:fs";
+import { join as join49, dirname as dirname19, sep as sep3, posix as pathPosix, win32 as pathWin32 } from "node:path";
+import { tmpdir as tmpdir4, homedir as homedir17 } from "node:os";
 import { createHash as createHash10 } from "node:crypto";
 function compareVersions(a, b) {
   const pa = String(a).split("-")[0].split(".").map((n) => parseInt(n, 10) || 0);
@@ -20668,7 +20838,7 @@ function newerOf(a, b) {
 function installedVersion() {
   try {
     const here = dirname19(fileURLToPath2(import.meta.url));
-    const raw = readFileSync37(join48(here, "..", "package.json"), "utf-8");
+    const raw = readFileSync38(join49(here, "..", "package.json"), "utf-8");
     return JSON.parse(raw).version || null;
   } catch {
     return null;
@@ -20681,7 +20851,7 @@ function planAutoUpdate(base2, caps, ownVersion2, flag) {
   if (compareVersions(rel.version, ownVersion2) <= 0) return { update: false, reason: `already current (own ${ownVersion2} >= server ${rel.version})` };
   return { update: true, reason: `server ${rel.version} > own ${ownVersion2}`, url: tarballUrl(base2, rel.version), fallbackUrl: tarballUrl(base2), sha256: rel.sha256, from: ownVersion2, to: rel.version };
 }
-function sweepStaleStaging(root = tmpdir3(), now = Date.now()) {
+function sweepStaleStaging(root = tmpdir4(), now = Date.now()) {
   const MKDTEMP_SUFFIX = /^cr-update-.{6}$/s;
   const COLD_MS = 60 * 60 * 1e3;
   let removed = 0;
@@ -20693,13 +20863,13 @@ function sweepStaleStaging(root = tmpdir3(), now = Date.now()) {
   }
   for (const name of entries) {
     if (!MKDTEMP_SUFFIX.test(name)) continue;
-    const dir = join48(root, name);
+    const dir = join49(root, name);
     try {
-      const st = statSync42(dir);
+      const st = statSync43(dir);
       if (!st.isDirectory() || now - st.mtimeMs < COLD_MS) continue;
       const inside = readdirSync31(dir);
       if (inside.length > 1 || inside.length === 1 && inside[0] !== "chat-recall.tgz") continue;
-      rmSync5(dir, { recursive: true, force: true });
+      rmSync6(dir, { recursive: true, force: true });
       removed++;
     } catch {
     }
@@ -20722,14 +20892,14 @@ async function executeAutoUpdate(plan, deps) {
   }
   const got = createHash10("sha256").update(buf).digest("hex");
   if (got !== plan.sha256) return { updated: false, reason: `checksum mismatch (expected ${plan.sha256.slice(0, 12)}\u2026, got ${got.slice(0, 12)}\u2026) \u2014 NOT installing` };
-  const dir = mkdtempSync3(join48(tmpdir3(), "cr-update-"));
+  const dir = mkdtempSync3(join49(tmpdir4(), "cr-update-"));
   const discardStaging = () => {
     try {
-      rmSync5(dir, { recursive: true, force: true });
+      rmSync6(dir, { recursive: true, force: true });
     } catch {
     }
   };
-  const tgz = join48(dir, "chat-recall.tgz");
+  const tgz = join49(dir, "chat-recall.tgz");
   writeFileSync9(tgz, buf);
   if (deps.stopping?.()) {
     discardStaging();
@@ -20809,7 +20979,7 @@ function realInstall(tgz) {
   try {
     npmInstall(npm, ["install", "-g", tgz]);
   } catch {
-    npmInstall(npm, ["install", "-g", "--prefix", join48(homedir17(), ".local"), tgz]);
+    npmInstall(npm, ["install", "-g", "--prefix", join49(homedir17(), ".local"), tgz]);
   }
 }
 function acquireUpdateLock() {
@@ -20826,12 +20996,12 @@ function realRestart(platform2) {
   if (c) execSync4(c.cmd, { stdio: "ignore", ...c.shell ? { shell: c.shell } : {} });
 }
 function updateStatePath() {
-  const dir = process.env.CHAT_RECALL_DATA_DIR || join48(homedir17(), ".chat-recall");
-  return join48(dir, "auto-update-state.json");
+  const dir = process.env.CHAT_RECALL_DATA_DIR || join49(homedir17(), ".chat-recall");
+  return join49(dir, "auto-update-state.json");
 }
 function readUpdateState() {
   try {
-    return JSON.parse(readFileSync37(updateStatePath(), "utf8"));
+    return JSON.parse(readFileSync38(updateStatePath(), "utf8"));
   } catch {
     return {};
   }
@@ -20972,9 +21142,9 @@ __export(sync_client_exports, {
   syncIncremental: () => syncIncremental,
   syncSessions: () => syncSessions
 });
-import { join as join49, dirname as dirname20, basename as basename22 } from "node:path";
-import { readFileSync as readFileSync38, writeFileSync as writeFileSync10, mkdirSync as mkdirSync13, mkdtempSync as mkdtempSync4, rmSync as rmSync6, chmodSync as chmodSync6, unlinkSync as unlinkSync3, readdirSync as readdirSync32, statSync as statSync43 } from "node:fs";
-import { tmpdir as tmpdir4, hostname as hostname2 } from "node:os";
+import { join as join50, dirname as dirname20, basename as basename22 } from "node:path";
+import { readFileSync as readFileSync39, writeFileSync as writeFileSync10, mkdirSync as mkdirSync13, mkdtempSync as mkdtempSync4, rmSync as rmSync7, chmodSync as chmodSync6, unlinkSync as unlinkSync3, readdirSync as readdirSync32, statSync as statSync44 } from "node:fs";
+import { tmpdir as tmpdir5, hostname as hostname2 } from "node:os";
 import { createHash as createHash11 } from "node:crypto";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 import { gzipSync as gzipSync3 } from "zlib";
@@ -21028,7 +21198,7 @@ function loadAllCredentials() {
   const fromEnv = envCredentials();
   if (fromEnv) return [{ serverUrl: fromEnv.serverUrl, token: fromEnv.token }];
   try {
-    const parsed = JSON.parse(readFileSync38(credPath(), "utf-8"));
+    const parsed = JSON.parse(readFileSync39(credPath(), "utf-8"));
     if (Array.isArray(parsed?.targets)) return parsed.targets.filter((t) => t?.serverUrl).map((t) => ({ serverUrl: t.serverUrl, token: t.token || "" }));
     if (parsed?.serverUrl) return [{ serverUrl: parsed.serverUrl, token: parsed.token || "" }];
   } catch {
@@ -21090,11 +21260,11 @@ function _resetTenantSecurityConfigCache() {
   _securityConfigCache.clear();
 }
 function syncConfigCachePath() {
-  return join49(getDataDir(), "sync-config-cache.json");
+  return join50(getDataDir(), "sync-config-cache.json");
 }
 function readPersistedSyncConfigs() {
   try {
-    return JSON.parse(readFileSync38(syncConfigCachePath(), "utf-8"));
+    return JSON.parse(readFileSync39(syncConfigCachePath(), "utf-8"));
   } catch {
     return {};
   }
@@ -21372,7 +21542,7 @@ async function reconcileFields(opts = {}) {
   }
   return { sessions: fullRefs().length, scanned, pushed, absent, perTarget };
 }
-function reapStaleScanDirs(dir = tmpdir4(), maxAgeMs = 6 * 36e5, now = Date.now()) {
+function reapStaleScanDirs(dir = tmpdir5(), maxAgeMs = 6 * 36e5, now = Date.now()) {
   let reaped = 0;
   let names;
   try {
@@ -21382,10 +21552,10 @@ function reapStaleScanDirs(dir = tmpdir4(), maxAgeMs = 6 * 36e5, now = Date.now(
   }
   for (const name of names) {
     if (!name.startsWith("cr-batchscan-")) continue;
-    const p = join49(dir, name);
+    const p = join50(dir, name);
     try {
-      if (now - statSync43(p).mtimeMs < maxAgeMs) continue;
-      rmSync6(p, { recursive: true, force: true });
+      if (now - statSync44(p).mtimeMs < maxAgeMs) continue;
+      rmSync7(p, { recursive: true, force: true });
       reaped++;
     } catch {
     }
@@ -21399,7 +21569,7 @@ function batchScanExternal(items, opts = {}) {
   let scanned = 0, slices = 0, scanMs = 0;
   if (items.length === 0) return { findings, scanned, slices, scanMs };
   reapStaleScanDirs();
-  let scanDir = mkdtempSync4(join49(tmpdir4(), "cr-batchscan-"));
+  let scanDir = mkdtempSync4(join50(tmpdir5(), "cr-batchscan-"));
   let safeToId = /* @__PURE__ */ new Map();
   let bytesInDir = 0;
   const flushSlice = () => {
@@ -21417,7 +21587,7 @@ function batchScanExternal(items, opts = {}) {
       slices++;
     }
     try {
-      rmSync6(scanDir, { recursive: true, force: true });
+      rmSync7(scanDir, { recursive: true, force: true });
     } catch {
     }
     safeToId = /* @__PURE__ */ new Map();
@@ -21430,19 +21600,19 @@ function batchScanExternal(items, opts = {}) {
         if (raw === null) continue;
         const safe = item.id.replace(/[^A-Za-z0-9_-]/g, "");
         safeToId.set(safe, item.id);
-        writeFileSync10(join49(scanDir, `${safe}.txt`), raw);
+        writeFileSync10(join50(scanDir, `${safe}.txt`), raw);
         bytesInDir += Buffer.byteLength(raw);
       } catch {
       }
       if (bytesInDir >= maxBytes) {
         flushSlice();
-        scanDir = mkdtempSync4(join49(tmpdir4(), "cr-batchscan-"));
+        scanDir = mkdtempSync4(join50(tmpdir5(), "cr-batchscan-"));
       }
     }
     flushSlice();
   } finally {
     try {
-      rmSync6(scanDir, { recursive: true, force: true });
+      rmSync7(scanDir, { recursive: true, force: true });
     } catch {
     }
   }
@@ -21686,12 +21856,13 @@ async function syncToTargetInScope(cred, opts = {}) {
       markSynced(base2, rows.map((r) => {
         const off = typeof r.from_offset === "number" ? r.from_offset : 0;
         const hash = shippedHash.get(r.session_id);
-        return off > 0 ? { id: r.session_id, mtime: r.mtime, offset: off, size: off, hash, acked: true } : { id: r.session_id, mtime: r.mtime, hash };
+        return off > 0 ? { id: r.session_id, mtime: r.mtime, offset: off, size: off, hash, acked: true, full: true } : { id: r.session_id, mtime: r.mtime, hash };
       }));
     } catch {
     }
   });
   const appendResults = { uploaded: 0, fullResyncNeeded: /* @__PURE__ */ new Set() };
+  const pendingArchives = [];
   const postAppend = async (convs) => {
     const headers = { "content-type": "application/json" };
     if (cred.token) headers.authorization = `Bearer ${cred.token}`;
@@ -21726,8 +21897,10 @@ async function syncToTargetInScope(cred, opts = {}) {
             offset: c.from_offset,
             size: c.from_offset,
             // size = new offset (file grew to here)
-            acked: true
+            acked: true,
             // server merged this tail
+            chunkFinal: c.final === true
+            // completes a chunked full sync
           })));
         } catch {
         }
@@ -21759,9 +21932,9 @@ async function syncToTargetInScope(cred, opts = {}) {
       const mtime = conv.mtime;
       try {
         if (staged || !guarded) {
-          markSynced(base2, [{ id, mtime, offset: conv.from_offset, size: conv.from_offset, acked: true }]);
+          markSynced(base2, [{ id, mtime, offset: conv.from_offset, size: conv.from_offset, acked: true, chunkedHead: true }]);
         } else if (typeof guarded.o === "number" && guarded.o > 0 && guarded.o <= fileSize) {
-          markSynced(base2, [{ id, mtime, offset: guarded.o, size: guarded.o, acked: true }]);
+          markSynced(base2, [{ id, mtime, offset: guarded.o, size: guarded.o, acked: true, chunkedHead: true }]);
         } else {
           markSynced(base2, [{ id, mtime }]);
         }
@@ -21970,6 +22143,14 @@ async function syncToTargetInScope(cred, opts = {}) {
     if (built.srcHash) shippedHash.set(ref.prefixedId, built.srcHash);
     if (built.conv.chunked) await postChunkedHead(built.conv, sessionFileBytes(ref));
     else await convBatch.add(built.conv);
+    if (built.archive) {
+      pendingArchives.push({
+        id: ref.prefixedId,
+        ...built.archive,
+        projectId: built.conv.project_id,
+        projectPath: built.conv.project_path
+      });
+    }
     if (built.findings.length > 0) await findingsBatch.add(built.findings);
     if (upload.sessionMeta) {
       await accumulateKg(extractEntities(built.kgText, { projectPath: built.projectPath, sourceType: "session", sessionId: ref.prefixedId, validFrom: ref.mtime ? new Date(ref.mtime).toISOString().slice(0, 10) : void 0 }), ref.prefixedId);
@@ -22122,6 +22303,30 @@ async function syncToTargetInScope(cred, opts = {}) {
   await kgTripleBatch.drain();
   await findingsBatch.drain();
   await drainInflight();
+  let archivesUnsupported = false;
+  for (const a of pendingArchives) {
+    try {
+      if (!archivesUnsupported) {
+        const r = await uploadArchiveFile(base2, cred.token, {
+          sessionId: a.id,
+          tool: a.tool,
+          mtime: a.mtime,
+          projectId: a.projectId,
+          projectPath: a.projectPath,
+          file: a.file
+        });
+        if (r === "unsupported") archivesUnsupported = true;
+      }
+    } catch (err) {
+      console.error(`[sync] raw archive for ${a.id} not uploaded (tried again when the session is next quiet): ${err instanceof Error ? err.message : err}`);
+      try {
+        forgetFullCoverage(base2, a.id);
+      } catch {
+      }
+    } finally {
+      rmSync7(a.file.path, { force: true });
+    }
+  }
   {
     const sentHashes = loadInventoryHashes(base2);
     const entries = [];
@@ -22227,6 +22432,7 @@ async function buildConversationSync(ref, mtime, opts = {}) {
   let includeRaw = opts.includeRaw !== false;
   let includeMeta = opts.includeMeta !== false;
   let srcHash;
+  const wantRaw = opts.includeRaw !== false;
   const oversized = sessionBuildBytes(ref) > FULL_BUILD_MAX_BYTES;
   let headOffsetEnd = 0;
   let oversizedFindings = null;
@@ -22395,7 +22601,7 @@ async function buildConversationSync(ref, mtime, opts = {}) {
     } else if (opts.scanSecrets) {
       let tmp = null;
       try {
-        tmp = join49(tmpdir4(), `cr-scan-${ref.prefixedId.replace(/[^A-Za-z0-9_-]/g, "")}-${mtime}.txt`);
+        tmp = join50(tmpdir5(), `cr-scan-${ref.prefixedId.replace(/[^A-Za-z0-9_-]/g, "")}-${mtime}.txt`);
         writeFileSync10(tmp, rawText);
         for (const f of scanFileForSecrets(tmp, { verifyOnly: opts.verifySecrets, tenantRules: opts.tenantRules })) {
           const verifiedAt = f.verified ? (/* @__PURE__ */ new Date()).toISOString() : null;
@@ -22447,6 +22653,25 @@ async function buildConversationSync(ref, mtime, opts = {}) {
   }
   const envTexts = envelope.messages.filter((m) => m.content?.trim());
   const redactedText = envTexts.map((m) => m.content).join("\n");
+  let archive;
+  if (wantRaw && !raw_b64) {
+    try {
+      const redact = (t) => redactSecrets(t, { force: true, count });
+      let source = null;
+      let archiveMtime = Math.floor(ref.mtime) || 0;
+      let archiveTool = ref.toolId;
+      if (container) {
+        source = { kind: "memory", files: container.files };
+        archiveMtime = container.mtime;
+        archiveTool = container.tool;
+      } else if (oversized) {
+        source = diskArchiveSource(ref);
+      }
+      if (source) archive = { file: await writeArchiveFile(source, { tool: archiveTool, mtime: archiveMtime }, redact), tool: archiveTool, mtime: archiveMtime };
+    } catch (err) {
+      console.error(`[sync] raw archive for ${ref.prefixedId} not written: ${err instanceof Error ? err.message : err}`);
+    }
+  }
   return {
     conv: {
       session_id: ref.prefixedId,
@@ -22478,7 +22703,17 @@ async function buildConversationSync(ref, mtime, opts = {}) {
     redactions: count.redactions,
     findings,
     scanMs,
-    srcHash
+    srcHash,
+    archive
+  };
+}
+function diskArchiveSource(ref) {
+  if (ref.toolId !== "claude") return null;
+  const groups = resolveSessionContentGroups(ref.rawId);
+  if (groups.length === 0 || groups.some((g) => g.paths.length !== 1)) return null;
+  return {
+    kind: "disk",
+    files: groups.map((g) => ({ name: g.name === "main" ? `${ref.rawId}.jsonl` : g.name, path: g.paths[0] }))
   };
 }
 function parseTailMessages(tool, text) {
@@ -22634,14 +22869,15 @@ var init_sync_client = __esm({
     init_telemetry();
     init_collector_health();
     init_live_session_scan();
+    init_raw_archive_parts();
     init_backends();
     ownVersion = "0.0.0";
     try {
       const dir = dirname20(fileURLToPath3(import.meta.url));
-      ownVersion = JSON.parse(readFileSync38(join49(dir, "../package.json"), "utf-8")).version || ownVersion;
+      ownVersion = JSON.parse(readFileSync39(join50(dir, "../package.json"), "utf-8")).version || ownVersion;
     } catch {
       try {
-        if (true) ownVersion = "0.7.16";
+        if (true) ownVersion = "0.7.18";
       } catch {
       }
     }
@@ -22653,7 +22889,7 @@ var init_sync_client = __esm({
     ]);
     walkProgressForUpload = null;
     lastServerPackSpec = null;
-    credPath = () => join49(getDataDir(), "credentials.json");
+    credPath = () => join50(getDataDir(), "credentials.json");
     _securityConfigCache = /* @__PURE__ */ new Map();
     SECURITY_CONFIG_TTL_MS = 5 * 60 * 1e3;
     _syncConfigCache = /* @__PURE__ */ new Map();
@@ -22682,7 +22918,7 @@ __export(client_events_exports, {
   isTelemetryEnabled: () => isTelemetryEnabled,
   reportClientEvent: () => reportClientEvent2
 });
-import { readFileSync as readFileSync39 } from "node:fs";
+import { readFileSync as readFileSync40 } from "node:fs";
 function scrub(msg) {
   if (!msg) return "";
   const noHome = msg.replace(/\/(?:home|Users)\/[^/\s]+/g, "~");
@@ -22735,7 +22971,7 @@ var init_client_events = __esm({
     init_secret_redactor();
     CLI_VERSION2 = "0.0.0";
     try {
-      CLI_VERSION2 = JSON.parse(readFileSync39(new URL("../package.json", import.meta.url), "utf-8")).version || CLI_VERSION2;
+      CLI_VERSION2 = JSON.parse(readFileSync40(new URL("../package.json", import.meta.url), "utf-8")).version || CLI_VERSION2;
     } catch {
     }
   }
@@ -22749,15 +22985,15 @@ __export(update_notice_exports, {
   refreshUpdateCheck: () => refreshUpdateCheck,
   updateNotice: () => updateNotice2
 });
-import { readFileSync as readFileSync40, writeFileSync as writeFileSync11 } from "node:fs";
-import { join as join50 } from "node:path";
+import { readFileSync as readFileSync41, writeFileSync as writeFileSync11 } from "node:fs";
+import { join as join51 } from "node:path";
 function newestKnown(c) {
   const npm = c.npmVersion ?? "0.0.0";
   return compareVersions(npm, c.serverVersion) > 0 ? { version: npm, source: "npm" } : { version: c.serverVersion, source: "server" };
 }
 function readCheck() {
   try {
-    const c = JSON.parse(readFileSync40(checkPath(), "utf-8"));
+    const c = JSON.parse(readFileSync41(checkPath(), "utf-8"));
     return c && typeof c.serverVersion === "string" ? c : null;
   } catch {
     return null;
@@ -22851,7 +23087,7 @@ var init_update_notice = __esm({
     init_http();
     CHECK_TTL_MS = 6 * 3600 * 1e3;
     NPM_LATEST_URL = "https://registry.npmjs.org/chat-recall";
-    checkPath = () => join50(getDataDir(), "update-check.json");
+    checkPath = () => join51(getDataDir(), "update-check.json");
     printed = false;
   }
 });
@@ -22923,15 +23159,15 @@ __export(service_installer_exports, {
   uninstallService: () => uninstallService
 });
 import { execSync as execSync5 } from "child_process";
-import { existsSync as existsSync46, mkdirSync as mkdirSync14, readFileSync as readFileSync41, rmSync as rmSync7, writeFileSync as writeFileSync12 } from "fs";
+import { existsSync as existsSync46, mkdirSync as mkdirSync14, readFileSync as readFileSync42, rmSync as rmSync8, writeFileSync as writeFileSync12 } from "fs";
 import { homedir as homedir18 } from "os";
-import { join as join51 } from "path";
+import { join as join52 } from "path";
 import { fileURLToPath as fileURLToPath4 } from "url";
 function resolveDaemonPaths() {
   const watchJs = fileURLToPath4(new URL("./watch.js", import.meta.url));
   const node = process.execPath;
-  const dataDir = join51(homedir18(), ".chat-recall");
-  const logFile = join51(dataDir, "watch.log");
+  const dataDir = join52(homedir18(), ".chat-recall");
+  const logFile = join52(dataDir, "watch.log");
   return { watchJs, node, logFile, dataDir };
 }
 function tryCmd(cmd) {
@@ -22958,12 +23194,12 @@ function refreshServiceDefinition() {
   if (process.platform !== "linux") return false;
   try {
     const { watchJs, node, logFile } = resolveDaemonPaths();
-    const unitPath = join51(homedir18(), ".config", "systemd", "user", "chat-recall-watch.service");
+    const unitPath = join52(homedir18(), ".config", "systemd", "user", "chat-recall-watch.service");
     if (!existsSync46(unitPath)) return false;
-    const current = readFileSync41(unitPath, "utf8");
+    const current = readFileSync42(unitPath, "utf8");
     if (!current.includes(watchJs)) return false;
     const wanted = renderSystemdUnit(watchJs, node, logFile);
-    if (readFileSync41(unitPath, "utf8") === wanted) return false;
+    if (readFileSync42(unitPath, "utf8") === wanted) return false;
     writeFileSync12(unitPath, wanted);
     execSync5("systemctl --user daemon-reload", { stdio: "ignore" });
     return true;
@@ -22989,8 +23225,8 @@ function installService() {
   );
 }
 function installSystemd(watchJs, node, logFile) {
-  const unitDir = join51(homedir18(), ".config", "systemd", "user");
-  const unitPath = join51(unitDir, "chat-recall-watch.service");
+  const unitDir = join52(homedir18(), ".config", "systemd", "user");
+  const unitPath = join52(unitDir, "chat-recall-watch.service");
   const unit = renderSystemdUnit(watchJs, node, logFile);
   mkdirSync14(unitDir, { recursive: true });
   writeFileSync12(unitPath, unit);
@@ -23069,8 +23305,8 @@ function renderSystemdUnit(watchJs, node, logFile) {
 }
 function installLaunchd(watchJs, node, logFile) {
   const label = "com.chat-recall.watch";
-  const plistDir = join51(homedir18(), "Library", "LaunchAgents");
-  const plistPath = join51(plistDir, `${label}.plist`);
+  const plistDir = join52(homedir18(), "Library", "LaunchAgents");
+  const plistPath = join52(plistDir, `${label}.plist`);
   const plist = renderLaunchdPlist(watchJs, node, logFile, label);
   mkdirSync14(plistDir, { recursive: true });
   writeFileSync12(plistPath, plist);
@@ -23126,9 +23362,9 @@ function uninstallService() {
       removed = true;
     } catch {
     }
-    const unitPath = join51(homedir18(), ".config", "systemd", "user", "chat-recall-watch.service");
+    const unitPath = join52(homedir18(), ".config", "systemd", "user", "chat-recall-watch.service");
     if (existsSync46(unitPath)) {
-      rmSync7(unitPath, { force: true });
+      rmSync8(unitPath, { force: true });
       removed = true;
     }
     try {
@@ -23138,14 +23374,14 @@ function uninstallService() {
     return removed;
   }
   if (process.platform === "darwin") {
-    const plistPath = join51(homedir18(), "Library", "LaunchAgents", "com.chat-recall.watch.plist");
+    const plistPath = join52(homedir18(), "Library", "LaunchAgents", "com.chat-recall.watch.plist");
     try {
       execSync5(`launchctl unload "${plistPath}" 2>/dev/null`, { stdio: "ignore" });
     } catch {
     }
     let removed = false;
     if (existsSync46(plistPath)) {
-      rmSync7(plistPath, { force: true });
+      rmSync8(plistPath, { force: true });
       removed = true;
     }
     return removed;
@@ -23191,15 +23427,15 @@ __export(install_skills_exports, {
   skillsSourceDir: () => skillsSourceDir,
   uninstallSkills: () => uninstallSkills
 });
-import { readdirSync as readdirSync33, existsSync as existsSync47, mkdirSync as mkdirSync15, rmSync as rmSync8, cpSync, writeFileSync as writeFileSync13, readFileSync as readFileSync42, statSync as statSync44, realpathSync as realpathSync4 } from "fs";
+import { readdirSync as readdirSync33, existsSync as existsSync47, mkdirSync as mkdirSync15, rmSync as rmSync9, cpSync, writeFileSync as writeFileSync13, readFileSync as readFileSync43, statSync as statSync45, realpathSync as realpathSync4 } from "fs";
 import { createHash as createHash12 } from "crypto";
-import { join as join52, basename as basename23 } from "path";
+import { join as join53, basename as basename23 } from "path";
 function skillsSourceDir() {
-  return join52(import.meta.dirname, "..", "skills");
+  return join53(import.meta.dirname, "..", "skills");
 }
 function version() {
   try {
-    return JSON.parse(readFileSync42(new URL("../package.json", import.meta.url), "utf-8")).version || "0.0.0";
+    return JSON.parse(readFileSync43(new URL("../package.json", import.meta.url), "utf-8")).version || "0.0.0";
   } catch {
     return "0.0.0";
   }
@@ -23208,9 +23444,9 @@ function skillsFingerprint() {
   const src = skillsSourceDir();
   const h = createHash12("sha256");
   for (const name of bundledSkillNames()) {
-    for (const rel of filesUnder(join52(src, name)).sort()) {
+    for (const rel of filesUnder(join53(src, name)).sort()) {
       h.update(name + "/" + rel);
-      h.update(readFileSync42(join52(src, name, rel)));
+      h.update(readFileSync43(join53(src, name, rel)));
     }
   }
   return h.digest("hex").slice(0, 12);
@@ -23220,7 +23456,7 @@ function filesUnder(dir, prefix = "") {
   for (const e of readdirSync33(dir, { withFileTypes: true })) {
     if (e.name === MARKER) continue;
     const rel = prefix ? `${prefix}/${e.name}` : e.name;
-    if (e.isDirectory()) out.push(...filesUnder(join52(dir, e.name), rel));
+    if (e.isDirectory()) out.push(...filesUnder(join53(dir, e.name), rel));
     else out.push(rel);
   }
   return out;
@@ -23231,7 +23467,7 @@ function skillStamp() {
 function bundledSkillNames() {
   const src = skillsSourceDir();
   if (!existsSync47(src)) return [];
-  return readdirSync33(src, { withFileTypes: true }).filter((e) => e.isDirectory() && existsSync47(join52(src, e.name, "SKILL.md"))).map((e) => e.name).sort();
+  return readdirSync33(src, { withFileTypes: true }).filter((e) => e.isDirectory() && existsSync47(join53(src, e.name, "SKILL.md"))).map((e) => e.name).sort();
 }
 function realPathOrSelf(p) {
   try {
@@ -23244,7 +23480,7 @@ function claudeSkillTargets() {
   const targets = [];
   const seen = /* @__PURE__ */ new Set();
   for (const home of claudeHomeDirs()) {
-    const dir = join52(home, "skills");
+    const dir = join53(home, "skills");
     const key2 = realPathOrSelf(dir);
     if (seen.has(key2)) continue;
     seen.add(key2);
@@ -23255,7 +23491,7 @@ function claudeSkillTargets() {
       dir,
       // Judge each profile on ITS OWN transcripts, not the primary's: a home
       // with no projects/ is a directory someone made, not a Claude install.
-      available: existsSync47(join52(home, "projects"))
+      available: existsSync47(join53(home, "projects"))
     });
   }
   if (targets.length === 0) {
@@ -23270,16 +23506,16 @@ function skillTargets() {
     // both produces "skill conflict" duplicate warnings. Every tool we support
     // has its own dir, so per-tool coverage is complete.
     ...claudeSkillTargets(),
-    { id: "agy", label: "Antigravity", dir: join52(agyBackend.homeDir(), "skills"), available: agyBackend.isAvailable() },
+    { id: "agy", label: "Antigravity", dir: join53(agyBackend.homeDir(), "skills"), available: agyBackend.isAvailable() },
     { id: "codex", label: "Codex", dir: codexBackend.skillsDir(), available: codexBackend.isAvailable() },
     { id: "opencode", label: "OpenCode", dir: opencodeBackend.skillsDir(), available: opencodeBackend.isAvailable() },
     // Cursor DOES have its own dir (~/.cursor/skills). `skills-cursor` next to
     // it is Cursor's bundled set — read-only, never an install target.
-    { id: "cursor", label: "Cursor", dir: join52(cursorHomeDir(), "skills"), available: cursorBackend.isAvailable() }
+    { id: "cursor", label: "Cursor", dir: join53(cursorHomeDir(), "skills"), available: cursorBackend.isAvailable() }
   ];
 }
 function isManaged(dir) {
-  return existsSync47(join52(dir, MARKER));
+  return existsSync47(join53(dir, MARKER));
 }
 function installSkills(opts = {}) {
   const onlyAvailable = opts.onlyAvailable ?? true;
@@ -23296,15 +23532,15 @@ function installSkills(opts = {}) {
       continue;
     }
     for (const name of names) {
-      const dest = join52(t.dir, name);
+      const dest = join53(t.dir, name);
       if (existsSync47(dest) && !isManaged(dest)) {
         skippedUserOwned.push(name);
         continue;
       }
       mkdirSync15(t.dir, { recursive: true });
-      rmSync8(dest, { recursive: true, force: true });
-      cpSync(join52(src, name), dest, { recursive: true });
-      writeFileSync13(join52(dest, MARKER), `${stamp}
+      rmSync9(dest, { recursive: true, force: true });
+      cpSync(join53(src, name), dest, { recursive: true });
+      writeFileSync13(join53(dest, MARKER), `${stamp}
 `);
       installed.push(name);
     }
@@ -23323,9 +23559,9 @@ function uninstallSkills() {
     }
     for (const entry of readdirSync33(t.dir, { withFileTypes: true })) {
       if (!entry.isDirectory()) continue;
-      const dir = join52(t.dir, entry.name);
+      const dir = join53(t.dir, entry.name);
       if (isManaged(dir) && (names.has(entry.name) || entry.name.startsWith("chat-recall"))) {
-        rmSync8(dir, { recursive: true, force: true });
+        rmSync9(dir, { recursive: true, force: true });
         removed.push(entry.name);
       }
     }
@@ -23340,10 +23576,10 @@ function skillsNeedRefresh() {
   for (const t of skillTargets()) {
     if (!t.available) continue;
     for (const name of names) {
-      const marker = join52(t.dir, name, MARKER);
+      const marker = join53(t.dir, name, MARKER);
       if (!existsSync47(marker)) return true;
       try {
-        if (readFileSync42(marker, "utf-8").trim() !== cur) return true;
+        if (readFileSync43(marker, "utf-8").trim() !== cur) return true;
       } catch {
         return true;
       }
@@ -23358,11 +23594,11 @@ function skillStatus() {
     let installed = 0;
     let ver = null;
     for (const name of names) {
-      const marker = join52(t.dir, name, MARKER);
+      const marker = join53(t.dir, name, MARKER);
       if (existsSync47(marker)) {
         installed++;
         try {
-          ver = readFileSync42(marker, "utf-8").trim();
+          ver = readFileSync43(marker, "utf-8").trim();
         } catch {
         }
       }
@@ -29457,9 +29693,9 @@ function openBrowser(url) {
 // src/mcp.ts
 init_client_events();
 init_update_notice();
-import { readFileSync as readFileSync43 } from "node:fs";
+import { readFileSync as readFileSync44 } from "node:fs";
 setServerVersion(JSON.parse(
-  readFileSync43(new URL("../package.json", import.meta.url), "utf-8")
+  readFileSync44(new URL("../package.json", import.meta.url), "utf-8")
 ).version);
 setEventReporter(reportClientEvent2);
 setIndexRunner(runIndexChild2);
@@ -29576,9 +29812,9 @@ var SYNC_TICK_MS = 3 * 6e4;
 function startBackgroundSync() {
   const tick = async (scope) => {
     try {
-      const { installedVersion: installedVersion2 } = await Promise.resolve().then(() => (init_auto_update(), auto_update_exports));
+      const { installedVersion: installedVersion3 } = await Promise.resolve().then(() => (init_auto_update(), auto_update_exports));
       const { installedIsNewer: installedIsNewer2, runInstalledSync: runInstalledSync2 } = await Promise.resolve().then(() => (init_sync_delegate(), sync_delegate_exports));
-      const installed = installedVersion2();
+      const installed = installedVersion3();
       if (installedIsNewer2(RELAY_VERSION, installed)) {
         const code = await runInstalledSync2(fileURLToPath5(new URL("./cli.js", import.meta.url)));
         if (code !== 0) console.error(`[mcp] sync by the installed CLI ${installed} ended with ${code ?? "no exit code"}`);
@@ -29632,7 +29868,7 @@ function installCrashGuards() {
     reportClientEvent2("mcp_crash", { message: err.stack || err.message });
   });
 }
-var RELAY_VERSION = true ? "0.7.16" : "0.0.0";
+var RELAY_VERSION = true ? "0.7.18" : "0.0.0";
 function daemonIdleSecs() {
   const raw = process.env.CHAT_RECALL_DAEMON_IDLE_SECS;
   if (raw === void 0) return 900;
@@ -29728,8 +29964,25 @@ async function runDaemon() {
   };
   process.on("SIGTERM", shutdown);
   process.on("SIGINT", shutdown);
+  const upgradeTimer = setInterval(() => {
+    const installed = installedVersion2();
+    if (installed && RELAY_VERSION !== "0.0.0" && installed !== RELAY_VERSION) {
+      console.error(`[mcp] v${installed} is installed; daemon v${RELAY_VERSION} is leaving`);
+      clearInterval(upgradeTimer);
+      shutdown();
+    }
+  }, 3e4);
+  upgradeTimer.unref();
   return true;
 }
+function installedVersion2() {
+  try {
+    const pkg = JSON.parse(readFileSync44(new URL("../package.json", import.meta.url), "utf-8"));
+    return typeof pkg.version === "string" ? pkg.version : null;
+  } catch {
+    return null;
+  }
+}
 async function main() {
   installCrashGuards();
   if (process.argv.includes("--daemon")) {