@downcity/agent 1.1.338 → 1.1.400

package/src/remote/transports/RpcClient.ts

@@ -283,12 +283,14 @@ export class RpcClient {
   async fork_session(params: {
     session_id: string;
     message_id?: string;
+    include_message?: boolean;
   }): Promise<AgentSessionInfo> {
     const data = await this.request<{ session: AgentSessionInfo }>({
       method: "sdk.sessions.fork",
       params: {
         session_id: params.session_id,
         ...(params.message_id ? { message_id: params.message_id } : {}),
+        ...(params.include_message === false ? { include_message: false } : {}),
       },
     });
     return data.session;
@@ -486,6 +488,12 @@ export class RpcClient {
             params: input.params as never,
           }
     ) as RpcRequest;
+    if (this.endpoint.agent_id) {
+      request.agent_id = this.endpoint.agent_id;
+    }
+    if (this.endpoint.workspace_id) {
+      request.workspace_id = this.endpoint.workspace_id;
+    }
     const result = await new Promise<TData>((resolve, reject) => {
       this.pending_requests.set(id, { resolve, reject });
       socket.write(`${JSON.stringify(request)}\n`, (error) => {
@@ -614,8 +622,17 @@ export function parse_rpc_url(url_input: string): RpcClientEndpoint {
   if (!Number.isInteger(port) || port <= 0 || port > 65535) {
     throw new Error("RPC url requires a valid port");
   }
+  const path_segments = url.pathname
+    .split("/")
+    .map((segment) => decodeURIComponent(segment).trim())
+    .filter(Boolean);
+  if (path_segments.length > 2) {
+    throw new Error("RPC url accepts at most Agent ID and Workspace ID path segments");
+  }
   return {
     host,
     port,
+    ...(path_segments[0] ? { agent_id: path_segments[0] } : {}),
+    ...(path_segments[1] ? { workspace_id: path_segments[1] } : {}),
   };
 }

package/src/remote/transports/RpcRemoteAgentTransport.ts

@@ -124,6 +124,7 @@ export class RpcRemoteAgentTransport implements RemoteAgentTransport {
     return await this.client.fork_session({
       session_id,
       ...(message_id ? { message_id } : {}),
+      ...(typeof input !== "string" && input?.include_message === false ? { include_message: false } : {}),
     });
   }
 

package/src/session/DefaultSessionComposer.ts

@@ -7,7 +7,7 @@
 
 import { build_session_system_blocks } from "@/session/SessionSystem.js";
 import { compose_session_compaction } from "@/session/messages/SessionMessageCompaction.js";
-import { to_executor_history } from "@/session/messages/SessionMessageCodec.js";
+import { session_context_to_model_messages } from "@executor/messages/SessionModelMessages.js";
 import type {
   SessionComposer,
   SessionCompactionInput,
@@ -45,9 +45,9 @@ export class DefaultSessionComposer implements SessionComposer {
         content: block.content,
       })),
       system_blocks,
-      messages: to_executor_history(
-        input.session.session_id,
+      messages: await session_context_to_model_messages(
         input.history,
+        input.session.project_root,
       ),
       tools: { ...input.state.tools },
     };

package/src/session/Session.ts

@@ -8,7 +8,8 @@
  */
 
 import { Executor } from "@executor/Executor.js";
-import type { LanguageModel, Tool } from "ai";
+import type { ModelClient } from "@downcity/type";
+import type { RuntimeTool as Tool } from "@downcity/type";
 import {
   infer_agent_model_label,
   normalize_agent_model,
@@ -69,11 +70,10 @@ import { generate_id } from "@/utils/Id.js";
 import { nanoid } from "nanoid";
 import { build_session_info } from "@/session/browse/Browse.js";
 import { ensure_session_title } from "@/session/SessionTitle.js";
-import { to_executor_history } from "@/session/messages/SessionMessageCodec.js";
 import type { SessionMessage } from "@/types/session/SessionMessage.js";
-import type { SessionActionRecordInputV1 } from "@/executor/types/SessionRecords.js";
+import type { SessionActionEventInput } from "@/types/session/SessionAction.js";
 import type { SessionCommandOptions } from "@/types/session/SessionCommand.js";
-import type { SessionStore } from "@/types/store/SessionStore.js";
+import type { SessionDataStore } from "@/types/store/SessionDataStore.js";
 
 /**
  * SDK 本地 Session。
@@ -81,9 +81,13 @@ import type { SessionStore } from "@/types/store/SessionStore.js";
 export class Session implements AgentSession {
   readonly id: string;
   readonly agent_id: string;
+  /** 当前 Session 创建时绑定的 Workspace ID。 */
+  readonly workspace_id?: string;
+  /** 当前 Session 的创建来源。 */
+  readonly origin?: SessionOptions["origin"];
 
   private readonly workspace_path: string;
-  private readonly store: SessionStore;
+  private readonly store: SessionDataStore;
   private readonly get_session_store: SessionOptions["get_session_store"];
   private readonly tools: Record<string, Tool>;
   private readonly logger: SessionOptions["logger"];
@@ -120,6 +124,8 @@ export class Session implements AgentSession {
   constructor(options: SessionOptions) {
     this.id = String(options.session_id || "").trim();
     this.agent_id = String(options.agent_id || "").trim();
+    this.workspace_id = String(options.workspace_id || "").trim() || undefined;
+    this.origin = options.origin;
     this.workspace_path = String(options.workspace_path || "").trim();
     this.store = options.store;
     this.get_session_store = options.get_session_store;
@@ -169,6 +175,7 @@ export class Session implements AgentSession {
     this.state = new SessionState({
       agent_id: this.agent_id,
       session_id: this.id,
+      origin: this.origin,
       store: this.store,
       messages: this.session_messages,
       state: this.local_state,
@@ -344,6 +351,11 @@ export class Session implements AgentSession {
     });
   }
 
+  /** 修改当前 Session 的用户可见标题。 */
+  async rename(title: string): Promise<string> {
+    return await this.state.set_title(title);
+  }
+
   /**
    * 追加一条新的 Session prompt。
    */
@@ -504,7 +516,7 @@ export class Session implements AgentSession {
     text: string;
   }): Promise<void> {
     const appended = await this.session_messages.append_external_assistant_message({
-      fallback_text: String(input.text || "").trim(),
+      text: String(input.text || "").trim(),
     });
     if (appended) await this.state.touch_metadata();
   }
@@ -517,13 +529,12 @@ export class Session implements AgentSession {
       this.store.read_metadata(),
       this.session_messages.context_snapshot(),
     ]);
-    const records = to_executor_history(this.id, snapshot);
     const metadata_with_title = metadata.title
       ? metadata
       : await ensure_session_title({
           session_id: this.id,
           store: this.store,
-          messages: records,
+          messages: snapshot.messages,
           logger: this.logger,
         });
     const model_label = String(
@@ -539,7 +550,7 @@ export class Session implements AgentSession {
         ...metadata_with_title,
         ...(model_label ? { model_label } : {}),
       },
-      messages: records,
+      messages: snapshot.messages,
       executing: this.is_executing(),
     });
   }
@@ -585,16 +596,18 @@ export class Session implements AgentSession {
     const message_id = typeof input === "string"
       ? String(input || "").trim() || undefined
       : String(input?.message_id || "").trim() || undefined;
+    const include_message = typeof input === "string" || input?.include_message !== false;
     const messages = await this.session_messages.list_history_messages();
     const fork_messages = message_id
-      ? this.resolve_fork_messages(messages, message_id)
+      ? this.resolve_fork_messages(messages, message_id, include_message)
       : messages;
     const action_id = `history-forking:${this.id}:${Date.now()}:${nanoid(8)}`;
     await this.emit_action_event({
-      id: action_id,
+      action_id,
+      action_type: "history-fork",
       title: "Forking session messages",
       description: `Preparing ${String(fork_messages.length)} messages for the new session.`,
-      state: "running",
+      status: "running",
     });
     try {
       const forked = this.create_fork_session(
@@ -611,27 +624,30 @@ export class Session implements AgentSession {
       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,
+        action_id,
+        action_type: "history-fork",
         title: "Session messages forked",
         description: `Created ${forked.id} with ${String(fork_messages.length)} messages.`,
-        state: "completed",
+        status: "completed",
       });
       return forked;
     } catch (error) {
       await this.emit_action_event({
-        id: action_id,
+        action_id,
+        action_type: "history-fork",
         title: "Session messages fork failed",
         description: error instanceof Error ? error.message : String(error),
-        state: "failed",
+        status: "failed",
       });
       throw error;
     }
   }
 
-  /** 截取 Fork 目标 Message 及其之前的完整历史。 */
+  /** 截取 Fork 目标 Message 之前的历史，并按调用语义决定是否包含锚点。 */
   private resolve_fork_messages(
     messages: SessionMessage[],
     message_id: string,
+    include_message: boolean,
   ): SessionMessage[] {
     const target_index = messages.findIndex(
       (message) => message.message_id === message_id,
@@ -641,7 +657,7 @@ export class Session implements AgentSession {
         `Cannot fork session "${this.id}": message_id "${message_id}" not found.`,
       );
     }
-    return messages.slice(0, target_index + 1);
+    return messages.slice(0, include_message ? target_index + 1 : target_index);
   }
 
   /**
@@ -666,8 +682,8 @@ export class Session implements AgentSession {
       },
       append_assistant_message: async (message_params) => {
         const appended = await this.session_messages.append_external_assistant_message({
-          message: message_params.message,
-          fallback_text: message_params.fallback_text,
+          parts: message_params.parts,
+          text: message_params.text,
         });
         if (appended) await this.state.touch_metadata();
       },
@@ -936,9 +952,10 @@ export class Session implements AgentSession {
   ): Promise<void> {
     const action_id = `compacting:${this.id}:${generate_id()}`;
     await this.emit_action_event({
-      id: action_id,
+      action_id,
+      action_type: "history-compaction",
       title: "Compacting session messages",
-      state: "running",
+      status: "running",
       ...(turn_id
         ? { turn_id }
         : {}),
@@ -949,12 +966,11 @@ export class Session implements AgentSession {
         summary: plan.summary,
       });
       await this.emit_action_event({
-        id: action_id,
+        action_id,
+        action_type: "history-compaction",
         title: "Session messages compacted",
-        description: plan.used_fallback
-          ? `Closed Active through Message ${plan.boundary_message_id} with deterministic fallback Summary.`
-          : `Closed Active through Message ${plan.boundary_message_id}.`,
-        state: "completed",
+        description: `Closed Active through Message ${plan.boundary_message_id}.`,
+        status: "completed",
         ...(turn_id
           ? { turn_id }
           : {}),
@@ -962,10 +978,11 @@ export class Session implements AgentSession {
       await this.state.touch_metadata();
     } catch (error) {
       await this.emit_action_event({
-        id: action_id,
+        action_id,
+        action_type: "history-compaction",
         title: "Session messages compact failed",
         description: error instanceof Error ? error.message : String(error),
-        state: "failed",
+        status: "failed",
         ...(turn_id
           ? { turn_id }
           : {}),
@@ -979,7 +996,7 @@ export class Session implements AgentSession {
    *
    * 解析顺序固定为 Session 覆盖模型，其次回退到 Agent 模型。
    */
-  get_model(): LanguageModel | undefined {
+  get_model(): ModelClient | undefined {
     const model = this.get_selected_model();
     return model ? normalize_agent_model(model) : undefined;
   }
@@ -1003,21 +1020,16 @@ export class Session implements AgentSession {
   }
 
   /** 持久化并发布一条 canonical Action Message。 */
-  private async emit_action_event(input: SessionActionRecordInputV1): Promise<void> {
-    const action_id = String(input.id || "").trim() ||
+  private async emit_action_event(input: SessionActionEventInput): Promise<void> {
+    const action_id = String(input.action_id || "").trim() ||
       `action:${this.id}:${Date.now()}`;
-    await this.session_messages.persist_action_record({
-      type: "action",
-      id: action_id,
+    await this.session_messages.persist_action({
+      action_id,
+      action_type: input.action_type,
+      ...(input.turn_id ? { turn_id: input.turn_id } : {}),
       title: input.title,
       ...(input.description ? { description: input.description } : {}),
-      state: input.state,
-      metadata: {
-        v: 1,
-        ts: Date.now(),
-        session_id: this.id,
-        ...(input.turn_id ? { turn_id: input.turn_id } : {}),
-      },
+      status: input.status,
     });
     await this.state.touch_metadata();
   }

package/src/session/SessionLoop.ts

@@ -8,19 +8,14 @@
  */
 
 import { nanoid } from "nanoid";
-import type { SessionUserMessageV1 } from "@/executor/types/SessionRecords.js";
-import type {
-  SessionActionRecordV1,
-  SessionRecordV1,
-  SessionMessageRecordV1,
-} from "@/executor/types/SessionRecords.js";
+import type { SessionUserMessage } from "@/types/session/SessionMessage.js";
+import type { SessionActionEvent } from "@/types/session/SessionAction.js";
 import type { AgentSessionPromptInput } from "@/types/sdk/AgentSessionPrompt.js";
 import type { AgentSessionStopResult } from "@/types/sdk/AgentSessionStop.js";
 import type {
   AgentSessionTurnHandle,
   AgentSessionTurnResult,
 } from "@/types/sdk/AgentSessionTurn.js";
-import { extract_text_from_parts } from "@/executor/messages/UIMessageTransformer.js";
 import { is_agent_session_prompt_input_empty } from "@/types/sdk/AgentSessionPrompt.js";
 import type {
   SessionCompactHistory,
@@ -32,7 +27,7 @@ import { create_session_turn_context } from "@/session/runtime/SessionTurnContex
 import { SessionEventHub } from "@/session/runtime/SessionEventHub.js";
 import { SessionState } from "@/session/SessionState.js";
 import { SessionMessages } from "@/session/SessionMessages.js";
-import type { ShellApprovalGateway } from "@downcity/shell";
+import type { ShellApprovalGateway } from "@downcity/workspace";
 import type {
   SessionInteractionLifecycle,
   SessionInteractionPort,
@@ -70,7 +65,7 @@ export class SessionLoop {
   private pending_prompt_count = 0;
   private processing_promise: Promise<void> | null = null;
   private active_turn: ActiveSessionTurnState | null = null;
-  private checkpoint_merged_messages: SessionUserMessageV1[] | null = null;
+  private checkpoint_merged_messages: SessionUserMessage[] | null = null;
 
   constructor(options: SessionLoopOptions) {
     this.session_id = String(options.session_id || "").trim();
@@ -228,10 +223,10 @@ export class SessionLoop {
    */
   private async drain_queued_inputs(
     active_turn: ActiveSessionTurnState,
-  ): Promise<SessionUserMessageV1[]> {
+  ): Promise<SessionUserMessage[]> {
     const drained = this.queue.drain();
     if (drained.length <= 0) return [];
-    const merged: SessionUserMessageV1[] = [];
+    const merged: SessionUserMessage[] = [];
     this.checkpoint_merged_messages = merged;
 
     try {
@@ -266,19 +261,14 @@ export class SessionLoop {
     const turn_id = this.require_active_turn().turn_id;
     try {
       await this.persist_action_event({
-        type: "action",
-        id: completion.id,
+        action_id: completion.id,
+        action_type: "command",
+        turn_id,
         title: completion.title,
         ...(completion.description
           ? { description: completion.description }
           : {}),
-        state: "completed",
-        metadata: {
-          v: 1,
-          ts: Date.now(),
-          session_id: this.session_id,
-          turn_id,
-        },
+        status: "completed",
       }, {
         publish_mutation: completion.publish_mutation !== false,
       });
@@ -310,17 +300,12 @@ export class SessionLoop {
     if (result.reason === "nothing_to_compact") {
       try {
         await this.persist_action_event({
-          type: "action",
-          id: compact_id,
+          action_id: compact_id,
+          action_type: "history-compaction",
+          turn_id,
           title: "Session messages already compact",
           description: "The Session has no active messages to compact.",
-          state: "completed",
-          metadata: {
-            v: 1,
-            ts: Date.now(),
-            session_id: this.session_id,
-            turn_id: turn_id,
-          },
+          status: "completed",
         });
       } catch (error) {
         try {
@@ -357,15 +342,20 @@ export class SessionLoop {
 
     active_turn.prompt_started = true;
     this.pending_prompt_count = Math.max(0, this.pending_prompt_count - 1);
-    deferred_handle.resolve(create_turn_handle(active_turn));
+    let handle_resolved = false;
     try {
       await this.persist_prompt_message(input, active_turn.turn_id, "prompt");
+      // 只有 canonical user message 已经写入 Session 后，调用方才认为输入被接收。
+      deferred_handle.resolve(create_turn_handle(active_turn));
+      handle_resolved = true;
       const result = await this.execute_prompt_turn({
         active_turn,
         prompt_input: input,
       });
       await this.finish_active_turn(active_turn, result);
     } catch (error) {
+      // 持久化失败时仍兑现句柄，让调用方可以观察到失败的 Turn，而不是永久等待。
+      if (!handle_resolved) deferred_handle.resolve(create_turn_handle(active_turn));
       await this.fail_active_turn(active_turn, error);
     }
   }
@@ -507,7 +497,10 @@ export class SessionLoop {
     const query = input.prompt_input.query;
     const executor_query = typeof query === "string"
       ? query
-      : extract_text_from_parts(query);
+      : query
+          .flatMap((part) => part.type === "text" ? [part.text] : [])
+          .join("\n")
+          .trim();
     let result: SessionTurnExecutionResult;
     result = await this.executor.execute({
       query: executor_query,
@@ -586,7 +579,7 @@ export class SessionLoop {
     prompt: AgentSessionPromptInput,
     turn_id: string,
     input_type: "prompt" | "steer",
-  ): Promise<SessionUserMessageV1> {
+  ): Promise<SessionUserMessage> {
     const message = await this.messages.append_prompt_message({
       project_root: this.workspace_path,
       prompt,
@@ -600,10 +593,10 @@ export class SessionLoop {
 
   /** 持久化 Executor Action，并同步刷新 Session metadata。 */
   private async persist_action_event(
-    event: SessionActionRecordV1,
+    event: SessionActionEvent,
     options?: { publish_mutation?: boolean },
   ): Promise<void> {
-    await this.messages.persist_action_record(event, options);
+    await this.messages.persist_action(event, options);
     await this.state.touch_metadata();
   }