@downcity/agent 1.1.25 → 1.1.32

package/src/core/AgentCore.ts

@@ -11,7 +11,7 @@ import fs from "fs-extra";
 import { nanoid } from "nanoid";
 import type { LanguageModel, Tool } from "ai";
 import { Logger } from "@/utils/logger/Logger.js";
-import type { BaseService } from "@/service/builtins/BaseService.js";
+import type { BasePlugin } from "@/plugin/core/BasePlugin.js";
 import type { AgentContext } from "@/core/AgentContextTypes.js";
 import type { SessionPort } from "@/core/AgentContextTypes.js";
 import type { AgentRuntime } from "@/core/AgentCoreTypes.js";
@@ -37,14 +37,13 @@ import {
   createAgentPluginConfigRuntime,
 } from "@/runtime/host/AgentHostRuntime.js";
 import { loadDowncityConfig } from "@/config/Config.js";
-import { appendExecSessionMessage } from "@/service/builtins/chat/runtime/ChatIngressStore.js";
-import { readChatMetaBySessionId } from "@/service/builtins/chat/runtime/ChatMetaStore.js";
-import { resolveChatQueueStore } from "@/service/builtins/chat/runtime/ChatQueueStore.js";
+import { readChatMetaBySessionId } from "@/plugin/builtins/chat/runtime/ChatMetaStore.js";
+import { resolveChatQueueStore } from "@/plugin/builtins/chat/runtime/ChatQueueStore.js";
 import { HookRegistry } from "@/plugin/core/HookRegistry.js";
 import { PluginRegistry } from "@/plugin/core/PluginRegistry.js";
 import { isPluginEnabled } from "@/plugin/core/Activation.js";
 import { PLUGINS } from "@/plugin/core/Plugins.js";
