@downcity/agent 1.1.287 → 1.1.310

package/src/index.ts

@@ -2,19 +2,40 @@
  * @downcity/agent — Agent 运行时公开 API。
  *
  * 关键点（中文）
- * - 这是 agent 包唯一稳定的公开入口。
+ * - 这是 agent 包核心运行时的稳定公开入口；可选 Tool 通过 `@downcity/agent/tools` 导出。
  * - 只导出 Agent、plugin 作者 API、city 运行集成 API 与跨包协议类型。
  * - HTTP router、sandbox runner、内部 plugin runtime runner 等实现细节不从根入口暴露。
  */
 
 // Agent 入口
 export { Agent } from "./agent/Agent.js";
+export { Workspace } from "./workspace/Workspace.js";
+export type { AgentStore } from "./types/store/AgentStore.js";
+export type {
+  CompactActiveMessagesInput,
+  CompactActiveMessagesResult,
+  SessionMessageCommitState,
+  SessionMessageStore,
+  SessionStore,
+} from "./types/store/SessionStore.js";
+export { create_session_message_store } from "./workspace/store/SessionMessageStoreFactory.js";
+export type {
+  FileSystem,
+  WorkspaceDirectoryEntry,
+} from "./types/workspace/FileSystem.js";
+export type { WorkspaceOptions } from "./types/workspace/Workspace.js";
+export type {
+  WorkspaceEnvPatch,
+  WorkspaceEnvSubscriber,
+  WorkspaceEnvUnsubscribe,
+} from "./types/workspace/WorkspaceEnv.js";
+export type { WorkspaceTools } from "./types/workspace/WorkspaceTools.js";
 export { RemoteAgent } from "./remote/RemoteAgent.js";
 export { Session } from "./session/Session.js";
 export type { SessionOptions } from "./types/session/SessionOptions.js";
 export {
-  inferAgentModelLabel,
-  normalizeAgentModel,
+  infer_agent_model_label,
+  normalize_agent_model,
   read_agent_model_context_window,
 } from "./agent/AgentModel.js";
 export type { AgentModel } from "./agent/AgentModel.js";
