@downcity/agent 1.1.317 → 1.1.323

package/src/session/Session.ts

@@ -21,6 +21,7 @@ import type {
   AgentSessionInfo,
   AgentSessionStatus,
   AgentSessionSetInput,
+  AgentSessionSetOptions,
   AgentSessionSystemBlock,
   AgentSessionSystemSnapshot,
 } from "@/types/agent/SessionTypes.js";
@@ -93,8 +94,6 @@ export class Session implements AgentSession {
   private readonly events: SessionEventHub;
   private readonly session_interactions: SessionInteractions;
   private readonly shell_approval_adapter: SessionShellApprovalAdapter;
-  /** 已被 Session 接受、等待或已经在 Step 检查点提交的审批模式。 */
-  private configured_approval_mode: SessionApprovalMode = "ask";
   private readonly local_state: SessionLocalState;
   private readonly get_workspace_env: SessionOptions["get_workspace_env"];
   private readonly get_agent_model: SessionOptions["get_agent_model"];
@@ -102,6 +101,8 @@ export class Session implements AgentSession {
   private readonly get_instruction_system_blocks:
     SessionOptions["get_instruction_system_blocks"];
   private effective_instruction_system_blocks: AgentSessionSystemBlock[];
+  /** 当前 Session 的一次性初始化任务，避免缓存实例被重复恢复运行时状态。 */
+  private initialize_promise: Promise<void> | null = null;
   private instruction_initialize_promise: Promise<void> | null = null;
   private effective_workspace_env: Record<string, string>;
   private effective_agent_plugins: AgentPluginExecutionRuntime;
@@ -149,6 +150,7 @@ export class Session implements AgentSession {
     this.session_messages = new SessionMessages({
       session_id: this.id,
       store: this.store.messages,
+      attachment_store: this.store.attachments,
       publish: (mutation) => {
         this.events.publish(mutation);
       },
@@ -199,11 +201,19 @@ export class Session implements AgentSession {
    * 初始化当前 session。
    */
   async initialize(): Promise<this> {
-    await Promise.all([
-      this.initialize_instruction(),
-      this.session_messages.initialize(),
-      this.state.initialize(),
-    ]);
+    if (!this.initialize_promise) {
+      this.initialize_promise = (async () => {
+        await Promise.all([
+          this.initialize_instruction(),
+          this.session_messages.initialize(),
+          this.state.initialize(),
+        ]);
+        this.shell_approval_adapter.set_effective_mode(
+          this.state.get_approval_mode(),
+        );
+      })();
+    }
+    await this.initialize_promise;
     return this;
   }
 
@@ -257,7 +267,10 @@ export class Session implements AgentSession {
   /**
    * 写入当前 session 默认配置。
    */
-  async set(input: AgentSessionSetInput): Promise<void> {
+  async set(
+    input: AgentSessionSetInput,
+    options?: AgentSessionSetOptions,
+  ): Promise<void> {
     if (!input.model && !input.security) {
       throw new Error("session.set requires model or security");
     }
@@ -269,38 +282,49 @@ export class Session implements AgentSession {
     ) {
       throw new Error("security.approval_mode must be ask or always-allow");
     }
-    const model_config = input.model
+    const persist_action = options?.persist_action !== false;
+    const publish_mutation =
+      options?.publish_mutation === undefined
+        ? persist_action
+        : options.publish_mutation;
+    if (!persist_action && publish_mutation) {
+      throw new Error(
+        "session.set publish_mutation requires persist_action",
+      );
+    }
+    const model_result = input.model
       ? await this.state.set_model(input.model)
       : undefined;
     const next_approval_mode = requested_approval_mode;
-    const security_changed = Boolean(
-      next_approval_mode && next_approval_mode !== this.configured_approval_mode,
-    );
-    if (next_approval_mode !== undefined) {
-      this.configured_approval_mode = next_approval_mode;
-    }
-    if (!model_config && !security_changed) return;
+    const security_changed = next_approval_mode !== undefined
+      ? await this.state.set_approval_mode(next_approval_mode)
+      : false;
+    if (!model_result && !security_changed) return;
     const changed_fields = [
-      ...(model_config
-        ? [`model: ${String(model_config.model_label || "configured")}`]
+      ...(model_result?.changed
+        ? [`model: ${String(model_result.config.model_label || "configured")}`]
         : []),
       ...(security_changed
         ? [`security.approval_mode: ${String(next_approval_mode)}`]
         : []),
     ];
+    const completion = changed_fields.length > 0 && persist_action
+      ? {
+          type: "action" as const,
+          id: `session-config:${this.id}:${Date.now()}:${generate_id()}`,
+          title: "Session configuration updated",
+          description: changed_fields.join("; "),
+          publish_mutation,
+        }
+      : undefined;
     this.enqueue_command({
       execute: async () => {
-        if (model_config) this.state.apply_model_config(model_config);
+        if (model_result) this.state.apply_model_config(model_result.config);
         if (security_changed && next_approval_mode) {
           this.shell_approval_adapter.set_effective_mode(next_approval_mode);
         }
       },
-      completion: {
-        type: "action",
-        id: `session-config:${this.id}:${Date.now()}:${generate_id()}`,
-        title: "Session configuration updated",
-        description: changed_fields.join("; "),
-      },
+      ...(completion ? { completion } : {}),
     });
   }
 
@@ -432,7 +456,7 @@ export class Session implements AgentSession {
       state: active_turn_id || this.executor.is_executing() ? "running" : "idle",
       ...(active_turn_id ? { active_turn_id } : {}),
       security: {
-        approval_mode: this.configured_approval_mode,
+        approval_mode: this.state.get_approval_mode(),
         effective_approval_mode: this.shell_approval_adapter.get_effective_mode(),
       },
     };
@@ -453,8 +477,8 @@ export class Session implements AgentSession {
       text: String(input.text || "").trim(),
     });
     if (!appended) return;
-    await this.state.ensure_title_from_history({ generate: true });
-    await this.state.touch_metadata();
+    this.state.touch_metadata_in_background();
+    this.state.schedule_title_generation();
   }
 
   /**
@@ -555,9 +579,12 @@ export class Session implements AgentSession {
       await forked.initialize();
       const session_config = this.state.get_config();
       if (session_config.model) {
-        const forked_config = await forked.state.set_model(session_config.model);
-        forked.state.apply_model_config(forked_config);
+        const forked_model = await forked.state.set_model(session_config.model);
+        forked.state.apply_model_config(forked_model.config);
       }
+      const approval_mode = this.state.get_approval_mode();
+      await forked.state.set_approval_mode(approval_mode);
+      forked.shell_approval_adapter.set_effective_mode(approval_mode);
       await forked.session_messages.import_messages(fork_messages);
       await this.emit_action_event({
         id: action_id,
@@ -610,8 +637,8 @@ export class Session implements AgentSession {
           message_params,
         );
         if (!appended) return;
-        await this.state.ensure_title_from_history({ generate: true });
-        await this.state.touch_metadata();
+        this.state.touch_metadata_in_background();
+        this.state.schedule_title_generation();
       },
       append_assistant_message: async (message_params) => {
         const appended = await this.session_messages.append_external_assistant_message({
@@ -629,6 +656,11 @@ export class Session implements AgentSession {
     return this.runtime_port;
   }
 
+  /** 取消并释放当前 Session 的标题后台任务。 */
+  dispose_title_generation(): void {
+    this.state.dispose_title_generation();
+  }
+
   /**
    * 在执行前确保 session 已完成初始化与宿主装配。
    */
@@ -710,6 +742,7 @@ export class Session implements AgentSession {
     return {
       session_config: {},
       effective_session_config: {},
+      configured_approval_mode: "ask",
       created_at: Date.now(),
       timezone: resolve_system_timezone(),
       initialize_promise: null,

package/src/session/SessionLoop.ts

@@ -279,6 +279,8 @@ export class SessionLoop {
           session_id: this.session_id,
           turn_id,
         },
+      }, {
+        publish_mutation: completion.publish_mutation !== false,
       });
     } catch (error) {
       try {
@@ -591,16 +593,17 @@ export class SessionLoop {
       turn_id,
       input_type,
     });
-    await this.state.ensure_title_from_history({ generate: true });
-    await this.state.touch_metadata();
+    this.state.touch_metadata_in_background();
+    this.state.schedule_title_generation();
     return message;
   }
 
   /** 持久化 Executor Action，并同步刷新 Session metadata。 */
   private async persist_action_event(
     event: SessionActionRecordV1,
+    options?: { publish_mutation?: boolean },
   ): Promise<void> {
-    await this.messages.persist_action_record(event);
+    await this.messages.persist_action_record(event, options);
     await this.state.touch_metadata();
   }
 

package/src/session/SessionMessages.ts

@@ -50,7 +50,7 @@ import {
   from_ui_user_parts,
   to_executor_ui_message,
 } from "@/session/messages/SessionMessageCodec.js";
-import { hydrate_user_prompt_file_parts } from "@executor/messages/SessionAttachmentMapper.js";
+import { persist_user_prompt_file_parts } from "@executor/messages/SessionAttachmentMapper.js";
 import type {
   AppendCompletedAssistantMessageInput,
   AppendExternalSessionAssistantMessageInput,
@@ -63,6 +63,7 @@ import type {
   SessionMessagesOptions,
 } from "@/types/session/SessionMessages.js";
 import type { SessionMessageStore } from "@/types/store/SessionStore.js";
+import type { SessionAttachmentStore } from "@/types/store/SessionAttachmentStore.js";
 
 export { SessionAssistantMessageWriter } from "@/session/messages/SessionAssistantMessageWriter.js";
 
@@ -70,6 +71,7 @@ export { SessionAssistantMessageWriter } from "@/session/messages/SessionAssista
 export class SessionMessages {
   readonly session_id: string;
   private readonly store: SessionMessageStore;
+  private readonly attachment_store: SessionAttachmentStore;
   private readonly publish: SessionMessagesOptions["publish"];
   private readonly messages_by_id = new Map<string, SessionMessage>();
   /** 按 Assistant Message 隔离的完整写事务链。 */
@@ -81,6 +83,7 @@ export class SessionMessages {
   constructor(options: SessionMessagesOptions) {
     this.session_id = String(options.session_id || "").trim();
     this.store = options.store;
+    this.attachment_store = options.attachment_store;
     this.publish = options.publish;
     if (!this.session_id) throw new Error("SessionMessages requires session_id");
     this.interaction_writer = new SessionMessageInteractionWriter({
@@ -282,9 +285,9 @@ export class SessionMessages {
     const query = input.prompt.query;
     const ui_parts = typeof query === "string"
       ? [{ type: "text" as const, text: query.trim() }]
-      : await hydrate_user_prompt_file_parts(
+      : await persist_user_prompt_file_parts(
           Array.isArray(query) ? query : [],
-          input.project_root,
+          this.attachment_store,
         );
     const canonical = await this.append_user_message({
       turn_id: input.turn_id,
@@ -315,7 +318,11 @@ export class SessionMessages {
   }
 
   /** 按稳定 Action ID 创建或更新 canonical Action Message。 */
-  async persist_action_record(event: SessionActionRecordV1): Promise<void> {
+  async persist_action_record(
+    event: SessionActionRecordV1,
+    options?: { publish_mutation?: boolean },
+  ): Promise<void> {
+    const publish_mutation = options?.publish_mutation !== false;
     const existing = this.get_message(event.id);
     if (!existing) {
       const writer = await this.open_action_message({
@@ -324,6 +331,7 @@ export class SessionMessages {
         action_type: infer_action_type(event.id),
         title: event.title,
         description: event.description,
+        publish_mutation,
       });
       if (event.state === "completed") await writer.complete();
       if (event.state === "failed") {
@@ -335,7 +343,7 @@ export class SessionMessages {
       await this.update_action_message(event.id, event.state, {
         title: event.title,
         description: event.description,
-      });
+      }, { publish_mutation });
     }
   }
 
@@ -360,8 +368,12 @@ export class SessionMessages {
       title: input.title,
       ...(input.description ? { description: input.description } : {}),
       ...(input.data ? { data: structuredClone(input.data) } : {}),
-    }))) as SessionActionMessage;
-    return new SessionActionMessageWriter(this, message.message_id);
+    }), false, input.publish_mutation !== false)) as SessionActionMessage;
+    return new SessionActionMessageWriter(
+      this,
+      message.message_id,
+      input.publish_mutation !== false,
+    );
   }
 
   /** 更新 Action 状态，同时保持 message_id 与 sequence 不变。 */
@@ -369,6 +381,7 @@ export class SessionMessages {
     message_id: string,
     status: "running" | "completed" | "failed",
     changes?: { title?: string; description?: string; data?: JsonObject },
+    options?: { publish_mutation?: boolean },
   ): Promise<SessionActionMessage> {
     const message = await this.store.append_message((state) => {
       const current = require_message(state.messages, message_id, "action");
@@ -385,7 +398,7 @@ export class SessionMessages {
         updated_at: created_at,
       } satisfies SessionActionMessage;
     });
-    this.accept_message(message);
+    this.accept_message(message, options?.publish_mutation !== false);
     return message as SessionActionMessage;
   }
 
@@ -711,9 +724,10 @@ export class SessionMessages {
   async complete_assistant_message(
     message_id: string,
     status: "completed" | "stopped" | "failed",
+    error?: string,
   ): Promise<void> {
     await this.enqueue_assistant_write(message_id, async () => {
-      await this.complete_assistant_message_serialized(message_id, status);
+      await this.complete_assistant_message_serialized(message_id, status, error);
     });
   }
 
@@ -721,6 +735,7 @@ export class SessionMessages {
   private async complete_assistant_message_serialized(
     message_id: string,
     status: "completed" | "stopped" | "failed",
+    error?: string,
   ): Promise<void> {
     const current = require_message([...this.messages_by_id.values()], message_id, "assistant");
     require_streaming_assistant(current);
@@ -757,13 +772,18 @@ export class SessionMessages {
         }
         if (
           part.type === "tool" &&
-          part.state === "waiting-user" &&
-          interrupted_tool_ids.has(part.tool_call_id)
+          part.state !== "completed" &&
+          part.state !== "failed"
         ) {
           return {
             ...part,
             state: "failed" as const,
-            error: "Interaction cancelled",
+            error:
+              status === "stopped" &&
+              part.state === "waiting-user" &&
+              interrupted_tool_ids.has(part.tool_call_id)
+                ? "Interaction cancelled"
+                : error || "Tool did not complete before Assistant Message closed",
           };
         }
         return part;
@@ -776,6 +796,7 @@ export class SessionMessages {
   private async create_message(
     factory: (sequence: number, created_at: number) => SessionMessage,
     draft = false,
+    publish_mutation = true,
   ): Promise<SessionMessage> {
     await this.ensure_initialized();
     if (draft) {
@@ -786,13 +807,13 @@ export class SessionMessages {
         }
         return candidate;
       });
-      this.accept_message(message);
+      this.accept_message(message, publish_mutation);
       return message;
     }
     const message = await this.store.append_message((state) =>
       factory(state.message_sequence, Date.now()),
     );
-    this.accept_message(message);
+    this.accept_message(message, publish_mutation);
     return message;
   }
 
@@ -923,7 +944,11 @@ export class SessionMessages {
     } as SessionMessageSnapshotMutation;
   }
 
-  private accept_message(message: SessionMessage): void {
+  private accept_message(message: SessionMessage, publish_mutation = true): void {
+    if (!publish_mutation) {
+      this.messages_by_id.set(message.message_id, structuredClone(message));
+      return;
+    }
     this.accept_mutation(this.build_message_mutation(message), message);
   }
 
@@ -941,26 +966,42 @@ export class SessionMessages {
 export class SessionActionMessageWriter {
   readonly message_id: string;
   private readonly messages: SessionMessages;
+  private readonly publish_mutation: boolean;
   private closed = false;
 
-  constructor(messages: SessionMessages, message_id: string) {
+  constructor(
+    messages: SessionMessages,
+    message_id: string,
+    publish_mutation = true,
+  ) {
     this.messages = messages;
     this.message_id = message_id;
+    this.publish_mutation = publish_mutation;
   }
 
   /** 把 Action 更新为 completed。 */
   async complete(input?: { title?: string; description?: string; data?: JsonObject }): Promise<void> {
     if (this.closed) return;
-    await this.messages.update_action_message(this.message_id, "completed", input);
+    await this.messages.update_action_message(
+      this.message_id,
+      "completed",
+      input,
+      { publish_mutation: this.publish_mutation },
+    );
     this.closed = true;
   }
 
   /** 把 Action 更新为 failed。 */
   async fail(error: unknown): Promise<void> {
     if (this.closed) return;
-    await this.messages.update_action_message(this.message_id, "failed", {
-      description: error instanceof Error ? error.message : String(error),
-    });
+    await this.messages.update_action_message(
+      this.message_id,
+      "failed",
+      {
+        description: error instanceof Error ? error.message : String(error),
+      },
+      { publish_mutation: this.publish_mutation },
+    );
     this.closed = true;
   }
 }