@downcity/agent 1.1.113 → 1.1.119

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

@@ -24,6 +24,14 @@ import type {
   RemoteAgentTransport,
   TransportSubscription,
 } from "@/agent/remote/RemoteTransport.js";
+import type {
+  ShellApprovalMode,
+  ShellApprovalDecisionResult,
+  ShellApprovalModeUpdateResult,
+  ShellApprovalModeOption,
+  ShellSessionApprovalModeView,
+  ShellApprovalView,
+} from "@downcity/shell";
 
 type SdkEventsReadyFrame = {
   /** SDK HTTP events 连接内部 ready 标记。 */
@@ -264,6 +272,99 @@ export class HttpRemoteAgentTransport implements RemoteAgentTransport {
     }
     return payload;
   }
+
+  async approvals(): Promise<ShellApprovalView[]> {
+    const payload = await read_http_json<{
+      success?: boolean;
+      error?: string;
+      approvals?: ShellApprovalView[];
+    }>(`${this.base_url}/api/shell/approvals`, {
+      headers: this.headers(),
+    });
+    if (!payload.success || !Array.isArray(payload.approvals)) {
+      throw new Error(String(payload.error || "Remote shell approvals failed"));
+    }
+    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();
+    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)}`, {
+      headers: this.headers(),
+    });
+    if (!payload.success || !payload.session_id || !payload.mode) {
+      throw new Error(String(payload.error || "Remote shell approval mode failed"));
+    }
+    return {
+      session_id: payload.session_id,
+      mode: payload.mode,
+    };
+  }
+
+  async set_approval_mode(input: {
+    session_id: string;
+    mode: ShellApprovalMode;
+  }): Promise<ShellApprovalModeUpdateResult> {
+    const payload = await read_http_json<ShellApprovalModeUpdateResult & {
+      error?: string;
+    }>(`${this.base_url}/api/shell/approval-mode`, {
+      method: "POST",
+      headers: this.headers({
+        "Content-Type": "application/json",
+      }),
+      body: JSON.stringify(input),
+    });
+    if (payload.success !== true) {
+      throw new Error(String(payload.error || "Remote shell approval mode update failed"));
+    }
+    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 & {
+      error?: string;
+    }>(`${this.base_url}/api/shell/${action}`, {
+      method: "POST",
+      headers: this.headers({
+        "Content-Type": "application/json",
+      }),
+      body: JSON.stringify({ approval_id }),
+    });
+    if (typeof payload.success !== "boolean") {
+      throw new Error(String(payload.error || `Remote shell ${action} failed`));
+    }
+    return payload;
+  }
 }
 
 async function read_http_json<T>(input: string, init?: RequestInit): Promise<T> {

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

@@ -25,6 +25,14 @@ import type {
   RemoteAgentTransport,
   TransportSubscription,
 } from "@/agent/remote/RemoteTransport.js";
+import type {
+  ShellApprovalMode,
+  ShellApprovalDecisionResult,
+  ShellApprovalModeUpdateResult,
+  ShellApprovalModeOption,
+  ShellSessionApprovalModeView,
+  ShellApprovalView,
+} from "@downcity/shell";
 
 /**
  * 本机 RPC transport。
@@ -113,6 +121,33 @@ 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 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 deny(input: { approval_id: string }): Promise<ShellApprovalDecisionResult> {
+    return await this.client.deny_shell_approval(input.approval_id);
+  }
+
   async close(): Promise<void> {
     await this.client.close();
   }

package/src/executor/Executor.ts

@@ -8,6 +8,7 @@
  */
 
 import { streamText, type LanguageModel, type Tool } from "ai";
+import { withShellRunScope } from "@downcity/shell";
 import { SessionHistoryWriter } from "@executor/composer/history/SessionHistoryWriter.js";
 import type { SessionHistoryComposer } from "@executor/composer/history/SessionHistoryComposer.js";
 import type { SessionHistoryStore } from "@/executor/store/history/SessionHistoryStore.js";
@@ -267,7 +268,15 @@ export class Executor implements SessionExecutor {
           runContext: run_context,
         },
         async () =>
-          await this.recovery_policy.run_with_retry({
+          await withShellRunScope(
+            {
+              run_context: {
+                session_id: run_context.sessionId,
+                ...(run_context.turnId ? { turn_id: run_context.turnId } : {}),
+              },
+            },
+            async () =>
+              await this.recovery_policy.run_with_retry({
             query,
             model: this.resolveModelOrThrow(),
             run_context,
@@ -293,7 +302,8 @@ export class Executor implements SessionExecutor {
                 model,
                 next_run_context,
               ),
-          }),
+              }),
+          ),
       );
       return result;
     } finally {

package/src/index.ts

@@ -105,7 +105,6 @@ export {
   loadStaticSystemPrompts,
   StaticPromptCatalog,
 } from "./executor/composer/system/default/StaticPromptCatalog.js";
-export { shellTools } from "./executor/tools/shell/ShellToolDefinition.js";
 
 // 通用 plugin 宿主工具
 export {

package/src/rpc/Client.ts

@@ -37,6 +37,14 @@ import type {
   RpcSessionSubscription,
   RpcSystemPromptPayload,
 } from "@/types/rpc/RpcProtocol.js";
+import type {
+  ShellApprovalMode,
+  ShellApprovalDecisionResult,
+  ShellApprovalModeUpdateResult,
+  ShellApprovalModeOption,
+  ShellSessionApprovalModeView,
+  ShellApprovalView,
+} from "@downcity/shell";
 
 export type {
   RpcClientEndpoint,
@@ -358,6 +366,78 @@ 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,
+      },
+    });
+  }
+
   /**
    * 关闭底层连接。
    */

package/src/rpc/server/InternalHandlers.ts

@@ -154,11 +154,66 @@ export async function handleInternalRpcRequest(params: {
       });
       return true;
     }
+    case "internal.shell.approvals": {
+      const shell = requireShell(options);
+      write_success(request.id, {
+        approvals: shell.approvals(),
+      });
+      return true;
+    }
+    case "internal.shell.approvalModes": {
+      const shell = requireShell(options);
+      write_success(request.id, {
+        modes: shell.approval_modes(),
+      });
+      return true;
+    }
+    case "internal.shell.approvalMode": {
+      const shell = requireShell(options);
+      const result = shell.approval_mode({
+        session_id: String(request.params.sessionId || "").trim(),
+      });
+      write_success(request.id, result);
+      return true;
+    }
+    case "internal.shell.setApprovalMode": {
+      const shell = requireShell(options);
+      const result = shell.set_approval_mode({
+        session_id: String(request.params.sessionId || "").trim(),
+        mode: request.params.mode,
+      });
+      write_success(request.id, result);
+      return true;
+    }
+    case "internal.shell.approve": {
+      const shell = requireShell(options);
+      const result = await shell.approve({
+        approval_id: String(request.params.approvalId || "").trim(),
+      });
+      write_success(request.id, result);
+      return true;
+    }
+    case "internal.shell.deny": {
+      const shell = requireShell(options);
+      const result = await shell.deny({
+        approval_id: String(request.params.approvalId || "").trim(),
+      });
+      write_success(request.id, result);
+      return true;
+    }
     default:
       return false;
   }
 }
 
+function requireShell(options: RpcRequestHandlerOptions) {
+  const shell = options.getShell?.();
+  if (!shell) {
+    throw new Error("Agent RPC server was started without Shell");
+  }
+  return shell;
+}
+
 function requireAgentContext(options: RpcRequestHandlerOptions): AgentContext {
   const context = options.getAgentContext?.();
   if (!context) {

package/src/rpc/server/ServerTypes.ts

@@ -10,6 +10,7 @@ import type { AgentSessionCollection } from "@/types/agent/AgentTypes.js";
 import type { AgentContext } from "@/types/runtime/agent/AgentContext.js";
 import type { AgentRuntime } from "@/types/runtime/agent/AgentRuntime.js";
 import type { RpcEventFrame } from "@/types/rpc/RpcProtocol.js";
+import type { Shell } from "@downcity/shell";
 
 /**
  * RPC Server 启动参数。
@@ -25,6 +26,8 @@ export interface RpcServerStartOptions {
   getAgentContext?: () => AgentContext;
   /** Agent 运行态访问口。 */
   getAgentRuntime?: () => AgentRuntime;
+  /** Shell 访问口。 */
+  getShell?: () => Shell | undefined;
 }
 
 /**
@@ -37,6 +40,8 @@ export interface RpcRequestHandlerOptions {
   getAgentContext?: () => AgentContext;
   /** Agent 运行态访问口。 */
   getAgentRuntime?: () => AgentRuntime;
+  /** Shell 访问口。 */
+  getShell?: () => Shell | undefined;
 }
 
 /**

package/src/types/agent/AgentOptions.ts

@@ -7,6 +7,7 @@
  */
 
 import type { Tool } from "ai";
+import type { Shell } from "@downcity/shell";
 import type { BasePlugin } from "@/plugin/core/BasePlugin.js";
 import type { AgentModel } from "@/model/CityModelAdapter.js";
 import type { RpcServerInstance } from "@/rpc/Server.js";
@@ -51,6 +52,15 @@ export interface AgentOptions {
    */
   tools?: Record<string, Tool>;
 
+  /**
+   * 当前 agent 内建 shell 能力。
+   *
+   * 关键点（中文）
+   * - Shell 不是 plugin，而是 agent 直接挂载的内建工具对象。
+   * - 未传入时，Agent 不会自动注入 shell tools。
+   */
+  shell?: Shell;
+
   /**
    * 调用方显式传入的静态基础指令。
    *

package/src/types/config/DowncityConfig.ts

@@ -8,7 +8,7 @@
 import type { LlmConfig } from "@/types/config/LlmConfig.js";
 import type { ExecutionBindingConfig } from "@/types/config/ExecutionBinding.js";
 import type { JsonObject } from "@/types/common/Json.js";
-import type { SandboxProjectConfig } from "@/sandbox/types/Sandbox.js";
+import type { SandboxProjectConfig } from "@downcity/shell/sandbox/types/Sandbox.js";
 
 /**
  * 单个聊天渠道配置。
@@ -165,7 +165,7 @@ export interface DowncityConfig {
    * shell / CLI 执行 sandbox 配置。
    *
    * 关键点（中文）
-   * - 当前只作用于 shell plugin 这条命令执行链。
+   * - 当前只作用于内建 shell 这条命令执行链。
    * - 这里不表达审批、用户授权与复杂策略系统，只表达最小边界。
    */
   sandbox?: SandboxProjectConfig;

package/src/types/rpc/RpcProtocol.ts

@@ -17,6 +17,7 @@ import type { AgentSessionEvent } from "@/types/sdk/AgentSessionEvent.js";
 import type { AgentSessionPromptInput } from "@/types/sdk/AgentSessionPrompt.js";
 import type { JsonObject, JsonValue } from "@/types/common/Json.js";
 import type { PluginStateControlAction } from "@/plugin/types/Plugin.js";
+import type { ShellApprovalMode } from "@downcity/shell";
 
 /**
  * RPC 请求。
@@ -231,6 +232,64 @@ export type RpcRequest =
         /** action payload。 */
         payload?: JsonValue;
       };
+    }
+  | {
+      /** 请求 id，用于匹配响应。 */
+      id: string;
+      /** 列出 shell approvals。 */
+      method: "internal.shell.approvals";
+    }
+  | {
+      /** 请求 id，用于匹配响应。 */
+      id: string;
+      /** 列出 shell approval 模式。 */
+      method: "internal.shell.approvalModes";
+    }
+  | {
+      /** 请求 id，用于匹配响应。 */
+      id: string;
+      /** 读取 shell approval 模式。 */
+      method: "internal.shell.approvalMode";
+      /** session 参数。 */
+      params: {
+        /** session id。 */
+        sessionId: string;
+      };
+    }
+  | {
+      /** 请求 id，用于匹配响应。 */
+      id: string;
+      /** 设置 shell approval 模式。 */
+      method: "internal.shell.setApprovalMode";
+      /** session 模式参数。 */
+      params: {
+        /** session id。 */
+        sessionId: string;
+        /** approval 模式。 */
+        mode: ShellApprovalMode;
+      };
+    }
+  | {
+      /** 请求 id，用于匹配响应。 */
+      id: string;
+      /** 批准 shell approval。 */
+      method: "internal.shell.approve";
+      /** approval 参数。 */
+      params: {
+        /** approval id。 */
+        approvalId: string;
+      };
+    }
+  | {
+      /** 请求 id，用于匹配响应。 */
+      id: string;
+      /** 拒绝 shell approval。 */
+      method: "internal.shell.deny";
+      /** approval 参数。 */
+      params: {
+        /** approval id。 */
+        approvalId: string;
+      };
     };
 
 /**