@evident-ai/cli 3.3.1-dev.70eaa1c → 3.3.1-dev.8abe4d1

package/dist/index.js

@@ -934,6 +934,7 @@ import { homedir } from "os";
 import { join } from "path";
 var CLAUDE_USAGE_URL = "https://api.anthropic.com/api/oauth/usage";
 var KEYCHAIN_SERVICE = "Claude Code-credentials";
+var CLAUDE_CREDENTIALS_SEGMENTS = [".claude", ".credentials.json"];
 function parseClaudeCliCredentials(raw) {
   let parsed;
   try {
@@ -967,7 +968,7 @@ function readClaudeCliCredentials() {
     }
   }
   try {
-    const raw = readFileSync(join(homedir(), ".claude", ".credentials.json"), "utf-8");
+    const raw = readFileSync(join(homedir(), ...CLAUDE_CREDENTIALS_SEGMENTS), "utf-8");
     return parseClaudeCliCredentials(raw);
   } catch (err) {
     const code = err.code;
@@ -1063,7 +1064,7 @@ async function claudeUsage() {
 
 // src/commands/run.ts
 import { homedir as homedir3 } from "os";
-import { isAbsolute as isAbsolute2, join as join4, parse, resolve as resolvePath } from "path";
+import { isAbsolute as isAbsolute2, join as join5, parse, resolve as resolvePath } from "path";
 import chalk6 from "chalk";
 
 // ../../packages/types/src/agents/index.ts
@@ -2995,6 +2996,9 @@ function claudeUsageFailureLogLevel(consecutiveFailures) {
 // src/lib/channels/driver.ts
 import { homedir as homedir2 } from "os";
 
+// src/lib/runner-file-sync.ts
+import { join as join4 } from "path";
+
 // src/lib/file-push.ts
 import { randomUUID } from "crypto";
 import { chmod, mkdir, open as open2, realpath, rename, unlink } from "fs/promises";
@@ -3188,17 +3192,20 @@ async function syncPendingRunnerFiles(options) {
   for (const id of options.ackFailures.keys()) {
     if (!pendingIds.has(id)) options.ackFailures.delete(id);
   }
-  if (pending.length === 0) return 0;
+  if (pending.length === 0) return { applied: 0, claudeCredentialApplied: false };
   options.log({
     level: "info",
     message: `Runner file sync: ${pending.length} file(s) queued for this runner`
   });
   let applied = 0;
+  let claudeCredentialApplied = false;
   for (const file of pending) {
     if ((options.ackFailures.get(file.id) ?? 0) >= MAX_ACK_ATTEMPTS) continue;
-    if (await applyOne(options, file)) applied += 1;
+    const outcome = await applyOne(options, file);
+    if (outcome.applied) applied += 1;
+    if (outcome.claudeCredentialApplied) claudeCredentialApplied = true;
   }
-  return applied;
+  return { applied, claudeCredentialApplied };
 }
 async function listPendingFiles(options) {
   let res;
@@ -3259,6 +3266,11 @@ function asPendingFile(entry) {
   if (typeof size !== "number" || !Number.isFinite(size) || size < 0) return null;
   return { id, path, size };
 }
+var NOT_APPLIED = { applied: false, claudeCredentialApplied: false };
+function isClaudeCredentialPath(requestedPath, homeDir) {
+  const expanded = requestedPath === "~" ? homeDir : requestedPath.startsWith("~/") ? join4(homeDir, requestedPath.slice(2)) : requestedPath;
+  return expanded === join4(homeDir, ...CLAUDE_CREDENTIALS_SEGMENTS);
+}
 async function applyOne(options, file) {
   const label = `${file.id.slice(0, 8)} (${file.path})`;
   if (options.allowedDirectories.length === 0) {
@@ -3267,7 +3279,7 @@ async function applyOne(options, file) {
       message: `Runner file ${label} rejected: file sync is not enabled on this runner (start it with --enable-file-sync-to)`
     });
     await ack(options, file, "rejected", "file_sync_disabled");
-    return false;
+    return NOT_APPLIED;
   }
   if (file.size > MAX_FILE_PUSH_BYTES) {
     options.log({
@@ -3275,12 +3287,12 @@ async function applyOne(options, file) {
       message: `Runner file ${label} rejected: declared ${file.size} bytes, the limit is ${MAX_FILE_PUSH_BYTES}`
     });
     await ack(options, file, "rejected", "file_too_large");
-    return false;
+    return NOT_APPLIED;
   }
   const download = await downloadContent(options, file, label);
   if (!download.ok) {
     if (download.terminal) await ack(options, file, "rejected", download.code);
-    return false;
+    return NOT_APPLIED;
   }
   let outcome;
   try {
@@ -3296,7 +3308,7 @@ async function applyOne(options, file) {
       message: `Runner file ${label} could not be written: ${describe(err)}`
     });
     await ack(options, file, "rejected", "write_failed");
-    return false;
+    return NOT_APPLIED;
   }
   if (!outcome.ok) {
     options.log({
@@ -3304,14 +3316,17 @@ async function applyOne(options, file) {
       message: `Runner file ${label} rejected (${outcome.code}): ${outcome.message}`
     });
     await ack(options, file, "rejected", outcome.code);
-    return false;
+    return NOT_APPLIED;
   }
   options.log({
     level: "info",
     message: `Runner file ${label} applied (${download.content.byteLength} bytes)`
   });
   await ack(options, file, "applied");
-  return true;
+  return {
+    applied: true,
+    claudeCredentialApplied: isClaudeCredentialPath(file.path, options.homeDir)
+  };
 }
 function durableDownloadCode(status2) {
   return status2 === 413 ? "file_too_large" : "write_failed";
@@ -3756,6 +3771,14 @@ var ChannelDriver = class _ChannelDriver {
    * same trick `lastProxiedActivityAt` uses.
    */
   appliedFileCount = 0;
+  /**
+   * Generation counter, NOT a tally (#1656): advances by exactly one per sync
+   * batch that applied the Claude CLI credential file, not by how many
+   * credential files were in that batch. `run.ts` only ever tests inequality
+   * against the value it saw last cycle, so magnitude is meaningless — keep it
+   * that way rather than "fixing" it into a count.
+   */
+  claudeCredentialApplyCount = 0;
   /**
    * The currently-executing `drainPending()` promise, or null when idle. Lets a
    * graceful shutdown (`waitForInFlight`) await an in-progress drain so a turn it
@@ -3848,7 +3871,7 @@ var ChannelDriver = class _ChannelDriver {
     if (this.syncingFiles) return 0;
     this.syncingFiles = true;
     try {
-      const applied = await syncPendingRunnerFiles({
+      const result = await syncPendingRunnerFiles({
         agentId: this.agentId,
         apiUrl: this.apiUrl,
         getAuthHeader: this.getAuthHeader,
@@ -3858,8 +3881,9 @@ var ChannelDriver = class _ChannelDriver {
         ackFailures: this.fileAckFailures,
         log: this.log
       });
-      this.appliedFileCount += applied;
-      return applied;
+      this.appliedFileCount += result.applied;
+      if (result.claudeCredentialApplied) this.claudeCredentialApplyCount += 1;
+      return result.applied;
     } catch (err) {
       this.log({
         level: "error",
@@ -3950,12 +3974,24 @@ var ChannelDriver = class _ChannelDriver {
    * `appliedFiles` is monotonic so a pull that started AND finished between two
    * idle checks still shows up as an advance.
    *
+   * A THIRD signal, `claudeCredentialApplies`, is a separate re-arm trigger
+   * (#1656), not idle accounting: `run.ts` gates re-probing Claude usage
+   * reporting on it advancing, so an unrelated file sync can never disturb a
+   * healthy reporting cadence (#1627) — it never even reaches that trigger, let
+   * alone gets declined by it. Keep this narrower signal OUT of `appliedFiles`,
+   * whose consumer is idle-timeout suppression and must key on ANY file, not
+   * just a Claude credential.
+   *
    * CALLER CONTRACT: sample `inFlight` BEFORE calling `syncPendingFiles()` for
    * the cycle. `syncPendingFiles` sets the flag synchronously, so a caller that
    * samples afterwards reads `true` every single cycle and can never idle out.
    */
   fileSyncActivity() {
-    return { appliedFiles: this.appliedFileCount, inFlight: this.syncingFiles };
+    return {
+      appliedFiles: this.appliedFileCount,
+      inFlight: this.syncingFiles,
+      claudeCredentialApplies: this.claudeCredentialApplyCount
+    };
   }
   /**
    * OpenCode session ids the session-cleanup sweep (issue #190) must NOT delete:
@@ -4815,6 +4851,17 @@ var ChannelDriver = class _ChannelDriver {
           message: `OpenCode session ${bound} for conversation ${conv.id.slice(0, 8)} no longer exists (deleted or DB reset) \u2014 creating a fresh session and rebinding.`,
           conversation_id: conv.id
         });
+        const watcher = this.watchers.get(bound);
+        if (watcher) {
+          for (const [evidentMessageId, inFlight] of [...watcher.inFlight]) {
+            this.recordReleasedOpencodeId(evidentMessageId, bound, inFlight.opencodeMessageId);
+            this.removeInFlight(watcher, evidentMessageId);
+            void this.postSignal(watcher.conv.id, evidentMessageId, "watcher_recovered", {
+              recovery: "session_gone_released"
+            });
+          }
+          this.watchers.delete(bound);
+        }
         this.sessions.delete(conv.id);
         return { sessionId: await this.createAndBindSession(conv.id), created: true };
       }
@@ -7280,7 +7327,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("~/") ? join4(homeDir, trimmed.slice(2)) : trimmed;
+    const expanded = trimmed === "~" ? homeDir : trimmed.startsWith("~/") ? join5(homeDir, trimmed.slice(2)) : trimmed;
     if (!isAbsolute2(expanded)) {
       throw new Error(`--enable-file-sync-to requires an absolute directory path; got "${entry}"`);
     }
@@ -7487,6 +7534,7 @@ async function driveChannels(state, driver) {
   let unreachableMs = 0;
   let lastSeenProxiedActivityAt = state.lastProxiedActivityAt;
   let lastSeenAppliedFiles = driver.fileSyncActivity().appliedFiles;
+  let lastSeenClaudeApplies = driver.fileSyncActivity().claudeCredentialApplies;
   while (state.running) {
     const cycleStartedAtMs = performance.now();
     let idleThisCycle = false;
@@ -7510,11 +7558,15 @@ async function driveChannels(state, driver) {
       state.messageCount += processed;
       const proxiedActivity = state.lastProxiedActivityAt !== lastSeenProxiedActivityAt;
       lastSeenProxiedActivityAt = state.lastProxiedActivityAt;
-      const appliedFiles = driver.fileSyncActivity().appliedFiles;
+      const fileActivitySnapshot = driver.fileSyncActivity();
+      const appliedFiles = fileActivitySnapshot.appliedFiles;
       const filesApplied = appliedFiles !== lastSeenAppliedFiles;
       const fileActivity = carriedOverFileSync || filesApplied;
       lastSeenAppliedFiles = appliedFiles;
-      if (filesApplied) state.claudeUsageRearm?.();
+      const claudeCredentialApplies = fileActivitySnapshot.claudeCredentialApplies;
+      const claudeCredentialApplied = claudeCredentialApplies !== lastSeenClaudeApplies;
+      lastSeenClaudeApplies = claudeCredentialApplies;
+      if (claudeCredentialApplied) state.claudeUsageRearm?.();
       if (processed > 0 || driver.hasInFlightWatchers() || proxiedActivity || fileActivity) {
         idlePolls = 0;
         idleMs = 0;
@@ -7583,7 +7635,7 @@ 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");
+  return join5(homedir3(), ".local", "share", "opencode", "opencode.db");
 }
 async function runSweep(state, driver, config) {
   const mode = `age=${config.maxAgeMs ?? "\u2014"} count=${config.maxCount ?? "\u2014"}`;
@@ -7724,13 +7776,13 @@ function scheduleClaudeUsageReporting(state, options) {
     phase = "probe-pending";
     state.claudeUsageTimer = setTimeout(() => void tick(true), FIRST_REPORT_DELAY_MS);
   };
-  const scheduleNextTick = (reportedSuccessfully) => {
+  const scheduleNextTick = () => {
     if (rearmRequested) {
       rearmRequested = false;
       armProbe();
       return;
     }
-    phase = reportedSuccessfully ? "steady-pending-healthy" : "steady-pending-retry";
+    phase = "steady-pending";
     state.claudeUsageTimer = setTimeout(() => void tick(false), nextReportDelayMs());
   };
   const rearm = () => {
@@ -7740,9 +7792,7 @@ function scheduleClaudeUsageReporting(state, options) {
         return;
       case "probe-pending":
         return;
-      case "steady-pending-healthy":
-        return;
-      case "steady-pending-retry":
+      case "steady-pending":
         if (state.claudeUsageTimer) {
           clearTimeout(state.claudeUsageTimer);
           state.claudeUsageTimer = null;
@@ -7783,7 +7833,7 @@ function scheduleClaudeUsageReporting(state, options) {
           message: `Failed to report Claude usage: ${result.error}${claudeUsageFailureStreakSuffix(consecutiveFailures)}`
         });
       }
-      scheduleNextTick(result.ok);
+      scheduleNextTick();
     } catch (error2) {
       if (error2 instanceof ClaudeUsageError && isLocalCredentialProblem(error2)) {
         if (mode === "on") {
@@ -7792,7 +7842,7 @@ function scheduleClaudeUsageReporting(state, options) {
             level: "warn",
             message: "Claude usage reporting is forced on but no usable Claude Code login was found \u2014 run `claude` to sign in; reporting will keep retrying"
           });
-          scheduleNextTick(false);
+          scheduleNextTick();
         } else if (isProbe) {
           logActivity(state, {
             type: "info",
@@ -7807,7 +7857,7 @@ function scheduleClaudeUsageReporting(state, options) {
             level: "debug",
             message: `Claude usage reporting: ${error2.message}`
           });
-          scheduleNextTick(false);
+          scheduleNextTick();
         }
       } else {
         consecutiveFailures++;
@@ -7817,7 +7867,7 @@ function scheduleClaudeUsageReporting(state, options) {
           level: claudeUsageFailureLogLevel(consecutiveFailures),
           message: `Claude usage reporting failed: ${message}${claudeUsageFailureStreakSuffix(consecutiveFailures)}`
         });
-        scheduleNextTick(false);
+        scheduleNextTick();
       }
     }
   };