@lingjingai/scriptctl 0.63.5 → 0.63.6

package/changes/0.63.6.md

@@ -0,0 +1,5 @@
+# 0.63.6
+
+- 审核 Agent 在实际 Gemini／豆包适配器收到响应时记录 provider、model 和用量，模型切换后归属到真正执行请求的模型。
+- 每次响应仅记录一次用量，保留内容过滤响应和已成功工具操作的用量；暂时性错误重试不会重复计入成功响应。
+- 豆包 Agent 使用显式 OpenAI-compatible 适配器，固定官方火山方舟地址并复用代理传输配置。

package/dist/review-agent.js

@@ -2324,6 +2324,7 @@ import { z as z3 } from "zod";
 
 // packages/review-agent/src/models.ts
 import { createGoogleGenerativeAI } from "@ai-sdk/google";
+import { createOpenAICompatible } from "@ai-sdk/openai-compatible";
 import { APICallError } from "@ai-sdk/provider";
 import { z as z2 } from "zod";
 
@@ -2379,44 +2380,41 @@ function reviewRoutes(config) {
   });
   return routes;
 }
-function agentModels(config, onFailure, onFilteredUsage) {
-  let filteredCalls = 0;
-  return reviewRoutes(config).filter((route) => route.apiKey).map((route) => ({
-    id: `${route.provider}/${route.model}`,
-    model: route.provider === "google-gemini" ? (() => {
-      const model = createGoogleGenerativeAI({ apiKey: route.apiKey, baseURL: route.baseUrl, fetch: proxyFetch })(route.model);
-      const generate = model.doGenerate.bind(model);
-      model.doGenerate = async (options) => {
-        try {
-          const result = await generate(options);
-          if (["content-filter", "error"].includes(result.finishReason.unified) || ["PROHIBITED_CONTENT", "SAFETY", "RECITATION", "BLOCKLIST", "MALFORMED_FUNCTION_CALL"].includes(result.finishReason.raw ?? "")) {
-            const u = result.usage;
-            onFilteredUsage?.({
-              call_key: `filtered:${++filteredCalls}`,
-              provider: route.provider,
-              model: route.model,
-              input_tokens: u.inputTokens.total ?? 0,
-              cached_input_tokens: u.inputTokens.cacheRead ?? 0,
-              output_tokens: u.outputTokens.total ?? 0,
-              reasoning_tokens: u.outputTokens.reasoning ?? 0
-            });
-            throw new APICallError({
-              message: `Gemini finishReason=${result.finishReason.raw ?? result.finishReason.unified}`,
-              url: `${route.baseUrl}/models/${route.model}:generateContent`,
-              requestBodyValues: {},
-              isRetryable: false
-            });
-          }
-          return result;
-        } catch (error) {
-          onFailure?.(route, error);
-          throw error;
+function agentModels(config, onFailure, onUsage) {
+  let calls = 0;
+  return reviewRoutes(config).filter((route) => route.apiKey).map((route) => {
+    const model = route.provider === "google-gemini" ? createGoogleGenerativeAI({ apiKey: route.apiKey, baseURL: route.baseUrl, fetch: proxyFetch })(route.model) : createOpenAICompatible({ name: "doubao", apiKey: route.apiKey, baseURL: route.baseUrl, fetch: proxyFetch })(route.model);
+    const generate = model.doGenerate.bind(model);
+    model.doGenerate = async (options) => {
+      const callKey = `call:${++calls}`;
+      try {
+        const result = await generate(options);
+        const u = result.usage;
+        onUsage?.({
+          call_key: callKey,
+          provider: route.provider,
+          model: route.model,
+          input_tokens: u.inputTokens.total ?? 0,
+          cached_input_tokens: u.inputTokens.cacheRead ?? 0,
+          output_tokens: u.outputTokens.total ?? 0,
+          reasoning_tokens: u.outputTokens.reasoning ?? 0
+        });
+        if (route.provider === "google-gemini" && (["content-filter", "error"].includes(result.finishReason.unified) || ["PROHIBITED_CONTENT", "SAFETY", "RECITATION", "BLOCKLIST", "MALFORMED_FUNCTION_CALL"].includes(result.finishReason.raw ?? ""))) {
+          throw new APICallError({
+            message: `Gemini finishReason=${result.finishReason.raw ?? result.finishReason.unified}`,
+            url: `${route.baseUrl}/models/${route.model}:generateContent`,
+            requestBodyValues: {},
+            isRetryable: false
+          });
         }
-      };
-      return model;
-    })() : { providerId: "doubao", modelId: route.model, url: route.baseUrl, apiKey: route.apiKey },
-    maxRetries: route.maxAttempts - 1
-  }));
+        return result;
+      } catch (error) {
+        onFailure?.(route, error);
+        throw error;
+      }
+    };
+    return { id: `${route.provider}/${route.model}`, model, maxRetries: route.maxAttempts - 1 };
+  });
 }
 var geminiResponse = z2.object({
   candidates: z2.array(z2.object({
@@ -3234,19 +3232,8 @@ async function reviewUnit(doc, episode, video, config, asr) {
         schema: z6.object({ message: z6.string().describe("\u4E00\u4E24\u53E5\u8BDD\u603B\u7ED3\u672C\u96C6\u5BA1\u6838\u7ED3\u679C") }),
         errorStrategy: "warn"
       },
-      onStepFinish: (step2) => {
+      onStepFinish: () => {
         steps += 1;
-        const model = step2.model?.modelId ?? step2.response.modelId ?? config.model;
-        const u = step2.usage;
-        usage.push({
-          call_key: `review:ep${episode}:agent:${steps}`,
-          provider: step2.model?.provider?.startsWith("doubao") ? "doubao" : "google-gemini",
-          model,
-          input_tokens: u.inputTokens ?? 0,
-          cached_input_tokens: u.cachedInputTokens ?? 0,
-          output_tokens: u.outputTokens ?? 0,
-          reasoning_tokens: u.reasoningTokens ?? 0
-        });
       }
     });
     steps = response?.steps?.length ?? 0;