@downcity/agent 1.1.338 → 1.1.400

package/bin/session/execution/SessionAssistantOutputAdapter.js

@@ -1,10 +1,9 @@
 /**
- * AI SDK Assistant 输出到 Session canonical Message 的协议 Adapter。
+ * Downcity 模型事件到 canonical Assistant Message 的输出 Adapter。
  *
- * 本模块是 AI SDK 临时 ID、空 Part 与最终 UIMessage 快照能进入的最外层边界。
- * 它只通过 SessionMessages 打开 Writer，不持有第二份 Assistant Message 状态。
+ * Adapter 只负责惰性打开当前 Turn 的唯一 Writer，并把标准模型事件、Tool 结果与
+ * Action 内容转交给 Writer；`SessionMessages` 始终是唯一事实源。
  */
-import { from_ui_assistant_parts } from "../../session/messages/SessionMessageCodec.js";
 /** 单个 Turn 使用的 Assistant 输出 Adapter。 */
 export class SessionAssistantOutputAdapter {
     turn_id;
@@ -19,7 +18,7 @@ export class SessionAssistantOutputAdapter {
             throw new Error("SessionAssistantOutputAdapter requires a non-empty turn_id");
         }
     }
-    /** 开始当前 Provider Step。 */
+    /** 开始当前模型 Step。 */
     async begin_step() {
         if (this.writer) {
             await this.writer.begin_step();
@@ -27,15 +26,23 @@ export class SessionAssistantOutputAdapter {
         }
         this.step_pending = true;
     }
-    /** 把可持久化 AI SDK Chunk 写入当前 canonical Message。 */
-    async write_chunk(chunk) {
-        if (!is_assistant_content_chunk(chunk.type))
+    /** 直接写入单个标准模型事件。 */
+    async write_model_event(event) {
+        if (!is_assistant_content_event(event))
             return;
-        await (await this.ensure_writer()).apply_chunk(chunk);
+        await (await this.ensure_writer()).apply_model_event(event);
     }
-    /** 使用最终快照校验当前 Step Part 顺序并补齐 metadata。 */
-    async finish_step(message) {
-        await (await this.ensure_writer()).finish_step(from_ui_assistant_parts(message.parts));
+    /** 在 Tool 执行前提交完整输入。 */
+    async prepare_tool_input(input) {
+        await (await this.ensure_writer()).prepare_tool_input(input);
+    }
+    /** 写入 Tool 执行终态。 */
+    async write_tool_result(result) {
+        await (await this.ensure_writer()).apply_tool_result(result);
+    }
+    /** 使用模型聚合出的 canonical Parts 校验当前 Step。 */
+    async finish_step(parts) {
+        await (await this.ensure_writer()).finish_step(parts);
     }
     /** 清理异常结束的 Step 作用域。 */
     async abort_step() {
@@ -43,11 +50,7 @@ export class SessionAssistantOutputAdapter {
             await this.writer.abort_step();
         this.step_pending = false;
     }
-    /** 在 Tool 实现开始前提交完整输入。 */
-    async prepare_tool_input(input) {
-        await (await this.ensure_writer()).prepare_tool_input(input);
-    }
-    /** User steer 已持久化后关闭当前 Assistant Message；没有输出时保持为空。 */
+    /** User steer 持久化后关闭它之前的当前 Assistant Message。 */
     async close_current_message() {
         if (!this.writer) {
             this.step_pending = false;
@@ -56,11 +59,11 @@ export class SessionAssistantOutputAdapter {
         await this.writer.complete();
         this.writer = null;
     }
-    /** 把 Action 产生的完整 UI Parts 追加到当前 canonical Assistant Message。 */
-    async append_parts(parts) {
-        if (!Array.isArray(parts) || parts.length === 0)
+    /** 追加 Action 产生的封闭 Assistant 内容。 */
+    async append_result_parts(parts) {
+        if (parts.length === 0)
             return;
-        await (await this.ensure_writer()).append_parts(from_ui_assistant_parts(parts));
+        await (await this.ensure_writer()).append_result_parts(parts);
     }
     /** 按 Turn 结果收口最后一个 canonical Message。 */
     async finish(input) {
@@ -99,19 +102,16 @@ export class SessionAssistantOutputAdapter {
         }
     }
 }
-/** 判断 AI SDK Chunk 是否属于 canonical Assistant 内容。 */
-function is_assistant_content_chunk(type) {
-    return (type === "text-start" ||
-        type === "text-delta" ||
-        type === "text-end" ||
-        type === "reasoning-start" ||
-        type === "reasoning-delta" ||
-        type === "reasoning-end" ||
-        type.startsWith("tool-") ||
-        type === "file" ||
-        type === "source-url" ||
-        type === "source-document" ||
-        type === "start-step" ||
-        type.startsWith("data-"));
+/** 判断标准模型事件是否会产生 canonical Assistant 内容。 */
+function is_assistant_content_event(event) {
+    return event.type === "text_start" ||
+        event.type === "text_delta" ||
+        event.type === "text_finish" ||
+        event.type === "reasoning_start" ||
+        event.type === "reasoning_delta" ||
+        event.type === "reasoning_finish" ||
+        event.type === "tool_call_start" ||
+        event.type === "tool_call_delta" ||
+        event.type === "tool_call_finish";
 }
 //# sourceMappingURL=SessionAssistantOutputAdapter.js.map

package/bin/session/execution/SessionAssistantOutputAdapter.js.map

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

package/bin/session/execution/tools/SessionShellApprovalAdapter.d.ts

@@ -4,8 +4,8 @@
  * Shell 只理解高风险命令审批协议；本 Adapter 把它转换成 Session 的通用
  * approval Interaction，并把 Interaction 终态映射回 Shell 决策。
  */
-import type { ShellApprovalGateway, ShellApprovalHandle, ShellApprovalRequest } from "@downcity/shell";
-import type { SessionInteractions } from "../../../session/control/SessionInteractions.js";
+import type { ShellApprovalGateway, ShellApprovalHandle, ShellApprovalRequest } from "@downcity/workspace";
+import type { SessionInteractions } from "../../control/SessionInteractions.js";
 import type { SessionApprovalMode } from "../../../types/session/SessionInteraction.js";
 /** 单个 Session 的 Shell 高风险操作审批 Adapter。 */
 export declare class SessionShellApprovalAdapter implements ShellApprovalGateway {

package/bin/session/execution/tools/SessionShellApprovalAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SessionShellApprovalAdapter.d.ts","sourceRoot":"","sources":["../../../../src/session/execution/tools/SessionShellApprovalAdapter.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EACV,oBAAoB,EACpB,mBAAmB,EACnB,oBAAoB,EAErB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AACpF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAGjF,0CAA0C;AAC1C,qBAAa,2BAA4B,YAAW,oBAAoB;IACtE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAsB;IACnD,OAAO,CAAC,IAAI,CAA8B;gBAE9B,OAAO,EAAE;QACnB,gCAAgC;QAChC,UAAU,EAAE,MAAM,CAAC;QACnB,4BAA4B;QAC5B,YAAY,EAAE,mBAAmB,CAAC;KACnC;IAUD,+CAA+C;IACzC,OAAO,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IA6CxE,oCAAoC;IACpC,kBAAkB,IAAI,mBAAmB;IAIzC,4CAA4C;IAC5C,kBAAkB,CAAC,IAAI,EAAE,mBAAmB,GAAG,IAAI;CAGpD"}
+{"version":3,"file":"SessionShellApprovalAdapter.d.ts","sourceRoot":"","sources":["../../../../src/session/execution/tools/SessionShellApprovalAdapter.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EACV,oBAAoB,EACpB,mBAAmB,EACnB,oBAAoB,EAErB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AACpF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAGjF,0CAA0C;AAC1C,qBAAa,2BAA4B,YAAW,oBAAoB;IACtE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAsB;IACnD,OAAO,CAAC,IAAI,CAA8B;gBAE9B,OAAO,EAAE;QACnB,gCAAgC;QAChC,UAAU,EAAE,MAAM,CAAC;QACnB,4BAA4B;QAC5B,YAAY,EAAE,mBAAmB,CAAC;KACnC;IAUD,+CAA+C;IACzC,OAAO,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAwDxE,oCAAoC;IACpC,kBAAkB,IAAI,mBAAmB;IAIzC,4CAA4C;IAC5C,kBAAkB,CAAC,IAAI,EAAE,mBAAmB,GAAG,IAAI;CAGpD"}

package/bin/session/execution/tools/SessionShellApprovalAdapter.js

@@ -34,18 +34,27 @@ export class SessionShellApprovalAdapter {
         const handle = await this.interactions.request({
             interaction_id,
             turn_id: input.turn_id,
-            kind: "approval",
+            type: "approval",
             source: {
-                type: "tool",
+                type: "shell",
                 tool_call_id: input.tool_call_id,
                 tool_name: input.tool_name,
             },
             title: `Approve ${input.tool_name}`,
             description: input.reason,
-            command: input.command,
-            cwd: input.cwd,
-            reason: input.reason,
-            operation: input.operation,
+            payload: {
+                operation: input.operation,
+                command: input.command,
+                cwd: input.cwd,
+                reason: input.reason,
+            },
+            response_schema: {
+                type: "object",
+                required: ["decision"],
+                properties: {
+                    decision: { type: "string", enum: ["approved", "denied"] },
+                },
+            },
             created_at,
             expires_at: created_at + input.timeout_ms,
         });
@@ -57,9 +66,12 @@ export class SessionShellApprovalAdapter {
                     return "expired";
                 if (result.status !== "resolved")
                     return "denied";
-                if (result.response.kind !== "approval")
+                if (result.response.outcome !== "resolved" || result.response.type !== "approval")
+                    return "denied";
+                const payload = result.response.payload;
+                if (!payload || typeof payload !== "object" || Array.isArray(payload))
                     return "denied";
-                return result.response.decision;
+                return payload.decision || "denied";
             }),
         };
     }

package/bin/session/execution/tools/SessionShellApprovalAdapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"SessionShellApprovalAdapter.js","sourceRoot":"","sources":["../../../../src/session/execution/tools/SessionShellApprovalAdapter.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAUH,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,0CAA0C;AAC1C,MAAM,OAAO,2BAA2B;IACrB,UAAU,CAAS;IACnB,YAAY,CAAsB;IAC3C,IAAI,GAAwB,KAAK,CAAC;IAE1C,YAAY,OAKX;QACC,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC1D,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;QACzC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CACb,6DAA6D,CAC9D,CAAC;QACJ,CAAC;IACH,CAAC;IAED,+CAA+C;IAC/C,KAAK,CAAC,OAAO,CAAC,KAA2B;QACvC,IAAI,KAAK,CAAC,UAAU,KAAK,IAAI,CAAC,UAAU,EAAE,CAAC;YACzC,MAAM,IAAI,KAAK,CAAC,8BAA8B,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC;QACpE,CAAC;QACD,MAAM,cAAc,GAAG,eAAe,WAAW,EAAE,EAAE,CAAC;QACtD,IAAI,IAAI,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;YACjC,OAAO;gBACL,WAAW,EAAE,cAAc;gBAC3B,sBAAsB,EAAE,KAAK;gBAC7B,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC;aACtC,CAAC;QACJ,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC9B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC;YAC7C,cAAc;YACd,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,IAAI,EAAE,UAAU;YAChB,MAAM,EAAE;gBACN,IAAI,EAAE,MAAM;gBACZ,YAAY,EAAE,KAAK,CAAC,YAAY;gBAChC,SAAS,EAAE,KAAK,CAAC,SAAS;aAC3B;YACD,KAAK,EAAE,WAAW,KAAK,CAAC,SAAS,EAAE;YACnC,WAAW,EAAE,KAAK,CAAC,MAAM;YACzB,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,GAAG,EAAE,KAAK,CAAC,GAAG;YACd,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,UAAU;YACV,UAAU,EAAE,UAAU,GAAG,KAAK,CAAC,UAAU;SAC1C,CAAC,CAAC;QAEH,OAAO;YACL,WAAW,EAAE,cAAc;YAC3B,sBAAsB,EAAE,IAAI;YAC5B,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,EAAuB,EAAE;gBAC3D,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS;oBAAE,OAAO,SAAS,CAAC;gBAClD,IAAI,MAAM,CAAC,MAAM,KAAK,UAAU;oBAAE,OAAO,QAAQ,CAAC;gBAClD,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,KAAK,UAAU;oBAAE,OAAO,QAAQ,CAAC;gBACzD,OAAO,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAClC,CAAC,CAAC;SACH,CAAC;IACJ,CAAC;IAED,oCAAoC;IACpC,kBAAkB;QAChB,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED,4CAA4C;IAC5C,kBAAkB,CAAC,IAAyB;QAC1C,IAAI,CAAC,IAAI,GAAG,IAAI,KAAK,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC;IAC/D,CAAC;CACF"}
+{"version":3,"file":"SessionShellApprovalAdapter.js","sourceRoot":"","sources":["../../../../src/session/execution/tools/SessionShellApprovalAdapter.ts"],"names":[],"mappings":"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"}

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

@@ -1,19 +1,21 @@
 /**
- * 单个 Assistant Message 的流式写入器。
+ * 单个 canonical Assistant Message 的流式写入器。
  *
- * Writer 把 AI SDK chunk、Executor Tool 输入屏障和最终关闭操作收口到同一条
- * 单写者队列，保证并发回调不会产生 revision 冲突。
+ * Writer 直接消费 Downcity `ModelStreamEvent`，并把模型内容、Tool 状态和 Action 内容
+ * 串行写入 `SessionMessages`。它不理解 UI Message 或 Provider 私有事件。
  */
-import type { UIMessageChunk } from "ai";
-import type { SessionMessages } from "../../session/SessionMessages.js";
-import type { SessionAssistantFilePart, SessionAssistantMessagePart } from "../../types/session/SessionMessage.js";
-import type { SessionToolInputReady } from "../../types/session/SessionTool.js";
-/** 单个 Assistant Message 的流式 writer。 */
+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 { SessionToolExecutionResult, SessionToolInputReady } from "../../types/session/SessionTool.js";
+/** 单个 Assistant Message 的流式 Writer。 */
 export declare class SessionAssistantMessageWriter {
+    /** 当前 canonical Assistant Message 标识。 */
     readonly message_id: string;
     private readonly recorder;
-    private readonly pending_text_parts;
-    private readonly active_text_part_ids;
+    private readonly content_part_ids;
+    private readonly tool_call_ids;
     private readonly current_step_part_ids;
     private readonly tool_part_gate;
     private write_chain;
@@ -21,30 +23,27 @@ export declare class SessionAssistantMessageWriter {
     private step_active;
     private closed;
     constructor(recorder: SessionMessages, message_id: string);
-    /** 应用一个原始 AI SDK UI chunk。 */
-    apply_chunk(chunk: UIMessageChunk): Promise<void>;
-    /** 建立一个独立模型 UI stream 的 canonical step 作用域。 */
+    /** 建立一个独立模型 Step 的 canonical Part 作用域。 */
     begin_step(): Promise<void>;
+    /** 直接把单个标准模型事件写入 canonical Assistant Message。 */
+    apply_model_event(event: ModelStreamEvent): Promise<void>;
+    /** 在 Tool 实现执行前提交完整输入，供审批与执行状态共同使用。 */
+    prepare_tool_input(input: SessionToolInputReady): Promise<void>;
+    /** 把 Tool 执行终态直接写入对应 canonical Tool Part。 */
+    apply_tool_result(result: SessionToolExecutionResult): Promise<void>;
     /**
-     * 校验当前 step 的最终快照并原子补充 metadata。
+     * 校验当前 Step 最终 canonical Part 快照。
      *
-     * 最终快照不能创建、删除或重排 Part；任何不一致都表示 canonical chunk
-     * 链路不完整，必须让当前 Turn 失败。
+     * 最终快照不能创建、删除或重排模型 Part；不一致意味着事件链不完整。
      */
     finish_step(parts: SessionAssistantMessagePart[]): Promise<void>;
-    /** 释放异常结束的 step 作用域并保留已经写入的 canonical Parts。 */
+    /** 释放异常结束的 Step 作用域并保留已经写入的 canonical Parts。 */
     abort_step(): Promise<void>;
-    /** 在当前 Assistant writer 的单写者队列中应用原始 chunk。 */
-    private apply_chunk_serialized;
-    /** 写入一个完整 Assistant part。 */
+    /** 把 Action 产生的封闭内容追加到当前 Assistant Message。 */
+    append_result_parts(parts: readonly SessionAssistantResultPart[]): Promise<void>;
+    /** 写入一个完整 canonical Assistant Part。 */
     upsert_part(part: SessionAssistantMessagePart): Promise<void>;
-    /** Executor 在调用 Tool 实现前写入完整输入。 */
-    prepare_tool_input(input: SessionToolInputReady): Promise<void>;
-    /** 把最终结果中的文件补入当前 Assistant，并对流式已写入文件去重。 */
-    append_file_part(input: Pick<SessionAssistantFilePart, "filename" | "media_type" | "provider_metadata" | "url">): Promise<void>;
-    /** 把 Action 产生的完整 Assistant Parts 按当前消息顺序追加。 */
-    append_parts(parts: SessionAssistantMessagePart[]): Promise<void>;
-    /** 等待当前 Assistant writer 已入队的全部写操作完成。 */
+    /** 等待当前 Writer 已入队的全部写操作完成。 */
     flush(): Promise<void>;
     /** 正常完成当前 Assistant Message。 */
     complete(): Promise<void>;
@@ -52,35 +51,30 @@ export declare class SessionAssistantMessageWriter {
     stop(): Promise<void>;
     /** 以失败状态关闭当前 Assistant Message。 */
     fail(error: unknown): Promise<void>;
+    /** 在单写队列中应用标准模型事件。 */
+    private apply_model_event_serialized;
     /** 读取当前 Assistant Message 快照。 */
     private current_message;
-    /** 读取当前 Assistant 中的指定 Tool Part。 */
+    /** 查找当前 Assistant 中的指定 Tool Part。 */
     private find_tool;
-    /** 校验并合并同一位置的 canonical Part 与 step 最终快照。 */
+    /** 读取指定 Tool Part，否则抛出稳定错误。 */
+    private require_tool;
+    /** 读取当前 Step content_id 对应的 canonical Part。 */
+    private require_content_part_id;
+    /** 读取当前 Step content_id 对应的 Tool Call。 */
+    private require_tool_call_id;
+    /** 更新已经由模型事件创建的 Tool Part。 */
+    private upsert_tool;
+    /** 创建由模型事件声明的 Tool Part。 */
+    private create_tool;
+    /** 校验并合并同一位置的 canonical Part 与 Step 最终快照。 */
     private merge_step_part;
-    /** 构造不包含正文与工具输出的结构化 step 快照错误。 */
+    /** 构造不包含正文与 Tool 输出的结构化 Step 快照错误。 */
     private step_snapshot_error;
-    /** 清理当前 step 的临时关联状态。 */
+    /** 清理当前 Step 的临时关联状态。 */
     private reset_step_state;
     /** 计算下一个不可变 Part 顺序号。 */
     private next_part_sequence;
-    /**
-     * 把 AI SDK 当前 stream 内的临时 chunk ID 映射为 Message 内唯一 Part ID。
-     *
-     * AI SDK 会在不同 `streamText()` 调用中重复使用 `txt-0`、`reasoning-0`
-     * 等 ID，因此这些 ID 只能用于关联当前尚未结束的文本片段。
-     */
-    private resolve_text_part_id;
-    /** 构造当前流片段使用的临时关联键。 */
-    private source_text_part_id;
-    /** 在首个有效 Delta 到达时才固定文本 Part 的真实顺序。 */
-    private ensure_text_part;
-    /** 更新已经由 canonical stream 创建的 Tool Part。 */
-    private upsert_tool;
-    /** 仅由 Tool 输入 stream chunk 创建 canonical Tool Part。 */
-    private create_tool;
-    /** 将 Executor 完整输入写入已经由 stream 创建的 Tool Part。 */
-    private write_prepared_tool_input;
     /** 串行执行对当前 Assistant Message 的全部写操作。 */
     private enqueue_write;
     /** 在队列内关闭当前 Assistant Message。 */

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

@@ -1 +1 @@
-{"version":3,"file":"SessionAssistantMessageWriter.d.ts","sourceRoot":"","sources":["../../../src/session/messages/SessionAssistantMessageWriter.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,IAAI,CAAC;AACzC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAOpE,OAAO,KAAK,EACV,wBAAwB,EAExB,2BAA2B,EAG5B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAG5E,uCAAuC;AACvC,qBAAa,6BAA6B;IACxC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkB;IAC3C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAG/B;IACJ,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAA6B;IAClE,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAqB;IAC3D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA6B;IAC5D,OAAO,CAAC,WAAW,CAAoC;IACvD,OAAO,CAAC,UAAU,CAAK;IACvB,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,MAAM,CAAS;gBAEX,QAAQ,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM;IAKzD,8BAA8B;IACxB,WAAW,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAMvD,+CAA+C;IACzC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAcjC;;;;;OAKG;IACG,WAAW,CAAC,KAAK,EAAE,2BAA2B,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAmCtE,gDAAgD;IAC1C,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAOjC,8CAA8C;YAChC,sBAAsB;IAwVpC,6BAA6B;IACvB,WAAW,CAAC,IAAI,EAAE,2BAA2B,GAAG,OAAO,CAAC,IAAI,CAAC;IAKnE,mCAAmC;IAC7B,kBAAkB,CAAC,KAAK,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BrE,2CAA2C;IACrC,gBAAgB,CACpB,KAAK,EAAE,IAAI,CACT,wBAAwB,EACxB,UAAU,GAAG,YAAY,GAAG,mBAAmB,GAAG,KAAK,CACxD,GACA,OAAO,CAAC,IAAI,CAAC;IAsChB,gDAAgD;IAC1C,YAAY,CAAC,KAAK,EAAE,2BAA2B,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAoBvE,yCAAyC;IACnC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5B,gCAAgC;IAC1B,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAM/B,0CAA0C;IACpC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAM3B,mCAAmC;IAC7B,IAAI,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IASzC,iCAAiC;IACjC,OAAO,CAAC,eAAe;IAQvB,qCAAqC;IACrC,OAAO,CAAC,SAAS;IAOjB,6CAA6C;IAC7C,OAAO,CAAC,eAAe;IAmDvB,kCAAkC;IAClC,OAAO,CAAC,mBAAmB;IAM3B,yBAAyB;IACzB,OAAO,CAAC,gBAAgB;IAOxB,yBAAyB;IACzB,OAAO,CAAC,kBAAkB;IAO1B;;;;;OAKG;IACH,OAAO,CAAC,oBAAoB;IAY5B,uBAAuB;IACvB,OAAO,CAAC,mBAAmB;IAO3B,uCAAuC;YACzB,gBAAgB;IAuC9B,4CAA4C;YAC9B,WAAW;IAqBzB,sDAAsD;YACxC,WAAW;IAmBzB,iDAAiD;YACnC,yBAAyB;IAUvC,wCAAwC;YAC1B,aAAa;IAM3B,kCAAkC;YACpB,gBAAgB;CAY/B"}
+{"version":3,"file":"SessionAssistantMessageWriter.d.ts","sourceRoot":"","sources":["../../../src/session/messages/SessionAssistantMessageWriter.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAGpE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAC;AACpF,OAAO,KAAK,EAEV,2BAA2B,EAE5B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EACV,0BAA0B,EAC1B,qBAAqB,EACtB,MAAM,gCAAgC,CAAC;AAGxC,uCAAuC;AACvC,qBAAa,6BAA6B;IACxC,yCAAyC;IACzC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAE5B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkB;IAC3C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA6B;IAC9D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA6B;IAC3D,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAqB;IAC3D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA6B;IAC5D,OAAO,CAAC,WAAW,CAAoC;IACvD,OAAO,CAAC,UAAU,CAAK;IACvB,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,MAAM,CAAS;gBAEX,QAAQ,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM;IAKzD,0CAA0C;IACpC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAcjC,iDAAiD;IAC3C,iBAAiB,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAI/D,uCAAuC;IACjC,kBAAkB,CAAC,KAAK,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBrE,6CAA6C;IACvC,iBAAiB,CAAC,MAAM,EAAE,0BAA0B,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB1E;;;;OAIG;IACG,WAAW,CAAC,KAAK,EAAE,2BAA2B,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA+BtE,gDAAgD;IAC1C,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAOjC,+CAA+C;IACzC,mBAAmB,CAAC,KAAK,EAAE,SAAS,0BAA0B,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAmCtF,uCAAuC;IACjC,WAAW,CAAC,IAAI,EAAE,2BAA2B,GAAG,OAAO,CAAC,IAAI,CAAC;IAKnE,+BAA+B;IACzB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5B,gCAAgC;IAC1B,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAI/B,0CAA0C;IACpC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B,mCAAmC;IAC7B,IAAI,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAOzC,sBAAsB;YACR,4BAA4B;IA4E1C,iCAAiC;IACjC,OAAO,CAAC,eAAe;IAQvB,qCAAqC;IACrC,OAAO,CAAC,SAAS;IAOjB,+BAA+B;IAC/B,OAAO,CAAC,YAAY;IAMpB,+CAA+C;IAC/C,OAAO,CAAC,uBAAuB;IAM/B,0CAA0C;IAC1C,OAAO,CAAC,oBAAoB;IAM5B,8BAA8B;YAChB,WAAW;IASzB,4BAA4B;YACd,WAAW;IAiBzB,6CAA6C;IAC7C,OAAO,CAAC,eAAe;IAgCvB,sCAAsC;IACtC,OAAO,CAAC,mBAAmB;IAM3B,yBAAyB;IACzB,OAAO,CAAC,gBAAgB;IAOxB,yBAAyB;IACzB,OAAO,CAAC,kBAAkB;IAO1B,wCAAwC;YAC1B,aAAa;IAM3B,kCAAkC;YACpB,gBAAgB;CAY/B"}