@@ -29,13 +50,18 @@ export type {
   AgentSessionConfigSnapshot,
   AgentSessionForkInput,
   AgentSessionInfo,
+  AgentSessionSecurityConfig,
+  AgentSessionSecurityStatus,
   AgentSessionSetInput,
+  AgentSessionStatus,
   AgentSessionSummary,
   AgentSessionSummaryPage,
   AgentSessionSystemBlock,
   AgentSessionSystemBlockSource,
   AgentSessionSystemSessionInfo,
   AgentSessionSystemSnapshot,
+  AgentSessionTimelineEvent,
+  RemoteSessionSetInput,
 } from "./types/agent/SessionTypes.js";
 export type {
   ListSessionMessagesInput,
@@ -43,6 +69,7 @@ export type {
   SessionAssistantDataPart,
   SessionAssistantDocumentSourcePart,
   SessionAssistantFilePart,
+  SessionAssistantInteractionPart,
   SessionAssistantMessage,
   SessionAssistantMessagePart,
   SessionAssistantSourcePart,
@@ -58,8 +85,9 @@ export type {
   SessionUserMessage,
   SessionUserMessagePart,
   SessionUserTextPart,
-  SessionToolApprovalSnapshot,
 } from "./types/session/SessionMessage.js";
+export { to_session_message_timeline_events } from "./session/browse/SessionMessageTimeline.js";
+export { SessionAssistantOutputAdapter } from "./session/execution/SessionAssistantOutputAdapter.js";
 export type {
   SessionContextSnapshot,
   SessionMessageStorageStats,
@@ -71,6 +99,7 @@ export {
   is_session_mutation,
 } from "./types/session/SessionMutation.js";
 export type {
+  SessionCompactMutation,
   SessionDeltaMutation,
   SessionMessageMutation,
   SessionMutation,
@@ -81,14 +110,29 @@ export type {
   SessionTurnMutation,
 } from "./types/session/SessionMutation.js";
 export type {
-  ResolveSessionApprovalInput,
-  SessionApproval,
-  SessionApprovalDecision,
+  RespondSessionInteractionInput,
+  SessionApprovalInteractionRequest,
+  SessionApprovalInteractionResponse,
   SessionApprovalMode,
-  SessionApprovalModeSnapshot,
-  SessionApprovalResult,
-  SetSessionApprovalModeInput,
-} from "./types/session/SessionApproval.js";
+  SessionCancelledInteractionResult,
+  SessionExpiredInteractionResult,
+  SessionInteractionAnswer,
+  SessionInteractionHandle,
+  SessionInteractionLifecycle,
+  SessionInteractionOption,
+  SessionInteractionPort,
+  SessionInteractionQuestion,
+  SessionInteractionQuestionResponseType,
+  SessionInteractionRequest,
+  SessionInteractionResponse,
+  SessionInteractionResult,
+  SessionInteractionSource,
+  SessionInteractionStatus,
+  SessionPendingInteraction,
+  SessionQuestionInteractionRequest,
+  SessionQuestionInteractionResponse,
+  SessionResolvedInteractionResult,
+} from "./types/session/SessionInteraction.js";
 export type {
   AgentOptions,
   AgentSessionConstructor,
@@ -117,26 +161,33 @@ export type {
   AgentSessionTurnHandle,
   AgentSessionTurnResult,
 } from "./types/sdk/AgentSessionTurn.js";
-export { AgentContext } from "./agent/AgentContext.js";
+export type {
+  AgentSessionCompactHandle,
+  AgentSessionCompactReason,
+  AgentSessionCompactResult,
+} from "./types/sdk/AgentSessionCompact.js";
+export type { PluginContext } from "./types/plugin/PluginContext.js";
 export type { SessionPort } from "./types/session/SessionPort.js";
-export type { StructuredConfig } from "./types/plugin/PluginConfig.js";
 
 // Plugin 作者 API
 export { BasePlugin } from "./plugin/core/BasePlugin.js";
 export {
-  createAction,
-  createPlugin,
+  create_action,
+  create_plugin,
 } from "./plugin/core/PluginActionFactory.js";
 export type {
   CreatePluginActionOptions,
   CreatePluginOptions,
 } from "./plugin/core/PluginActionFactory.js";
+export type {
+  ActionResult,
+  ActionResultMessage,
+} from "./types/action/ActionResult.js";
 
 // Session 与即时执行集成
 export { Executor } from "./executor/Executor.js";
 export { DefaultSessionComposer } from "./session/DefaultSessionComposer.js";
 export { SessionMessages } from "./session/SessionMessages.js";
-export { JsonlSessionMessageStore } from "./session/messages/JsonlSessionMessageStore.js";
 export type {
   AppendCompletedAssistantMessageInput,
   AppendExternalSessionAssistantMessageInput,
@@ -159,15 +210,19 @@ export type {
   SessionStepInput,
 } from "./types/session/SessionComposer.js";
 export { DefaultSessionSystemComposer } from "./executor/composer/system/default/DefaultSessionSystemComposer.js";
-export { resolveSessionSystemMessages } from "./executor/composer/system/default/SystemDomain.js";
-export type { SessionExecutor } from "./executor/types/SessionExecutor.js";
+export { resolve_session_system_messages } from "./executor/composer/system/default/SystemDomain.js";
 export type {
   SessionAssistantStepCallback,
-  SessionRunResult,
-} from "./executor/types/SessionRun.js";
-export type { SessionRunContext } from "./types/executor/SessionRunContext.js";
+  SessionExecutor,
+  SessionTurnExecutionResult,
+} from "./types/session/SessionExecution.js";
+export { create_session_turn_context } from "./session/runtime/SessionTurnContext.js";
+export type {
+  SessionTurnContext,
+  SessionTurnContextInit,
+} from "./types/executor/SessionTurnContext.js";
 export type { SessionToolExecutionContext } from "./types/executor/SessionToolExecutionContext.js";
-export type { PluginRunContext } from "./types/plugin/PluginRunContext.js";
+export type { PluginExecutionContext } from "./types/plugin/PluginExecutionContext.js";
 export type {
   SessionActionRecordV1,
   SessionMessageRecordV1,
@@ -180,43 +235,35 @@ export {
   is_session_message_record,
 } from "./executor/types/SessionRecords.js";
 export type { SessionSystemMessage } from "./executor/types/SessionPrompts.js";
-export { transformPromptsIntoSystemMessages } from "./executor/composer/system/default/PromptRenderer.js";
+export { transform_prompts_into_system_messages } from "./executor/composer/system/default/PromptRenderer.js";
 // 通用 plugin 宿主工具
 export {
-  buildStaticPluginAvailability,
-  findPluginByName,
-  hasPluginLifecycle,
-  listPluginViews,
-  listPluginsWithLifecycle,
-  listPluginsWithoutLifecycle,
-  resolvePluginAvailability,
-  toPluginView,
+  build_static_plugin_availability,
+  find_plugin_by_name,
+  has_plugin_lifecycle,
+  list_plugin_views,
+  list_plugins_with_lifecycle,
+  list_plugins_without_lifecycle,
+  resolve_plugin_availability,
+  to_plugin_view,
 } from "./plugin/core/PluginCatalog.js";
 export {
-  listPluginAuthPolicies,
-  registerPluginHttpRoutes,
+  list_plugin_auth_policies,
+  register_plugin_http_routes,
 } from "./plugin/core/PluginHttpRoutes.js";
-export {
-  createLocalPluginCommandContext,
-  getLocalPluginAvailability,
-  runLocalPluginAction,
-} from "./plugin/core/PluginLocalExecution.js";
-export {
-  registerPluginActionCommandsForCli,
-} from "./plugin/core/PluginCommand.js";
 
 // Runtime plugin 调度集成
 export { ActionScheduleStore } from "./plugin/core/ActionScheduleStore.js";
-export { parseActionScheduleRunAtMsOrThrow } from "./plugin/core/ActionScheduleTime.js";
+export { parse_action_schedule_run_at_ms_or_throw } from "./plugin/core/ActionScheduleTime.js";
 export {
-  pickLastSuccessfulChatSendText,
-  resolveAssistantMessageForPersistence,
+  pick_last_successful_chat_send_text,
+  resolve_assistant_message_for_persistence,
 } from "./executor/messages/UserVisibleText.js";
-export { extractToolCallsFromUiMessage } from "./executor/messages/UIMessageTransformer.js";
+export { extract_tool_calls_from_ui_message } from "./executor/messages/UIMessageTransformer.js";
 export {
-  buildChatMessageText,
-  parseChatMessageMarkup,
-  renderChatMessageFileTag,
+  build_chat_message_text,
+  parse_chat_message_markup,
+  render_chat_message_file_tag,
 } from "./executor/messages/ChatMessageMarkup.js";
 export type {
   ChatMessageFileTag,
@@ -225,87 +272,23 @@ export type {
   ChatMessageSendOptions,
 } from "./executor/messages/ChatMessageMarkupTypes.js";
 
-// 项目与配置集成
-export {
-  initializeAgentProject,
-  normalizeDefaultAgentId,
-} from "./config/AgentInitializer.js";
+// Workspace 环境集成
 export {
   load_project_dotenv,
-  resolve_agent_env,
-} from "./config/AgentEnv.js";
-export { getDowncitySessionMessagesPath } from "./config/Paths.js";
-export {
-  getPlatformStoreDbPath,
-  getPlatformStoreKeyPath,
-} from "./config/PlatformPaths.js";
-export {
-  ensureRuntimeProjectReady,
-} from "./config/ProjectSetup.js";
-export { assertProjectExecutionTarget } from "./config/ExecutionBinding.js";
+  resolve_workspace_env,
+} from "./workspace/WorkspaceEnv.js";
 
 // 日志
-export { getLogger, type Logger } from "./utils/logger/Logger.js";
-export { generateId } from "./utils/Id.js";
+export { get_logger, type Logger } from "./utils/logger/Logger.js";
+export { generate_id } from "./utils/Id.js";
 export {
-  formatDateTimeInTimezone,
-  resolveRuntimeTimezone,
+  format_date_time_in_timezone,
+  resolve_runtime_timezone,
 } from "./utils/Time.js";
 
-// 项目协议类型
-export type {
-  AgentProjectChannel,
-  AgentProjectInitializationInput,
-  AgentProjectInitializationResult,
-} from "./types/config/AgentProject.js";
-export type { ExecutionBindingConfig } from "./types/config/ExecutionBinding.js";
-
-// 配置与模型类型
-export type {
-  DowncityChatChannelConfig,
-  DowncityChatPluginChannelsConfig,
-  DowncityChatPluginConfig,
-  DowncityChatPluginQueueConfig,
-  DowncityConfig,
-  DowncityPluginConfigMap,
-} from "./types/config/DowncityConfig.js";
-export type {
-  LlmConfig,
-  LlmModelConfig,
-  LlmProviderConfig,
-  LlmProviderType,
-} from "./types/config/LlmConfig.js";
-
 // JSON 基础类型
 export type { JsonObject, JsonPrimitive, JsonValue } from "./types/common/Json.js";
 
-// Platform / city 控制面协议类型
-export type {
-  ControlPlaneRuntimeMeta,
-  ControlPlaneRuntimeStatus,
-  ManagedAgentProcessView,
-  ManagedAgentRegistryEntry,
-  ManagedAgentRegistryV1,
-  PlatformAgentDirectoryInspection,
-  PlatformAgentOption,
-  PlatformAgentsResponse,
-  PlatformConfigFileStatusItem,
-  PlatformConfigStatusResponse,
-  PlatformLocalModelsResponse,
-} from "./types/runtime/platform/Platform.js";
-
-export type {
-  PlatformAgentChatChannelStatus,
-} from "./types/runtime/platform/PlatformGateway.js";
-
-// Inline instant 协议类型
-export type {
-  InlineInstantExecutorType,
-  PlatformInlineInstantRunInput,
-  PlatformInlineInstantRunResult,
-  PlatformInlineInstantRunner,
-} from "./types/runtime/http/InlineInstant.js";
-
 // Plugin 作者与控制面类型
 export type {
   PluginAction,
@@ -322,14 +305,10 @@ export type {
   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 { PluginLifecycle } from "./types/plugin/PluginCommand.js";
 export type {
   AgentPlugins,
   PluginAvailability,
-  PluginConfigDefinition,
   PluginEffectHook,
   PluginGuardHook,
   PluginHooks,
@@ -342,14 +321,6 @@ export type {
   PluginHttpDefinition,
   PluginHttpRegistration,
 } from "./types/plugin/PluginHttp.js";
-export type {
-  PluginSetupDefinition,
-  PluginSetupField,
-  PluginSetupFieldOption,
-  PluginUsageDefinition,
-  PluginUsageField,
-  PluginUsageFieldOption,
-} from "./types/plugin/PluginSetup.js";
 export type {
   PluginActionResponse,
   PluginCatalogResponse,
@@ -365,20 +336,11 @@ export type {
   CreateActionScheduleJobInput,
   PluginActionScheduleInput,
 } from "./plugin/types/ActionSchedule.js";
-export type {
-  PluginCliBaseOptions,
-  PluginCommandResponse,
-  PluginControlAction,
-  PluginControlResponse,
-  PluginStateListResponse,
-} from "./types/plugin/PluginControl.js";
-export type { PluginControlResult } from "./types/plugin/PluginState.js";
+export { list_plugin_states } from "./plugin/core/PluginStateController.js";
 export {
-  controlPluginState,
-  listPluginStates,
-} from "./plugin/core/PluginStateController.js";
-export { runPluginCommand } from "./plugin/core/PluginActionRunner.js";
-export { parsePluginCommandRequestBody } from "./plugin/core/PluginCommandRequest.js";
+  invoke_plugin_action,
+  resolve_plugin_action,
+} from "./plugin/core/PluginActionRunner.js";
 
 // 跨包 RPC 与 session 标识协议
 export type {
@@ -386,42 +348,4 @@ export type {
   RpcRequest,
   RpcServerFrame,
 } from "./types/rpc/RpcProtocol.js";
-export { resolveSessionId } from "./executor/ids/resolveSessionId.js";
-
-// Platform store 类型
-export type {
-  StoredChannelAccount,
-  StoredChannelAccountChannel,
-  StoredEnvEntry,
-  StoredGlobalEnvEntry,
-  UpsertChannelAccountInput,
-  UpsertEnvEntryInput,
-  UpsertGlobalEnvEntryInput,
-} from "./types/platform/Store.js";
-
-// HTTP auth 协议类型
-export {
-  AUTH_DEFAULT_ROLE_NAMES,
-  AUTH_DEFAULT_ROLES,
-  AUTH_PERMISSION_DESCRIPTIONS,
-  AUTH_PERMISSION_KEYS,
-} from "./types/runtime/auth/AuthPermission.js";
-export type {
-  AuthDefaultRoleDefinition,
-  AuthDefaultRoleName,
-  AuthPermissionKey,
-} from "./types/runtime/auth/AuthPermission.js";
-export type { AuthRoutePolicy } from "./types/runtime/auth/AuthRoute.js";
-export type {
-  AuthIssuedToken,
-  AuthTokenSummary,
-} from "./types/runtime/auth/AuthToken.js";
-export type {
-  AuthAuditLog,
-  AuthPermission,
-  AuthPrincipal,
-  AuthRole,
-  AuthTokenRecord,
-  AuthUser,
-  AuthUserStatus,
-} from "./types/runtime/auth/AuthTypes.js";
+export { resolve_session_id } from "./executor/ids/resolveSessionId.js";

package/src/plugin/core/ActionScheduleExecutor.ts

@@ -4,53 +4,51 @@
  * 关键点（中文）
  * - 只负责“把到点的 action schedule 任务执行掉并更新状态”。
  * - 不负责调度入口、持久化初始化和轮询生命周期管理。
- * - 到期后重新走 `runPluginCommand`，复用 plugin action 的统一执行规则。
+ * - 到期后直接走 Plugin Registry Action 执行入口。
  */
 
-import type { AgentContext } from "@/agent/AgentContext.js";
+import type { PluginContext } from "@/types/plugin/PluginContext.js";
 import type { ActionScheduleStore } from "@/plugin/core/ActionScheduleStore.js";
-import { runPluginCommand } from "@/plugin/core/PluginActionRunner.js";
 
 /**
  * 执行当前已到点的 pending 任务。
  */
-export async function runDueActionScheduleJobs(params: {
-  context: AgentContext;
+export async function run_due_action_schedule_jobs(params: {
+  context: PluginContext;
   store: ActionScheduleStore;
 }): Promise<void> {
-  const dueJobs = params.store.listDuePendingJobs(Date.now());
+  const dueJobs = await params.store.list_due_pending_jobs(Date.now());
   for (const job of dueJobs) {
-    const claimed = params.store.markJobRunning(job.id);
+    const claimed = await params.store.mark_job_running(job.id);
     if (!claimed) continue;
 
     try {
-      const result = await runPluginCommand({
-        pluginName: job.pluginName,
-        command: job.actionName,
-        payload: job.payload,
-        context: params.context,
+      const result = await params.context.plugins.run_action({
+        plugin: job.plugin_name,
+        action: job.action_name,
+        payload: job.payload ?? undefined,
       });
       if (!result.success) {
-        params.store.markJobFailed(
+        await params.store.mark_job_failed(
           job.id,
-          result.message || "scheduled action failed",
+          result.error || result.message || "scheduled action failed",
         );
         params.context.logger.warn("[action-schedule] job failed", {
-          jobId: job.id,
-          pluginName: job.pluginName,
-          actionName: job.actionName,
-          error: result.message || "scheduled action failed",
+          job_id: job.id,
+          plugin_name: job.plugin_name,
+          action_name: job.action_name,
+          error: result.error || result.message || "scheduled action failed",
         });
         continue;
       }
 
-      params.store.markJobSucceeded(job.id);
+      await params.store.mark_job_succeeded(job.id);
     } catch (error) {
-      params.store.markJobFailed(job.id, String(error));
+      await params.store.mark_job_failed(job.id, String(error));
       params.context.logger.warn("[action-schedule] job failed", {
-        jobId: job.id,
-        pluginName: job.pluginName,
-        actionName: job.actionName,
+        job_id: job.id,
+        plugin_name: job.plugin_name,
+        action_name: job.action_name,
         error: String(error),
       });
     }

package/src/plugin/core/ActionScheduleRuntime.ts

@@ -7,11 +7,11 @@
  * - 普通 plugin 先启动，ActionSchedule 再开始轮询，避免到期 action 执行到未启动的 plugin。
  */
 
-import type { AgentContext } from "@/agent/AgentContext.js";
-import { runDueActionScheduleJobs } from "@/plugin/core/ActionScheduleExecutor.js";
+import type { PluginContext } from "@/types/plugin/PluginContext.js";
+import { run_due_action_schedule_jobs } from "@/plugin/core/ActionScheduleExecutor.js";
 import { ActionScheduleStore } from "@/plugin/core/ActionScheduleStore.js";
 
-const ACTION_SCHEDULE_POLL_INTERVAL_MS = 200;
+const ACTION_SCHEDULE_POLL_INTERVAL_MS = 1_000;
 const ACTION_SCHEDULE_LOG_PREFIX = "[ACTION_SCHEDULE]";
 
 function formatActionScheduleLogMessage(message: string): string {
@@ -31,11 +31,11 @@ export interface ActionScheduleRuntimeHandle {
 /**
  * 启动 ActionSchedule 轮询 runtime。
  */
-export async function startActionScheduleRuntime(
-  context: AgentContext,
+export async function start_action_schedule_runtime(
+  context: PluginContext,
 ): Promise<ActionScheduleRuntimeHandle> {
-  const store = new ActionScheduleStore(context.rootPath);
-  const recovered = store.resetRunningJobsToPending();
+  const store = new ActionScheduleStore(context.files);
+  const recovered = await store.reset_running_jobs_to_pending();
   if (recovered > 0) {
     context.logger.warn(
       formatActionScheduleLogMessage("Recovered interrupted running jobs"),
@@ -51,7 +51,7 @@ export async function startActionScheduleRuntime(
     if (stopped || ticking) return;
     ticking = true;
     try {
-      await runDueActionScheduleJobs({
+      await run_due_action_schedule_jobs({
         context,
         store,
       });