chat-recall 0.7.10 → 0.7.12

package/dist/watch.js

@@ -194,8 +194,15 @@ var init_claude_prompt_origin = __esm({
     INJECTED_PREFIXES = [
       ["<task-notification", "task-notification"],
       ["<agent-message", "peer"],
+      ["<cross-session-message", "peer"],
+      ["[Cross-session delivery notice]", "peer"],
       ["Another Claude session sent a message:", "peer"],
-      ["Stop hook feedback:", "hook"]
+      ["Stop hook feedback:", "hook"],
+      ["<bash-stdout>", "command-output"],
+      ["<bash-stderr>", "command-output"],
+      ["<local-command-stdout>", "command-output"],
+      ["<local-command-stderr>", "command-output"],
+      ["<<autonomous-loop", "meta"]
     ];
   }
 });
@@ -6449,7 +6456,11 @@ __export(raw_exports, {
   gzipContainer: () => gzipContainer,
   mapContainerText: () => mapContainerText,
   parseOpenCodeDumpText: () => parseOpenCodeDumpText,
-  parseTranscriptFromContainer: () => parseTranscriptFromContainer
+  parseTranscriptFromContainer: () => parseTranscriptFromContainer,
+  redactContainer: () => redactContainer,
+  redactJsonLine: () => redactJsonLine,
+  repairContainer: () => repairContainer,
+  repairRedactedJsonl: () => repairRedactedJsonl
 });
 import { gzipSync, gunzipSync } from "zlib";
 import { createHash } from "crypto";
