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

package/README.md

@@ -113,8 +113,8 @@ Options:
   and ignored, which can leave cleanup off if it was the only rule set. Env:
   `EVIDENT_SESSION_CLEANUP_MAX_AGE`. With cleanup off, a runner whose local
   session store has grown large warns once at startup, on the runner's page,
-  naming this flag — pruning stops the store growing, but it does not shrink
-  what has already grown.
+  naming this flag — turning cleanup on both stops the store growing further
+  and reclaims disk space already used by deleted sessions.
 - `--session-cleanup-max-count <n>` — Keep only the newest N OpenCode sessions
   by last activity, deleting the rest. Also enables cleanup; combines with
   `--session-cleanup-max-age` as OR. A session with a turn actively in progress
@@ -135,7 +135,9 @@ Options:
   `EVIDENT_MAX_ACTIVE_SESSIONS`.
 - `--session-cleanup-interval <duration>` — How often the cleanup sweep runs
   (default: `1h`). An invalid value falls back to the default rather than
-  disabling cleanup. Env: `EVIDENT_SESSION_CLEANUP_INTERVAL`.
+  disabling cleanup. Each sweep also reclaims disk space freed by the sessions
+  it deleted, so the store shrinks rather than merely stopping its growth. Env:
+  `EVIDENT_SESSION_CLEANUP_INTERVAL`.
 - `--enable-file-sync-to <dir>` — Let the runner write files Evident has queued
   for it into this directory — it collects them as part of the polling it
   already does, so they land a couple of seconds after you hand them over.

package/dist/index.js

@@ -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 {
@@ -2356,10 +2357,128 @@ function statSessionDbBytes(homeDir) {
   }
 }
 function buildSessionStoreSizeWarning(input) {
-  const { dbBytes, cleanupEnabled } = input;
-  if (dbBytes === null || dbBytes <= LARGE_DB_THRESHOLD_BYTES || cleanupEnabled) return null;
+  const { dbBytes, cleanupEnabled, reclaimSkipReason } = input;
+  if (dbBytes === null || dbBytes <= LARGE_DB_THRESHOLD_BYTES) return null;
   const mib = Math.round(dbBytes / 1024 / 1024);
-  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 (!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
@@ -2527,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) {
@@ -2571,6 +2701,7 @@ function connectTunnel(options) {
     onError,
     onResponse,
     onInfo,
+    onWarning,
     onDrainPing
   } = options;
   const tunnelUrl = getTunnelUrlConfig();
@@ -2590,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", () => {
@@ -2605,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", () => {
@@ -2652,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");
@@ -2729,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) {
@@ -2740,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);
       }
     }
@@ -2797,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 join3, 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) {
@@ -2828,7 +2980,7 @@ async function writePushedFile(request) {
   }
   try {
     const { existingAncestor, missingSegments } = await resolveNearestExistingAncestor(
-      dirname2(candidate)
+      dirname3(candidate)
     );
     const realTarget = join3(existingAncestor, ...missingSegments, basename(candidate));
     const allowedDirectory = await findContainingAllowedDirectory(allowedDirectories, realTarget);
@@ -2840,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,
@@ -2884,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;
       }
@@ -2945,7 +3097,7 @@ async function createMissingDirectories(existingAncestor, missingSegments) {
   }
 }
 async function writeAtomically(realTarget, content) {
-  const temporaryPath = join3(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);
@@ -7089,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 {
@@ -7131,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, {
@@ -7151,13 +7326,22 @@ function scheduleSessionCleanup(state, driver, options) {
   for (const warning2 of config.warnings) {
     logActivity(state, { type: "info", level: "warn", message: `Session cleanup: ${warning2}` });
   }
-  const sizeWarning = buildSessionStoreSizeWarning({
-    dbBytes: statSessionDbBytes(homedir3()),
-    cleanupEnabled: config.enabled
+  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 (sizeWarning !== null) {
-    logActivity(state, { type: "info", level: "warn", message: sizeWarning });
-  }
   if (!config.enabled) return;
   logActivity(state, {
     type: "info",
@@ -7739,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