@cortexkit/opencode-magic-context 0.49.16 → 0.49.17

package/dist/v2/{server-6fyp0v67.js → server-fw7wrk01.js}

@@ -11,13 +11,14 @@ import {
   sessionLog2
 } from "./server-f2xf5gcb.js";
 import {
+  parseTree,
   parseJsoncRecovering,
   detectConfigFile,
   cortexKitUserConfigBasePath,
   cortexKitProjectConfigBasePath,
   resolveLegacyConfigSourcesForHarness,
   loadPluginConfigDetailed
-} from "./server-y5pznjt9.js";
+} from "./server-nj659894.js";
 import {
   catalogOutputReserve,
   getSdkContextLimit,
@@ -39,12 +40,12 @@ import {
   getProjectChunkEmbeddingModelId2,
   getProjectEmbeddingMaxInputTokens2,
   embedItemsForProject2
-} from "./server-kr2kc9dz.js";
+} from "./server-8by8qfec.js";
 import {
   hasMeaningfulUserText2,
   estimateTokens,
   estimateFixedPromptTokens
-} from "./server-0ppsweh6.js";
+} from "./server-tgnbmwah.js";
 import {
   inRootAsyncContext2,
   Database2,
@@ -52,13 +53,13 @@ import {
   withSqliteBackgroundWriter2,
   withoutSqliteTransformPass2,
   beginSqliteWriterAsync2
-} from "./server-wafzvyhg.js";
+} from "./server-beht37jy.js";
 import {
   isStrictGapHealingMessage2,
   noteRawSessionSummaryRowWritten2,
   RawOrdinalsNotReady2,
   runSessionWarmupWorker
-} from "./server-6714jebr.js";
+} from "./server-xj136kt8.js";
 import {
   buildCanonicalChunkTextFromFts,
   buildCompartmentSummaryFallbackText,
@@ -68,7 +69,7 @@ import {
   replaceCompartmentChunkEmbeddings,
   deleteChunkEmbedBackoffForSession,
   chunkWindowSourceKey
-} from "./server-kqpawe1a.js";
+} from "./server-46neh5fa.js";
 import {
   isPidAlive
 } from "./server-da07v4xp.js";
@@ -82,11 +83,13 @@ import {
   ownsLkgDirtyFence,
   commitLkgWithRecoveryFence,
   clearLkgRecoveryFence,
+  gaDatabasePath,
+  V2StoreReader,
   deleteSessionScopedRows,
   toMessageIndexSource2,
   clearIndexedMessagesInTransaction2,
   indexSourcesAfterOrdinal2
-} from "./server-g59aatsz.js";
+} from "./server-3rhpvy84.js";
 import {
   detectOverflow,
   SESSION_META_SELECT_COLUMNS,
@@ -179,7 +182,7 @@ import {
   getRawSessionTagKeysThrough2,
   getLegacyProtectedTailStartOrdinal2,
   readSessionChunk2
-} from "./server-1hcbw661.js";
+} from "./server-kh7dpa1a.js";
 import {
   getTableColumnNames
 } from "./server-pwv4ezb0.js";
@@ -189,7 +192,7 @@ import {
   LATEST_SUPPORTED_VERSION,
   getPersistedSchemaVersion,
   openDatabase
-} from "./server-r9gjxcte.js";
+} from "./server-gtfhttbr.js";
 import {
   providerMass,
   calibrationForModelKey,
@@ -207,7 +210,7 @@ import {
   foldShrunkPartTags2,
   getTagNumberByMessageId2,
   getActiveTagsBySession2
-} from "./server-0mzjjw3s.js";
+} from "./server-zyzawhdw.js";
 import {
   resolveOpenCodeDbPath,
   assertOpenCodeStoreGeneration,
@@ -218,10 +221,10 @@ import {
   openCodeDbExists,
   withReadOnlySessionDb,
   getMessageTimesFromOpenCodeDb
-} from "./server-d8tj10db.js";
+} from "./server-n1prf1g6.js";
 import {
   getMeasuredToolDefinitionTokens
-} from "./server-zs8d0s3b.js";
+} from "./server-g3qma5c0.js";
 import {
   V2_MEMORY_CATEGORIES,
   CATEGORY_PRIORITY,
@@ -237,11 +240,11 @@ import {
   resolveStoredPathWorkspaceIdentity,
   sourceNameForMemory,
   computeWorkspaceEpochFingerprint
-} from "./server-00hx04yn.js";
+} from "./server-gpvay0xz.js";
 import {
   shouldSkipHomeProjectMemory,
   resolveProjectIdentity
-} from "./server-e3ftpk7v.js";
+} from "./server-rmygf5pn.js";
 import {
   getSessionNotes,
   getReadySmartNotes,
@@ -250,13 +253,13 @@ import {
   userFacingFailureCode,
   promoteSessionFactsDurable,
   embedPromotedFacts
-} from "./server-vgpab6rd.js";
+} from "./server-my7k4eds.js";
 import {
   isMarkerCandidateBasisCurrent2,
   invalidateMarkerCandidateBasis2,
   readMarkerCandidateBasis2,
   prepareMarkerCandidateBasis2
-} from "./server-05xjtq6c.js";
+} from "./server-d04vrx0j.js";
 import {
   computeCueContentHash,
   getMuralCueState,
@@ -264,7 +267,7 @@ import {
   getMemoriesByProject2,
   getMemoriesByProjects2,
   getMaxMemoryIdForProjects2
-} from "./server-n78avt2p.js";
+} from "./server-n37sebck.js";
 import {
   pushNotification2
 } from "./server-x8a7jmkh.js";
@@ -275,13 +278,10 @@ import {
 } from "./server-34kwfsr4.js";
 import {
   sendStatusNotification2
-} from "./server-vbe4se57.js";
+} from "./server-a9xqj88f.js";
 import {
   piModelRefToCanonical
 } from "./server-avwt563y.js";
