@downcity/agent 1.1.217 → 1.1.224

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

@@ -15,18 +15,20 @@ import type {
   AgentArchiveSessionsResult,
   AgentCleanArchiveResult,
   AgentSessionForkInput,
-  AgentSessionRecordsInput,
-  AgentSessionRecordsPage,
   AgentSessionInfo,
   AgentSessionSummaryPage,
   AgentSessionSystemSnapshot,
   AgentSessionSetInput,
 } from "@/types/agent/SessionTypes.js";
+import type {
+  ListSessionMessagesInput,
+  SessionMessagePage,
+} from "@/types/session/SessionMessage.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 {
@@ -34,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 标记。 */
@@ -168,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();
@@ -213,32 +214,36 @@ export class HttpRemoteAgentTransport implements RemoteAgentTransport {
     };
   }
 
-  async records(
+  async messages(
     session_id: string,
-    input?: AgentSessionRecordsInput,
-  ): Promise<AgentSessionRecordsPage> {
+    input?: ListSessionMessagesInput,
+  ): Promise<SessionMessagePage> {
     const query = new URLSearchParams();
     if (input?.limit !== undefined) query.set("limit", String(input.limit));
     if (input?.cursor) query.set("cursor", input.cursor);
-    if (input?.archive_id) query.set("archive_id", input.archive_id);
-    if (input?.order) query.set("order", input.order);
-    if (input?.view) query.set("view", input.view);
+    if (input?.before_sequence !== undefined) {
+      query.set("before_sequence", String(input.before_sequence));
+    }
+    if (input?.include_internal) query.set("include_internal", "true");
+    if (input?.through_sequence !== undefined) {
+      query.set("through_sequence", String(input.through_sequence));
+    }
     const payload = await read_http_json<{
       success?: boolean;
       error?: string;
-      records?: AgentSessionRecordsPage;
+      messages?: SessionMessagePage;
     }>(
-      `${this.base_url}/api/sdk/sessions/${encodeURIComponent(session_id)}/records${
+      `${this.base_url}/api/sdk/sessions/${encodeURIComponent(session_id)}/messages${
         query.size > 0 ? `?${query.toString()}` : ""
       }`,
       {
         headers: this.headers(),
       },
     );
-    if (!payload.success || !payload.records || !Array.isArray(payload.records.items)) {
-      throw new Error(String(payload.error || "Remote session records failed"));
+    if (!payload.success || !payload.messages || !Array.isArray(payload.messages.items)) {
+      throw new Error(String(payload.error || "Remote session messages failed"));
     }
-    return payload.records;
+    return payload.messages;
   }
 
   async system(session_id: string): Promise<AgentSessionSystemSnapshot> {
@@ -401,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)) {
@@ -415,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) {
@@ -448,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"));
@@ -467,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;
   }
@@ -523,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();
@@ -546,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");
@@ -560,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);
       }
     }
 
@@ -570,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;
@@ -581,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

@@ -15,18 +15,20 @@ import type {
   AgentArchiveSessionsResult,
   AgentCleanArchiveResult,
   AgentSessionForkInput,
-  AgentSessionRecordsInput,
-  AgentSessionRecordsPage,
   AgentSessionInfo,
   AgentSessionSummaryPage,
   AgentSessionSystemSnapshot,
   AgentSessionSetInput,
 } from "@/types/agent/SessionTypes.js";
+import type {
+  ListSessionMessagesInput,
+  SessionMessagePage,
+} from "@/types/session/SessionMessage.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";
@@ -35,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。
@@ -85,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({
@@ -101,11 +102,11 @@ export class RpcRemoteAgentTransport implements RemoteAgentTransport {
     };
   }
 
-  async records(
+  async messages(
     session_id: string,
-    input?: AgentSessionRecordsInput,
-  ): Promise<AgentSessionRecordsPage> {
-    return await this.client.get_session_records({
+    input?: ListSessionMessagesInput,
+  ): Promise<SessionMessagePage> {
+    return await this.client.get_session_messages({
       session_id,
       input,
     });
@@ -159,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 approval_mode(input: { session_id: string }): Promise<ShellSessionApprovalModeView> {
-    return await this.client.get_shell_approval_mode(input.session_id);
+  async approvals(session_id: string): Promise<SessionApproval[]> {
+    return await this.client.get_session_approvals(session_id);
   }
 
-  async set_approval_mode(input: {
-    session_id: string;
-    mode: ShellApprovalMode;
-  }): Promise<ShellApprovalModeUpdateResult> {
-    return await this.client.set_shell_approval_mode(input);
+  async approval_mode(session_id: string): Promise<SessionApprovalModeSnapshot> {
+    return await this.client.get_session_approval_mode(session_id);
   }
 
-  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/executor/types/SessionRecords.ts

@@ -65,6 +65,8 @@ export type SessionMetadataV1 = {
   ts: number;
   /** 当前消息所属的 session ID。 */
   sessionId: string;
+  /** 当前消息所属 turn。 */
+  turnId?: string;
   /** 当前消息是普通消息还是摘要消息。 */
   kind?: SessionMessageKind;
   /** 当前消息来自入站、出站还是 compact。 */

package/src/index.ts

@@ -27,9 +27,6 @@ export type {
   AgentListSessionsInput,
   AgentSessionConfigSnapshot,
   AgentSessionForkInput,
-  AgentSessionRecordsInput,
-  AgentSessionRecordsPage,
-  AgentSessionRecordsView,
   AgentSessionInfo,
   AgentSessionSetInput,
   AgentSessionSummary,
@@ -38,8 +35,42 @@ export type {
   AgentSessionSystemBlockSource,
   AgentSessionSystemSessionInfo,
   AgentSessionSystemSnapshot,
-  AgentSessionTimelineEvent,
 } from "./types/agent/SessionTypes.js";
+export type {
+  ListSessionMessagesInput,
+  SessionActionMessage,
+  SessionAssistantMessage,
+  SessionAssistantMessagePart,
+  SessionAssistantToolPart,
+  SessionErrorMessage,
+  SessionMessage,
+  SessionMessagePage,
+  SessionUserMessage,
+  SessionUserMessagePart,
+} from "./types/session/SessionMessage.js";
+export {
+  is_session_mutation,
+} from "./types/session/SessionMutation.js";
+export type {
+  SessionDeltaMutation,
+  SessionMessageMutation,
+  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,
@@ -56,18 +87,13 @@ export type {
   RemoteAgentPluginActionInput,
   RemoteAgentPluginActionResult,
 } from "./types/agent/RemoteAgentPluginAction.js";
-export type {
-  AgentSessionEvent,
-  AgentSessionSubscriber,
-  AgentSessionUnsubscribe,
-} from "./types/sdk/AgentSessionEvent.js";
 export type {
   AgentSessionActionCallback,
   AgentSessionActionEvent,
   AgentSessionActionRecord,
   AgentSessionActionState,
 } from "./types/sdk/AgentSessionAction.js";
-export type { AgentSessionPromptInput, SessionUserMessagePart } from "./types/sdk/AgentSessionPrompt.js";
+export type { AgentSessionPromptInput } from "./types/sdk/AgentSessionPrompt.js";
 export type { AgentSessionStopResult } from "./types/sdk/AgentSessionStop.js";
 export type {
   AgentSessionTurnHandle,