chat-recall 0.7.21 → 0.7.24

package/dist/scan-worker.js

@@ -5409,19 +5409,19 @@ function mapJsonStrings(line, fn, escapedOnly) {
     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);
+    let j2 = q + 1;
+    while (j2 < line.length) {
+      const c = line.charCodeAt(j2);
       if (c === 92)
-        j += 2;
+        j2 += 2;
       else if (c === 34)
         break;
       else
-        j++;
+        j2++;
     }
-    const token = line.slice(q, j + 1);
+    const token = line.slice(q, j2 + 1);
     out += line.slice(i, q);
-    i = j + 1;
+    i = j2 + 1;
     const body = token.slice(1, -1);
     const escaped = body.includes("\\");
     if (escapedOnly && !escaped) {
@@ -6208,6 +6208,130 @@ var init_sqlite_reader = __esm({
   }
 });
 
+// ../engine/dist/core/backends/opencode-v2.js
+function hasTable(db, name) {
+  return !!db.prepare("SELECT 1 FROM main.sqlite_master WHERE type = 'table' AND name = ?").get(name);
+}
+function columnsOf(db, table) {
+  return new Set(db.prepare(`SELECT name FROM pragma_table_info('${table}', 'main')`).all().map((r) => r.name));
+}
+function installOpencodeV2Views(db) {
+  if (!hasTable(db, "session_v2") || !hasTable(db, "session_message"))
+    return false;
+  const v2Cols = columnsOf(db, "session_v2");
+  const sessionCols = SESSION_COLUMNS.map((c) => v2Cols.has(c) ? c : `NULL AS ${c}`).join(", ");
+  const hasV1 = hasTable(db, "message") && hasTable(db, "part");
+  const v1Messages = hasV1 ? `SELECT id, session_id, time_created, time_updated, data FROM main.message WHERE session_id NOT IN (${V2_SESSIONS}) UNION ALL ` : "";
+  const v1Parts = hasV1 ? `SELECT id, message_id, session_id, time_created, time_updated, data FROM main.part WHERE session_id NOT IN (${V2_SESSIONS}) UNION ALL ` : "";
+  db.exec(`
+    CREATE TEMP VIEW IF NOT EXISTS session AS SELECT ${sessionCols} FROM main.session_v2;
+
+    CREATE TEMP VIEW IF NOT EXISTS message AS
+    ${v1Messages}
+    SELECT m.id, m.session_id, m.time_created, m.time_updated,
+      CASE m.type
+        WHEN 'user' THEN json_object('role', 'user', 'time', ${j("$.time")})
+        ELSE json_object(
+          'role', 'assistant',
+          'agent', json_extract(m.data, '$.agent'),
+          'modelID', json_extract(m.data, '$.model.id'),
+          'providerID', json_extract(m.data, '$.model.providerID'),
+          'cost', coalesce(json_extract(m.data, '$.cost'), 0),
+          'tokens', ${j("$.tokens")},
+          'time', ${j("$.time")})
+      END AS data
+    FROM main.session_message m WHERE m.type IN ('user', 'assistant');
+
+    CREATE TEMP VIEW IF NOT EXISTS part AS
+    ${v1Parts}
+    SELECT m.id || ':text', m.id, m.session_id, m.time_created, m.time_updated,
+      json_object('type', 'text', 'text', json_extract(m.data, '$.text'))
+    FROM main.session_message m
+    WHERE m.type = 'user' AND json_extract(m.data, '$.text') IS NOT NULL
+    UNION ALL
+    SELECT m.id || ':' || c.key, m.id, m.session_id, m.time_created + c.key, m.time_updated,
+      CASE json_extract(c.value, '$.type')
+        WHEN 'tool' THEN json_object(
+          'type', 'tool',
+          'tool', json_extract(c.value, '$.name'),
+          'callID', json_extract(c.value, '$.id'),
+          'state', json_object(
+            'status', json_extract(c.value, '$.state.status'),
+            'input', json(coalesce(json_extract(c.value, '$.state.input'), '{}')),
+            'output', (SELECT group_concat(json_extract(o.value, '$.text'), char(10))
+                       FROM json_each(c.value, '$.state.content') o
+                       WHERE json_extract(o.value, '$.type') = 'text')))
+        ELSE json_object('type', json_extract(c.value, '$.type'), 'text', json_extract(c.value, '$.text'))
+      END
+    FROM main.session_message m, json_each(m.data, '$.content') c
+    WHERE m.type = 'assistant'
+    UNION ALL
+    SELECT m.id || ':step', m.id, m.session_id,
+      coalesce(json_extract(m.data, '$.time.completed'), m.time_created), m.time_updated,
+      json_object('type', 'step-finish', 'cost', coalesce(json_extract(m.data, '$.cost'), 0), 'tokens', ${j("$.tokens")})
+    FROM main.session_message m WHERE m.type = 'assistant';
+  `);
+  return true;
+}
+function openOpencodeDb(path) {
+  const db = openSqliteReadonly(path);
+  if (!db)
+    return null;
+  try {
+    installOpencodeV2Views(db);
+  } catch {
+  }
+  return db;
+}
+function openOpencodeDbOrThrow(path) {
+  const db = openSqliteReadonlyOrThrow(path);
+  try {
+    installOpencodeV2Views(db);
+  } catch {
+  }
+  return db;
+}
+var SESSION_COLUMNS, j, V2_SESSIONS;
+var init_opencode_v2 = __esm({
+  "../engine/dist/core/backends/opencode-v2.js"() {
+    "use strict";
+    init_sqlite_reader();
+    SESSION_COLUMNS = [
+      "id",
+      "project_id",
+      "parent_id",
+      "slug",
+      "directory",
+      "title",
+      "version",
+      "share_url",
+      "summary_additions",
+      "summary_deletions",
+      "summary_files",
+      "summary_diffs",
+      "revert",
+      "permission",
+      "time_created",
+      "time_updated",
+      "time_compacting",
+      "time_archived",
+      "workspace_id",
+      "path",
+      "agent",
+      "model",
+      "cost",
+      "tokens_input",
+      "tokens_output",
+      "tokens_reasoning",
+      "tokens_cache_read",
+      "tokens_cache_write",
+      "metadata"
+    ];
+    j = (path, fallback = "'{}'") => `json(coalesce(json_extract(m.data, '${path}'), ${fallback}))`;
+    V2_SESSIONS = "SELECT session_id FROM main.session_message";
+  }
+});
+
 // ../engine/dist/core/generic-engine.js
 import { basename as basename3 } from "path";
 import { createPatch } from "diff";
