@evident-ai/cli 3.0.1-dev.6bbae3a → 3.0.1-dev.7272711

package/dist/index.js

@@ -1126,36 +1126,6 @@ async function sessionExists(port, id) {
     return null;
   }
 }
-async function getSessionStatuses(port) {
-  try {
-    const res = await fetch(`${opencodeBase(port)}/session/status`);
-    if (!res.ok) {
-      console.error(
-        `[getSessionStatuses] GET /session/status returned HTTP ${res.status} (port ${port})`
-      );
-      return null;
-    }
-    const body = await res.json();
-    if (body == null || typeof body !== "object" || Array.isArray(body)) {
-      console.error(
-        `[getSessionStatuses] GET /session/status body was not a plain object (port ${port})`
-      );
-      return null;
-    }
-    return body;
-  } catch (err) {
-    console.error(
-      `[getSessionStatuses] GET /session/status failed (port ${port}): ${err instanceof Error ? err.message : String(err)}`
-    );
-    return null;
-  }
-}
-async function isSessionOngoing(port, id) {
-  const map = await getSessionStatuses(port);
-  if (map == null) return null;
-  const entry = map[id];
-  return entry != null && entry.type !== "idle";
-}
 async function createOpenCodeSession(port, directory) {
   const url = new URL(`${opencodeBase(port)}/session`);
   if (directory && directory.trim()) {
@@ -1820,7 +1790,6 @@ var DEFAULT_PAUSED_POLL_INTERVAL_MS = 2e3;
 var DEFAULT_PAUSED_MAX_WAIT_MS = 10 * 60 * 1e3;
 var DEFAULT_STUCK_QUEUED_MS = 6e4;
 var HEARTBEAT_MS = 6e4;
-var ABSOLUTE_MAX_PROCESSING_MS = 6 * 60 * 60 * 1e3;
 var POLL_MISS_GRACE_MS = HEARTBEAT_MS;
 var ChannelAuthError = class extends Error {
   constructor(message) {
@@ -1918,15 +1887,6 @@ var ChannelDriver = class {
    * the row leaves the processing list, exactly like `dontRedispatch`.
    */
   doneUndeliverable = /* @__PURE__ */ new Set();
-  /**
-   * "Already emitted `readopt_poll_unresolved` for this row" (#229). The b1 /
-   * unreadable-status re-evaluate leaf leaves the row UN-tracked so it is re-read
-   * every ~2s drain until the status map becomes readable — but the server-visible
-   * signal is an OUTCOME, so it must fire at most ONCE per row, not once per drain
-   * (Bugbot "Re-adopt signals flood every drain"). Cleared when the row leaves the
-   * processing list, exactly like `dontRedispatch`/`doneUndeliverable`.
-   */
-  readoptPollUnresolvedSignalled = /* @__PURE__ */ new Set();
   /**
    * "A null-id re-adopt re-dispatch is in flight, awaiting its read-back" (WI-5
    * Task 5.4, High-2). Since we no longer send a caller-supplied id, a re-dispatch
@@ -2314,7 +2274,6 @@ var ChannelDriver = class {
       opencodeMessageId,
       message,
       dispatchedAt: now,
-      processingAnchorMs: now,
       deadline: now + this.pausedMaxWaitMs,
       started: false,
       done: false,
@@ -2373,10 +2332,6 @@ var ChannelDriver = class {
       opencodeMessageId,
       message,
       dispatchedAt: this.now(),
-      // Anchor the absolute-age ceiling to the SERVER-SIDE `processed_at` (the same
-      // value seeding `deadline`), NOT `dispatchedAt` — so a re-adopted zombie's age
-      // reflects the real turn duration and the ceiling fires on the ORIGINAL turn.
-      processingAnchorMs: processedAtMs,
       deadline: processedAtMs + this.pausedMaxWaitMs,
       // The server row is ALREADY `processing`; do not re-fire markProcessing.
       started: true,
@@ -2665,19 +2620,6 @@ var ChannelDriver = class {
       });
     }
     const activelyRunning = state === "running" && !awaitingHuman;
-    if (activelyRunning && this.now() - inFlight.processingAnchorMs >= ABSOLUTE_MAX_PROCESSING_MS) {
-      this.log({
-        level: "error",
-        message: `Message ${inFlight.evidentMessageId.slice(0, 8)} exceeded the absolute processing ceiling (${Math.round((this.now() - inFlight.processingAnchorMs) / 6e4)}min, session ${sessionId}) while still actively running \u2014 releasing so the cron can reclaim it`,
-        conversation_id: conv.id,
-        message_id: inFlight.evidentMessageId
-      });
-      void this.postSignal(conv.id, inFlight.evidentMessageId, "gave_up", {
-        watched_for_ms: this.now() - inFlight.processingAnchorMs
-      });
-      this.removeInFlight(watcher, inFlight.evidentMessageId);
-      return;
-    }
     if (activelyRunning && !inFlight.awaitingHumanLatched && !inFlight.aliveInFlight && this.now() - inFlight.lastAliveAt >= HEARTBEAT_MS) {
       inFlight.aliveInFlight = true;
       void this.postSignal(conv.id, inFlight.evidentMessageId, "alive").then((ok) => {
@@ -2740,17 +2682,12 @@ var ChannelDriver = class {
    */
   async readoptProcessing() {
     const rows = await this.getProcessingMessages();
-    if (this.dontRedispatch.size > 0 || this.doneUndeliverable.size > 0 || this.readoptPollUnresolvedSignalled.size > 0) {
+    if (this.dontRedispatch.size > 0 || this.doneUndeliverable.size > 0) {
       const stillProcessing = new Set(rows.map((r) => r.id));
-      for (const id of [
-        ...this.dontRedispatch,
-        ...this.doneUndeliverable,
-        ...this.readoptPollUnresolvedSignalled
-      ]) {
+      for (const id of [...this.dontRedispatch, ...this.doneUndeliverable]) {
         if (!stillProcessing.has(id)) {
           const cleared = this.dontRedispatch.delete(id);
           const clearedUndeliverable = this.doneUndeliverable.delete(id);
-          this.readoptPollUnresolvedSignalled.delete(id);
           if (cleared || clearedUndeliverable) {
             this.log({
               level: "info",
@@ -2804,10 +2741,8 @@ var ChannelDriver = class {
         });
         continue;
       }
-      const anyUntracked = sessionRows.some((row) => !this.isTracked(sessionId, row.id));
-      const sessionOngoing = anyUntracked ? await isSessionOngoing(this.port, sessionId) : null;
       for (const row of sessionRows) {
-        await this.readoptOne(sessionId, row, messages, sessionOngoing);
+        await this.readoptOne(sessionId, row, messages);
       }
     }
   }
@@ -2829,7 +2764,7 @@ var ChannelDriver = class {
    *
    * Only `ChannelAuthError` propagates.
    */
-  async readoptOne(sessionId, row, messages, sessionOngoing) {
+  async readoptOne(sessionId, row, messages) {
     if (this.isTracked(sessionId, row.id)) {
       this.log({
         level: "info",
@@ -2869,7 +2804,6 @@ var ChannelDriver = class {
             conversation_id: row.conversation_id,
             message_id: row.id
           });
-          void this.postSignal(row.conversation_id, row.id, "readopt_undeliverable");
           return;
         }
         this.log({
@@ -2881,7 +2815,6 @@ var ChannelDriver = class {
         return;
       }
       this.dontRedispatch.delete(row.id);
-      void this.postSignal(row.conversation_id, row.id, "readopt_done");
       return;
     }
     if (state === "failed") {
@@ -2904,7 +2837,6 @@ var ChannelDriver = class {
             conversation_id: row.conversation_id,
             message_id: row.id
           });
-          void this.postSignal(row.conversation_id, row.id, "readopt_undeliverable");
           return;
         }
         this.log({
@@ -2916,7 +2848,6 @@ var ChannelDriver = class {
         return;
       }
       this.dontRedispatch.delete(row.id);
-      void this.postSignal(row.conversation_id, row.id, "readopt_failed");
       return;
     }
     if (this.dontRedispatch.has(row.id)) {
@@ -2928,52 +2859,7 @@ var ChannelDriver = class {
       });
       return;
     }
-    let statusReadableOngoing = null;
-    if (state === "running" && ocId) {
-      const reply = findLastAssistantReplyFor(messages, ocId);
-      const shape = this.replyCompletionShape(reply);
-      const ongoing = sessionOngoing;
-      statusReadableOngoing = ongoing;
-      if (ongoing === false) {
-        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)`,
-          conversation_id: row.conversation_id,
-          message_id: row.id
-        });
-        await this.forceReadoptRun(sessionId, row);
-        return;
-      }
-      if (ongoing === true) {
-        this.log({
-          level: "info",
-          message: `Re-adopt: message ${row.id.slice(0, 8)} running/${shape} and session ${sessionId.slice(0, 8)} is ongoing per GET /session/status (busy/retry) \u2014 re-attaching watcher (no re-dispatch)`,
-          conversation_id: row.conversation_id,
-          message_id: row.id
-        });
-      } else {
-        if (shape === "b1") {
-          this.log({
-            level: "info",
-            message: `Re-adopt: message ${row.id.slice(0, 8)} running/b1 but GET /session/status was unreadable (null) for session ${sessionId.slice(0, 8)} \u2014 NOT latching a b1 row on a transient status blip; leaving it un-tracked to re-evaluate on the next drain`,
-            conversation_id: row.conversation_id,
-            message_id: row.id
-          });
-          if (!this.readoptPollUnresolvedSignalled.has(row.id)) {
-            this.readoptPollUnresolvedSignalled.add(row.id);
-            void this.postSignal(row.conversation_id, row.id, "readopt_poll_unresolved");
-          }
-          return;
-        }
-        this.log({
-          level: "info",
-          message: `Re-adopt: message ${row.id.slice(0, 8)} running/${shape} but GET /session/status was unreadable (null) for session ${sessionId.slice(0, 8)} \u2014 falling back to the #253 preamble + descendant cross-check`,
-          conversation_id: row.conversation_id,
-          message_id: row.id
-        });
-      }
-    }
-    if (statusReadableOngoing === null && state === "running" && ocId && isPreamblePinnedRunning(messages, ocId)) {
+    if (state === "running" && ocId && isPreamblePinnedRunning(messages, ocId)) {
       const descendantAlive = await this.isAnyDescendantSessionAlive(sessionId);
       if (descendantAlive === true) {
         this.log({
@@ -3006,7 +2892,6 @@ var ChannelDriver = class {
         conversation_id: row.conversation_id,
         message_id: row.id
       });
-      void this.postSignal(row.conversation_id, row.id, "readopt_reattached");
       return;
     }
     await this.forceReadoptRun(sessionId, row);
@@ -3059,7 +2944,6 @@ var ChannelDriver = class {
         conversation_id: row.conversation_id,
         message_id: row.id
       });
-      void this.postSignal(row.conversation_id, row.id, "readopt_window_elapsed");
       return;
     }
     const options = {
@@ -3088,7 +2972,6 @@ var ChannelDriver = class {
         conversation_id: row.conversation_id,
         message_id: row.id
       });
-      void this.postSignal(row.conversation_id, row.id, "readopt_orphan_unsent");
       return;
     }
     if (ocId === null) {
@@ -3099,7 +2982,6 @@ var ChannelDriver = class {
         conversation_id: row.conversation_id,
         message_id: row.id
       });
-      void this.postSignal(row.conversation_id, row.id, "readopt_orphan_unsent");
       return;
     }
     const conv = this.convForRow(sessionId, row);
@@ -3109,7 +2991,6 @@ var ChannelDriver = class {
     this.readopted.add(row.id);
     this.awaitingReadopt.delete(row.id);
     this.ensureWatcherRunning(sessionId);
-    void this.postSignal(row.conversation_id, row.id, "readopt_redispatched");
   }
   /**
    * True if `evidentMessageId` is already being driven — either in the
@@ -3377,25 +3258,6 @@ var ChannelDriver = class {
     }
     return false;
   }
-  /**
-   * Cheap decision-telemetry label for a running row's LAST correlated reply
-   * (WI-2 Task 2.2): which running SHAPE it is, for the status-gated recovery log.
-   *   - `b1`    — the reply itself is still in flight (`time.completed == null`) —
-   *               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.
-   */
-  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";
-  }
   /**
    * Attribute a surfaced interaction to the in-flight message it paused on (M-1).
    *