@downcity/agent 1.1.222 → 1.1.224

package/src/agent/remote/transports/HttpRemoteAgentTransport.ts

@@ -24,15 +24,11 @@ import type {
   ListSessionMessagesInput,
   SessionMessagePage,
 } from "@/types/session/SessionMessage.js";
-import type {
-  ListSessionMessageChangesInput,
-  SessionMessageMutationPage,
-} from "@/types/session/SessionMessageMutation.js";
 import type {
   RemoteAgentPluginActionInput,
   RemoteAgentPluginActionResult,
 } from "@/types/agent/RemoteAgentPluginAction.js";
-import type { AgentSessionEvent } from "@/types/sdk/AgentSessionEvent.js";
+import type { SessionMutation } from "@/types/session/SessionMutation.js";
 import type { AgentSessionPromptInput } from "@/types/sdk/AgentSessionPrompt.js";
 import type { AgentSessionStopResult } from "@/types/sdk/AgentSessionStop.js";
 import type {
@@ -40,13 +36,12 @@ import type {
   TransportSubscription,
 } from "@/agent/remote/RemoteTransport.js";
 import type {
-  ShellApprovalMode,
-  ShellApprovalDecisionResult,
-  ShellApprovalModeUpdateResult,
-  ShellApprovalModeOption,
-  ShellSessionApprovalModeView,
-  ShellApprovalView,
-} from "@downcity/shell";
+  ResolveSessionApprovalInput,
+  SessionApproval,
+  SessionApprovalModeSnapshot,
+  SessionApprovalResult,
+  SetSessionApprovalModeInput,
+} from "@/types/session/SessionApproval.js";
 
 type SdkEventsReadyFrame = {
   /** SDK HTTP events 连接内部 ready 标记。 */
@@ -174,7 +169,7 @@ export class HttpRemoteAgentTransport implements RemoteAgentTransport {
   async subscribe(params: {
     session_id: string;
     on_ready: () => void;
-    on_event: (event: AgentSessionEvent) => void;
+    on_event: (event: SessionMutation) => void;
     on_close: (error?: unknown) => void;
   }): Promise<TransportSubscription> {
     const abort_controller = new AbortController();
@@ -251,28 +246,6 @@ export class HttpRemoteAgentTransport implements RemoteAgentTransport {
     return payload.messages;
   }
 
-  async message_changes(
-    session_id: string,
-    input: ListSessionMessageChangesInput,
-  ): Promise<SessionMessageMutationPage> {
-    const query = new URLSearchParams({
-      after_commit_sequence: String(input.after_commit_sequence),
-    });
-    if (input.limit !== undefined) query.set("limit", String(input.limit));
-    const payload = await read_http_json<{
-      success?: boolean;
-      error?: string;
-      changes?: SessionMessageMutationPage;
-    }>(
-      `${this.base_url}/api/sdk/sessions/${encodeURIComponent(session_id)}/message-changes?${query.toString()}`,
-      { headers: this.headers() },
-    );
-    if (!payload.success || !payload.changes) {
-      throw new Error(String(payload.error || "Remote session message changes failed"));
-    }
-    return payload.changes;
-  }
-
   async system(session_id: string): Promise<AgentSessionSystemSnapshot> {
     const payload = await read_http_json<{
       success?: boolean;
@@ -433,12 +406,12 @@ export class HttpRemoteAgentTransport implements RemoteAgentTransport {
     return payload;
   }
 
-  async approvals(): Promise<ShellApprovalView[]> {
+  async approvals(session_id: string): Promise<SessionApproval[]> {
     const payload = await read_http_json<{
       success?: boolean;
       error?: string;
-      approvals?: ShellApprovalView[];
-    }>(`${this.base_url}/api/shell/approvals`, {
+      approvals?: SessionApproval[];
+    }>(`${this.base_url}/api/sdk/sessions/${encodeURIComponent(session_id)}/approvals`, {
       headers: this.headers(),
     });
     if (!payload.success || !Array.isArray(payload.approvals)) {
@@ -447,28 +420,13 @@ export class HttpRemoteAgentTransport implements RemoteAgentTransport {
     return payload.approvals;
   }
 
-  async approval_modes(): Promise<ShellApprovalModeOption[]> {
-    const payload = await read_http_json<{
-      success?: boolean;
-      error?: string;
-      modes?: ShellApprovalModeOption[];
-    }>(`${this.base_url}/api/shell/approval-modes`, {
-      headers: this.headers(),
-    });
-    if (!payload.success || !Array.isArray(payload.modes)) {
-      throw new Error(String(payload.error || "Remote shell approval modes failed"));
-    }
-    return payload.modes;
-  }
-
-  async approval_mode(input: { session_id: string }): Promise<ShellSessionApprovalModeView> {
-    const session_id = String(input.session_id || "").trim();
+  async approval_mode(session_id: string): Promise<SessionApprovalModeSnapshot> {
     const payload = await read_http_json<{
       success?: boolean;
       error?: string;
       session_id?: string;
-      mode?: ShellApprovalMode;
-    }>(`${this.base_url}/api/shell/approval-mode?session_id=${encodeURIComponent(session_id)}`, {
+      mode?: SessionApprovalModeSnapshot["mode"];
+    }>(`${this.base_url}/api/sdk/sessions/${encodeURIComponent(session_id)}/approval-mode`, {
       headers: this.headers(),
     });
     if (!payload.success || !payload.session_id || !payload.mode) {
@@ -480,18 +438,19 @@ export class HttpRemoteAgentTransport implements RemoteAgentTransport {
     };
   }
 
-  async set_approval_mode(input: {
-    session_id: string;
-    mode: ShellApprovalMode;
-  }): Promise<ShellApprovalModeUpdateResult> {
-    const payload = await read_http_json<ShellApprovalModeUpdateResult & {
+  async set_approval_mode(
+    session_id: string,
+    input: SetSessionApprovalModeInput,
+  ): Promise<SessionApprovalModeSnapshot> {
+    const payload = await read_http_json<SessionApprovalModeSnapshot & {
+      success?: boolean;
       error?: string;
-    }>(`${this.base_url}/api/shell/approval-mode`, {
+    }>(`${this.base_url}/api/sdk/sessions/${encodeURIComponent(session_id)}/approval-mode`, {
       method: "POST",
       headers: this.headers({
         "Content-Type": "application/json",
       }),
-      body: JSON.stringify(input),
+      body: JSON.stringify({ mode: input.mode }),
     });
     if (payload.success !== true) {
       throw new Error(String(payload.error || "Remote shell approval mode update failed"));
@@ -499,29 +458,21 @@ export class HttpRemoteAgentTransport implements RemoteAgentTransport {
     return payload;
   }
 
-  async approve(input: { approval_id: string }): Promise<ShellApprovalDecisionResult> {
-    return await this.run_shell_decision("approve", input.approval_id);
-  }
-
-  async deny(input: { approval_id: string }): Promise<ShellApprovalDecisionResult> {
-    return await this.run_shell_decision("deny", input.approval_id);
-  }
-
-  private async run_shell_decision(
-    action: "approve" | "deny",
-    approval_id: string,
-  ): Promise<ShellApprovalDecisionResult> {
-    const payload = await read_http_json<ShellApprovalDecisionResult & {
+  async resolve_approval(
+    session_id: string,
+    input: ResolveSessionApprovalInput,
+  ): Promise<SessionApprovalResult> {
+    const payload = await read_http_json<SessionApprovalResult & {
       error?: string;
-    }>(`${this.base_url}/api/shell/${action}`, {
+    }>(`${this.base_url}/api/sdk/sessions/${encodeURIComponent(session_id)}/approval`, {
       method: "POST",
       headers: this.headers({
         "Content-Type": "application/json",
       }),
-      body: JSON.stringify({ approval_id }),
+      body: JSON.stringify(input),
     });
     if (typeof payload.success !== "boolean") {
-      throw new Error(String(payload.error || `Remote shell ${action} failed`));
+      throw new Error(String(payload.error || "Remote session approval failed"));
     }
     return payload;
   }
@@ -555,7 +506,7 @@ async function consume_http_event_stream(params: {
   abort_controller: AbortController;
   on_ready: () => void;
   on_ready_error: (error: unknown) => void;
-  on_event: (event: AgentSessionEvent) => void;
+  on_event: (event: SessionMutation) => void;
 }): Promise<unknown | undefined> {
   const decoder = new TextDecoder();
   const reader = params.body.getReader();
@@ -578,7 +529,7 @@ async function consume_http_event_stream(params: {
             ready_resolved = true;
             params.on_ready();
           } else {
-            params.on_event(value as AgentSessionEvent);
+            params.on_event(value as SessionMutation);
           }
         }
         newline_index = buffered.indexOf("\n");
@@ -592,7 +543,7 @@ async function consume_http_event_stream(params: {
         ready_resolved = true;
         params.on_ready();
       } else {
-        params.on_event(value as AgentSessionEvent);
+        params.on_event(value as SessionMutation);
       }
     }
 
@@ -602,10 +553,6 @@ async function consume_http_event_stream(params: {
         params.on_ready_error(error);
         throw error;
       }
-      params.on_event({
-        type: "error",
-        message: "Remote session events connection closed",
-      });
     }
   } catch (error) {
     close_error = error;
@@ -613,10 +560,6 @@ async function consume_http_event_stream(params: {
       if (!ready_resolved) {
         params.on_ready_error(error);
       }
-      params.on_event({
-        type: "error",
-        message: error instanceof Error ? error.message : String(error),
-      });
     }
   } finally {
     try {

package/src/agent/remote/transports/RpcRemoteAgentTransport.ts

@@ -24,15 +24,11 @@ import type {
   ListSessionMessagesInput,
   SessionMessagePage,
 } from "@/types/session/SessionMessage.js";
-import type {
-  ListSessionMessageChangesInput,
-  SessionMessageMutationPage,
-} from "@/types/session/SessionMessageMutation.js";
 import type {
   RemoteAgentPluginActionInput,
   RemoteAgentPluginActionResult,
 } from "@/types/agent/RemoteAgentPluginAction.js";
-import type { AgentSessionEvent } from "@/types/sdk/AgentSessionEvent.js";
+import type { SessionMutation } from "@/types/session/SessionMutation.js";
 import type { AgentSessionPromptInput } from "@/types/sdk/AgentSessionPrompt.js";
 import type { AgentSessionStopResult } from "@/types/sdk/AgentSessionStop.js";
 import { RpcClient, parse_rpc_url } from "@/rpc/Client.js";
@@ -41,13 +37,12 @@ import type {
   TransportSubscription,
 } from "@/agent/remote/RemoteTransport.js";
 import type {
-  ShellApprovalMode,
-  ShellApprovalDecisionResult,
-  ShellApprovalModeUpdateResult,
-  ShellApprovalModeOption,
-  ShellSessionApprovalModeView,
-  ShellApprovalView,
-} from "@downcity/shell";
+  ResolveSessionApprovalInput,
+  SessionApproval,
+  SessionApprovalModeSnapshot,
+  SessionApprovalResult,
+  SetSessionApprovalModeInput,
+} from "@/types/session/SessionApproval.js";
 
 /**
  * 本机 RPC transport。
@@ -91,7 +86,7 @@ export class RpcRemoteAgentTransport implements RemoteAgentTransport {
   async subscribe(params: {
     session_id: string;
     on_ready: () => void;
-    on_event: (event: AgentSessionEvent) => void;
+    on_event: (event: SessionMutation) => void;
     on_close: (error?: unknown) => void;
   }): Promise<TransportSubscription> {
     const subscription = await this.client.subscribe_session({
@@ -117,13 +112,6 @@ export class RpcRemoteAgentTransport implements RemoteAgentTransport {
     });
   }
 
-  async message_changes(
-    session_id: string,
-    input: ListSessionMessageChangesInput,
-  ): Promise<SessionMessageMutationPage> {
-    return await this.client.get_session_message_changes({ session_id, input });
-  }
-
   async system(session_id: string): Promise<AgentSessionSystemSnapshot> {
     return await this.client.get_session_system(session_id);
   }
@@ -172,31 +160,26 @@ export class RpcRemoteAgentTransport implements RemoteAgentTransport {
     });
   }
 
-  async approvals(): Promise<ShellApprovalView[]> {
-    return await this.client.list_shell_approvals();
-  }
-
-  async approval_modes(): Promise<ShellApprovalModeOption[]> {
-    return await this.client.list_shell_approval_modes();
+  async approvals(session_id: string): Promise<SessionApproval[]> {
+    return await this.client.get_session_approvals(session_id);
   }
 
-  async approval_mode(input: { session_id: string }): Promise<ShellSessionApprovalModeView> {
-    return await this.client.get_shell_approval_mode(input.session_id);
+  async approval_mode(session_id: string): Promise<SessionApprovalModeSnapshot> {
+    return await this.client.get_session_approval_mode(session_id);
   }
 
-  async set_approval_mode(input: {
-    session_id: string;
-    mode: ShellApprovalMode;
-  }): Promise<ShellApprovalModeUpdateResult> {
-    return await this.client.set_shell_approval_mode(input);
-  }
-
-  async approve(input: { approval_id: string }): Promise<ShellApprovalDecisionResult> {
-    return await this.client.approve_shell_approval(input.approval_id);
+  async set_approval_mode(
+    session_id: string,
+    input: SetSessionApprovalModeInput,
+  ): Promise<SessionApprovalModeSnapshot> {
+    return await this.client.set_session_approval_mode(session_id, input);
   }
 
-  async deny(input: { approval_id: string }): Promise<ShellApprovalDecisionResult> {
-    return await this.client.deny_shell_approval(input.approval_id);
+  async resolve_approval(
+    session_id: string,
+    input: ResolveSessionApprovalInput,
+  ): Promise<SessionApprovalResult> {
+    return await this.client.resolve_session_approval(session_id, input);
   }
 
   async close(): Promise<void> {

package/src/executor/store/history/jsonl/JsonlSessionHistoryStore.ts

@@ -197,9 +197,9 @@ export class JsonlSessionHistoryStore implements SessionHistoryStore {
   private getInflightFilePath(): string {
     if (this.overrideInflightFilePath) return this.overrideInflightFilePath;
     if (this.overrideMessagesDirPath) {
-      return path.join(this.overrideMessagesDirPath, "inflight.json");
+      return path.join(this.overrideMessagesDirPath, "assistant_message.json");
     }
-    return path.join(this.getMessagesDirPath(), "inflight.json");
+    return path.join(this.getMessagesDirPath(), "assistant_message.json");
   }
 
   private getLockFilePath(): string {

package/src/executor/types/SessionHistoryPaths.ts

@@ -32,7 +32,7 @@ export type SessionHistoryPathOverrides = {
   archiveDirPath?: string;
 
   /**
-   * 运行中 assistant 快照路径（通常是 `.../messages/inflight.json`）。
+   * 运行中 assistant 快照路径（通常是 `.../messages/assistant_message.json`）。
    */
   inflightFilePath?: string;
 };

package/src/index.ts

@@ -49,15 +49,28 @@ export type {
   SessionUserMessagePart,
 } from "./types/session/SessionMessage.js";
 export {
-  is_session_message_mutation,
-} from "./types/session/SessionMessageMutation.js";
+  is_session_mutation,
+} from "./types/session/SessionMutation.js";
 export type {
-  ListSessionMessageChangesInput,
+  SessionDeltaMutation,
   SessionMessageMutation,
-  SessionMessageMutationPage,
-  SessionMessageMutationSubscriber,
-  SessionMessageMutationUnsubscribe,
-} from "./types/session/SessionMessageMutation.js";
+  SessionMutation,
+  SessionMutationReply,
+  SessionMutationSubscriber,
+  SessionMutationUnsubscribe,
+  SessionPartMutation,
+  SessionStateMutation,
+  SessionTurnMutation,
+} from "./types/session/SessionMutation.js";
+export type {
+  ResolveSessionApprovalInput,
+  SessionApproval,
+  SessionApprovalDecision,
+  SessionApprovalMode,
+  SessionApprovalModeSnapshot,
+  SessionApprovalResult,
+  SetSessionApprovalModeInput,
+} from "./types/session/SessionApproval.js";
 export type {
   AgentOptions,
   AgentSessionConstructor,
@@ -74,11 +87,6 @@ export type {
   RemoteAgentPluginActionInput,
   RemoteAgentPluginActionResult,
 } from "./types/agent/RemoteAgentPluginAction.js";
-export type {
-  AgentSessionEvent,
-  AgentSessionSubscriber,
-  AgentSessionUnsubscribe,
-} from "./types/sdk/AgentSessionEvent.js";
 export type {
   AgentSessionActionCallback,
   AgentSessionActionEvent,

package/src/rpc/Client.ts

@@ -25,10 +25,6 @@ import type {
   ListSessionMessagesInput,
   SessionMessagePage,
 } from "@/types/session/SessionMessage.js";
-import type {
-  ListSessionMessageChangesInput,
-  SessionMessageMutationPage,
-} from "@/types/session/SessionMessageMutation.js";
 import type { JsonValue } from "@/types/common/Json.js";
 import type { JsonObject } from "@/types/common/Json.js";
 import type { AgentSessionStopResult } from "@/types/sdk/AgentSessionStop.js";
@@ -42,7 +38,14 @@ import type {
   PluginControlResult,
   PluginSnapshot,
 } from "@/types/plugin/PluginState.js";
-import type { AgentSessionEvent } from "@/types/sdk/AgentSessionEvent.js";
+import type { SessionMutation } from "@/types/session/SessionMutation.js";
+import type {
+  ResolveSessionApprovalInput,
+  SessionApproval,
+  SessionApprovalModeSnapshot,
+  SessionApprovalResult,
+  SetSessionApprovalModeInput,
+} from "@/types/session/SessionApproval.js";
 import type { AgentSessionPromptInput } from "@/types/sdk/AgentSessionPrompt.js";
 import type {
   RpcClientEndpoint,
@@ -51,14 +54,6 @@ import type {
   RpcSessionSubscription,
   RpcSystemPromptPayload,
 } from "@/types/rpc/RpcProtocol.js";
-import type {
-  ShellApprovalMode,
-  ShellApprovalDecisionResult,
-  ShellApprovalModeUpdateResult,
-  ShellApprovalModeOption,
-  ShellSessionApprovalModeView,
-  ShellApprovalView,
-} from "@downcity/shell";
 
 export type {
   RpcClientEndpoint,
@@ -73,7 +68,7 @@ type PendingRequest = {
 
 type RpcSubscription = {
   on_ready: () => void;
-  on_event: (event: AgentSessionEvent) => void;
+  on_event: (event: SessionMutation) => void;
   /** 底层 RPC 连接结束后的通知。 */
   on_close: (error?: unknown) => void;
 };
@@ -239,21 +234,6 @@ export class RpcClient {
     return data.messages;
   }
 
-  /** 读取指定 cursor 后的 Session Message Mutation。 */
-  async get_session_message_changes(params: {
-    session_id: string;
-    input: ListSessionMessageChangesInput;
-  }): Promise<SessionMessageMutationPage> {
-    const data = await this.request<{ changes: SessionMessageMutationPage }>({
-      method: "sdk.sessions.message_changes",
-      params: {
-        sessionId: params.session_id,
-        input: params.input,
-      },
-    });
-    return data.changes;
-  }
-
   /**
    * 读取 system snapshot。
    */
@@ -267,6 +247,44 @@ export class RpcClient {
     return data.system;
   }
 
+  async get_session_approvals(session_id: string): Promise<SessionApproval[]> {
+    const data = await this.request<{ approvals: SessionApproval[] }>({
+      method: "sdk.sessions.approvals",
+      params: { sessionId: session_id },
+    });
+    return data.approvals;
+  }
+
+  async get_session_approval_mode(session_id: string): Promise<SessionApprovalModeSnapshot> {
+    const data = await this.request<{ approval_mode: SessionApprovalModeSnapshot }>({
+      method: "sdk.sessions.approvalMode",
+      params: { sessionId: session_id },
+    });
+    return data.approval_mode;
+  }
+
+  async set_session_approval_mode(
+    session_id: string,
+    input: SetSessionApprovalModeInput,
+  ): Promise<SessionApprovalModeSnapshot> {
+    const data = await this.request<{ approval_mode: SessionApprovalModeSnapshot }>({
+      method: "sdk.sessions.setApprovalMode",
+      params: { sessionId: session_id, input },
+    });
+    return data.approval_mode;
+  }
+
+  async resolve_session_approval(
+    session_id: string,
+    input: ResolveSessionApprovalInput,
+  ): Promise<SessionApprovalResult> {
+    const data = await this.request<{ result: SessionApprovalResult }>({
+      method: "sdk.sessions.resolveApproval",
+      params: { sessionId: session_id, input },
+    });
+    return data.result;
+  }
+
   /**
    * 分叉 session。
    */
@@ -290,7 +308,7 @@ export class RpcClient {
   async subscribe_session(params: {
     session_id: string;
     on_ready: () => void;
-    on_event: (event: AgentSessionEvent) => void;
+    on_event: (event: SessionMutation) => void;
     on_close: (error?: unknown) => void;
   }): Promise<RpcSessionSubscription> {
     const data = await this.request<{ subscriptionId: string }>({
@@ -471,78 +489,6 @@ export class RpcClient {
     });
   }
 
-  /**
-   * 列出 shell approvals。
-   */
-  async list_shell_approvals(): Promise<ShellApprovalView[]> {
-    const data = await this.request<{ approvals: ShellApprovalView[] }>({
-      method: "internal.shell.approvals",
-    });
-    return Array.isArray(data.approvals) ? data.approvals : [];
-  }
-
-  /**
-   * 列出 shell approval 模式。
-   */
-  async list_shell_approval_modes(): Promise<ShellApprovalModeOption[]> {
-    const data = await this.request<{ modes: ShellApprovalModeOption[] }>({
-      method: "internal.shell.approvalModes",
-    });
-    return Array.isArray(data.modes) ? data.modes : [];
-  }
-
-  /**
-   * 读取 shell approval 模式。
-   */
-  async get_shell_approval_mode(session_id: string): Promise<ShellSessionApprovalModeView> {
-    return await this.request<ShellSessionApprovalModeView>({
-      method: "internal.shell.approvalMode",
-      params: {
-        sessionId: session_id,
-      },
-    });
-  }
-
-  /**
-   * 设置 shell approval 模式。
-   */
-  async set_shell_approval_mode(input: {
-    session_id: string;
-    mode: ShellApprovalMode;
-  }): Promise<ShellApprovalModeUpdateResult> {
-    return await this.request<ShellApprovalModeUpdateResult>({
-      method: "internal.shell.setApprovalMode",
-      params: {
-        sessionId: input.session_id,
-        mode: input.mode,
-      },
-    });
-  }
-
-  /**
-   * 批准 shell approval。
-   */
-  async approve_shell_approval(approval_id: string): Promise<ShellApprovalDecisionResult> {
-    return await this.request<ShellApprovalDecisionResult>({
-      method: "internal.shell.approve",
-      params: {
-        approvalId: approval_id,
-      },
-    });
-  }
-
-  /**
-   * 拒绝 shell approval。
-   */
-  async deny_shell_approval(approval_id: string): Promise<ShellApprovalDecisionResult> {
-    return await this.request<ShellApprovalDecisionResult>({
-      method: "internal.shell.deny",
-      params: {
-        approvalId: approval_id,
-      },
-    });
-  }
-
   /**
    * 关闭底层连接。
    */
@@ -690,10 +636,6 @@ export class RpcClient {
 
   private fail_all_subscriptions(message: string): void {
     for (const subscription of this.subscriptions.values()) {
-      subscription.on_event({
-        type: "error",
-        message,
-      });
       subscription.on_close(new Error(message));
     }
     this.subscriptions.clear();