-import {
-  sameProjectDirectory
-} from "./server-knvkbfvh.js";
 import {
   getErrorMessage,
   describeError
@@ -1002,10 +1002,10 @@ function readProjectDocsCanonical(projectDirectory) {
   return { renderedBlock, canonicalHash };
 }
 // src/hooks/magic-context/lkg-slot.ts
-import { createHash as createHash6 } from "node:crypto";
+import { createHash as createHash5 } from "node:crypto";
 
 // src/hooks/magic-context/lkg-measured-request.ts
-import { createHash as createHash4 } from "node:crypto";
+import { createHash as createHash3 } from "node:crypto";
 
 // src/shared/provider-response-completion.ts
 function providerResponseFailed(input) {
@@ -1073,691 +1073,6 @@ function cancelAutoSearchWork(sessionId) {
   }
 }
 
-// src/v2/store-reader.ts
-import { createHash as createHash3 } from "node:crypto";
-import { statSync as statSync3 } from "node:fs";
-import { hostname } from "node:os";
-import { resolve } from "node:path";
-function gaDatabasePath(dataHome, channel = "latest", env = process.env) {
-  return resolveOpenCodeDbPath("v2", { dataHome, channel, env }).path;
-}
-var RAW_MESSAGE_TYPES = [
-  "user",
-  "synthetic",
-  "assistant",
-  "skill",
-  "shell",
-  "system"
-];
-var RAW_MESSAGE_TYPE_PARAMETERS = RAW_MESSAGE_TYPES.map(() => "?").join(", ");
-var V2_MESSAGE_PAGE_SQL = `WITH bounds AS (
-    SELECT
-        CASE WHEN ? = 0 THEN -1 ELSE COALESCE((
-            SELECT seq FROM session_message
-            WHERE session_id = ? AND type IN (${RAW_MESSAGE_TYPE_PARAMETERS})
-            ORDER BY seq ASC LIMIT 1 OFFSET ?
-        ), (SELECT MAX(seq) FROM session_message WHERE session_id = ?), -1) END AS after_seq,
-        COALESCE((
-            SELECT seq FROM session_message
-            WHERE session_id = ? AND type IN (${RAW_MESSAGE_TYPE_PARAMETERS})
-            ORDER BY seq ASC LIMIT 1 OFFSET ?
-        ), ?) AS watermark_seq
-)
-SELECT id, session_id, type, seq, time_created, data FROM session_message, bounds
-WHERE session_id = ?
-  AND type IN (${RAW_MESSAGE_TYPE_PARAMETERS})
-  AND seq > bounds.after_seq
-  AND seq <= bounds.watermark_seq
-ORDER BY seq ASC LIMIT ?`;
-var V2_STORE_READER_DEBUG_COUNTER_KEY = "magic-context.v2.store-reader-debug";
-var debugSymbol = Symbol.for(V2_STORE_READER_DEBUG_COUNTER_KEY);
-var debugGlobal = globalThis;
-var QUERY_STATEMENTS = {
-  messagePage: V2_MESSAGE_PAGE_SQL,
-  messageCount: "SELECT COUNT(*) AS count FROM session_message WHERE session_id = ? AND type IN (?)",
-  storedMessageCount: "SELECT COUNT(*) AS count FROM session_message WHERE session_id = ?",
-  messageById: "SELECT id, session_id, type, seq, time_created, data FROM session_message WHERE session_id = ? AND id = ? AND type IN (?) LIMIT 1",
-  messageExistsById: "SELECT 1 FROM session_message WHERE id = ? AND session_id = ? AND type IN (?) LIMIT 1",
-  messageOrdinalById: `WITH target AS (
-    SELECT seq FROM session_message WHERE session_id = ? AND id = ? AND type IN (?) LIMIT 1
-)
-SELECT (SELECT COUNT(*) FROM session_message WHERE session_id = ? AND type IN (?) AND seq <= target.seq) AS ordinal FROM target`,
-  messageIdOrdinals: "SELECT id FROM session_message WHERE session_id = ? AND type IN (?) ORDER BY seq ASC LIMIT ? OFFSET ?",
-  messageOrdinalPage: "SELECT id, type, seq, json_valid(data) AS valid FROM session_message WHERE session_id = ? AND seq > ? ORDER BY seq ASC, id ASC LIMIT ?",
-  rawRowsThrough: "SELECT id, session_id, type, seq, time_created, data FROM session_message WHERE session_id = ? AND type IN (?) AND seq <= ? ORDER BY seq DESC LIMIT ?"
-};
-function debugCounters() {
-  const counters = debugGlobal[debugSymbol] ??= {
-    decodedRows: 0,
-    operations: {},
-    openReaders: 0,
-    maxOpenReaders: 0,
-    readersOpened: 0,
-    readersClosed: 0
-  };
-  counters.openReaders ??= 0;
-  counters.maxOpenReaders ??= 0;
-  counters.readersOpened ??= 0;
-  counters.readersClosed ??= 0;
-  return counters;
-}
-function returnedRowCount(value) {
-  if (Array.isArray(value))
-    return value.length;
-  if (value === null || value === undefined || value === false)
-    return 0;
-  return 1;
-}
-function trackDecodeOperation(name, operation) {
-  const counters = debugCounters();
-  const before = counters.decodedRows;
-  const started = performance.now();
-  let value;
-  try {
-    value = operation();
-    return value;
-  } finally {
-    const decodedRows = counters.decodedRows - before;
-    const current = counters.operations[name] ?? {
-      calls: 0,
-      decodedRows: 0,
-      maxDecodedRows: 0
-    };
-    current.calls += 1;
-    current.decodedRows += decodedRows;
-    current.maxDecodedRows = Math.max(current.maxDecodedRows, decodedRows);
-    counters.operations[name] = current;
-    const statement = QUERY_STATEMENTS[name];
-    if (counters.captureQueries && statement) {
-      (counters.queries ??= []).push({
-        operation: name,
-        statement,
-        rows: returnedRowCount(value),
-        elapsedMs: performance.now() - started
-      });
-    }
-  }
-}
-function decode(row) {
-  debugCounters().decodedRows += 1;
-  const data = JSON.parse(row.data);
-  if (!data || typeof data !== "object" || Array.isArray(data)) {
-    throw new Error(`Invalid session_message data at seq ${row.seq}`);
-  }
-  if (row.type === "idle" && !["succeeded", "failed", "interrupted"].includes(String(data.outcome))) {
-    throw new Error(`Invalid idle outcome at seq ${row.seq}`);
-  }
-  return { ...row, data };
-}
-function connect(path, identity = "") {
-  const stat = statSync3(path);
-  const acquiredIdentity = identity || `${stat.dev}:${stat.ino}:${stat.birthtimeMs}`;
-  const db = new Database2(path, { readonly: true, fileMustExist: true });
-  try {
-    assertOpenCodeStoreGeneration(db, "v2", path);
-  } catch (error) {
-    db.close();
-    throw error;
-  }
-  const counters = debugCounters();
-  counters.openReaders += 1;
-  counters.readersOpened += 1;
-  counters.maxOpenReaders = Math.max(counters.maxOpenReaders, counters.openReaders);
-  return { db, statements: new Map, identity: acquiredIdentity, leases: 0, retired: false };
-}
-function closeConnection(connection) {
-  connection.statements.clear();
-  try {
-    connection.db.close();
-  } finally {
-    const counters = debugCounters();
-    counters.openReaders = Math.max(0, counters.openReaders - 1);
-    counters.readersClosed += 1;
-  }
-}
-
-class V2StoreReaderPool {
-  capacity;
-  connections = new Map;
-  closed = false;
-  closing = false;
-  holds = 0;
-  idleWaiters = new Set;
-  constructor(capacity = 4) {
-    this.capacity = capacity;
-    if (!Number.isSafeInteger(capacity) || capacity < 1)
-      throw new Error("Invalid reader capacity");
-  }
-  open(path) {
-    return new V2StoreReader(path, this);
-  }
-  acquire(path) {
-    if (this.closed)
-      throw new Error("Store reader pool is closed");
-    const key = resolve(path);
-    const stat = statSync3(key);
-    const identity = `${stat.dev}:${stat.ino}:${stat.birthtimeMs}`;
-    let connection = this.connections.get(key);
-    if (connection && connection.identity !== identity) {
-      this.connections.delete(key);
-      this.retire(connection);
-      connection = undefined;
-    }
-    if (!connection)
-      connection = connect(key, identity);
-    connection.leases++;
-    this.connections.delete(key);
-    this.connections.set(key, connection);
-    while (this.connections.size > this.capacity) {
-      const oldest = this.connections.entries().next().value;
-      if (!oldest)
-        break;
-      this.connections.delete(oldest[0]);
-      this.retire(oldest[1]);
-    }
-    return connection;
-  }
-  release(connection) {
-    connection.leases--;
-    if (connection.retired && connection.leases === 0)
-      closeConnection(connection);
-  }
-  retire(connection) {
-    connection.retired = true;
-    if (connection.leases === 0)
-      closeConnection(connection);
-  }
-  hold() {
-    if (this.closed || this.closing)
-      throw new Error("Store reader pool is closed");
-    this.holds++;
-    let released = false;
-    return () => {
-      if (released)
-        return;
-      released = true;
-      this.holds--;
-      if (this.holds === 0 && this.closing)
-        this.finishClose();
-    };
-  }
-  isClosed() {
-    return this.closed;
-  }
-  holdCount() {
-    return this.holds;
-  }
-  close() {
-    if (this.closed || this.closing)
-      return;
-    this.closing = true;
-    if (this.holds === 0)
-      this.finishClose();
-  }
-  async closeWhenIdle(timeoutMs) {
-    this.close();
-    if (this.closed)
-      return true;
-    let timer;
-    let waiter;
-    try {
-      await new Promise((resolve) => {
-        waiter = resolve;
-        this.idleWaiters.add(resolve);
-        timer = setTimeout(resolve, Math.max(0, timeoutMs));
-      });
-    } finally {
-      if (timer)
-        clearTimeout(timer);
-      if (waiter)
-        this.idleWaiters.delete(waiter);
-    }
-    return this.closed;
-  }
-  finishClose() {
-    if (this.closed)
-      return;
-    this.closed = true;
-    for (const connection of this.connections.values())
-      this.retire(connection);
-    this.connections.clear();
-    for (const resolve of this.idleWaiters)
-      resolve();
-    this.idleWaiters.clear();
-  }
-}
-
-class V2StoreReader {
-  path;
-  pool;
-  db;
-  connection;
-  closed = false;
-  constructor(path, pool) {
-    this.path = path;
-    this.pool = pool;
-    this.connection = pool ? pool.acquire(path) : connect(path);
-    this.db = this.connection.db;
-  }
-  hostIdentity() {
-    return createHash3("sha256").update(JSON.stringify([hostname(), resolve(this.path), this.connection.identity])).digest("hex");
-  }
-  prepare(sql) {
-    if (this.closed)
-      throw new Error("Store reader is closed");
-    const statements = this.connection.statements;
-    let statement = statements.get(sql);
-    if (!statement) {
-      statement = this.db.prepare(sql);
-      if (statements.size >= 128)
-        statements.clear();
-      statements.set(sql, statement);
-    }
-    return statement;
-  }
-  close() {
-    if (this.closed)
-      return;
-    this.closed = true;
-    if (this.pool)
-      this.pool.release(this.connection);
-    else
-      closeConnection(this.connection);
-  }
-  page(sessionID, options = {}) {
-    return trackDecodeOperation("page", () => {
-      const limit = options.limit ?? 100;
-      if (!Number.isSafeInteger(limit) || limit < 1 || limit > 1e4)
-        throw new Error("Invalid page limit");
-      const after = options.after ?? -1;
-      if (!Number.isSafeInteger(after))
-        throw new Error("Invalid seq cursor");
-      if (options.through !== undefined && !Number.isSafeInteger(options.through))
-        throw new Error("Invalid seq upper bound");
-      const predicates = ["session_id = ?", "seq > ?"];
-      const parameters = [sessionID, after];
-      if (options.through !== undefined) {
-        predicates.push("seq <= ?");
-        parameters.push(options.through);
-      }
-      if (options.type) {
-        predicates.push("type = ?");
-        parameters.push(options.type);
-      }
-      const rows = this.prepare(`SELECT id, session_id, type, seq, time_created, data FROM session_message
-                        WHERE ${predicates.join(" AND ")}
-                        ORDER BY seq ASC LIMIT ?`).all(...parameters, limit).map(decode);
-      return { rows, cursor: rows.at(-1)?.seq };
-    });
-  }
-  messagePage(sessionID, afterOrdinal, limit, finalWatermark, after) {
-    return trackDecodeOperation("messagePage", () => {
-      if (!Number.isSafeInteger(afterOrdinal) || afterOrdinal < 0)
-        throw new Error("Invalid raw-message ordinal cursor");
-      if (!Number.isSafeInteger(limit) || limit < 1 || limit > 1e4)
-        throw new Error("Invalid page limit");
-      if (!Number.isSafeInteger(finalWatermark) || finalWatermark < 0)
-        throw new Error("Invalid raw-message watermark");
-      const pageSize = Math.min(limit, finalWatermark - afterOrdinal);
-      if (pageSize <= 0)
-        return [];
-      if (after) {
-        const anchor = this.prepare("SELECT seq FROM session_message WHERE session_id = ? AND id = ?").get(sessionID, after.id);
-        if (anchor) {
-          return this.prepare(`SELECT id, session_id, type, seq, time_created, data
-                        FROM session_message WHERE session_id = ? AND seq > ?
-                        AND type IN (${RAW_MESSAGE_TYPE_PARAMETERS}) ORDER BY seq ASC LIMIT ?`).all(sessionID, anchor.seq, ...RAW_MESSAGE_TYPES, pageSize).map(decode);
-        }
-      }
-      const maximumSeq = Number.MAX_SAFE_INTEGER;
-      const rows = this.prepare(V2_MESSAGE_PAGE_SQL).all(afterOrdinal, sessionID, ...RAW_MESSAGE_TYPES, Math.max(0, afterOrdinal - 1), sessionID, sessionID, ...RAW_MESSAGE_TYPES, finalWatermark - 1, maximumSeq, sessionID, ...RAW_MESSAGE_TYPES, pageSize);
-      return rows.map(decode);
-    });
-  }
-  messageCount(sessionID) {
-    return trackDecodeOperation("messageCount", () => {
-      const rawTypes = RAW_MESSAGE_TYPES.map(() => "?").join(", ");
-      const row = this.prepare(`SELECT COUNT(*) AS count FROM session_message
-                     WHERE session_id = ? AND type IN (${rawTypes})`).get(sessionID, ...RAW_MESSAGE_TYPES);
-      return typeof row?.count === "number" ? row.count : 0;
-    });
-  }
-  sessionDirectoryPage(afterSessionID, limit) {
-    const rows = this.prepare(`SELECT id, COALESCE(directory, '') AS directory FROM session_v2
-                 WHERE id > ? ORDER BY id ASC LIMIT ?`).all(afterSessionID ?? "", limit);
-    return rows.map((row) => ({ sessionId: row.id, directory: row.directory }));
-  }
-  latestMessageTime(sessionID) {
-    const row = this.prepare("SELECT MAX(time_created) AS time FROM session_message WHERE session_id = ?").get(sessionID);
-    return row?.time ?? undefined;
-  }
-  isSubagent(sessionID) {
-    const row = this.prepare("SELECT parent_id FROM session_v2 WHERE id = ?").get(sessionID);
-    if (!row)
-      return null;
-    return typeof row.parent_id === "string" && row.parent_id.length > 0;
-  }
-  latestRootSessionInDirectory(directory) {
-    const columns = new Set(this.prepare("PRAGMA table_info(session_v2)").all().map((column) => column.name));
-    const archived = columns.has("time_archived") ? " AND time_archived IS NULL" : "";
-    const order = columns.has("time_updated") ? "time_updated DESC, id DESC" : "id DESC";
-    const page = this.prepare(`SELECT id, COALESCE(directory, '') AS directory FROM session_v2
-                 WHERE parent_id IS NULL${archived}
-                   AND COALESCE(json_extract(metadata, '$.magic_context'), '') <> 'hidden-run'
-                 ORDER BY ${order} LIMIT ? OFFSET ?`);
-    const pageSize = 500;
-    for (let offset = 0;; offset += pageSize) {
-      const rows = page.all(pageSize, offset);
-      const match = rows.find((row) => sameProjectDirectory(row.directory, directory));
-      if (match)
-        return match.id;
-      if (rows.length < pageSize)
-        return;
-    }
-  }
-  rootSessionActivity(sessionIDs) {
-    const roots = new Map;
-    for (let offset = 0;offset < sessionIDs.length; offset += 500) {
-      const chunk = sessionIDs.slice(offset, offset + 500);
-      const rows = this.prepare(`SELECT id, (
-                    SELECT MAX(time_created) FROM session_message
-                    WHERE session_id = session_v2.id AND type = 'user'
-                ) AS time FROM session_v2
-                WHERE parent_id IS NULL
-                  AND COALESCE(json_extract(metadata, '$.magic_context'), '') <> 'hidden-run'
-                  AND id IN (${chunk.map(() => "?").join(",")})`).all(...chunk);
-      for (const row of rows)
-        if (row.time !== null)
-          roots.set(row.id, row.time);
-    }
-    return roots;
-  }
-  oldestUserMessageTimesSince(sessionIDs, sinceMs) {
-    const result = new Map;
-    for (let offset = 0;offset < sessionIDs.length; offset += 500) {
-      const chunk = sessionIDs.slice(offset, offset + 500);
-      const rows = this.prepare(`SELECT session_id, MIN(time_created) AS time FROM session_message
-                WHERE type = 'user' AND time_created > ? AND session_id IN (${chunk.map(() => "?").join(",")})
-                GROUP BY session_id`).all(sinceMs, ...chunk);
-      for (const row of rows)
-        result.set(row.session_id, row.time);
-    }
-    return result;
-  }
-  retrospectiveUserPage(sessionID, options) {
-    const { boundaryMs, before, limit, maxChars, truncationMarker } = options;
-    if (!Number.isSafeInteger(limit) || limit < 1 || limit > 1e4)
-      throw new Error("Invalid page limit");
-    if (!Number.isSafeInteger(maxChars) || maxChars <= truncationMarker.length)
-      throw new Error("Invalid text limit");
-    const direction = before ? "DESC" : "ASC";
-    const head = Math.floor((maxChars - truncationMarker.length) / 2);
-    const tail = maxChars - truncationMarker.length - head;
-    return this.prepare(`WITH users AS (
-            SELECT session_id, seq, time_created, data FROM session_message
-            WHERE session_id = ? AND type = 'user' AND time_created ${before ? "<=" : ">"}
-                ?
-            ORDER BY time_created ${direction}, seq ${direction} LIMIT ?
-        ), texts AS (
-            SELECT session_id, seq, time_created, CASE
-                WHEN json_extract(data, '$.synthetic') = 1 OR json_extract(data, '$.ignored') = 1 THEN ''
-                WHEN json_type(data, '$.text') = 'text' THEN json_extract(data, '$.text')
-                ELSE COALESCE((SELECT group_concat(json_extract(value, '$.text'), char(10))
-                    FROM json_each(users.data, '$.content')
-                    WHERE json_extract(value, '$.type') IN ('text', 'input_text')
-                      AND COALESCE(json_extract(value, '$.synthetic'), 0) <> 1
-                      AND COALESCE(json_extract(value, '$.ignored'), 0) <> 1), '') END AS text
-            FROM users WHERE json_valid(data)
-        ) SELECT seq, time_created, CASE WHEN length(text) > ?
-            THEN substr(text, 1, ?) || ? || substr(text, -?) ELSE text END AS text,
-            EXISTS (
-                SELECT 1 FROM session_message assistant_reply
-                 WHERE assistant_reply.session_id = texts.session_id
-                   AND assistant_reply.type = 'assistant'
-                   AND assistant_reply.seq < texts.seq
-                   AND EXISTS (
-                       SELECT 1 FROM session_message prior_user
-                        WHERE prior_user.session_id = texts.session_id
-                          AND prior_user.type = 'user'
-                          AND prior_user.seq < assistant_reply.seq
-                   )
-            ) AS follows_assistant_reply
-          FROM texts ORDER BY time_created ${direction}, seq ${direction}`).all(sessionID, boundaryMs, limit, maxChars, head, truncationMarker, tail);
-  }
-  storedRowsAfter(sessionID, after) {
-    const row = this.prepare("SELECT COUNT(*) AS count FROM session_message WHERE session_id = ? AND seq > ?").get(sessionID, after);
-    return row.count;
-  }
-  storedMessageCount(sessionID) {
-    return trackDecodeOperation("storedMessageCount", () => {
-      const row = this.prepare("SELECT COUNT(*) AS count FROM session_message WHERE session_id = ?").get(sessionID);
-      return typeof row?.count === "number" ? row.count : 0;
-    });
-  }
-  messageById(sessionID, id) {
-    return trackDecodeOperation("messageById", () => {
-      const rawTypes = RAW_MESSAGE_TYPES.map(() => "?").join(", ");
-      const row = this.prepare(`SELECT id, session_id, type, seq, time_created, data FROM session_message
-                     WHERE session_id = ? AND id = ? AND type IN (${rawTypes}) LIMIT 1`).get(sessionID, id, ...RAW_MESSAGE_TYPES);
-      return row ? decode(row) : null;
-    });
-  }
-  messageTimes(sessionID, ids) {
-    const times = new Map;
-    for (let offset = 0;offset < ids.length; offset += 500) {
-      const batch = ids.slice(offset, offset + 500);
-      const rows = this.prepare(`SELECT id, COALESCE(time_created, json_extract(data, '$.time.created')) AS created,
-                        json_extract(data, '$.time.completed') AS completed
-                 FROM session_message WHERE session_id = ? AND id IN (${batch.map(() => "?").join(",")})`).all(sessionID, ...batch);
-      for (const row of rows)
-        times.set(row.id, {
-          created: typeof row.created === "number" ? row.created : undefined,
-          completed: typeof row.completed === "number" ? row.completed : undefined
-        });
-    }
-    return times;
-  }
-  messageExistsById(sessionID, id) {
-    return trackDecodeOperation("messageExistsById", () => {
-      const rawTypes = RAW_MESSAGE_TYPES.map(() => "?").join(", ");
-      const row = this.prepare(`SELECT 1 FROM session_message
-                     WHERE id = ? AND session_id = ? AND type IN (${rawTypes}) LIMIT 1`).get(id, sessionID, ...RAW_MESSAGE_TYPES);
-      return row != null;
-    });
-  }
-  messageOrdinalById(sessionID, id) {
-    return trackDecodeOperation("messageOrdinalById", () => {
-      const rawTypes = RAW_MESSAGE_TYPES.map(() => "?").join(", ");
-      const row = this.prepare(`WITH target AS (
-                        SELECT seq FROM session_message
-                        WHERE session_id = ? AND id = ? AND type IN (${rawTypes})
-                        LIMIT 1
-                    )
-                    SELECT (
-                        SELECT COUNT(*) FROM session_message
-                        WHERE session_id = ?
-                          AND type IN (${rawTypes})
-                          AND seq <= target.seq
-                    ) AS ordinal
-                    FROM target`).get(sessionID, id, ...RAW_MESSAGE_TYPES, sessionID, ...RAW_MESSAGE_TYPES);
-      return typeof row?.ordinal === "number" ? row.ordinal : null;
-    });
-  }
-  messageIdOrdinals(sessionID, fromOrdinal, toOrdinal) {
-    return trackDecodeOperation("messageIdOrdinals", () => {
-      if (!Number.isSafeInteger(fromOrdinal) || fromOrdinal < 1)
-        throw new Error("Invalid raw-message range start");
-      if (!Number.isSafeInteger(toOrdinal) || toOrdinal < fromOrdinal)
-        throw new Error("Invalid raw-message range end");
-      const rawTypes = RAW_MESSAGE_TYPES.map(() => "?").join(", ");
-      const rows = this.prepare(`SELECT id FROM session_message
-                     WHERE session_id = ? AND type IN (${rawTypes})
-                     ORDER BY seq ASC LIMIT ? OFFSET ?`).all(sessionID, ...RAW_MESSAGE_TYPES, toOrdinal - fromOrdinal + 1, fromOrdinal - 1);
-      return new Map(rows.map((row, index) => [row.id, fromOrdinal + index]));
-    });
-  }
-  messageOrdinalPage(sessionID, after, limit) {
-    return trackDecodeOperation("messageOrdinalPage", () => {
-      if (!Number.isSafeInteger(limit) || limit < 1 || limit > 1e4)
-        throw new Error("Invalid page limit");
-      const rows = after ? this.prepare(`SELECT id, type, seq, json_valid(data) AS valid
-                               FROM session_message
-                               WHERE session_id = ? AND (seq > ? OR (seq = ? AND id > ?))
-                               ORDER BY seq ASC, id ASC LIMIT ?`).all(sessionID, after.timeCreated, after.timeCreated, after.id, limit) : this.prepare(`SELECT id, type, seq, json_valid(data) AS valid
-                               FROM session_message
-                               WHERE session_id = ?
-                               ORDER BY seq ASC, id ASC LIMIT ?`).all(sessionID, limit);
-      const rawTypes = new Set(RAW_MESSAGE_TYPES);
-      return rows.map((row) => ({
-        id: row.id,
-        timeCreated: row.seq,
-        contributesOrdinal: rawTypes.has(row.type),
-        hasValidInfo: row.valid === 1
-      }));
-    });
-  }
-  range(sessionID, after, through) {
-    return trackDecodeOperation("range", () => through <= after ? [] : this.all(sessionID, after, undefined, through));
-  }
-  spanRowStamps(sessionID, after, through) {
-    if (!Number.isSafeInteger(after) || !Number.isSafeInteger(through))
-      throw new Error("Invalid seq span");
-    const rows = this.prepare(`SELECT seq, id, time_updated AS updated, length(CAST(data AS BLOB)) AS bytes
-                 FROM session_message WHERE session_id = ? AND seq > ? AND seq <= ?
-                 ORDER BY seq ASC`).all(sessionID, after, through);
-    const stamps = new Map;
-    for (const row of rows)
-      stamps.set(row.seq, `${row.id}\x00${row.updated ?? ""}\x00${row.bytes ?? ""}`);
-    return stamps;
-  }
-  rawRowsThrough(sessionID, throughSeq, limit) {
-    return trackDecodeOperation("rawRowsThrough", () => {
-      if (!Number.isSafeInteger(throughSeq))
-        throw new Error("Invalid seq upper bound");
-      if (!Number.isSafeInteger(limit) || limit < 1 || limit > 1e4)
-        throw new Error("Invalid page limit");
-      const rawTypes = RAW_MESSAGE_TYPES.map(() => "?").join(", ");
-      return this.prepare(`SELECT id, session_id, type, seq, time_created, data FROM session_message
-                         WHERE session_id = ? AND type IN (${rawTypes}) AND seq <= ?
-                         ORDER BY seq DESC LIMIT ?`).all(sessionID, ...RAW_MESSAGE_TYPES, throughSeq, limit).map(decode);
-    });
-  }
-  sequenceForId(sessionID, id) {
-    if (!id)
-      return;
-    const row = this.prepare("SELECT seq FROM session_message WHERE session_id = ? AND id = ? LIMIT 1").get(sessionID, id);
-    return typeof row?.seq === "number" ? row.seq : undefined;
-  }
-  syntheticMessageIDs(sessionID) {
-    const rows = this.prepare("SELECT id FROM session_message WHERE session_id = ? AND type = 'synthetic'").all(sessionID);
-    return new Set(rows.map((row) => row.id));
-  }
-  forkOrigin(sessionID) {
-    const columns = new Set(this.prepare("PRAGMA table_info(session_v2)").all().map((column) => column.name));
-    if (!columns.has("fork_session_id") || !columns.has("fork_boundary"))
-      return null;
-    const row = this.prepare("SELECT fork_session_id, fork_boundary FROM session_v2 WHERE id = ?").get(sessionID);
-    if (!row?.fork_session_id || !row.fork_boundary)
-      return null;
-    try {
-      const boundary = JSON.parse(row.fork_boundary);
-      if (boundary.type !== "before" && boundary.type !== "through" || typeof boundary.messageID !== "string" || boundary.messageID.length === 0)
-        return null;
-      return {
-        parentSessionID: row.fork_session_id,
-        boundary: { type: boundary.type, messageID: boundary.messageID }
-      };
-    } catch {
-      return null;
-    }
-  }
-  sessionExists(sessionID) {
-    return this.prepare("SELECT 1 FROM session_v2 WHERE id = ?").get(sessionID) != null;
-  }
-  rowStampsThrough(sessionID, throughSeq) {
-    return this.prepare(`SELECT id, type, seq, time_created FROM session_message
-                 WHERE session_id = ? AND seq <= ? ORDER BY seq ASC`).all(sessionID, throughSeq);
-  }
-  latestSequenceForIds(sessionID, ids) {
-    let latest = -1;
-    for (let offset = 0;offset < ids.length; offset += 500) {
-      const chunk = ids.slice(offset, offset + 500);
-      const row = this.prepare(`SELECT MAX(seq) AS seq FROM session_message
-                     WHERE session_id = ? AND id IN (${chunk.map(() => "?").join(", ")})`).get(sessionID, ...chunk);
-      if (typeof row?.seq === "number")
-        latest = Math.max(latest, row.seq);
-    }
-    return latest;
-  }
-  compactionByStatus(sessionID, status) {
-    const row = this.prepare(`SELECT id, session_id, type, seq, time_created, data FROM session_message
-                WHERE session_id = ? AND type = 'compaction'
-                  AND json_extract(data, '$.status') = ?
-                ORDER BY seq DESC LIMIT 1`).get(sessionID, status);
-    return row ? decode(row) : undefined;
-  }
-  latestCompaction(sessionID) {
-    return trackDecodeOperation("latestCompaction", () => this.compactionByStatus(sessionID, "completed"));
-  }
-  latestRunningCompaction(sessionID) {
-    return trackDecodeOperation("latestRunningCompaction", () => this.compactionByStatus(sessionID, "running"));
-  }
-  idleRows(sessionID, after = -1) {
-    return trackDecodeOperation("idleRows", () => this.all(sessionID, after, "idle"));
-  }
-  earliestSequence(sessionID) {
-    const row = this.prepare("SELECT MIN(seq) AS seq FROM session_message WHERE session_id = ?").get(sessionID);
-    return typeof row?.seq === "number" ? row.seq : undefined;
-  }
-  latestSequence(sessionID) {
-    const row = this.prepare("SELECT MAX(seq) AS seq FROM session_message WHERE session_id = ?").get(sessionID);
-    return typeof row?.seq === "number" ? row.seq : -1;
-  }
-  assistantSince(sessionID, afterSeq) {
-    return trackDecodeOperation("assistantSince", () => {
-      const rows = this.prepare(`SELECT id, session_id, type, seq, time_created, data FROM session_message
-                    WHERE session_id = ? AND type = 'assistant' AND seq > ?
-                    ORDER BY seq ASC`).all(sessionID, afterSeq);
-      return rows.map((row) => decode(row));
-    });
-  }
-  latestAssistant(sessionID) {
-    return trackDecodeOperation("latestAssistant", () => {
-      const row = this.prepare(`SELECT id, session_id, type, seq, time_created, data FROM session_message
-                    WHERE session_id = ? AND type = 'assistant'
-                    ORDER BY seq DESC LIMIT 1`).get(sessionID);
-      return row ? decode(row) : undefined;
-    });
-  }
-  latestIdle(sessionID) {
-    return trackDecodeOperation("latestIdle", () => {
-      const row = this.prepare(`SELECT id, session_id, type, seq, time_created, data FROM session_message
-                    WHERE session_id = ? AND type = 'idle'
-                    ORDER BY seq DESC LIMIT 1`).get(sessionID);
-      return row ? decode(row) : undefined;
-    });
-  }
-  window(sessionID) {
-    return trackDecodeOperation("window", () => this.db.transaction(() => {
-      const cut = this.latestCompaction(sessionID);
-      return this.all(sessionID, cut ? cut.seq - 1 : -1);
-    }).deferred());
-  }
-  history(sessionID) {
-    return trackDecodeOperation("history", () => this.all(sessionID, -1));
-  }
-  all(sessionID, after, type, through) {
-    const rows = [];
-    for (;; ) {
-      const page = this.page(sessionID, { after, through, type });
-      rows.push(...page.rows);
-      if (page.rows.length < 100 || page.cursor === undefined)
-        return rows;
-      after = page.cursor;
-    }
-  }
-}
-
 // src/features/magic-context/resolve-subagent-fallback.ts
 function resolveIsSubagentFromOpenCodeDb(sessionId) {
   try {
@@ -1834,17 +1149,48 @@ function findSessionMeta(db, sessionId) {
   const result = db.prepare(`SELECT ${getSessionMetaSelectColumns(db)} FROM session_meta WHERE session_id = ?`).get(sessionId);
   return isSessionMetaRow(result) ? toSessionMeta(result) : undefined;
 }
+var parentReadRetries = new WeakMap;
+var PARENT_READ_ATTEMPTS = 5;
+var PARENT_READ_COOLDOWN_MS = 30000;
 function getOrCreateSessionMeta(db, sessionId) {
   const existing = findSessionMeta(db, sessionId);
-  if (existing)
-    return existing;
-  const defaults = getDefaultSessionMeta(sessionId);
   const harness = getHarness2();
+  if (existing) {
+    if (harness !== "opencode2")
+      return existing;
+    const row = db.prepare("SELECT is_subagent FROM session_meta WHERE session_id = ?").get(sessionId);
+    if (row.is_subagent !== null)
+      return existing;
+  }
+  const defaults = existing ?? getDefaultSessionMeta(sessionId);
+  let retries = parentReadRetries.get(db);
+  if (harness === "opencode2") {
+    if (!retries) {
+      retries = new BoundedSessionMap(1000);
+      parentReadRetries.set(db, retries);
+    }
+    const retry = retries.get(sessionId);
+    if (retry && retry.attempts >= PARENT_READ_ATTEMPTS && Date.now() - retry.at < PARENT_READ_COOLDOWN_MS)
+      return defaults;
+  }
   const fallbackSubagent = harness === "opencode" ? resolveIsSubagentFromOpenCodeDb(sessionId) : harness === "opencode2" ? resolveIsSubagentFromOpenCode2Db(sessionId) : null;
   if (fallbackSubagent === true) {
     defaults.isSubagent = true;
   }
-  ensureSessionMetaRow(db, sessionId, harness === "opencode2" && fallbackSubagent === true);
+  if (harness === "opencode2") {
+    if (fallbackSubagent === null) {
+      const previous = retries?.get(sessionId);
+      const attempts = previous && Date.now() - previous.at < PARENT_READ_COOLDOWN_MS ? previous.attempts + 1 : 1;
+      retries?.set(sessionId, { attempts, at: Date.now() });
+      ensureSessionMetaRow(db, sessionId, null);
+      return defaults;
+    }
+    retries?.delete(sessionId);
+    ensureSessionMetaRow(db, sessionId, fallbackSubagent);
+    db.prepare("UPDATE session_meta SET is_subagent = ? WHERE session_id = ? AND is_subagent IS NULL").run(fallbackSubagent ? 1 : 0, sessionId);
+    return defaults;
+  }
+  ensureSessionMetaRow(db, sessionId);
   if (harness === "opencode" && fallbackSubagent === true) {
     db.prepare("UPDATE session_meta SET is_subagent = 1 WHERE session_id = ?").run(sessionId);
   }
@@ -1953,14 +1299,18 @@ function clearSession(db, sessionId, rustModuleCleanupAcknowledged = false, perm
   cancelAutoSearchWork(sessionId);
   let transactionStartedAt = 0;
   let clearedMarker = null;
+  let eligibleSessions = 0;
   withoutSqliteTransformPass2(() => withSqliteBackgroundWriter2(() => db.transaction(() => {
     transactionStartedAt = performance.now();
     clearedMarker = getPendingPiCompactionMarkerState(db, sessionId);
-    deleteSessionScopedRows(db, [sessionId], undefined, {
+    eligibleSessions = deleteSessionScopedRows(db, [sessionId], undefined, {
       rustModuleCleanupAcknowledged,
-      preserveTagRevisionTombstones: !permanentlyDeleted
+      preserveTagRevisionTombstones: !permanentlyDeleted,
+      deferRecoveryFenceCleanup: true
     });
   }).immediate()));
+  if (eligibleSessions > 0)
+    clearLkgRecoveryFence(sessionId);
   if (clearedMarker)
     logPiCompactionMarkerClear(sessionId, clearedMarker, "session-reset");
   clearUnpublishedAutoSearchNoHints(sessionId);
@@ -2123,7 +1473,7 @@ function lkgProviderInputTotal(tokens) {
   return counts.every((count) => Number.isSafeInteger(count) && count >= 0) ? counts.reduce((sum, count) => sum + count, 0) : Number.NaN;
 }
 function identity(slot) {
-  return createHash4("sha256").update(JSON.stringify([
+  return createHash3("sha256").update(JSON.stringify([
     slot.capturedAt,
     slot.captureSequence,
     slot.rowVersion,
@@ -2219,7 +1569,7 @@ function clearCapturedLkgMeasurement(sessionId) {
 }
 
 // src/hooks/magic-context/lkg-persist.ts
-import { createHash as createHash5 } from "node:crypto";
+import { createHash as createHash4 } from "node:crypto";
 function parseStringArray(value) {
   if (typeof value !== "string")
     return null;
@@ -2333,7 +1683,7 @@ function rememberFingerprint(db, sessionId, fingerprint) {
   saved.set(sessionId, fingerprint);
 }
 function slotFingerprint(slot) {
-  return createHash5("sha256").update(JSON.stringify([
+  return createHash4("sha256").update(JSON.stringify([
     slot.jsonPrefix,
     slot.inputIdSeq,
     slot.inputContentDigests,
@@ -3436,7 +2786,7 @@ var DIGEST_CHUNK_BYTES = 64 * 1024;
 var digestChunk;
 function lkgContentDigestFromFields(fields) {
   lkgDigestsComputed += 1;
-  const hash = createHash6("sha256");
+  const hash = createHash5("sha256");
   digestChunk ??= Buffer.allocUnsafe(DIGEST_CHUNK_BYTES);
   const chunk = digestChunk;
   let offset = 0;
@@ -3499,7 +2849,7 @@ function legacyLkgDigestFromFields(fields) {
     const value = typeof field === "symbol" ? field.description ?? "" : String(field);
     key += `${typeof field}:${value.length}:${value}\x00`;
   }
-  return createHash6("sha256").update(key).digest("base64url");
+  return createHash5("sha256").update(key).digest("base64url");
 }
 function legacyLkgContentDigest(message) {
   const fields = flattenContentFields(withoutEmptyUserDiffSummary(message));
@@ -5591,14 +4941,14 @@ class HiddenCompletionRefusal extends Error {
 }
 
 // src/features/magic-context/compaction-marker.ts
-import { createHash as createHash7 } from "node:crypto";
-import { existsSync, statSync as statSync4 } from "node:fs";
+import { createHash as createHash6 } from "node:crypto";
+import { existsSync, statSync as statSync3 } from "node:fs";
 var BASE62_CHARS = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
 var ID_PREFIX_HEX_LENGTH = 12;
 var ID_SUFFIX_LENGTH = 14;
 var ID_PREFIX_MASK = (1n << BigInt(ID_PREFIX_HEX_LENGTH * 4)) - 1n;
 function deterministicBase62(seed, length) {
-  let value = BigInt(`0x${createHash7("sha256").update(seed).digest("hex")}`);
+  let value = BigInt(`0x${createHash6("sha256").update(seed).digest("hex")}`);
   const chars = Array(length);
   for (let index = length - 1;index >= 0; index -= 1) {
     chars[index] = BASE62_CHARS[Number(value % 62n)];
@@ -5664,7 +5014,7 @@ function runMarkerWriteTransaction(db, site, operation) {
 function markerWalPages(db) {
   try {
     const row = db.prepare("PRAGMA page_size").get();
-    const bytes = statSync4(`${getOpenCodeDbPath()}-wal`).size;
+    const bytes = statSync3(`${getOpenCodeDbPath()}-wal`).size;
     return Math.max(0, Math.floor((bytes - 32) / (row.page_size + 24)));
   } catch {
     return null;
@@ -6448,7 +5798,7 @@ function parseUserMemoryRow(row) {
 }
 // src/features/magic-context/dreamer/provider-output-failure.ts
 import { AsyncLocalStorage } from "node:async_hooks";
-import { createHash as createHash8 } from "node:crypto";
+import { createHash as createHash7 } from "node:crypto";
 var MAX_NEAR_ZERO_OUTPUT_TOKENS = 32;
 
 class DreamerProviderOutputFailureError extends Error {
@@ -6545,12 +5895,12 @@ function providerOutputFailureFromInvalidManifest(messages, responseText, now =
   const resetAt = quotaResetAt(responseText, now);
   if (resetAt === undefined && completion.outputTokens > MAX_NEAR_ZERO_OUTPUT_TOKENS)
     return null;
-  const fingerprint = createHash8("sha256").update(normalized).digest("hex").slice(0, 16);
+  const fingerprint = createHash7("sha256").update(normalized).digest("hex").slice(0, 16);
   return new DreamerProviderOutputFailureError(fingerprint, completion.outputTokens, completion.reasoningTokens, responseText, resetAt);
 }
 
 // src/v2/hooks/hidden-child.ts
-import { createHash as createHash9 } from "node:crypto";
+import { createHash as createHash8 } from "node:crypto";
 
 // src/agents/dreamer.ts
 var DREAMER_AGENT = "dreamer";
@@ -6580,6 +5930,37 @@ var DREAMER_PRIMER_INVESTIGATOR_ALLOWED_TOOLS = [
   "ctx_search"
 ];
 
+// src/shared/historian-cache.ts
+function withoutHistorianTailCache(body) {
+  const value = JSON.parse(body);
+  if (!value || typeof value.model !== "string" || typeof value.max_tokens !== "number" || !Array.isArray(value.system) || value.system.length === 0 || !value.system.every((part) => part?.type === "text" && typeof part.text === "string") || !value.system.some((part) => part.cache_control) || !Array.isArray(value.messages) || value.cache_control !== undefined)
+    return body;
+  const root = parseTree(body);
+  const property = (node, key) => node?.children?.find((child) => child.children?.[0]?.value === key)?.children?.[1];
+  const removals = [];
+  for (const message of property(root, "messages")?.children ?? []) {
+    for (const block of property(message, "content")?.children ?? []) {
+      if (block.type !== "object")
+        continue;
+      const fields = block.children ?? [];
+      fields.forEach((field, index) => {
+        if (field.children?.[0]?.value !== "cache_control")
+          return;
+        const next = fields[index + 1];
+        const previous = fields[index - 1];
+        removals.push(next ? [field.offset, next.offset] : [
+          previous ? previous.offset + previous.length : field.offset,
+          field.offset + field.length
+        ]);
+      });
+    }
+  }
+  for (const [start, end] of removals.sort((a, b) => b[0] - a[0])) {
+    body = body.slice(0, start) + body.slice(end);
+  }
+  return body;
+}
+
 // src/v2/hooks/hidden-child.ts
 var HIDDEN_HISTORIAN_AGENT = "historian";
 var HIDDEN_DREAMER_AGENT = "dreamer-classifier";
@@ -6744,7 +6125,7 @@ function markerCandidates(text) {
 function textDigest(text) {
   return {
     length: text.length,
-    sha256: createHash9("sha256").update(text).digest("hex").slice(0, 16)
+    sha256: createHash8("sha256").update(text).digest("hex").slice(0, 16)
   };
 }
 function firstDifference(a, b) {
@@ -6767,6 +6148,7 @@ class HiddenChildHook {
   childIDs = new Map;
   attempts = new Map;
   active = new Map;
+  cacheWarnings = new Set;
   constructor(note = log2) {
     this.note = note;
   }
@@ -6792,6 +6174,30 @@ class HiddenChildHook {
   owns(sessionID) {
     return this.childIDs.has(sessionID);
   }
+  async cacheRequest(draft) {
+    const attempt = this.active.get(draft.sessionID);
+    if (!this.owns(draft.sessionID) || !attempt || attempt.identity.kind !== "historian" || draft.kind !== "primary" || attempt.request.cacheTail !== "skip")
+      return;
+    if ((attempt.wireRequests ?? 0) > 0)
+      return;
+    attempt.wireRequests = 1;
+    try {
+      const original = await draft.request.clone().text();
+      const body = withoutHistorianTailCache(original);
+      if (body === original)
+        return;
+      const headers = new Headers(draft.request.headers);
+      headers.delete("content-length");
+      draft.request = new Request(draft.request, { body, headers });
+    } catch (error) {
+      if (!this.cacheWarnings.has(draft.sessionID)) {
+        this.cacheWarnings.add(draft.sessionID);
+        try {
+          this.note(`Historian cache optimization skipped for ${draft.sessionID}: ${String(error)}`);
+        } catch {}
+      }
+    }
+  }
   compactionSummary(sessionID, agent) {
     if (!this.owns(sessionID)) {
       if (isChildOfDisposedInstance(sessionID)) {
@@ -8020,9 +7426,9 @@ async function promptAsyncAndWaitForIdle(client, request, options = {}) {
   }
 }
 // src/shared/prompt-surface-runtime.ts
-import { createHash as createHash10 } from "node:crypto";
-import { existsSync as existsSync2, readFileSync as readFileSync3, statSync as statSync5 } from "node:fs";
-import { dirname, isAbsolute, resolve as resolve2 } from "node:path";
+import { createHash as createHash9 } from "node:crypto";
+import { existsSync as existsSync2, readFileSync as readFileSync3, statSync as statSync4 } from "node:fs";
+import { dirname, isAbsolute, resolve } from "node:path";
 
 // src/tools/light-descriptions.ts
 var CTX_REDUCE_LIGHT_DESCRIPTION = `Stamp an item as no longer needed for the work ahead. Not a delete: stamping QUEUES it, the item stays readable until Magic Context clears stamped items in one sweep, newest tags are protected, and a cleared item goes to the archive (recent: a [dropped §N§] placeholder; older: removed) recoverable via ctx_expand(tag=N). The question is "does this need to stay on my desk for what comes next?" — a file you keep editing stays, the grep that found it goes. Stamp used reads/searches/outputs, acted-on build/test output, redundant dumps, extracted pasted payloads; keep user messages, your own text, unresolved errors, raw evidence, exact wording that may matter. Look at each tag; never blanket-stamp "1-50". Grammar: "3-5", "1,2,9", "1-5,8,12-15".`;
@@ -8053,12 +7459,12 @@ function promptSurfaceHashMaterial(systemContent, preset = "full") {
 \x00magic-context-prompt-surface:${preset}`;
 }
 function systemPromptFingerprint(systemContent, preset = "full") {
-  return createHash10("md5").update(promptSurfaceHashMaterial(systemContent, preset)).digest("hex");
+  return createHash9("md5").update(promptSurfaceHashMaterial(systemContent, preset)).digest("hex");
 }
 var PROMPT_SURFACE_TOOL_ID_SET = new Set(ACTIVE_TOOL_IDS);
 function resolveUserConfigDirectory(options) {
   if (options.userConfigDirectory)
-    return resolve2(options.userConfigDirectory);
+    return resolve(options.userConfigDirectory);
   const sharedBase = cortexKitUserConfigBasePath();
   const shared = detectConfigFile(sharedBase);
   if (shared.format !== "none")
@@ -8085,10 +7491,10 @@ function createPromptSurfaceRuntime(options) {
   const readGuidanceOverride = (configuredPath) => {
     if (!configuredPath)
       return;
-    const path = isAbsolute(configuredPath) ? configuredPath : resolve2(userConfigDirectory, configuredPath);
+    const path = isAbsolute(configuredPath) ? configuredPath : resolve(userConfigDirectory, configuredPath);
     let content;
     try {
-      if (!statSync5(path).isFile()) {
+      if (!statSync4(path).isFile()) {
         warnOnce(`guidance-not-file:${path}`, `prompt_surface.guidance_override_path (${path}) is not a file; using built-in guidance.`);
         return;
       }
@@ -9951,7 +9357,7 @@ function compareMemorySelectionPriority(left, right) {
 }
 
 // src/features/magic-context/mural/render-trigger.ts
-import { createHash as createHash11 } from "node:crypto";
+import { createHash as createHash10 } from "node:crypto";
 
 // src/features/magic-context/mural/mural-selection.ts
 var DEFAULT_MURAL_MEMORY_BUDGET = 8000;
@@ -10655,7 +10061,7 @@ function ensureMuralRendered(db, projectIdentity, budgetTokens = DEFAULT_MURAL_M
     return { ...cached.result };
   }
   const plan = planMuralRender(entries);
-  const textHash = createHash11("sha256").update(plan.layout.text).digest("hex");
+  const textHash = createHash10("sha256").update(plan.layout.text).digest("hex");
   if (existing && existing.contentHash === textHash && existing.width === plan.width && existing.height === plan.height) {
     return rememberRender(db, projectIdentity, key, existing.image, {
       hasMural: true,
@@ -15882,6 +15288,7 @@ async function runHistorianPrompt(args) {
   let handle = null;
   let completion;
   const executor = resolveHiddenCompletionExecutor(args.hiddenCompletionExecutor, client, db, sessionDirectory, "historian");
+  const cacheTail = args.cacheTail ?? (executor.capabilities.harness === "opencode2" ? "skip" : undefined);
   let promptSettled = false;
   let hadUnsettledPrompt = false;
   const startedAt = Date.now();
@@ -15963,6 +15370,7 @@ async function runHistorianPrompt(args) {
       try {
         await promptSyncWithModelSuggestionRetry(client, {
           path: { id: agentSessionId },
+          ...cacheTail !== undefined ? { cacheTail: retryIndex > 0 ? "write" : cacheTail } : {},
           query: { directory: sessionDirectory },
           body: {
             agent: agentId,
@@ -19212,4 +18620,4 @@ ${failure}`;
   }
 }
 
-export { historianRunConfig, dreamerRunConfig, pluginConfigReader, currentPluginConfigReader, withLiveDreamerOutputCap, COMPARTMENT_LEASE_RENEWAL_MS, acquireCompartmentLease, renewCompartmentLease, releaseCompartmentLeaseBestEffort, isCompartmentLeaseHeld, queueM0Mutation, getMaxM0MutationId, getCompartments, getLastCompartmentEndMessage, getLastCompartmentEndMessageId, getUncoveredCompartmentEndsThrough, providerResponseFailed, isSuccessfulProviderCompletion, rememberUnpublishedAutoSearchNoHint, getUnpublishedAutoSearchNoHint, forgetUnpublishedAutoSearchNoHint, registerAutoSearchWork, gaDatabasePath, RAW_MESSAGE_TYPES, V2StoreReaderPool, V2StoreReader, getOrCreateSessionMeta, updateSessionMeta, advanceToolReclaimWatermark, markSessionCleanupPending, retryPendingSessionCleanups, retryPendingRustSessionCleanupsForProject, clearSession, requestPendingMaterialization, pendingMaterializationOrigin, hasPendingMaterializationOrigin, clearPendingMaterialization, recordSystemPromptForRequest, recordHeldHeadForRequest, bindSystemPromptResponse, isHeldHeadForRequest, deferDeliveredSystemRefresh, retirePendingSystemPromptDelivery, lkgProviderInputTotal, beginV2LkgRequest, claimLkgRequestIdentity, currentLkgRequestIdentity, noteCapturedLkgRequest, noteLkgProviderResponse, measuredLkgPrefix, clearLkgMeasuredRequest, saveLkgSlotToDb, clearPersistedLkgSlotStrict, loadPersistedLkgSlot, drainStaleLkgSlots, resolveLkgModelKeys, createLkgEntryProjector, captureLkgSlot, validateAnthropicReasoningRuns, validateLkgSeam, replayLkg, coldStartRawServedIndex, coldStartUncapturedReplay, noteUncertifiedNormalLkg, hasProcessLocalLkgProof, lkgDirtyRevision, rememberLkgDirtyRevision, noteLkgRecoveryPrefix, readLkgRecoveryPrefix, noteLkgHealthyPrefix, lkgRecoveryReplayUnproven, lkgRecoveryEntryUnproven, beginLkgPass, visitMessageContentFields, contentSnapshotValue, messageContentFields, signatureForFields, exactReusablePrefix, incrementalLkgContentDigests, lkgSlotRejection, captureSlot, getInMemorySlot, getSlot, forgetInMemorySlot, dropSlot, noteEntry, getLkgSlotHeapStats, TOOL_SWEEP_SCOPED_MARKER, useScopedToolSweep, createPreAdoptionToolSweepResolver, copySessionStateForClone, queueMemoryMutation, getMaxMemoryMutationIdForProjects, GLOBAL_USER_PROFILE_PROJECT_PATH, getProjectState, bumpProjectUserProfileVersion, saveSourceContent, replaceSourceContent, getSourceContents, readCoordinateGeneration, rebaseSessionCoordinatesAsync, HiddenCompletionRefusal, getOpenCodeDbPath, compareOpenCodeMessagesByCanonicalOrder, prepareCompactionMarkerCandidates, removeMcOwnedCompactionMarkers, getCompartmentEvents, USER_MEMORY_CANDIDATE_TTL_MS, insertUserMemoryCandidates, getUserMemoryCandidates, deleteUserMemoryCandidates, pruneExpiredUserMemoryCandidates, insertUserMemory, getActiveUserMemories, updateUserMemoryContent, dismissUserMemory, DreamerProviderOutputFailureError, withDreamerModelCooldown, providerOutputFailureFromInvalidManifest, DREAMER_AGENT, DREAMER_RETROSPECTIVE_AGENT, DREAMER_PRIMER_INVESTIGATOR_AGENT, DREAMER_MEMORY_MAPPER_AGENT, DREAMER_CLASSIFIER_AGENT, DREAMER_DOCS_AGENT, DREAMER_REVIEWER_AGENT, HIDDEN_HISTORIAN_AGENT, HIDDEN_DREAMER_AGENT, HIDDEN_CURATE_AGENT, hiddenAgentFor, hiddenToolLoop, HIDDEN_RUN_DISPOSED_REASON, noteChildOfDisposedInstance, hiddenChildPermissions, registerHiddenChildAgents, hiddenToolCallRefusal, HiddenAgentStepLimit, HiddenChildHook, extractLatestAssistantText, hasLengthCappedOutput, parseProviderModel, modelBodyField, toModelEntry, isPromptTimeoutError, getPromptFailureDetail, raceWithSignal, promptSyncWithValidatedOutputRetry, normalizeSDKResponse, failedInvocationStatus, sumTokensFromChildMessages, recordChildInvocation, createPromptAsyncTransport, CTX_NOTE_LIGHT_DESCRIPTION, ACTIVE_TOOL_IDS, systemPromptFingerprint, createPromptSurfaceRuntime, createPromptSurfaceGuidanceEpochCache, MARKER_SUMMARY_TEXT, markerUpdateDefinitelyDidNotCut, applyDeferredCompactionMarker, teardownChildSession, runTokenLog, formatRunTokenLog, createChildSessionWithFence, buildMagicContextSection, getMuralIdentity, getMural, modelKeyAcceptsImages, resolveMuralWire, extractM0Block, formatDate, TEMPORAL_MARKER_REPLAY_PATTERN, collectTemporalCandidates, injectTemporalMarkers, clearInjectionCache, getVisibleMemoryIds, selectHiddenMessagesAtCompactionSeam, prepareCompartmentInjection, renderCompartmentInjection, MaterializeContentionError, mustMaterialize, trimMemoriesToBudgetV2, renderMemoryBlockV2, materializeM0, hydrateCachedM0Mural, resetPrefixTrimFallbackState, findHostCompactionWindow, capturePrefixTrimSourceOrder, prepareCachedM0M1Replay, hasCompleteCachedM0M1, injectM0M1, clampProducerAtomChars, producerInputTokenLimit, historianProducerReserve, producerPromptFailureReason, resolveHiddenCompletionExecutor, createV1HiddenCompletionExecutor, EMPTY_READ_REPLY, noteTouchedAt, renderGlance, renderNotesById, formatWriteReply, observeNoteNudgeServe, onNoteTrigger, peekNoteNudgeText, markNoteNudgeDelivered, clearNoteNudgeTriggerAndCooldown, describeBoundaryDiagnostics, RECOVERY_NO_HEAD_LIMIT, deriveProtectedTailTokenTarget, selectPerRunCap, resolveOpenCodeProtectedTailBoundary, resolveWrapupProtectedTailBoundary, getRawHistoryEligibility, hasRunnableCompartmentWindow, recordHighPressureNoEligibleHead, noteTransformPassForExactOrdinalReads, runCompartmentAgent, getActiveCompartmentRun, markActiveCompartmentRunPublished, registerActiveCompartmentRun, startCompartmentAgent, isRecompFailure2, isRecompSkip2, extractRecompReason2, setRecompStarting2, setRecompNote2, setRecompTerminal2, buildRecompDeps2, runManagedRecomp2 };
+export { historianRunConfig, dreamerRunConfig, pluginConfigReader, currentPluginConfigReader, withLiveDreamerOutputCap, COMPARTMENT_LEASE_RENEWAL_MS, acquireCompartmentLease, renewCompartmentLease, releaseCompartmentLeaseBestEffort, isCompartmentLeaseHeld, queueM0Mutation, getMaxM0MutationId, getCompartments, getLastCompartmentEndMessage, getLastCompartmentEndMessageId, getUncoveredCompartmentEndsThrough, providerResponseFailed, isSuccessfulProviderCompletion, rememberUnpublishedAutoSearchNoHint, getUnpublishedAutoSearchNoHint, forgetUnpublishedAutoSearchNoHint, registerAutoSearchWork, getOrCreateSessionMeta, updateSessionMeta, advanceToolReclaimWatermark, markSessionCleanupPending, retryPendingSessionCleanups, retryPendingRustSessionCleanupsForProject, clearSession, requestPendingMaterialization, pendingMaterializationOrigin, hasPendingMaterializationOrigin, clearPendingMaterialization, recordSystemPromptForRequest, recordHeldHeadForRequest, bindSystemPromptResponse, isHeldHeadForRequest, deferDeliveredSystemRefresh, retirePendingSystemPromptDelivery, lkgProviderInputTotal, beginV2LkgRequest, claimLkgRequestIdentity, currentLkgRequestIdentity, noteCapturedLkgRequest, noteLkgProviderResponse, measuredLkgPrefix, clearLkgMeasuredRequest, saveLkgSlotToDb, clearPersistedLkgSlotStrict, loadPersistedLkgSlot, drainStaleLkgSlots, resolveLkgModelKeys, createLkgEntryProjector, captureLkgSlot, validateAnthropicReasoningRuns, validateLkgSeam, replayLkg, coldStartRawServedIndex, coldStartUncapturedReplay, noteUncertifiedNormalLkg, hasProcessLocalLkgProof, lkgDirtyRevision, rememberLkgDirtyRevision, noteLkgRecoveryPrefix, readLkgRecoveryPrefix, noteLkgHealthyPrefix, lkgRecoveryReplayUnproven, lkgRecoveryEntryUnproven, beginLkgPass, visitMessageContentFields, contentSnapshotValue, messageContentFields, signatureForFields, exactReusablePrefix, incrementalLkgContentDigests, lkgSlotRejection, captureSlot, getInMemorySlot, getSlot, forgetInMemorySlot, dropSlot, noteEntry, getLkgSlotHeapStats, TOOL_SWEEP_SCOPED_MARKER, useScopedToolSweep, createPreAdoptionToolSweepResolver, copySessionStateForClone, queueMemoryMutation, getMaxMemoryMutationIdForProjects, GLOBAL_USER_PROFILE_PROJECT_PATH, getProjectState, bumpProjectUserProfileVersion, saveSourceContent, replaceSourceContent, getSourceContents, readCoordinateGeneration, rebaseSessionCoordinatesAsync, HiddenCompletionRefusal, getOpenCodeDbPath, compareOpenCodeMessagesByCanonicalOrder, prepareCompactionMarkerCandidates, removeMcOwnedCompactionMarkers, getCompartmentEvents, USER_MEMORY_CANDIDATE_TTL_MS, insertUserMemoryCandidates, getUserMemoryCandidates, deleteUserMemoryCandidates, pruneExpiredUserMemoryCandidates, insertUserMemory, getActiveUserMemories, updateUserMemoryContent, dismissUserMemory, DreamerProviderOutputFailureError, withDreamerModelCooldown, providerOutputFailureFromInvalidManifest, DREAMER_AGENT, DREAMER_RETROSPECTIVE_AGENT, DREAMER_PRIMER_INVESTIGATOR_AGENT, DREAMER_MEMORY_MAPPER_AGENT, DREAMER_CLASSIFIER_AGENT, DREAMER_DOCS_AGENT, DREAMER_REVIEWER_AGENT, HIDDEN_HISTORIAN_AGENT, HIDDEN_DREAMER_AGENT, HIDDEN_CURATE_AGENT, hiddenAgentFor, hiddenToolLoop, HIDDEN_RUN_DISPOSED_REASON, noteChildOfDisposedInstance, hiddenChildPermissions, registerHiddenChildAgents, hiddenToolCallRefusal, HiddenAgentStepLimit, HiddenChildHook, extractLatestAssistantText, hasLengthCappedOutput, parseProviderModel, modelBodyField, toModelEntry, isPromptTimeoutError, getPromptFailureDetail, raceWithSignal, promptSyncWithValidatedOutputRetry, normalizeSDKResponse, failedInvocationStatus, sumTokensFromChildMessages, recordChildInvocation, createPromptAsyncTransport, CTX_NOTE_LIGHT_DESCRIPTION, ACTIVE_TOOL_IDS, systemPromptFingerprint, createPromptSurfaceRuntime, createPromptSurfaceGuidanceEpochCache, MARKER_SUMMARY_TEXT, markerUpdateDefinitelyDidNotCut, applyDeferredCompactionMarker, teardownChildSession, runTokenLog, formatRunTokenLog, createChildSessionWithFence, buildMagicContextSection, getMuralIdentity, getMural, modelKeyAcceptsImages, resolveMuralWire, extractM0Block, formatDate, TEMPORAL_MARKER_REPLAY_PATTERN, collectTemporalCandidates, injectTemporalMarkers, clearInjectionCache, getVisibleMemoryIds, selectHiddenMessagesAtCompactionSeam, prepareCompartmentInjection, renderCompartmentInjection, MaterializeContentionError, mustMaterialize, trimMemoriesToBudgetV2, renderMemoryBlockV2, materializeM0, hydrateCachedM0Mural, resetPrefixTrimFallbackState, findHostCompactionWindow, capturePrefixTrimSourceOrder, prepareCachedM0M1Replay, hasCompleteCachedM0M1, injectM0M1, clampProducerAtomChars, producerInputTokenLimit, historianProducerReserve, producerPromptFailureReason, resolveHiddenCompletionExecutor, createV1HiddenCompletionExecutor, EMPTY_READ_REPLY, noteTouchedAt, renderGlance, renderNotesById, formatWriteReply, observeNoteNudgeServe, onNoteTrigger, peekNoteNudgeText, markNoteNudgeDelivered, clearNoteNudgeTriggerAndCooldown, describeBoundaryDiagnostics, RECOVERY_NO_HEAD_LIMIT, deriveProtectedTailTokenTarget, selectPerRunCap, resolveOpenCodeProtectedTailBoundary, resolveWrapupProtectedTailBoundary, getRawHistoryEligibility, hasRunnableCompartmentWindow, recordHighPressureNoEligibleHead, noteTransformPassForExactOrdinalReads, runCompartmentAgent, getActiveCompartmentRun, markActiveCompartmentRunPublished, registerActiveCompartmentRun, startCompartmentAgent, isRecompFailure2, isRecompSkip2, extractRecompReason2, setRecompStarting2, setRecompNote2, setRecompTerminal2, buildRecompDeps2, runManagedRecomp2 };