ennodia 0.5.2 → 0.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ennodia",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "mcpName": "io.github.cherninlab/ennodia",
   "description": "Connects the AI agents you use: your agent hands a task to another and gets the answer back",
   "license": "MIT",

package/src/diagnosis.ts

@@ -1,5 +1,6 @@
 import type { TaskView } from "./tasks";
 import { truncate } from "./internal";
+import { openCodeQuotaError } from "./harnesses";
 
 export type TaskOutputPreview = {
   harnessId: string;
@@ -150,7 +151,8 @@ export function hasCodexQuotaError(stdout: string): boolean {
 }
 
 function hasQuotaError(task: TaskView): boolean {
-  return task.harnessId === "codex" && (hasCodexQuotaError(task.stdout) || hasCodexQuotaError(task.stderr));
+  return task.harnessId === "opencode" ? Boolean(openCodeQuotaError(task.stderr))
+    : task.harnessId === "codex" && (hasCodexQuotaError(task.stdout) || hasCodexQuotaError(task.stderr));
 }
 
 function hasAuthenticationError(task: TaskView): boolean {

package/src/harnesses.ts

@@ -95,6 +95,8 @@ export type HarnessAdapter = {
   extractSessionId?: (stdout: string) => string | undefined;
   /** Some public CLIs report a semantic failure with exit code zero. */
   failureReason?: (stdout: string, stderr: string) => string | undefined;
+  /** A confirmed native failure that must stop a still-running CLI. */
+  streamFailureReason?: (stdout: string, stderr: string) => string | undefined;
   /** The CLI accepts operator instructions separately from the prompt. A
    * worker then reads Ennodia's limits as its session's own, not as text
    * inside the task, which a careful model can distrust. */
@@ -312,8 +314,10 @@ export const harnessAdapters: HarnessAdapter[] = [
     notes: ["Runs through `opencode run` without permission-bypass flags."],
     // Concurrent starts can fail while another instance holds its database.
     startupConflict: /database is locked/i,
+    streamFailureReason: (_stdout, stderr) => openCodeQuotaError(stderr),
     buildCommand: (commandPath, input) => {
-      const args = ["run"];
+      // Retryable provider errors otherwise stay in OpenCode's private log.
+      const args = ["run", "--print-logs", "--log-level", "ERROR"];
 
       if (input.cwd) {
         args.push("--dir", input.cwd);
@@ -501,6 +505,24 @@ export const harnessAdapters: HarnessAdapter[] = [
   },
 ];
 
+/** OpenCode's public --print-logs stderr; never inspect worker stdout here. */
+export function openCodeQuotaError(stderr: string): string | undefined {
+  for (const line of stderr.split(/\r?\n/)) {
+    if (!/^timestamp=\S+ level=ERROR /.test(line) ||
+        !/ message="stream error" /.test(line) ||
+        !/ small=false /.test(line) || !/ mode=primary /.test(line)) continue;
+    // Ignore small/title requests: they can fail while the main agent works.
+    const encoded = / error\.error=("(?:[^"\\]|\\.)*")(?= |$)/.exec(line)?.[1];
+    if (!encoded) continue;
+    let message: string;
+    try { message = JSON.parse(encoded); } catch { continue; }
+    if (/^AI_APICallError:\s*(?:OpenCode )?Go usage limit (?:reached|exceeded)\b/i.test(message)) {
+      return message.replace(/^AI_APICallError:\s*/i, "");
+    }
+  }
+  return undefined;
+}
+
 function extractCodexSessionId(stdout: string): string | undefined {
   for (const line of stdout.split(/\r?\n/)) {
     const event = parseJsonObject(line);

package/src/readiness.ts

@@ -4,6 +4,7 @@ import { homedir, tmpdir } from "node:os";
 import { join, resolve } from "node:path";
 import { stripVTControlCharacters } from "node:util";
 import type { CommandSpec, HarnessAdapter, HarnessDiscovery, HarnessRunInput } from "./harnesses";
+import { openCodeQuotaError } from "./harnesses";
 import { signalOwnedProcess } from "./process";
 
 export type ReadinessState = "unverified" | "ready" | "login-required" | "credentials-expired" | "setup-required" | "model-unavailable" | "quota-exhausted" | "unreachable" | "updating";
@@ -42,6 +43,7 @@ export class HarnessReadinessError extends Error {
 
 /** Recognize native failure envelopes, never quoted prose inside an answer. */
 export function nativeReadinessFailure(stdout: string, stderr: string, allowPlainStdout = false): ReadinessState | undefined {
+  if (openCodeQuotaError(stderr)) return "quota-exhausted";
   const stderrLines = stripVTControlCharacters(stderr).split(/\r?\n/);
   const lines = [...stderrLines, ...stripVTControlCharacters(stdout).split(/\r?\n/)];
   for (const [index, line] of lines.entries()) {

package/src/tasks.ts

@@ -145,6 +145,8 @@ type InternalTask = Omit<
   isolatedCwd?: string;
   extractUsage?: HarnessAdapter["extractUsage"];
   failureReason?: HarnessAdapter["failureReason"];
+  streamFailureReason?: HarnessAdapter["streamFailureReason"];
+  streamFailure?: string;
   /** The exact spawn, kept so a start that met a startup conflict can run again. */
   spawnInput: TaskSpawnInput;
   stdinText?: string;
@@ -379,6 +381,7 @@ ${noticeLines.join("\n")}
       isolatedCwd,
       extractUsage: adapter.extractUsage,
       failureReason: adapter.failureReason,
+      streamFailureReason: adapter.streamFailureReason,
       spawnInput,
       stdinText: commandSpec.stdin,
       startupConflict: adapter.startupConflict,
@@ -407,7 +410,7 @@ ${noticeLines.join("\n")}
     ]).then(() => undefined);
 
     task.timeout = setTimeout(() => {
-      if (task.cancelRequested) {
+      if (task.cancelRequested || task.streamFailure) {
         return;
       }
 
@@ -549,7 +552,7 @@ ${noticeLines.join("\n")}
         terminalStatus = "cancelled";
       } else {
         terminalStatus =
-          exitCode === 0 && !task.timedOut && !task.drainTimedOut
+          exitCode === 0 && !task.timedOut && !task.drainTimedOut && !task.streamFailure
             ? "succeeded"
             : "failed";
       }
@@ -628,7 +631,7 @@ ${noticeLines.join("\n")}
   private metStartupConflict(task: InternalTask): boolean {
     return Boolean(task.startupConflict?.test(task.stderr)) &&
       !task.stdout.trim() &&
-      !task.cancelRequested && !task.timedOut && !task.drainTimedOut && !this.shuttingDown &&
+      !task.cancelRequested && !task.timedOut && !task.drainTimedOut && !task.streamFailure && !this.shuttingDown &&
       (task.startupRestarts ?? 0) < MAX_STARTUP_RESTARTS &&
       Date.now() - task.attemptStartedAtMs < STARTUP_CONFLICT_WINDOW_MS;
   }
@@ -903,6 +906,7 @@ ${noticeLines.join("\n")}
         }
         task.streamCaptureTruncated ||= task[streamName].length + chunk.length > MAX_CAPTURE_CHARS;
         task[streamName] = appendLimited(task[streamName], chunk);
+        this.checkStreamFailure(task);
         task.lastOutputAtMs = Date.now();
         this.pushEvent(task, { type: streamName, message: chunk });
         this.touch(task);
@@ -912,6 +916,7 @@ ${noticeLines.join("\n")}
       if (finalChunk) {
         task.streamCaptureTruncated ||= task[streamName].length + finalChunk.length > MAX_CAPTURE_CHARS;
         task[streamName] = appendLimited(task[streamName], finalChunk);
+        this.checkStreamFailure(task);
         task.lastOutputAtMs = Date.now();
         this.pushEvent(task, { type: streamName, message: finalChunk });
         this.touch(task);
@@ -922,6 +927,20 @@ ${noticeLines.join("\n")}
     }
   }
 
+  private checkStreamFailure(task: InternalTask): void {
+    if (!task.streamFailureReason || task.streamFailure || task.cancelRequested || task.timedOut) return;
+    try {
+      const reason = task.streamFailureReason(task.stdout, task.stderr);
+      if (!reason) return;
+      task.streamFailure = reason;
+      this.pushEvent(task, { type: "error", message: reason });
+      this.terminate(task);
+    } catch (error) {
+      task.streamFailureReason = undefined;
+      this.pushEvent(task, { type: "error", message: `Adapter stream check failed: ${String(error)}` });
+    }
+  }
+
   private toView(task: InternalTask, options: TaskViewOptions = {}): TaskView {
     const now = Date.now();
     const end = task.endedAtMs ?? now;

package/src/version.ts

@@ -1 +1 @@
-export const ENNODIA_VERSION = "0.5.2";
+export const ENNODIA_VERSION = "0.5.3";