@downcity/agent 1.1.331 → 1.1.335

package/src/executor/messages/SessionMessageCodec.ts

@@ -96,10 +96,78 @@ export async function to_model_messages(
   });
 
   // 调用 ai-sdk 的转换函数。
-  return await convertToModelMessages(input, {
+  const converted_messages = await convertToModelMessages(input, {
     // 如果当前轮有工具，就把工具注入转换选项。
     ...(tools && Object.keys(tools).length > 0 ? { tools: tools as ToolSet } : {}),
     // 忽略历史里的不完整工具调用，提升容错性。
     ignoreIncompleteToolCalls: true,
   });
+  return repair_orphaned_openai_text_references(converted_messages);
+}
+
+/**
+ * 修复旧版 Session 中“只保存 msg_*、未保存必需 rs_*”的孤立 Responses API 引用。
+ *
+ * 关键点（中文）
+ * - reasoning itemId / encrypted content 与 message itemId 存在时，保留 Provider 原子重放。
+ * - 只有 message itemId 时，删除该引用并发送已持久化的普通文本，避免 400。
+ * - 不修改 Session canonical source，该修复是可重建的 Provider 投影。
+ */
+function repair_orphaned_openai_text_references(
+  messages: ModelMessage[],
+): ModelMessage[] {
+  return messages.map((message) => {
+    if (message.role !== "assistant" || !Array.isArray(message.content)) {
+      return message;
+    }
+    const has_reasoning_replay_data = message.content.some((part) => {
+      if (part.type !== "reasoning") return false;
+      const openai_options = read_openai_provider_options(part.providerOptions);
+      return Boolean(
+        (typeof openai_options?.itemId === "string" && openai_options.itemId) ||
+        (typeof openai_options?.reasoningEncryptedContent === "string" &&
+          openai_options.reasoningEncryptedContent),
+      );
+    });
+    if (has_reasoning_replay_data) return message;
+
+    let changed = false;
+    const content = message.content.map((part) => {
+      if (part.type !== "text") return part;
+      const provider_options = read_json_record(part.providerOptions);
+      const openai_options = read_openai_provider_options(part.providerOptions);
+      if (!provider_options || !openai_options || !("itemId" in openai_options)) {
+        return part;
+      }
+      changed = true;
+      const { itemId: _item_id, ...remaining_openai_options } = openai_options;
+      const next_provider_options = { ...provider_options };
+      if (Object.keys(remaining_openai_options).length > 0) {
+        next_provider_options.openai = remaining_openai_options;
+      } else {
+        delete next_provider_options.openai;
+      }
+      return {
+        ...part,
+        providerOptions: Object.keys(next_provider_options).length > 0
+          ? next_provider_options
+          : undefined,
+      };
+    });
+    return changed ? { ...message, content } as ModelMessage : message;
+  });
+}
+
+/** 读取 Provider options 中的 OpenAI 协议字段。 */
+function read_openai_provider_options(
+  value: unknown,
+): Record<string, unknown> | undefined {
+  return read_json_record(read_json_record(value)?.openai);
+}
+
+/** 安全读取普通 JSON object。 */
+function read_json_record(value: unknown): Record<string, unknown> | undefined {
+  return value && typeof value === "object" && !Array.isArray(value)
+    ? value as Record<string, unknown>
+    : undefined;
 }

package/src/session/messages/SessionAssistantMessageWriter.ts

@@ -156,9 +156,21 @@ export class SessionAssistantMessageWriter {
         const source_part_id = this.source_text_part_id(type, chunk.id);
         const part_id = this.active_text_part_ids.get(source_part_id);
         if (!part_id) return;
-        const part = current.parts.find((item) => item.part_id === part_id);
+        const provider_metadata = to_session_provider_metadata(chunk.providerMetadata);
+        const pending = this.pending_text_parts.get(part_id);
+        // 关键点（中文）：Responses API 可能只输出 reasoning start/end 与 itemId，
+        // 却没有可见 reasoning delta。这个空 Part 不是 UI 占位，而是后续 msg_* 重放必需的协议关联。
+        if (
+          type === "reasoning" &&
+          !current.parts.some((item) => item.part_id === part_id) &&
+          (provider_metadata !== undefined || pending?.provider_metadata !== undefined)
+        ) {
+          await this.ensure_text_part(part_id, type, provider_metadata);
+        }
+        const part = this.current_message().parts.find(
+          (item) => item.part_id === part_id,
+        );
         if (part?.type === "text" || part?.type === "reasoning") {
-          const provider_metadata = to_session_provider_metadata(chunk.providerMetadata);
           await this.upsert_part({
             ...part,
             state: "done",

package/src/session/messages/SessionMessageCodec.ts

@@ -154,10 +154,14 @@ export function from_ui_assistant_parts(
     const type = String(candidate.type || "");
     if (type === "text" || type === "reasoning") {
       const text = String(candidate.text || "");
-      // 关键点（中文）：AI SDK 会为只有 start/end、没有 delta 的流生成空占位 Part。
-      // canonical history 不保存无内容的协议占位，避免与只按 delta 创建 Part 的 writer 分叉。
-      if (text.length === 0) return [];
       const provider_metadata = to_session_provider_metadata(candidate.providerMetadata);
+      // 关键点（中文）：AI SDK 会为只有 start/end、没有 delta 的流生成空占位 Part。
+      // 纯空占位不保存；但 Responses API 的 reasoning 即使没有可见文本，
+      // 也可能通过 itemId / encrypted content 与后续 message 形成必须原子重放的协议组。
+      if (
+        text.length === 0 &&
+        !(type === "reasoning" && provider_metadata !== undefined)
+      ) return [];
       return [{
         part_id: `${type}:${index + 1}`,
         sequence: index + 1,

package/src/workspace/tool/FileTools.ts

@@ -29,7 +29,7 @@ import {
 export function create_file_tools(runner: FileToolRunner): FileToolSet {
   const read = tool({
     description:
-      "Read a project file instead of using cat or sed. Images and PDFs are attached to the next model step as local file parts. Text output is limited to 500 lines and 256KB by default; use offset and limit to continue. Other binary files return metadata only.",
+      "Read a project file instead of using cat or sed. For a chat attachment, use the file part's url (the .downcity/... storage path) as path; filename is only the user's display name and is not a project path. Images and PDFs are attached to the next model step as local file parts. Text output is limited to 500 lines and 256KB by default; use offset and limit to continue. Other binary files return metadata only.",
     inputSchema: read_file_tool_input_schema,
     execute: async (
       input: ReadFileToolInput,