@downcity/agent 1.1.175 → 1.1.178

package/src/plugin/core/PluginActionRunner.ts

@@ -1,106 +1,56 @@
 /**
- * PluginActionRunner：主动型 plugin action/command 执行模块。
+ * PluginActionRunner：plugin command/action 兼容执行模块。
+ *
+ * 关键点（中文）
+ * - 新模型中注册即生效，不再要求 plugin 处于 running 状态。
+ * - `command` 仅作为 CLI/RPC 对 action 的兼容入口；优先执行同名 action。
+ * - 延迟调度仍复用本模块，保证 schedule 到点后走统一 action 规则。
  */
 
 import type { AgentContext } from "@/types/runtime/agent/AgentContext.js";
-import type { BasePlugin } from "@/plugin/core/BasePlugin.js";
 import type {
   PluginAction,
   PluginActionResult,
   PluginCommandResult,
-  PluginStateControlAction,
   PluginStateSnapshot,
 } from "@/plugin/types/Plugin.js";
 import type { PluginActionScheduleInput } from "@/plugin/types/ActionSchedule.js";
 import type { JsonValue } from "@/types/common/Json.js";
 import { ActionScheduleStore } from "@/plugin/core/ActionScheduleStore.js";
 import { normalizeRunAtMsOrThrow } from "@/plugin/core/ActionScheduleTime.js";