@@ -6500,13 +6624,13 @@ import { existsSync as existsSync5 } from "fs";
 import { homedir as homedir4 } from "os";
 import { dirname as dirname5, join as join5 } from "path";
 function openReadonly(path) {
-  return openSqliteReadonly(path);
+  return openOpencodeDb(path);
 }
 var PREFIX, OpencodeBackend, opencodeBackend;
 var init_opencode = __esm({
   "../engine/dist/core/backends/opencode.js"() {
     "use strict";
-    init_sqlite_reader();
+    init_opencode_v2();
     init_tool_paths();
     init_session_outcome();
     init_session_git();
@@ -6797,9 +6921,9 @@ var init_opencode = __esm({
             return [];
           const parts = db.prepare(`
         SELECT p.id, p.message_id, p.time_created, p.data, m.data AS msg_data
-        FROM part p JOIN message m ON m.id = p.message_id
+        FROM part p JOIN (SELECT id, data FROM message WHERE session_id = ?) m ON m.id = p.message_id
         WHERE p.session_id = ? ORDER BY p.time_created ASC
-      `).all(ocId);
+      `).all(ocId, ocId);
           const events = [];
           let lineNum = 0;
           for (const p of parts) {
@@ -7015,17 +7139,17 @@ var init_opencode = __esm({
         if (!existsSync5(dbPath))
           return null;
         const realId = this.toRawId(id);
-        const db = openSqliteReadonlyOrThrow(dbPath);
+        const db = openOpencodeDbOrThrow(dbPath);
         try {
           const session = db.prepare(`SELECT * FROM session WHERE id = ?`).get(realId);
           if (!session)
             return null;
           const rows = db.prepare(`
         SELECT m.id AS message_id, m.data AS message_data, p.id AS part_id, p.data AS part_data, p.time_created
-        FROM part p JOIN message m ON p.message_id = m.id
+        FROM part p JOIN (SELECT id, data FROM message WHERE session_id = ?) m ON p.message_id = m.id
         WHERE p.session_id = ?
         ORDER BY p.time_created ASC, p.id ASC
-      `).all(realId);
+      `).all(realId, realId);
           const lines = [JSON.stringify({ kind: "session", row: session })];
           for (const r of rows)
             lines.push(JSON.stringify({ kind: "part", row: r }));
@@ -8137,6 +8261,10 @@ var init_agy = __esm({
       sharedSettingsFile() {
         return join7(this.sharedRootDir(), "settings.json");
       }
+      /** The global hooks file the CLI reads. It does not read hooks from its own home directory. */
+      sharedHooksFile() {
+        return join7(this.sharedRootDir(), "config", "hooks.json");
+      }
       sharedProjectsJson() {
         return join7(this.sharedRootDir(), "projects.json");
       }

package/dist/watch.js

@@ -6794,19 +6794,19 @@ function mapJsonStrings(line, fn, escapedOnly) {
     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);
+    let j2 = q + 1;
+    while (j2 < line.length) {
+      const c = line.charCodeAt(j2);
       if (c === 92)
-        j += 2;
+        j2 += 2;
       else if (c === 34)
         break;
       else
-        j++;
+        j2++;
     }
-    const token = line.slice(q, j + 1);
+    const token = line.slice(q, j2 + 1);
     out += line.slice(i, q);
-    i = j + 1;
+    i = j2 + 1;
     const body = token.slice(1, -1);
     const escaped = body.includes("\\");
     if (escapedOnly && !escaped) {
@@ -9372,6 +9372,130 @@ var init_sqlite_reader = __esm({
   }
 });
 
+// ../engine/dist/core/backends/opencode-v2.js
+function hasTable(db, name) {
+  return !!db.prepare("SELECT 1 FROM main.sqlite_master WHERE type = 'table' AND name = ?").get(name);
+}
+function columnsOf(db, table) {
+  return new Set(db.prepare(`SELECT name FROM pragma_table_info('${table}', 'main')`).all().map((r) => r.name));
+}
+function installOpencodeV2Views(db) {
+  if (!hasTable(db, "session_v2") || !hasTable(db, "session_message"))
+    return false;
+  const v2Cols = columnsOf(db, "session_v2");
+  const sessionCols = SESSION_COLUMNS.map((c) => v2Cols.has(c) ? c : `NULL AS ${c}`).join(", ");
+  const hasV1 = hasTable(db, "message") && hasTable(db, "part");
+  const v1Messages = hasV1 ? `SELECT id, session_id, time_created, time_updated, data FROM main.message WHERE session_id NOT IN (${V2_SESSIONS}) UNION ALL ` : "";
+  const v1Parts = hasV1 ? `SELECT id, message_id, session_id, time_created, time_updated, data FROM main.part WHERE session_id NOT IN (${V2_SESSIONS}) UNION ALL ` : "";
+  db.exec(`
+    CREATE TEMP VIEW IF NOT EXISTS session AS SELECT ${sessionCols} FROM main.session_v2;
+
+    CREATE TEMP VIEW IF NOT EXISTS message AS
+    ${v1Messages}
+    SELECT m.id, m.session_id, m.time_created, m.time_updated,
+      CASE m.type
+        WHEN 'user' THEN json_object('role', 'user', 'time', ${j("$.time")})
+        ELSE json_object(
+          'role', 'assistant',
+          'agent', json_extract(m.data, '$.agent'),
+          'modelID', json_extract(m.data, '$.model.id'),
+          'providerID', json_extract(m.data, '$.model.providerID'),
+          'cost', coalesce(json_extract(m.data, '$.cost'), 0),
+          'tokens', ${j("$.tokens")},
+          'time', ${j("$.time")})
+      END AS data
+    FROM main.session_message m WHERE m.type IN ('user', 'assistant');
+
+    CREATE TEMP VIEW IF NOT EXISTS part AS
+    ${v1Parts}
+    SELECT m.id || ':text', m.id, m.session_id, m.time_created, m.time_updated,
+      json_object('type', 'text', 'text', json_extract(m.data, '$.text'))
+    FROM main.session_message m
+    WHERE m.type = 'user' AND json_extract(m.data, '$.text') IS NOT NULL
+    UNION ALL
+    SELECT m.id || ':' || c.key, m.id, m.session_id, m.time_created + c.key, m.time_updated,
+      CASE json_extract(c.value, '$.type')
+        WHEN 'tool' THEN json_object(
+          'type', 'tool',
+          'tool', json_extract(c.value, '$.name'),
+          'callID', json_extract(c.value, '$.id'),
+          'state', json_object(
+            'status', json_extract(c.value, '$.state.status'),
+            'input', json(coalesce(json_extract(c.value, '$.state.input'), '{}')),
+            'output', (SELECT group_concat(json_extract(o.value, '$.text'), char(10))
+                       FROM json_each(c.value, '$.state.content') o
+                       WHERE json_extract(o.value, '$.type') = 'text')))
+        ELSE json_object('type', json_extract(c.value, '$.type'), 'text', json_extract(c.value, '$.text'))
+      END
+    FROM main.session_message m, json_each(m.data, '$.content') c
+    WHERE m.type = 'assistant'
+    UNION ALL
+    SELECT m.id || ':step', m.id, m.session_id,
+      coalesce(json_extract(m.data, '$.time.completed'), m.time_created), m.time_updated,
+      json_object('type', 'step-finish', 'cost', coalesce(json_extract(m.data, '$.cost'), 0), 'tokens', ${j("$.tokens")})
+    FROM main.session_message m WHERE m.type = 'assistant';
+  `);
+  return true;
+}
+function openOpencodeDb(path) {
+  const db = openSqliteReadonly(path);
+  if (!db)
+    return null;
+  try {
+    installOpencodeV2Views(db);
+  } catch {
+  }
+  return db;
+}
+function openOpencodeDbOrThrow(path) {
+  const db = openSqliteReadonlyOrThrow(path);
+  try {
+    installOpencodeV2Views(db);
+  } catch {
+  }
+  return db;
+}
+var SESSION_COLUMNS, j, V2_SESSIONS;
+var init_opencode_v2 = __esm({
+  "../engine/dist/core/backends/opencode-v2.js"() {
+    "use strict";
+    init_sqlite_reader();
+    SESSION_COLUMNS = [
+      "id",
+      "project_id",
+      "parent_id",
+      "slug",
+      "directory",
+      "title",
+      "version",
+      "share_url",
+      "summary_additions",
+      "summary_deletions",
+      "summary_files",
+      "summary_diffs",
+      "revert",
+      "permission",
+      "time_created",
+      "time_updated",
+      "time_compacting",
+      "time_archived",
+      "workspace_id",
+      "path",
+      "agent",
+      "model",
+      "cost",
+      "tokens_input",
+      "tokens_output",
+      "tokens_reasoning",
+      "tokens_cache_read",
+      "tokens_cache_write",
+      "metadata"
+    ];
+    j = (path, fallback = "'{}'") => `json(coalesce(json_extract(m.data, '${path}'), ${fallback}))`;
+    V2_SESSIONS = "SELECT session_id FROM main.session_message";
+  }
+});
+
 // ../engine/dist/core/backends/opencode.js
 var opencode_exports = {};
 __export(opencode_exports, {
@@ -9382,13 +9506,13 @@ import { existsSync as existsSync11 } from "fs";
 import { homedir as homedir5 } from "os";
 import { dirname as dirname9, join as join12 } from "path";
 function openReadonly(path) {
-  return openSqliteReadonly(path);
+  return openOpencodeDb(path);
 }
 var PREFIX, OpencodeBackend, opencodeBackend;
 var init_opencode = __esm({
   "../engine/dist/core/backends/opencode.js"() {
     "use strict";
-    init_sqlite_reader();
+    init_opencode_v2();
     init_tool_paths();
     init_session_outcome();
     init_session_git();
@@ -9679,9 +9803,9 @@ var init_opencode = __esm({
             return [];
           const parts = db.prepare(`
         SELECT p.id, p.message_id, p.time_created, p.data, m.data AS msg_data
-        FROM part p JOIN message m ON m.id = p.message_id
+        FROM part p JOIN (SELECT id, data FROM message WHERE session_id = ?) m ON m.id = p.message_id
         WHERE p.session_id = ? ORDER BY p.time_created ASC
-      `).all(ocId);
+      `).all(ocId, ocId);
           const events = [];
           let lineNum = 0;
           for (const p of parts) {
@@ -9897,17 +10021,17 @@ var init_opencode = __esm({
         if (!existsSync11(dbPath))
           return null;
         const realId = this.toRawId(id);
-        const db = openSqliteReadonlyOrThrow(dbPath);
+        const db = openOpencodeDbOrThrow(dbPath);
         try {
           const session = db.prepare(`SELECT * FROM session WHERE id = ?`).get(realId);
           if (!session)
             return null;
           const rows = db.prepare(`
         SELECT m.id AS message_id, m.data AS message_data, p.id AS part_id, p.data AS part_data, p.time_created
-        FROM part p JOIN message m ON p.message_id = m.id
+        FROM part p JOIN (SELECT id, data FROM message WHERE session_id = ?) m ON p.message_id = m.id
         WHERE p.session_id = ?
         ORDER BY p.time_created ASC, p.id ASC
-      `).all(realId);
+      `).all(realId, realId);
           const lines = [JSON.stringify({ kind: "session", row: session })];
           for (const r of rows)
             lines.push(JSON.stringify({ kind: "part", row: r }));
@@ -10823,6 +10947,10 @@ var init_agy = __esm({
       sharedSettingsFile() {
         return join14(this.sharedRootDir(), "settings.json");
       }
+      /** The global hooks file the CLI reads. It does not read hooks from its own home directory. */
+      sharedHooksFile() {
+        return join14(this.sharedRootDir(), "config", "hooks.json");
+      }
       sharedProjectsJson() {
         return join14(this.sharedRootDir(), "projects.json");
       }
@@ -14652,19 +14780,19 @@ function runTrufflehog(binary, filePath, opts = {}) {
     if (!line.trim())
       continue;
     try {
-      const j = JSON.parse(line);
-      const raw = j.Raw || "";
+      const j2 = JSON.parse(line);
+      const raw = j2.Raw || "";
       if (looksLikeUuid(raw))
         continue;
       out.push({
-        rule: j.DetectorName || "unknown",
-        line: j.SourceMetadata?.Data?.Filesystem?.line || 0,
+        rule: j2.DetectorName || "unknown",
+        line: j2.SourceMetadata?.Data?.Filesystem?.line || 0,
         preview: mask(raw),
         // trufflehog reports `Verified: true` only when --verification
         // ran AND the call succeeded. With --only-verified set, every
         // returned finding is verified live by definition, so we tag
         // them all true; with --no-verification, leave undefined.
-        verified: opts.verifyOnly ? true : j.Verified === true ? true : void 0
+        verified: opts.verifyOnly ? true : j2.Verified === true ? true : void 0
       });
     } catch {
     }
@@ -14717,16 +14845,16 @@ function runTrufflehogDir(binary, dir, opts = {}) {
     if (!line.trim())
       continue;
     try {
-      const j = JSON.parse(line);
-      const raw = j.Raw || "";
+      const j2 = JSON.parse(line);
+      const raw = j2.Raw || "";
       if (looksLikeUuid(raw))
         continue;
       out.push({
-        rule: j.DetectorName || "unknown",
-        line: j.SourceMetadata?.Data?.Filesystem?.line || 0,
+        rule: j2.DetectorName || "unknown",
+        line: j2.SourceMetadata?.Data?.Filesystem?.line || 0,
         preview: mask(raw),
-        verified: opts.verifyOnly ? true : j.Verified === true ? true : void 0,
-        file: j.SourceMetadata?.Data?.Filesystem?.file || ""
+        verified: opts.verifyOnly ? true : j2.Verified === true ? true : void 0,
+        file: j2.SourceMetadata?.Data?.Filesystem?.file || ""
       });
     } catch {
     }
@@ -14894,7 +15022,7 @@ async function parseOpenCodeSubagents(parentSessionId) {
   if (!existsSync53(dbPath))
     return [];
   const realParent = parentSessionId.replace("opencode_", "");
-  const db = openSqliteReadonlyOrThrow(dbPath);
+  const db = openOpencodeDbOrThrow(dbPath);
   try {
     const children = db.prepare(`
       SELECT id, title, time_created
@@ -14938,16 +15066,16 @@ async function parseOpenCodeTranscript(sessionId) {
   if (!existsSync53(dbPath))
     return [];
   const realId = sessionId.replace("opencode_", "");
-  const db = openSqliteReadonlyOrThrow(dbPath);
+  const db = openOpencodeDbOrThrow(dbPath);
   const messages = [];
   try {
     const parts = db.prepare(`
       SELECT p.data, p.time_created, m.data as msg_data
       FROM part p
-      JOIN message m ON p.message_id = m.id
+      JOIN (SELECT id, data FROM message WHERE session_id = ?) m ON p.message_id = m.id
       WHERE p.session_id = ?
       ORDER BY p.time_created ASC
-    `).all(realId);
+    `).all(realId, realId);
     let lineNum = 0;
     for (const part of parts) {
       try {
@@ -14978,7 +15106,7 @@ var log5;
 var init_opencode2 = __esm({
   "../engine/dist/transcript/opencode.js"() {
     "use strict";
-    init_sqlite_reader();
+    init_opencode_v2();
     init_logger();
     log5 = createLogger("transcript-opencode");
   }
@@ -17647,7 +17775,7 @@ var MAX_CHUNK_CHARS8, OpenCodeSource;
 var init_opencode_source = __esm({
   "../engine/dist/parsers/opencode-source.js"() {
     "use strict";
-    init_sqlite_reader();
+    init_opencode_v2();
     init_opencode();
     init_settings();
     MAX_CHUNK_CHARS8 = 2e3;
@@ -17664,7 +17792,7 @@ var init_opencode_source = __esm({
           return;
         let db;
         try {
-          db = openSqliteReadonlyOrThrow(this.dbPath);
+          db = openOpencodeDbOrThrow(this.dbPath);
         } catch {
           return;
         }
@@ -17761,17 +17889,17 @@ var init_opencode_source = __esm({
         if (!existsSync30(this.dbPath))
           return [];
         const sessionId = item.id.replace("opencode_", "");
-        const db = openSqliteReadonlyOrThrow(this.dbPath);
+        const db = openOpencodeDbOrThrow(this.dbPath);
         const chunks = [];
         try {
           const parts = db.prepare(`
         SELECT p.data, m.data as msg_data
         FROM part p
-        JOIN message m ON p.message_id = m.id
+        JOIN (SELECT id, data FROM message WHERE session_id = ?) m ON p.message_id = m.id
         WHERE p.session_id = ?
         AND (p.data LIKE '%"type":"text"%' OR p.data LIKE '%"type":"reasoning"%')
         ORDER BY p.time_created ASC
-      `).all(sessionId);
+      `).all(sessionId, sessionId);
           const userTexts = [];
           const assistantTexts = [];
           for (const part of parts) {
@@ -17835,7 +17963,7 @@ var OpenCodeTodoSource;
 var init_opencode_todo_source = __esm({
   "../engine/dist/parsers/opencode-todo-source.js"() {
     "use strict";
-    init_sqlite_reader();
+    init_opencode_v2();
     init_opencode();
     init_settings();
     OpenCodeTodoSource = class {
@@ -17851,7 +17979,7 @@ var init_opencode_todo_source = __esm({
           return;
         let db;
         try {
-          db = openSqliteReadonlyOrThrow(this.dbPath);
+          db = openOpencodeDbOrThrow(this.dbPath);
         } catch {
           return;
         }
@@ -17899,7 +18027,7 @@ var init_opencode_todo_source = __esm({
         if (!existsSync31(this.dbPath))
           return [];
         const sessionId = item.extra?.sessionId || item.id.replace(`${opencodeBackend.idPrefix}todo_`, "");
-        const db = openSqliteReadonlyOrThrow(this.dbPath);
+        const db = openOpencodeDbOrThrow(this.dbPath);
         const chunks = [];
         try {
           const todos = db.prepare(`
@@ -19583,12 +19711,12 @@ var require_foldFlowLines = __commonJS({
                 ch = text[i += 1];
                 overflow = true;
               }
-              const j = i > escEnd + 1 ? i - 2 : escStart - 1;
-              if (escapedFolds[j])
+              const j2 = i > escEnd + 1 ? i - 2 : escStart - 1;
+              if (escapedFolds[j2])
                 return text;
-              folds.push(j);
-              escapedFolds[j] = true;
-              end = j + endStep;
+              folds.push(j2);
+              escapedFolds[j2] = true;
+              end = j2 + endStep;
               split = void 0;
             } else {
               overflow = true;
@@ -27526,7 +27654,7 @@ var init_http = __esm({
       CLI_VERSION = JSON.parse(readFileSync35(new URL("../package.json", import.meta.url), "utf-8")).version || CLI_VERSION;
     } catch {
       try {
-        if (true) CLI_VERSION = "0.7.21";
+        if (true) CLI_VERSION = "0.7.24";
       } catch {
       }
     }
@@ -28020,7 +28148,7 @@ var init_telemetry = __esm({
     init_sync_client();
     cliVersion = () => {
       try {
-        return true ? "0.7.21" : "dev";
+        return true ? "0.7.24" : "dev";
       } catch {
         return "dev";
       }
@@ -30385,7 +30513,7 @@ var init_sync_client = __esm({
       ownVersion = JSON.parse(readFileSync39(join46(dir, "../package.json"), "utf-8")).version || ownVersion;
     } catch {
       try {
-        if (true) ownVersion = "0.7.21";
+        if (true) ownVersion = "0.7.24";
       } catch {
       }
     }
@@ -32816,16 +32944,16 @@ async function collectCode(opts) {
         ...blastTargets.map((f, i) => call(2e3 + i, "plan_change", { file: f, format: "json" }))
       ]);
       blastTargets.forEach((f, i) => {
-        const j = parseJson(pc, 2e3 + i, null);
-        if (j && typeof j === "object" && typeof j.fan_in === "number") {
+        const j2 = parseJson(pc, 2e3 + i, null);
+        if (j2 && typeof j2 === "object" && typeof j2.fan_in === "number") {
           blast[f] = {
-            fileRole: j.file_role ?? "regular",
-            fanIn: j.fan_in ?? 0,
-            fanOut: j.fan_out ?? 0,
-            direct: j.direct ?? 0,
-            transitive: j.transitive ?? 0,
-            maxDepth: j.max_depth ?? 0,
-            directFiles: Array.isArray(j.direct_files) ? j.direct_files.map(rel).slice(0, 20) : void 0
+            fileRole: j2.file_role ?? "regular",
+            fanIn: j2.fan_in ?? 0,
+            fanOut: j2.fan_out ?? 0,
+            direct: j2.direct ?? 0,
+            transitive: j2.transitive ?? 0,
+            maxDepth: j2.max_depth ?? 0,
+            directFiles: Array.isArray(j2.direct_files) ? j2.direct_files.map(rel).slice(0, 20) : void 0
           };
         }
       });
@@ -33749,7 +33877,7 @@ try {
   ownVersion2 = JSON.parse(readFileSync43(join52(dir, "../package.json"), "utf-8")).version || ownVersion2;
 } catch {
   try {
-    if (true) ownVersion2 = "0.7.21";
+    if (true) ownVersion2 = "0.7.24";
   } catch {
   }
 }
@@ -34134,7 +34262,7 @@ async function runCollectorMigration(opts) {
 init_sync_ledger();
 init_collector_health();
 import { existsSync as existsSync52, readFileSync as readFileSync49, statSync as statSync49 } from "fs";
-var CLI_VERSION3 = true ? "0.7.21" : "0.0.0";
+var CLI_VERSION3 = true ? "0.7.24" : "0.0.0";
 var DEBOUNCE_MS = 5e3;
 var PLANS_DIR = claudeBackend.plansDir();
 var TASKS_DIR = claudeBackend.tasksDir();