@downcity/agent 1.1.337 → 1.1.399

package/src/session/SessionMessages.ts

@@ -6,7 +6,10 @@
  * 从最新快照严格递增。
  */
 
-import type { UIMessage } from "ai";
+import type {
+  SessionAssistantResultPart,
+  SessionPromptPart,
+} from "@/types/session/SessionContent.js";
 import { generate_id } from "@/utils/Id.js";
 import { SessionAssistantMessageWriter } from "@/session/messages/SessionAssistantMessageWriter.js";
 import { SessionMessageInteractionWriter } from "@/session/messages/SessionMessageInteractionWriter.js";
@@ -39,17 +42,7 @@ import type {
   SessionInteractionRequest,
   SessionInteractionResponse,
 } from "@/types/session/SessionInteraction.js";
-import type {
-  SessionActionRecordV1,
-  SessionRecordV1,
-  SessionUserMessageV1,
-} from "@/executor/types/SessionRecords.js";
-import { is_session_action_record } from "@/executor/types/SessionRecords.js";
-import {
-  from_ui_assistant_parts,
-  from_ui_user_parts,
-  to_executor_ui_message,
-} from "@/session/messages/SessionMessageCodec.js";
+import type { SessionActionEvent } from "@/types/session/SessionAction.js";
 import { persist_user_prompt_file_parts } from "@executor/messages/SessionAttachmentMapper.js";
 import type {
   AppendCompletedAssistantMessageInput,
@@ -62,7 +55,7 @@ import type {
   OpenSessionAssistantMessageInput,
   SessionMessagesOptions,
 } from "@/types/session/SessionMessages.js";
-import type { SessionMessageStore } from "@/types/store/SessionStore.js";
+import type { SessionMessageStore } from "@/types/store/SessionDataStore.js";
 import type { SessionAttachmentStore } from "@/types/store/SessionAttachmentStore.js";
 
 export { SessionAssistantMessageWriter } from "@/session/messages/SessionAssistantMessageWriter.js";
@@ -188,69 +181,15 @@ export class SessionMessages {
     return this.get_message(writer.message_id) as SessionAssistantMessage;
   }
 
-  /** 把内部 Executor Record 收口为 canonical Session Message。 */
-  async append_record(record: SessionRecordV1): Promise<void> {
-    if (is_session_action_record(record)) {
-      const action = record as SessionActionRecordV1;
-      const existing = this.get_message(action.id);
-      if (existing?.type === "action") {
-        if (action.state !== "running") {
-          await this.update_action_message(action.id, action.state, {
-            title: action.title,
-            description: action.description,
-          });
-        }
-        return;
-      }
-      const writer = await this.open_action_message({
-        message_id: action.id,
-        turn_id: action.metadata.turn_id,
-        action_type: String(action.id || "").split(":")[0] || "action",
-        title: action.title,
-        description: action.description,
-      });
-      if (action.state === "completed") await writer.complete();
-      if (action.state === "failed") {
-        await writer.fail(action.description || action.title);
-      }
-      return;
-    }
-
-    const turn_id = String(
-      record.metadata?.turn_id || `external:${this.session_id}:${generate_id()}`,
-    );
-    if (record.role === "user") {
-      await this.append_user_message({
-        turn_id,
-        input_type:
-          record.metadata?.extra?.inputType === "steer" ? "steer" : "prompt",
-        parts: from_ui_user_parts(record.parts),
-      });
-      return;
-    }
-    await this.append_completed_assistant_message({
-      turn_id,
-      parts: from_ui_assistant_parts(record.parts),
-      visibility:
-        record.metadata?.extra?.visibility === "internal"
-          ? "internal"
-          : "visible",
-      kind: record.metadata?.kind === "summary" ? "summary" : "normal",
-    });
-  }
-
   /** 把公开 Session API 的 User 输入转换为 canonical Message 并持久化。 */
   async append_external_user_message(
     input: AppendExternalSessionUserMessageInput,
   ): Promise<boolean> {
-    const parts = input.message && "role" in input.message
-      ? from_ui_user_parts(input.message.parts)
-      : [{
-          part_id: `external-user-text:${Date.now()}`,
-          type: "text" as const,
-          text: String(input.text || "").trim(),
-          state: "done" as const,
-        }];
+    const source_parts = input.parts || [{
+      type: "text" as const,
+      text: String(input.text || "").trim(),
+    }];
+    const parts = normalize_session_user_parts(source_parts);
     if (parts.length === 0) return false;
     await this.append_user_message({
       turn_id: `external:${this.session_id}:${Date.now()}`,
@@ -264,24 +203,23 @@ export class SessionMessages {
   async append_external_assistant_message(
     input: AppendExternalSessionAssistantMessageInput,
   ): Promise<boolean> {
-    const parts = input.message && "role" in input.message
-      ? from_ui_assistant_parts(input.message.parts)
-      : [{
-          part_id: `external-assistant-text:${Date.now()}`,
-          sequence: 1,
-          type: "text" as const,
-          text: String(input.fallback_text || "").trim(),
-          state: "done" as const,
-        }];
-    if (parts.length === 0) return false;
-    await this.append_completed_assistant_message({ parts });
+    const parts = input.parts || [{
+      type: "text" as const,
+      text: String(input.text || "").trim(),
+    }];
+    if (!has_assistant_result_content(parts)) return false;
+    const writer = await this.open_assistant_message({
+      turn_id: `external:${this.session_id}:${Date.now()}`,
+    });
+    await writer.append_result_parts(parts);
+    await writer.complete();
     return true;
   }
 
   /** 把 Session prompt 转换为 canonical User Message 并持久化。 */
   async append_prompt_message(
     input: AppendSessionPromptMessageInput,
-  ): Promise<SessionUserMessageV1> {
+  ): Promise<SessionUserMessage> {
     const query = input.prompt.query;
     const ui_parts = typeof query === "string"
       ? [{ type: "text" as const, text: query.trim() }]
@@ -294,53 +232,50 @@ export class SessionMessages {
       input_type: input.input_type,
       parts: normalize_session_user_parts(ui_parts),
     });
-    return to_executor_ui_message(canonical) as SessionUserMessageV1;
+    return canonical;
   }
 
   /** 持久化 Executor 在本轮延迟产生的 User Message。 */
   async append_deferred_user_messages(
-    deferred_messages?: SessionUserMessageV1[],
+    deferred_messages?: SessionUserMessage[],
   ): Promise<number> {
     const messages = Array.isArray(deferred_messages)
       ? deferred_messages
       : [];
     for (const message of messages) {
       await this.append_user_message({
-        turn_id: String(
-          message.metadata?.turn_id ||
-            `deferred:${this.session_id}:${Date.now()}`,
-        ),
+        turn_id: message.turn_id || `deferred:${this.session_id}:${Date.now()}`,
         input_type: "steer",
-        parts: from_ui_user_parts(message.parts),
+        parts: structuredClone(message.parts),
       });
     }
     return messages.length;
   }
 
   /** 按稳定 Action ID 创建或更新 canonical Action Message。 */
-  async persist_action_record(
-    event: SessionActionRecordV1,
+  async persist_action(
+    event: SessionActionEvent,
     options?: { publish_mutation?: boolean },
   ): Promise<void> {
     const publish_mutation = options?.publish_mutation !== false;
-    const existing = this.get_message(event.id);
+    const existing = this.get_message(event.action_id);
     if (!existing) {
       const writer = await this.open_action_message({
-        message_id: event.id,
-        turn_id: event.metadata.turn_id,
-        action_type: infer_action_type(event.id),
+        message_id: event.action_id,
+        turn_id: event.turn_id,
+        action_type: event.action_type,
         title: event.title,
         description: event.description,
         publish_mutation,
       });
-      if (event.state === "completed") await writer.complete();
-      if (event.state === "failed") {
+      if (event.status === "completed") await writer.complete();
+      if (event.status === "failed") {
         await writer.fail(event.description || event.title);
       }
       return;
     }
-    if (existing.type === "action" && event.state !== "running") {
-      await this.update_action_message(event.id, event.state, {
+    if (existing.type === "action" && event.status !== "running") {
+      await this.update_action_message(event.action_id, event.status, {
         title: event.title,
         description: event.description,
       }, { publish_mutation });
@@ -748,7 +683,7 @@ export class SessionMessages {
       : [];
     const interrupted_tool_ids = new Set(
       interrupted_interactions.flatMap((part) =>
-        part.request.source.type === "tool"
+        part.request.source.tool_call_id
           ? [part.request.source.tool_call_id]
           : [],
       ),
@@ -1006,40 +941,47 @@ export class SessionActionMessageWriter {
   }
 }
 
-/** 把 AI SDK User parts 归一为 canonical User parts。 */
+/** 把 Downcity Session User parts 归一为 canonical User parts。 */
 export function normalize_session_user_parts(
-  parts: UIMessage["parts"] | null | undefined,
+  parts: SessionPromptPart[] | null | undefined,
 ): SessionUserMessagePart[] {
   if (!Array.isArray(parts)) return [];
   return parts.flatMap<SessionUserMessagePart>((part, index) => {
-    if (!part || typeof part !== "object") return [];
-    const candidate = part as Record<string, unknown>;
-    if (candidate.type === "text") {
+    if (part.type === "text") {
       return [{
         part_id: `user-text:${index + 1}`,
         type: "text",
-        text: String(candidate.text || ""),
+        text: part.text,
         state: "done",
       }];
     }
-    if (candidate.type === "file") {
+    if (part.type === "file") {
       return [{
         part_id: `user-file:${index + 1}`,
         type: "file",
-        url: String(candidate.url || ""),
-        media_type: String(candidate.mediaType || "application/octet-stream"),
-        ...(candidate.filename ? { filename: String(candidate.filename) } : {}),
-      }];
-    }
-    if (String(candidate.type || "").startsWith("data-")) {
-      return [{
-        part_id: `user-data:${index + 1}`,
-        type: "data",
-        data_type: String(candidate.type),
-        data: to_session_json_value(candidate.data),
+        url: part.url,
+        media_type: part.media_type,
+        ...(part.filename ? { filename: part.filename } : {}),
       }];
     }
-    return [];
+    return [{
+      part_id: `user-data:${index + 1}`,
+      type: "data",
+      data_type: part.data_type,
+      data: to_session_json_value(part.data),
+      ...(part.data_id ? { data_id: part.data_id } : {}),
+    }];
+  });
+}
+
+/** 判断 Assistant 结果中是否包含可持久化内容。 */
+function has_assistant_result_content(
+  parts: readonly SessionAssistantResultPart[],
+): boolean {
+  return parts.some((part) => {
+    if (part.type === "text") return Boolean(part.text.trim());
+    if (part.type === "file") return Boolean(part.media_type.trim() && part.url.trim());
+    return Boolean(part.data_type.trim());
   });
 }
 

package/src/session/SessionState.ts

@@ -11,7 +11,10 @@ import {
   infer_agent_model_label,
   read_agent_model_context_window,
 } from "@/agent/AgentModel.js";
-import { resolve_system_timezone } from "@/session/storage/Metadata.js";
+import {
+  normalize_session_title,
+  resolve_system_timezone,
+} from "@/session/storage/Metadata.js";
 import { ensure_session_title } from "@/session/SessionTitle.js";
 import type {
   AgentSessionConfigSnapshot,
@@ -22,11 +25,9 @@ import { generate_id } from "@/utils/Id.js";
 import type { Logger } from "@/utils/logger/Logger.js";
 import { SessionMessages } from "@/session/SessionMessages.js";
 import { SessionTitleTask } from "@/session/runtime/SessionTitleTask.js";
-import { to_executor_history } from "@/session/messages/SessionMessageCodec.js";
 import type { SessionMessage } from "@/types/session/SessionMessage.js";
-import { is_session_message_record } from "@/executor/types/SessionRecords.js";
 import type { SessionStateOptions } from "@/types/session/SessionState.js";
-import type { SessionStore } from "@/types/store/SessionStore.js";
+import type { SessionDataStore } from "@/types/store/SessionDataStore.js";
 import type { SessionApprovalMode } from "@/types/session/SessionInteraction.js";
 
 /** Session 模型配置写入结果。 */
@@ -43,7 +44,8 @@ export interface SessionModelSetResult {
 export class SessionState {
   private readonly agent_id: string;
   private readonly session_id: string;
-  private readonly store: SessionStore;
+  private readonly origin?: SessionStateOptions["origin"];
+  private readonly store: SessionDataStore;
   private readonly messages: SessionMessages;
   private readonly state: SessionLocalState;
   private readonly logger: Logger;
@@ -56,6 +58,7 @@ export class SessionState {
   constructor(options: SessionStateOptions) {
     this.agent_id = options.agent_id;
     this.session_id = options.session_id;
+    this.origin = options.origin;
     this.store = options.store;
     this.messages = options.messages;
     this.state = options.state;
@@ -118,6 +121,7 @@ export class SessionState {
         agent_id: this.agent_id,
         created_at: created_at,
         timezone,
+        ...(this.origin ? { origin: this.origin } : {}),
       });
       this.state.created_at = created_at;
       this.state.timezone = timezone;
@@ -206,6 +210,35 @@ export class SessionState {
     return true;
   }
 
+  /** 原子修改 Session 标题并发布唯一的标题 mutation。 */
+  async set_title(input: string): Promise<string> {
+    const title = normalize_session_title(input);
+    if (!title) throw new Error("session.rename requires a non-empty title");
+    this.title_task.dispose();
+    const changed = await this.run_metadata_mutation(async () => {
+      const metadata = await this.store.read_metadata();
+      if (normalize_session_title(metadata.title) === title) return false;
+      await this.store.write_metadata({
+        ...metadata,
+        agent_id: this.agent_id,
+        title,
+        updated_at: Date.now(),
+      });
+      return true;
+    });
+    if (changed) {
+      this.publish_event({
+        mutation_id: generate_id(),
+        variant: "session",
+        type: "title",
+        session_id: this.session_id,
+        created_at: Date.now(),
+        title,
+      });
+    }
+    return title;
+  }
+
   /** 在 Session Step 检查点提交模型配置。 */
   apply_model_config(config: AgentSessionConfigSnapshot): void {
     this.state.effective_session_config = {
@@ -256,20 +289,17 @@ export class SessionState {
     this.title_task.schedule(async (signal) => {
       const before_metadata = await this.store.read_metadata();
       if (String(before_metadata.title || "").trim()) return;
-      const records = to_executor_history(
-        this.session_id,
-        await this.messages.context_snapshot(),
-      );
-      const first_user_message = records.find(
-        (record) => is_session_message_record(record) && record.role === "user",
+      const messages = (await this.messages.context_snapshot()).messages;
+      const first_user_message = messages.find(
+        (message) => message.type === "user",
       );
       if (!first_user_message) return;
-      const first_user_message_id = first_user_message.id;
+      const first_user_message_id = first_user_message.message_id;
       const before_title = String(before_metadata.title || "").trim();
       const next_metadata = await ensure_session_title({
         session_id: this.session_id,
         store: this.store,
-        messages: records,
+        messages,
         model: this.get_model(),
         model_label: this.state.session_config.model_label,
         logger: this.logger,
@@ -279,14 +309,9 @@ export class SessionState {
           const latest_metadata = await this.store.read_metadata();
           if (signal.aborted) return latest_metadata;
           if (String(latest_metadata.title || "").trim()) return latest_metadata;
-          const latest_records = to_executor_history(
-            this.session_id,
-            await this.messages.context_snapshot(),
-          );
-          const source_exists = latest_records.some(
-            (record) =>
-              is_session_message_record(record) &&
-              record.id === first_user_message_id,
+          const latest_messages = (await this.messages.context_snapshot()).messages;
+          const source_exists = latest_messages.some(
+            (message) => message.message_id === first_user_message_id,
           );
           if (!source_exists || signal.aborted) return latest_metadata;
           const next_metadata = { ...latest_metadata, title };

package/src/session/SessionTitle.ts

@@ -7,13 +7,17 @@
  * - 当 title 仍为空时，后续执行链路可以再次尝试生成。
  */
 
-import { streamText, type LanguageModel } from "ai";
+import type { ModelClient } from "@downcity/type";
+import {
+  build_text_model_messages,
+  generate_model,
+} from "@executor/model/ModelGenerate.js";
 import type { SessionHistoryMetaV1 } from "@/executor/types/SessionHistoryMeta.js";
-import type { SessionRecordV1 } from "@/executor/types/SessionRecords.js";
-import { is_session_message_record } from "@/executor/types/SessionRecords.js";
 import type { Logger } from "@/utils/logger/Logger.js";
 import { normalize_session_title } from "@/session/storage/Metadata.js";
-import type { SessionStore } from "@/types/store/SessionStore.js";
+import type { SessionDataStore } from "@/types/store/SessionDataStore.js";
+import type { SessionMessage } from "@/types/session/SessionMessage.js";
+import { extract_session_message_text } from "@/session/messages/SessionMessageText.js";
 
 const GENERATED_SESSION_TITLE_MAX_CHARS = 24;
 
@@ -22,7 +26,7 @@ const GENERATED_SESSION_TITLE_MAX_CHARS = 24;
  */
 export interface EnsureSessionTitleParams {
   /** 当前 Session 的领域持久化入口。 */
-  store: SessionStore;
+  store: SessionDataStore;
 
   /**
    * 当前 session_id。
@@ -32,12 +36,12 @@ export interface EnsureSessionTitleParams {
   /**
    * 当前 session 已落盘消息。
    */
-  messages: SessionRecordV1[];
+  messages: SessionMessage[];
 
   /**
    * 可选模型实例；传入时会尝试生成更短标题。
    */
-  model?: LanguageModel;
+  model?: ModelClient;
 
   /**
    * 当前模型展示标签；仅用于排障日志，不参与生成逻辑。
@@ -68,26 +72,10 @@ function truncateTitle(input: string, maxChars: number): string {
   return title.slice(0, maxChars).trimEnd();
 }
 
-function extractTextFromMessage(message: SessionRecordV1): string {
-  if (!is_session_message_record(message)) return "";
-  if (!Array.isArray(message.parts)) return "";
-  const texts: string[] = [];
-  for (const part of message.parts) {
-    if (!part || typeof part !== "object") continue;
-    const textPart = part as { type?: unknown; text?: unknown };
-    if (textPart.type !== "text" || typeof textPart.text !== "string") continue;
-    const text = textPart.text.trim();
-    if (!text) continue;
-    texts.push(text);
-  }
-  return texts.join("\n").trim();
-}
-
-function resolveFirstUserText(messages: SessionRecordV1[]): string {
+function resolveFirstUserText(messages: SessionMessage[]): string {
   for (const message of messages) {
-    if (!is_session_message_record(message)) continue;
-    if (message.role !== "user") continue;
-    const text = extractTextFromMessage(message);
+    if (message.type !== "user") continue;
+    const text = extract_session_message_text(message);
     if (text) return text;
   }
   return "";
@@ -177,7 +165,7 @@ async function generateSessionTitle(input: {
   /**
    * 当前模型实例。
    */
-  model: LanguageModel;
+  model: ModelClient;
 
   /**
    * 当前 session 标识。
@@ -202,24 +190,19 @@ async function generateSessionTitle(input: {
   /** 标题请求取消信号。 */
   signal?: AbortSignal;
 }): Promise<string | undefined> {
-  let observedStreamError: unknown;
   try {
-    const result = streamText({
-      model: input.model,
-      system:
+    const result = await generate_model(input.model, {
+      messages: build_text_model_messages(
         "You generate minimal conversation titles. Output only the title itself, with no explanation and no quotation marks.",
-      prompt: [
+        [
         "Generate a short conversation title from the first user message below.",
         "Requirements: 3 to 12 Chinese characters or 2 to 6 English words; no period; no prefix.",
         "",
         input.firstUserText,
-      ].join("\n"),
-      onError: ({ error }) => {
-        observedStreamError = error;
-      },
-      abortSignal: input.signal,
-    });
-    const text = await result.text;
+        ].join("\n"),
+      ),
+    }, input.signal);
+    const text = result.text;
     const generatedTitle = normalizeGeneratedTitle(text);
     if (!generatedTitle) {
       await logSessionTitleDiagnostic({
@@ -236,7 +219,7 @@ async function generateSessionTitle(input: {
     }
     return generatedTitle;
   } catch (error) {
-    const effectiveError = observedStreamError || error;
+    const effectiveError = error;
     await logSessionTitleDiagnostic({
       logger: input.logger,
       session_id: input.session_id,