@evident-ai/cli 3.6.1-dev.22e9703 → 3.6.1-dev.2a0b3d1

package/dist/index.js

@@ -1445,7 +1445,7 @@ import ora4 from "ora";
 import { select as select4 } from "@inquirer/prompts";
 
 // src/lib/telemetry.ts
-var CLI_VERSION = (true ? "3.6.1-dev.22e9703" : void 0) ?? process.env.npm_package_version ?? "unknown";
+var CLI_VERSION = (true ? "3.6.1-dev.2a0b3d1" : void 0) ?? process.env.npm_package_version ?? "unknown";
 function getCliVersion() {
   return CLI_VERSION;
 }
@@ -3880,6 +3880,13 @@ function withRequestTimeout(fetchImpl, timeoutMs) {
 }
 
 // src/lib/opencode/client.ts
+var OpenCodeRequestError = class extends Error {
+  constructor(statusCode, message) {
+    super(message);
+    this.statusCode = statusCode;
+    this.name = "OpenCodeRequestError";
+  }
+};
 function redactPassword(message, password) {
   return message.replaceAll(password, "[redacted]");
 }
@@ -3901,7 +3908,8 @@ function createOpenCodeClient(options) {
         const response = await fetchImpl(`${baseUrl}${path}`, requestInit);
         if (!response.ok && !requestOptions?.allowStatuses?.includes(response.status)) {
           const body = await response.text();
-          throw new Error(
+          throw new OpenCodeRequestError(
+            response.status,
             `OpenCode request failed: HTTP ${response.status}${body ? `: ${body}` : ""}`
           );
         }
@@ -3909,7 +3917,11 @@ function createOpenCodeClient(options) {
       } catch (error2) {
         if (options.version === "v2" && password !== null) {
           const message = error2 instanceof Error ? error2.message : String(error2);
-          throw new Error(redactPassword(message, password));
+          const redactedMessage = redactPassword(message, password);
+          if (error2 instanceof OpenCodeRequestError) {
+            throw new OpenCodeRequestError(error2.statusCode, redactedMessage);
+          }
+          throw new Error(redactedMessage);
         }
         throw error2;
       }
@@ -4585,21 +4597,24 @@ function findLastAssistantReplyFor(messages, userMessageId) {
   }
   return last;
 }
+function assistantMessagesInTurnBlock(messages, userMessageId) {
+  const userIndex = messages.findIndex((message) => idOf2(message) === userMessageId);
+  if (userIndex === -1) return [];
+  const assistants = [];
+  for (let i = userIndex + 1; i < messages.length; i++) {
+    const message = messages[i];
+    const role = roleOf2(message);
+    if (role === "user") break;
+    if (role === "assistant") assistants.push(message);
+  }
+  return assistants;
+}
 function collectSubagentSessions(messages, userMessageId) {
   if (!messages || messages.length === 0) return [];
   const byParent = messages.filter(
     (message) => roleOf2(message) === "assistant" && parentIdOf2(message) === userMessageId
   );
-  const assistants = byParent.length > 0 ? byParent : [];
-  if (assistants.length === 0) {
-    const userIndex = messages.findIndex((message) => idOf2(message) === userMessageId);
-    if (userIndex === -1) return [];
-    for (let i = userIndex + 1; i < messages.length; i++) {
-      const message = messages[i];
-      if (roleOf2(message) === "user") break;
-      if (roleOf2(message) === "assistant") assistants.push(message);
-    }
-  }
+  const assistants = byParent.length > 0 ? byParent : assistantMessagesInTurnBlock(messages, userMessageId);
   const refs = [];
   const seen = /* @__PURE__ */ new Set();
   for (const message of assistants) {
@@ -4754,8 +4769,7 @@ function messageUsage(messages, userMessageId) {
   if (byParentAll.length > 0) {
     correlated = byParentAll;
   } else {
-    const reply = findAssistantReplyAfter(messages, userMessageId);
-    correlated = reply ? [reply] : [];
+    correlated = assistantMessagesInTurnBlock(messages, userMessageId);
   }
   if (correlated.length === 0) return null;
   return sumAssistantUsage(correlated);
@@ -4977,39 +4991,85 @@ async function hasAnyConfiguredProvider(port, client) {
       );
       return null;
     }
-    const path = `/api/integration?location%5Bdirectory%5D=${encodeURIComponent(directory)}`;
+    const query = `?location%5Bdirectory%5D=${encodeURIComponent(directory)}`;
+    const integrationPath = `/api/integration${query}`;
+    let integrationReady = null;
     try {
-      const res = await client.request(path);
+      const res = await client.request(integrationPath);
       if (!res.ok) {
         console.error(
-          `[hasAnyConfiguredProvider] GET ${path} returned HTTP ${res.status} (port ${port})`
+          `[hasAnyConfiguredProvider] GET ${integrationPath} returned HTTP ${res.status} (port ${port})`
         );
-        return null;
+      } else {
+        const body = await res.json();
+        if (!body || typeof body !== "object" || Array.isArray(body) || !Array.isArray(body.data)) {
+          console.error(
+            `[hasAnyConfiguredProvider] GET ${integrationPath} body had no integration data array (port ${port})`
+          );
+        } else {
+          let valid = true;
+          for (const integration of body.data) {
+            if (!integration || typeof integration !== "object" || Array.isArray(integration) || typeof integration.id !== "string" || !Array.isArray(integration.connections)) {
+              console.error(
+                `[hasAnyConfiguredProvider] GET ${integrationPath} body contained an invalid integration (port ${port})`
+              );
+              valid = false;
+              break;
+            }
+          }
+          if (valid) {
+            integrationReady = body.data.some(
+              (integration) => integration.connections.length > 0
+            );
+          }
+        }
       }
-      const body = await res.json();
-      if (!body || typeof body !== "object" || Array.isArray(body) || !Array.isArray(body.data)) {
+    } catch (error2) {
+      console.error(
+        `[hasAnyConfiguredProvider] GET ${integrationPath} failed (port ${port}): ${error2 instanceof Error ? error2.message : String(error2)}`
+      );
+    }
+    if (integrationReady === true) return true;
+    const providerPath = `/api/provider${query}`;
+    let providerReady = null;
+    try {
+      const res = await client.request(providerPath);
+      if (!res.ok) {
         console.error(
-          `[hasAnyConfiguredProvider] GET ${path} body had no integration data array (port ${port})`
+          `[hasAnyConfiguredProvider] GET ${providerPath} returned HTTP ${res.status} (port ${port})`
         );
-        return null;
-      }
-      for (const integration of body.data) {
-        if (!integration || typeof integration !== "object" || Array.isArray(integration) || typeof integration.id !== "string" || !Array.isArray(integration.connections)) {
+      } else {
+        const body = await res.json();
+        if (!body || typeof body !== "object" || Array.isArray(body) || !Array.isArray(body.data)) {
           console.error(
-            `[hasAnyConfiguredProvider] GET ${path} body contained an invalid integration (port ${port})`
+            `[hasAnyConfiguredProvider] GET ${providerPath} body had no provider data array (port ${port})`
           );
-          return null;
+        } else {
+          let valid = true;
+          for (const provider of body.data) {
+            if (!provider || typeof provider !== "object" || Array.isArray(provider) || typeof provider.id !== "string") {
+              console.error(
+                `[hasAnyConfiguredProvider] GET ${providerPath} body contained an invalid provider (port ${port})`
+              );
+              valid = false;
+              break;
+            }
+          }
+          if (valid) {
+            providerReady = body.data.some(
+              (provider) => provider.activation === "enabled"
+            );
+          }
         }
       }
-      return body.data.some(
-        (integration) => Array.isArray(integration.connections) && integration.connections.length > 0
-      );
     } catch (error2) {
       console.error(
-        `[hasAnyConfiguredProvider] GET ${path} failed (port ${port}): ${error2 instanceof Error ? error2.message : String(error2)}`
+        `[hasAnyConfiguredProvider] GET ${providerPath} failed (port ${port}): ${error2 instanceof Error ? error2.message : String(error2)}`
       );
-      return null;
     }
+    if (providerReady === true) return true;
+    if (integrationReady === null || providerReady === null) return null;
+    return false;
   }
   try {
     const res = await requestWithClient(port, client, "/config/providers");
@@ -5390,6 +5450,14 @@ var OpenCodeV2PromptAckError = class extends Error {
     this.name = "OpenCodeV2PromptAckError";
   }
 };
+var OpenCodeV2ModelSwitchError = class extends Error {
+  statusCode;
+  constructor(error2) {
+    super(error2 instanceof Error ? error2.message : String(error2));
+    this.name = "OpenCodeV2ModelSwitchError";
+    this.statusCode = error2 instanceof OpenCodeRequestError ? error2.statusCode : null;
+  }
+};
 async function getOpenCodeDirectoryV2(client) {
   try {
     return adaptV2Location(await readJson(await client.request("/api/location")));
@@ -5509,7 +5577,34 @@ async function v2SessionExists(client, sessionId) {
     return null;
   }
 }
-async function sendV2Prompt(client, sessionId, text) {
+async function sendV2Prompt(client, sessionId, text, options, onInvalidModelSelection) {
+  const modelSelection = options?.model?.trim();
+  const { model, variant } = splitModelVariant(modelSelection);
+  const separator = model?.indexOf("/") ?? -1;
+  const modelReference = model && separator > 0 && separator < model.length - 1 ? {
+    id: model.slice(separator + 1),
+    providerID: model.slice(0, separator),
+    ...variant ? { variant } : {}
+  } : void 0;
+  if (modelSelection && !modelReference) onInvalidModelSelection?.();
+  if (options?.agent) {
+    await client.request(`/api/session/${encodeURIComponent(sessionId)}/agent`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ agent: options.agent })
+    });
+  }
+  if (modelReference) {
+    try {
+      await client.request(`/api/session/${encodeURIComponent(sessionId)}/model`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ model: modelReference })
+      });
+    } catch (error2) {
+      throw new OpenCodeV2ModelSwitchError(error2);
+    }
+  }
   const path = `/api/session/${encodeURIComponent(sessionId)}/prompt`;
   const response = await client.request(path, {
     method: "POST",
@@ -10095,7 +10190,13 @@ var ChannelDriver = class _ChannelDriver {
             false
           );
         }
-        opencodeMessageId = this.isV2 ? await sendV2Prompt(this.openCodeClient, sessionId, message.content) : await this.dispatchLocked(
+        opencodeMessageId = this.isV2 ? await sendV2Prompt(
+          this.openCodeClient,
+          sessionId,
+          message.content,
+          options,
+          () => this.logInvalidV2ModelSelection(conv.id, message.id)
+        ) : await this.dispatchLocked(
           sessionId,
           () => sendPromptAsync(
             this.port,
@@ -10170,6 +10271,10 @@ var ChannelDriver = class _ChannelDriver {
           this.signalDispatchNotStarted(conv, message, "session_existence_unknown");
           break;
         }
+        if (this.isV2 && err instanceof OpenCodeV2ModelSwitchError) {
+          await this.failV2ModelSwitch(conv, message, sessionId, err);
+          break;
+        }
         const errorMessage4 = err instanceof Error ? err.message : String(err);
         this.sessions.delete(conv.id);
         this.supersede(conv.id, sessionId);
@@ -10763,6 +10868,14 @@ var ChannelDriver = class _ChannelDriver {
     this.dispatchNotStartedSignalled.set(message.id, branch);
     void this.postSignal(conv.id, message.id, "dispatch_not_started", { branch });
   }
+  logInvalidV2ModelSelection(conversationId, messageId) {
+    this.log({
+      level: "warn",
+      message: `Skipping an invalid OpenCode V2 model selection for message ${messageId.slice(0, 8)}; expected provider/model format`,
+      conversation_id: conversationId,
+      message_id: messageId
+    });
+  }
   /**
    * Class B (#1340): the runner DECIDED an outcome (reattach/settle/fail_permanent)
    * but its own PATCH to record it failed. Fires at most once per (message,
@@ -13403,7 +13516,13 @@ var ChannelDriver = class _ChannelDriver {
     let ocId;
     let preDispatchUserIds = null;
     try {
-      ocId = this.isV2 ? await sendV2Prompt(this.openCodeClient, sessionId, row.content) : await this.dispatchLocked(
+      ocId = this.isV2 ? await sendV2Prompt(
+        this.openCodeClient,
+        sessionId,
+        row.content,
+        options,
+        () => this.logInvalidV2ModelSelection(row.conversation_id, row.id)
+      ) : await this.dispatchLocked(
         sessionId,
         () => sendPromptAsync(
           this.port,
@@ -13459,6 +13578,10 @@ var ChannelDriver = class _ChannelDriver {
           this.untrackableAck.set(row.id, errorMessage4);
           this.untrackableAckSessionIds.set(row.id, sessionId);
         }
+        if (err instanceof OpenCodeV2ModelSwitchError) {
+          await this.failV2ModelSwitch(readoptConv, readoptMessage, sessionId, err);
+          return;
+        }
         this.log({
           level: "error",
           message: `V2 re-adopt dispatch for message ${row.id.slice(0, 8)} failed: ${errorMessage4}`,
@@ -14536,6 +14659,38 @@ var ChannelDriver = class _ChannelDriver {
     }
     this.clearSubagentInvocationCaches(messageId);
   }
+  async failV2ModelSwitch(conv, message, sessionId, error2) {
+    const { model } = splitModelVariant(message.opencode_model ?? void 0);
+    const separator = model?.indexOf("/") ?? -1;
+    const classification = error2.statusCode === 404 && model && separator > 0 && separator < model.length - 1 ? {
+      kind: "model_auth",
+      providerId: model.slice(0, separator),
+      modelId: model.slice(separator + 1),
+      reason: "missing"
+    } : null;
+    this.log({
+      level: "error",
+      message: `OpenCode could not apply the selected model for message ${message.id.slice(0, 8)}: ${error2.message}`,
+      conversation_id: conv.id,
+      message_id: message.id
+    });
+    try {
+      await this.markFailed(conv.id, message.id, sessionId, error2.message, void 0, {
+        classification,
+        errorShape: { name: null, statusCode: error2.statusCode }
+      });
+    } catch (markErr) {
+      this.log({
+        level: "warn",
+        message: `markFailed PATCH for V2 model switch failure on message ${message.id.slice(0, 8)} (conversation ${conv.id.slice(0, 8)}) failed: ${markErr instanceof Error ? markErr.message : String(markErr)}`,
+        conversation_id: conv.id,
+        message_id: message.id
+      });
+      this.signalDispatchNotStarted(conv, message, "failure_unreported");
+      return;
+    }
+    if (classification) await this.repairProviderRegistry(conv.id, message.id);
+  }
   /**
    * Classify an errored turn and extract its bounded error shape for `markFailed`.
    *
@@ -15841,14 +15996,21 @@ function request2(options) {
 function safeFailure(operation, status2) {
   return status2 === void 0 ? `${operation} could not reach the managed credential service` : `${operation} returned HTTP ${status2}`;
 }
-function logTransportFailure(options, operation, error2, authorization) {
-  let detail = error2 instanceof Error ? error2.message : String(error2);
+function redactAuthorizedText(message, authorization) {
+  let redacted = message;
   const credential = authorization.split(/\s+/, 2)[1];
   for (const secret of [authorization, credential]) {
-    if (secret) detail = detail.replaceAll(secret, "[redacted]");
+    if (secret) redacted = redacted.replaceAll(secret, "[redacted]");
   }
+  return redactDiagnosticText(redacted);
+}
+function logTransportFailure(options, operation, error2, authorization) {
+  const detail = redactAuthorizedText(
+    error2 instanceof Error ? error2.message : String(error2),
+    authorization
+  );
   options.log(
-    `MANAGED-INFERENCE-TRANSPORT-FAILED: operation=${operation} detail=${redactDiagnosticText(detail)}`,
+    `MANAGED-INFERENCE-TRANSPORT-FAILED: operation=${operation} detail=${detail}`,
     "debug"
   );
 }
@@ -15911,7 +16073,14 @@ async function discoverManagedInferenceSetup(options) {
     return { kind: "none" };
   }
   if (!response.ok) {
-    return { kind: "failed", reason: safeFailure("Managed setup discovery", response.status) };
+    const body2 = await responseJson(response);
+    const serverMessage = typeof body2?.error === "string" && body2.error.trim() ? redactAuthorizedText(body2.error.trim(), headers.Authorization).slice(0, 500) : void 0;
+    const failure = serverMessage ? `Managed setup discovery returned HTTP ${response.status}: ${serverMessage}` : safeFailure("Managed setup discovery", response.status);
+    const runnerKeyGuidance = response.status === 401 || response.status === 403 ? "Authenticate as this runner with its runner key (EVIDENT_RUNNER_KEY)." : void 0;
+    return {
+      kind: "failed",
+      reason: runnerKeyGuidance ? `${failure}. ${runnerKeyGuidance}` : failure
+    };
   }
   const body = await responseJson(response);
   const setup = readSetup(body?.setup);