@evident-ai/cli 3.1.1-dev.b860956 → 3.1.1-dev.e69750c

package/README.md

@@ -85,6 +85,7 @@ Options:
 
 - `-a, --agent [id]` — Runner ID to connect to. Optional when `EVIDENT_AGENT_KEY`
   is set (the runner is then resolved automatically from the key).
+- `--runner [id]` — Alias for `--agent` (preferred name; wins if both are given).
 - `-p, --port <port>` — OpenCode port (default: `4096`).
 - `--log-level <level>` — Log verbosity: `debug | info | warn | error` (default:
   `info`). Env: `EVIDENT_LOG_LEVEL`.
@@ -105,15 +106,18 @@ targets the **production** Evident platform by default.
 
 ## Environment variables
 
-- `EVIDENT_AGENT_KEY` — A runner key. When set, `evident run` authenticates as
-  that runner and resolves the runner ID automatically, so `--agent` is not
-  required. Ideal for CI/CD.
+- `EVIDENT_RUNNER_KEY` — A runner key. When set, `evident run` authenticates as
+  that runner and resolves the runner ID automatically, so `--runner`/`--agent`
+  is not required. Ideal for CI/CD. Preferred name; wins over `EVIDENT_AGENT_KEY`
+  if both are set.
+- `EVIDENT_AGENT_KEY` — Alias for `EVIDENT_RUNNER_KEY` (still fully supported).
 - `EVIDENT_TOKEN` — A user token used for authentication (alternative to a
   keychain login from `evident login`).
 - `EVIDENT_API_URL` — Override the API base URL (equivalent to `--endpoint`).
 - `EVIDENT_TUNNEL_URL` — Override the tunnel relay URL (equivalent to `--tunnel`).
 
-Authentication precedence for `run`: `EVIDENT_AGENT_KEY` → `EVIDENT_TOKEN` →
+Authentication precedence for `run`: `EVIDENT_RUNNER_KEY`/`EVIDENT_AGENT_KEY`
+(tied; `EVIDENT_RUNNER_KEY` wins if both are set) → `EVIDENT_TOKEN` →
 credentials stored by `evident login`. For the URL flags, an explicit
 `--endpoint` / `--tunnel` flag wins over the matching environment variable, which
 in turn overrides the production default.
@@ -150,6 +154,8 @@ For CI or unattended use, set `EVIDENT_AGENT_KEY` and omit `--agent`:
 EVIDENT_AGENT_KEY=<agent-key> evident run --idle-timeout 30
 ```
 
+(`EVIDENT_RUNNER_KEY` is equivalent and the preferred name — use whichever you like.)
+
 ## How it works
 
 ```

package/dist/index.js

