@evident-ai/cli 3.2.1-dev.6d96a16 → 3.2.1-dev.73d539a

package/dist/index.js

@@ -1023,7 +1023,7 @@ async function claudeUsage() {
 
 // src/commands/run.ts
 import { homedir as homedir3 } from "os";
-import { isAbsolute as isAbsolute2, join as join3, parse, resolve as resolvePath } from "path";
+import { isAbsolute as isAbsolute2, join as join4, parse, resolve as resolvePath } from "path";
 import chalk6 from "chalk";
 
 // ../../packages/types/src/agents/index.ts
@@ -1052,6 +1052,7 @@ var MAX_FILE_SYNC_DIRECTORIES = 16;
 
 // ../../packages/types/src/logging/index.ts
 var CORRELATION_ID_HEADER = "x-evident-correlation-id";
+var FORWARD_FAILURE_REASON_HEADER = "X-Evident-Failure-Reason";
 function log(level, event, fields) {
   const method = level === "debug" ? "log" : level;
   try {
@@ -2106,7 +2107,9 @@ function messageRunState(messages, userMessageId) {
   }
   if (!reply) return "queued";
   if (isAssistantInFlight(reply)) return "running";
-  return errorOf(reply) != null ? "failed" : "done";
+  if (errorOf(reply) != null) return "failed";
+  if (isAmbiguousTerminalFinish(reply)) return "running";
+  return "done";
 }
 function isPreamblePinnedRunning(messages, userMessageId) {
   if (messageRunState(messages, userMessageId) !== "running") return false;
@@ -2116,6 +2119,19 @@ function isPreamblePinnedRunning(messages, userMessageId) {
 function isB2AbandonmentConfirmed(params) {
   return params.pinnedForMs >= params.minPinnedMs && params.descendantOngoing === false;
 }
+function isAmbiguousTerminalFinish(m) {
+  if (completedOf(m) == null) return false;
+  if (errorOf(m) != null) return false;
+  const finish = finishOf(m);
+  return finish !== "tool-calls" && finish !== "stop";
+}
+function isAmbiguousFinishPinnedRunning(messages, userMessageId) {
+  const reply = findLastAssistantReplyFor(messages, userMessageId);
+  return isAmbiguousTerminalFinish(reply);
+}
+function isAmbiguousFinishResolved(params) {
+  return params.sessionOngoing === false || params.pinnedForMs >= params.maxPinnedMs;
+}
 function messageError(messages, userMessageId) {
   const reply = findLastAssistantReplyFor(messages, userMessageId);
   const error2 = errorOf(reply);
@@ -2322,6 +2338,149 @@ function resolveSessionCleanupConfig(flags, env = process.env) {
   return { enabled, maxAgeMs, maxCount, intervalMs, warnings };
 }
 
+// src/lib/opencode/session-db-size.ts
+import { statSync as statSync2 } from "fs";
+import { join as join2 } from "path";
+var LARGE_DB_THRESHOLD_BYTES = 268435456;
+function statSessionDbBytes(homeDir) {
+  const dbPath = join2(homeDir, ".local", "share", "opencode", "opencode.db");
+  try {
+    return statSync2(dbPath).size;
+  } catch (err) {
+    const isMissingFile = err instanceof Error && "code" in err && err.code === "ENOENT";
+    if (!isMissingFile) {
+      console.error(
+        `[statSessionDbBytes] could not stat ${dbPath}: ${err instanceof Error ? err.message : String(err)}`
+      );
+    }
+    return null;
+  }
+}
+function buildSessionStoreSizeWarning(input) {
+  const { dbBytes, cleanupEnabled, reclaimSkipReason } = input;
+  if (dbBytes === null || dbBytes <= LARGE_DB_THRESHOLD_BYTES) return null;
+  const mib = Math.round(dbBytes / 1024 / 1024);
+  if (!cleanupEnabled) {
+    return `Session store is large: opencode.db is ${mib} MiB and automatic session cleanup is off. Enable it with --session-cleanup-max-age 24h (env EVIDENT_SESSION_CLEANUP_MAX_AGE) to stop it growing \u2014 a store much larger than this can exceed a hosted runner's session-history restore budget on the next start, losing this runner's session history.`;
+  }
+  if (reclaimSkipReason === "sqlite-unavailable" || reclaimSkipReason === "insufficient-disk-space") {
+    const reasonText = reclaimSkipReason === "sqlite-unavailable" ? "this Node runtime lacks node:sqlite (needs Node >=22.5)" : "there is not enough free disk space to compact it";
+    return `Session store is large: opencode.db is ${mib} MiB. Automatic session cleanup is on, but space cannot currently be reclaimed because ${reasonText} \u2014 a store this large can exceed a hosted runner's session-history restore budget on the next start, losing this runner's session history.`;
+  }
+  return null;
+}
+
+// src/lib/opencode/session-db-reclaim.ts
+import { statSync as statSync3, statfsSync } from "fs";
+import { dirname as dirname2 } from "path";
+function insufficientSpaceReason(dbPath, requiredBytes) {
+  try {
+    const fsStats = statfsSync(dirname2(dbPath));
+    const availableBytes = fsStats.bavail * fsStats.bsize;
+    if (availableBytes < requiredBytes) {
+      return `only ${availableBytes} bytes free, need ${requiredBytes} for a second copy`;
+    }
+    return null;
+  } catch (err) {
+    return `could not check free space (${err instanceof Error ? err.message : String(err)}); refusing to guess`;
+  }
+}
+function readLogicalBytes(db) {
+  const pageCount = db.prepare("PRAGMA page_count").get().page_count;
+  const pageSize = db.prepare("PRAGMA page_size").get().page_size;
+  return pageCount * pageSize;
+}
+function readCheckpointResult(db) {
+  const row = db.prepare("PRAGMA wal_checkpoint(TRUNCATE)").get();
+  return { busy: row.busy !== 0, log: row.log, checkpointed: row.checkpointed };
+}
+async function probeReclaimAvailability(input) {
+  const { dbPath, requiredBytes } = input;
+  let sqlite;
+  try {
+    sqlite = await import("sqlite");
+  } catch (err) {
+    console.warn(
+      `[probeReclaimAvailability] node:sqlite unavailable for ${dbPath}: ${err instanceof Error ? err.message : String(err)}`
+    );
+    return "sqlite-unavailable";
+  }
+  let autoVacuum = null;
+  try {
+    const db = new sqlite.DatabaseSync(dbPath, { readOnly: true });
+    try {
+      autoVacuum = db.prepare("PRAGMA auto_vacuum").get().auto_vacuum;
+    } finally {
+      db.close();
+    }
+  } catch (err) {
+    console.warn(
+      `[probeReclaimAvailability] could not read auto_vacuum mode for ${dbPath}: ${err instanceof Error ? err.message : String(err)}`
+    );
+  }
+  if (autoVacuum !== 0) return null;
+  return insufficientSpaceReason(dbPath, requiredBytes) !== null ? "insufficient-disk-space" : null;
+}
+async function reclaimSessionDbSpace(input) {
+  const { dbPath, maxPages, allowFullVacuum = true } = input;
+  let sqlite;
+  try {
+    sqlite = await import("sqlite");
+  } catch (err) {
+    console.warn(
+      `[reclaimSessionDbSpace] node:sqlite unavailable (need Node >=22.5, >=22.13 unflagged) for ${dbPath}: ${err instanceof Error ? err.message : String(err)}`
+    );
+    return { ok: false, skipped: "sqlite-unavailable" };
+  }
+  const { DatabaseSync } = sqlite;
+  let db;
+  try {
+    db = new DatabaseSync(dbPath);
+    const autoVacuum = db.prepare("PRAGMA auto_vacuum").get().auto_vacuum;
+    if (autoVacuum === 0) {
+      if (!allowFullVacuum) {
+        console.warn(
+          `[reclaimSessionDbSpace] skipping VACUUM conversion of ${dbPath}: a session turn is live`
+        );
+        return { ok: false, skipped: "full-vacuum-blocked" };
+      }
+      const fileBytesForGuard = statSync3(dbPath).size;
+      const skipReason = insufficientSpaceReason(dbPath, fileBytesForGuard);
+      if (skipReason !== null) {
+        console.warn(
+          `[reclaimSessionDbSpace] skipping VACUUM conversion of ${dbPath}: ${skipReason}`
+        );
+        return { ok: false, skipped: "insufficient-disk-space" };
+      }
+      const beforeBytes = readLogicalBytes(db);
+      db.exec("PRAGMA auto_vacuum=INCREMENTAL");
+      db.exec("VACUUM");
+      const afterBytes = readLogicalBytes(db);
+      const checkpoint = readCheckpointResult(db);
+      return { ok: true, mode: "convert", beforeBytes, afterBytes, checkpoint };
+    }
+    if (autoVacuum === 2) {
+      const beforeBytes = readLogicalBytes(db);
+      const bound = Math.max(0, Math.trunc(maxPages));
+      db.exec(`PRAGMA incremental_vacuum(${bound})`);
+      const afterBytes = readLogicalBytes(db);
+      const checkpoint = readCheckpointResult(db);
+      return { ok: true, mode: "incremental", beforeBytes, afterBytes, checkpoint };
+    }
+    console.warn(
+      `[reclaimSessionDbSpace] ${dbPath} has auto_vacuum=${autoVacuum} (neither NONE nor INCREMENTAL); nothing to reclaim`
+    );
+    return { ok: false, skipped: "auto-vacuum-not-applicable" };
+  } catch (err) {
+    console.error(
+      `[reclaimSessionDbSpace] reclaim failed for ${dbPath}: ${err instanceof Error ? err.message : String(err)}`
+    );
+    return { ok: false, skipped: "reclaim-error" };
+  } finally {
+    db?.close();
+  }
+}
+
 // src/lib/tunnel/connection.ts
 import WebSocket2 from "ws";
 
@@ -2487,6 +2646,17 @@ var StreamForwarder = class {
 };
 
 // src/lib/tunnel/connection.ts
+var FAILURE_REASON_HEADER_LC = FORWARD_FAILURE_REASON_HEADER.toLowerCase();
+var TunnelUpgradeRejectedError = class extends Error {
+  constructor(message, reason) {
+    super(message);
+    this.reason = reason;
+  }
+};
+function classifyUpgradeRejection(headers) {
+  const value = headers[FAILURE_REASON_HEADER_LC];
+  return value === "do_code_updated" ? "do_code_updated" : "unknown";
+}
 var MAX_RECONNECT_DELAY = 3e4;
 var BASE_RECONNECT_DELAY = 500;
 function getReconnectDelay(attempt) {
@@ -2531,6 +2701,7 @@ function connectTunnel(options) {
     onError,
     onResponse,
     onInfo,
+    onWarning,
     onDrainPing
   } = options;
   const tunnelUrl = getTunnelUrlConfig();
@@ -2550,8 +2721,11 @@ function connectTunnel(options) {
       reject(new Error("Connection timeout"));
     }, 3e4);
     let upgradeRejection = null;
+    let upgradeRejectionReason = null;
     ws.on("unexpected-response", (_req, res) => {
       clearTimeout(connectionTimeout);
+      const reason = classifyUpgradeRejection(res.headers);
+      upgradeRejectionReason = reason;
       const chunks = [];
       res.on("data", (chunk) => chunks.push(chunk));
       res.on("end", () => {
@@ -2565,8 +2739,14 @@ function connectTunnel(options) {
         }
         const statusLine = `HTTP ${res.statusCode}${res.statusMessage ? ` ${res.statusMessage}` : ""}`;
         upgradeRejection = detail ? `${statusLine}: ${detail}` : statusLine;
-        onError?.(`Tunnel refused by relay (${upgradeRejection})`);
-        reject(new Error(`Tunnel handshake rejected: ${upgradeRejection}`));
+        if (reason === "do_code_updated") {
+          onWarning?.("Relay redeployed \u2014 reconnecting");
+        } else {
+          onError?.(`Tunnel refused by relay (${upgradeRejection})`);
+        }
+        reject(
+          new TunnelUpgradeRejectedError(`Tunnel handshake rejected: ${upgradeRejection}`, reason)
+        );
       });
     });
     ws.on("open", () => {
@@ -2612,8 +2792,14 @@ function connectTunnel(options) {
     ws.on("error", (error2) => {
       clearTimeout(connectionTimeout);
       const detail = upgradeRejection ?? describeSocketError(error2, url);
-      onError?.(`Connection error: ${detail}`);
-      reject(upgradeRejection ? new Error(upgradeRejection) : new Error(detail));
+      if (upgradeRejectionReason === "do_code_updated") {
+        onWarning?.("Relay redeployed \u2014 reconnecting");
+      } else {
+        onError?.(`Connection error: ${detail}`);
+      }
+      reject(
+        upgradeRejectionReason !== null ? new TunnelUpgradeRejectedError(detail, upgradeRejectionReason) : new Error(detail)
+      );
     });
     ws.on("close", (code, reason) => {
       const reasonStr = reason.toString() || upgradeRejection || (code === 1006 ? "abnormal closure" : "No reason provided");
@@ -2689,7 +2875,8 @@ var RunnerConnection = class {
           onError: (error2) => events.onError?.(error2),
           onResponse: () => events.onResponse?.(),
           onDrainPing: () => events.onDrainPing?.(),
-          onInfo: (message) => events.onInfo?.(message)
+          onInfo: (message) => events.onInfo?.(message),
+          onWarning: (message) => events.onWarning?.(message)
         });
         return;
       } catch (error2) {
@@ -2700,7 +2887,12 @@ var RunnerConnection = class {
         }
         const delay = getReconnectDelay(this.reconnectAttempt);
         events.onReconnecting?.(this.reconnectAttempt);
-        events.onError?.(`Connection failed, retrying in ${Math.round(delay / 1e3)}s...`);
+        const retryMessage = `Connection failed, retrying in ${Math.round(delay / 1e3)}s...`;
+        if (error2 instanceof TunnelUpgradeRejectedError && error2.reason === "do_code_updated") {
+          events.onWarning?.(retryMessage);
+        } else {
+          events.onError?.(retryMessage);
+        }
         await this.sleep(delay);
       }
     }
@@ -2757,7 +2949,7 @@ import { homedir as homedir2 } from "os";
 // src/lib/file-push.ts
 import { randomUUID } from "crypto";
 import { chmod, mkdir, open as open2, realpath, rename, unlink } from "fs/promises";
-import { basename, dirname as dirname2, isAbsolute, join as join2, relative, resolve as resolve2, sep } from "path";
+import { basename, dirname as dirname3, isAbsolute, join as join3, relative, resolve as resolve2, sep } from "path";
 var FILE_MODE = 384;
 var DIRECTORY_MODE = 448;
 async function writePushedFile(request) {
@@ -2788,9 +2980,9 @@ async function writePushedFile(request) {
   }
   try {
     const { existingAncestor, missingSegments } = await resolveNearestExistingAncestor(
-      dirname2(candidate)
+      dirname3(candidate)
     );
-    const realTarget = join2(existingAncestor, ...missingSegments, basename(candidate));
+    const realTarget = join3(existingAncestor, ...missingSegments, basename(candidate));
     const allowedDirectory = await findContainingAllowedDirectory(allowedDirectories, realTarget);
     if (allowedDirectory === null) {
       return refuse("path_not_allowed", "The runner does not allow writing to that location.", {
@@ -2800,8 +2992,8 @@ async function writePushedFile(request) {
     }
     if (missingSegments.length > 0) {
       await createMissingDirectories(existingAncestor, missingSegments);
-      const realParent = await realpath(dirname2(realTarget));
-      if (realParent !== dirname2(realTarget) || !contains(allowedDirectory, realTarget)) {
+      const realParent = await realpath(dirname3(realTarget));
+      if (realParent !== dirname3(realTarget) || !contains(allowedDirectory, realTarget)) {
         return refuse("path_not_allowed", "The runner does not allow writing to that location.", {
           path: realTarget,
           bytes,
@@ -2826,7 +3018,7 @@ function expandAndValidate(requestedPath, homeDir) {
   if (requestedPath.trim() === "" || requestedPath.includes("\0")) {
     return null;
   }
-  const expanded = requestedPath === "~" ? homeDir : requestedPath.startsWith("~/") ? join2(homeDir, requestedPath.slice(2)) : requestedPath;
+  const expanded = requestedPath === "~" ? homeDir : requestedPath.startsWith("~/") ? join3(homeDir, requestedPath.slice(2)) : requestedPath;
   if (expanded.split(/[/\\]/).includes("..")) {
     return null;
   }
@@ -2844,7 +3036,7 @@ async function resolveNearestExistingAncestor(directory) {
     try {
       return { existingAncestor: await realpath(current), missingSegments };
     } catch (err) {
-      const parent = dirname2(current);
+      const parent = dirname3(current);
       if (err.code !== "ENOENT" || parent === current) {
         throw err;
       }
@@ -2899,13 +3091,13 @@ function contains(realDirectory, realTarget) {
 async function createMissingDirectories(existingAncestor, missingSegments) {
   let current = existingAncestor;
   for (const segment of missingSegments) {
-    current = join2(current, segment);
+    current = join3(current, segment);
     await mkdir(current, { recursive: true, mode: DIRECTORY_MODE });
     await chmod(current, DIRECTORY_MODE);
   }
 }
 async function writeAtomically(realTarget, content) {
-  const temporaryPath = join2(dirname2(realTarget), `.evident-push-${randomUUID()}.tmp`);
+  const temporaryPath = join3(dirname3(realTarget), `.evident-push-${randomUUID()}.tmp`);
   let handle;
   try {
     handle = await open2(temporaryPath, "wx", FILE_MODE);
@@ -3178,6 +3370,7 @@ var DEFAULT_STUCK_QUEUED_MS = 6e4;
 var HEARTBEAT_MS = 6e4;
 var ABSOLUTE_MAX_PROCESSING_MS = 6 * 60 * 60 * 1e3;
 var B2_ABANDONMENT_MIN_PINNED_MS = 3 * 6e4;
+var AMBIGUOUS_FINISH_MAX_PINNED_MS = 3 * 6e4;
 var B2_ABANDONMENT_RECHECK_MS = HEARTBEAT_MS;
 var POLL_MISS_GRACE_MS = HEARTBEAT_MS;
 var MAX_SUPERSEDED_CONVERSATIONS = 256;
@@ -4012,6 +4205,9 @@ var ChannelDriver = class _ChannelDriver {
         return this.reattachRedrive(conv, sessionId, message, ocId);
       }
       if (ongoing === false) {
+        if (state === "running" && isAmbiguousFinishPinnedRunning(messages, ocId ?? "")) {
+          return this.settleRedrive(conv, sessionId, message, ocId, messages, "done");
+        }
         this.clearRedriveUnresolved(message.id);
         void this.postSignal(conv.id, message.id, "redrive_redispatched");
         return "dispatch";
@@ -4623,7 +4819,9 @@ var ChannelDriver = class _ChannelDriver {
       deliveryDeadlineAnchored: false,
       b2PinnedSinceMs: 0,
       b2LastDescendantCheckMs: 0,
-      b2AbandonedSignalled: false
+      b2AbandonedSignalled: false,
+      ambiguousPinnedSinceMs: 0,
+      ambiguousResolved: false
     });
   }
   /**
@@ -4702,7 +4900,9 @@ var ChannelDriver = class _ChannelDriver {
       deliveryDeadlineAnchored: false,
       b2PinnedSinceMs: 0,
       b2LastDescendantCheckMs: 0,
-      b2AbandonedSignalled: false
+      b2AbandonedSignalled: false,
+      ambiguousPinnedSinceMs: 0,
+      ambiguousResolved: false
     });
   }
   /**
@@ -4970,6 +5170,49 @@ var ChannelDriver = class _ChannelDriver {
         }
       }
     }
+    const ambiguousPinnedNow = activelyRunning && isAmbiguousFinishPinnedRunning(messages, inFlight.opencodeMessageId);
+    if (!ambiguousPinnedNow) {
+      if (snapshotReadable) {
+        inFlight.ambiguousPinnedSinceMs = 0;
+        inFlight.ambiguousResolved = false;
+      }
+    } else {
+      if (inFlight.ambiguousResolved) {
+        await this.settleMessageDone(sessionId, watcher, inFlight, messages);
+        return;
+      }
+      if (inFlight.ambiguousPinnedSinceMs === 0) {
+        inFlight.ambiguousPinnedSinceMs = this.now();
+        const reply = findLastAssistantReplyFor(messages, inFlight.opencodeMessageId);
+        const finish = reply?.info?.finish ?? reply?.finish;
+        this.log({
+          level: "warn",
+          message: `Message ${id.slice(0, 8)} pinned running by an unrecognised finish ("${finish ?? "(absent)"}") \u2014 corroborating against opencode's session status before settling (issue #1493)`,
+          conversation_id: conv.id,
+          message_id: id
+        });
+      }
+      const pinnedForMs = this.now() - inFlight.ambiguousPinnedSinceMs;
+      const ongoing = await isSessionOngoing(this.port, sessionId);
+      if (isAmbiguousFinishResolved({
+        pinnedForMs,
+        maxPinnedMs: AMBIGUOUS_FINISH_MAX_PINNED_MS,
+        sessionOngoing: ongoing
+      })) {
+        inFlight.ambiguousResolved = true;
+        this.log({
+          level: "warn",
+          message: `Message ${id.slice(0, 8)} ambiguous-finish-pinned for ${Math.round(pinnedForMs / 1e3)}s \u2014 resolved (${ongoing === false ? "session confirmed not-ongoing" : "pin exceeded the no-hang cap"}) \u2014 settling done`,
+          conversation_id: conv.id,
+          message_id: id
+        });
+        void this.postSignal(conv.id, id, "ambiguous_finish_resolved", {
+          watched_for_ms: pinnedForMs
+        });
+        await this.settleMessageDone(sessionId, watcher, inFlight, messages);
+        return;
+      }
+    }
     if (activelyRunning && this.now() - inFlight.processingAnchorMs >= ABSOLUTE_MAX_PROCESSING_MS) {
       this.log({
         level: "warn",
@@ -5224,48 +5467,7 @@ var ChannelDriver = class _ChannelDriver {
     const ocId = row.opencode_message_id;
     const state = messageRunState(messages, ocId ?? "");
     if (state === "done") {
-      if (this.doneUndeliverable.has(row.id)) {
-        this.log({
-          level: "debug",
-          message: `Re-adopt: message ${row.id.slice(0, 8)} markDone is terminally undeliverable \u2014 left to the cron; skipping until it leaves processing`,
-          conversation_id: row.conversation_id,
-          message_id: row.id
-        });
-        return;
-      }
-      this.log({
-        level: "info",
-        message: `Re-adopt: message ${row.id.slice(0, 8)} completed while unwatched \u2014 marking done`,
-        conversation_id: row.conversation_id,
-        message_id: row.id
-      });
-      try {
-        const title = await this.resolveSessionTitle(sessionId, row.conversation_id);
-        const usage = messageUsage(messages, ocId ?? "");
-        await this.markDone(row.conversation_id, row.id, sessionId, ocId, title, usage);
-      } catch (err) {
-        if (err instanceof ChannelAuthError) throw err;
-        if (err instanceof ChannelTerminalError) {
-          this.doneUndeliverable.add(row.id);
-          this.log({
-            level: "warn",
-            message: `Re-adopt: failed to mark message ${row.id.slice(0, 8)} done (terminal HTTP ${err.status}) \u2014 parking until it leaves processing; leaving for the cron safety net: ${err.message}`,
-            conversation_id: row.conversation_id,
-            message_id: row.id
-          });
-          void this.postSignal(row.conversation_id, row.id, "readopt_undeliverable");
-          return;
-        }
-        this.log({
-          level: "warn",
-          message: `Re-adopt: failed to mark message ${row.id.slice(0, 8)} done (will retry next drain): ${err instanceof Error ? err.message : String(err)}`,
-          conversation_id: row.conversation_id,
-          message_id: row.id
-        });
-        return;
-      }
-      this.dontRedispatch.delete(row.id);
-      void this.postSignal(row.conversation_id, row.id, "readopt_done");
+      await this.deliverReadoptedDone(sessionId, row, messages, ocId);
       return;
     }
     const restartAborted = state === "failed" && sessionOngoing === false && isAbortedTerminalReply(messages, ocId ?? "");
@@ -5330,6 +5532,17 @@ var ChannelDriver = class _ChannelDriver {
       const ongoing = sessionOngoing;
       statusReadableOngoing = ongoing;
       if (ongoing === false) {
+        if (isAmbiguousFinishPinnedRunning(messages, ocId ?? "")) {
+          const finish = reply?.info?.finish ?? reply?.finish;
+          this.log({
+            level: "info",
+            message: `Re-adopt: message ${row.id.slice(0, 8)} has an ambiguous finish ("${finish ?? "(absent)"}") but session ${sessionId.slice(0, 8)} is confirmed not-ongoing per GET /session/status \u2014 delivering the existing reply instead of re-dispatching`,
+            conversation_id: row.conversation_id,
+            message_id: row.id
+          });
+          await this.deliverReadoptedDone(sessionId, row, messages, ocId);
+          return;
+        }
         this.log({
           level: "info",
           message: `Re-adopt: message ${row.id.slice(0, 8)} running/${shape} but session ${sessionId.slice(0, 8)} is not-ongoing per GET /session/status (absent/idle) \u2014 re-dispatching from scratch (status-gated recovery)`,
@@ -5406,6 +5619,63 @@ var ChannelDriver = class _ChannelDriver {
     }
     await this.forceReadoptRun(sessionId, row);
   }
+  /**
+   * Deliver a `processing` row whose correlated reply already completed while
+   * nobody was watching (ADR-0046) — the `readoptOne` `state === 'done'` body,
+   * extracted (#1493 Task 2.4) so the ambiguous-finish guard above can call the
+   * SAME delivery instead of duplicating it.
+   *
+   * EVEN IF the row was previously parked in `dontRedispatch` (a give-up stops
+   * re-dispatch, not delivery — Bugbot #202). Guarded EXACTLY like the watcher's
+   * `settleMessageDone`: auth re-throws; terminal → park in `doneUndeliverable` +
+   * leave for cron; transient → log + leave for the next drain (the still-
+   * `processing` row is re-read and retried). markDone is idempotent server-side
+   * (status-gated), so a repeat can never double-post.
+   */
+  async deliverReadoptedDone(sessionId, row, messages, ocId) {
+    if (this.doneUndeliverable.has(row.id)) {
+      this.log({
+        level: "debug",
+        message: `Re-adopt: message ${row.id.slice(0, 8)} markDone is terminally undeliverable \u2014 left to the cron; skipping until it leaves processing`,
+        conversation_id: row.conversation_id,
+        message_id: row.id
+      });
+      return;
+    }
+    this.log({
+      level: "info",
+      message: `Re-adopt: message ${row.id.slice(0, 8)} completed while unwatched \u2014 marking done`,
+      conversation_id: row.conversation_id,
+      message_id: row.id
+    });
+    try {
+      const title = await this.resolveSessionTitle(sessionId, row.conversation_id);
+      const usage = messageUsage(messages, ocId ?? "");
+      await this.markDone(row.conversation_id, row.id, sessionId, ocId, title, usage);
+    } catch (err) {
+      if (err instanceof ChannelAuthError) throw err;
+      if (err instanceof ChannelTerminalError) {
+        this.doneUndeliverable.add(row.id);
+        this.log({
+          level: "warn",
+          message: `Re-adopt: failed to mark message ${row.id.slice(0, 8)} done (terminal HTTP ${err.status}) \u2014 parking until it leaves processing; leaving for the cron safety net: ${err.message}`,
+          conversation_id: row.conversation_id,
+          message_id: row.id
+        });
+        void this.postSignal(row.conversation_id, row.id, "readopt_undeliverable");
+        return;
+      }
+      this.log({
+        level: "warn",
+        message: `Re-adopt: failed to mark message ${row.id.slice(0, 8)} done (will retry next drain): ${err instanceof Error ? err.message : String(err)}`,
+        conversation_id: row.conversation_id,
+        message_id: row.id
+      });
+      return;
+    }
+    this.dontRedispatch.delete(row.id);
+    void this.postSignal(row.conversation_id, row.id, "readopt_done");
+  }
   /**
    * Re-dispatch an orphaned (`unknown`/null-id) `processing` row (ADR-0046 §2).
    *
@@ -6035,17 +6305,25 @@ var ChannelDriver = class _ChannelDriver {
    *               the aborted-in-flight production bug after a restart.
    *   - `b2`    — a COMPLETED reply pinned running only by `finish === "tool-calls"`
    *               (the sub-agent preamble — #253's shape).
-   *   - `other` — any other shape (defensive; a running row is normally b1 or b2).
-   * Reads `info.time.completed` / `info.finish` (tolerating the legacy top-level
-   * shape) directly rather than re-importing the module-private `completedOf`/
-   * `finishOf` — this is a display label only, not a correctness predicate.
+   *   - `ambiguous` — a COMPLETED, non-errored reply whose `finish` is neither
+   *               "tool-calls" nor "stop" (issue #1493, class 4 — see
+   *               `isAmbiguousFinishPinnedRunning`/Task 2.4).
+   *   - `other` — any other shape (defensive; a running row is normally b1, b2 or
+   *               ambiguous).
+   * Reads `info.time.completed` / `info.finish` / `info.error` (tolerating the
+   * legacy top-level shape) directly rather than re-importing the module-private
+   * `completedOf`/`finishOf`/`errorOf` — this is a display label only, not a
+   * correctness predicate (that is `isAmbiguousFinishPinnedRunning`'s job).
    */
   replyCompletionShape(reply) {
     if (!reply) return "other";
     const completed = reply.info?.time?.completed ?? reply.time?.completed;
     if (completed == null) return "b1";
     const finish = reply.info?.finish ?? reply.finish;
-    return finish === "tool-calls" ? "b2" : "other";
+    if (finish === "tool-calls") return "b2";
+    const error2 = reply.info?.error ?? reply.error;
+    if (finish !== "stop" && error2 == null) return "ambiguous";
+    return "other";
   }
   /**
    * Attribute a surfaced interaction to the in-flight message it paused on (M-1).
@@ -6662,7 +6940,7 @@ function resolveFileSyncDirectories(raw, homeDir) {
     if (trimmed === "") {
       throw new Error("--enable-file-sync-to requires a directory path (got an empty value)");
     }
-    const expanded = trimmed === "~" ? homeDir : trimmed.startsWith("~/") ? join3(homeDir, trimmed.slice(2)) : trimmed;
+    const expanded = trimmed === "~" ? homeDir : trimmed.startsWith("~/") ? join4(homeDir, trimmed.slice(2)) : trimmed;
     if (!isAbsolute2(expanded)) {
       throw new Error(`--enable-file-sync-to requires an absolute directory path; got "${entry}"`);
     }
@@ -6963,6 +7241,10 @@ async function driveChannels(state, driver) {
   }
 }
 var SESSION_CLEANUP_FIRST_SWEEP_MS = 1e4;
+var SESSION_DB_RECLAIM_MAX_PAGES = 2e3;
+function sessionDbPath() {
+  return join4(homedir3(), ".local", "share", "opencode", "opencode.db");
+}
 async function runSweep(state, driver, config) {
   const mode = `age=${config.maxAgeMs ?? "\u2014"} count=${config.maxCount ?? "\u2014"}`;
   try {
@@ -7005,6 +7287,25 @@ async function runSweep(state, driver, config) {
       type: "info",
       message: `Session cleanup: inspected ${sessions.length}, deleted ${deleted}${failedNote}${skippedNote} (${mode})`
     });
+    const reclaimResult = await reclaimSessionDbSpace({
+      dbPath: sessionDbPath(),
+      maxPages: SESSION_DB_RECLAIM_MAX_PAGES,
+      allowFullVacuum: protectedNow.size === 0
+    });
+    if (reclaimResult.ok) {
+      const beforeMib = (reclaimResult.beforeBytes / 1024 / 1024).toFixed(1);
+      const afterMib = (reclaimResult.afterBytes / 1024 / 1024).toFixed(1);
+      const checkpointNote = reclaimResult.checkpoint.busy ? ` (on-disk file truncation deferred: checkpoint busy, ${reclaimResult.checkpoint.log} WAL frames pending)` : "";
+      logActivity(state, {
+        type: "info",
+        message: `Session cleanup: reclaimed session-db space (${reclaimResult.mode}): ${beforeMib} MiB -> ${afterMib} MiB${checkpointNote}`
+      });
+    } else {
+      logActivity(state, {
+        type: "info",
+        message: `Session cleanup: session-db space reclaim skipped (${reclaimResult.skipped})`
+      });
+    }
   } catch (error2) {
     const message = error2 instanceof Error ? error2.message : String(error2);
     logActivity(state, {
@@ -7025,6 +7326,22 @@ function scheduleSessionCleanup(state, driver, options) {
   for (const warning2 of config.warnings) {
     logActivity(state, { type: "info", level: "warn", message: `Session cleanup: ${warning2}` });
   }
+  const dbBytes = statSessionDbBytes(homedir3());
+  void (async () => {
+    const reclaimSkipReason = dbBytes !== null && config.enabled ? await probeReclaimAvailability({ dbPath: sessionDbPath(), requiredBytes: dbBytes }) : null;
+    const sizeWarning = buildSessionStoreSizeWarning({
+      dbBytes,
+      cleanupEnabled: config.enabled,
+      reclaimSkipReason
+    });
+    if (sizeWarning !== null) {
+      logActivity(state, { type: "info", level: "warn", message: sizeWarning });
+    }
+  })().catch((err) => {
+    console.error(
+      `[scheduleSessionCleanup] size-warning preflight failed: ${err instanceof Error ? err.message : String(err)}`
+    );
+  });
   if (!config.enabled) return;
   logActivity(state, {
     type: "info",
@@ -7606,6 +7923,13 @@ async function run(options) {
           logActivity(state, { type: "error", error: error2 });
           if (state.interactive) displayStatus(state);
         },
+        // `warn`, not `info`: `forwardRunnerActivity`'s FORWARDED_LEVELS floor is
+        // {'warn','error'}, so an `info` entry would never leave the machine and
+        // an operator couldn't correlate a reconnect storm with a relay deploy.
+        onWarning: (message) => {
+          logActivity(state, { type: "info", level: "warn", message });
+          if (state.interactive) displayStatus(state);
+        },
         // Web traffic is proxied transparently; note opencode is live and stamp
         // proxied activity so the idle loop treats interactive proxy use as work.
         // Fires per forwarded response head (incl. every SSE open) and excludes