@evident-ai/cli 3.5.2-dev.df1ae49 → 3.5.2-dev.fbf25b4

package/dist/index.js

@@ -703,6 +703,31 @@ async function reportResourceUsage(agentId, authHeader, usage) {
     opencode_db_bytes: usage.opencodeDbBytes
   });
 }
+async function getRunnerCredentialVault(agentId, authHeader) {
+  const empty = { prefix: null, vaultId: null, source: null };
+  try {
+    const apiUrl = getApiUrlConfig();
+    const response = await fetch(`${apiUrl}/runners/${agentId}/credential-vault`, {
+      headers: { Authorization: authHeader },
+      signal: AbortSignal.timeout(1e4)
+    });
+    if (!response.ok) {
+      const serverMessage = await readErrorMessage(response);
+      return {
+        ...empty,
+        error: `HTTP ${response.status}${serverMessage ? `: ${serverMessage}` : ""}`
+      };
+    }
+    const data = await response.json();
+    return {
+      prefix: data.credential_vault_prefix,
+      vaultId: data.vault_id,
+      source: data.source
+    };
+  } catch (error2) {
+    return { ...empty, error: describeTimeoutError(error2, 1e4) };
+  }
+}
 async function getAgentInfo(agentId, authHeader) {
   const apiUrl = getApiUrlConfig();
   try {
@@ -877,6 +902,76 @@ async function status(options = {}) {
   process.exit(result.exitCode);
 }
 
+// src/commands/credential-vault-env.ts
+function shellQuote(value) {
+  return `'${value.replaceAll("'", "'\\''")}'`;
+}
+function printAssignment(prefix) {
+  console.log(`CREDENTIAL_VAULT_PREFIX=${shellQuote(prefix ?? "")}`);
+}
+function safeReason(reason, credentials2, authHeader) {
+  let safe = reason;
+  for (const secret of [
+    authHeader,
+    credentials2?.token,
+    process.env.EVIDENT_RUNNER_KEY,
+    process.env.EVIDENT_AGENT_KEY,
+    process.env.EVIDENT_TOKEN
+  ]) {
+    if (secret) safe = safe.replaceAll(secret, "[redacted]");
+  }
+  return safe.replace(/[\r\n]+/g, " ");
+}
+function printFallback(reason, credentials2, authHeader) {
+  printAssignment(null);
+  console.error(
+    `WARNING: ${safeReason(reason, credentials2, authHeader)}; using this runner's own credential prefix.`
+  );
+}
+async function credentialVaultEnv() {
+  let credentials2 = null;
+  let authHeader;
+  try {
+    credentials2 = await getAuthCredentials();
+    if (!credentials2) {
+      printFallback("no runner credentials are configured");
+      return;
+    }
+    authHeader = getAuthHeader(credentials2);
+    const runner = await resolveAgentIdFromKey(authHeader);
+    if (!runner.agent_id) {
+      printFallback(
+        runner.error ?? "the runner identity could not be resolved",
+        credentials2,
+        authHeader
+      );
+      return;
+    }
+    const lookup = await getRunnerCredentialVault(runner.agent_id, authHeader);
+    if (lookup.error) {
+      printFallback(`credential vault lookup failed: ${lookup.error}`, credentials2, authHeader);
+      return;
+    }
+    if (lookup.prefix === null) {
+      printFallback("this runner is not linked to a credential vault", credentials2, authHeader);
+      return;
+    }
+    if (/[\r\n]/.test(lookup.prefix)) {
+      printFallback("credential vault lookup returned an invalid prefix", credentials2, authHeader);
+      return;
+    }
+    printAssignment(lookup.prefix);
+    console.error(
+      `VAULT-MODE: credential stores use vault=${lookup.vaultId} source=${lookup.source} prefix=${lookup.prefix}.`
+    );
+  } catch (error2) {
+    const detail = credentials2 === null ? "credential resolution failed" : `credential vault lookup could not be completed: ${error2 instanceof Error ? error2.message : String(error2)}`;
+    printFallback(detail, credentials2, authHeader);
+  } finally {
+    process.exitCode = 0;
+  }
+}
+
 // src/lib/claude-usage.ts
 import { execFileSync } from "node:child_process";
 import { readFileSync } from "node:fs";
@@ -1069,6 +1164,76 @@ import chalk7 from "chalk";
 // ../../packages/types/src/agents/index.ts
 var MICROVM_MAX_LIFETIME_MS = 8 * 60 * 6e4;
 
+// ../../packages/types/src/opencode/index.ts
+function roleOf(m) {
+  if (!m || typeof m !== "object") return void 0;
+  if (typeof m.role === "string") return m.role;
+  const infoRole = m.info?.role;
+  return typeof infoRole === "string" ? infoRole : void 0;
+}
+function idOf(m) {
+  if (!m || typeof m !== "object") return void 0;
+  if (typeof m.id === "string") return m.id;
+  const infoId = m.info?.id;
+  return typeof infoId === "string" ? infoId : void 0;
+}
+function parentIdOf(m) {
+  if (!m || typeof m !== "object") return void 0;
+  if (typeof m.parentID === "string") return m.parentID;
+  const infoParent = m.info?.parentID;
+  return typeof infoParent === "string" ? infoParent : void 0;
+}
+function textPartsOf(m) {
+  if (!m || typeof m !== "object") return [];
+  const parts = Array.isArray(m.parts) ? m.parts : [];
+  return parts.filter((p) => p.type === "text" && typeof p.text === "string").map((p) => p.text ?? "").filter(Boolean);
+}
+function correlatedAssistantRun(messages, userMessageId) {
+  if (!messages || messages.length === 0) return [];
+  const byParent = messages.filter(
+    (m) => roleOf(m) === "assistant" && parentIdOf(m) === userMessageId
+  );
+  if (byParent.length > 0) return byParent;
+  const userIndex = messages.findIndex((m) => idOf(m) === userMessageId);
+  if (userIndex === -1) return [];
+  const run2 = [];
+  for (let i = userIndex + 1; i < messages.length; i++) {
+    const role = roleOf(messages[i]);
+    if (role === "user") break;
+    if (role === "assistant") run2.push(messages[i]);
+  }
+  return run2;
+}
+function lastText(assistantRun) {
+  for (let i = assistantRun.length - 1; i >= 0; i--) {
+    const textParts = textPartsOf(assistantRun[i]);
+    if (textParts.length > 0) return textParts.join("\n").trim() || null;
+  }
+  return null;
+}
+function effectiveCorrelatedRun(messages, userMessageId) {
+  const run2 = correlatedAssistantRun(messages, userMessageId);
+  if (lastText(run2) !== null) return run2;
+  const userIndex = messages?.findIndex((m) => idOf(m) === userMessageId) ?? -1;
+  if (userIndex === -1) return run2;
+  let continuation;
+  for (let i = userIndex + 1; messages && i < messages.length; i++) {
+    if (roleOf(messages[i]) === "user") {
+      continuation = messages[i];
+      break;
+    }
+  }
+  const continuationId = idOf(continuation);
+  if (roleOf(continuation) === "user" && textPartsOf(continuation).join("\n").trim().toLowerCase() === "continue" && continuationId) {
+    const continuationRun = correlatedAssistantRun(messages, continuationId);
+    if (continuationRun.length > 0) return continuationRun;
+  }
+  return run2;
+}
+function extractReplyTextForMessage(messages, opencodeUserMessageId) {
+  return lastText(effectiveCorrelatedRun(messages, opencodeUserMessageId));
+}
+
 // ../../packages/types/src/telemetry/index.ts
 var TelemetryEventTypes = {
   // Agent activity events (shown in web UI activity log)
@@ -1157,7 +1322,7 @@ import ora4 from "ora";
 import { select as select4 } from "@inquirer/prompts";
 
 // src/lib/telemetry.ts
-var CLI_VERSION = (true ? "3.5.2-dev.df1ae49" : void 0) ?? process.env.npm_package_version ?? "unknown";
+var CLI_VERSION = (true ? "3.5.2-dev.fbf25b4" : void 0) ?? process.env.npm_package_version ?? "unknown";
 function getCliVersion() {
   return CLI_VERSION;
 }
@@ -1318,12 +1483,38 @@ var EventTypes = {
   DEPRECATED_AGENT_KEY_ENV_USED: "cli.deprecated_agent_key_env_used"
 };
 
-// src/lib/runner-activity-telemetry.ts
-import { homedir as homedir2 } from "node:os";
-
 // src/lib/opencode/session-db-reclaim.ts
 import { statSync as statSync2, statfsSync } from "node:fs";
 import { dirname as dirname2 } from "node:path";
+
+// src/lib/diagnostic-redaction.ts
+import { homedir as homedir2 } from "node:os";
+function redactHomeDirectory(message) {
+  const home = homedir2();
+  if (!home || home === "/") {
+    return message;
+  }
+  const pathSegmentCharacters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789._-";
+  let result = "";
+  let searchFrom = 0;
+  let homeIndex;
+  while ((homeIndex = message.indexOf(home, searchFrom)) !== -1) {
+    const homeEnd = homeIndex + home.length;
+    const previousCharacter = message[homeIndex - 1];
+    const nextCharacter = message[homeEnd];
+    const atPathBoundary = (!previousCharacter || !pathSegmentCharacters.includes(previousCharacter)) && (!nextCharacter || !pathSegmentCharacters.includes(nextCharacter));
+    result += message.slice(searchFrom, homeIndex);
+    result += atPathBoundary ? "~" : home;
+    searchFrom = homeEnd;
+  }
+  return result + message.slice(searchFrom);
+}
+function redactDiagnosticText(message) {
+  const redacted = message.replace(/esk_[A-Za-z0-9_-]+/g, "esk_***").replace(/ct_[A-Za-z0-9_-]+/g, "ct_***").replace(/(?<![A-Za-z0-9_-])sk-ant-[A-Za-z0-9_-]{20,}(?![A-Za-z0-9_-])/g, "sk-ant-***").replace(/(?<![A-Za-z0-9_-])sk-proj-[A-Za-z0-9_-]{20,}(?![A-Za-z0-9_-])/g, "sk-proj-***").replace(/(?<![A-Za-z0-9_-])sk-[A-Za-z0-9]{20,}(?![A-Za-z0-9_-])/g, "sk-***").replace(/(?<![A-Za-z0-9_-])(gh[oprsu])_[A-Za-z0-9]{20,}(?![A-Za-z0-9_-])/g, "$1_***").replace(/(?<![A-Za-z0-9_-])github_pat_[A-Za-z0-9_]{20,}(?![A-Za-z0-9_-])/g, "github_pat_***").replace(/https?:\/\/\S+/g, "<url>");
+  return redactHomeDirectory(redacted);
+}
+
+// src/lib/opencode/session-db-reclaim.ts
 var SESSION_DB_RECLAIM_CHUNK_PAGES = 2e3;
 var SESSION_DB_RECLAIM_TIME_BUDGET_MS = 500;
 var SESSION_DB_RECLAIM_PAGE_CEILING = 4e4;
@@ -1331,7 +1522,7 @@ function errorMessage(error2) {
   if (!(error2 instanceof Error)) return String(error2);
   return error2.cause instanceof Error ? error2.cause.message : error2.message;
 }
-function isSessionStoreWriteFailure(error2) {
+function errorMessages(error2) {
   const messages = [];
   const visited = /* @__PURE__ */ new Set();
   let current = error2;
@@ -1355,12 +1546,81 @@ function isSessionStoreWriteFailure(error2) {
     }
     break;
   }
-  return messages.some(
+  return messages;
+}
+function isSessionStoreWriteFailure(error2) {
+  return errorMessages(error2).some(
     (message) => /(?:database or disk is full|disk is full|no space left on device|SQLITE_(?:FULL|IOERR)(?:\b|_))/i.test(
       message
     )
   );
 }
+var SQLITE_CAUSE_TOKEN = /(?:^|cause:\s+)(SQLiteError:\s+[A-Za-z][A-Za-z0-9]*(?:\s+[A-Za-z][A-Za-z0-9]*){0,7})(?=\s*(?:[)\]"',;]|$))/i;
+var EFFECT_SQL_CAUSE_TOKEN = /(?:^|cause:\s+)(effect\/sql\/SqlError\/[A-Za-z][A-Za-z0-9_]*)/i;
+var PARAMS_FIELD = /\bparams\s*(?:=|:)/i;
+function isCauseBearingText(text) {
+  return /^(?:SQLiteError:\s+|effect\/sql\/SqlError\/)/i.test(text.trim()) || /(?:^|\s)cause:\s+(?:SQLiteError:\s+|effect\/sql\/SqlError\/)/i.test(text);
+}
+function structuredLogFields(line) {
+  const fields = [];
+  for (let index = 0; index < line.length; index++) {
+    if (line[index] === '"') {
+      index++;
+      while (index < line.length) {
+        if (line[index] === "\\") {
+          index++;
+        } else if (line[index] === '"') {
+          break;
+        }
+        index++;
+      }
+      continue;
+    }
+    const atFieldBoundary = index === 0 || /\s/.test(line[index - 1]);
+    const key = line.startsWith("error=", index) ? "error=" : line.startsWith("cause=", index) ? "cause=" : null;
+    if (!atFieldBoundary || key === null) continue;
+    const valueStart = index + key.length;
+    if (line[valueStart] !== '"') {
+      const valueEnd2 = line.indexOf(" ", valueStart);
+      fields.push(line.slice(valueStart, valueEnd2 === -1 ? line.length : valueEnd2));
+      index = valueEnd2 === -1 ? line.length : valueEnd2;
+      continue;
+    }
+    let valueEnd = valueStart + 1;
+    for (; valueEnd < line.length; valueEnd++) {
+      if (line[valueEnd] === "\\") {
+        valueEnd++;
+      } else if (line[valueEnd] === '"') {
+        break;
+      }
+    }
+    fields.push(line.slice(valueStart + 1, valueEnd));
+    index = valueEnd;
+  }
+  return fields;
+}
+function structuredCauseMessages(text) {
+  const fields = structuredLogFields(text);
+  if (fields.length > 0) return fields;
+  return isCauseBearingText(text) ? [text] : [];
+}
+function causeTokenFromText(text) {
+  const paramsIndex = text.search(PARAMS_FIELD);
+  for (const pattern of [SQLITE_CAUSE_TOKEN, EFFECT_SQL_CAUSE_TOKEN]) {
+    const match = pattern.exec(text);
+    if (match?.[1] && (paramsIndex === -1 || match.index < paramsIndex)) {
+      return match[1];
+    }
+  }
+  return null;
+}
+function sessionStoreCauseToken(value) {
+  for (const message of structuredCauseMessages(value)) {
+    const token = causeTokenFromText(message);
+    if (token !== null) return redactDiagnosticText(token).slice(0, 120);
+  }
+  return null;
+}
 function insufficientSpaceReason(dbPath, requiredBytes) {
   try {
     const fsStats = statfsSync(dirname2(dbPath));
@@ -1549,11 +1809,13 @@ function parseOpenCodeLogLine(line) {
   if (!levelMatch) return null;
   const level = levelMatch[1].toUpperCase();
   if (level !== "WARN" && level !== "ERROR") return null;
-  const sessionMatch = normalisedLine.match(/(?:^|\s)sessionID=(\S+)/);
+  const sessionMatch = normalisedLine.match(/(?:^|\s)(?:sessionID|session\.id)=(\S+)/);
+  const messageIDMatch = normalisedLine.match(/(?:^|\s)messageID=(\S+)/);
   const messageMatch = normalisedLine.match(/(?:^|\s)message=(?:"((?:\\.|[^"])*)"|(\S+))/);
   const parsed = {
     level: level === "WARN" ? "warn" : "error",
-    sessionID: sessionMatch?.[1]
+    sessionID: sessionMatch?.[1],
+    messageID: messageIDMatch?.[1]
   };
   const message = messageMatch?.[1] ?? messageMatch?.[2];
   if (message !== void 0) parsed.message = message;
@@ -1567,6 +1829,7 @@ function createOpenCodeActivityForwarder(getContext, onSessionStoreWriteFailure)
   const forwardLine = (line, parsed, repeatsSuppressed = 0) => {
     const metadata = {
       ...parsed.sessionID ? { sessionID: parsed.sessionID } : {},
+      ...parsed.messageID ? { messageID: parsed.messageID } : {},
       ...repeatsSuppressed > 0 ? { repeats_suppressed: repeatsSuppressed } : {}
     };
     forwardRunnerActivity(
@@ -1591,19 +1854,25 @@ function createOpenCodeActivityForwarder(getContext, onSessionStoreWriteFailure)
     }
   };
   const flushLine = (line) => {
-    if (onSessionStoreWriteFailure && isSessionStoreWriteFailure(line)) {
+    const parsed = parseOpenCodeLogLine(line);
+    const isDiskFailure = isSessionStoreWriteFailure(line);
+    const cause = sessionStoreCauseToken(line);
+    if (onSessionStoreWriteFailure && (isDiskFailure || cause !== null)) {
       try {
-        onSessionStoreWriteFailure();
+        onSessionStoreWriteFailure({
+          isDiskFailure,
+          sessionId: parsed?.sessionID ?? null,
+          cause
+        });
       } catch (err) {
         reportTelemetryDiagnostic(
           `Runner activity telemetry could not record session-store write failure: ${err instanceof Error ? err.message : String(err)}`
         );
       }
     }
-    const parsed = parseOpenCodeLogLine(line);
     if (!parsed) return;
     const now = Date.now();
-    const key = parsed.message === void 0 ? void 0 : `${parsed.level}\0${parsed.message}`;
+    const key = parsed.message === void 0 ? void 0 : `${parsed.level}\0${parsed.message}\0${parsed.sessionID ?? ""}\0${parsed.messageID ?? ""}`;
     expireRepeatStates(now, key);
     if (key === void 0) {
       forwardLine(line, parsed);
@@ -1649,34 +1918,21 @@ function createOpenCodeActivityForwarder(getContext, onSessionStoreWriteFailure)
 var MAX_MESSAGE_LENGTH = 500;
 var MAX_METADATA_VALUE_LENGTH = 200;
 var MAX_METADATA_ENTRIES = 20;
-var TRUNCATION_MARKER = "\u2026";
-function redactHomeDirectory(message) {
-  const home = homedir2();
-  if (!home || home === "/") {
-    return message;
-  }
-  const pathSegmentCharacters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789._-";
-  let result = "";
-  let searchFrom = 0;
-  let homeIndex;
-  while ((homeIndex = message.indexOf(home, searchFrom)) !== -1) {
-    const homeEnd = homeIndex + home.length;
-    const previousCharacter = message[homeIndex - 1];
-    const nextCharacter = message[homeEnd];
-    const atPathBoundary = home === "/" || (!previousCharacter || !pathSegmentCharacters.includes(previousCharacter)) && (!nextCharacter || !pathSegmentCharacters.includes(nextCharacter));
-    result += message.slice(searchFrom, homeIndex);
-    result += atPathBoundary ? "~" : home;
-    searchFrom = homeEnd;
-  }
-  return result + message.slice(searchFrom);
-}
-function redactDiagnosticText(message) {
-  const redacted = message.replace(/esk_[A-Za-z0-9_-]+/g, "esk_***").replace(/ct_[A-Za-z0-9_-]+/g, "ct_***").replace(/(?<![A-Za-z0-9_-])sk-ant-[A-Za-z0-9_-]{20,}(?![A-Za-z0-9_-])/g, "sk-ant-***").replace(/(?<![A-Za-z0-9_-])sk-proj-[A-Za-z0-9_-]{20,}(?![A-Za-z0-9_-])/g, "sk-proj-***").replace(/(?<![A-Za-z0-9_-])sk-[A-Za-z0-9]{20,}(?![A-Za-z0-9_-])/g, "sk-***").replace(/(?<![A-Za-z0-9_-])(gh[oprsu])_[A-Za-z0-9]{20,}(?![A-Za-z0-9_-])/g, "$1_***").replace(/(?<![A-Za-z0-9_-])github_pat_[A-Za-z0-9_]{20,}(?![A-Za-z0-9_-])/g, "github_pat_***").replace(/https?:\/\/\S+/g, "<url>");
-  return redactHomeDirectory(redacted);
-}
 function truncate(message) {
   if (message.length <= MAX_MESSAGE_LENGTH) return message;
-  return message.slice(0, MAX_MESSAGE_LENGTH - TRUNCATION_MARKER.length) + TRUNCATION_MARKER;
+  let dropped = message.length - MAX_MESSAGE_LENGTH;
+  let marker = `\u2026${dropped} chars omitted\u2026`;
+  let previousDropped = -1;
+  while (dropped !== previousDropped) {
+    previousDropped = dropped;
+    const nextDropped = message.length - MAX_MESSAGE_LENGTH + marker.length;
+    dropped = nextDropped;
+    marker = `\u2026${dropped} chars omitted\u2026`;
+  }
+  const remaining = MAX_MESSAGE_LENGTH - marker.length;
+  const headLength = Math.ceil(remaining * 0.6);
+  const tailLength = remaining - headLength;
+  return message.slice(0, headLength) + marker + message.slice(message.length - tailLength);
 }
 function sanitiseMetadata(metadata) {
   if (!metadata) return {};
@@ -1886,12 +2142,23 @@ function buildSessionDbRecoveryActivity(record) {
         metadata: withoutContractFields(record),
         message: `This runner started without restoring session history because it could not verify where its session history is backed up. Nothing in the backup was changed; check the runner backup configuration and permissions.${replication}`
       };
-    case "session_db_boot_refused":
-      return {
-        level,
-        metadata: withoutContractFields(record),
-        message: `This runner did not come online because its damaged session database could not be safely separated from its active backup or proven removed. Backed-up session history remains readable at ${record.quarantine_destination ?? "its original location or the quarantine destination named in the boot logs"}; any local session-database files that remain were left in place and nothing opened or wrote them. See the runner boot logs for SESSION-DB-LOCAL-DISCARD-FAILED details.`
-      };
+    case "session_db_boot_refused": {
+      const message = (() => {
+        switch (record.reason) {
+          case "local_discard_failed":
+            return `This runner did not come online because its damaged session database could not be safely separated from its active backup or proven removed. Backed-up session history remains readable at ${record.quarantine_destination ?? "its original location or the quarantine destination named in the boot logs"}; any local session-database files that remain were left in place and nothing opened or wrote them. See the runner boot logs for SESSION-DB-LOCAL-DISCARD-FAILED details.`;
+          case "replica_separation_unproven":
+            return `This runner did not come online because its damaged session database could not be safely separated from its active backup. The SESSION-DB-REPLICA-SEPARATION-UNVERIFIED boot log contains the partial-quarantine moved and remaining counts. Backed-up session history remains readable at ${record.quarantine_destination ?? "its original location or the quarantine destination named in the boot logs"}; any local session-database files that remain were left in place and nothing opened or wrote them.`;
+          case "verification_timeout_before_separation":
+            return "This runner did not come online because session database verification timed out after detecting corruption, before replica separation was attempted. No replica progress is claimed. See SESSION-DB-VERIFY-TIMEOUT in the runner boot logs before retrying.";
+          case "verification_timeout_during_separation":
+            return "This runner did not come online because session database verification timed out while replica separation was in progress. Separation completion and object removal were not proven. See SESSION-DB-VERIFY-TIMEOUT in the runner boot logs before retrying.";
+          default:
+            return "This runner did not come online because session database recovery could not be completed. Inspect the runner boot logs for the refusal reason before retrying.";
+        }
+      })();
+      return { level, metadata: withoutContractFields(record), message };
+    }
     case "schema_provenance_mismatch":
       return {
         level,
@@ -2141,7 +2408,7 @@ async function getOpenCodeDirectory(port, client) {
     return null;
   }
 }
-function roleOf(m) {
+function roleOf2(m) {
   if (!m || typeof m !== "object") return void 0;
   if (typeof m.role === "string") return m.role;
   const infoRole = m.info?.role;
@@ -2155,13 +2422,13 @@ function createdOf(m) {
   if (!m || typeof m !== "object") return void 0;
   return m.info?.time?.created ?? m.time?.created;
 }
-function idOf(m) {
+function idOf2(m) {
   if (!m || typeof m !== "object") return void 0;
   if (typeof m.id === "string") return m.id;
   const infoId = m.info?.id;
   return typeof infoId === "string" ? infoId : void 0;
 }
-function parentIdOf(m) {
+function parentIdOf2(m) {
   if (!m || typeof m !== "object") return void 0;
   if (typeof m.parentID === "string") return m.parentID;
   const infoParent = m.info?.parentID;
@@ -2177,8 +2444,12 @@ function errorOf(m) {
   if (!m || typeof m !== "object") return void 0;
   return m.info?.error ?? m.error;
 }
+function isTerminalStopAnswer(m) {
+  return completedOf(m) != null && errorOf(m) == null && finishOf(m) === "stop";
+}
 function isAssistantInFlight(m) {
   if (completedOf(m) == null) return true;
+  if (errorOf(m) != null) return false;
   return finishOf(m) === "tool-calls";
 }
 async function getSessionMessages(port, sessionId, client) {
@@ -2226,7 +2497,7 @@ async function pollSessionMessagesForRedrive(port, sessionId, client) {
 function isSessionActivelyGenerating(messages) {
   if (!messages || messages.length === 0) return false;
   const last = messages[messages.length - 1];
-  if (roleOf(last) !== "assistant") return false;
+  if (roleOf2(last) !== "assistant") return false;
   return completedOf(last) == null;
 }
 var FULL_SESSION_ENUMERATION_MAX_SESSIONS = 3200;
@@ -2535,11 +2806,31 @@ function messageText(m) {
   if (!m || !Array.isArray(m.parts)) return "";
   return m.parts.filter((p) => p.type === "text" && typeof p.text === "string").map((p) => p.text).join("");
 }
-async function sendPromptAsync(port, sessionId, content, options, attachments, client) {
+function findDispatchedUserMessageId(messages, content, excludeIds) {
+  if (!messages || messages.length === 0) return null;
+  let best = null;
+  for (const message of messages) {
+    if (roleOf2(message) !== "user") continue;
+    const id = idOf2(message);
+    if (typeof id !== "string" || excludeIds?.has(id)) continue;
+    if (messageText(message) !== content) continue;
+    const created = createdOf(message) ?? 0;
+    if (best === null || created > best.created) best = { id, created };
+  }
+  return best?.id ?? null;
+}
+async function sendPromptAsync(port, sessionId, content, options, attachments, client, callbacks) {
   const before = await getSessionMessages(port, sessionId, client);
   const knownUserIds = new Set(
-    (before ?? []).filter((m) => roleOf(m) === "user").map((m) => idOf(m)).filter((id) => typeof id === "string")
+    (before ?? []).filter((m) => roleOf2(m) === "user").map((m) => idOf2(m)).filter((id) => typeof id === "string")
   );
+  if (callbacks) {
+    try {
+      callbacks.onKnownUserIds(before === null ? null : knownUserIds);
+    } catch (error2) {
+      callbacks.onKnownUserIdsError(error2);
+    }
+  }
   const parts = [{ type: "text", text: content }];
   let pendingOutcomes = null;
   if (attachments && attachments.inputs.length > 0) {
@@ -2578,22 +2869,10 @@ async function sendPromptAsync(port, sessionId, content, options, attachments, c
   const READ_BACK_DELAY_MS = 150;
   for (let attempt = 0; attempt < READ_BACK_ATTEMPTS; attempt++) {
     const after = await getSessionMessages(port, sessionId, client);
-    if (after) {
-      let best = null;
-      for (const m of after) {
-        if (roleOf(m) !== "user") continue;
-        const id = idOf(m);
-        if (typeof id !== "string" || knownUserIds.has(id)) continue;
-        if (messageText(m) !== content) continue;
-        const created = createdOf(m) ?? 0;
-        if (best === null || created > best.created) {
-          best = { id, created };
-        }
-      }
-      if (best) {
-        if (pendingOutcomes && attachments?.onOutcomes) attachments.onOutcomes(pendingOutcomes);
-        return best.id;
-      }
+    const dispatchedUserMessageId = findDispatchedUserMessageId(after, content, knownUserIds);
+    if (dispatchedUserMessageId !== null) {
+      if (pendingOutcomes && attachments?.onOutcomes) attachments.onOutcomes(pendingOutcomes);
+      return dispatchedUserMessageId;
     }
     if (attempt < READ_BACK_ATTEMPTS - 1) {
       await new Promise((resolve4) => setTimeout(resolve4, READ_BACK_DELAY_MS));
@@ -2604,57 +2883,68 @@ async function sendPromptAsync(port, sessionId, content, options, attachments, c
 function findAssistantReplyAfter(messages, userMessageId) {
   if (!messages || messages.length === 0) return null;
   const byParent = messages.find(
-    (m) => roleOf(m) === "assistant" && parentIdOf(m) === userMessageId
+    (m) => roleOf2(m) === "assistant" && parentIdOf2(m) === userMessageId
   );
   if (byParent) return byParent;
-  const userIndex = messages.findIndex((m) => idOf(m) === userMessageId);
+  const userIndex = messages.findIndex((m) => idOf2(m) === userMessageId);
   if (userIndex === -1) return null;
   for (let i = userIndex + 1; i < messages.length; i++) {
-    if (roleOf(messages[i]) === "assistant") return messages[i];
+    if (roleOf2(messages[i]) === "assistant") return messages[i];
   }
   return null;
 }
 function findLastAssistantReplyFor(messages, userMessageId) {
   if (!messages || messages.length === 0) return null;
   let lastCorrelated = null;
-  let lastNonErrored = null;
   for (let i = messages.length - 1; i >= 0; i--) {
     const m = messages[i];
-    if (roleOf(m) !== "assistant" || parentIdOf(m) !== userMessageId) continue;
-    if (lastCorrelated === null) lastCorrelated = m;
-    if (errorOf(m) == null) {
-      lastNonErrored = m;
-      break;
+    if (roleOf2(m) !== "assistant" || parentIdOf2(m) !== userMessageId) continue;
+    lastCorrelated = m;
+    break;
+  }
+  if (lastCorrelated) {
+    if (errorOf(lastCorrelated) == null) return lastCorrelated;
+    for (let i = messages.length - 1; i >= 0; i--) {
+      const m = messages[i];
+      if (roleOf2(m) === "assistant" && parentIdOf2(m) === userMessageId && isTerminalStopAnswer(m)) {
+        return m;
+      }
     }
+    return lastCorrelated;
   }
-  if (lastCorrelated) return lastNonErrored ?? lastCorrelated;
-  const userIndex = messages.findIndex((m) => idOf(m) === userMessageId);
+  const userIndex = messages.findIndex((m) => idOf2(m) === userMessageId);
   if (userIndex === -1) return null;
   let last = null;
-  let lastOk = null;
+  let lastAssistantIndex = -1;
   for (let i = userIndex + 1; i < messages.length; i++) {
-    const role = roleOf(messages[i]);
+    const role = roleOf2(messages[i]);
     if (role === "user") break;
     if (role === "assistant") {
       last = messages[i];
-      if (errorOf(messages[i]) == null) lastOk = messages[i];
+      lastAssistantIndex = i;
     }
   }
-  return lastOk ?? last;
+  if (last === null || errorOf(last) == null) return last;
+  for (let i = lastAssistantIndex; i > userIndex; i--) {
+    const m = messages[i];
+    if (roleOf2(m) === "user") break;
+    if (roleOf2(m) === "assistant" && isTerminalStopAnswer(m)) return m;
+  }
+  return last;
 }
 function collectSubagentSessions(messages, userMessageId) {
   if (!messages || messages.length === 0) return [];
   const byParent = messages.filter(
-    (message) => roleOf(message) === "assistant" && parentIdOf(message) === userMessageId
+    (message) => roleOf2(message) === "assistant" && parentIdOf2(message) === userMessageId
   );
   const assistants = byParent.length > 0 ? byParent : [];
   if (assistants.length === 0) {
-    const userIndex = messages.findIndex((message) => idOf(message) === userMessageId);
+    const userIndex = messages.findIndex((message) => idOf2(message) === userMessageId);
     if (userIndex === -1) return [];
     for (let i = userIndex + 1; i < messages.length; i++) {
       const message = messages[i];
-      if (roleOf(message) === "user") break;
-      if (roleOf(message) === "assistant") assistants.push(message);
+      if (roleOf2(message) === "user") break;
+      if (roleOf2(message) === "assistant") assistants.push(message);
     }
   }
   const refs = [];
@@ -2694,7 +2984,7 @@ function collectTaskCalls(messages, userMessageId) {
   if (!messages || messages.length === 0) return [];
   const calls = [];
   for (const message of messages) {
-    if (roleOf(message) !== "assistant" || parentIdOf(message) !== userMessageId) continue;
+    if (roleOf2(message) !== "assistant" || parentIdOf2(message) !== userMessageId) continue;
     for (const part of message.parts ?? []) {
       if (part.tool !== "task" || !part.callID || !part.state || part.state.status === "pending") {
         continue;
@@ -2724,7 +3014,7 @@ function attributeTaskCallUsage(messages, windows) {
   for (const window of eligibleWindows) assignments.set(window.callID, []);
   const unattributed = [];
   for (const message of messages ?? []) {
-    if (roleOf(message) !== "assistant") continue;
+    if (roleOf2(message) !== "assistant") continue;
     const created = finiteNumber(createdOf(message));
     const matching = created === null ? [] : eligibleWindows.filter(
       (window) => window.timeStart <= created && (window.timeEnd === null || window.timeEnd === void 0 || created <= window.timeEnd)
@@ -2746,8 +3036,9 @@ function attributeTaskCallUsage(messages, windows) {
 }
 function sumAssistantUsage(messages) {
   if (!messages || messages.length === 0) return null;
-  const nonErrored = messages.filter((message) => errorOf(message) == null);
-  const selected = nonErrored.length > 0 ? nonErrored : messages;
+  const hasTrailingError = errorOf(messages[messages.length - 1]) != null;
+  const hasTerminalStopAnswer = messages.some(isTerminalStopAnswer);
+  const selected = hasTrailingError && hasTerminalStopAnswer ? messages.filter((message) => errorOf(message) == null) : messages;
   let sawAnyUsage = false;
   let inputSum = 0;
   let outputSum = 0;
@@ -2801,13 +3092,11 @@ function sumAssistantUsage(messages) {
 function messageUsage(messages, userMessageId) {
   if (!messages || messages.length === 0) return null;
   const byParentAll = messages.filter(
-    (m) => roleOf(m) === "assistant" && parentIdOf(m) === userMessageId
+    (m) => roleOf2(m) === "assistant" && parentIdOf2(m) === userMessageId
   );
-  const byParentNonErrored = byParentAll.filter((m) => errorOf(m) == null);
-  const byParent = byParentNonErrored.length > 0 ? byParentNonErrored : byParentAll;
   let correlated;
-  if (byParent.length > 0) {
-    correlated = byParent;
+  if (byParentAll.length > 0) {
+    correlated = byParentAll;
   } else {
     const reply = findAssistantReplyAfter(messages, userMessageId);
     correlated = reply ? [reply] : [];
@@ -2817,7 +3106,7 @@ function messageUsage(messages, userMessageId) {
 }
 function messageRunState(messages, userMessageId) {
   if (!messages || messages.length === 0) return "unknown";
-  const hasUser = messages.some((m) => idOf(m) === userMessageId);
+  const hasUser = messages.some((m) => idOf2(m) === userMessageId);
   const reply = findLastAssistantReplyFor(messages, userMessageId);
   if (!hasUser) {
     if (!reply) return "unknown";
@@ -2853,14 +3142,38 @@ function messageError(messages, userMessageId) {
   const reply = findLastAssistantReplyFor(messages, userMessageId);
   const error2 = errorOf(reply);
   if (error2 == null) return null;
-  if (typeof error2 === "string") return error2;
-  if (typeof error2 === "object") {
+  let rendered;
+  if (typeof error2 === "string") {
+    rendered = error2;
+  } else if (typeof error2 === "object") {
     const e = error2;
     const dataMessage = e.data?.message;
-    if (typeof dataMessage === "string") return dataMessage;
-    if (typeof e.message === "string") return e.message;
+    if (typeof dataMessage === "string") {
+      rendered = dataMessage;
+    } else if (typeof e.message === "string") {
+      rendered = e.message;
+    } else {
+      rendered = "The agent run failed.";
+    }
+  } else {
+    rendered = "The agent run failed.";
   }
-  return "The agent run failed.";
+  const toolPart = Array.isArray(reply?.parts) ? reply.parts.find(
+    (part) => part && typeof part === "object" && part.type === "tool" && part.state?.status === "error"
+  ) : void 0;
+  return typeof toolPart?.tool === "string" && toolPart.tool.length > 0 ? `${rendered} (tool "${toolPart.tool}")` : rendered;
+}
+function describeAbandonedReplyShape(messages, userMessageId) {
+  const reply = findLastAssistantReplyFor(messages, userMessageId);
+  if (!reply) return null;
+  const parts = Array.isArray(reply.parts) ? reply.parts : [];
+  const lastTool = [...parts].reverse().find((part) => part?.type === "tool");
+  return {
+    partTypes: parts.slice(-12).map((part) => typeof part?.type === "string" ? part.type : "(unknown)"),
+    droppedPartCount: Math.max(0, parts.length - 12),
+    lastToolName: typeof lastTool?.tool === "string" && lastTool.tool.length > 0 ? lastTool.tool : null,
+    lastToolStatus: typeof lastTool?.state?.status === "string" && lastTool.state.status.length > 0 ? lastTool.state.status : null
+  };
 }
 function isAbortedTerminalReply(messages, userMessageId) {
   const reply = findLastAssistantReplyFor(messages, userMessageId);
@@ -2909,7 +3222,7 @@ function findLatestSubagentAuthOutcome(messages, sinceMs) {
   if (!messages || messages.length === 0) return null;
   for (let i = messages.length - 1; i >= 0; i--) {
     const message = messages[i];
-    if (roleOf(message) !== "assistant") continue;
+    if (roleOf2(message) !== "assistant") continue;
     const created = createdOf(message);
     if (sinceMs !== null && typeof created === "number" && created < sinceMs) continue;
     const failure = classifyReplyAuthError(message);
@@ -2941,25 +3254,25 @@ function applyZeroProviderFallback(classified, hasConfiguredProvider, replyProvi
 function hasRunningAssistantExcept(messages, exceptUserMessageId) {
   if (!messages || messages.length === 0) return false;
   return messages.some(
-    (m) => roleOf(m) === "assistant" && parentIdOf(m) !== exceptUserMessageId && isAssistantInFlight(m)
+    (m) => roleOf2(m) === "assistant" && parentIdOf2(m) !== exceptUserMessageId && isAssistantInFlight(m)
   );
 }
 function hasLaterSiblingTurnStarted(messages, userMessageId, siblingUserMessageIds) {
   if (!messages || messages.length === 0) return false;
-  const userIndex = messages.findIndex((message) => idOf(message) === userMessageId);
+  const userIndex = messages.findIndex((message) => idOf2(message) === userMessageId);
   if (userIndex === -1) return false;
   let hasLaterUser = false;
   let hasStartedLaterUser = false;
   for (let i = userIndex + 1; i < messages.length; i++) {
     const message = messages[i];
-    if (roleOf(message) !== "user") continue;
+    if (roleOf2(message) !== "user") continue;
     hasLaterUser = true;
-    const laterUserMessageId = idOf(message);
+    const laterUserMessageId = idOf2(message);
     if (laterUserMessageId === void 0 || !siblingUserMessageIds.has(laterUserMessageId)) {
       return false;
     }
     if (messages.some(
-      (candidate) => roleOf(candidate) === "assistant" && parentIdOf(candidate) === laterUserMessageId
+      (candidate) => roleOf2(candidate) === "assistant" && parentIdOf2(candidate) === laterUserMessageId
     )) {
       hasStartedLaterUser = true;
     }
@@ -4144,9 +4457,12 @@ function runSynchroniser(args, opts) {
 
 // src/lib/opencode/session-db-boot.ts
 var SESSION_DB_RESTORE_TIMEOUT_MS = 3e5;
-var SESSION_DB_VERIFY_TIMEOUT_MS = 12e4;
+var SESSION_DB_VERIFY_TIMEOUT_MS = 36e4;
 var SESSION_DB_SYNCHRONISER_TIMEOUT_MS = 12e4;
-var SESSION_DB_VERIFY_WALKBACK_BUDGET_SECONDS = 120;
+var SESSION_DB_VERIFY_WALKBACK_BUDGET_SECONDS = 40;
+var SESSION_DB_VERIFY_RESTORE_POINTS_TIMEOUT_SECONDS = 30;
+var SESSION_DB_VERIFY_RESTORE_CANDIDATE_TIMEOUT_SECONDS = 120;
+var SESSION_DB_VERIFY_DISPOSAL_BUDGET_SECONDS = 90;
 function commandError(result) {
   return result.stderr.trim() || `process exited with code ${result.code ?? "null"}`;
 }
@@ -4457,20 +4773,37 @@ async function verifySessionDb(options, configPath, env) {
       timeoutMs: SESSION_DB_VERIFY_TIMEOUT_MS,
       env: {
         ...env,
-        // The synchroniser reads this value in SECONDS. Keep this at 120, not
-        // 120_000, so the walkback gives up before the outer process bound.
+        // The synchroniser reads all four values in SECONDS.
         EVIDENT_SESSION_DB_WALKBACK_BUDGET_SECONDS: String(
           SESSION_DB_VERIFY_WALKBACK_BUDGET_SECONDS
+        ),
+        EVIDENT_SESSION_DB_RESTORE_POINTS_TIMEOUT_SECONDS: String(
+          SESSION_DB_VERIFY_RESTORE_POINTS_TIMEOUT_SECONDS
+        ),
+        EVIDENT_SESSION_DB_RESTORE_CANDIDATE_TIMEOUT_SECONDS: String(
+          SESSION_DB_VERIFY_RESTORE_CANDIDATE_TIMEOUT_SECONDS
+        ),
+        EVIDENT_SESSION_DB_DISPOSAL_BUDGET_SECONDS: String(
+          SESSION_DB_VERIFY_DISPOSAL_BUDGET_SECONDS
         )
       }
     });
     logSynchroniserDiagnostics(result, options);
     if (result.timedOut || result.code === 124 || result.code === 137) {
+      if (result.stderr.includes("SESSION-DB-INTEGRITY-FAILED")) {
+        const reason = result.stderr.includes("SESSION-DB-REPLICA-SIZE") ? "verification_timeout_during_separation" : "verification_timeout_before_separation";
+        options.log(
+          `SESSION-DB-VERIFY-TIMEOUT: verification did not finish within its ${SESSION_DB_VERIFY_TIMEOUT_MS}ms deadline; refusing to start with the restored opencode.db (${reason})`,
+          "error"
+        );
+        reportRecord("verify", "session_db_boot_refused", reason, null, options);
+        return { verifyFatal: true, verifyFatalReason: reason };
+      }
       options.log(
         `SESSION-DB-VERIFY-TIMEOUT: verification did not finish within its ${SESSION_DB_VERIFY_TIMEOUT_MS}ms deadline; continuing with the restored opencode.db as-is, unverified`,
         "warn"
       );
-      return false;
+      return { verifyFatal: false };
     }
     if (result.code === 34) {
       reportRecord(
@@ -4480,14 +4813,14 @@ async function verifySessionDb(options, configPath, env) {
         null,
         options
       );
-      return true;
+      return { verifyFatal: true };
     }
     if (result.code === 33) {
       options.log(
         "SESSION-DB-INTEGRITY-EXHAUSTED: booting continues and litestream still replicates, starting an empty backup chain after the corrupt replica was separated.",
         "warn"
       );
-      return false;
+      return { verifyFatal: false };
     }
     if (result.code !== 0) {
       options.log(
@@ -4495,13 +4828,13 @@ async function verifySessionDb(options, configPath, env) {
         "warn"
       );
     }
-    return false;
+    return { verifyFatal: false };
   }
   options.log(
     "skipping session-DB verification: this boot's session DB was not proven safe to replicate",
     "debug"
   );
-  return false;
+  return { verifyFatal: false };
 }
 function fileExists(path) {
   try {
@@ -4588,7 +4921,7 @@ async function restoreAndVerifySessionDb(options) {
   if (options.noReplicateMarker && fileExists(options.noReplicateMarker)) {
     return { verifyFatal: false };
   }
-  return { verifyFatal: await verifySessionDb(options, configPath, env) };
+  return verifySessionDb(options, configPath, env);
 }
 
 // src/lib/opencode/session-db-provenance.ts
@@ -6369,6 +6702,7 @@ function createSessionStoreHealth(options = {}) {
   const stalenessMs = Math.max(0, options.stalenessMs ?? SESSION_STORE_HEALTH_STALENESS_MS);
   let lastUnwritableAt = null;
   let lastWritableAt = null;
+  const causes = /* @__PURE__ */ new Map();
   return {
     observeUnwritable: () => {
       lastUnwritableAt = now();
@@ -6380,6 +6714,23 @@ function createSessionStoreHealth(options = {}) {
       if (lastUnwritableAt === null) return false;
       if (lastWritableAt !== null && lastWritableAt >= lastUnwritableAt) return false;
       return now() - lastUnwritableAt < stalenessMs;
+    },
+    observeCause: (sessionId, cause) => {
+      if (sessionId === null) return;
+      causes.delete(sessionId);
+      causes.set(sessionId, { cause, observedAt: now() });
+      while (causes.size > 256) {
+        const oldest = causes.keys().next().value;
+        if (typeof oldest !== "string") break;
+        causes.delete(oldest);
+      }
+    },
+    readCause: (sessionId) => {
+      const observed = causes.get(sessionId);
+      if (!observed) return null;
+      causes.delete(sessionId);
+      if (now() - observed.observedAt >= stalenessMs) return null;
+      return observed.cause;
     }
   };
 }
@@ -6840,6 +7191,10 @@ var SUBAGENT_TELEMETRY_FETCH_TIMEOUT_MS = 2e3;
 var SESSION_ERROR_STREAM_HEALTHY_MS = 5e3;
 var SESSION_ERROR_BUFFER_TTL_MS = SESSION_ERROR_STREAM_HEALTHY_MS;
 var MAX_BUFFERED_SESSION_ERRORS = 256;
+var SESSION_ERROR_RETENTION_TTL_MS = 6e4;
+var SESSION_STORE_UNWRITABLE_ERROR = "The runner session database could not be written, so this turn did not finish. Nothing was lost from the queue. Clear disk space and retry.";
+var SESSION_ERROR_RETAINED_DETAIL = "The runner's session database could not be written, so this turn stopped part-way. Runner-observed session error: ";
+var SESSION_ERROR_OBSERVED_CAUSE = "Runner-observed OpenCode session-store cause: ";
 var DEFAULT_PAUSED_POLL_INTERVAL_MS = 2e3;
 var DEFAULT_PAUSED_MAX_WAIT_MS = 10 * 60 * 1e3;
 var DRIVER_SESSION_ENUMERATION_LIMIT = 20;
@@ -6997,6 +7352,7 @@ var ChannelDriver = class _ChannelDriver {
    * with a short TTL so an unmatched session cannot retain an event indefinitely.
    */
   bufferedSessionErrors = /* @__PURE__ */ new Map();
+  retainedSessionErrors = /* @__PURE__ */ new Map();
   /**
    * AUTHORITATIVE local dedup (WI-3): Evident message ids that have been
    * dispatched and are still in-flight. A message in this set is never
@@ -7029,10 +7385,18 @@ var ChannelDriver = class _ChannelDriver {
    * row is `processing` or `pending`; clear it only when absent from both lists.
    */
   untrackableAck = /* @__PURE__ */ new Map();
+  /** Session binding used by the first untrackable-ack report, for retries. */
+  untrackableAckSessionIds = /* @__PURE__ */ new Map();
   /** Messages whose untrackable-ack failure signal was emitted while fenced. */
   untrackableAckSignalled = /* @__PURE__ */ new Set();
   /** Messages whose first untrackable-ack fence warning was already logged. */
   untrackableAckWarned = /* @__PURE__ */ new Set();
+  /**
+   * Accepted V1 prompts whose assigned ids were not read back; these rows are
+   * re-read instead of POSTed again. A null snapshot cannot safely exclude an older
+   * identical-text turn, so it never produces a correlation.
+   */
+  awaitingCorrelation = /* @__PURE__ */ new Map();
   /** Pending rows seen in the current drain, used to retain terminal dispatch fences. */
   pendingMessageIds = /* @__PURE__ */ new Set();
   /**
@@ -7118,21 +7482,6 @@ var ChannelDriver = class _ChannelDriver {
    * re-signal on every one of the 15h of re-dispatch attempts #1110 made.
    */
   dispatchNotStartedSignalled = /* @__PURE__ */ new Map();
-  /**
-   * Consecutive-UNCONFIRMED-dispatch streak for a `pending` row with NO stored
-   * `opencode_message_id` yet — i.e. one that has never even reached the
-   * re-drive fence above. `sendPromptAsync`'s POST may 2xx, but its own
-   * read-back retries can never confirm the assigned id when the session's
-   * message list is PERMANENTLY unreadable (e.g. a corrupted local opencode
-   * SQLite DB, #1345/#1348's exact fault, just hit BEFORE the row is ever
-   * dispatched instead of after). Unlike an already-dispatched row, THIS row has
-   * no other safety net at all: the lifecycle cron only reclaims `status =
-   * 'processing'` rows, and a row stuck here never reaches `processing`. Keyed
-   * by message id, carrying `sessionId` so a session change (a fresh one bound
-   * after abandonment) starts a new streak rather than inheriting the old
-   * session's count — same shape as `redrivePollFailures` above.
-   */
-  unconfirmedDispatchFailures = /* @__PURE__ */ new Map();
   /**
    * Consecutive give-ups for a message whose OpenCode user row remains queued.
    * The session id scopes the count: a fresh session is a new attempt after a
@@ -7150,8 +7499,8 @@ var ChannelDriver = class _ChannelDriver {
    * short-circuits while it is present, so a null-id row is re-dispatched AT MOST
    * ONCE per outstanding read-back. Cleared on a SUCCESSFUL dispatch+read-back (the
    * row is then tracked in `dispatched`, so `readoptOne`'s early skip prevents
-   * re-entry) OR on a failed/unresolved dispatch (the message is genuinely un-sent,
-   * so the NEXT tick may retry exactly once more).
+   * re-entry) OR on a failed/unresolved dispatch (the accepted prompt is handed to
+   * the terminal-report fence and is never sent again).
    */
   awaitingReadopt = /* @__PURE__ */ new Set();
   /**
@@ -7469,6 +7818,49 @@ var ChannelDriver = class _ChannelDriver {
     }
     return ids;
   }
+  /** Find an accepted prompt's user row without adopting an older or concurrent turn. */
+  findAwaitingCorrelationId(entry, sessionId, messages) {
+    if (entry.sessionId !== sessionId || entry.knownUserIds === null) return null;
+    const excludeIds = new Set(entry.knownUserIds);
+    for (const inFlight of this.watchers.get(entry.sessionId)?.inFlight.values() ?? []) {
+      excludeIds.add(inFlight.opencodeMessageId);
+    }
+    return findDispatchedUserMessageId(messages, entry.content, excludeIds);
+  }
+  /** Hand an exhausted accepted-but-untrackable prompt to the terminal-report fence. */
+  async handoffUntrackableCorrelation(conversationId, messageId, sessionId, attempts, source) {
+    this.awaitingCorrelation.delete(messageId);
+    this.awaitingReadopt.delete(messageId);
+    this.sessions.delete(conversationId);
+    this.supersede(conversationId, sessionId);
+    const dispatchDescription = source === "readopt" ? "re-dispatched message" : "message";
+    const errorMessage3 = `OpenCode accepted this ${dispatchDescription} once, but its assigned id was never confirmed after ${attempts} attempts to match it up \u2014 the message was deliberately not sent again, so no duplicate turn was created; session ${sessionId.slice(0, 8)} was abandoned; a fresh one is used for further messages.`;
+    this.untrackableAck.set(messageId, errorMessage3);
+    this.untrackableAckSessionIds.set(messageId, null);
+    this.log({
+      level: "error",
+      message: errorMessage3,
+      conversation_id: conversationId,
+      message_id: messageId
+    });
+    const reportError = await this.reportUntrackableAck(
+      conversationId,
+      messageId,
+      null,
+      errorMessage3
+    );
+    if (reportError !== null) {
+      this.log({
+        level: "warn",
+        message: `markFailed PATCH for message ${messageId.slice(0, 8)} (conversation ${conversationId.slice(0, 8)}) failed: ${reportError.message}`,
+        conversation_id: conversationId,
+        message_id: messageId
+      });
+    }
+    if (source === "readopt") {
+      void this.postSignal(conversationId, messageId, "readopt_orphan_unsent");
+    }
+  }
   /**
    * File-pull work, for `run.ts`'s idle accounting (#559).
    *
@@ -7648,6 +8040,56 @@ var ChannelDriver = class _ChannelDriver {
         }
         break;
       }
+      const correlation = this.awaitingCorrelation.get(message.id);
+      if (correlation) {
+        correlation.attempts += 1;
+        let correlatedId = null;
+        if (correlation.knownUserIds !== null && correlation.sessionId === sessionId) {
+          const polled = await this.pollSessionMessagesForRedrive(
+            conv,
+            message,
+            correlation.sessionId
+          );
+          if (polled.ok)
+            correlatedId = this.findAwaitingCorrelationId(correlation, sessionId, polled.messages);
+        } else if (correlation.knownUserIds === null) {
+          this.log({
+            level: "debug",
+            message: `Message ${message.id.slice(0, 8)} cannot be correlated because its pre-dispatch session list was unreadable`,
+            conversation_id: conv.id,
+            message_id: message.id
+          });
+        }
+        if (correlatedId !== null) {
+          this.awaitingCorrelation.delete(message.id);
+          this.dispatchNotStartedSignalled.delete(message.id);
+          this.releasedOpencodeIds.delete(message.id);
+          this.dispatched.add(message.id);
+          this.registerInFlight(conv, correlation.sessionId, message, correlatedId);
+          dispatched += 1;
+          this.log({
+            level: "info",
+            message: `Matched accepted message ${message.id.slice(0, 8)} to OpenCode turn ${correlatedId.slice(0, 8)} without sending it again`,
+            conversation_id: conv.id,
+            message_id: message.id
+          });
+          void this.postSignal(conv.id, message.id, "ack_correlated", {
+            opencode_message_id: correlatedId
+          });
+          continue;
+        }
+        if (correlation.attempts >= MAX_IDENTICAL_REDRIVE_POLL_FAILURES) {
+          await this.handoffUntrackableCorrelation(
+            conv.id,
+            message.id,
+            correlation.sessionId,
+            correlation.attempts,
+            "fresh"
+          );
+          break;
+        }
+        break;
+      }
       const effectiveOpencodeMessageId = message.opencode_message_id ?? this.releasedOpencodeIds.get(message.id)?.opencodeMessageId ?? null;
       if (effectiveOpencodeMessageId) {
         const outcome = await this.resolveRedrive(
@@ -7669,6 +8111,7 @@ var ChannelDriver = class _ChannelDriver {
         model: message.opencode_model ?? void 0
       };
       let opencodeMessageId;
+      let preDispatchUserIds = null;
       try {
         this.log({
           level: "info",
@@ -7698,7 +8141,20 @@ var ChannelDriver = class _ChannelDriver {
             message.content,
             options,
             sendAttachments,
-            this.openCodeClient
+            this.openCodeClient,
+            {
+              onKnownUserIds: (ids) => {
+                preDispatchUserIds = ids;
+              },
+              onKnownUserIdsError: (error2) => {
+                this.log({
+                  level: "warn",
+                  message: `Pre-dispatch snapshot callback failed for message ${message.id.slice(0, 8)}: ${error2 instanceof Error ? error2.message : String(error2)}`,
+                  conversation_id: conv.id,
+                  message_id: message.id
+                });
+              }
+            }
           )
         );
       } catch (err) {
@@ -7706,6 +8162,7 @@ var ChannelDriver = class _ChannelDriver {
         if (this.isV2 && err instanceof OpenCodeV2PromptAckError) {
           const errorMessage4 = err instanceof Error ? err.message : String(err);
           this.untrackableAck.set(message.id, errorMessage4);
+          this.untrackableAckSessionIds.set(message.id, null);
           this.log({
             level: "error",
             message: `V2 prompt dispatch for message ${message.id.slice(0, 8)} failed after a positive ack with no usable id: ${errorMessage4}`,
@@ -7781,39 +8238,21 @@ var ChannelDriver = class _ChannelDriver {
         if (this.isV2) {
           throw new Error("V2 prompt dispatch completed without an acknowledged message id");
         }
-        const streak = this.recordUnconfirmedDispatch(message.id, sessionId);
-        if (streak < MAX_IDENTICAL_REDRIVE_POLL_FAILURES) {
-          this.log({
-            level: "warn",
-            message: `Message ${message.id.slice(0, 8)} dispatched but its opencode id could not be read back (${streak}/${MAX_IDENTICAL_REDRIVE_POLL_FAILURES}) \u2014 leaving un-tracked to retry next tick`,
-            conversation_id: conv.id,
-            message_id: message.id
-          });
-          this.signalDispatchNotStarted(conv, message, "readback_unconfirmed");
-          continue;
-        }
-        this.unconfirmedDispatchFailures.delete(message.id);
-        this.sessions.delete(conv.id);
-        this.supersede(conv.id, sessionId);
-        const errorMessage3 = `OpenCode accepted this message ${streak} times in a row but never confirmed its assigned id (session ${sessionId.slice(0, 8)}'s message list could not be read back) \u2014 the session was abandoned; a fresh one is used for further messages.`;
+        this.awaitingCorrelation.set(message.id, {
+          sessionId,
+          content: message.content,
+          attempts: 0,
+          knownUserIds: preDispatchUserIds
+        });
         this.log({
-          level: "error",
-          message: errorMessage3,
+          level: "warn",
+          message: `OpenCode accepted message ${message.id.slice(0, 8)}, but its assigned id could not be read back \u2014 the message will not be sent again while the runner matches it to the turn already running`,
           conversation_id: conv.id,
           message_id: message.id
         });
-        await this.markFailed(conv.id, message.id, null, errorMessage3).catch((markErr) => {
-          this.log({
-            level: "warn",
-            message: `markFailed PATCH for message ${message.id.slice(0, 8)} (conversation ${conv.id.slice(0, 8)}) failed (best-effort, not retried): ${markErr instanceof Error ? markErr.message : String(markErr)}`,
-            conversation_id: conv.id,
-            message_id: message.id
-          });
-          this.signalDispatchNotStarted(conv, message, "abandon_unreported");
-        });
+        this.signalDispatchNotStarted(conv, message, "readback_unconfirmed");
         break;
       }
-      this.unconfirmedDispatchFailures.delete(message.id);
       this.dispatchNotStartedSignalled.delete(message.id);
       this.releasedOpencodeIds.delete(message.id);
       this.dispatched.add(message.id);
@@ -8418,23 +8857,6 @@ var ChannelDriver = class _ChannelDriver {
     this.redrivePollFailures.set(messageId, { sessionId, signature, count: 1 });
     return 1;
   }
-  /**
-   * Record one UNCONFIRMED-dispatch outcome (a `pending` row with no stored
-   * `opencode_message_id` whose `sendPromptAsync` returned `null`) toward the
-   * bound in `processConversation`'s dispatch loop, and return the resulting
-   * count. Mirrors `recordRedrivePollFailure`'s session-scoping: a session
-   * change starts a fresh streak at `1` rather than inheriting the old one's
-   * count, since a new session is a genuinely different attempt.
-   */
-  recordUnconfirmedDispatch(messageId, sessionId) {
-    const existing = this.unconfirmedDispatchFailures.get(messageId);
-    if (existing && existing.sessionId === sessionId) {
-      existing.count += 1;
-      return existing.count;
-    }
-    this.unconfirmedDispatchFailures.set(messageId, { sessionId, count: 1 });
-    return 1;
-  }
   /** Record one queued give-up toward the never-started bound. */
   recordNeverStartedAttempt(messageId, sessionId) {
     const existing = this.neverStartedAttempts.get(messageId);
@@ -8746,6 +9168,7 @@ var ChannelDriver = class _ChannelDriver {
       b2LastDescendantCheckMs: 0,
       b2RootOngoingHeldLogged: false,
       b2AbandonedSignalled: false,
+      b2AbandonedWithoutAnswer: false,
       ambiguousPinnedSinceMs: 0,
       ambiguousResolved: false,
       sessionStoreFailurePending: false,
@@ -8770,6 +9193,28 @@ var ChannelDriver = class _ChannelDriver {
       this.bufferedSessionErrors.delete(oldest);
     }
   }
+  retainSessionError(event) {
+    this.retainedSessionErrors.delete(event.sessionId);
+    this.retainedSessionErrors.set(event.sessionId, {
+      reason: event.reason,
+      observedAt: this.now()
+    });
+    while (this.retainedSessionErrors.size > MAX_BUFFERED_SESSION_ERRORS) {
+      const oldest = this.retainedSessionErrors.keys().next().value;
+      if (typeof oldest !== "string") break;
+      this.retainedSessionErrors.delete(oldest);
+    }
+  }
+  readRetainedSessionError(sessionId) {
+    const retained = this.retainedSessionErrors.get(sessionId);
+    if (!retained) return null;
+    if (this.now() - retained.observedAt >= SESSION_ERROR_RETENTION_TTL_MS) {
+      this.retainedSessionErrors.delete(sessionId);
+      return null;
+    }
+    this.retainedSessionErrors.delete(sessionId);
+    return retained.reason;
+  }
   /**
    * Build a fresh `SessionWatcher`. Seeds `lastTickAt`/`lastObservedTickAt`
    * EQUAL (#1618) so a watcher whose loop has not started ticking yet is never
@@ -8865,6 +9310,7 @@ var ChannelDriver = class _ChannelDriver {
       b2LastDescendantCheckMs: 0,
       b2RootOngoingHeldLogged: false,
       b2AbandonedSignalled: false,
+      b2AbandonedWithoutAnswer: false,
       ambiguousPinnedSinceMs: 0,
       ambiguousResolved: false,
       sessionStoreFailurePending: false,
@@ -9095,9 +9541,10 @@ var ChannelDriver = class _ChannelDriver {
         return;
       }
       if ([...watcher.inFlight.values()].some((message) => message.started && !message.done)) {
+        this.retainSessionError(event);
         this.log({
-          level: "debug",
-          message: `A turn is already running in session ${event.sessionId.slice(0, 8)} \u2014 deferring to transcript polling`,
+          level: "warn",
+          message: `A turn is already running in session ${event.sessionId.slice(0, 8)} \u2014 retaining the session error and deferring to transcript polling: ${event.reason}`,
           conversation_id: watcher.conv.id
         });
         return;
@@ -9127,9 +9574,10 @@ var ChannelDriver = class _ChannelDriver {
       const messages = await this.getSessionMessages(event.sessionId);
       const state = messageRunState(messages, inFlight.opencodeMessageId);
       if (state !== "queued") {
+        this.retainSessionError(event);
         this.log({
-          level: "debug",
-          message: `Session error for message ${inFlight.evidentMessageId.slice(0, 8)} observed state ${state}; leaving it to transcript polling`,
+          level: "warn",
+          message: `Session error for message ${inFlight.evidentMessageId.slice(0, 8)} in session ${event.sessionId.slice(0, 8)} observed state ${state}; retaining the reason for transcript polling: ${event.reason}`,
           conversation_id: watcher.conv.id,
           message_id: inFlight.evidentMessageId
         });
@@ -9358,7 +9806,16 @@ var ChannelDriver = class _ChannelDriver {
     if (state === "failed") {
       this.anchorDeliveryDeadline(inFlight);
       if (!inFlight.done) {
-        const error2 = messageError(messages, inFlight.opencodeMessageId) ?? void 0;
+        const messageErrorText = messageError(messages, inFlight.opencodeMessageId);
+        const retainedReason = this.readRetainedSessionError(sessionId);
+        const retainedError = retainedReason === null ? null : `${SESSION_ERROR_RETAINED_DETAIL}${retainedReason}`;
+        const observedCause = this.sessionStoreHealth?.readCause(sessionId);
+        const causeError = observedCause === null || observedCause === void 0 ? null : `${SESSION_ERROR_OBSERVED_CAUSE}${observedCause}`;
+        const storeError = this.sessionStoreHealth?.isUnwritable() ? SESSION_STORE_UNWRITABLE_ERROR : null;
+        const runnerDetails = [retainedError, causeError, storeError].filter(
+          (detail) => detail !== null
+        );
+        const error2 = messageErrorText === null ? runnerDetails.length === 0 ? void 0 : runnerDetails.join(" ") : [messageErrorText, ...runnerDetails].join(" ");
         this.log({
           level: "error",
           message: `Message ${inFlight.evidentMessageId.slice(0, 8)} errored \u2014 marking failed: ${error2 ?? "(no error text)"}`,
@@ -9444,10 +9901,22 @@ var ChannelDriver = class _ChannelDriver {
         inFlight.b2LastDescendantCheckMs = 0;
         inFlight.b2RootOngoingHeldLogged = false;
         inFlight.b2AbandonedSignalled = false;
+        inFlight.b2AbandonedWithoutAnswer = false;
       }
     } else {
       if (inFlight.b2AbandonedSignalled) {
-        await this.settleMessageDone(sessionId, watcher, inFlight, messages);
+        if (inFlight.b2AbandonedWithoutAnswer) {
+          const reply = findLastAssistantReplyFor(messages, inFlight.opencodeMessageId);
+          await this.settleMessageAbandonedWithoutAnswer(
+            sessionId,
+            watcher,
+            inFlight,
+            messages,
+            reply?.info?.finish ?? reply?.finish
+          );
+        } else {
+          await this.settleMessageDone(sessionId, watcher, inFlight, messages);
+        }
         return;
       }
       if (inFlight.b2PinnedSinceMs === 0) inFlight.b2PinnedSinceMs = this.now();
@@ -9475,16 +9944,36 @@ var ChannelDriver = class _ChannelDriver {
             return;
           }
           inFlight.b2AbandonedSignalled = true;
+          const reply = findLastAssistantReplyFor(messages, inFlight.opencodeMessageId);
+          const finish = reply?.info?.finish ?? reply?.finish;
+          if (extractReplyTextForMessage(messages, inFlight.opencodeMessageId) === null) {
+            inFlight.b2AbandonedWithoutAnswer = true;
+            void this.postSignal(conv.id, id, "b2_abandoned_resolved", {
+              watched_for_ms: pinnedForMs,
+              run_state: "failed",
+              finish,
+              ...rootOngoing != null ? { root_ongoing: rootOngoing } : {},
+              ...descendantOngoing != null ? { descendant_ongoing: descendantOngoing } : {},
+              opencode_message_id: inFlight.opencodeMessageId
+            });
+            await this.settleMessageAbandonedWithoutAnswer(
+              sessionId,
+              watcher,
+              inFlight,
+              messages,
+              finish
+            );
+            return;
+          }
           this.log({
             level: "warn",
             message: `Message ${id.slice(0, 8)} b2-pinned for ${Math.round(pinnedForMs / 1e3)}s with no ongoing descendant sub-agent session (status-map confirmed) \u2014 treating the delegated/tool turn as abandoned, resolving done`,
             conversation_id: conv.id,
             message_id: id
           });
-          const reply = findLastAssistantReplyFor(messages, inFlight.opencodeMessageId);
           void this.postSignal(conv.id, id, "b2_abandoned_resolved", {
             watched_for_ms: pinnedForMs,
-            finish: reply?.info?.finish ?? reply?.finish,
+            finish,
             ...rootOngoing != null ? { root_ongoing: rootOngoing } : {},
             ...descendantOngoing != null ? { descendant_ongoing: descendantOngoing } : {},
             opencode_message_id: inFlight.opencodeMessageId
@@ -9766,6 +10255,76 @@ var ChannelDriver = class _ChannelDriver {
     }
     this.removeInFlight(watcher, inFlight.evidentMessageId);
   }
+  /** Report a confirmed b2 abandonment that produced no answer text. */
+  async settleMessageAbandonedWithoutAnswer(sessionId, watcher, inFlight, messages, finish) {
+    const conv = watcher.conv;
+    const legacyError = `OpenCode ended this turn after a tool call (finish="${finish ?? "(unknown)"}") without writing an answer, and confirmed it is no longer working on this conversation. Evident is reporting the run as failed so the failure and its reason are visible in failed runs.`;
+    const replyShape = describeAbandonedReplyShape(messages, inFlight.opencodeMessageId);
+    const error2 = replyShape === null ? legacyError : `${legacyError} ${replyShape.lastToolName === null ? "No tool call was recorded" : `The last tool call was "${replyShape.lastToolName}" with status "${replyShape.lastToolStatus ?? "(unknown)"}"`}; the reply's final part types were [${replyShape.partTypes.join(", ")}]${replyShape.droppedPartCount > 0 ? ` (${replyShape.droppedPartCount} earlier part types omitted)` : ""}.`;
+    this.anchorDeliveryDeadline(inFlight);
+    this.log({
+      level: "warn",
+      message: `Message ${inFlight.evidentMessageId.slice(0, 8)} was abandoned without an answer \u2014 ${error2}`,
+      conversation_id: conv.id,
+      message_id: inFlight.evidentMessageId
+    });
+    const usage = messageUsage(messages, inFlight.opencodeMessageId);
+    const usageAgentName = this.usageAgentName(messages ?? [], inFlight.opencodeMessageId);
+    const subagentInvocations = await this.resolveSubagentInvocations(
+      messages,
+      inFlight.opencodeMessageId,
+      inFlight.evidentMessageId
+    );
+    try {
+      await this.markFailed(
+        conv.id,
+        inFlight.evidentMessageId,
+        sessionId,
+        error2,
+        usage,
+        void 0,
+        usageAgentName,
+        subagentInvocations
+      );
+    } catch (err) {
+      if (err instanceof ChannelAuthError) throw err;
+      if (err instanceof ChannelTerminalError) {
+        this.log({
+          level: "warn",
+          message: `Failed to report abandoned no-answer message ${inFlight.evidentMessageId.slice(0, 8)} as failed (terminal HTTP ${err.status}) \u2014 leaving it for the cron safety net: ${err.message}`,
+          conversation_id: conv.id,
+          message_id: inFlight.evidentMessageId
+        });
+        this.removeInFlight(watcher, inFlight.evidentMessageId);
+        return;
+      }
+      if (this.now() >= inFlight.deadline) {
+        this.log({
+          level: "warn",
+          message: `Failed to report abandoned no-answer message ${inFlight.evidentMessageId.slice(0, 8)} as failed within the delivery window \u2014 leaving it for the cron safety net: ${err instanceof Error ? err.message : String(err)}`,
+          conversation_id: conv.id,
+          message_id: inFlight.evidentMessageId
+        });
+        this.removeInFlight(watcher, inFlight.evidentMessageId);
+        return;
+      }
+      this.log({
+        level: "warn",
+        message: `Failed to report abandoned no-answer message ${inFlight.evidentMessageId.slice(0, 8)} as failed (will retry next tick): ${err instanceof Error ? err.message : String(err)}`,
+        conversation_id: conv.id,
+        message_id: inFlight.evidentMessageId
+      });
+      return;
+    }
+    inFlight.done = true;
+    await this.reportSubagentAuthFailures(
+      watcher.conv.id,
+      inFlight.opencodeMessageId,
+      inFlight.evidentMessageId,
+      messages
+    );
+    this.removeInFlight(watcher, inFlight.evidentMessageId);
+  }
   /**
    * Report a queued message as failed after the never-started bound. The accepted
    * OpenCode copy is not cancelled, so the local fence remains on unsuccessful
@@ -9828,7 +10387,7 @@ var ChannelDriver = class _ChannelDriver {
    */
   async settleMessageSessionStoreUnwritable(sessionId, watcher, inFlight) {
     const conv = watcher.conv;
-    const error2 = "The runner session database could not be written, so this turn did not finish. Nothing was lost from the queue. Clear disk space and retry.";
+    const error2 = SESSION_STORE_UNWRITABLE_ERROR;
     this.log({
       level: "error",
       message: `Message ${inFlight.evidentMessageId.slice(0, 8)} was not resolved as done: ${error2}`,
@@ -9919,11 +10478,22 @@ var ChannelDriver = class _ChannelDriver {
         }
       }
     }
-    if (this.untrackableAck.size > 0 || this.neverStartedAttempts.size > 0) {
+    if (this.untrackableAck.size > 0 || this.neverStartedAttempts.size > 0 || this.awaitingCorrelation.size > 0) {
       const stillProcessing = new Set(rows.map((r) => r.id));
+      for (const id of this.awaitingCorrelation.keys()) {
+        if (!stillProcessing.has(id) && !this.pendingMessageIds.has(id)) {
+          this.awaitingCorrelation.delete(id);
+          this.log({
+            level: "debug",
+            message: `Re-adopt: message ${id.slice(0, 8)} left processing and pending \u2014 cleared awaiting-correlation fence`,
+            message_id: id
+          });
+        }
+      }
       for (const id of [...this.untrackableAck.keys()]) {
         if (!stillProcessing.has(id) && !this.pendingMessageIds.has(id)) {
           this.untrackableAck.delete(id);
+          this.untrackableAckSessionIds.delete(id);
           this.untrackableAckSignalled.delete(id);
           this.untrackableAckWarned.delete(id);
           this.log({
@@ -9963,7 +10533,7 @@ var ChannelDriver = class _ChannelDriver {
       bySession.set(row.opencode_session_id, list);
     }
     for (const [sessionId, sessionRows] of bySession) {
-      let messages;
+      let messages = null;
       try {
         if (this.isV2) {
           const snapshot = await this.getSessionMessages(sessionId);
@@ -9972,9 +10542,9 @@ var ChannelDriver = class _ChannelDriver {
               level: "warn",
               message: `Re-adopt: polling session ${sessionId.slice(0, 8)} returned an unreadable message snapshot \u2014 skipping this session this tick`
             });
-            continue;
+          } else {
+            messages = snapshot;
           }
-          messages = snapshot;
         } else {
           const polled = await pollSessionMessagesForRedrive(
             this.port,
@@ -9987,15 +10557,22 @@ var ChannelDriver = class _ChannelDriver {
               level: "warn",
               message: `Re-adopt: polling session ${sessionId.slice(0, 8)} returned ${polled.malformed ? "a non-array message body" : `HTTP ${polled.status ?? "a network error"}${normalized ? `: ${normalized}` : ""}`} \u2014 skipping this session this tick`
             });
-            continue;
+          } else {
+            messages = polled.messages;
           }
-          messages = polled.messages;
         }
       } catch (err) {
         this.log({
           level: "warn",
           message: `Re-adopt: failed to poll session ${sessionId.slice(0, 8)} (will retry next drain): ${err instanceof Error ? err.message : String(err)}`
         });
+      }
+      if (messages === null) {
+        for (const row of sessionRows) {
+          if (this.awaitingCorrelation.has(row.id)) {
+            await this.advanceReadoptCorrelation(sessionId, row, null);
+          }
+        }
         continue;
       }
       const anyUntracked = sessionRows.some((row) => !this.isTracked(sessionId, row.id));
@@ -10005,6 +10582,59 @@ var ChannelDriver = class _ChannelDriver {
       }
     }
   }
+  /** Advance a re-adopted accepted prompt through the shared correlation fence. */
+  async advanceReadoptCorrelation(sessionId, row, messages) {
+    const correlation = this.awaitingCorrelation.get(row.id);
+    if (!correlation) return false;
+    correlation.attempts += 1;
+    const correlatedId = messages === null ? null : this.findAwaitingCorrelationId(correlation, sessionId, messages);
+    if (correlatedId !== null) {
+      this.awaitingCorrelation.delete(row.id);
+      const conv = this.convForRow(sessionId, row);
+      const message = this.queuedMessageForRow(row);
+      const processedAtMs = this.processedAtMs(row);
+      this.registerReadopted(conv, sessionId, message, correlatedId, processedAtMs, processedAtMs);
+      this.dispatched.add(row.id);
+      this.readopted.add(row.id);
+      this.ensureWatcherRunning(sessionId);
+      this.log({
+        level: "info",
+        message: `Re-adopt: matched accepted message ${row.id.slice(0, 8)} to OpenCode turn ${correlatedId.slice(0, 8)} without sending it again`,
+        conversation_id: row.conversation_id,
+        message_id: row.id
+      });
+      void this.postSignal(row.conversation_id, row.id, "readopt_redispatched");
+      void this.postSignal(row.conversation_id, row.id, "ack_correlated", {
+        opencode_message_id: correlatedId
+      });
+      return true;
+    }
+    if (correlation.knownUserIds === null) {
+      this.log({
+        level: "debug",
+        message: `Re-adopt: message ${row.id.slice(0, 8)} cannot be correlated because its pre-dispatch session list was unreadable`,
+        conversation_id: row.conversation_id,
+        message_id: row.id
+      });
+    } else if (correlation.sessionId !== sessionId) {
+      this.log({
+        level: "warn",
+        message: `Re-adopt: message ${row.id.slice(0, 8)} moved from original session ${correlation.sessionId.slice(0, 8)} to ${sessionId.slice(0, 8)} while awaiting correlation \u2014 refusing to adopt a turn from the rebound session`,
+        conversation_id: row.conversation_id,
+        message_id: row.id
+      });
+    }
+    if (correlation.attempts >= MAX_IDENTICAL_REDRIVE_POLL_FAILURES) {
+      await this.handoffUntrackableCorrelation(
+        row.conversation_id,
+        row.id,
+        correlation.sessionId,
+        correlation.attempts,
+        "readopt"
+      );
+    }
+    return true;
+  }
   /**
    * Re-adopt ONE `processing` row against the tick's session message snapshot
    * (ADR-0046 Decision §1/§2). Idempotent: skips a row already being driven.
@@ -10012,8 +10642,10 @@ var ChannelDriver = class _ChannelDriver {
    * Branches on `messageRunState(messages, row.opencode_message_id)` — the
    * opencode-assigned user-message id persisted on the first `processing` PATCH
    * (#218). A row with a NULL stored id (dispatched but the read-back never landed
-   * before the restart) has no id to correlate → treated as an orphan and
-   * re-dispatched (at most once, see `forceReadoptRun`):
+   * before the restart) is first offered to an awaiting-correlation fence recorded
+   * by this process; without that fence, it has no id to correlate after restart
+   * and is treated as an orphan and re-dispatched (at most once, see
+   * `forceReadoptRun`):
    *   - `done`             → `markDone` now (guarded like the watcher's done branch);
    *   - `failed`           → `markFailed` with the surfaced error (issue #182), so an
    *                          errored turn is reported failed on restart, NOT re-dispatched —
@@ -10022,7 +10654,8 @@ var ChannelDriver = class _ChannelDriver {
    *                          re-dispatched instead (issue #1310, see the branch below);
    *   - `running`/`queued` → re-attach a watcher via `registerReadopted` (no re-dispatch),
    *                          tracking the stored id so the reply correlates by it;
-   *   - `unknown`/null id  → re-dispatch (opencode assigns a fresh id) + attach a watcher.
+   *   - `unknown`/null id  → correlate through an awaiting fence when present;
+   *                          otherwise re-dispatch (opencode assigns a fresh id) + attach a watcher.
    *
    * Only `ChannelAuthError` propagates.
    */
@@ -10036,6 +10669,7 @@ var ChannelDriver = class _ChannelDriver {
       });
       return;
     }
+    if (await this.advanceReadoptCorrelation(sessionId, row, messages)) return;
     const ocId = row.opencode_message_id;
     const state = messageRunState(messages, ocId ?? "");
     if (state === "done") {
@@ -10102,12 +10736,48 @@ var ChannelDriver = class _ChannelDriver {
       await this.reportSubagentAuthFailures(row.conversation_id, ocId ?? "", row.id, messages);
       this.dontRedispatch.delete(row.id);
       this.untrackableAck.delete(row.id);
+      this.untrackableAckSessionIds.delete(row.id);
       this.untrackableAckSignalled.delete(row.id);
       this.untrackableAckWarned.delete(row.id);
       void this.postSignal(row.conversation_id, row.id, "readopt_failed");
       return;
     }
-    if (this.dontRedispatch.has(row.id) || this.untrackableAck.has(row.id)) {
+    if (this.untrackableAck.has(row.id)) {
+      if (this.untrackableAckSignalled.has(row.id)) {
+        const firstFenceWarning = !this.untrackableAckWarned.has(row.id);
+        this.untrackableAckWarned.add(row.id);
+        this.log({
+          level: firstFenceWarning ? "warn" : "debug",
+          message: `Re-adopt: message ${row.id.slice(0, 8)} is fenced after an untrackable OpenCode turn \u2014 skipping re-dispatch and retrying the terminal report`,
+          conversation_id: row.conversation_id,
+          message_id: row.id
+        });
+        const errorMessage3 = this.untrackableAck.get(row.id);
+        const reportError = await this.reportUntrackableAck(
+          row.conversation_id,
+          row.id,
+          this.untrackableAckSessionIds.get(row.id) ?? null,
+          errorMessage3
+        );
+        if (reportError !== null) {
+          this.log({
+            level: "warn",
+            message: `Re-adopt: failed to report untrackable message ${row.id.slice(0, 8)} (will retry next drain): ${reportError.message}`,
+            conversation_id: row.conversation_id,
+            message_id: row.id
+          });
+        }
+      } else {
+        this.log({
+          level: "debug",
+          message: `Re-adopt: message ${row.id.slice(0, 8)} already gave up \u2014 left to the cron; skipping until it leaves processing`,
+          conversation_id: row.conversation_id,
+          message_id: row.id
+        });
+      }
+      return;
+    }
+    if (this.dontRedispatch.has(row.id)) {
       this.log({
         level: "debug",
         message: `Re-adopt: message ${row.id.slice(0, 8)} already gave up \u2014 left to the cron; skipping until it leaves processing`,
@@ -10285,6 +10955,7 @@ var ChannelDriver = class _ChannelDriver {
     }
     this.dontRedispatch.delete(row.id);
     this.untrackableAck.delete(row.id);
+    this.untrackableAckSessionIds.delete(row.id);
     this.untrackableAckSignalled.delete(row.id);
     this.untrackableAckWarned.delete(row.id);
     void this.postSignal(row.conversation_id, row.id, "readopt_done");
@@ -10304,8 +10975,9 @@ var ChannelDriver = class _ChannelDriver {
    * latch makes a null-id row re-dispatched AT MOST ONCE per outstanding read-back:
    * short-circuit while the row is latched; clear it on a successful dispatch (the
    * row is then tracked in `dispatched`, so `readoptOne`'s early skip prevents
-   * re-entry) OR on a failed/unresolved dispatch (genuinely un-sent → the next tick
-   * may retry exactly once more).
+   * re-entry) or when the dispatch itself failed before acceptance. An accepted V1
+   * dispatch whose id is not readable enters the bounded correlation fence instead
+   * of retrying; exhaustion hands it to `untrackableAck`.
    *
    * `evidentMessageId = row.id` addresses the SERVER row. Deadline anchored to
    * `processed_at` (Invariant 1).
@@ -10368,6 +11040,7 @@ var ChannelDriver = class _ChannelDriver {
       );
     }
     let ocId;
+    let preDispatchUserIds = null;
     try {
       ocId = this.isV2 ? await sendV2Prompt(this.openCodeClient, sessionId, row.content) : await this.dispatchLocked(
         sessionId,
@@ -10377,7 +11050,20 @@ var ChannelDriver = class _ChannelDriver {
           row.content,
           options,
           sendAttachments,
-          this.openCodeClient
+          this.openCodeClient,
+          {
+            onKnownUserIds: (ids) => {
+              preDispatchUserIds = ids;
+            },
+            onKnownUserIdsError: (error2) => {
+              this.log({
+                level: "warn",
+                message: `Pre-dispatch snapshot callback failed for message ${row.id.slice(0, 8)}: ${error2 instanceof Error ? error2.message : String(error2)}`,
+                conversation_id: row.conversation_id,
+                message_id: row.id
+              });
+            }
+          }
         )
       );
     } catch (err) {
@@ -10410,6 +11096,7 @@ var ChannelDriver = class _ChannelDriver {
           }
         } else {
           this.untrackableAck.set(row.id, errorMessage3);
+          this.untrackableAckSessionIds.set(row.id, sessionId);
         }
         this.log({
           level: "error",
@@ -10458,39 +11145,20 @@ var ChannelDriver = class _ChannelDriver {
     }
     if (ocId === null) {
       this.awaitingReadopt.delete(row.id);
-      const streak = this.recordUnconfirmedDispatch(row.id, sessionId);
-      if (streak >= MAX_IDENTICAL_REDRIVE_POLL_FAILURES) {
-        this.unconfirmedDispatchFailures.delete(row.id);
-        this.sessions.delete(readoptConv.id);
-        this.supersede(readoptConv.id, sessionId);
-        const errorMessage3 = `OpenCode accepted this re-dispatched message ${streak} times in a row but never confirmed its assigned id (session ${sessionId.slice(0, 8)}'s message list could not be read back) \u2014 the session was abandoned; a fresh one is used for further messages.`;
-        this.log({
-          level: "error",
-          message: errorMessage3,
-          conversation_id: row.conversation_id,
-          message_id: row.id
-        });
-        await this.markFailed(row.conversation_id, row.id, null, errorMessage3).catch((markErr) => {
-          this.log({
-            level: "warn",
-            message: `markFailed PATCH for message ${row.id.slice(0, 8)} (conversation ${row.conversation_id.slice(0, 8)}) failed (best-effort, not retried): ${markErr instanceof Error ? markErr.message : String(markErr)}`,
-            conversation_id: row.conversation_id,
-            message_id: row.id
-          });
-        });
-        void this.postSignal(row.conversation_id, row.id, "readopt_orphan_unsent");
-        return;
-      }
+      this.awaitingCorrelation.set(row.id, {
+        sessionId,
+        content: row.content,
+        attempts: 0,
+        knownUserIds: preDispatchUserIds
+      });
       this.log({
         level: "warn",
-        message: `Re-adopt: message ${row.id.slice(0, 8)} re-dispatched but its opencode id could not be read back (${streak}/${MAX_IDENTICAL_REDRIVE_POLL_FAILURES}) \u2014 leaving un-tracked to retry next drain`,
+        message: `Re-adopt: OpenCode accepted message ${row.id.slice(0, 8)}, but its assigned id could not be read back \u2014 the message will not be sent again while the runner matches it to the turn already running`,
         conversation_id: row.conversation_id,
         message_id: row.id
       });
-      void this.postSignal(row.conversation_id, row.id, "readopt_orphan_unsent");
       return;
     }
-    this.unconfirmedDispatchFailures.delete(row.id);
     const processedAtMs = this.processedAtMs(row);
     this.registerReadopted(
       readoptConv,
@@ -13969,6 +14637,34 @@ async function run(options) {
     } else {
       log2(state, "Not running in a MicroVM (MICROVM_ID unset) \u2014 nothing to report", "debug");
     }
+    if (options.restoreRunnerCredentials || options.credentialSyncMarker) {
+      const logCredentialVaultResolution = (message, level) => {
+        log2(state, message, level);
+        if (state.interactive && !state.json) {
+          logActivity(state, { type: "info", level, message });
+        }
+      };
+      const vaultResolution = await getRunnerCredentialVault(state.agentId, state.authHeader);
+      if (vaultResolution.error) {
+        delete process.env.CREDENTIAL_VAULT_PREFIX;
+        logCredentialVaultResolution(
+          `CREDENTIAL-VAULT-LOOKUP-FAILED: ${vaultResolution.error}; credentials will be read from and written to this runner's own prefix this boot`,
+          "warn"
+        );
+      } else if (vaultResolution.prefix !== null && vaultResolution.vaultId !== null && vaultResolution.source !== null) {
+        process.env.CREDENTIAL_VAULT_PREFIX = vaultResolution.prefix;
+        logCredentialVaultResolution(
+          `CREDENTIAL-VAULT: source=${vaultResolution.source} vault=${vaultResolution.vaultId} prefix=${vaultResolution.prefix}`,
+          "info"
+        );
+      } else {
+        delete process.env.CREDENTIAL_VAULT_PREFIX;
+        logCredentialVaultResolution(
+          "CREDENTIAL-VAULT-NONE: this runner is not linked to a credential vault; using its own prefix",
+          "debug"
+        );
+      }
+    }
     if (options.restoreRunnerCredentials) {
       log2(state, "Restoring runner credentials before starting OpenCode");
       const credentialContext = {
@@ -13991,7 +14687,12 @@ async function run(options) {
         agentId: state.agentId,
         authHeader: state.authHeader
       }),
-      state.sessionStoreHealth.observeUnwritable
+      ({ isDiskFailure, sessionId, cause }) => {
+        if (isDiskFailure) state.sessionStoreHealth.observeUnwritable();
+        if (cause !== null && sessionId !== null) {
+          state.sessionStoreHealth.observeCause(sessionId, cause);
+        }
+      }
     );
     const openCodeLogTail = tailOpenCodeLogFile(
       resolveOpenCodeLogPath(homedir7(), process.env),
@@ -14002,22 +14703,27 @@ async function run(options) {
       openCodeLogTail.stop();
     };
     let sessionDbVerifyFatal = false;
+    let sessionDbVerifyFatalReason;
     if (!options.restoreSessionDb) {
-      log2(state, "Skipping session-DB restore: --restore-session-db was not passed", "debug");
+      logActivity(state, {
+        type: "info",
+        level: "warn",
+        message: "SESSION-DB-VERIFY-SKIPPED: reason=flag-absent \u2014 Skipping session-DB restore: --restore-session-db was not passed"
+      });
     } else {
       const health = await checkOpenCodeHealth(state.port);
       if (health.healthy) {
-        log2(
-          state,
-          "Skipping session-DB restore: OpenCode is already serving this database",
-          "debug"
-        );
+        logActivity(state, {
+          type: "info",
+          level: "warn",
+          message: "SESSION-DB-VERIFY-SKIPPED: reason=opencode-serving \u2014 Skipping session-DB restore: OpenCode is already serving this database"
+        });
       } else if (health.authFailed) {
-        log2(
-          state,
-          "Skipping session-DB restore: OpenCode answered with an authentication challenge; assuming this database is in use",
-          "debug"
-        );
+        logActivity(state, {
+          type: "info",
+          level: "warn",
+          message: "SESSION-DB-VERIFY-SKIPPED: reason=opencode-auth-challenge \u2014 Skipping session-DB restore: OpenCode answered with an authentication challenge; assuming this database is in use"
+        });
       } else {
         const result = await restoreAndVerifySessionDb({
           dbPath: sessionDbPath(),
@@ -14034,12 +14740,13 @@ async function run(options) {
           reportRecovery: (record) => reportSessionDbRecoveryRecord(state, record)
         });
         sessionDbVerifyFatal = result.verifyFatal;
+        sessionDbVerifyFatalReason = result.verifyFatalReason;
       }
     }
     reportSessionDbRecovery(state);
     if (sessionDbVerifyFatal) {
       throw new Error(
-        "SESSION-DB-INTEGRITY-EXHAUSTED: the corrupt session DB could not be proven separated from the active backup prefix or removed from disk"
+        sessionDbVerifyFatalReason === void 0 ? "SESSION-DB-INTEGRITY-EXHAUSTED: the corrupt session DB could not be proven separated from the active backup prefix or removed from disk" : `SESSION-DB-VERIFY-TIMEOUT: session DB verification timed out (${sessionDbVerifyFatalReason}); refusing to start`
       );
     }
     applyRunnerOpenCodeConfig({
@@ -14366,14 +15073,14 @@ async function run(options) {
         },
         onDisconnected: (code, reason, transition) => {
           state.connected = false;
-          const safeReason = redactDiagnosticText(reason).slice(0, MAX_DISCONNECT_REASON_LENGTH);
+          const safeReason2 = redactDiagnosticText(reason).slice(0, MAX_DISCONNECT_REASON_LENGTH);
           logActivity(state, {
             type: "info",
-            message: `Tunnel disconnected (generation: ${transition.generation}, code: ${code}, reason: ${safeReason})`
+            message: `Tunnel disconnected (generation: ${transition.generation}, code: ${code}, reason: ${safeReason2})`
           });
           emitAgentDisconnected(state.agentId, {
             code,
-            reason: safeReason,
+            reason: safeReason2,
             connection_generation: transition.generation
           });
           if (state.interactive) displayStatus(state);
@@ -14536,6 +15243,7 @@ program.command("login").description("Authenticate with Evident").option("--toke
 program.command("logout").description("Remove stored credentials for the current endpoint").option("--all", "Remove stored credentials for all endpoints").action((options) => logout({ all: options.all }));
 program.command("whoami").description("Show the currently logged in user").action(whoami);
 program.command("status").description("Check whether the configured credentials can reach Evident").option("--json", "Output in JSON format").action((options) => status({ json: options.json }));
+program.command("credential-vault-env").description("Print the shell assignment a runner image evals before starting the synchroniser").action(credentialVaultEnv);
 program.command("claude-usage").description("[spike] Show Claude subscription usage (requires a local `claude login`)").action(claudeUsage);
 program.command("run").description("Connect to Evident and process messages").option("--runner [id]", "Runner ID to connect to (optional when EVIDENT_RUNNER_KEY is set)").option(
   "-a, --agent [id]",