@@ -650,7 +650,15 @@ var EventTypes = {
 
 // src/lib/auth.ts
 async function getAuthCredentials() {
+  const runnerKey = process.env.EVIDENT_RUNNER_KEY;
   const agentKey = process.env.EVIDENT_AGENT_KEY;
+  if (runnerKey) {
+    return {
+      token: runnerKey,
+      authType: "agent_key",
+      notice: agentKey ? "Both EVIDENT_RUNNER_KEY and EVIDENT_AGENT_KEY are set; using EVIDENT_RUNNER_KEY." : void 0
+    };
+  }
   if (agentKey) {
     return { token: agentKey, authType: "agent_key" };
   }
@@ -1370,6 +1378,72 @@ function findLastAssistantReplyFor(messages, userMessageId) {
   }
   return lastOk ?? last;
 }
+function messageUsage(messages, userMessageId) {
+  if (!messages || messages.length === 0) return null;
+  const byParentAll = messages.filter(
+    (m) => roleOf(m) === "assistant" && parentIdOf(m) === userMessageId
+  );
+  const byParentNonErrored = byParentAll.filter((m) => errorOf(m) == null);
+  const byParent = byParentNonErrored.length > 0 ? byParentNonErrored : byParentAll;
+  let correlated;
+  if (byParent.length > 0) {
+    correlated = byParent;
+  } else {
+    const reply = findAssistantReplyAfter(messages, userMessageId);
+    correlated = reply ? [reply] : [];
+  }
+  if (correlated.length === 0) return null;
+  let sawAnyUsage = false;
+  let inputSum = 0;
+  let outputSum = 0;
+  let reasoningSum = 0;
+  let cacheReadSum = 0;
+  let cacheWriteSum = 0;
+  let costSum = 0;
+  let sawCost = false;
+  let modelId = null;
+  let providerId = null;
+  for (const m of correlated) {
+    const info = m.info;
+    if (!info) continue;
+    const tokens = info.tokens;
+    if (tokens) {
+      sawAnyUsage = true;
+      inputSum += tokens.input ?? 0;
+      outputSum += tokens.output ?? 0;
+      reasoningSum += tokens.reasoning ?? 0;
+      cacheReadSum += tokens.cache?.read ?? 0;
+      cacheWriteSum += tokens.cache?.write ?? 0;
+    }
+    if (typeof info.cost === "number") {
+      sawAnyUsage = true;
+      sawCost = true;
+      costSum += info.cost;
+    }
+    if (typeof info.modelID === "string") {
+      sawAnyUsage = true;
+      modelId = info.modelID;
+    }
+    if (typeof info.providerID === "string") {
+      sawAnyUsage = true;
+      providerId = info.providerID;
+    }
+  }
+  if (!sawAnyUsage) return null;
+  return {
+    usage_provider_id: providerId,
+    usage_model_id: modelId,
+    usage_tokens_input: inputSum,
+    usage_tokens_output: outputSum,
+    usage_tokens_reasoning: reasoningSum,
+    usage_tokens_cache_read: cacheReadSum,
+    usage_tokens_cache_write: cacheWriteSum,
+    // NULL means "OpenCode never reported a cost" (never inferred from
+    // tokens) — distinct from a genuine 0-cost turn, which would set
+    // `sawCost` true with `costSum === 0`.
+    usage_cost_usd: sawCost ? costSum : null
+  };
+}
 function messageRunState(messages, userMessageId) {
   if (!messages || messages.length === 0) return "unknown";
   const hasUser = messages.some((m) => idOf(m) === userMessageId);
@@ -2445,7 +2519,7 @@ var ChannelDriver = class {
   }
   /**
    * Fetch ONE inbound image's bytes through Evident's WI-6 endpoint
-   * (`GET {apiUrl}/agents/{agentId}/attachments/{messageId}/{index}`) using the
+   * (`GET {apiUrl}/runners/{agentId}/attachments/{messageId}/{index}`) using the
    * existing authenticated fetch, and base64-encode into a
    * `data:<mime>;base64,<…>` URL for the opencode `file` part's `url`.
    *
@@ -2458,7 +2532,7 @@ var ChannelDriver = class {
   async fetchAttachmentDataUrl(messageId, index, mime) {
     try {
       const res = await this.fetchImpl(
-        `${this.apiUrl}/agents/${this.agentId}/attachments/${messageId}/${index}`,
+        `${this.apiUrl}/runners/${this.agentId}/attachments/${messageId}/${index}`,
         { headers: { Authorization: this.getAuthHeader() } }
       );
       if (!res.ok) {
@@ -2790,13 +2864,15 @@ var ChannelDriver = class {
           message_id: inFlight.evidentMessageId
         });
         const title = await this.resolveSessionTitle(sessionId, watcher.conv.id);
+        const usage = messageUsage(messages, inFlight.opencodeMessageId);
         try {
           await this.markDone(
             conv.id,
             inFlight.evidentMessageId,
             sessionId,
             inFlight.opencodeMessageId,
-            title
+            title,
+            usage
           );
         } catch (err) {
           if (err instanceof ChannelAuthError) throw err;
@@ -2843,8 +2919,9 @@ var ChannelDriver = class {
           conversation_id: conv.id,
           message_id: inFlight.evidentMessageId
         });
+        const usage = messageUsage(messages, inFlight.opencodeMessageId);
         try {
-          await this.markFailed(conv.id, inFlight.evidentMessageId, sessionId, error2);
+          await this.markFailed(conv.id, inFlight.evidentMessageId, sessionId, error2, usage);
         } catch (err) {
           if (err instanceof ChannelAuthError) throw err;
           if (err instanceof ChannelTerminalError) {
@@ -3081,7 +3158,8 @@ var ChannelDriver = class {
       });
       try {
         const title = await this.resolveSessionTitle(sessionId, row.conversation_id);
-        await this.markDone(row.conversation_id, row.id, sessionId, ocId, title);
+        const usage = messageUsage(messages, ocId ?? "");
+        await this.markDone(row.conversation_id, row.id, sessionId, ocId, title, usage);
       } catch (err) {
         if (err instanceof ChannelAuthError) throw err;
         if (err instanceof ChannelTerminalError) {
@@ -3109,6 +3187,7 @@ var ChannelDriver = class {
     }
     if (state === "failed") {
       const error2 = messageError(messages, ocId ?? "") ?? void 0;
+      const usage = messageUsage(messages, ocId ?? "");
       this.log({
         level: "error",
         message: `Re-adopt: message ${row.id.slice(0, 8)} errored while unwatched \u2014 marking failed: ${error2 ?? "(no error text)"}`,
@@ -3116,7 +3195,7 @@ var ChannelDriver = class {
         message_id: row.id
       });
       try {
-        await this.markFailed(row.conversation_id, row.id, sessionId, error2);
+        await this.markFailed(row.conversation_id, row.id, sessionId, error2, usage);
       } catch (err) {
         if (err instanceof ChannelAuthError) throw err;
         if (err instanceof ChannelTerminalError) {
@@ -3719,7 +3798,7 @@ var ChannelDriver = class {
   // Evident API calls (combinedAuth thread routes)
   async getPendingConversations() {
     const res = await this.fetchImpl(
-      `${this.apiUrl}/agents/${this.agentId}/conversations/pending`,
+      `${this.apiUrl}/runners/${this.agentId}/conversations/pending`,
       {
         headers: { Authorization: this.getAuthHeader() }
       }
@@ -3737,7 +3816,7 @@ var ChannelDriver = class {
   }
   async getPendingMessages(conversationId) {
     const res = await this.fetchImpl(
-      `${this.apiUrl}/agents/${this.agentId}/threads/${conversationId}/messages?status=pending`,
+      `${this.apiUrl}/runners/${this.agentId}/threads/${conversationId}/messages?status=pending`,
       { headers: { Authorization: this.getAuthHeader() } }
     );
     this.assertAuth(res, "fetching pending messages");
@@ -3761,7 +3840,7 @@ var ChannelDriver = class {
    */
   async getProcessingMessages() {
     const res = await this.fetchImpl(
-      `${this.apiUrl}/agents/${this.agentId}/conversations/processing`,
+      `${this.apiUrl}/runners/${this.agentId}/conversations/processing`,
       { headers: { Authorization: this.getAuthHeader() } }
     );
     this.assertAuth(res, "fetching processing messages");
@@ -3798,7 +3877,7 @@ var ChannelDriver = class {
    */
   async markProcessing(conversationId, messageId, sessionId, opencodeMessageId, title) {
     const res = await this.fetchImpl(
-      `${this.apiUrl}/agents/${this.agentId}/threads/${conversationId}/messages/${messageId}`,
+      `${this.apiUrl}/runners/${this.agentId}/threads/${conversationId}/messages/${messageId}`,
       {
         method: "PATCH",
         headers: { Authorization: this.getAuthHeader(), "Content-Type": "application/json" },
@@ -3845,9 +3924,9 @@ var ChannelDriver = class {
    *                                    watcher retries next tick within the
    *                                    deadline, Finding 4).
    */
-  async markDone(conversationId, messageId, sessionId, opencodeMessageId, title) {
+  async markDone(conversationId, messageId, sessionId, opencodeMessageId, title, usage) {
     const res = await this.fetchImpl(
-      `${this.apiUrl}/agents/${this.agentId}/threads/${conversationId}/messages/${messageId}`,
+      `${this.apiUrl}/runners/${this.agentId}/threads/${conversationId}/messages/${messageId}`,
       {
         method: "PATCH",
         headers: { Authorization: this.getAuthHeader(), "Content-Type": "application/json" },
@@ -3855,7 +3934,8 @@ var ChannelDriver = class {
           status: "done",
           opencode_session_id: sessionId,
           ...opencodeMessageId ? { opencode_message_id: opencodeMessageId } : {},
-          ...title ? { title } : {}
+          ...title ? { title } : {},
+          ...usage ? usage : {}
         })
       }
     );
@@ -3873,14 +3953,15 @@ var ChannelDriver = class {
    * OpenCode turn sends `{status:'failed', opencode_session_id, error}` so the
    * failure reason reaches the channel.
    */
-  async markFailed(conversationId, messageId, sessionId, error2) {
+  async markFailed(conversationId, messageId, sessionId, error2, usage) {
     const body = { status: "failed" };
     if (sessionId !== void 0) body.opencode_session_id = sessionId;
     if (error2 !== void 0) body.error = error2;
+    if (usage) Object.assign(body, usage);
     await this.callWithRetry(
       "marking message as failed",
       () => this.fetchImpl(
-        `${this.apiUrl}/agents/${this.agentId}/threads/${conversationId}/messages/${messageId}`,
+        `${this.apiUrl}/runners/${this.agentId}/threads/${conversationId}/messages/${messageId}`,
         {
           method: "PATCH",
           headers: { Authorization: this.getAuthHeader(), "Content-Type": "application/json" },
@@ -3907,7 +3988,7 @@ var ChannelDriver = class {
   async postSignal(conversationId, messageId, signal, extra) {
     try {
       const res = await this.fetchImpl(
-        `${this.apiUrl}/agents/${this.agentId}/threads/${conversationId}/messages/${messageId}/signal`,
+        `${this.apiUrl}/runners/${this.agentId}/threads/${conversationId}/messages/${messageId}/signal`,
         {
           method: "POST",
           headers: { Authorization: this.getAuthHeader(), "Content-Type": "application/json" },
@@ -3936,7 +4017,7 @@ var ChannelDriver = class {
   }
   async persistSession(conversationId, sessionId) {
     const res = await this.fetchImpl(
-      `${this.apiUrl}/agents/${this.agentId}/threads/${conversationId}`,
+      `${this.apiUrl}/runners/${this.agentId}/threads/${conversationId}`,
       {
         method: "PATCH",
         headers: { Authorization: this.getAuthHeader(), "Content-Type": "application/json" },
@@ -3962,7 +4043,7 @@ var ChannelDriver = class {
       await this.callWithRetry(
         "reporting interactive event",
         () => this.fetchImpl(
-          `${this.apiUrl}/agents/${this.agentId}/threads/${conversationId}/interactive-event`,
+          `${this.apiUrl}/runners/${this.agentId}/threads/${conversationId}/interactive-event`,
           {
             method: "POST",
             headers: { Authorization: this.getAuthHeader(), "Content-Type": "application/json" },
@@ -4205,7 +4286,7 @@ async function resolveAgentIdFromKey(authHeader) {
 async function notifyAgentDisconnected(agentId, authHeader) {
   const apiUrl = getApiUrlConfig();
   try {
-    const response = await fetch(`${apiUrl}/agents/${agentId}/disconnect`, {
+    const response = await fetch(`${apiUrl}/runners/${agentId}/disconnect`, {
       method: "POST",
       headers: { Authorization: authHeader }
     });
@@ -4224,7 +4305,7 @@ async function notifyAgentDisconnected(agentId, authHeader) {
 async function getAgentInfo(agentId, authHeader) {
   const apiUrl = getApiUrlConfig();
   try {
-    const response = await fetch(`${apiUrl}/agents/${agentId}`, {
+    const response = await fetch(`${apiUrl}/runners/${agentId}`, {
       headers: { Authorization: authHeader }
     });
     if (response.status === 401) {
@@ -4611,7 +4692,7 @@ async function run(options) {
     return;
   }
   const state = {
-    agentId: options.agent || "",
+    agentId: options.runner || options.agent || "",
     agentName: null,
     port: options.port ?? 4096,
     conversationFilter: options.conversation ?? null,
@@ -4661,7 +4742,9 @@ async function run(options) {
       if (!interactive) {
         printError("Authentication required");
         blank();
-        console.log(chalk6.dim("Set EVIDENT_AGENT_KEY environment variable for CI"));
+        console.log(
+          chalk6.dim("Set EVIDENT_RUNNER_KEY (or EVIDENT_AGENT_KEY) environment variable for CI")
+        );
         console.log(chalk6.dim("Or run `evident login` for interactive authentication"));
         blank();
         process.exit(1);
@@ -4675,6 +4758,12 @@ async function run(options) {
       );
     }
     state.authHeader = getAuthHeader(credentials2);
+    if (credentials2.notice) {
+      log2(state, credentials2.notice, "warn");
+      if (state.interactive && !state.json) {
+        logActivity(state, { type: "info", level: "warn", message: credentials2.notice });
+      }
+    }
     if (!state.agentId) {
       if (credentials2.authType === "agent_key") {
         const resolved = await resolveAgentIdFromKey(state.authHeader);
@@ -4692,9 +4781,15 @@ async function run(options) {
           process.exit(1);
         }
       } else {
-        printError("--agent is required when not using EVIDENT_AGENT_KEY");
+        printError(
+          "--runner (or --agent) is required when not using EVIDENT_RUNNER_KEY or EVIDENT_AGENT_KEY"
+        );
         blank();
-        console.log(chalk6.dim("Either provide --agent <id> or set EVIDENT_AGENT_KEY"));
+        console.log(
+          chalk6.dim(
+            "Either provide --runner/--agent <id> or set EVIDENT_RUNNER_KEY/EVIDENT_AGENT_KEY"
+          )
+        );
         blank();
         process.exit(1);
       }
@@ -4909,7 +5004,7 @@ async function run(options) {
     }
     telemetry.error(EventTypes.CLI_ERROR, `Run command failed: ${message}`, {
       command: "run",
-      agentId: options.agent
+      agentId: options.runner || options.agent
     });
     await shutdownTelemetry();
     process.exit(1);
@@ -4934,7 +5029,7 @@ program.name("evident").description("Run OpenCode locally and connect it to Evid
 program.command("login").description("Authenticate with Evident").option("--token", "Use token-based authentication (for CI/CD)").option("--no-browser", "Do not open the browser automatically").action(login);
 program.command("logout").description("Remove stored credentials for the current endpoint").option("--all", "Remove stored credentials for all endpoints").action((options) => logout({ all: options.all }));
 program.command("whoami").description("Show the currently logged in user").action(whoami);
-program.command("run").description("Connect to Evident and process messages").option("-a, --agent [id]", "Runner ID to connect to (optional when EVIDENT_AGENT_KEY is set)").option("-p, --port <port>", "OpenCode port (default: 4096)", "4096").option(
+program.command("run").description("Connect to Evident and process messages").option("-a, --agent [id]", "Runner ID to connect to (optional when EVIDENT_AGENT_KEY is set)").option("--runner [id]", "Alias for --agent (preferred name; wins if both are given)").option("-p, --port <port>", "OpenCode port (default: 4096)", "4096").option(
   "--log-level <level>",
   "Log verbosity: debug | info | warn | error (default: info). Env: EVIDENT_LOG_LEVEL"
 ).option("-v, --verbose", "Alias for --log-level debug (ignored if --log-level is set)").option("-c, --conversation <id>", "Process only this specific conversation").option("--idle-timeout <seconds>", "Exit after N seconds idle").option("--json", "Output in JSON format").option(
@@ -4950,6 +5045,7 @@ program.command("run").description("Connect to Evident and process messages").op
   (options) => {
     run({
       agent: options.agent,
+      runner: options.runner,
       port: parseInt(options.port, 10),
       // Raw string — validation/precedence is single-sourced in run.ts's
       // resolveLogLevel (flag > -v > EVIDENT_LOG_LEVEL > info).