@downcity/agent 1.1.43 → 1.1.62

package/src/agent/Agent.ts

@@ -3,7 +3,7 @@
  *
  * 职责说明（中文）
  * - 对外暴露 `Agent` 这一唯一的本地实例类。
- * - 统一承接单个 agent 实例的配置加载、plugin 装配、session 创建、HTTP/RPC 启停。
+ * - 统一承接单个 agent 实例的配置加载、plugin 装配、session 创建、RPC 启停。
  * - 把原先独立的实例内核装配逻辑收敛到 `Agent` 内部，避免 facade 与 core 双层跳转。
  *
  * 边界说明（中文）
@@ -13,7 +13,7 @@
 
 import fs from "fs-extra";
 import { nanoid } from "nanoid";
-import type { LanguageModel, Tool } from "ai";
+import type { Tool } from "ai";
 import type { BasePlugin } from "@/plugin/core/BasePlugin.js";
 import type {
   AgentContext,
@@ -35,13 +35,13 @@ import type {
   AgentStartOptions,
   AgentStartResult,
   AgentStopResult,
-  AgentHttpBinding,
-  AgentHttpStartOptions,
   AgentRpcBinding,
+  AgentRpcStartOptions,
   AgentSessionCollection,
   AgentSessionSummaryPage,
   AgentSessionSystemBlock,
 } from "@/types/agent/AgentTypes.js";
+import type { AgentModel } from "@/model/CityModelAdapter.js";
 import { Logger } from "@/utils/logger/Logger.js";
 import { Session } from "@/session/Session.js";
 import { DEFAULT_SHIP_PROMPTS } from "@executor/composer/system/default/SystemDomain.js";
@@ -53,7 +53,7 @@ import {
   createAgentPathRuntime,
   createAgentPluginConfigRuntime,
 } from "@/runtime/host/AgentHostRuntime.js";
-import { loadDowncityConfig } from "@/config/Config.js";
+import { loadDowncityConfig, resolveAgentEnv } from "@/config/Config.js";
 import { HookRegistry } from "@/plugin/core/HookRegistry.js";
 import { PluginRegistry } from "@/plugin/core/PluginRegistry.js";
 import { isPluginEnabled } from "@/plugin/core/Activation.js";
@@ -61,12 +61,11 @@ import { setShellToolRuntime } from "@executor/tools/shell/ShellToolDefinition.j
 import { startAllPlugins, stopAllPlugins } from "@/plugin/core/Manager.js";
 import type { ActionScheduleRuntimeHandle } from "@/plugin/core/ActionScheduleRuntime.js";
 import { startActionScheduleRuntime } from "@/plugin/core/ActionScheduleRuntime.js";
-import { startServer } from "@/runtime/server/http/Server.js";
-import { startLocalRpcServer } from "@/runtime/server/rpc/Server.js";
+import { startRpcServer } from "@/rpc/Server.js";
 
 function createFallbackSdkConfig(agentId: string): DowncityConfig {
   return {
-    name: agentId,
+    id: agentId,
     version: "0.0.0",
   } as DowncityConfig;
 }
@@ -126,7 +125,7 @@ export class Agent {
   private readonly pluginRegistry: PluginRegistry;
   private readonly config: DowncityConfig;
   private readonly env: Record<string, string>;
-  private readonly defaultModel?: LanguageModel;
+  private readonly defaultModel?: AgentModel;
   private readonly pluginInstances: Map<string, BasePlugin>;
   private readonly sessionCollection: AgentSessionCollection;
 
@@ -135,7 +134,6 @@ export class Agent {
   private pluginsStarted = false;
   private actionScheduleRuntime: ActionScheduleRuntimeHandle | null = null;
   private startPromise: Promise<AgentStartResult> | null = null;
-  private httpBinding: AgentHttpBinding | null = null;
   private rpcBinding: AgentRpcBinding | null = null;
 
   constructor(options: AgentOptions) {
@@ -153,7 +151,7 @@ export class Agent {
 
     this.logger = new Logger();
     this.logger.bindProjectRoot(this.path);
-    this.env = options.env ? { ...options.env } : {};
+    this.env = resolveAgentEnv(this.path, options.env);
     this.instruction = normalizeInstructionInput(options.instruction);
     this.defaultModel = options.model;
     this.config = this.loadConfig();
@@ -246,7 +244,7 @@ export class Agent {
    *
    * 关键点（中文）
    * - `start()` 是唯一公开的长期运行生命周期入口。
-   * - 多次并发调用会复用同一个启动 Promise，避免重复启动 plugins / server。
+   * - 多次并发调用会复用同一个启动 Promise，避免重复启动 plugins / rpc。
    */
   async start(options?: AgentStartOptions): Promise<AgentStartResult> {
     if (this.startPromise) {
@@ -259,17 +257,12 @@ export class Agent {
         await this.ensurePluginsStarted();
       }
 
-      const httpBinding =
-        options?.http === false || options?.http === undefined
-          ? undefined
-          : await this.startHttp(options.http);
       const rpcBinding =
-        options?.rpc === true
-          ? await this.startRpc()
-          : undefined;
+        options?.rpc === false || options?.rpc === undefined
+          ? undefined
+          : await this.startRpc(options.rpc);
 
       return {
-        ...(httpBinding ? { http: httpBinding } : {}),
         ...(rpcBinding ? { rpc: rpcBinding } : {}),
         pluginsStarted: this.pluginsStarted,
       };
@@ -286,13 +279,12 @@ export class Agent {
    * 停止当前 agent 实例的长期运行能力。
    *
    * 关键点（中文）
-   * - 停止顺序保持为 plugins -> rpc -> http，与当前运行语义一致。
+   * - 停止顺序保持为 plugins -> rpc，与当前运行语义一致。
    * - 停止后会清空 `startPromise`，允许后续再次 `start()`。
    */
   async stop(): Promise<AgentStopResult> {
     const pluginsStarted = this.pluginsStarted;
     const rpcStarted = this.rpcBinding !== null;
-    const httpStarted = this.httpBinding !== null;
 
     if (pluginsStarted) {
       await this.stopActionScheduleRuntime();
@@ -304,14 +296,9 @@ export class Agent {
       await this.stopRpc();
     }
 
-    if (httpStarted) {
-      await this.stopHttp();
-    }
-
     this.startPromise = null;
 
     return {
-      httpStopped: httpStarted,
       rpcStopped: rpcStarted,
       pluginsStopped: pluginsStarted,
     };
@@ -342,11 +329,42 @@ export class Agent {
     return this.logger;
   }
 
+  /**
+   * 返回当前 agent runtime。
+   *
+   * 关键点（中文）
+   * - 供宿主在 agent 外部装配 transport（例如 city HTTP gateway）时复用。
+   * - 不暴露启动语义，只暴露运行时访问口。
+   */
+  getRuntime(): AgentRuntime {
+    return this.runtime;
+  }
+
+  /**
+   * 返回当前 agent context。
+   *
+   * 关键点（中文）
+   * - 供宿主装配 plugin/control 相关外层协议面。
+   */
+  getContext(): AgentContext {
+    return this.agentContext;
+  }
+
+  /**
+   * 返回当前 session collection。
+   *
+   * 关键点（中文）
+   * - 供宿主在外层挂载 RemoteAgent transport 时复用。
+   */
+  getSessionCollection(): AgentSessionCollection {
+    return this.sessionCollection;
+  }
+
   /**
    * 确保当前 plugins 已启动。
    *
    * 关键点（中文）
-   * - 这里只负责托管 plugin 的生命周期启动，不隐式启动 HTTP/RPC 能力。
+   * - 这里只负责托管 plugin 的生命周期启动，不隐式启动 RPC 能力。
    * - 启动失败的 plugin 会记录日志，但保留与原行为一致的整体启动流程。
    */
   private async ensurePluginsStarted(): Promise<void> {
@@ -396,65 +414,35 @@ export class Agent {
   }
 
   /**
-   * 启动当前 agent 的 HTTP server。
+   * 启动当前 agent 的本机 RPC server。
    */
-  private async startHttp(
-    options?: AgentHttpStartOptions,
-  ): Promise<AgentHttpBinding> {
-    if (this.httpBinding) {
-      return this.httpBinding;
+  private async startRpc(
+    options?: AgentRpcStartOptions,
+  ): Promise<AgentRpcBinding> {
+    if (this.rpcBinding) {
+      return this.rpcBinding;
     }
     const host = String(options?.host || "127.0.0.1").trim() || "127.0.0.1";
     const port =
       typeof options?.port === "number" && Number.isInteger(options.port)
         ? options.port
         : 15314;
-    const server = await startServer({
+    const server = await startRpcServer({
       host,
       port,
-      getAgentRuntime: () => this.runtime,
-      getAgentContext: () => this.agentContext,
       sessionCollection: this.sessionCollection,
     });
-    this.httpBinding = {
-      baseUrl: `http://${host}:${port}`,
+    this.rpcBinding = {
+      url: `rpc://${host}:${port}`,
       host,
       port,
       server,
     };
-    return this.httpBinding;
-  }
-
-  /**
-   * 停止当前 agent 的 HTTP server。
-   */
-  private async stopHttp(): Promise<void> {
-    if (!this.httpBinding) return;
-    const current = this.httpBinding;
-    this.httpBinding = null;
-    await current.server.stop();
-  }
-
-  /**
-   * 启动当前 agent 的本地 RPC server。
-   */
-  private async startRpc(): Promise<AgentRpcBinding> {
-    if (this.rpcBinding) {
-      return this.rpcBinding;
-    }
-    const server = await startLocalRpcServer({
-      context: this.agentContext,
-      runtime: this.runtime,
-    });
-    this.rpcBinding = {
-      endpoint: server.endpoint,
-      server,
-    };
     return this.rpcBinding;
   }
 
   /**
-   * 停止当前 agent 的本地 RPC server。
+   * 停止当前 agent 的本机 RPC server。
    */
   private async stopRpc(): Promise<void> {
     if (!this.rpcBinding) return;
@@ -472,11 +460,7 @@ export class Agent {
    */
   private loadConfig(): DowncityConfig {
     try {
-      return loadDowncityConfig(this.path, {
-        projectEnv: this.env,
-        agentEnv: this.env,
-        globalEnv: {},
-      });
+      return loadDowncityConfig(this.path);
     } catch {
       return createFallbackSdkConfig(this.id);
     }