@agentv/core 3.9.2 → 3.10.0

package/dist/index.js

@@ -6112,11 +6112,7 @@ var CopilotCliProvider = class {
           }
         }
         if (sessionUpdate === "usage_update") {
-          if (tokenUsage) {
-            tokenUsage = { input: update.used, output: tokenUsage.output };
-          } else {
-            tokenUsage = { input: update.used, output: 0 };
-          }
+          tokenUsage = { input: update.used, output: 0 };
           if (update.cost && update.cost.currency === "USD") {
             costUsd = (costUsd ?? 0) + update.cost.amount;
           }
@@ -6150,21 +6146,32 @@ var CopilotCliProvider = class {
         sessionId: session.sessionId,
         prompt: promptMessages
       });
+      let promptResponse;
       if (request.signal) {
         const abortHandler = () => {
           killProcess(agentProcess);
         };
         request.signal.addEventListener("abort", abortHandler, { once: true });
         try {
-          await this.raceWithTimeout(sendPromise, agentProcess);
+          promptResponse = await this.raceWithTimeout(sendPromise, agentProcess);
         } finally {
           request.signal.removeEventListener("abort", abortHandler);
         }
       } else {
-        await this.raceWithTimeout(sendPromise, agentProcess);
+        promptResponse = await this.raceWithTimeout(sendPromise, agentProcess);
       }
       const endTime = (/* @__PURE__ */ new Date()).toISOString();
       const durationMs = Date.now() - startMs;
+      const responseUsage = promptResponse.usage;
+      if (responseUsage && responseUsage.totalTokens > 0) {
+        tokenUsage = {
+          input: responseUsage.inputTokens,
+          output: responseUsage.outputTokens,
+          ...responseUsage.thoughtTokens != null ? { reasoning: responseUsage.thoughtTokens } : {},
+          ...responseUsage.cachedReadTokens != null ? { cached: responseUsage.cachedReadTokens } : {}
+        };
+        request.streamCallbacks?.onLlmCallEnd?.("copilot", tokenUsage);
+      }
       const rejectedCalls = completedToolCalls.filter((tc) => {
         const out = tc.output;
         return out && (out.code === "rejected" || out.code === "denied");
@@ -6222,8 +6229,7 @@ var CopilotCliProvider = class {
   async raceWithTimeout(sendPromise, agentProcess) {
     const timeoutMs = this.config.timeoutMs;
     if (!timeoutMs) {
-      await sendPromise;
-      return;
+      return sendPromise;
     }
     let timer;
     const timeoutPromise = new Promise((_, reject) => {
@@ -6234,7 +6240,7 @@ var CopilotCliProvider = class {
       timer.unref?.();
     });
     try {
-      await Promise.race([sendPromise, timeoutPromise]);
+      return await Promise.race([sendPromise, timeoutPromise]);
     } finally {
       if (timer) clearTimeout(timer);
     }
@@ -9287,7 +9293,7 @@ async function readTargetDefinitions(filePath) {
     throw new Error(`targets.yaml not found at ${absolutePath}`);
   }
   const raw = await readFile9(absolutePath, "utf8");
-  const parsed = parse4(raw);
+  const parsed = interpolateEnv(parse4(raw), process.env);
   if (!isRecord(parsed)) {
     throw new Error(`targets.yaml at ${absolutePath} must be a YAML object with a 'targets' field`);
   }