-import {
-  controlPluginState,
-  ensurePluginStateRecord,
-  markPluginCommand,
-  markPluginState,
-  resolvePluginByName,
-  toPluginStateSnapshot,
-} from "@/plugin/core/PluginStateController.js";
-
-function resolveLifecycle(plugin: BasePlugin) {
-  return plugin.lifecycle;
-}
 
 /**
- * 按名称解析主动型 plugin action。
+ * 按名称解析 plugin action。
  */
 export function resolvePluginAction(
-  plugin: BasePlugin,
+  plugin: {
+    actions?: Record<string, PluginAction<JsonValue, JsonValue>>;
+  },
   actionName: string,
 ): PluginAction<JsonValue, JsonValue> | null {
   const key = String(actionName || "").trim();
   if (!key) return null;
-  return plugin.actions[key] || null;
+  return plugin.actions?.[key] || null;
 }
 
 /**
- * 执行一个主动型 plugin action。
+ * 执行一个 plugin action。
  */
 export async function invokePluginAction(params: {
-  plugin: BasePlugin;
+  pluginName: string;
   actionName: string;
   payload?: JsonValue;
   context: AgentContext;
 }): Promise<PluginActionResult<JsonValue>> {
-  const action = resolvePluginAction(params.plugin, params.actionName);
-  if (!action) {
-    return {
-      success: false,
-      error: `Plugin "${params.plugin.name}" does not implement action "${params.actionName}"`,
-    };
-  }
-
-  try {
-    const payload = (params.payload ?? {}) as JsonValue;
-    const schema = action.input_schema?.zod;
-    const parsed_payload = schema ? schema.safeParse(payload) : null;
-    if (parsed_payload && !parsed_payload.success) {
-      return {
-        success: false,
-        error: `Invalid payload for ${params.plugin.name}.${params.actionName}: ${parsed_payload.error.message}`,
-      };
-    }
-    const input_payload = parsed_payload?.success
-      ? parsed_payload.data as JsonValue
-      : payload;
-    return await action.execute({
-      context: params.context,
-      payload: input_payload,
-      input: input_payload,
-      pluginName: params.plugin.name,
-      actionName: params.actionName,
-    });
-  } catch (error) {
-    return {
-      success: false,
-      error: String(error),
-    };
-  }
-}
-
-function toControlCommandAction(
-  command: string,
-): PluginStateControlAction | null {
-  if (
-    command === "status" ||
-    command === "start" ||
-    command === "stop" ||
-    command === "restart"
-  ) {
-    return command;
-  }
-  return null;
+  return await params.context.plugins.runAction({
+    plugin: params.pluginName,
+    action: params.actionName,
+    payload: params.payload,
+  });
 }
 
 async function schedulePluginAction(params: {
-  plugin: BasePlugin;
+  pluginName: string;
   command: string;
   payload?: JsonValue;
   schedule: JsonValue | PluginActionScheduleInput;
@@ -116,7 +66,7 @@ async function schedulePluginAction(params: {
     const store = new ActionScheduleStore(params.context.rootPath);
     try {
       const job = store.createJob({
-        pluginName: params.plugin.name,
+        pluginName: params.pluginName,
         actionName: params.command,
         payload: params.payload ?? null,
         runAtMs,
@@ -144,7 +94,7 @@ async function schedulePluginAction(params: {
 }
 
 /**
- * 统一执行主动型 plugin command。
+ * 统一执行 plugin command。
  */
 export async function runPluginCommand(params: {
   pluginName: string;
@@ -153,104 +103,74 @@ export async function runPluginCommand(params: {
   schedule?: JsonValue | PluginActionScheduleInput;
   context: AgentContext;
 }): Promise<PluginCommandResult & { plugin?: PluginStateSnapshot }> {
-  const plugin = resolvePluginByName(params.pluginName, {
-    context: params.context,
-  });
-  if (!plugin) {
+  const pluginName = String(params.pluginName || "").trim();
+  const command = String(params.command || "")
+    .trim()
+    .toLowerCase();
+  const plugin = params.context.plugins.get(pluginName);
+  const snapshot = params.context.plugins.status(pluginName) || undefined;
+
+  if (!plugin || !snapshot) {
     return {
       success: false,
       message: `Unknown plugin: ${params.pluginName}`,
     };
   }
 
-  const record = ensurePluginStateRecord(plugin);
-  const command = String(params.command || "")
-    .trim()
-    .toLowerCase();
   if (!command) {
     return {
       success: false,
-      plugin: toPluginStateSnapshot(record, plugin),
+      plugin: snapshot,
       message: "command is required",
     };
   }
 
-  markPluginCommand(record, command);
+  if (command === "status") {
+    return {
+      success: true,
+      plugin: snapshot,
+    };
+  }
 
   const action = resolvePluginAction(plugin, command);
   if (params.schedule !== undefined && params.schedule !== null) {
     if (!action) {
       return {
         success: false,
-        plugin: toPluginStateSnapshot(record, plugin),
+        plugin: snapshot,
         message: `Scheduling only supports plugin actions. "${plugin.name}.${command}" is not a schedulable action.`,
       };
     }
 
     return await schedulePluginAction({
-      plugin,
+      pluginName: plugin.name,
       command,
       payload: params.payload,
       schedule: params.schedule,
-      recordSnapshot: toPluginStateSnapshot(record, plugin),
+      recordSnapshot: snapshot,
       context: params.context,
     });
   }
 
   if (action) {
-    if (record.state !== "running") {
-      return {
-        success: false,
-        plugin: toPluginStateSnapshot(record, plugin),
-        message: `Plugin "${plugin.name}" is not running`,
-      };
-    }
-
-    const result = await invokePluginAction({
-      plugin,
-      actionName: command,
+    const result = await params.context.plugins.runAction({
+      plugin: plugin.name,
+      action: command,
       payload: params.payload,
-      context: params.context,
     });
 
-    if (!result.success) {
-      return {
-        success: false,
-        plugin: toPluginStateSnapshot(record, plugin),
-        message: result.error || "plugin action failed",
-      };
-    }
-
-    return {
-      success: true,
-      plugin: toPluginStateSnapshot(record, plugin),
-      ...(result.data !== undefined ? { data: result.data } : {}),
-    };
-  }
-
-  const controlAction = toControlCommandAction(command);
-  if (controlAction) {
-    const result = await controlPluginState({
-      pluginName: plugin.name,
-      action: controlAction,
-      context: params.context,
-    });
     return {
       success: result.success,
-      ...(result.plugin ? { plugin: result.plugin } : {}),
-      ...(result.error ? { message: result.error } : {}),
-    };
-  }
-
-  if (record.state !== "running") {
-    return {
-      success: false,
-      plugin: toPluginStateSnapshot(record, plugin),
-      message: `Plugin "${plugin.name}" is not running`,
+      plugin: params.context.plugins.status(plugin.name) || snapshot,
+      ...(result.message || result.error
+        ? { message: result.message || result.error }
+        : {}),
+      ...(result.data !== undefined ? { data: result.data } : {}),
+      ...(result.error ? { error: result.error } : {}),
     };
   }
 
-  const handler = resolveLifecycle(plugin)?.command;
+  const handler = plugin.lifecycle?.command;
   if (handler) {
     try {
       const result = await handler({
@@ -260,13 +180,12 @@ export async function runPluginCommand(params: {
       });
       return {
         ...result,
-        plugin: toPluginStateSnapshot(record, plugin),
+        plugin: params.context.plugins.status(plugin.name) || snapshot,
       };
     } catch (error) {
-      markPluginState(record, "error", String(error));
       return {
         success: false,
-        plugin: toPluginStateSnapshot(record, plugin),
+        plugin: params.context.plugins.status(plugin.name) || snapshot,
         message: String(error),
       };
     }
@@ -274,7 +193,7 @@ export async function runPluginCommand(params: {
 
   return {
     success: false,
-    plugin: toPluginStateSnapshot(record, plugin),
+    plugin: snapshot,
     message: `Plugin "${plugin.name}" does not implement command "${command}"`,
   };
 }

package/src/plugin/core/PluginCatalog.ts

@@ -7,7 +7,6 @@
  * - Agent 的视角只有“传入的 plugin”，目录视图和可用性检查都从这些实例推导。
  */
 
-import { isPluginEnabled } from "@/plugin/core/Activation.js";
 import type {
   Plugin,
   PluginAvailability,
@@ -90,7 +89,7 @@ export function listPluginViews(plugins: Iterable<Plugin>): PluginView[] {
  *
  * 关键点（中文）
  * - 传入 context 时会调用 plugin 自己的 availability。
- * - 未传 context 时只做静态启用态检查，适合 Console 或 CLI 的目录回退展示。
+ * - 未传 context 时只返回静态目录说明，适合 Console 或 CLI 的目录回退展示。
  */
 export async function resolvePluginAvailability(params: {
   plugins: Iterable<Plugin>;
@@ -111,18 +110,6 @@ export async function resolvePluginAvailability(params: {
     return await plugin.availability(params.context);
   }
 
-  const enabled = isPluginEnabled({
-    plugin,
-    ...(params.context ? { context: params.context } : {}),
-  });
-  if (!enabled) {
-    return {
-      enabled: false,
-      available: false,
-      reasons: [`Plugin "${plugin.name}" is disabled`],
-    };
-  }
-
   const agentReason = String(params.agentError || "").trim();
   if (agentReason || !params.context) {
     return {
@@ -158,15 +145,6 @@ export function buildStaticPluginAvailability(params: {
     };
   }
 
-  const enabled = isPluginEnabled({ plugin });
-  if (!enabled) {
-    return {
-      enabled: false,
-      available: false,
-      reasons: [`Plugin "${plugin.name}" is disabled`],
-    };
-  }
-
   const agentReason = String(params.agentError || "").trim();
   return {
     enabled: true,

package/src/plugin/core/PluginLocalExecution.ts

@@ -4,18 +4,18 @@
  * 关键点（中文）
  * - 这里不创建或维护任何全局注册表，调用方必须显式传入 plugin 集合。
  * - 用于 CLI / 控制面这类没有运行中 Agent 实例、但需要执行 setup action 的场景。
- * - 真正运行中的 Agent 仍应优先使用 `PluginRegistry.runAction`。
+ * - 真正运行中的 Agent 仍应优先使用 `Agent.plugins.runAction`。
  */
 
 import path from "node:path";
 import { logger as defaultLogger } from "@/utils/logger/Logger.js";
-import { loadDowncityConfig, resolveAgentEnv } from "@/config/Config.js";
-import { isPluginEnabled } from "@/plugin/core/Activation.js";
+import { resolveAgentEnv } from "@/config/Config.js";
 import { findPluginByName } from "@/plugin/core/PluginCatalog.js";
 import {
   createAgentPathRuntime,
   createAgentPluginConfigRuntime,
 } from "@/agent/local/AgentRuntimeAssembly.js";
+import { createFallbackSdkConfig } from "@/agent/local/AgentInstructions.js";
 import type { JsonValue } from "@/types/common/Json.js";
 import type {
   Plugin,
@@ -24,14 +24,28 @@ import type {
   PluginCommandContext,
 } from "@/plugin/types/Plugin.js";
 import type { AgentContext } from "@/types/runtime/agent/AgentContext.js";
+import type { DowncityConfig } from "@/types/config/DowncityConfig.js";
+
+type LocalPluginCommandContextInput = {
+  /** 当前项目根目录。 */
+  projectRoot: string;
+  /** 宿主显式传入的 agent 配置。 */
+  config?: DowncityConfig;
+};
 
 /**
  * 创建本地 plugin 命令上下文。
  */
-export function createLocalPluginCommandContext(projectRoot: string): PluginCommandContext {
+export function createLocalPluginCommandContext(
+  input: string | LocalPluginCommandContextInput,
+): PluginCommandContext {
+  const projectRoot = typeof input === "string" ? input : input.projectRoot;
   const rootPath = path.resolve(String(projectRoot || "").trim() || ".");
   const env = resolveAgentEnv(rootPath);
-  const config = loadDowncityConfig(rootPath);
+  const config = typeof input === "string" || !input.config
+    ? createFallbackSdkConfig(path.basename(rootPath) || "agent")
+    : input.config;
+  const agent_id = String(config.id || "").trim() || path.basename(rootPath) || "agent";
 
   defaultLogger.bindProjectRoot(rootPath);
 
@@ -43,7 +57,7 @@ export function createLocalPluginCommandContext(projectRoot: string): PluginComm
     env,
     paths: createAgentPathRuntime(
       rootPath,
-      String(config.id || "").trim() || path.basename(rootPath) || "agent",
+      agent_id,
     ),
     pluginConfig: createAgentPluginConfigRuntime(rootPath),
   };
@@ -56,6 +70,7 @@ export async function getLocalPluginAvailability(params: {
   plugins: Iterable<Plugin>;
   projectRoot: string;
   pluginName: string;
+  config?: DowncityConfig;
 }): Promise<PluginAvailability> {
   const plugin = findPluginByName(params.plugins, params.pluginName);
   if (!plugin) {
@@ -66,20 +81,14 @@ export async function getLocalPluginAvailability(params: {
     };
   }
 
-  const context = createLocalPluginCommandContext(params.projectRoot);
+  const context = createLocalPluginCommandContext({
+    projectRoot: params.projectRoot,
+    config: params.config,
+  });
   if (plugin.availability) {
     return await plugin.availability(context);
   }
 
-  const enabled = isPluginEnabled({ plugin, context });
-  if (!enabled) {
-    return {
-      enabled: false,
-      available: false,
-      reasons: [`Plugin "${plugin.name}" is disabled`],
-    };
-  }
-
   return {
     enabled: true,
     available: true,
@@ -96,6 +105,7 @@ export async function runLocalPluginAction(params: {
   pluginName: string;
   actionName: string;
   payload?: JsonValue;
+  config?: DowncityConfig;
 }): Promise<PluginActionResult<JsonValue>> {
   const plugin = findPluginByName(params.plugins, params.pluginName);
   if (!plugin) {
@@ -124,15 +134,10 @@ export async function runLocalPluginAction(params: {
     };
   }
 
-  const context = createLocalPluginCommandContext(params.projectRoot);
-  const enabled = isPluginEnabled({ plugin, context });
-  if (!enabled && action.allowWhenDisabled !== true) {
-    return {
-      success: false,
-      error: `Plugin "${plugin.name}" is disabled`,
-      message: `Plugin "${plugin.name}" is disabled`,
-    };
-  }
+  const context = createLocalPluginCommandContext({
+    projectRoot: params.projectRoot,
+    config: params.config,
+  });
 
   try {
     const payload = (params.payload ?? {}) as JsonValue;