wip

Author: Aslemammad

agents/claude-code.ts

@@ -106,6 +106,11 @@ const claudeCodeAgent: AgentDefinition = {
     const cacheKey = sessionKey(cwd, model);
     const existingSessionID = sessionCache.get(cacheKey);
 
+    const usage = {
+      input: 0,
+      output: 0,
+    };
+
     try {
       const result = query({
         prompt,
@@ -122,6 +127,13 @@ const claudeCodeAgent: AgentDefinition = {
       for await (const message of result) {
         // Extract and cache session ID from messages
         sessionCache.set(cacheKey, message.session_id);
+
+        // Accumulate token usage if available
+        if (message.usage) {
+          usage.input += message.usage.input_tokens || 0;
+          usage.output += message.usage.output_tokens || 0;
+        }
+
         logJson(message, options);
       }
     } catch (error) {
@@ -137,7 +149,7 @@ const claudeCodeAgent: AgentDefinition = {
       throw error;
     }
 
-    return { command: displayCommand };
+    return { command: displayCommand, usage };
   },
 };
 

agents/codex.ts

@@ -3,6 +3,7 @@ import process from "node:process";
 
 import {
   Codex,
+  Usage,
   type CommandExecutionItem,
   type SandboxMode,
   type Thread,
@@ -122,15 +123,27 @@ const codexAgent: AgentDefinition = {
     const key = sessionKey(model, cwd);
     const thread = getOrCreateThread(model, cwd);
 
+    const actions: string[] = [];
+    let usage: Usage;
     try {
       const turn = await thread.run(prompt);
+      assert(turn.usage, "The agent did not emit the usage information.");
+      usage = turn.usage;
+      actions.push(...turn.items.map((item) => JSON.stringify(item)));
       logTurnItems(turn.items, options);
     } catch (error) {
       threadCache.delete(key);
       throw error;
     }
 
-    return { command: displayCommand };
+    return {
+      command: displayCommand,
+      actions,
+      usage: {
+        input: usage.input_tokens,
+        output: usage.output_tokens,
+      },
+    };
   },
 };
 

agents/opencode.ts

@@ -71,51 +71,31 @@ function writeLog(
   }
 }
 
-function logJson(
-  value: unknown,
-  options: AgentRunOptions | undefined,
-  logs?: string[],
-): void {
+function logJson(value: unknown, options: AgentRunOptions | undefined): void {
   try {
     const message = JSON.stringify(value);
     writeLog(process.stdout, message, options?.logPrefix);
-    if (options?.captureLogs && logs) {
-      logs.push(message);
-    }
   } catch (error) {
     const reason = error instanceof Error ? error.message : String(error);
     const errorMessage = JSON.stringify({
       error: "serialization_failed",
       reason,
     });
     writeLog(process.stdout, errorMessage, options?.logPrefix);
-    if (options?.captureLogs && logs) {
-      logs.push(errorMessage);
-    }
   }
 }
 
-function logError(
-  value: unknown,
-  options: AgentRunOptions | undefined,
-  logs?: string[],
-): void {
+function logError(value: unknown, options: AgentRunOptions | undefined): void {
   try {
     const message = JSON.stringify(value);
     writeLog(process.stderr, message, options?.logPrefix);
-    if (options?.captureLogs && logs) {
-      logs.push(`ERROR: ${message}`);
-    }
   } catch (error) {
     const reason = error instanceof Error ? error.message : String(error);
     const errorMessage = JSON.stringify({
       error: "serialization_failed",
       reason,
     });
     writeLog(process.stderr, errorMessage, options?.logPrefix);
-    if (options?.captureLogs && logs) {
-      logs.push(`ERROR: ${errorMessage}`);
-    }
   }
 }
 
@@ -179,7 +159,6 @@ const opencodeAgent: AgentDefinition = {
     options?.onStart?.(displayCommand);
 
     const cacheKey = sessionKey(cwd, model);
-    const logs: string[] = options?.captureLogs ? [] : undefined as any;
 
     let sessionID = sessionCache.get(cacheKey);
     if (!sessionID) {
@@ -191,6 +170,10 @@ const opencodeAgent: AgentDefinition = {
       sessionCache.set(cacheKey, sessionID);
     }
 
+    const usage = {
+      input: 0,
+      output: 0,
+    };
     try {
       const [providerID, modelID] = model.split("/");
       const { data } = await opencode.client.session.prompt({
@@ -206,7 +189,10 @@ const opencodeAgent: AgentDefinition = {
         throwOnError: true,
       });
 
-      logPromptResult(data, options, logs);
+      usage.input = data.info.tokens.input;
+      usage.output = data.info.tokens.output;
+
+      logPromptResult(data, options);
     } catch (error) {
       sessionCache.delete(cacheKey);
       logError(
@@ -215,12 +201,11 @@ const opencodeAgent: AgentDefinition = {
           details: serializeError(error),
         },
         options,
-        logs,
       );
       throw error;
     }
 
-    return { command: displayCommand, sessionID, logs };
+    return { command: displayCommand, usage };
   },
 };