-import { createRegisteredServiceInstances } from "@/service/core/ServiceClassRegistry.js";
+import { createRegisteredPluginInstances } from "@/plugin/core/PluginClassRegistry.js";
 import { setShellToolRuntime } from "@session/tools/shell/ShellToolDefinition.js";
 
 const EMPTY_SDK_PLATFORM: AgentPlatformRuntime = {
@@ -115,13 +114,13 @@ export class AgentCore {
   readonly id: string;
   readonly path: string;
   readonly tools: Record<string, Tool>;
-  readonly services: Map<string, BaseService>;
+  readonly runtimePlugins: Map<string, BasePlugin>;
   readonly plugins: PluginPort;
 
   private readonly logger: Logger;
   private readonly sessionsById = new Map<string, Session>();
   private readonly runtime: AgentRuntime;
-  private readonly serviceContext: AgentContext;
+  private readonly agentContext: AgentContext;
   private readonly pluginRegistry: PluginRegistry;
   private readonly pluginSystemProviders: Plugin[];
   private readonly config: DowncityConfig;
@@ -131,7 +130,7 @@ export class AgentCore {
   private readonly defaultModel?: LanguageModel;
   private readonly configureSessionHook?: AgentOptions["configureSession"];
   private instruction: string[];
-  private servicesStartPromise: Promise<void> | null = null;
+  private runtimePluginsStartPromise: Promise<void> | null = null;
   private configuredSessionIds = new Set<string>();
 
   constructor(options: AgentOptions) {
@@ -156,11 +155,11 @@ export class AgentCore {
     this.defaultModel = options.model;
     this.configureSessionHook = options.configureSession;
     this.config = this.loadConfig();
-    this.services = new Map<string, BaseService>();
+    this.runtimePlugins = new Map<string, BasePlugin>();
     this.runtime = this.createRuntime();
-    this.registerServices({
-      explicitServices: options.services || [],
-      useBuiltinServices: options.useBuiltinServices === true,
+    this.registerRuntimePlugins({
+      explicitRuntimePlugins: options.runtimePlugins || [],
+      useBuiltinRuntimePlugins: options.useBuiltinRuntimePlugins === true,
     });
     this.pluginSystemProviders = this.resolvePlugins({
       explicitPlugins: options.plugins,
@@ -168,8 +167,8 @@ export class AgentCore {
     });
     this.pluginRegistry = this.createPluginRegistry(this.pluginSystemProviders);
     this.plugins = this.createPluginPort();
-    this.serviceContext = this.createServiceContext();
-    setShellToolRuntime(this.serviceContext.invoke);
+    this.agentContext = this.createAgentContext();
+    setShellToolRuntime(this.agentContext.invoke);
   }
 
   /**
@@ -183,7 +182,7 @@ export class AgentCore {
    * 返回实例级执行上下文。
    */
   getContext(): AgentContext {
-    return this.serviceContext;
+    return this.agentContext;
   }
 
   /**
@@ -235,19 +234,19 @@ export class AgentCore {
   }
 
   /**
-   * 确保显式注入的 services 已启动。
+   * 确保显式注入的 runtime plugins 已启动。
    */
-  async ensureServicesStarted(): Promise<void> {
-    if (this.servicesStartPromise) {
-      await this.servicesStartPromise;
+  async ensureRuntimePluginsStarted(): Promise<void> {
+    if (this.runtimePluginsStartPromise) {
+      await this.runtimePluginsStartPromise;
       return;
     }
-    this.servicesStartPromise = (async () => {
-      for (const service of this.services.values()) {
-        await service.lifecycle?.start?.(this.serviceContext);
+    this.runtimePluginsStartPromise = (async () => {
+      for (const plugin of this.runtimePlugins.values()) {
+        await plugin.lifecycle?.start?.(this.agentContext);
       }
     })();
-    await this.servicesStartPromise;
+    await this.runtimePluginsStartPromise;
   }
 
   /**
@@ -269,24 +268,24 @@ export class AgentCore {
     }
   }
 
-  private registerServices(input: {
-    explicitServices: BaseService[];
-    useBuiltinServices: boolean;
+  private registerRuntimePlugins(input: {
+    explicitRuntimePlugins: BasePlugin[];
+    useBuiltinRuntimePlugins: boolean;
   }): void {
-    const explicitServices = input.explicitServices;
-    const builtinServices = input.useBuiltinServices
-      ? [...createRegisteredServiceInstances(this.runtime).values()]
+    const explicitRuntimePlugins = input.explicitRuntimePlugins;
+    const builtinRuntimePlugins = input.useBuiltinRuntimePlugins
+      ? [...createRegisteredPluginInstances(this.runtime).values()]
       : [];
-    for (const service of [...builtinServices, ...explicitServices]) {
-      const name = String(service?.name || "").trim();
+    for (const plugin of [...builtinRuntimePlugins, ...explicitRuntimePlugins]) {
+      const name = String(plugin?.name || "").trim();
       if (!name) {
-        throw new Error("Agent received a service without a valid name");
+        throw new Error("Agent received a runtime plugin without a valid name");
       }
-      if (this.services.has(name)) {
-        throw new Error(`Duplicate service registration: ${name}`);
+      if (this.runtimePlugins.has(name)) {
+        throw new Error(`Duplicate runtime plugin registration: ${name}`);
       }
-      service.bindAgent(this.runtime);
-      this.services.set(name, service);
+      plugin.bindAgent(this.runtime);
+      this.runtimePlugins.set(name, plugin);
     }
   }
 
@@ -304,14 +303,14 @@ export class AgentCore {
   private createPluginRegistry(input: Plugin[]): PluginRegistry {
     let pluginRegistryRef: PluginRegistry | null = null;
     const hookRegistry = new HookRegistry({
-      contextResolver: () => this.serviceContext,
+      contextResolver: () => this.agentContext,
       pluginEnabledChecker: (pluginName) => {
         const plugin = pluginRegistryRef?.get(pluginName);
-        return plugin ? isPluginEnabled({ plugin, context: this.serviceContext }) : false;
+        return plugin ? isPluginEnabled({ plugin, context: this.agentContext }) : false;
       },
     });
     const registry = new PluginRegistry({
-      contextResolver: () => this.serviceContext,
+      contextResolver: () => this.agentContext,
       hookRegistry,
     });
     pluginRegistryRef = registry;
@@ -353,12 +352,12 @@ export class AgentCore {
     for (const plugin of this.pluginSystemProviders) {
       if (typeof plugin.system !== "function") continue;
       try {
-        if (!isPluginEnabled({ plugin, context: this.serviceContext })) continue;
+        if (!isPluginEnabled({ plugin, context: this.agentContext })) continue;
         if (typeof plugin.availability === "function") {
-          const availability = await plugin.availability(this.serviceContext);
+          const availability = await plugin.availability(this.agentContext);
           if (!availability.available) continue;
         }
-        const text = String(await plugin.system(this.serviceContext)).trim();
+        const text = String(await plugin.system(this.agentContext)).trim();
         if (!text) continue;
         out.push({
           source: "plugin",
@@ -372,20 +371,20 @@ export class AgentCore {
     return out;
   }
 
-  private async loadServiceSystemBlocks(): Promise<AgentSessionSystemBlock[]> {
+  private async loadRuntimePluginSystemBlocks(): Promise<AgentSessionSystemBlock[]> {
     const out: AgentSessionSystemBlock[] = [];
-    for (const service of this.services.values()) {
-      if (typeof service.system !== "function") continue;
+    for (const plugin of this.runtimePlugins.values()) {
+      if (typeof plugin.system !== "function") continue;
       try {
-        const text = String(await service.system(this.serviceContext)).trim();
+        const text = String(await plugin.system(this.agentContext)).trim();
         if (!text) continue;
         out.push({
-          source: "service",
-          name: service.name,
+          source: "plugin",
+          name: plugin.name,
           content: text,
         });
       } catch {
-        // 单个 service system 失败不应阻断 SDK session 主链路。
+        // 单个 runtime plugin system 失败不应阻断 SDK session 主链路。
       }
     }
     return out;
@@ -400,23 +399,23 @@ export class AgentCore {
       env: this.env,
       globalEnv: this.globalEnv,
       systems: this.instruction,
-      paths: createAgentPathRuntime(this.path),
+      paths: createAgentPathRuntime(this.path, this.id),
       pluginConfig: createAgentPluginConfigRuntime(this.path),
       platform: this.platform,
       getSession: (sessionId: string): SessionPort =>
-        this.getOrCreateSession(sessionId).getServicePort(),
+        this.getOrCreateSession(sessionId).getRuntimePort(),
       listExecutingSessionIds: () =>
         [...this.sessionsById.values()]
           .filter((session) => session.isExecuting())
           .map((session) => session.id),
       getExecutingSessionCount: () =>
         [...this.sessionsById.values()].filter((session) => session.isExecuting()).length,
-      services: this.services,
+      runtimePlugins: this.runtimePlugins,
     } satisfies AgentRuntime;
     return runtime;
   }
 
-  private createServiceContext(): AgentContext {
+  private createAgentContext(): AgentContext {
     let context!: AgentContext;
     context = {
       agent: this.runtime,
@@ -431,7 +430,7 @@ export class AgentCore {
       pluginConfig: this.runtime.pluginConfig,
       platform: this.platform,
       session: {
-        get: (sessionId) => this.getOrCreateSession(sessionId).getServicePort(),
+        get: (sessionId) => this.getOrCreateSession(sessionId).getRuntimePort(),
         listExecutingSessionIds: () => this.runtime.listExecutingSessionIds(),
         getExecutingSessionCount: () => this.runtime.getExecutingSessionCount(),
         resolveModel: async (sessionId) => {
@@ -441,30 +440,30 @@ export class AgentCore {
       },
       invoke: {
         invoke: async (params: {
-          service: string;
+          plugin: string;
           action: string;
           payload?: JsonValue;
         }) => {
-          const serviceName = String(params.service || "").trim();
+          const pluginName = String(params.plugin || "").trim();
           const actionName = String(params.action || "").trim();
-          const service = this.services.get(serviceName);
-          if (!service) {
+          const plugin = this.runtimePlugins.get(pluginName);
+          if (!plugin) {
             return {
               success: false,
-              error: `Unknown service: ${serviceName}`,
+              error: `Unknown plugin: ${pluginName}`,
             };
           }
-          const action = service.actions[actionName];
+          const action = plugin.actions[actionName];
           if (!action) {
             return {
               success: false,
-              error: `Unknown action: ${serviceName}.${actionName}`,
+              error: `Unknown action: ${pluginName}.${actionName}`,
             };
           }
           const result = await action.execute({
             context,
             payload: params.payload ?? null,
-            serviceName,
+            pluginName,
             actionName,
           });
           if (!result.success) {
@@ -486,14 +485,6 @@ export class AgentCore {
             sessionId,
           });
         },
-        appendExecSessionMessage: async (params) => {
-          await appendExecSessionMessage({
-            context,
-            sessionId: params.sessionId,
-            text: params.text,
-            extra: params.extra,
-          });
-        },
         enqueue: (params) => resolveChatQueueStore(context).enqueue(params),
       },
       plugins: this.plugins,
@@ -514,7 +505,7 @@ export class AgentCore {
       tools: this.tools,
       logger: this.logger,
       getInstructionSystemBlocks: () => this.loadInstructionSystemBlocks(),
-      getServiceSystemBlocks: () => this.loadServiceSystemBlocks(),
+      getRuntimePluginSystemBlocks: () => this.loadRuntimePluginSystemBlocks(),
       getPluginSystemBlocks: () => this.loadPluginSystemBlocks(),
       ensureConfigured: async (session) => {
         await this.configureSession(session);

package/src/core/AgentCoreTypes.ts

@@ -4,7 +4,7 @@
  * 关键点（中文）
  * - 这里表达的是单个 `AgentCore` 实例持有的长期运行状态。
  * - 它不再依赖 `runtime/*` 兼容层，而是作为实例级主类型来源。
- * - Session / Service / Plugin 这些长期对象都从这里挂出。
+ * - Session / runtime plugin / plugin 这些长期对象都从这里挂出。
  */
 
 import type { Logger } from "@/utils/logger/Logger.js";
@@ -14,7 +14,7 @@ import type {
   AgentPlatformRuntime,
   AgentPluginConfigRuntime,
 } from "@/types/runtime/host/AgentHost.js";
-import type { BaseService } from "@/service/builtins/BaseService.js";
+import type { BasePlugin } from "@/plugin/core/BasePlugin.js";
 import type { SessionPort } from "@/core/AgentContextTypes.js";
 
 /**
@@ -72,7 +72,7 @@ export interface AgentRuntime extends AgentRuntimeBase {
    *
    * 关键点（中文）
    * - 返回值是统一的 `SessionPort`，而不是裸 `Executor`。
-   * - 这样 HTTP / service / chat queue / contact 等入口都能复用同一层会话装配与执行兜底。
+   * - 这样 HTTP / runtime plugin / chat queue / contact 等入口都能复用同一层会话装配与执行兜底。
    */
   getSession(sessionId: string): SessionPort;
   /**
@@ -84,7 +84,7 @@ export interface AgentRuntime extends AgentRuntimeBase {
    */
   getExecutingSessionCount(): number;
   /**
-   * 当前 agent 持有的 service instances。
+   * 当前 agent 持有的 runtime plugin instances。
    */
-  services: Map<string, BaseService>;
+  runtimePlugins: Map<string, BasePlugin>;
 }

package/src/index.ts

@@ -3,8 +3,8 @@
  *
  * 关键点（中文）
  * - 这是 agent 包唯一稳定的公开入口。
- * - 只导出 SDK、插件/服务作者 API、city 运行集成 API 与跨包协议类型。
- * - HTTP router、sandbox runner、内部 service runner 等实现细节不从根入口暴露。
+ * - 只导出 SDK、plugin 作者 API、city 运行集成 API 与跨包协议类型。
+ * - HTTP router、sandbox runner、内部 runtime plugin runner 等实现细节不从根入口暴露。
  */
 
 // SDK 入口
@@ -44,24 +44,24 @@ export type { AgentRuntime, AgentRuntimeBase } from "./core/AgentCoreTypes.js";
 export type {
   AgentContext,
   ChatRuntimePort,
-  InvokeServicePort,
+  InvokePluginPort,
   SessionCollectionPort,
   SessionPort,
   StructuredConfig,
 } from "./core/AgentContextTypes.js";
 
-// 服务与插件作者 API
-export { BaseService } from "./service/builtins/BaseService.js";
-export { ChatService } from "./service/builtins/chat/ChatService.js";
-export { ChatChannelAccountService } from "./service/builtins/chat/accounts/ChannelAccountService.js";
-export type { ChatChannelAccountListItem } from "./service/builtins/chat/types/ChannelAccount.js";
+// Plugin 作者 API
+export { BasePlugin } from "./plugin/core/BasePlugin.js";
+export { ChatPlugin } from "./plugin/builtins/chat/ChatPlugin.js";
+export { ChatChannelAccountService } from "./plugin/builtins/chat/accounts/ChannelAccountService.js";
+export type { ChatChannelAccountListItem } from "./plugin/builtins/chat/types/ChannelAccount.js";
 export type {
-  ChatServiceChannelAccountProvider,
-  ChatServiceFeishuOptions,
-  ChatServiceOptions,
-  ChatServiceQqOptions,
-  ChatServiceTelegramOptions,
-} from "./service/builtins/chat/ChatServiceTypes.js";
+  ChatPluginChannelAccountProvider,
+  ChatPluginFeishuOptions,
+  ChatPluginOptions,
+  ChatPluginQqOptions,
+  ChatPluginTelegramOptions,
+} from "./plugin/builtins/chat/ChatPluginTypes.js";
 export { authPlugin } from "./plugin/builtins/auth/Plugin.js";
 export { skillPlugin } from "./plugin/builtins/skill/Plugin.js";
 export { webPlugin } from "./plugin/builtins/web/Plugin.js";
@@ -91,18 +91,18 @@ export { startServer } from "./runtime/server/http/Server.js";
 export { startLocalRpcServer } from "./runtime/server/rpc/Server.js";
 export { callAgentTransport } from "./runtime/transport/rpc/Transport.js";
 
-// Service 运行集成
-export { listRegisteredServices } from "./service/core/ServiceClassRegistry.js";
+// Runtime plugin 运行集成
+export { listRegisteredPlugins } from "./plugin/core/PluginClassRegistry.js";
 export {
-  startAllServices,
-  stopAllServices,
-} from "./service/core/Manager.js";
-export { ServiceScheduleStore } from "./service/core/schedule/Store.js";
-export { parseScheduledRunAtMsOrThrow } from "./service/core/schedule/Time.js";
+  startAllPlugins,
+  stopAllPlugins,
+} from "./plugin/core/Manager.js";
+export { PluginScheduleStore } from "./plugin/core/schedule/Store.js";
+export { parseScheduledRunAtMsOrThrow } from "./plugin/core/schedule/Time.js";
 export {
   pickLastSuccessfulChatSendText,
   resolveAssistantMessageForPersistence,
-} from "./service/builtins/chat/runtime/UserVisibleText.js";
+} from "./plugin/builtins/chat/runtime/UserVisibleText.js";
 
 // Plugin 与权限配置集成
 export {
@@ -250,41 +250,33 @@ export type {
   PluginActionResponse,
   PluginAvailabilityResponse,
   PluginAvailabilityView,
-  PluginCliBaseOptions,
-  PluginListResponse,
 } from "./plugin/types/PluginApi.js";
 
-// Service 作者与 CLI/control 协议类型
+// 主动型 plugin 与 CLI/control 协议类型
 export type {
-  Service,
-  ServiceAction,
-  ServiceActionCommand,
-  ServiceActionCommandInput,
-  ServiceActionResult,
-  ServiceActions,
-  ServiceCommandResult,
-  ServiceLifecycle,
-  ServiceState,
-} from "./service/types/Service.js";
+  PluginCommandResult,
+  PluginLifecycle,
+  PluginState,
+} from "./plugin/types/Plugin.js";
 export type {
   CreateScheduledJobInput,
   ScheduledJobRecord,
   ScheduledJobStatus,
-  ServiceCommandScheduleInput,
-} from "./service/types/ServiceSchedule.js";
+  PluginCommandScheduleInput,
+} from "./plugin/types/PluginSchedule.js";
 export type {
-  ServiceCliBaseOptions,
-  ServiceCommandResponse,
-  ServiceControlAction,
-  ServiceControlResponse,
-  ServiceListResponse,
-  ServiceStateView,
-} from "./service/types/Services.js";
+  PluginCliBaseOptions,
+  PluginCommandResponse,
+  PluginControlAction,
+  PluginControlResponse,
+  PluginListResponse,
+  PluginStateView,
+} from "./plugin/types/Plugins.js";
 export type {
-  ServiceStateControlAction,
-  ServiceStateControlResult,
-  ServiceStateSnapshot,
-} from "./service/core/Manager.js";
+  PluginStateControlAction,
+  PluginStateControlResult,
+  PluginStateSnapshot,
+} from "./plugin/core/Manager.js";
 
 // Chat authorization plugin 协议类型
 export {

package/src/plugin/builtins/asr/InboundAugment.ts

@@ -7,7 +7,7 @@
  */
 
 import type { AgentContext } from "@/core/AgentContextTypes.js";
-import type { ChatInboundAugmentInput } from "@/service/builtins/chat/types/ChatPlugin.js";
+import type { ChatInboundAugmentInput } from "@/plugin/builtins/chat/types/ChatPlugin.js";
 import type { JsonValue } from "@/types/common/Json.js";
 import { transcribeWithVoiceDependency } from "@/plugin/builtins/asr/Dependency.js";
 

package/src/plugin/builtins/asr/Plugin.ts

@@ -9,7 +9,7 @@
 
 import type { Plugin } from "@/plugin/types/Plugin.js";
 import type { VoicePluginConfig } from "@/plugin/builtins/voice/types/VoicePlugin.js";
-import { CHAT_PLUGIN_POINTS } from "@/service/builtins/chat/runtime/PluginPoints.js";
+import { CHAT_PLUGIN_POINTS } from "@/plugin/builtins/chat/runtime/PluginPoints.js";
 import { isPluginEnabled } from "@/plugin/core/Activation.js";
 import {
   listVoiceModels,

package/src/plugin/builtins/auth/Plugin.ts

@@ -9,7 +9,7 @@
 
 import type { Plugin } from "@/plugin/types/Plugin.js";
 import type { JsonValue } from "@/types/common/Json.js";
-import { CHAT_PLUGIN_POINTS } from "@/service/builtins/chat/runtime/PluginPoints.js";
+import { CHAT_PLUGIN_POINTS } from "@/plugin/builtins/chat/runtime/PluginPoints.js";
 import {
   AUTH_ACTIONS,
   type AuthObservePrincipalPayload,
@@ -32,7 +32,7 @@ import {
   readAuthorizationSnapshot,
   recordObservedAuthorizationPrincipal,
 } from "@/plugin/builtins/auth/runtime/AuthorizationStore.js";
-import type { ChatDispatchChannel } from "@/service/builtins/chat/types/ChatDispatcher.js";
+import type { ChatDispatchChannel } from "@/plugin/builtins/chat/types/ChatDispatcher.js";
 
 function toChannel(value: unknown): ChatDispatchChannel | null {
   const text = String(value || "").trim().toLowerCase();

package/src/plugin/builtins/auth/runtime/AuthorizationStore.ts

@@ -15,7 +15,7 @@ import type {
   ChatAuthorizationStateFile,
 } from "@/plugin/builtins/auth/types/AuthPlugin.js";
 import type { AgentContext } from "@/core/AgentContextTypes.js";
-import type { ChatDispatchChannel } from "@/service/builtins/chat/types/ChatDispatcher.js";
+import type { ChatDispatchChannel } from "@/plugin/builtins/chat/types/ChatDispatcher.js";
 
 function getAuthorizationStatePath(rootPath: string): string {
   return path.join(rootPath, ".downcity", "chat", "authorization", "state.json");

package/src/plugin/builtins/auth/types/AuthPlugin.ts

@@ -7,8 +7,8 @@
  * - chat / console / plugin 执行链路都从这里共享同一份边界定义。
  */
 
-import type { ChatDispatchChannel } from "@/service/builtins/chat/types/ChatDispatcher.js";
-import { CHAT_PLUGIN_POINTS } from "@/service/builtins/chat/runtime/PluginPoints.js";
+import type { ChatDispatchChannel } from "@/plugin/builtins/chat/types/ChatDispatcher.js";
+import { CHAT_PLUGIN_POINTS } from "@/plugin/builtins/chat/runtime/PluginPoints.js";
 
 /**
  * auth plugin 稳定名称。