@downcity/agent 1.1.217 → 1.1.224

package/src/agent/local/Agent.ts

@@ -15,12 +15,6 @@ import type { AgentModel } from "@/model/CityModelAdapter.js";
 import type { AgentOptions } from "@/types/agent/AgentOptions.js";
 import type { AgentSessions as AgentSessionsApi } from "@/types/agent/SessionActor.js";
 import type {
-  ShellApprovalMode,
-  ShellApprovalDecisionResult,
-  ShellApprovalModeUpdateResult,
-  ShellApprovalModeOption,
-  ShellSessionApprovalModeView,
-  ShellApprovalView,
   Shell,
 } from "@downcity/shell";
 import { Logger } from "@/utils/logger/Logger.js";
@@ -122,55 +116,6 @@ export class Agent {
     await this.backgroundService.dispose();
   }
 
-  /**
-   * 列出当前 shell pending approvals。
-   */
-  approvals(): ShellApprovalView[] {
-    return this.shell?.approvals() || [];
-  }
-
-  /**
-   * 列出当前 shell 显式设置过的 approval 模式。
-   */
-  approval_modes(): ShellApprovalModeOption[] {
-    return this.shell?.approval_modes() || [];
-  }
-
-  /**
-   * 读取当前 shell 指定 session 的 approval 模式。
-   */
-  approval_mode(input: { session_id: string }): ShellSessionApprovalModeView {
-    if (!this.shell) throw new Error("Agent shell is not configured");
-    return this.shell.approval_mode(input);
-  }
-
-  /**
-   * 设置当前 shell 指定 session 的 approval 模式。
-   */
-  set_approval_mode(input: {
-    session_id: string;
-    mode: ShellApprovalMode;
-  }): ShellApprovalModeUpdateResult {
-    if (!this.shell) throw new Error("Agent shell is not configured");
-    return this.shell.set_approval_mode(input);
-  }
-
-  /**
-   * 批准当前 shell pending approval。
-   */
-  async approve(input: { approval_id: string }): Promise<ShellApprovalDecisionResult> {
-    if (!this.shell) throw new Error("Agent shell is not configured");
-    return await this.shell.approve(input);
-  }
-
-  /**
-   * 拒绝当前 shell pending approval。
-   */
-  async deny(input: { approval_id: string }): Promise<ShellApprovalDecisionResult> {
-    if (!this.shell) throw new Error("Agent shell is not configured");
-    return await this.shell.deny(input);
-  }
-
   /**
    * 更新当前 SDK Agent 的静态基础指令。
    */
