@downcity/agent 1.1.408 → 1.1.437

package/bin/session/messages/{SessionAssistantMessageWriter.d.ts → SessionAgentMessageWriter.d.ts}

@@ -5,12 +5,12 @@
  * 串行写入 `SessionMessages`。它不理解 UI Message 或 Provider 私有事件。
  */
 import type { ModelStreamEvent } from "@downcity/type";
-import type { SessionMessages } from "../SessionMessages.js";
-import type { SessionAssistantResultPart } from "../../types/session/SessionContent.js";
-import type { SessionAssistantMessagePart } from "../../types/session/SessionMessage.js";
+import type { SessionMessages } from "../../session/SessionMessages.js";
+import type { SessionAgentContent } from "@downcity/type";
+import type { SessionAgentMessagePart } from "@downcity/type";
 import type { SessionToolExecutionResult, SessionToolInputReady } from "../../types/session/SessionTool.js";
 /** 单个 Assistant Message 的流式 Writer。 */
-export declare class SessionAssistantMessageWriter {
+export declare class SessionAgentMessageWriter {
     /** 当前 canonical Assistant Message 标识。 */
     readonly message_id: string;
     private readonly recorder;
@@ -20,6 +20,7 @@ export declare class SessionAssistantMessageWriter {
     private readonly tool_part_gate;
     private write_chain;
     private step_index;
+    private current_step_id;
     private step_active;
     private closed;
     constructor(recorder: SessionMessages, message_id: string);
@@ -36,13 +37,24 @@ export declare class SessionAssistantMessageWriter {
      *
      * 最终快照不能创建、删除或重排模型 Part；不一致意味着事件链不完整。
      */
-    finish_step(parts: SessionAssistantMessagePart[]): Promise<void>;
-    /** 释放异常结束的 Step 作用域并保留已经写入的 canonical Parts。 */
+    finish_step(parts: SessionAgentMessagePart[]): Promise<void>;
+    /** 释放异常 Step，并丢弃最近检查点之后的运行投影。 */
     abort_step(): Promise<void>;
     /** 把 Action 产生的封闭内容追加到当前 Assistant Message。 */
-    append_result_parts(parts: readonly SessionAssistantResultPart[]): Promise<void>;
+    append_result_parts(parts: readonly SessionAgentContent[]): Promise<SessionAgentMessagePart[]>;
+    /** 在 Turn 收口产物之前追加用户可见的 canonical Error Part。 */
+    append_error(input: {
+        /** 错误影响范围。 */
+        scope: "session" | "turn";
+        /** 稳定错误码。 */
+        code: string;
+        /** 用户可见错误信息。 */
+        message: string;
+        /** 当前错误是否允许重试恢复。 */
+        recoverable: boolean;
+    }): Promise<void>;
     /** 写入一个完整 canonical Assistant Part。 */
-    upsert_part(part: SessionAssistantMessagePart): Promise<void>;
+    upsert_part(part: SessionAgentMessagePart): Promise<void>;
     /** 等待当前 Writer 已入队的全部写操作完成。 */
     flush(): Promise<void>;
     /** 正常完成当前 Assistant Message。 */
@@ -73,6 +85,8 @@ export declare class SessionAssistantMessageWriter {
     private step_snapshot_error;
     /** 清理当前 Step 的临时关联状态。 */
     private reset_step_state;
+    /** 返回当前模型 Step 的稳定标识。 */
+    private require_step_id;
     /** 计算下一个不可变 Part 顺序号。 */
     private next_part_sequence;
     /** 串行执行对当前 Assistant Message 的全部写操作。 */
@@ -80,4 +94,4 @@ export declare class SessionAssistantMessageWriter {
     /** 在队列内关闭当前 Assistant Message。 */
     private close_serialized;
 }
-//# sourceMappingURL=SessionAssistantMessageWriter.d.ts.map
+//# sourceMappingURL=SessionAgentMessageWriter.d.ts.map

package/bin/session/messages/SessionAgentMessageWriter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SessionAgentMessageWriter.d.ts","sourceRoot":"","sources":["../../../src/session/messages/SessionAgentMessageWriter.ts"],"names":[],"mappings":"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"}

package/bin/session/messages/{SessionAssistantMessageWriter.js → SessionAgentMessageWriter.js}

@@ -4,11 +4,12 @@
  * Writer 直接消费 Downcity `ModelStreamEvent`，并把模型内容、Tool 状态和 Action 内容
  * 串行写入 `SessionMessages`。它不理解 UI Message 或 Provider 私有事件。
  */
-import { to_session_json_value } from "./SessionJsonValue.js";
-import { SessionToolPartGate } from "./SessionToolPartGate.js";
+import { to_session_json_value } from "../../session/messages/SessionJsonValue.js";
+import { SessionToolPartGate } from "../../session/messages/SessionToolPartGate.js";
 import { generate_id } from "../../utils/Id.js";
+import { create_session_agent_content_part } from "../../session/messages/SessionAgentContent.js";
 /** 单个 Assistant Message 的流式 Writer。 */
-export class SessionAssistantMessageWriter {
+export class SessionAgentMessageWriter {
     /** 当前 canonical Assistant Message 标识。 */
     message_id;
     recorder;
@@ -18,6 +19,7 @@ export class SessionAssistantMessageWriter {
     tool_part_gate = new SessionToolPartGate();
     write_chain = Promise.resolve();
     step_index = 0;
+    current_step_id = null;
     step_active = false;
     closed = false;
     constructor(recorder, message_id) {
@@ -33,6 +35,7 @@ export class SessionAssistantMessageWriter {
                 throw new Error("Assistant canonical step is already active");
             }
             this.step_index += 1;
+            this.current_step_id = `step:${this.message_id}:${this.step_index}`;
             this.step_active = true;
             this.content_part_ids.clear();
             this.tool_call_ids.clear();
@@ -59,6 +62,7 @@ export class SessionAssistantMessageWriter {
                 state: "ready",
                 input: to_session_json_value(input.input),
             });
+            await this.recorder.checkpoint_agent_message(this.message_id);
         });
     }
     /** 把 Tool 执行终态直接写入对应 canonical Tool Part。 */
@@ -78,6 +82,7 @@ export class SessionAssistantMessageWriter {
                     state: "failed",
                     error: read_tool_error(result.output),
                 });
+            await this.recorder.checkpoint_agent_message(this.message_id);
         });
     }
     /**
@@ -101,59 +106,56 @@ export class SessionAssistantMessageWriter {
                 const final_part = parts[index];
                 merged_parts.set(current_part.part_id, this.merge_step_part(current_part, final_part, index));
             }
-            await this.recorder.commit_assistant_step(this.message_id, current.parts.map((part) => merged_parts.get(part.part_id) ?? part));
+            await this.recorder.commit_agent_step(this.message_id, current.parts.map((part) => merged_parts.get(part.part_id) ?? part));
             this.reset_step_state();
         });
     }
-    /** 释放异常结束的 Step 作用域并保留已经写入的 canonical Parts。 */
+    /** 释放异常 Step，并丢弃最近检查点之后的运行投影。 */
     async abort_step() {
         await this.enqueue_write(async () => {
             this.tool_part_gate.reject_pending("Assistant canonical step was aborted");
-            if (this.step_active)
+            if (this.step_active) {
+                await this.recorder.rollback_agent_projection(this.message_id);
                 this.reset_step_state();
+            }
         });
     }
     /** 把 Action 产生的封闭内容追加到当前 Assistant Message。 */
     async append_result_parts(parts) {
-        await this.enqueue_write(async () => {
+        return await this.enqueue_write(async () => {
             if (this.closed)
                 throw new Error("Assistant Message writer is closed");
+            const appended_parts = [];
+            let sequence = this.next_part_sequence();
             for (const part of parts) {
-                if (part.type === "text") {
-                    await this.upsert_part({
-                        part_id: `text:${generate_id()}`,
-                        sequence: this.next_part_sequence(),
-                        type: "text",
-                        text: part.text,
-                        state: "done",
-                    });
-                }
-                else if (part.type === "file") {
-                    await this.upsert_part({
-                        part_id: `file:${generate_id()}`,
-                        sequence: this.next_part_sequence(),
-                        type: "file",
-                        media_type: part.media_type,
-                        url: part.url,
-                        ...(part.filename ? { filename: part.filename } : {}),
-                    });
-                }
-                else {
-                    await this.upsert_part({
-                        part_id: `data:${generate_id()}`,
-                        sequence: this.next_part_sequence(),
-                        type: "data",
-                        data_type: part.data_type,
-                        data: part.data,
-                        ...(part.data_id ? { data_id: part.data_id } : {}),
-                    });
-                }
+                const canonical = create_session_agent_content_part(part, `${part.type}:${generate_id()}`, sequence);
+                appended_parts.push(canonical);
+                sequence += 1;
             }
+            await this.recorder.commit_agent_parts(this.message_id, appended_parts);
+            return appended_parts;
+        });
+    }
+    /** 在 Turn 收口产物之前追加用户可见的 canonical Error Part。 */
+    async append_error(input) {
+        await this.enqueue_write(async () => {
+            if (this.closed)
+                throw new Error("Assistant Message writer is closed");
+            const part = {
+                part_id: `error:${generate_id()}`,
+                sequence: this.next_part_sequence(),
+                type: "error",
+                scope: input.scope,
+                code: input.code,
+                message: input.message,
+                recoverable: input.recoverable,
+            };
+            await this.recorder.commit_agent_parts(this.message_id, [part]);
         });
     }
     /** 写入一个完整 canonical Assistant Part。 */
     async upsert_part(part) {
-        await this.recorder.update_assistant_part(this.message_id, part);
+        this.recorder.project_agent_part(this.message_id, part);
         if (this.step_active)
             this.current_step_part_ids.add(part.part_id);
     }
@@ -187,6 +189,7 @@ export class SessionAssistantMessageWriter {
             await this.upsert_part({
                 part_id,
                 sequence: this.next_part_sequence(),
+                step_id: this.require_step_id(),
                 type,
                 text: "",
                 state: "streaming",
@@ -198,7 +201,7 @@ export class SessionAssistantMessageWriter {
                 return;
             const type = event.type === "text_delta" ? "text" : "reasoning";
             const part_id = this.require_content_part_id(event.content_id);
-            await this.recorder.append_assistant_delta(this.message_id, part_id, type, event.delta);
+            this.recorder.project_agent_delta(this.message_id, part_id, type, event.delta);
             return;
         }
         if (event.type === "text_finish" || event.type === "reasoning_finish") {
@@ -231,7 +234,7 @@ export class SessionAssistantMessageWriter {
                 return;
             const tool_call_id = this.require_tool_call_id(event.content_id);
             const tool = this.require_tool(tool_call_id);
-            await this.recorder.append_assistant_tool_input_delta(this.message_id, tool.part_id, tool_call_id, event.input_delta);
+            this.recorder.project_agent_tool_input_delta(this.message_id, tool.part_id, tool_call_id, event.input_delta);
             return;
         }
         if (event.type === "tool_call_finish") {
@@ -248,7 +251,7 @@ export class SessionAssistantMessageWriter {
     /** 读取当前 Assistant Message 快照。 */
     current_message() {
         const message = this.recorder.get_message(this.message_id);
-        if (!message || message.type !== "assistant") {
+        if (!message || message.role !== "agent") {
             throw new Error(`Assistant Message not found: ${this.message_id}`);
         }
         return message;
@@ -291,6 +294,7 @@ export class SessionAssistantMessageWriter {
         await this.upsert_part({
             part_id: `tool:${tool_call_id}`,
             sequence: this.next_part_sequence(),
+            step_id: this.require_step_id(),
             type: "tool",
             tool_call_id,
             ...changes,
@@ -316,6 +320,7 @@ export class SessionAssistantMessageWriter {
             ...final_part,
             part_id: current_part.part_id,
             sequence: current_part.sequence,
+            step_id: current_part.step_id,
         };
     }
     /** 构造不包含正文与 Tool 输出的结构化 Step 快照错误。 */
@@ -325,10 +330,17 @@ export class SessionAssistantMessageWriter {
     /** 清理当前 Step 的临时关联状态。 */
     reset_step_state() {
         this.step_active = false;
+        this.current_step_id = null;
         this.content_part_ids.clear();
         this.tool_call_ids.clear();
         this.current_step_part_ids.clear();
     }
+    /** 返回当前模型 Step 的稳定标识。 */
+    require_step_id() {
+        if (this.step_active && this.current_step_id)
+            return this.current_step_id;
+        throw new Error("Assistant canonical step is not active");
+    }
     /** 计算下一个不可变 Part 顺序号。 */
     next_part_sequence() {
         return this.current_message().parts.reduce((sequence, part) => Math.max(sequence, part.sequence + 1), 1);
@@ -336,8 +348,8 @@ export class SessionAssistantMessageWriter {
     /** 串行执行对当前 Assistant Message 的全部写操作。 */
     async enqueue_write(operation) {
         const current = this.write_chain.then(operation, operation);
-        this.write_chain = current.catch(() => undefined);
-        await current;
+        this.write_chain = current.then(() => undefined, () => undefined);
+        return await current;
     }
     /** 在队列内关闭当前 Assistant Message。 */
     async close_serialized(status, error) {
@@ -345,7 +357,7 @@ export class SessionAssistantMessageWriter {
             return;
         this.tool_part_gate.close(`Assistant Message writer closed with status ${status}`);
         this.reset_step_state();
-        await this.recorder.complete_assistant_message(this.message_id, status, error);
+        await this.recorder.complete_agent_message(this.message_id, status, error);
         this.closed = true;
     }
 }
@@ -360,4 +372,4 @@ function read_tool_error(output) {
     }
     return "Tool execution failed";
 }
-//# sourceMappingURL=SessionAssistantMessageWriter.js.map
+//# sourceMappingURL=SessionAgentMessageWriter.js.map

package/bin/session/messages/SessionAgentMessageWriter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SessionAgentMessageWriter.js","sourceRoot":"","sources":["../../../src/session/messages/SessionAgentMessageWriter.ts"],"names":[],"mappings":"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"}

package/bin/session/messages/SessionForkMessageFiles.d.ts

@@ -0,0 +1,22 @@
+/** Session fork 时重新归属 canonical Message 中由源 Session 持有的附件。 */
+import type { SessionMessage } from "@downcity/type";
+import type { SessionAttachmentStore } from "../../types/store/SessionAttachmentStore.js";
+/** 截取 Fork 锚点之前的历史，并按调用语义决定是否包含锚点。 */
+export declare function resolve_session_fork_messages(input: {
+    /** 当前源 Session 的稳定标识。 */
+    session_id: string;
+    /** 当前源 Session 的完整 canonical 历史。 */
+    messages: SessionMessage[];
+    /** Fork 使用的锚点 Message 标识。 */
+    message_id: string;
+    /** Fork 历史是否包含锚点 Message 本身。 */
+    include_message: boolean;
+}): SessionMessage[];
+/**
+ * 将 fork 历史中的本地绝对路径复制到目标 Session 的附件 Store。
+ *
+ * HTTP URL 和 Workspace 相对路径不由源 Session 持有，保持原引用；Data URL 与
+ * 本地绝对路径都进入目标附件 Store，确保源 Session 归档或删除后 fork 仍可恢复。
+ */
+export declare function relocate_fork_message_files(messages: readonly SessionMessage[], source_store: SessionAttachmentStore, target_store: SessionAttachmentStore): Promise<SessionMessage[]>;
+//# sourceMappingURL=SessionForkMessageFiles.d.ts.map

package/bin/session/messages/SessionForkMessageFiles.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SessionForkMessageFiles.d.ts","sourceRoot":"","sources":["../../../src/session/messages/SessionForkMessageFiles.ts"],"names":[],"mappings":"AAAA,8DAA8D;AAG9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AAEtF,sCAAsC;AACtC,wBAAgB,6BAA6B,CAAC,KAAK,EAAE;IACnD,yBAAyB;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,oCAAoC;IACpC,QAAQ,EAAE,cAAc,EAAE,CAAC;IAC3B,6BAA6B;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,gCAAgC;IAChC,eAAe,EAAE,OAAO,CAAC;CAC1B,GAAG,cAAc,EAAE,CAanB;AAED;;;;;GAKG;AACH,wBAAsB,2BAA2B,CAC/C,QAAQ,EAAE,SAAS,cAAc,EAAE,EACnC,YAAY,EAAE,sBAAsB,EACpC,YAAY,EAAE,sBAAsB,GACnC,OAAO,CAAC,cAAc,EAAE,CAAC,CAkB3B"}

package/bin/session/messages/SessionForkMessageFiles.js

@@ -0,0 +1,52 @@
+/** Session fork 时重新归属 canonical Message 中由源 Session 持有的附件。 */
+import path from "node:path";
+/** 截取 Fork 锚点之前的历史，并按调用语义决定是否包含锚点。 */
+export function resolve_session_fork_messages(input) {
+    const target_index = input.messages.findIndex((message) => message.message_id === input.message_id);
+    if (target_index < 0) {
+        throw new Error(`Cannot fork session "${input.session_id}": message_id "${input.message_id}" not found.`);
+    }
+    return input.messages.slice(0, input.include_message ? target_index + 1 : target_index);
+}
+/**
+ * 将 fork 历史中的本地绝对路径复制到目标 Session 的附件 Store。
+ *
+ * HTTP URL 和 Workspace 相对路径不由源 Session 持有，保持原引用；Data URL 与
+ * 本地绝对路径都进入目标附件 Store，确保源 Session 归档或删除后 fork 仍可恢复。
+ */
+export async function relocate_fork_message_files(messages, source_store, target_store) {
+    const relocated_urls = new Map();
+    return await Promise.all(messages.map(async (message) => {
+        const parts = await Promise.all(message.parts.map(async (part) => {
+            if (part.type !== "file")
+                return structuredClone(part);
+            if (!part.url.startsWith("data:") && (!path.isAbsolute(part.url) || !source_store.owns_local_file(part.url))) {
+                return structuredClone(part);
+            }
+            const cache_key = `${part.media_type}\u0000${part.url}`;
+            let relocated = relocated_urls.get(cache_key);
+            if (!relocated) {
+                relocated = persist_fork_file(part, target_store);
+                relocated_urls.set(cache_key, relocated);
+            }
+            return { ...structuredClone(part), url: await relocated };
+        }));
+        return { ...structuredClone(message), parts };
+    }));
+}
+/** 将单个源附件转换为目标 Store 接受的 Data URL。 */
+async function persist_fork_file(part, target_store) {
+    if (part.url.startsWith("data:")) {
+        return await target_store.persist_data_url({
+            data_url: part.url,
+            media_type: part.media_type,
+            ...(part.filename ? { filename: part.filename } : {}),
+        });
+    }
+    return await target_store.copy_local_file({
+        source_url: part.url,
+        media_type: part.media_type,
+        ...(part.filename ? { filename: part.filename } : {}),
+    });
+}
+//# sourceMappingURL=SessionForkMessageFiles.js.map

package/bin/session/messages/SessionForkMessageFiles.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SessionForkMessageFiles.js","sourceRoot":"","sources":["../../../src/session/messages/SessionForkMessageFiles.ts"],"names":[],"mappings":"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"}

package/bin/session/messages/SessionJsonValue.d.ts

@@ -4,7 +4,7 @@
  * Session 持久化边界只接受 JSON 值；无法直接序列化的输入降级为字符串，
  * 避免 Tool、User Data 等外部输入污染 canonical Message。
  */
-import type { JsonObject, JsonValue } from "../../types/common/Json.js";
+import type { JsonObject, JsonValue } from "@downcity/type";
 /** 把任意运行时输入转换为可持久化的 JSON 值。 */
 export declare function to_session_json_value(input: unknown): JsonValue;
 /** 把任意运行时输入转换为可持久化 JSON 对象，非对象输入返回 undefined。 */

package/bin/session/messages/SessionJsonValue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SessionJsonValue.d.ts","sourceRoot":"","sources":["../../../src/session/messages/SessionJsonValue.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEpE,+BAA+B;AAC/B,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,GAAG,SAAS,CAc/D;AAED,iDAAiD;AACjD,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,OAAO,GAAG,UAAU,GAAG,SAAS,CAQ7E"}
+{"version":3,"file":"SessionJsonValue.d.ts","sourceRoot":"","sources":["../../../src/session/messages/SessionJsonValue.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE5D,+BAA+B;AAC/B,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,GAAG,SAAS,CAc/D;AAED,iDAAiD;AACjD,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,OAAO,GAAG,UAAU,GAAG,SAAS,CAQ7E"}

package/bin/session/messages/SessionMessageInteractionWriter.d.ts

@@ -5,8 +5,8 @@
  * 原子状态转换；消息持久化、revision 串行化和 Mutation 发布仍由
  * SessionMessages 提供，避免复制 canonical Message 状态。
  */
-import type { SessionAssistantInteractionPart, SessionAssistantMessage, SessionAssistantMessagePart, SessionMessage } from "../../types/session/SessionMessage.js";
-import type { SessionInteractionRequest, SessionInteractionResponse } from "../../types/session/SessionInteraction.js";
+import type { SessionAgentInteractionPart, SessionAgentMessage, SessionAgentMessagePart, SessionMessage } from "@downcity/type";
+import type { SessionInteractionCloseInput, SessionInteractionRequest, SessionInteractionResponse } from "@downcity/type";
 import type { SessionStreamingToolLocation } from "../../types/session/SessionTool.js";
 /** Interaction 写入器依赖的最小 Message 能力。 */
 interface SessionMessageInteractionWriterOptions {
@@ -17,25 +17,20 @@ interface SessionMessageInteractionWriterOptions {
     /** 在指定 Assistant Message 的串行事务链中执行写操作。 */
     enqueue_assistant_write: <T>(message_id: string, operation: () => Promise<T>) => Promise<T>;
     /** 原子持久化 Assistant 完整快照并发布发生变化的 Part。 */
-    commit_assistant_snapshot: (current: SessionAssistantMessage, parts: SessionAssistantMessagePart[]) => Promise<void>;
+    commit_assistant_snapshot: (current: SessionAgentMessage, parts: SessionAgentMessagePart[]) => Promise<void>;
 }
 /** 管理 canonical Assistant Message 内的 Interaction 生命周期。 */
 export declare class SessionMessageInteractionWriter {
     private readonly options;
     constructor(options: SessionMessageInteractionWriterOptions);
     /** 返回当前 Session 中全部等待用户响应的 canonical Interaction。 */
-    list_pending(): SessionAssistantInteractionPart[];
+    list_pending(): SessionAgentInteractionPart[];
     /** 原子创建 Interaction，并把关联 Tool 转为 waiting-user。 */
-    request(request: SessionInteractionRequest): Promise<SessionAssistantInteractionPart>;
+    request(request: SessionInteractionRequest): Promise<SessionAgentInteractionPart>;
     /** 原子保存用户响应，并按 Interaction 结果恢复或终止关联 Tool。 */
-    resolve(interaction_id: string, response: SessionInteractionResponse): Promise<SessionAssistantInteractionPart>;
+    resolve(interaction_id: string, response: SessionInteractionResponse): Promise<SessionAgentInteractionPart>;
     /** 原子结束未响应 Interaction，并把关联 Tool 标记为失败。 */
-    close(interaction_id: string, input: {
-        status: "expired";
-    } | {
-        status: "cancelled";
-        reason: "turn_stopped" | "session_disposed" | "runtime_interrupted";
-    }): Promise<SessionAssistantInteractionPart>;
+    close(interaction_id: string, input: SessionInteractionCloseInput): Promise<SessionAgentInteractionPart>;
     /** 读取指定或当前唯一的流式 Assistant Message。 */
     private require_streaming_assistant;
     /** 查找指定 Interaction Part 及其所属流式 Assistant。 */

package/bin/session/messages/SessionMessageInteractionWriter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SessionMessageInteractionWriter.d.ts","sourceRoot":"","sources":["../../../src/session/messages/SessionMessageInteractionWriter.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EACV,+BAA+B,EAC/B,uBAAuB,EACvB,2BAA2B,EAC3B,cAAc,EACf,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EACV,yBAAyB,EACzB,0BAA0B,EAC3B,MAAM,uCAAuC,CAAC;AAC/C,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;AAEnF,uCAAuC;AACvC,UAAU,sCAAsC;IAC9C,8CAA8C;IAC9C,aAAa,EAAE,MAAM,QAAQ,CAAC,cAAc,CAAC,CAAC;IAC9C,uCAAuC;IACvC,mBAAmB,EAAE,CACnB,YAAY,EAAE,MAAM,KACjB,4BAA4B,GAAG,SAAS,CAAC;IAC9C,0CAA0C;IAC1C,uBAAuB,EAAE,CAAC,CAAC,EACzB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,KACxB,OAAO,CAAC,CAAC,CAAC,CAAC;IAChB,yCAAyC;IACzC,yBAAyB,EAAE,CACzB,OAAO,EAAE,uBAAuB,EAChC,KAAK,EAAE,2BAA2B,EAAE,KACjC,OAAO,CAAC,IAAI,CAAC,CAAC;CACpB;AAED,0DAA0D;AAC1D,qBAAa,+BAA+B;IAC1C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyC;gBAErD,OAAO,EAAE,sCAAsC;IAI3D,qDAAqD;IACrD,YAAY,IAAI,+BAA+B,EAAE;IAYjD,kDAAkD;IAC5C,OAAO,CACX,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,+BAA+B,CAAC;IAwD3C,8CAA8C;IACxC,OAAO,CACX,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,0BAA0B,GACnC,OAAO,CAAC,+BAA+B,CAAC;IA4C3C,2CAA2C;IACrC,KAAK,CACT,cAAc,EAAE,MAAM,EACtB,KAAK,EACD;QAAE,MAAM,EAAE,SAAS,CAAA;KAAE,GACrB;QACE,MAAM,EAAE,WAAW,CAAC;QACpB,MAAM,EAAE,cAAc,GAAG,kBAAkB,GAAG,qBAAqB,CAAC;KACrE,GACJ,OAAO,CAAC,+BAA+B,CAAC;IAmC3C,sCAAsC;IACtC,OAAO,CAAC,2BAA2B;IAoBnC,8CAA8C;IAC9C,OAAO,CAAC,gBAAgB;IAkBxB,mCAAmC;IACnC,OAAO,CAAC,mBAAmB;IAS3B,uDAAuD;IACvD,OAAO,CAAC,2BAA2B;IAanC,8CAA8C;IAC9C,OAAO,CAAC,sBAAsB;CAK/B"}
+{"version":3,"file":"SessionMessageInteractionWriter.d.ts","sourceRoot":"","sources":["../../../src/session/messages/SessionMessageInteractionWriter.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EACV,2BAA2B,EAC3B,mBAAmB,EACnB,uBAAuB,EACvB,cAAc,EACf,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EACV,4BAA4B,EAC5B,yBAAyB,EACzB,0BAA0B,EAC3B,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;AAEnF,uCAAuC;AACvC,UAAU,sCAAsC;IAC9C,8CAA8C;IAC9C,aAAa,EAAE,MAAM,QAAQ,CAAC,cAAc,CAAC,CAAC;IAC9C,uCAAuC;IACvC,mBAAmB,EAAE,CACnB,YAAY,EAAE,MAAM,KACjB,4BAA4B,GAAG,SAAS,CAAC;IAC9C,0CAA0C;IAC1C,uBAAuB,EAAE,CAAC,CAAC,EACzB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,KACxB,OAAO,CAAC,CAAC,CAAC,CAAC;IAChB,yCAAyC;IACzC,yBAAyB,EAAE,CACzB,OAAO,EAAE,mBAAmB,EAC5B,KAAK,EAAE,uBAAuB,EAAE,KAC7B,OAAO,CAAC,IAAI,CAAC,CAAC;CACpB;AAED,0DAA0D;AAC1D,qBAAa,+BAA+B;IAC1C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyC;gBAErD,OAAO,EAAE,sCAAsC;IAI3D,qDAAqD;IACrD,YAAY,IAAI,2BAA2B,EAAE;IAY7C,kDAAkD;IAC5C,OAAO,CACX,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,2BAA2B,CAAC;IAwDvC,8CAA8C;IACxC,OAAO,CACX,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,0BAA0B,GACnC,OAAO,CAAC,2BAA2B,CAAC;IA4CvC,2CAA2C;IACrC,KAAK,CACT,cAAc,EAAE,MAAM,EACtB,KAAK,EAAE,4BAA4B,GAClC,OAAO,CAAC,2BAA2B,CAAC;IAmCvC,sCAAsC;IACtC,OAAO,CAAC,2BAA2B;IAoBnC,8CAA8C;IAC9C,OAAO,CAAC,gBAAgB;IAkBxB,mCAAmC;IACnC,OAAO,CAAC,mBAAmB;IAS3B,uDAAuD;IACvD,OAAO,CAAC,2BAA2B;IAanC,8CAA8C;IAC9C,OAAO,CAAC,sBAAsB;CAK/B"}

package/bin/session/messages/SessionMessageInteractionWriter.js

@@ -13,7 +13,7 @@ export class SessionMessageInteractionWriter {
     }
     /** 返回当前 Session 中全部等待用户响应的 canonical Interaction。 */
     list_pending() {
-        return [...this.options.list_messages()].flatMap((message) => message.type === "assistant" && message.status === "streaming"
+        return [...this.options.list_messages()].flatMap((message) => message.role === "agent" && message.state === "streaming"
             ? message.parts.flatMap((part) => part.type === "interaction" && part.status === "pending"
                 ? [structuredClone(part)]
                 : [])
@@ -137,8 +137,8 @@ export class SessionMessageInteractionWriter {
     require_streaming_assistant(message_id) {
         const message = message_id
             ? [...this.options.list_messages()].find((item) => item.message_id === message_id)
-            : [...this.options.list_messages()].find((item) => item.type === "assistant" && item.status === "streaming");
-        if (!message || message.type !== "assistant" || message.status !== "streaming") {
+            : [...this.options.list_messages()].find((item) => item.role === "agent" && item.state === "streaming");
+        if (!message || message.role !== "agent" || message.state !== "streaming") {
             throw new Error(message_id
                 ? `Streaming Assistant Message not found: ${message_id}`
                 : "Streaming Assistant Message not found");
@@ -148,7 +148,7 @@ export class SessionMessageInteractionWriter {
     /** 查找指定 Interaction Part 及其所属流式 Assistant。 */
     find_interaction(interaction_id) {
         for (const message of this.options.list_messages()) {
-            if (message.type !== "assistant" || message.status !== "streaming")
+            if (message.role !== "agent" || message.state !== "streaming")
                 continue;
             const part = message.parts.find((item) => item.type === "interaction" &&
                 item.interaction_id === interaction_id);

package/bin/session/messages/SessionMessageInteractionWriter.js.map

@@ -1 +1 @@
-{"version":3,"file":"SessionMessageInteractionWriter.js","sourceRoot":"","sources":["../../../src/session/messages/SessionMessageInteractionWriter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SessionMessageInteractionWriter.js","sourceRoot":"","sources":["../../../src/session/messages/SessionMessageInteractionWriter.ts"],"names":[],"mappings":"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"}

package/bin/session/messages/SessionMessageText.d.ts

@@ -3,8 +3,8 @@
  *
  * 该模块只读取 Session 持久化事实，供标题、预览和外部时间线复用。
  */
-import type { SessionAssistantMessage, SessionMessage } from "../../types/session/SessionMessage.js";
-import type { JsonObject, JsonValue } from "../../types/common/Json.js";
+import type { SessionAgentMessage, SessionMessage } from "@downcity/type";
+import type { JsonObject, JsonValue } from "@downcity/type";
 /** Session 工具调用的只读摘要。 */
 export interface SessionToolCallSummary {
     /** 工具注册名称。 */
@@ -19,7 +19,7 @@ export interface SessionToolCallSummary {
 /** 提取单条 canonical Message 的全部普通文本。 */
 export declare function extract_session_message_text(message: SessionMessage): string;
 /** 提取 Assistant Message 中的 canonical 工具调用摘要。 */
-export declare function extract_session_tool_calls(message: SessionAssistantMessage): SessionToolCallSummary[];
+export declare function extract_session_tool_calls(message: SessionAgentMessage): SessionToolCallSummary[];
 /** 读取最终一次成功 `chat_send` 的可见文本，并回退到普通 Assistant 文本。 */
-export declare function resolve_session_assistant_visible_text(message: SessionAssistantMessage): string;
+export declare function resolve_session_assistant_visible_text(message: SessionAgentMessage): string;
 //# sourceMappingURL=SessionMessageText.d.ts.map

package/bin/session/messages/SessionMessageText.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SessionMessageText.d.ts","sourceRoot":"","sources":["../../../src/session/messages/SessionMessageText.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EACV,uBAAuB,EACvB,cAAc,EACf,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEpE,yBAAyB;AACzB,MAAM,WAAW,sBAAsB;IACrC,cAAc;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe;IACf,KAAK,EAAE,UAAU,CAAC;IAClB,mBAAmB;IACnB,MAAM,EAAE,SAAS,CAAC;IAClB,iBAAiB;IACjB,SAAS,EAAE,OAAO,CAAC;CACpB;AAED,sCAAsC;AACtC,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,CAQ5E;AAED,gDAAgD;AAChD,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,uBAAuB,GAC/B,sBAAsB,EAAE,CAY1B;AAED,sDAAsD;AACtD,wBAAgB,sCAAsC,CACpD,OAAO,EAAE,uBAAuB,GAC/B,MAAM,CASR"}
+{"version":3,"file":"SessionMessageText.d.ts","sourceRoot":"","sources":["../../../src/session/messages/SessionMessageText.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EACV,mBAAmB,EACnB,cAAc,EACf,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE5D,yBAAyB;AACzB,MAAM,WAAW,sBAAsB;IACrC,cAAc;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe;IACf,KAAK,EAAE,UAAU,CAAC;IAClB,mBAAmB;IACnB,MAAM,EAAE,SAAS,CAAC;IAClB,iBAAiB;IACjB,SAAS,EAAE,OAAO,CAAC;CACpB;AAED,sCAAsC;AACtC,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,CAO5E;AAED,gDAAgD;AAChD,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,mBAAmB,GAC3B,sBAAsB,EAAE,CAY1B;AAED,sDAAsD;AACtD,wBAAgB,sCAAsC,CACpD,OAAO,EAAE,mBAAmB,GAC3B,MAAM,CASR"}

package/bin/session/messages/SessionMessageText.js

@@ -5,8 +5,6 @@
  */
 /** 提取单条 canonical Message 的全部普通文本。 */
 export function extract_session_message_text(message) {
-    if (message.type !== "user" && message.type !== "assistant")
-        return "";
     return message.parts
         .flatMap((part) => part.type === "text" ? [part.text] : [])
         .map((text) => text.trim())

package/bin/session/messages/SessionMessageText.js.map

@@ -1 +1 @@
-{"version":3,"file":"SessionMessageText.js","sourceRoot":"","sources":["../../../src/session/messages/SessionMessageText.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAoBH,sCAAsC;AACtC,MAAM,UAAU,4BAA4B,CAAC,OAAuB;IAClE,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW;QAAE,OAAO,EAAE,CAAC;IACvE,OAAO,OAAO,CAAC,KAAK;SACjB,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SAC1D,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;SAC1B,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,IAAI,CAAC;SACV,IAAI,EAAE,CAAC;AACZ,CAAC;AAED,gDAAgD;AAChD,MAAM,UAAU,0BAA0B,CACxC,OAAgC;IAEhC,OAAO,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACpC,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS;YAAE,OAAO,EAAE,CAAC;QAChE,OAAO,CAAC;gBACN,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,KAAK,EAAE,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC;gBACjC,MAAM,EAAE,IAAI,CAAC,KAAK,KAAK,QAAQ;oBAC7B,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,YAAY,EAAE;oBACvC,CAAC,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI;gBACvB,SAAS,EAAE,IAAI,CAAC,KAAK,KAAK,WAAW;aACtC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,sDAAsD;AACtD,MAAM,UAAU,sCAAsC,CACpD,OAAgC;IAEhC,MAAM,KAAK,GAAG,0BAA0B,CAAC,OAAO,CAAC,CAAC;IAClD,KAAK,IAAI,KAAK,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QAC1D,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;QAC1B,IAAI,IAAI,CAAC,SAAS,KAAK,WAAW;YAAE,SAAS;QAC7C,MAAM,IAAI,GAAG,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/E,IAAI,IAAI,IAAI,IAAI,CAAC,SAAS;YAAE,OAAO,IAAI,CAAC;IAC1C,CAAC;IACD,OAAO,4BAA4B,CAAC,OAAO,CAAC,CAAC;AAC/C,CAAC;AAED,wBAAwB;AACxB,SAAS,cAAc,CAAC,KAAgB;IACtC,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAChE,OAAO,KAAmB,CAAC;IAC7B,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,CAAC;AACnB,CAAC"}
+{"version":3,"file":"SessionMessageText.js","sourceRoot":"","sources":["../../../src/session/messages/SessionMessageText.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAoBH,sCAAsC;AACtC,MAAM,UAAU,4BAA4B,CAAC,OAAuB;IAClE,OAAO,OAAO,CAAC,KAAK;SACjB,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SAC1D,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;SAC1B,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,IAAI,CAAC;SACV,IAAI,EAAE,CAAC;AACZ,CAAC;AAED,gDAAgD;AAChD,MAAM,UAAU,0BAA0B,CACxC,OAA4B;IAE5B,OAAO,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACpC,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS;YAAE,OAAO,EAAE,CAAC;QAChE,OAAO,CAAC;gBACN,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,KAAK,EAAE,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC;gBACjC,MAAM,EAAE,IAAI,CAAC,KAAK,KAAK,QAAQ;oBAC7B,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,YAAY,EAAE;oBACvC,CAAC,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI;gBACvB,SAAS,EAAE,IAAI,CAAC,KAAK,KAAK,WAAW;aACtC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,sDAAsD;AACtD,MAAM,UAAU,sCAAsC,CACpD,OAA4B;IAE5B,MAAM,KAAK,GAAG,0BAA0B,CAAC,OAAO,CAAC,CAAC;IAClD,KAAK,IAAI,KAAK,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QAC1D,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;QAC1B,IAAI,IAAI,CAAC,SAAS,KAAK,WAAW;YAAE,SAAS;QAC7C,MAAM,IAAI,GAAG,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/E,IAAI,IAAI,IAAI,IAAI,CAAC,SAAS;YAAE,OAAO,IAAI,CAAC;IAC1C,CAAC;IACD,OAAO,4BAA4B,CAAC,OAAO,CAAC,CAAC;AAC/C,CAAC;AAED,wBAAwB;AACxB,SAAS,cAAc,CAAC,KAAgB;IACtC,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAChE,OAAO,KAAmB,CAAC;IAC7B,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,CAAC;AACnB,CAAC"}