@downcity/agent 1.1.207 → 1.1.210

package/src/index.ts

@@ -16,22 +16,15 @@ export {
   inferAgentModelLabel,
   normalizeAgentModel,
 } from "./model/CityModelAdapter.js";
+export type { AgentModel } from "./model/CityModelAdapter.js";
 export type {
   AgentArchiveSessionInput,
   AgentArchiveSessionsInput,
   AgentArchiveSessionResult,
   AgentArchiveSessionsResult,
   AgentCleanArchiveResult,
-  AgentSessions,
-  AgentModel,
-  AgentManagedSession,
-  AgentSessionActor,
-  AgentSession,
-  AgentSessionConstructor,
   AgentCreateSessionInput,
   AgentListSessionsInput,
-  AgentOptions,
-  RemoteAgentOptions,
   AgentSessionConfigSnapshot,
   AgentSessionForkInput,
   AgentSessionRecordsInput,
@@ -46,10 +39,23 @@ export type {
   AgentSessionSystemSessionInfo,
   AgentSessionSystemSnapshot,
   AgentSessionTimelineEvent,
+} from "./types/agent/SessionTypes.js";
+export type {
+  AgentOptions,
+  AgentSessionConstructor,
+} from "./types/agent/AgentOptions.js";
+export type {
+  AgentSession,
+  AgentSessionActor,
+  AgentSessions,
+  RemoteAgentSession,
+} from "./types/agent/SessionActor.js";
+export type { AgentManagedSession } from "./types/session/SessionOptions.js";
+export type { RemoteAgentOptions } from "./types/agent/RemoteAgentOptions.js";
+export type {
   RemoteAgentPluginActionInput,
   RemoteAgentPluginActionResult,
-  RemoteAgentSession,
-} from "./types/agent/AgentTypes.js";
+} from "./types/agent/RemoteAgentPluginAction.js";
 export type {
   AgentSessionEvent,
   AgentSessionSubscriber,
@@ -91,7 +97,10 @@ export type {
 export { Executor } from "./executor/Executor.js";
 export {
   drainDeferredPersistedUserMessages,
+  drainInjectedUserMessages,
+  getSessionRunContext,
   getSessionRunScope,
+  withSessionRunScope,
 } from "./executor/SessionRunScope.js";
 export { JsonlSessionHistoryComposer } from "./executor/composer/history/jsonl/JsonlSessionHistoryComposer.js";
 export { LocalSessionContextComposer } from "./executor/composer/context/LocalSessionContextComposer.js";
@@ -110,6 +119,27 @@ export type {
   SessionHistoryPrepareInput,
 } from "./executor/composer/history/SessionHistoryComposer.js";
 export type { SessionSystemComposer } from "./executor/composer/system/SessionSystemComposer.js";
+export { DefaultSessionSystemComposer } from "./executor/composer/system/default/DefaultSessionSystemComposer.js";
+export { resolveSessionSystemMessages } from "./executor/composer/system/default/SystemDomain.js";
+export type { SessionHistoryStore } from "./executor/store/history/SessionHistoryStore.js";
+export type { SessionExecutor } from "./executor/types/SessionExecutor.js";
+export type {
+  SessionAssistantStepCallback,
+  SessionRunResult,
+} from "./executor/types/SessionRun.js";
+export type { SessionRunContext } from "./types/executor/SessionRunContext.js";
+export type {
+  SessionActionRecordV1,
+  SessionMessageRecordV1,
+  SessionMetadataV1,
+  SessionRecordV1,
+  SessionUserMessageV1,
+} from "./executor/types/SessionRecords.js";
+export {
+  is_session_action_record,
+  is_session_message_record,
+} from "./executor/types/SessionRecords.js";
+export type { SessionSystemMessage } from "./executor/types/SessionPrompts.js";
 export type {
   SessionComposerFactoryContext,
   SessionComposerInput,
@@ -152,6 +182,18 @@ export {
   pickLastSuccessfulChatSendText,
   resolveAssistantMessageForPersistence,
 } from "./executor/messages/UserVisibleText.js";
+export { extractToolCallsFromUiMessage } from "./executor/messages/UIMessageTransformer.js";
+export {
+  buildChatMessageText,
+  parseChatMessageMarkup,
+  renderChatMessageFileTag,
+} from "./executor/messages/ChatMessageMarkup.js";
+export type {
+  ChatMessageFileTag,
+  ChatMessageFileType,
+  ChatMessageSegment,
+  ChatMessageSendOptions,
+} from "./executor/messages/ChatMessageMarkupTypes.js";
 
 // 项目与配置集成
 export {
@@ -160,6 +202,14 @@ export {
   normalizeDefaultAgentId,
 } from "./config/AgentInitializer.js";
 export { loadDowncityConfig } from "./config/Config.js";
+export {
+  getDowncityChatHistoryPath,
+  getDowncitySessionMessagesPath,
+} from "./config/Paths.js";
+export {
+  getPlatformStoreDbPath,
+  getPlatformStoreKeyPath,
+} from "./config/PlatformPaths.js";
 export {
   ensureRuntimeProjectReady,
 } from "./agent/local/ProjectSetup.js";
@@ -167,6 +217,11 @@ export { assertProjectExecutionTarget } from "./config/ExecutionBinding.js";
 
 // 日志
 export { getLogger, logger, type Logger } from "./utils/logger/Logger.js";
+export { generateId } from "./utils/Id.js";
+export {
+  formatDateTimeInTimezone,
+  resolveRuntimeTimezone,
+} from "./utils/Time.js";
 
 // 宿主端口类型
 export type {
@@ -231,7 +286,6 @@ export type {
 
 // Plugin 作者与控制面类型
 export type {
-  Plugin,
   PluginAction,
   PluginActionApi,
   PluginActionCommand,
@@ -241,27 +295,39 @@ export type {
   PluginActionMetadata,
   PluginActionResult,
   PluginActions,
+  PluginActionInvokeParams,
+  PluginActionInvokePort,
+  PluginActionInvokeResult,
+} from "./types/plugin/PluginAction.js";
+export type { Plugin } from "./types/plugin/PluginDefinition.js";
+export type {
+  PluginCommandResult,
+  PluginLifecycle,
+} from "./types/plugin/PluginCommand.js";
+export type {
+  AgentPlugins,
   PluginAvailability,
   PluginConfigDefinition,
   PluginEffectHook,
   PluginGuardHook,
   PluginHooks,
-  PluginHttpDefinition,
   PluginPipelineHook,
-  AgentPlugins,
+  PluginResolves,
   PluginResolveHook,
+  PluginView,
+} from "./types/plugin/PluginRuntime.js";
+export type {
+  PluginHttpDefinition,
   PluginHttpRegistration,
-  PluginActionInvokeParams,
-  PluginActionInvokePort,
-  PluginActionInvokeResult,
+} from "./types/plugin/PluginHttp.js";
+export type {
   PluginSetupDefinition,
   PluginSetupField,
   PluginSetupFieldOption,
   PluginUsageDefinition,
   PluginUsageField,
   PluginUsageFieldOption,
-  PluginView,
-} from "./plugin/types/Plugin.js";
+} from "./types/plugin/PluginSetup.js";
 export type {
   PluginActionResponse,
   PluginCatalogResponse,
@@ -270,11 +336,7 @@ export type {
 } from "./plugin/types/PluginApi.js";
 
 // 主动型 plugin 与 CLI/control 协议类型
-export type {
-  PluginCommandResult,
-  PluginLifecycle,
-  PluginState,
-} from "./plugin/types/Plugin.js";
+export type { PluginState, PluginSnapshot } from "./types/plugin/PluginState.js";
 export type {
   ActionScheduleJobRecord,
   ActionScheduleJobStatus,
@@ -287,13 +349,22 @@ export type {
   PluginControlAction,
   PluginControlResponse,
   PluginStateListResponse,
-  PluginStateView,
-} from "./plugin/types/Plugins.js";
+} from "./types/plugin/PluginControl.js";
+export type { PluginControlResult } from "./types/plugin/PluginState.js";
+export {
+  controlPluginState,
+  listPluginStates,
+} from "./plugin/core/PluginStateController.js";
+export { runPluginCommand } from "./plugin/core/PluginActionRunner.js";
+export { parsePluginCommandRequestBody } from "./plugin/core/PluginCommandRequest.js";
+
+// 跨包 RPC 与 session 标识协议
 export type {
-  PluginStateControlAction,
-  PluginStateControlResult,
-  PluginStateSnapshot,
-} from "./plugin/core/Manager.js";
+  RpcEventFrame,
+  RpcRequest,
+  RpcServerFrame,
+} from "./types/rpc/RpcProtocol.js";
+export { resolveSessionId } from "./executor/ids/resolveSessionId.js";
 
 // Platform store 类型
 export type {

package/src/plugin/core/ActionScheduleExecutor.ts

@@ -9,7 +9,7 @@
 
 import type { AgentContext } from "@/types/runtime/agent/AgentContext.js";
 import type { ActionScheduleStore } from "@/plugin/core/ActionScheduleStore.js";
-import { runPluginCommand } from "@/plugin/core/Manager.js";
+import { runPluginCommand } from "@/plugin/core/PluginActionRunner.js";
 
 /**
  * 执行当前已到点的 pending 任务。

package/src/plugin/core/BasePlugin.ts

@@ -8,38 +8,26 @@
  */
 
 import type { AgentContext } from "@/types/runtime/agent/AgentContext.js";
+import type { Plugin } from "@/types/plugin/PluginDefinition.js";
+import type { PluginActions } from "@/types/plugin/PluginAction.js";
+import type { PluginCommandContext, PluginLifecycle } from "@/types/plugin/PluginCommand.js";
 import type {
-  Plugin,
-  PluginActions,
   PluginAvailability,
-  PluginCommandContext,
   PluginConfigDefinition,
   PluginHooks,
-  PluginHttpDefinition,
-  PluginLifecycle,
   PluginResolves,
+} from "@/types/plugin/PluginRuntime.js";
+import type { PluginHttpDefinition } from "@/types/plugin/PluginHttp.js";
+import type {
   PluginSetupDefinition,
   PluginUsageDefinition,
-} from "@/plugin/types/Plugin.js";
-import type { PluginRuntimeRecord } from "@/types/plugin/PluginState.js";
+} from "@/types/plugin/PluginSetup.js";
 import type { StructuredConfig } from "@/types/runtime/agent/AgentContext.js";
 
 /**
  * BasePlugin 抽象基类。
  */
 export abstract class BasePlugin implements Plugin {
-  /**
-   * 当前实例持有的 plugin 注册状态记录。
-   */
-  public readonly pluginStateRecord: PluginRuntimeRecord = {
-    plugin: this,
-    state: "ready",
-    registered_at: Date.now(),
-    updated_at: Date.now(),
-    chain: Promise.resolve(),
-    lifecycle_started: false,
-  };
-
   /**
    * 当前 plugin 名称。
    */
@@ -90,9 +78,7 @@ export abstract class BasePlugin implements Plugin {
    */
   readonly http?: PluginHttpDefinition;
 
-  /**
-   * 生命周期兼容层。
-   */
+  /** Plugin 生命周期钩子。 */
   lifecycle?: PluginLifecycle;
 
   /**

package/src/plugin/core/HookRegistry.ts

@@ -12,7 +12,7 @@ import type {
   PluginGuardHook,
   PluginPipelineHook,
   PluginResolveHook,
-} from "@/plugin/types/Plugin.js";
+} from "@/types/plugin/PluginRuntime.js";
 import type { AgentContext } from "@/types/runtime/agent/AgentContext.js";
 
 type ContextResolver = () => AgentContext;

package/src/plugin/core/PluginActionFactory.ts

@@ -56,8 +56,6 @@ export interface CreatePluginActionOptions<
   input_schema?: z.ZodTypeAny | PluginActionInputSchema<P>;
   /** Action 调用示例。 */
   examples?: PluginActionExample<P>[];
-  /** disabled 状态下是否仍允许执行。 */
-  allowWhenDisabled?: boolean;
   /** CLI 定义。 */
   command?: PluginActionCommand<P>;
   /** HTTP 定义。 */
@@ -68,8 +66,6 @@ export interface CreatePluginActionOptions<
     context: AgentContext;
     /** 已通过 schema 校验后的输入。 */
     input: P;
-    /** 兼容旧命名的 payload。 */
-    payload: P;
     /** 当前插件名称。 */
     pluginName: string;
     /** 当前 Action 名称。 */
@@ -101,7 +97,7 @@ export interface CreatePluginOptions<TActions extends PluginActions> {
   resolves?: PluginResolves;
   /** Plugin system 文本构建器。 */
   system?: (context: AgentContext) => string | Promise<string>;
-  /** 旧生命周期兼容定义。 */
+  /** Plugin 生命周期定义。 */
   lifecycle?: PluginLifecycle;
   /** Plugin 可用性检查。 */
   availability?: (
@@ -148,9 +144,6 @@ export function createAction(
       ? { input_schema: normalize_input_schema(options.input_schema) }
       : {}),
     ...(options.examples ? { examples: options.examples } : {}),
-    ...(typeof options.allowWhenDisabled === "boolean"
-      ? { allowWhenDisabled: options.allowWhenDisabled }
-      : {}),
     ...(options.command ? { command: options.command } : {}),
     ...(options.api ? { api: options.api } : {}),
     execute: options.execute,

package/src/plugin/core/PluginActionRunner.ts

@@ -1,19 +1,16 @@
 /**
- * PluginActionRunner：plugin command/action 兼容执行模块。
+ * PluginActionRunner：plugin command/action 执行模块。
  *
  * 关键点（中文）
  * - 新模型中注册即生效，不再要求 plugin 处于 running 状态。
- * - `command` 仅作为 CLI/RPC 对 action 的兼容入口；优先执行同名 action。
+ * - CLI/RPC command 优先解析为同名 action，再处理 plugin 自定义命令。
  * - 延迟调度仍复用本模块，保证 schedule 到点后走统一 action 规则。
  */
 
 import type { AgentContext } from "@/types/runtime/agent/AgentContext.js";
-import type {
-  PluginAction,
-  PluginActionResult,
-  PluginCommandResult,
-  PluginStateSnapshot,
-} from "@/plugin/types/Plugin.js";
+import type { PluginAction, PluginActionResult } from "@/types/plugin/PluginAction.js";
+import type { PluginCommandResult } from "@/types/plugin/PluginCommand.js";
+import type { PluginSnapshot } from "@/types/plugin/PluginState.js";
 import type { PluginActionScheduleInput } from "@/plugin/types/ActionSchedule.js";
 import type { JsonValue } from "@/types/common/Json.js";
 import { ActionScheduleStore } from "@/plugin/core/ActionScheduleStore.js";
@@ -54,9 +51,9 @@ async function schedulePluginAction(params: {
   command: string;
   payload?: JsonValue;
   schedule: JsonValue | PluginActionScheduleInput;
-  recordSnapshot: PluginStateSnapshot;
+  recordSnapshot: PluginSnapshot;
   context: AgentContext;
-}): Promise<PluginCommandResult & { plugin?: PluginStateSnapshot }> {
+}): Promise<PluginCommandResult & { plugin?: PluginSnapshot }> {
   try {
     const scheduleInput = params.schedule as Partial<PluginActionScheduleInput>;
     const runAtMs = normalizeRunAtMsOrThrow(
@@ -102,7 +99,7 @@ export async function runPluginCommand(params: {
   payload?: JsonValue;
   schedule?: JsonValue | PluginActionScheduleInput;
   context: AgentContext;
-}): Promise<PluginCommandResult & { plugin?: PluginStateSnapshot }> {
+}): Promise<PluginCommandResult & { plugin?: PluginSnapshot }> {
   const pluginName = String(params.pluginName || "").trim();
   const command = String(params.command || "")
     .trim()

package/src/plugin/core/PluginCatalog.ts

@@ -7,11 +7,8 @@
  * - Agent 的视角只有“传入的 plugin”，目录视图和可用性检查都从这些实例推导。
  */
 
-import type {
-  Plugin,
-  PluginAvailability,
-  PluginView,
-} from "@/plugin/types/Plugin.js";
+import type { Plugin } from "@/types/plugin/PluginDefinition.js";
+import type { PluginAvailability, PluginView } from "@/types/plugin/PluginRuntime.js";
 import type { AgentContext } from "@/types/runtime/agent/AgentContext.js";
 
 /**

package/src/plugin/core/PluginCommand.ts

@@ -9,7 +9,8 @@
 import path from "node:path";
 import type { Command } from "commander";
 import type { JsonObject, JsonValue } from "@/types/common/Json.js";
-import type { Plugin, PluginAction } from "@/plugin/types/Plugin.js";
+import type { Plugin } from "@/types/plugin/PluginDefinition.js";
+import type { PluginAction } from "@/types/plugin/PluginAction.js";
 import { runLocalPluginAction } from "@/plugin/core/PluginLocalExecution.js";
 import { printResult } from "@/utils/cli/CliOutput.js";
 

package/src/plugin/core/PluginHttpRoutes.ts

@@ -7,7 +7,7 @@
  */
 
 import type { Hono } from "hono";
-import type { Plugin } from "@/plugin/types/Plugin.js";
+import type { Plugin } from "@/types/plugin/PluginDefinition.js";
 import type { AgentContext } from "@/types/runtime/agent/AgentContext.js";
 import type { AuthRoutePolicy } from "@/types/runtime/auth/AuthRoute.js";
 

package/src/plugin/core/PluginLocalExecution.ts

@@ -17,12 +17,10 @@ import {
 } from "@/agent/local/AgentRuntimeAssembly.js";
 import { createFallbackSdkConfig } from "@/agent/local/AgentInstructions.js";
 import type { JsonValue } from "@/types/common/Json.js";
-import type {
-  Plugin,
-  PluginActionResult,
-  PluginAvailability,
-  PluginCommandContext,
-} from "@/plugin/types/Plugin.js";
+import type { Plugin } from "@/types/plugin/PluginDefinition.js";
+import type { PluginActionResult } from "@/types/plugin/PluginAction.js";
+import type { PluginCommandContext } from "@/types/plugin/PluginCommand.js";
+import type { PluginAvailability } from "@/types/plugin/PluginRuntime.js";
 import type { AgentContext } from "@/types/runtime/agent/AgentContext.js";
 import type { DowncityConfig } from "@/types/config/DowncityConfig.js";
 
@@ -155,7 +153,6 @@ export async function runLocalPluginAction(params: {
       : payload;
     return await action.execute({
       context: context as unknown as AgentContext,
-      payload: input_payload,
       input: input_payload,
       pluginName: plugin.name,
       actionName,

package/src/plugin/core/PluginRegistry.ts

@@ -9,16 +9,16 @@
 
 import { toPluginView } from "@/plugin/core/PluginCatalog.js";
 import type { HookRegistry } from "@/plugin/core/HookRegistry.js";
+import type { Plugin } from "@/types/plugin/PluginDefinition.js";
+import type { PluginActionResult } from "@/types/plugin/PluginAction.js";
 import type {
-  Plugin,
-  PluginActionResult,
   AgentPlugins,
   PluginAvailability,
   PluginActionReadView,
   PluginReadView,
   PluginView,
-} from "@/plugin/types/Plugin.js";
-import type { AgentSessionSystemBlock } from "@/types/agent/AgentTypes.js";
+} from "@/types/plugin/PluginRuntime.js";
+import type { AgentSessionSystemBlock } from "@/types/agent/SessionTypes.js";
 import type { AgentContext } from "@/types/runtime/agent/AgentContext.js";
 import type { JsonValue } from "@/types/common/Json.js";
 import type {
@@ -56,11 +56,9 @@ function to_plugin_snapshot(record: PluginRuntimeRecord): PluginSnapshot {
     title: String(plugin.title || plugin.name || "").trim(),
     description: String(plugin.description || "").trim(),
     status: record.state,
-    state: record.state,
     registered_at: record.registered_at,
     updated_at: record.updated_at,
-    updatedAt: record.updated_at,
-    ...(last_error ? { last_error, lastError: last_error } : {}),
+    ...(last_error ? { last_error } : {}),
   };
 }
 
@@ -190,7 +188,11 @@ export class PluginRegistry implements AgentPlugins {
   async startAll(): Promise<PluginSnapshot[]> {
     const snapshots: PluginSnapshot[] = [];
     for (const record of this.records.values()) {
-      await this.start_record(record);
+      try {
+        await this.start_record(record);
+      } catch {
+        // 关键点（中文）：单个 plugin 启动失败只影响自身，不能阻断其他 plugin 与 Agent ready。
+      }
       snapshots.push(to_plugin_snapshot(record));
     }
     return snapshots;
@@ -367,7 +369,6 @@ export class PluginRegistry implements AgentPlugins {
         ? { input_schema: action.input_schema.json_schema }
         : {}),
       ...(action.examples ? { examples: action.examples } : {}),
-      allow_when_disabled: action.allowWhenDisabled === true,
       has_command: Boolean(action.command),
       has_api: Boolean(action.api),
     };
@@ -517,7 +518,6 @@ export class PluginRegistry implements AgentPlugins {
       }
       const result = await action.execute({
         context: this.contextResolver(),
-        payload: parsed_payload.input,
         input: parsed_payload.input,
         pluginName: record.plugin.name,
         actionName,

package/src/plugin/core/PluginStateController.ts

@@ -1,47 +1,35 @@
 /**
- * Plugin 注册状态兼容控制模块。
+ * Plugin 注册状态控制模块。
  *
  * 关键点（中文）
  * - 新模型中 plugin 只有注册 / 卸载，不再暴露 start / stop / restart。
- * - 该模块保留旧内部函数名，方便 RPC、CLI 与内建 plugin 渐进迁移。
+ * - 控制动作与类型协议保持一致，只支持状态查询和卸载。
  */
 
 import type { AgentContext } from "@/types/runtime/agent/AgentContext.js";
 import type {
-  PluginStateControlAction,
-  PluginStateControlResult,
-  PluginStateSnapshot,
-} from "@/plugin/types/Plugin.js";
+  PluginControlAction,
+  PluginControlResult,
+  PluginSnapshot,
+} from "@/types/plugin/PluginState.js";
 
 /**
  * 列出当前 Agent 已注册 plugin 快照。
  */
 export function listPluginStates(input?: {
   context?: AgentContext;
-}): PluginStateSnapshot[] {
+}): PluginSnapshot[] {
   return input?.context?.plugins.snapshots() || [];
 }
 
 /**
- * 判断指定 plugin 是否已注册且 ready。
- */
-export function isPluginRunning(
-  pluginName: string,
-  input?: {
-    context?: AgentContext;
-  },
-): boolean {
-  return input?.context?.plugins.status(pluginName)?.status === "ready";
-}
-
-/**
- * 执行兼容 plugin 控制动作。
+ * 执行 plugin 控制动作。
  */
 export async function controlPluginState(params: {
   pluginName: string;
-  action: PluginStateControlAction;
+  action: PluginControlAction;
   context: AgentContext;
-}): Promise<PluginStateControlResult> {
+}): Promise<PluginControlResult> {
   const pluginName = String(params.pluginName || "").trim();
   if (!pluginName) {
     return {
@@ -51,14 +39,14 @@ export async function controlPluginState(params: {
   }
 
   const action = String(params.action || "").trim().toLowerCase();
-  if (action === "status" || action === "start" || action === "restart") {
+  if (action === "status") {
     const plugin = params.context.plugins.status(pluginName);
     return plugin
       ? { success: true, plugin }
       : { success: false, error: `Unknown plugin: ${pluginName}` };
   }
 
-  if (action === "unregister" || action === "stop") {
+  if (action === "unregister") {
     const plugin = params.context.plugins.status(pluginName) || undefined;
     const success = await params.context.plugins.unregister(pluginName);
     return success
@@ -71,39 +59,3 @@ export async function controlPluginState(params: {
     error: `Unsupported plugin control action: ${params.action}`,
   };
 }
-
-/**
- * 启动当前上下文中全部已挂载 plugin。
- */
-export async function startAllPlugins(context: AgentContext): Promise<{
-  success: boolean;
-  results: PluginStateControlResult[];
-}> {
-  const snapshots = await context.plugins.startAll();
-  return {
-    success: snapshots.every((item) => item.status === "ready"),
-    results: snapshots.map((plugin) => ({
-      success: plugin.status === "ready",
-      plugin,
-      ...(plugin.last_error ? { error: plugin.last_error } : {}),
-    })),
-  };
-}
-
-/**
- * 卸载当前上下文中全部 plugin。
- */
-export async function stopAllPlugins(context: AgentContext): Promise<{
-  success: boolean;
-  results: PluginStateControlResult[];
-}> {
-  const snapshots = context.plugins.snapshots();
-  await context.plugins.unregisterAll();
-  return {
-    success: true,
-    results: snapshots.map((plugin) => ({
-      success: true,
-      plugin,
-    })),
-  };
-}