@@ -260,6 +205,7 @@ export class Agent {
       tools: this.tools || assembly.tools,
       logger: this.logger || assembly.logger,
       get_agent_context: () => this.agentContext ?? assembly.agent_context,
+      get_shell: () => this.shell,
       get_instruction: () => this.instruction,
       ensure_agent_ready: async () => {
         await this.backgroundService.ready();

package/src/agent/local/services/AgentAssemblyService.ts

@@ -32,7 +32,7 @@ import {
 } from "@executor/tools/plugin/PluginToolDefinition.js";
 import type { AgentManagedSession } from "@/types/session/SessionOptions.js";
 import type { SessionPort } from "@/types/runtime/agent/AgentContext.js";
-import type { AgentSessionEvent } from "@/types/sdk/AgentSessionEvent.js";
+import type { SessionApprovalRuntimeEvent } from "@/types/session/SessionApproval.js";
 
 type AgentAssemblyServiceOptions = {
   /**
@@ -215,10 +215,12 @@ export class AgentAssemblyService {
         env,
         agent_id: id,
         logger,
-        emit_event: (event) => {
+        emit_event: async (event) => {
           const session_id = String(event.session_id || "").trim();
           if (!session_id) return;
-      agent_context!.session.get(session_id).publishEvent(event as unknown as AgentSessionEvent);
+          const approval_event = normalize_approval_runtime_event(event);
+          if (!approval_event) return;
+          await agent_context!.session.get(session_id).publishEvent(approval_event);
         },
       });
       Object.assign(tools, shell.tools);
@@ -269,3 +271,37 @@ export class AgentAssemblyService {
     return false;
   }
 }
+
+function normalize_approval_runtime_event(
+  event: Record<string, unknown>,
+): SessionApprovalRuntimeEvent | null {
+  if (event.type === "tool-approval-request") {
+    return {
+      type: "tool-approval-request",
+      turn_id: String(event.turnId || ""),
+      tool_call_id: String(event.toolCallId || ""),
+      tool_name: String(event.toolName || "unknown"),
+      approval_id: String(event.approvalId || ""),
+      command: String(event.cmd || ""),
+      cwd: String(event.cwd || ""),
+      reason: String(event.reason || ""),
+      operation:
+        event.operation === "start" || event.operation === "write"
+          ? event.operation
+          : "exec",
+    };
+  }
+  if (event.type === "tool-approval-result") {
+    const decision = event.decision === "approved" || event.decision === "denied"
+      ? event.decision
+      : "expired";
+    return {
+      type: "tool-approval-result",
+      turn_id: String(event.turnId || ""),
+      tool_call_id: String(event.toolCallId || ""),
+      approval_id: String(event.approvalId || ""),
+      decision,
+    };
+  }
+  return null;
+}

package/src/agent/local/services/AgentSessions.ts

@@ -39,6 +39,8 @@ import {
 import type { AgentContext } from "@/types/runtime/agent/AgentContext.js";
 import type { SessionPort } from "@/types/runtime/agent/AgentContext.js";
 import { createInstructionSystemBlocks } from "@/agent/local/AgentInstructions.js";
+import type { Shell } from "@downcity/shell";
+import type { SessionApproval } from "@/types/session/SessionApproval.js";
 
 function decodeMaybe(input: string): string {
   try {
@@ -77,6 +79,9 @@ type AgentSessionsOptions = {
    */
   get_agent_context: () => AgentContext;
 
+  /** 延迟读取当前 Agent 挂载的 Shell Runtime。 */
+  get_shell: () => Shell | undefined;
+
   /**
    * 当前静态 instruction 文本集合。
    */
@@ -113,6 +118,7 @@ export class AgentSessions implements AgentSessionsApi<AgentSession> {
   private readonly tools: Record<string, Tool>;
   private readonly logger: Logger;
   private readonly get_agent_context: AgentSessionsOptions["get_agent_context"];
+  private readonly get_shell: AgentSessionsOptions["get_shell"];
   private readonly get_instruction: AgentSessionsOptions["get_instruction"];
   private readonly ensure_agent_ready: AgentSessionsOptions["ensure_agent_ready"];
   private readonly default_model?: AgentModel;
@@ -128,6 +134,7 @@ export class AgentSessions implements AgentSessionsApi<AgentSession> {
     this.tools = options.tools;
     this.logger = options.logger;
     this.get_agent_context = options.get_agent_context;
+    this.get_shell = options.get_shell;
     this.get_instruction = options.get_instruction;
     this.ensure_agent_ready = options.ensure_agent_ready;
     this.default_model = options.default_model;
@@ -348,19 +355,57 @@ export class AgentSessions implements AgentSessionsApi<AgentSession> {
         await this.apply_session_defaults(session);
       },
       ...(this.resolve_model ? { resolve_model: this.resolve_model } : {}),
+      list_approvals: async (session_id) => this.list_session_approvals(session_id),
+      get_approval_mode: async (session_id) => {
+        const shell = this.require_shell();
+        return shell.approval_mode({ session_id });
+      },
+      set_approval_mode: async (session_id, { mode }) => {
+        const shell = this.require_shell();
+        return shell.set_approval_mode({ session_id, mode });
+      },
+      resolve_approval: async (session_id, { approval_id, decision }) => {
+        const approval = this.list_session_approvals(session_id)
+          .find((item) => item.approval_id === approval_id);
+        if (!approval) return { success: false, approval_id, decision };
+        return decision === "approved"
+          ? await this.require_shell().approve({ approval_id })
+          : await this.require_shell().deny({ approval_id });
+      },
     });
     this.sessions_by_id.set(resolved_session_id, created);
     return created;
   }
 
+  private require_shell(): Shell {
+    const shell = this.get_shell();
+    if (!shell) throw new Error("Session shell is not configured");
+    return shell;
+  }
+
+  private list_session_approvals(session_id: string): SessionApproval[] {
+    return (this.get_shell()?.approvals() || [])
+      .filter((approval) => approval.session_id === session_id)
+      .map((approval) => ({
+        approval_id: approval.approval_id,
+        session_id,
+        ...(approval.turn_id ? { turn_id: approval.turn_id } : {}),
+        ...(approval.tool_call_id ? { tool_call_id: approval.tool_call_id } : {}),
+        tool_name: approval.tool_name,
+        command: approval.cmd,
+        cwd: approval.cwd,
+        reason: approval.reason,
+        operation: approval.operation,
+        created_at: approval.created_at,
+      }));
+  }
+
   private async apply_session_defaults(
     session: AgentManagedSession,
   ): Promise<void> {
     if (this.configured_session_ids.has(session.id)) return;
     const persisted_model_id = String(session.config.modelId || "").trim();
-    if (persisted_model_id && this.resolve_model) {
-      await session.set({ modelId: persisted_model_id });
-    } else if (this.default_model) {
+    if (!persisted_model_id && this.default_model) {
       await session.set({
         model: this.default_model,
         ...(this.default_model_id ? { modelId: this.default_model_id } : {}),

package/src/agent/remote/RemoteAgent.ts

@@ -23,14 +23,6 @@ import type {
   RemoteAgentPluginActionInput,
   RemoteAgentPluginActionResult,
 } from "@/types/agent/RemoteAgentPluginAction.js";
-import type {
-  ShellApprovalMode,
-  ShellApprovalDecisionResult,
-  ShellApprovalModeUpdateResult,
-  ShellApprovalModeOption,
-  ShellSessionApprovalModeView,
-  ShellApprovalView,
-} from "@downcity/shell";
 import type { RemoteAgentTransport } from "@/agent/remote/RemoteTransport.js";
 import { RemoteSession } from "@/agent/remote/RemoteSession.js";
 import { create_remote_agent_transport } from "@/agent/remote/TransportFactory.js";
@@ -57,7 +49,7 @@ export class RemoteAgent {
    *
    * 关键点（中文）
    * - 这是 RemoteAgent 顶层能力，不绑定某个 session。
-   * - Shell approval 请使用 `approvals()` / `approve()` / `deny()`。
+   * - Shell approval 通过具体 RemoteSession 处理。
    */
   async runPluginAction(
     input: RemoteAgentPluginActionInput,
@@ -77,51 +69,6 @@ export class RemoteAgent {
     });
   }
 
-  /**
-   * 列出远程 Agent 的 shell pending approvals。
-   */
-  async approvals(): Promise<ShellApprovalView[]> {
-    return await this.transport.approvals();
-  }
-
-  /**
-   * 列出远程 Agent 显式设置过的 shell approval 模式。
-   */
-  async approval_modes(): Promise<ShellApprovalModeOption[]> {
-    return await this.transport.approval_modes();
-  }
-
-  /**
-   * 读取远程 Agent 指定 session 的 shell approval 模式。
-   */
-  async approval_mode(input: { session_id: string }): Promise<ShellSessionApprovalModeView> {
-    return await this.transport.approval_mode(input);
-  }
-
-  /**
-   * 设置远程 Agent 指定 session 的 shell approval 模式。
-   */
-  async set_approval_mode(input: {
-    session_id: string;
-    mode: ShellApprovalMode;
-  }): Promise<ShellApprovalModeUpdateResult> {
-    return await this.transport.set_approval_mode(input);
-  }
-
-  /**
-   * 批准远程 Agent 的 shell approval。
-   */
-  async approve(input: { approval_id: string }): Promise<ShellApprovalDecisionResult> {
-    return await this.transport.approve(input);
-  }
-
-  /**
-   * 拒绝远程 Agent 的 shell approval。
-   */
-  async deny(input: { approval_id: string }): Promise<ShellApprovalDecisionResult> {
-    return await this.transport.deny(input);
-  }
-
   /**
    * 关闭远程 transport。
    *