@downcity/city 1.1.29 → 1.1.39

package/src/cli/control-plane/ControlPlaneProcess.ts

@@ -16,8 +16,7 @@ import {
   readDaemonPid,
   stopDaemonProcess,
 } from "@/process/daemon/Manager.js";
-import { ensureRuntimeExecutionBindingReady } from "@downcity/agent";
-import { createAgentPlatformRuntime } from "@/process/registry/AgentHostRuntime.js";
+import { assertProjectExecutionModelReady } from "@/model/runtime/ExecutionModelBinding.js";
 import { allocateAvailablePort } from "@/process/daemon/PortAllocator.js";
 import {
   ensureManagedAgentRegistry,
@@ -469,7 +468,7 @@ export async function prepareForegroundAgent(
 
   injectAgentContext(cwd);
   const projectRoot = resolve(String(cwd || "."));
-    ensureRuntimeExecutionBindingReady(projectRoot, createAgentPlatformRuntime());
+    assertProjectExecutionModelReady(projectRoot);
 
   const shouldForeground = options.foreground === true;
   if (!shouldForeground) {

package/src/cli/model/ModelSupport.ts

@@ -181,7 +181,7 @@ export async function discoverProviderModels(params: {
   }
 }
 
-export { resolveProjectRoot } from "../shared/PluginRuntimeSupport.js";
+export { resolveProjectRoot } from "../shared/PluginTargetSupport.js";
 
 /**
  * 设置项目 `downcity.json.execution.modelId`。

package/src/cli/shared/Chat.ts

@@ -3,7 +3,7 @@
  *
  * 关键点（中文）
  * - 这里先注册裸 `city chat` 的交互式入口。
- * - 具体 runtime plugin actions/lifecycle 命令仍由 runtime plugin 注册器补充到同一个命令组。
+ * - 具体 plugin runtime actions/lifecycle 命令仍由 plugin runtime 注册器补充到同一个命令组。
  */
 
 import type { Command } from "commander";

package/src/cli/shared/ChatAuth.ts

@@ -11,18 +11,16 @@ import path from "node:path";
 import prompts from "prompts";
 import type { Command } from "commander";
 import {
+  isChatAuthorizationChannel,
   listChatAuthorizationRoles,
+  readChatAuthorizationConfigSync,
   resolveAuthorizedUserRole,
-} from "@downcity/agent";
-import { emitCliBlock } from "./CliReporter.js";
-import { parseBoolean } from "./IndexSupport.js";
-import {
-  isChatAuthorizationChannel,
+  setChatAuthorizationUserRole,
   type ChatAuthorizationChannel,
   type ChatAuthorizationRole,
-} from "@downcity/agent";
-import { createAgentPlatformRuntime } from "@/process/registry/AgentHostRuntime.js";
-import { readChatAuthorizationConfigSync } from "@/platform/chatAuthorization/Store.js";
+} from "@downcity/plugins";
+import { emitCliBlock } from "./CliReporter.js";
+import { parseBoolean } from "./IndexSupport.js";
 
 type ChatAuthSetOptions = {
   /**
@@ -141,9 +139,10 @@ export async function runChatAuthSet(params: {
 
   if (!nextRole) return;
 
-  const platform = createAgentPlatformRuntime();
-  await platform.setChatAuthorizationUserRole({
-    projectRoot,
+  await setChatAuthorizationUserRole({
+    context: {
+      rootPath: projectRoot,
+    },
     channel: principal.channel,
     userId: principal.userId,
     roleId: nextRole.roleId,

package/src/cli/shared/ChatManager.ts

@@ -2,7 +2,7 @@
  * `city chat` 交互式管理器。
  *
  * 关键点（中文）
- * - 裸 `city chat` 进入 chat service 管理，而不是只输出静态 help。
+ * - 裸 `city chat` 进入 chat plugin 管理，而不是只输出静态 help。
  * - chat channel account 属于 city 级配置，在这里通过“配置 channel”管理。
  * - agent 只绑定 channel account，不在 agent 流程中维护密钥。
  */
@@ -10,23 +10,22 @@
 import prompts from "prompts";
 import type { PromptObject } from "prompts";
 import {
-  ChatChannelAccountService,
+  ChatChannelAccountManager,
   type ChatChannelAccountListItem,
-} from "@downcity/agent";
+} from "@downcity/plugins";
 import { emitCliBlock, emitCliList } from "./CliReporter.js";
-import { runPluginRuntimeControlCommand } from "./PluginRuntimeRemote.js";
+import { runManagedPluginControlCommand } from "./ManagedPluginRemote.js";
 import type { StoredChannelAccountChannel } from "@downcity/agent";
 import type {
   ChatChannelAccountAction,
   ChatManagerRootAction,
 } from "./ChatManagerTypes.js";
 import { runInteractiveChatAuthSetFlow } from "./ChatAuth.js";
-import { createAgentPlatformRuntime } from "@/process/registry/AgentHostRuntime.js";
 
 const CHAT_CHANNELS: StoredChannelAccountChannel[] = ["telegram", "feishu", "qq"];
 
-function createChannelAccountService(): ChatChannelAccountService {
-  return new ChatChannelAccountService(createAgentPlatformRuntime());
+function createChannelAccountManager(): ChatChannelAccountManager {
+  return new ChatChannelAccountManager();
 }
 
 function isInteractiveTerminal(): boolean {
@@ -49,8 +48,8 @@ function formatCredentialSummary(account: ChatChannelAccountListItem): string {
 }
 
 async function promptRootAction(): Promise<ChatManagerRootAction | null> {
-  const service = createChannelAccountService();
-  const accounts = await service.list();
+  const manager = createChannelAccountManager();
+  const accounts = await manager.list();
   const response = (await prompts({
     type: "select",
     name: "action",
@@ -94,8 +93,8 @@ async function promptRootAction(): Promise<ChatManagerRootAction | null> {
 }
 
 async function promptChannelAccountAction(): Promise<ChatChannelAccountAction | null> {
-  const service = createChannelAccountService();
-  const accounts = await service.list();
+  const manager = createChannelAccountManager();
+  const accounts = await manager.list();
   const response = (await prompts({
     type: "select",
     name: "action",
@@ -139,8 +138,8 @@ async function promptChannelAccountAction(): Promise<ChatChannelAccountAction |
 }
 
 async function emitChannelAccountList(): Promise<void> {
-  const service = createChannelAccountService();
-  const { items } = await service.list();
+  const manager = createChannelAccountManager();
+  const { items } = await manager.list();
   if (items.length === 0) {
     emitCliBlock({
       tone: "info",
@@ -182,8 +181,8 @@ async function chooseChannel(): Promise<StoredChannelAccountChannel | null> {
 }
 
 async function chooseAccount(): Promise<ChatChannelAccountListItem | null> {
-  const service = createChannelAccountService();
-  const { items } = await service.list();
+  const manager = createChannelAccountManager();
+  const { items } = await manager.list();
   if (items.length === 0) {
     emitCliBlock({
       tone: "info",
@@ -296,8 +295,8 @@ async function addChannelAccount(): Promise<void> {
     initial: true,
   })) as { probe?: boolean };
 
-  const service = createChannelAccountService();
-  const result = await service.create({
+  const manager = createChannelAccountManager();
+  const result = await manager.create({
     channel,
     name,
     botToken: input.botToken,
@@ -324,8 +323,8 @@ async function editChannelAccount(): Promise<void> {
     channel: account.channel,
     current: account,
   });
-  const service = createChannelAccountService();
-  await service.upsert({
+  const manager = createChannelAccountManager();
+  await manager.upsert({
     id: account.id,
     channel: account.channel,
     name: String(input.name || account.name).trim(),
@@ -356,8 +355,8 @@ async function removeChannelAccount(): Promise<void> {
 
   if (response.remove !== true) return;
 
-  const service = createChannelAccountService();
-  service.remove(account.id);
+  const manager = createChannelAccountManager();
+  await manager.remove(account.id);
   emitCliBlock({
     tone: "success",
     title: "Channel account removed",
@@ -403,7 +402,7 @@ async function runChannelAccountManager(): Promise<void> {
 async function runChatLifecycleAction(
   action: "start" | "stop" | "restart" | "status",
 ): Promise<void> {
-  await runPluginRuntimeControlCommand({
+  await runManagedPluginControlCommand({
     pluginName: "chat",
     action,
     options: {

package/src/cli/shared/Config.ts

@@ -14,7 +14,7 @@ import { getDowncityJsonPath } from "@/config/Paths.js";
 import { printResult } from "@/utils/cli/CliOutput.js";
 import { aliasCommand } from "./Alias.js";
 import { parseBoolean } from "./IndexSupport.js";
-import { resolveProjectRoot } from "./PluginRuntimeSupport.js";
+import { resolveProjectRoot } from "./PluginTargetSupport.js";
 import type { DowncityConfig } from "@downcity/agent";
 
 function isPlainObject(value: unknown): value is Record<string, unknown> {

package/src/cli/shared/{PluginRuntimeActionCommands.ts → ManagedPluginActionCommands.ts}

@@ -1,27 +1,27 @@
 /**
- * Runtime plugin action CLI 注册器。
+ * 受 agent 托管的 plugin action CLI 注册器。
  *
  * 关键点（中文）
- * - 负责把 runtime plugin actions 挂到 commander（`city <plugin> <action>`）。
+ * - 负责把需要运行中 agent 承载的 plugin actions 挂到 commander（`city <plugin> <action>`）。
  * - 仅处理 CLI 参数映射与远程调用，不承载 plugin 状态机逻辑。
- * - runtime plugin 注册表与调度时间解析统一复用 agent 包实现，避免 city 维护第二套事实源。
+ * - 命令注册表与调度时间解析统一复用 agent 包实现，避免 city 维护第二套事实源。
  */
 
 import path from "node:path";
 import type { Command } from "commander";
 import {
   callAgentTransport,
-  listRegisteredPlugins,
-  parseScheduledRunAtMsOrThrow,
+  parseActionScheduleRunAtMsOrThrow,
 } from "@downcity/agent";
+import { listPluginsWithLifecycle } from "@downcity/agent";
 import type { BasePlugin, PluginAction } from "@downcity/agent";
 import type { JsonObject, JsonValue } from "@downcity/agent";
-import type { PluginCommandScheduleInput } from "@downcity/agent";
+import type { PluginActionScheduleInput } from "@downcity/agent";
 import type { PluginCommandResponse } from "@downcity/agent";
 import type { PluginCliBaseOptions } from "@downcity/agent";
 import { printResult } from "@/utils/cli/CliOutput.js";
 import { parseBoolean, parsePort } from "./IndexSupport.js";
-import { runPluginRuntimeControlCommand } from "./PluginRuntimeRemote.js";
+import { runManagedPluginControlCommand } from "./ManagedPluginRemote.js";
 
 const CHAT_PLUGIN_HELP_TEXT = [
   "",
@@ -160,8 +160,8 @@ function hasLongOption(command: Command, longFlag: string): boolean {
  */
 function extractCommandScheduleInput(
   options: Record<string, unknown>,
-): PluginCommandScheduleInput | undefined {
-  const runAtMs = parseScheduledRunAtMsOrThrow({
+): PluginActionScheduleInput | undefined {
+  const runAtMs = parseActionScheduleRunAtMsOrThrow({
     delay: options.delay as string | number | undefined,
     time: options.time as string | number | undefined,
   });
@@ -245,7 +245,7 @@ function registerPluginActionCommand(params: {
         })();
     const actionOptions = toPluginActionCommandOpts(allOptions);
     const bridgeOptions = toPluginCliBridgeOptions(allOptions);
-    let schedule: PluginCommandScheduleInput | undefined;
+    let schedule: PluginActionScheduleInput | undefined;
     try {
       schedule = extractCommandScheduleInput(allOptions);
     } catch (error) {
@@ -280,7 +280,7 @@ function registerPluginActionCommand(params: {
 
     const remote = await callAgentTransport<PluginCommandResponse>({
       projectRoot: resolveProjectRoot(bridgeOptions.path),
-      path: "/api/plugins/runtime/command",
+      path: "/api/plugins/command",
       method: "POST",
       host: bridgeOptions.host,
       port: bridgeOptions.port,
@@ -383,7 +383,7 @@ function registerPluginLifecycleCommands(params: {
         .description(item.description)
         .helpOption("--help", "display help for command"),
     ).action(async (options: PluginCliBaseOptions) => {
-      await runPluginRuntimeControlCommand({
+      await runManagedPluginControlCommand({
         pluginName: params.plugin.name,
         action: item.action,
         options,
@@ -393,10 +393,13 @@ function registerPluginLifecycleCommands(params: {
 }
 
 /**
- * 注册所有 runtime plugin actions 的 CLI 命令。
+ * 注册所有受 agent 托管的 plugin actions CLI 命令。
  */
-export function registerAllRuntimePluginsForCli(program: Command): void {
-  const plugins = listRegisteredPlugins();
+export function registerManagedPluginCommandsForCli(
+  program: Command,
+  pluginsInput: BasePlugin[],
+): void {
+  const plugins = listPluginsWithLifecycle(pluginsInput);
   for (const plugin of plugins) {
     for (const [actionName, action] of Object.entries(plugin.actions)) {
       registerPluginActionCommand({

package/src/cli/shared/{PluginRuntimeRemote.ts → ManagedPluginRemote.ts}

@@ -2,7 +2,7 @@
  * `city plugin` 运行态远程 Agent server 调用辅助。
  *
  * 关键点（中文）
- * - 统一处理 runtime list/control/command 三类需要访问 Agent server 的命令。
+ * - 统一处理 list/control/command 三类需要访问 Agent server 的命令。
  * - 这里不负责命令注册，只负责 transport 调用与结果输出。
  */
 
@@ -13,26 +13,26 @@ import type {
   PluginCommandResponse,
   PluginControlAction,
   PluginControlResponse,
-  PluginListResponse,
+  PluginStateListResponse,
 } from "@downcity/agent";
 import {
   parseCommandPayload,
   resolvePluginProjectRoot,
   validateAgentProjectRoot,
-} from "./PluginRuntimeSupport.js";
+} from "./PluginTargetSupport.js";
 
 const PLUGIN_COMMAND_TIMEOUT_MS = 120_000;
 
 /**
- * 执行 `plugin list --runtime`。
+ * 执行 `plugin list`。
  */
-export async function runPluginRuntimeListCommand(options: PluginCliBaseOptions): Promise<void> {
+export async function runManagedPluginListCommand(options: PluginCliBaseOptions): Promise<void> {
   const resolved = await resolvePluginProjectRoot(options);
   if (!resolved.projectRoot) {
     printResult({
       asJson: options.json,
       success: false,
-      title: "plugin runtime list failed",
+      title: "plugin list failed",
       payload: {
         error: resolved.error || "Failed to resolve agent project path",
       },
@@ -45,16 +45,16 @@ export async function runPluginRuntimeListCommand(options: PluginCliBaseOptions)
     printResult({
       asJson: options.json,
       success: false,
-      title: "plugin runtime list failed",
+      title: "plugin list failed",
       payload: {
         error: pathError,
       },
     });
     return;
   }
-  const remote = await callAgentTransport<PluginListResponse>({
+  const remote = await callAgentTransport<PluginStateListResponse>({
     projectRoot,
-    path: "/api/plugins/runtime/list",
+    path: "/api/plugins/list",
     method: "GET",
     host: options.host,
     port: options.port,
@@ -65,7 +65,7 @@ export async function runPluginRuntimeListCommand(options: PluginCliBaseOptions)
     printResult({
       asJson: options.json,
       success: Boolean(remote.data.success),
-      title: remote.data.success ? "plugin runtime listed" : "plugin runtime list failed",
+      title: remote.data.success ? "plugin listed" : "plugin list failed",
       payload: {
         ...(Array.isArray(remote.data.plugins) ? { plugins: remote.data.plugins } : {}),
         ...(remote.data.error ? { error: remote.data.error } : {}),
@@ -77,7 +77,7 @@ export async function runPluginRuntimeListCommand(options: PluginCliBaseOptions)
   printResult({
     asJson: options.json,
     success: false,
-    title: "plugin runtime list failed",
+    title: "plugin list failed",
     payload: {
       error: remote.error || "Unknown error",
     },
@@ -87,7 +87,7 @@ export async function runPluginRuntimeListCommand(options: PluginCliBaseOptions)
 /**
  * 执行 `plugin status/start/stop/restart`。
  */
-export async function runPluginRuntimeControlCommand(params: {
+export async function runManagedPluginControlCommand(params: {
   pluginName: string;
   action: PluginControlAction;
   options: PluginCliBaseOptions;
@@ -119,7 +119,7 @@ export async function runPluginRuntimeControlCommand(params: {
   }
   const remote = await callAgentTransport<PluginControlResponse>({
     projectRoot,
-    path: "/api/plugins/runtime/control",
+    path: "/api/plugins/control",
     method: "POST",
     host: params.options.host,
     port: params.options.port,
@@ -156,7 +156,7 @@ export async function runPluginRuntimeControlCommand(params: {
 /**
  * 执行 `plugin command` 桥接。
  */
-export async function runPluginRuntimeCommandBridge(params: {
+export async function runManagedPluginCommandBridge(params: {
   pluginName: string;
   command: string;
   payloadRaw?: string;
@@ -189,7 +189,7 @@ export async function runPluginRuntimeCommandBridge(params: {
   }
   const remote = await callAgentTransport<PluginCommandResponse>({
     projectRoot,
-    path: "/api/plugins/runtime/command",
+    path: "/api/plugins/command",
     method: "POST",
     timeoutMs: PLUGIN_COMMAND_TIMEOUT_MS,
     host: params.options.host,

package/src/cli/shared/PluginScheduleCommand.ts

@@ -2,12 +2,13 @@
  * `city plugin schedule` 命令。
  *
  * 关键点（中文）
- * - schedule 管理命令只依赖项目本地 schedule SQLite，不要求 runtime 在线。
- * - 这里同时承载 schedule 子命令注册与本地存储读写流程。
+ * - 命令名保留 schedule，是用户侧“延迟执行任务”的操作语义。
+ * - 内部使用 Agent 的 ActionScheduleStore，不依赖独立 schedule plugin。
+ * - 这里同时承载 schedule 子命令注册与 ActionSchedule 本地存储读写流程。
  */
 
 import type { Command } from "commander";
-import { PluginScheduleStore } from "@downcity/agent";
+import { ActionScheduleStore } from "@downcity/agent";
 import { printResult } from "@/utils/cli/CliOutput.js";
 import type { PluginCliBaseOptions } from "@downcity/agent";
 import {
@@ -16,7 +17,7 @@ import {
   parsePositiveIntOption,
   resolvePluginScheduleProjectRoot,
   validateAgentProjectRoot,
-} from "./PluginRuntimeSupport.js";
+} from "./PluginTargetSupport.js";
 
 /**
  * 执行 `plugin schedule list`。
@@ -57,7 +58,7 @@ export async function runPluginScheduleListCommand(params: {
     const limit = params.limitRaw
       ? parsePositiveIntOption(params.limitRaw, "limit")
       : 100;
-    const store = new PluginScheduleStore(projectRoot);
+    const store = new ActionScheduleStore(projectRoot);
     try {
       const jobs = store.listJobs({ status, limit });
       printResult({
@@ -132,7 +133,7 @@ export async function runPluginScheduleInfoCommand(params: {
     return;
   }
 
-  const store = new PluginScheduleStore(projectRoot);
+  const store = new ActionScheduleStore(projectRoot);
   try {
     const job = store.getJobById(jobId);
     if (!job) {
@@ -205,7 +206,7 @@ export async function runPluginScheduleCancelCommand(params: {
     return;
   }
 
-  const store = new PluginScheduleStore(projectRoot);
+  const store = new ActionScheduleStore(projectRoot);
   try {
     const current = store.getJobById(jobId);
     if (!current) {
@@ -264,13 +265,13 @@ export async function runPluginScheduleCancelCommand(params: {
 export function registerPluginScheduleCommands(plugin: Command): void {
   const schedule = plugin
     .command("schedule")
-    .description("查看和管理持久化 schedule 任务")
+    .description("查看和管理持久化延迟 action 任务")
     .helpOption("--help", "display help for command");
 
   addPluginScheduleOptions(
     schedule
       .command("list")
-      .description("列出当前 agent 的调度任务")
+      .description("列出当前 agent 的延迟 action 任务")
       .option("--status <status>", "状态过滤（pending|running|succeeded|failed|cancelled）")
       .option("--limit <n>", "返回条数（默认 100）"),
   ).action(async (opts: PluginCliBaseOptions & { status?: string; limit?: string }) => {
@@ -284,7 +285,7 @@ export function registerPluginScheduleCommands(plugin: Command): void {
   addPluginScheduleOptions(
     schedule
       .command("info <jobId>")
-      .description("查看单个调度任务详情"),
+      .description("查看单个延迟 action 任务详情"),
   ).action(async (jobId: string, opts: PluginCliBaseOptions) => {
     await runPluginScheduleInfoCommand({
       jobId,
@@ -295,7 +296,7 @@ export function registerPluginScheduleCommands(plugin: Command): void {
   addPluginScheduleOptions(
     schedule
       .command("cancel <jobId>")
-      .description("取消一个尚未执行的调度任务"),
+      .description("取消一个尚未执行的延迟 action 任务"),
   ).action(async (jobId: string, opts: PluginCliBaseOptions) => {
     await runPluginScheduleCancelCommand({
       jobId,

package/src/cli/shared/{PluginRuntimeSupport.ts → PluginTargetSupport.ts}

@@ -2,7 +2,7 @@
  * `city plugin` 运行态命令共享辅助 + Agent 预检。
  *
  * 关键点（中文）
- * - 统一承载 runtime plugin 命令的参数解析、目标 agent 路径解析与项目目录校验。
+ * - 统一承载 plugin runtime 命令的参数解析、目标 agent 路径解析与项目目录校验。
  * - 提供 `checkAgentPreflight` 供 start/restart/status 等命令统一使用。
  * - 保持 command 注册层只关注命令树，不再直接承载路径解析细节。
  */
@@ -13,14 +13,13 @@ import type { Command } from "commander";
 import { getProfileMdPath, getDowncityJsonPath } from "@/config/Paths.js";
 import { listManagedAgentEntries } from "@/process/registry/CityRegistry.js";
 import { isCityRunning } from "@/process/registry/CityRuntime.js";
-import { ensureRuntimeExecutionBindingReady } from "@downcity/agent";
 import type { JsonValue } from "@downcity/agent";
 import { parsePort, resolveAgentName } from "./IndexSupport.js";
 import { CliError } from "./CliError.js";
-import type { ScheduledJobStatus } from "@downcity/agent";
+import type { ActionScheduleJobStatus } from "@downcity/agent";
 import type { PluginCliBaseOptions } from "@downcity/agent";
 import { parseBoolean } from "./IndexSupport.js";
-import { createAgentPlatformRuntime } from "@/process/registry/AgentHostRuntime.js";
+import { assertProjectExecutionModelReady } from "@/model/runtime/ExecutionModelBinding.js";
 
 export function isRegistryEntryRunning(
   entry: { status?: "running" | "stopped" },
@@ -77,7 +76,7 @@ export async function checkAgentPreflight(
   }
 
   // 关键点（中文）：提前校验 execution binding，避免"启动成功后秒退"。
-  ensureRuntimeExecutionBindingReady(projectRoot, createAgentPlatformRuntime());
+  assertProjectExecutionModelReady(projectRoot);
 }
 
 /**
@@ -96,7 +95,7 @@ export function parsePositiveIntOption(value: string, fieldName: string): number
  */
 export function normalizeScheduledJobStatus(
   value: string | undefined,
-): ScheduledJobStatus | undefined {
+): ActionScheduleJobStatus | undefined {
   const text = String(value || "").trim().toLowerCase();
   if (!text) return undefined;
   if (
@@ -164,7 +163,7 @@ export async function resolveProjectRootByAgentName(agentName: string): Promise<
 }
 
 /**
- * 统一解析 runtime plugin 命令目标路径（agent 优先于 path）。
+ * 统一解析 plugin runtime 命令目标路径（agent 优先于 path）。
  */
 export async function resolvePluginProjectRoot(options: PluginCliBaseOptions): Promise<{
   projectRoot?: string;
@@ -206,7 +205,7 @@ export async function resolvePluginProjectRoot(options: PluginCliBaseOptions): P
 }
 
 /**
- * 解析 schedule 管理命令目标路径。
+ * 解析 ActionSchedule 管理命令目标路径。
  */
 export async function resolvePluginScheduleProjectRoot(options: PluginCliBaseOptions): Promise<{
   projectRoot?: string;
@@ -266,7 +265,7 @@ export function addPluginTargetOptions(command: Command): Command {
 }
 
 /**
- * 注入 plugin schedule 管理命令通用选项。
+ * 注入 ActionSchedule 管理命令通用选项。
  */
 export function addPluginScheduleOptions(command: Command): Command {
   return command