@@ -6490,6 +6501,134 @@ function gunzipContainer(gz) {
 function mapContainerText(c, fn) {
   return { ...c, files: c.files.map((f) => ({ name: f.name, text: fn(f.text) })) };
 }
+function repairRedactedJsonl(text) {
+  let repaired = 0;
+  const parts = [];
+  let copied = 0;
+  let at = text.indexOf("[REDACTED:");
+  while (at >= 0) {
+    const start = text.lastIndexOf("\n", at) + 1;
+    let end = text.indexOf("\n", at);
+    if (end < 0)
+      end = text.length;
+    const fixed = repairLine(text.slice(start, end));
+    if (fixed !== null) {
+      parts.push(text.slice(copied, start), fixed);
+      copied = end;
+      repaired++;
+    }
+    at = text.indexOf("[REDACTED:", end);
+  }
+  if (repaired === 0)
+    return { text, repaired: 0 };
+  parts.push(text.slice(copied));
+  return { text: parts.join(""), repaired };
+}
+function parseError(line) {
+  try {
+    JSON.parse(line);
+    return null;
+  } catch (e) {
+    const m = /position (\d+)/.exec(e instanceof Error ? e.message : "");
+    return m ? Number(m[1]) : line.length;
+  }
+}
+function repairLine(line) {
+  if (!line.includes("[REDACTED:") || parseError(line) === null)
+    return null;
+  let out = line.replace(/(?<!\\)((?:\\\\)*)\\(\[REDACTED:)/g, "$1$2");
+  for (let attempt = 0; attempt < 64; attempt++) {
+    const at = parseError(out);
+    if (at === null)
+      return out;
+    let site = -1;
+    for (const m of out.matchAll(MARKER_QUOTE)) {
+      const q = m.index + m[0].length - 1;
+      if (q < at)
+        site = q;
+    }
+    if (site < 0)
+      return null;
+    out = out.slice(0, site) + "\\" + out.slice(site);
+  }
+  return null;
+}
+function redactJsonLine(line, redact) {
+  if (!line.includes('"'))
+    return redact(line);
+  try {
+    JSON.parse(line);
+  } catch {
+    return redact(line);
+  }
+  const decoded = mapJsonStrings(line, redact, true);
+  const out = redact(decoded);
+  try {
+    JSON.parse(out);
+    return out;
+  } catch {
+    return mapJsonStrings(decoded, redact, false);
+  }
+}
+function mapJsonStrings(line, fn, escapedOnly) {
+  let out = "";
+  let i = 0;
+  for (; ; ) {
+    const q = line.indexOf('"', i);
+    if (q < 0)
+      return out + line.slice(i);
+    let j = q + 1;
+    while (j < line.length) {
+      const c = line.charCodeAt(j);
+      if (c === 92)
+        j += 2;
+      else if (c === 34)
+        break;
+      else
+        j++;
+    }
+    const token = line.slice(q, j + 1);
+    out += line.slice(i, q);
+    i = j + 1;
+    const body = token.slice(1, -1);
+    const escaped = body.includes("\\");
+    if (escapedOnly && !escaped) {
+      out += token;
+      continue;
+    }
+    let value = body;
+    if (escaped) {
+      try {
+        value = JSON.parse(token);
+      } catch {
+        out += token;
+        continue;
+      }
+    }
+    const next = fn(value);
+    out += next === value ? token : JSON.stringify(next);
+  }
+}
+function redactContainer(c, redact) {
+  return {
+    ...c,
+    files: c.files.map((f) => ({
+      name: f.name,
+      text: f.name.endsWith(".jsonl") ? f.text.split("\n").map((l) => l ? redactJsonLine(l, redact) : l).join("\n") : redact(f.text)
+    }))
+  };
+}
+function repairContainer(c) {
+  let repaired = 0;
+  const files = c.files.map((f) => {
+    if (!f.name.endsWith(".jsonl"))
+      return f;
+    const r = repairRedactedJsonl(f.text);
+    repaired += r.repaired;
+    return r.repaired > 0 ? { name: f.name, text: r.text } : f;
+  });
+  return repaired > 0 ? { container: { ...c, files }, repaired } : { container: c, repaired: 0 };
+}
 function subagentKind(id) {
   return id.includes("acompact") ? "compact" : id.includes("aside_question") ? "aside" : id.includes("explore") || /^agent-a[0-9a-f]{16,}$/i.test(id) ? "explore" : "other";
 }
@@ -6660,6 +6799,7 @@ function requireFs() {
 function requirePath() {
   return pathMod;
 }
+var MARKER_QUOTE;
 var init_raw = __esm({
   "../engine/dist/transcript/raw.js"() {
     "use strict";
@@ -6667,6 +6807,7 @@ var init_raw = __esm({
     init_claude();
     init_codex();
     init_from_events();
+    MARKER_QUOTE = /\[REDACTED:[A-Za-z0-9_-]+\]"/g;
   }
 });
 
@@ -7329,7 +7470,7 @@ var init_session_sentiment = __esm({
     DIRECTIVE_HEAD = /^(?:please\s+)?(?:use|implement|build|make|add|create|fix|remove|delete|update|refactor|run|deploy|push|merge|test|check|investigate|find|search|show|list|generate|set\s+up|ensure)\b/i;
     CLARIFY_PHRASES = /\b(?:wdym|what do you mean|explain|clarify|what is|what's|huh\??|i don'?t understand)\b/i;
     FRUSTRATED_PHRASES = /\b(?:why (?:the )?(?:fuck|hell)|wtf|are you (?:kidding|serious)|stop slacking|stop making|why did you|why didn'?t you|i (?:fucking )?(?:asked|told you)|are you (?:listening|even)|come\s*on|just\s+do)\b/i;
-    MARKERS_VERSION = 2;
+    MARKERS_VERSION = 3;
   }
 });
 
@@ -12163,7 +12304,13 @@ function redactSecrets(text, opts = {}) {
         return whole;
       if (opts.count)
         opts.count.redactions++;
-      return whole.slice(0, whole.length - secret.length) + `[REDACTED:${r.label}]`;
+      let last = args.length - 1;
+      if (typeof args[last] === "object")
+        last--;
+      const source = args[last];
+      const secretStart = args[last - 1] + whole.length - secret.length;
+      const head = escapeHead(source, secretStart, secret.length);
+      return whole.slice(0, whole.length - secret.length + head) + `[REDACTED:${r.label}]` + escapeKept(whole, whole.length);
     });
   }
   const ctx = findContextualSecrets(out);
@@ -12171,10 +12318,25 @@ function redactSecrets(text, opts = {}) {
     const { start, end } = ctx[i];
     if (opts.count)
       opts.count.redactions++;
-    out = out.slice(0, start) + "[REDACTED:secret-context]" + out.slice(end);
+    const head = escapeHead(out, start, end - start);
+    out = out.slice(0, start + head) + "[REDACTED:secret-context]" + escapeKept(out, end) + out.slice(end);
   }
   return out;
 }
+function escapeKept(text, end) {
+  let run = 0;
+  while (run < end && text.charCodeAt(end - 1 - run) === 92)
+    run++;
+  return run % 2 === 1 ? "\\" : "";
+}
+function escapeHead(text, start, length) {
+  let run = 0;
+  while (run < start && text.charCodeAt(start - 1 - run) === 92)
+    run++;
+  if (run % 2 === 0)
+    return 0;
+  return Math.min(text[start] === "u" ? 5 : 1, length);
+}
 function maskSecret(s) {
   if (!s)
     return "";
@@ -12281,7 +12443,12 @@ var init_secret_redactor = __esm({
       // userinfo URL walked through in cleartext — and a `jdbc:postgresql://…`
       // prefix broke the \b anchor for the one family it did cover. Any scheme
       // followed by userinfo is a credential, so match the shape, not a list.
-      { label: "url-password", secret: 1, pattern: /\b[a-zA-Z][a-zA-Z0-9+.-]{1,31}:\/\/[^:@\s/]{1,64}:([^@\s/]{1,256})(?=@)/g },
+      //
+      // A quote in userinfo is percent-encoded, so neither part takes a `"`. The
+      // sync redacts JSONL text, and a match that ran on through `","is_error":`
+      // to a later `@` replaced JSON structure: 4 lines on one machine stopped
+      // parsing, and their records were dropped.
+      { label: "url-password", secret: 1, pattern: /\b[a-zA-Z][a-zA-Z0-9+.-]{1,31}:\/\/[^:@\s/"]{1,64}:([^@\s/"]{1,256})(?=@)/g },
       // Bare AWS secret-access-key VALUE: EXACTLY 40 base64 chars, word-bounded,
       // containing upper+lower+digit. This is the gitleaks heuristic — the mixed-case
       // requirement excludes 40-char lowercase-hex git SHAs, and the exact-40 bound
@@ -13315,6 +13482,10 @@ __export(transcript_exports, {
   parseTranscript: () => parseTranscript,
   parseTranscriptFromContainer: () => parseTranscriptFromContainer,
   readShadowContainer: () => readShadowContainer,
+  redactContainer: () => redactContainer,
+  redactJsonLine: () => redactJsonLine,
+  repairContainer: () => repairContainer,
+  repairRedactedJsonl: () => repairRedactedJsonl,
   seedShadow: () => seedShadow,
   shadowFileFor: () => shadowFileFor,
   shadowRoot: () => shadowRoot,
@@ -18202,7 +18373,7 @@ var init_sync_fields = __esm({
 import { existsSync as existsSync39, mkdirSync as mkdirSync8, openSync as openSync8, writeFileSync as writeFileSync7, readFileSync as readFileSync31, rmSync as rmSync4, statSync as statSync35, closeSync as closeSync8 } from "fs";
 import { dirname as dirname17, join as join40 } from "path";
 function acquireIndexLock(opts) {
-  const lockPath = lockFilePath();
+  const lockPath = lockFilePath(opts.file);
   mkdirSync8(dirname17(lockPath), { recursive: true });
   if (existsSync39(lockPath)) {
     if (!stealStaleLock(lockPath, opts.staleAfterMs ?? 10 * 6e4)) {
@@ -18244,8 +18415,8 @@ function acquireIndexLock(opts) {
     }
   };
 }
-function lockFilePath() {
-  return join40(getIndexDir(), ".compact.lock");
+function lockFilePath(file = ".compact.lock") {
+  return join40(getIndexDir(), file);
 }
 function stealStaleLock(lockPath, staleAfterMs) {
   try {
@@ -18312,7 +18483,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.10";
+        if (true) CLI_VERSION = "0.7.12";
       } catch {
       }
     }
@@ -18806,7 +18977,7 @@ var init_telemetry = __esm({
     init_sync_client();
     cliVersion = () => {
       try {
-        return true ? "0.7.10" : "dev";
+        return true ? "0.7.12" : "dev";
       } catch {
         return "dev";
       }
@@ -19021,6 +19192,8 @@ var init_client_events = __esm({
 // src/auto-update.ts
 var auto_update_exports = {};
 __export(auto_update_exports, {
+  LOCKED_REASON: () => LOCKED_REASON,
+  STOPPING_REASON: () => STOPPING_REASON,
   clearUpdateFailures: () => clearUpdateFailures,
   compareVersions: () => compareVersions,
   executeAutoUpdate: () => executeAutoUpdate,
@@ -19032,8 +19205,10 @@ __export(auto_update_exports, {
   planAutoUpdate: () => planAutoUpdate,
   readUpdateState: () => readUpdateState,
   resolveNpm: () => resolveNpm,
+  restartCommand: () => restartCommand,
   runAutoUpdate: () => runAutoUpdate,
   runningPrefix: () => runningPrefix,
+  stopAutoUpdates: () => stopAutoUpdates,
   sweepStaleStaging: () => sweepStaleStaging,
   tarballUrl: () => tarballUrl
 });
@@ -19129,6 +19304,10 @@ async function executeAutoUpdate(plan, deps) {
   };
   const tgz = join41(dir, "chat-recall.tgz");
   writeFileSync8(tgz, buf);
+  if (deps.stopping?.()) {
+    discardStaging();
+    return { updated: false, reason: STOPPING_REASON };
+  }
   try {
     deps.install(tgz);
   } catch (e) {
@@ -19143,9 +19322,11 @@ async function executeAutoUpdate(plan, deps) {
       reason: `install reported success but ${landed} is still on disk (wanted ${plan.to}) \u2014 the package that runs is not the one npm wrote. Reinstall by hand: npm install -g ${plan.url}`
     };
   }
-  try {
-    deps.restart(deps.platform ?? process.platform);
-  } catch {
+  if (!deps.stopping?.()) {
+    try {
+      deps.restart(deps.platform ?? process.platform);
+    } catch {
+    }
   }
   return { updated: true, reason: `updated ${plan.from} \u2192 ${plan.to}`, from: plan.from, to: plan.to };
 }
@@ -19204,10 +19385,18 @@ function realInstall(tgz) {
     npmInstall(npm, ["install", "-g", "--prefix", join41(homedir15(), ".local"), tgz]);
   }
 }
+function acquireUpdateLock() {
+  return acquireIndexLock({ kind: "auto-update", file: ".update.lock", staleAfterMs: 10 * 6e4 });
+}
+function restartCommand(platform2) {
+  if (platform2 === "linux") return { cmd: "systemctl --user --no-block restart chat-recall-watch.service" };
+  if (platform2 === "darwin") return { cmd: "launchctl kickstart -k gui/$(id -u)/com.chat-recall.watch", shell: "/bin/bash" };
+  if (platform2 === "win32") return { cmd: "schtasks /End /TN chat-recall-watch & schtasks /Run /TN chat-recall-watch" };
+  return null;
+}
 function realRestart(platform2) {
-  if (platform2 === "linux") execSync2("systemctl --user restart chat-recall-watch.service", { stdio: "ignore" });
-  else if (platform2 === "darwin") execSync2("launchctl kickstart -k gui/$(id -u)/com.chat-recall.watch", { stdio: "ignore", shell: "/bin/bash" });
-  else if (platform2 === "win32") execSync2("schtasks /End /TN chat-recall-watch & schtasks /Run /TN chat-recall-watch", { stdio: "ignore" });
+  const c = restartCommand(platform2);
+  if (c) execSync2(c.cmd, { stdio: "ignore", ...c.shell ? { shell: c.shell } : {} });
 }
 function updateStatePath() {
   const dir = process.env.CHAT_RECALL_DATA_DIR || join41(homedir15(), ".chat-recall");
@@ -19240,6 +19429,9 @@ function noteUpdateFailure(target) {
 function clearUpdateFailures() {
   writeUpdateState({});
 }
+function stopAutoUpdates() {
+  stopRequested = true;
+}
 async function runAutoUpdate(base2, authHeaders, ownVersion3, deps) {
   let caps;
   try {
@@ -19266,12 +19458,28 @@ async function runAutoUpdate(base2, authHeaders, ownVersion3, deps) {
   if (target && hasGivenUpOn(target)) {
     return { updated: false, reason: `gave up installing ${plan.to} after ${GIVE_UP_AFTER} failed attempts \u2014 run \`npm install -g chat-recall\` by hand` };
   }
-  const result = await executeAutoUpdate(plan, {
-    download: deps?.download ?? realDownload,
-    install: deps?.install ?? realInstall,
-    restart: deps?.restart ?? realRestart,
-    platform: deps?.platform
-  });
+  const stopping = deps?.stopping ?? (() => stopRequested);
+  if (stopping()) return { updated: false, reason: STOPPING_REASON };
+  const lock = (deps?.acquireLock ?? acquireUpdateLock)();
+  if (!lock) return { updated: false, reason: LOCKED_REASON };
+  let result;
+  try {
+    const onDisk = (deps?.onDisk ?? installedVersion)();
+    if (onDisk && plan.to && compareVersions(onDisk, plan.to) >= 0) {
+      return { updated: false, reason: `already current: ${onDisk} is on disk` };
+    }
+    result = await executeAutoUpdate(plan, {
+      download: deps?.download ?? realDownload,
+      install: deps?.install ?? realInstall,
+      restart: deps?.restart ?? realRestart,
+      platform: deps?.platform,
+      verify: deps?.verify,
+      stopping
+    });
+  } finally {
+    lock.release();
+  }
+  if (result.reason === STOPPING_REASON) return result;
   if (!result.updated) {
     const failures = target ? noteUpdateFailure(target) : 1;
     if (failures <= GIVE_UP_AFTER) {
@@ -19287,14 +19495,18 @@ async function runAutoUpdate(base2, authHeaders, ownVersion3, deps) {
   }
   return result;
 }
-var tarballUrl, GIVE_UP_AFTER, reportedStandingSkip;
+var tarballUrl, GIVE_UP_AFTER, reportedStandingSkip, STOPPING_REASON, LOCKED_REASON, stopRequested;
 var init_auto_update = __esm({
   "src/auto-update.ts"() {
     "use strict";
     init_http();
+    init_index_lock();
     tarballUrl = (base2, version) => `${base2.replace(/\/+$/, "")}/install/${version ? `chat-recall-${version}.tgz` : "chat-recall.tgz"}`;
     GIVE_UP_AFTER = 3;
     reportedStandingSkip = /* @__PURE__ */ new Set();
+    STOPPING_REASON = "not installed: this process is shutting down";
+    LOCKED_REASON = "another process is installing an update";
+    stopRequested = false;
   }
 });
 
@@ -20698,7 +20910,7 @@ async function buildConversationSync(ref, mtime, opts = {}) {
     } else {
       try {
         const count2 = { redactions: 0 };
-        const redacted = mapContainerText(container, (t) => redactSecrets(t, { force: true, count: count2 }));
+        const redacted = redactContainer(container, (t) => redactSecrets(t, { force: true, count: count2 }));
         count.redactions += count2.redactions;
         const { gz, size } = gzipContainer(redacted);
         if (gz.length <= 8 * 1024 * 1024) {
@@ -20898,7 +21110,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.10";
+        if (true) ownVersion = "0.7.12";
       } catch {
       }
     }
@@ -24035,7 +24247,7 @@ try {
   ownVersion2 = JSON.parse(readFileSync39(join48(dir, "../package.json"), "utf-8")).version || ownVersion2;
 } catch {
   try {
-    if (true) ownVersion2 = "0.7.10";
+    if (true) ownVersion2 = "0.7.12";
   } catch {
   }
 }
@@ -24420,7 +24632,7 @@ async function runCollectorMigration(opts) {
 init_sync_ledger();
 init_collector_health();
 import { existsSync as existsSync50, readFileSync as readFileSync45, statSync as statSync45 } from "fs";
-var CLI_VERSION3 = true ? "0.7.10" : "0.0.0";
+var CLI_VERSION3 = true ? "0.7.12" : "0.0.0";
 var DEBOUNCE_MS = 5e3;
 var PLANS_DIR = claudeBackend.plansDir();
 var TASKS_DIR = claudeBackend.tasksDir();
@@ -24976,6 +25188,7 @@ if (CODE_INDEX_ON) setTimeout(() => {
 }, 15e4);
 function shutdown(signal) {
   daemonLog.info(`Received ${signal}, shutting down...`);
+  stopAutoUpdates();
   try {
     flushLedger();
   } catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chat-recall",
-  "version": "0.7.10",
+  "version": "0.7.12",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/munhq/chat-recall.git"