@downcity/agent 1.1.262 → 1.1.265

package/src/session/messages/SessionAssistantMessageWriter.ts

@@ -7,7 +7,10 @@
 
 import type { UIMessageChunk } from "ai";
 import type { SessionMessages } from "@/session/SessionMessages.js";
-import { to_session_json_value } from "@/session/messages/SessionJsonValue.js";
+import {
+  to_session_json_value,
+  to_session_provider_metadata,
+} from "@/session/messages/SessionJsonValue.js";
 import type {
   SessionAssistantFilePart,
   SessionAssistantMessage,
@@ -80,14 +83,41 @@ export class SessionAssistantMessageWriter {
         this.active_text_part_ids.delete(source_part_id);
         return;
       }
-      case "tool-input-start":
-        if (this.find_tool(chunk.toolCallId)) return;
+      case "tool-input-start": {
+        const tool = this.find_tool(chunk.toolCallId);
+        const call_provider_metadata = to_session_provider_metadata(
+          chunk.providerMetadata,
+        );
+        if (tool) {
+          if (
+            call_provider_metadata === undefined &&
+            chunk.providerExecuted === undefined
+          ) return;
+          await this.upsert_tool(chunk.toolCallId, {
+            tool_name: tool.tool_name,
+            state: tool.state,
+            ...(call_provider_metadata !== undefined
+              ? { call_provider_metadata }
+              : {}),
+            ...(chunk.providerExecuted !== undefined
+              ? { provider_executed: chunk.providerExecuted }
+              : {}),
+          });
+          return;
+        }
         await this.upsert_tool(chunk.toolCallId, {
           tool_name: chunk.toolName,
           state: "input-streaming",
           input_text: "",
+          ...(call_provider_metadata !== undefined
+            ? { call_provider_metadata }
+            : {}),
+          ...(chunk.providerExecuted !== undefined
+            ? { provider_executed: chunk.providerExecuted }
+            : {}),
         });
         return;
+      }
       case "tool-input-delta": {
         const tool = this.find_tool(chunk.toolCallId);
         if (tool && tool.state !== "input-streaming") return;
@@ -100,45 +130,103 @@ export class SessionAssistantMessageWriter {
       }
       case "tool-input-available": {
         const tool = this.find_tool(chunk.toolCallId);
-        if (tool && tool.state !== "input-streaming") return;
+        const call_provider_metadata = to_session_provider_metadata(
+          chunk.providerMetadata,
+        );
+        if (tool && tool.state !== "input-streaming") {
+          if (
+            call_provider_metadata === undefined &&
+            chunk.providerExecuted === undefined
+          ) return;
+          await this.upsert_tool(chunk.toolCallId, {
+            tool_name: tool.tool_name,
+            state: tool.state,
+            ...(call_provider_metadata !== undefined
+              ? { call_provider_metadata }
+              : {}),
+            ...(chunk.providerExecuted !== undefined
+              ? { provider_executed: chunk.providerExecuted }
+              : {}),
+          });
+          return;
+        }
         await this.upsert_tool(chunk.toolCallId, {
           tool_name: chunk.toolName,
           state: "ready",
           input: to_session_json_value(chunk.input),
+          ...(call_provider_metadata !== undefined
+            ? { call_provider_metadata }
+            : {}),
+          ...(chunk.providerExecuted !== undefined
+            ? { provider_executed: chunk.providerExecuted }
+            : {}),
         });
         return;
       }
-      case "tool-input-error":
+      case "tool-input-error": {
+        const call_provider_metadata = to_session_provider_metadata(
+          chunk.providerMetadata,
+        );
         await this.upsert_tool(chunk.toolCallId, {
           tool_name: chunk.toolName,
           state: "failed",
           input: to_session_json_value(chunk.input),
           error: chunk.errorText,
+          ...(call_provider_metadata !== undefined
+            ? { call_provider_metadata }
+            : {}),
+          ...(chunk.providerExecuted !== undefined
+            ? { provider_executed: chunk.providerExecuted }
+            : {}),
         });
         return;
+      }
       case "tool-output-available": {
         const tool = this.find_tool(chunk.toolCallId);
         if (
           tool?.state === "failed" &&
           (tool.error === "Approval denied" || tool.error === "Approval expired")
         ) return;
+        const result_provider_metadata = to_session_provider_metadata(
+          chunk.providerMetadata,
+        );
         await this.upsert_tool(chunk.toolCallId, {
           tool_name: tool?.tool_name || "unknown",
           state: "completed",
           output: to_session_json_value(chunk.output),
+          ...(result_provider_metadata !== undefined
+            ? { result_provider_metadata }
+            : {}),
+          ...(chunk.providerExecuted !== undefined
+            ? { provider_executed: chunk.providerExecuted }
+            : {}),
+        });
+        return;
+      }
+      case "tool-output-error": {
+        const tool = this.find_tool(chunk.toolCallId);
+        const result_provider_metadata = to_session_provider_metadata(
+          chunk.providerMetadata,
+        );
+        await this.upsert_tool(chunk.toolCallId, {
+          tool_name: tool?.tool_name || "unknown",
+          state: "failed",
+          error: chunk.errorText,
+          ...(result_provider_metadata !== undefined
+            ? { result_provider_metadata }
+            : {}),
+          ...(chunk.providerExecuted !== undefined
+            ? { provider_executed: chunk.providerExecuted }
+            : {}),
         });
         return;
       }
-      case "tool-output-error":
       case "tool-output-denied": {
         const tool = this.find_tool(chunk.toolCallId);
         await this.upsert_tool(chunk.toolCallId, {
           tool_name: tool?.tool_name || "unknown",
           state: "failed",
-          error:
-            chunk.type === "tool-output-error"
-              ? chunk.errorText
-              : "Tool output denied",
+          error: "Tool output denied",
         });
         return;
       }
@@ -158,6 +246,26 @@ export class SessionAssistantMessageWriter {
     await this.recorder.update_assistant_part(this.message_id, part);
   }
 
+  /**
+   * 用 AI SDK 最终 UIMessage 中的 Tool 快照校准流式写入结果。
+   *
+   * 关键点（中文）：最终快照只覆盖实际存在的字段；缺失 metadata 时继续保留
+   * 流式阶段已经写入的 Provider 快照。
+   */
+  async reconcile_final_tool_part(
+    part: SessionAssistantToolPart,
+  ): Promise<void> {
+    await this.enqueue_write(async () => {
+      const current = this.find_tool(part.tool_call_id);
+      await this.upsert_part({
+        ...(current || {}),
+        ...part,
+        part_id: current?.part_id || `tool:${part.tool_call_id}`,
+        sequence: current?.sequence || this.next_part_sequence(),
+      });
+    });
+  }
+
   /** Executor 在调用 Tool 实现前写入完整输入。 */
   async prepare_tool_input(input: SessionToolInputReady): Promise<void> {
     await this.enqueue_write(async () => {

package/src/session/messages/SessionJsonValue.ts

@@ -5,6 +5,7 @@
  * 避免 Tool、User Data 等外部输入污染 canonical Message。
  */
 
+import type { ProviderMetadata } from "ai";
 import type { JsonValue } from "@/types/common/Json.js";
 
 /** 把任意运行时输入转换为可持久化的 JSON 值。 */
@@ -23,3 +24,32 @@ export function to_session_json_value(input: unknown): JsonValue {
     return String(input);
   }
 }
+
+/**
+ * 把 AI SDK Provider metadata 规整为可持久化快照。
+ *
+ * 关键点（中文）
+ * - ProviderMetadata 顶层是 provider ID 到 JSON 对象的映射。
+ * - 新 metadata 代表完整快照，不在这里猜测 Provider 的字段合并语义。
+ * - 非法 metadata 返回 undefined，由调用方保留已经持久化的旧快照。
+ */
+export function to_session_provider_metadata(
+  input: unknown,
+): ProviderMetadata | undefined {
+  if (!is_plain_object(input)) return undefined;
+  try {
+    const value = JSON.parse(JSON.stringify(input)) as unknown;
+    if (!is_plain_object(value)) return undefined;
+    if (!Object.values(value).every(is_plain_object)) return undefined;
+    return value as ProviderMetadata;
+  } catch {
+    return undefined;
+  }
+}
+
+/** 判断未知值是否为普通对象。 */
+function is_plain_object(input: unknown): input is Record<string, unknown> {
+  if (!input || typeof input !== "object" || Array.isArray(input)) return false;
+  const prototype = Object.getPrototypeOf(input);
+  return prototype === Object.prototype || prototype === null;
+}

package/src/session/messages/SessionMessageCodec.ts

@@ -8,7 +8,10 @@
  */
 
 import type { UIMessage } from "ai";
-import { to_session_json_value } from "@/session/messages/SessionJsonValue.js";
+import {
+  to_session_json_value,
+  to_session_provider_metadata,
+} from "@/session/messages/SessionJsonValue.js";
 import type {
   SessionAssistantMessage,
   SessionAssistantMessagePart,
@@ -161,6 +164,12 @@ export function from_ui_assistant_parts(
     }
     if (type === "dynamic-tool" || type.startsWith("tool-")) {
       const state = String(candidate.state || "");
+      const call_provider_metadata = to_session_provider_metadata(
+        candidate.callProviderMetadata,
+      );
+      const result_provider_metadata = to_session_provider_metadata(
+        candidate.resultProviderMetadata,
+      );
       return [{
         part_id: String(candidate.toolCallId || `tool:${index + 1}`),
         sequence: index + 1,
@@ -189,6 +198,15 @@ export function from_ui_assistant_parts(
           ? { output: to_session_json_value(candidate.output) }
           : {}),
         ...(candidate.errorText ? { error: String(candidate.errorText) } : {}),
+        ...(call_provider_metadata !== undefined
+          ? { call_provider_metadata }
+          : {}),
+        ...(result_provider_metadata !== undefined
+          ? { result_provider_metadata }
+          : {}),
+        ...(typeof candidate.providerExecuted === "boolean"
+          ? { provider_executed: candidate.providerExecuted }
+          : {}),
       }];
     }
     return [];
@@ -251,6 +269,14 @@ function to_ui_assistant_parts(
       throw new Error(`Unsupported Assistant part: ${part.type}`);
     }
     const input = part.input ?? parse_json(part.input_text);
+    const call_provider_fields = {
+      ...(part.call_provider_metadata !== undefined
+        ? { callProviderMetadata: part.call_provider_metadata }
+        : {}),
+      ...(part.provider_executed !== undefined
+        ? { providerExecuted: part.provider_executed }
+        : {}),
+    };
     if (part.state === "completed") {
       return {
         type: "dynamic-tool",
@@ -259,6 +285,10 @@ function to_ui_assistant_parts(
         state: "output-available",
         input,
         output: part.output,
+        ...call_provider_fields,
+        ...(part.result_provider_metadata !== undefined
+          ? { resultProviderMetadata: part.result_provider_metadata }
+          : {}),
       };
     }
     if (part.state === "failed") {
@@ -269,6 +299,10 @@ function to_ui_assistant_parts(
         state: "output-error",
         input,
         errorText: part.error || "Tool failed",
+        ...call_provider_fields,
+        ...(part.result_provider_metadata !== undefined
+          ? { resultProviderMetadata: part.result_provider_metadata }
+          : {}),
       };
     }
     if (part.state === "approval-required") {
@@ -279,6 +313,7 @@ function to_ui_assistant_parts(
         state: "approval-requested",
         input,
         approval: { id: part.approval?.approval_id || `approval:${part.tool_call_id}` },
+        ...call_provider_fields,
       };
     }
     return {
@@ -287,6 +322,7 @@ function to_ui_assistant_parts(
       toolCallId: part.tool_call_id,
       state: part.state === "input-streaming" ? "input-streaming" : "input-available",
       input,
+      ...call_provider_fields,
     };
   }) as UIMessage["parts"];
 }

package/src/types/session/SessionMessage.ts

@@ -5,6 +5,7 @@
  * 均为内部 part，不提升为顶层消息。
  */
 
+import type { ProviderMetadata } from "ai";
 import type { JsonObject, JsonValue } from "@/types/common/Json.js";
 import type { SessionApproval } from "@/types/session/SessionApproval.js";
 
@@ -133,6 +134,12 @@ export interface SessionAssistantToolPart {
   output?: JsonValue;
   /** 工具失败信息。 */
   error?: string;
+  /** 工具调用阶段由 AI SDK Provider 返回的可序列化 metadata。 */
+  call_provider_metadata?: ProviderMetadata;
+  /** 工具结果阶段由 AI SDK Provider 返回的可序列化 metadata。 */
+  result_provider_metadata?: ProviderMetadata;
+  /** 当前工具是否由模型 Provider 直接执行。 */
+  provider_executed?: boolean;
   /** 当前 Tool 等待或已经处理过的完整审批快照。 */
   approval?: SessionApproval;
 }