@downcity/agent 1.1.35 → 1.1.51

package/src/executor/messages/ChatMessageMarkup.ts

@@ -0,0 +1,263 @@
+/**
+ * Chat 消息标记语法解析工具。
+ *
+ * 关键点（中文）
+ * - 统一处理 frontmatter metadata 与 `<file>` 附件标签。
+ * - 解析结果保留 `segments[]`，用于按正文与附件的真实顺序发送。
+ */
+
+import yaml from "js-yaml";
+import type {
+  ChatMessageFileSegment,
+  ChatMessageFileTag,
+  ChatMessageFileType,
+  ChatMessageSegment,
+  ChatMessageTextSegment,
+  ParsedChatMessageMarkup,
+} from "./ChatMessageMarkupTypes.js";
+
+const FILE_TAG_REGEXP =
+  /<file\b([^>]*?)(?:>([\s\S]*?)<\/file>|\/>)/gi;
+const FRONTMATTER_REGEXP = /^---\s*\r?\n([\s\S]*?)\r?\n---\s*(?:\r?\n|$)/;
+
+function normalizeText(value: unknown): string {
+  return String(value ?? "").trim();
+}
+
+/**
+ * 解析标签属性。
+ */
+function parseTagAttributes(rawAttrs: string): Record<string, string> {
+  const out: Record<string, string> = {};
+  const attrs = String(rawAttrs || "");
+  const regexp = /([a-zA-Z_][a-zA-Z0-9_-]*)\s*=\s*(?:"([^"]*)"|'([^']*)')/g;
+  let match: RegExpExecArray | null = null;
+  while (true) {
+    match = regexp.exec(attrs);
+    if (!match) break;
+    const key = normalizeText(match[1]).toLowerCase();
+    if (!key) continue;
+    const value = normalizeText(match[2] ?? match[3] ?? "");
+    out[key] = value;
+  }
+  return out;
+}
+
+/**
+ * 归一化附件类型。
+ */
+export function normalizeChatMessageFileType(value: unknown): ChatMessageFileType {
+  const text = normalizeText(value).toLowerCase();
+  if (text === "photo" || text === "image") return "photo";
+  if (text === "voice") return "voice";
+  if (text === "audio") return "audio";
+  if (text === "video") return "video";
+  return "document";
+}
+
+/**
+ * 提取 frontmatter metadata。
+ */
+export function extractChatMessageFrontmatter(params: {
+  source: string;
+}): {
+  metadata: Record<string, unknown>;
+  body: string;
+} {
+  const source = String(params.source || "");
+  const match = FRONTMATTER_REGEXP.exec(source);
+  if (!match) {
+    return {
+      metadata: {},
+      body: source,
+    };
+  }
+
+  const yamlRaw = String(match[1] || "");
+  let metadata: Record<string, unknown> = {};
+  try {
+    const parsed = yaml.load(yamlRaw);
+    if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+      metadata = parsed as Record<string, unknown>;
+    }
+  } catch {
+    return {
+      metadata: {},
+      body: source,
+    };
+  }
+
+  return {
+    metadata,
+    body: source.slice(match[0].length),
+  };
+}
+
+function toTextSegment(text: string): ChatMessageTextSegment | null {
+  const normalized = normalizeText(text);
+  if (!normalized) return null;
+  return {
+    kind: "text",
+    text: normalized,
+  };
+}
+
+function toFileSegment(file: ChatMessageFileTag): ChatMessageFileSegment | null {
+  const path = normalizeText(file.path);
+  if (!path) return null;
+  return {
+    kind: "file",
+    file: {
+      path,
+      type: normalizeChatMessageFileType(file.type),
+      ...(normalizeText(file.caption)
+        ? { caption: normalizeText(file.caption) }
+        : {}),
+    },
+  };
+}
+
+/**
+ * 提取 `<file>` 标签，并保留正文/附件的真实顺序。
+ */
+export function extractChatMessageSegments(source: string): ChatMessageSegment[] {
+  const out: ChatMessageSegment[] = [];
+  const text = String(source || "");
+
+  FILE_TAG_REGEXP.lastIndex = 0;
+  let cursor = 0;
+  let match: RegExpExecArray | null = null;
+  while (true) {
+    match = FILE_TAG_REGEXP.exec(text);
+    if (!match) break;
+
+    const rawBefore = text.slice(cursor, match.index);
+    const textSegment = toTextSegment(rawBefore);
+    if (textSegment) out.push(textSegment);
+
+    const attrs = parseTagAttributes(match[1] || "");
+    const path = normalizeText(match[2] || attrs.path);
+    const fileSegment = toFileSegment({
+      path,
+      type: normalizeChatMessageFileType(attrs.type),
+      ...(normalizeText(attrs.caption) ? { caption: normalizeText(attrs.caption) } : {}),
+    });
+    if (fileSegment) out.push(fileSegment);
+    cursor = match.index + match[0].length;
+  }
+
+  const trailingText = toTextSegment(text.slice(cursor));
+  if (trailingText) out.push(trailingText);
+  return out;
+}
+
+/**
+ * 提取 `<file>` 标签列表。
+ */
+export function extractChatMessageFileTags(source: string): ChatMessageFileTag[] {
+  return extractChatMessageSegments(source)
+    .filter((segment): segment is ChatMessageFileSegment => segment.kind === "file")
+    .map((segment) => segment.file);
+}
+
+/**
+ * 移除正文中的 `<file>` 标签，仅保留文本段。
+ */
+export function stripChatMessageFileTags(source: string): string {
+  return buildChatMessageText({
+    segments: extractChatMessageSegments(source).filter(
+      (segment): segment is ChatMessageTextSegment => segment.kind === "text",
+    ),
+  });
+}
+
+function normalizeTagAttributeValue(value: string, quote: '"' | "'"): string {
+  if (quote === '"') {
+    return value.replace(/"/g, "'");
+  }
+  return value.replace(/'/g, '"');
+}
+
+/**
+ * 渲染一条标准化 `<file>` 标签。
+ */
+export function renderChatMessageFileTag(file: ChatMessageFileTag): string {
+  const path = normalizeText(file.path);
+  if (!path) return "";
+  const type = normalizeChatMessageFileType(file.type);
+  const caption = normalizeText(file.caption);
+  const quote: '"' | "'" = caption.includes('"') && !caption.includes("'") ? "'" : '"';
+  const safeCaption = caption
+    ? normalizeTagAttributeValue(caption, quote)
+    : "";
+  const captionAttr = safeCaption ? ` caption=${quote}${safeCaption}${quote}` : "";
+  return `<file type="${type}"${captionAttr}>${path}</file>`;
+}
+
+function renderChatMessageSegment(segment: ChatMessageSegment): string {
+  if (segment.kind === "text") return normalizeText(segment.text);
+  return renderChatMessageFileTag(segment.file);
+}
+
+/**
+ * 把附件列表渲染回统一的 `<file>` 文本块。
+ */
+export function buildChatMessageFileBlock(files: ChatMessageFileTag[]): string {
+  return files
+    .map((file) => renderChatMessageFileTag(file))
+    .filter((item) => normalizeText(item).length > 0)
+    .join("\n");
+}
+
+/**
+ * 把片段重建成统一消息文本。
+ */
+export function buildChatMessageText(params: {
+  bodyText?: string;
+  files?: ChatMessageFileTag[];
+  segments?: ChatMessageSegment[];
+}): string {
+  const segments = Array.isArray(params.segments)
+    ? params.segments
+    : [
+        ...(normalizeText(params.bodyText)
+          ? [{
+              kind: "text",
+              text: normalizeText(params.bodyText),
+            } satisfies ChatMessageTextSegment]
+          : []),
+        ...(Array.isArray(params.files)
+          ? params.files
+              .map((file) => toFileSegment(file))
+              .filter((item): item is ChatMessageFileSegment => Boolean(item))
+          : []),
+      ];
+
+  return segments
+    .map((segment) => renderChatMessageSegment(segment))
+    .filter((item) => normalizeText(item).length > 0)
+    .join("\n\n")
+    .trim();
+}
+
+/**
+ * 统一解析一段 chat 消息文本。
+ */
+export function parseChatMessageMarkup(source: string): ParsedChatMessageMarkup {
+  const extracted = extractChatMessageFrontmatter({
+    source: String(source || ""),
+  });
+  const segments = extractChatMessageSegments(extracted.body);
+  return {
+    metadata: extracted.metadata,
+    bodyText: buildChatMessageText({
+      segments: segments.filter(
+        (segment): segment is ChatMessageTextSegment => segment.kind === "text",
+      ),
+    }),
+    files: segments
+      .filter((segment): segment is ChatMessageFileSegment => segment.kind === "file")
+      .map((segment) => segment.file),
+    segments,
+  };
+}

package/src/executor/messages/SessionAttachmentMapper.ts

@@ -15,7 +15,7 @@ import {
   type FileUIPart,
 } from "ai";
 import type { SessionMessageV1 } from "@/executor/types/SessionMessages.js";
-import { parseChatMessageMarkup } from "@/plugin/builtins/chat/runtime/ChatMessageMarkup.js";
+import { parseChatMessageMarkup } from "@/executor/messages/ChatMessageMarkup.js";
 
 /**
  * 从 `<file>` 标签中解析附件描述。

package/src/executor/tools/shell/ShellToolBridge.ts

@@ -11,8 +11,8 @@ import type { JsonObject, JsonValue } from "@/types/common/Json.js";
 import type {
   InvokePluginPort,
   InvokePluginResult,
-} from "@/core/AgentContextTypes.js";
-import type { ShellActionResponse } from "@/plugin/builtins/shell/types/ShellPlugin.js";
+} from "@/types/runtime/agent/AgentContext.js";
+import type { ShellActionResponse } from "@/executor/tools/shell/types/ShellPlugin.js";
 import {
   enqueueDeferredPersistedUserMessage,
   enqueueInjectedUserMessage,

package/src/executor/tools/shell/ShellToolDefinition.ts

@@ -16,7 +16,7 @@ import type {
   ShellStatusInput,
   ShellWaitInput,
   ShellWriteInput,
-} from "@/plugin/builtins/shell/types/Shell.js";
+} from "@/executor/tools/shell/types/Shell.js";
 import type { JsonObject } from "@/types/common/Json.js";
 import { validateChatSendCommand } from "./ShellToolFormatting.js";
 import {

package/src/executor/tools/shell/ShellToolFormatting.ts

@@ -75,8 +75,8 @@ export function buildShellContextEnv(
 
   applyEnvMap(env, injected);
   setEnvString(env, "DC_SESSION_ID", contextCtx?.sessionId);
-  setEnvString(env, "DC_CTX_SERVER_HOST", process.env.DC_SERVER_HOST);
-  setEnvString(env, "DC_CTX_SERVER_PORT", process.env.DC_SERVER_PORT);
+  setEnvString(env, "DC_CITY_HOST", process.env.DC_CITY_HOST);
+  setEnvString(env, "DC_CITY_PORT", process.env.DC_CITY_PORT);
   stripInvocationAuthEnv(env);
 
   return env;

package/src/executor/types/SessionRun.ts

@@ -65,7 +65,7 @@ export type SessionAssistantStepCallback = (
  *
  * 关键点（中文）
  * - 这里直接复用 AI SDK 的 `UIMessageChunk` 结构，避免在 session 内核层再复制一套协议。
- * - SDK / HTTP / RPC 若需要自己的事件模型，应在更上层做映射。
+ * - SDK / HTTP 若需要自己的事件模型，应在更上层做映射。
  */
 export type SessionUiMessageChunk = UIMessageChunk;
 

package/src/index.ts

@@ -3,24 +3,22 @@
  *
  * 关键点（中文）
  * - 这是 agent 包唯一稳定的公开入口。
- * - 只导出 SDK、plugin 作者 API、city 运行集成 API 与跨包协议类型。
+ * - 只导出 Agent、plugin 作者 API、city 运行集成 API 与跨包协议类型。
  * - HTTP router、sandbox runner、内部 plugin runtime runner 等实现细节不从根入口暴露。
  */
 
-// SDK 入口
-export { Agent } from "./sdk/Agent.js";
-export { RemoteAgent } from "./sdk/RemoteAgent.js";
+// Agent 入口
+export { Agent } from "./agent/Agent.js";
+export { RemoteAgent } from "./agent/RemoteAgent.js";
 export type {
-  AgentMode,
   AgentSessionCollection,
   AgentSessionActor,
   AgentSession,
   AgentCreateSessionInput,
   AgentListSessionsInput,
   AgentOptions,
-  AgentHttpBinding,
-  AgentHttpStartOptions,
   AgentRpcBinding,
+  AgentRpcStartOptions,
   AgentStartOptions,
   AgentStartResult,
   AgentStopResult,
@@ -40,7 +38,7 @@ export type {
   AgentSessionSystemSnapshot,
   AgentSessionTimelineEvent,
   RemoteAgentSession,
-} from "./sdk/AgentSdkTypes.js";
+} from "./types/agent/AgentTypes.js";
 export type {
   AgentSessionEvent,
   AgentSessionSubscriber,
@@ -51,34 +49,17 @@ export type {
   AgentSessionTurnHandle,
   AgentSessionTurnResult,
 } from "./types/sdk/AgentSessionTurn.js";
-export type { AgentRuntime, AgentRuntimeBase } from "./core/AgentCoreTypes.js";
+export type { AgentRuntime, AgentRuntimeBase } from "./types/runtime/agent/AgentRuntime.js";
 export type {
   AgentContext,
-  ChatRuntimePort,
   InvokePluginPort,
   SessionCollectionPort,
   SessionPort,
   StructuredConfig,
-} from "./core/AgentContextTypes.js";
+} from "./types/runtime/agent/AgentContext.js";
 
 // Plugin 作者 API
 export { BasePlugin } from "./plugin/core/BasePlugin.js";
-export { ChatPlugin } from "./plugin/builtins/chat/ChatPlugin.js";
-export { ChatChannelAccountManager } from "./plugin/builtins/chat/accounts/ChannelAccountManager.js";
-export type { ChatChannelAccountListItem } from "./plugin/builtins/chat/types/ChannelAccount.js";
-export type {
-  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";
-export { AsrPlugin } from "./plugin/builtins/asr/Plugin.js";
-export { TtsPlugin } from "./plugin/builtins/tts/Plugin.js";
-export { WorkboardPlugin } from "./plugin/builtins/workboard/Plugin.js";
 
 // Session 与即时执行集成
 export { Executor } from "./executor/Executor.js";
@@ -97,54 +78,59 @@ export {
 } from "./executor/composer/system/default/StaticPromptCatalog.js";
 export { shellTools } from "./executor/tools/shell/ShellToolDefinition.js";
 
-// Agent server 与 transport 集成
+// 通用 plugin 宿主工具
+export {
+  buildStaticPluginAvailability,
+  findPluginByName,
+  hasPluginLifecycle,
+  listPluginViews,
+  listPluginsWithLifecycle,
+  listPluginsWithoutLifecycle,
+  resolvePluginAvailability,
+  toPluginView,
+} from "./plugin/core/PluginCatalog.js";
+export {
+  listPluginAuthPolicies,
+  registerPluginHttpRoutes,
+} from "./plugin/core/PluginHttpRoutes.js";
+export {
+  createLocalPluginCommandContext,
+  getLocalPluginAvailability,
+  runLocalPluginAction,
+} from "./plugin/core/PluginLocalExecution.js";
+export {
+  registerPluginActionCommandsForCli,
+} from "./plugin/core/PluginCommand.js";
+
+// Agent RPC 集成
+export { startRpcServer } from "./rpc/Server.js";
+
+// 宿主 HTTP gateway 集成
 export { startServer } from "./runtime/server/http/Server.js";
-export { startLocalRpcServer } from "./runtime/server/rpc/Server.js";
-export { callAgentTransport } from "./runtime/transport/rpc/Transport.js";
 
 // Runtime plugin 运行集成
-export { listRegisteredPlugins } from "./plugin/core/PluginClassRegistry.js";
-export { listManagedPlugins } from "./plugin/core/PluginClassRegistry.js";
-export { listLocalPlugins } from "./plugin/core/PluginClassRegistry.js";
 export {
   startAllPlugins,
   stopAllPlugins,
 } from "./plugin/core/Manager.js";
-export { PluginScheduleStore } from "./plugin/core/schedule/Store.js";
-export { parseScheduledRunAtMsOrThrow } from "./plugin/core/schedule/Time.js";
+export { ActionScheduleStore } from "./plugin/core/ActionScheduleStore.js";
+export { parseActionScheduleRunAtMsOrThrow } from "./plugin/core/ActionScheduleTime.js";
 export {
   pickLastSuccessfulChatSendText,
   resolveAssistantMessageForPersistence,
-} from "./plugin/builtins/chat/runtime/UserVisibleText.js";
+} from "./executor/messages/UserVisibleText.js";
 
 // Plugin 与权限配置集成
-export {
-  listChatAuthorizationRoles,
-  readChatAuthorizationConfigSync,
-  setChatAuthorizationUserRole,
-} from "./plugin/builtins/auth/runtime/AuthorizationConfig.js";
-export { resolveAuthorizedUserRole } from "./plugin/builtins/auth/runtime/AuthorizationPolicy.js";
-export {
-  buildStaticPluginAvailability,
-  findBuiltinPlugin,
-  findStaticPluginView,
-  listStaticPluginViews,
-} from "./plugin/core/Catalog.js";
-export { runLocalPluginAction } from "./plugin/core/LocalExecution.js";
-export { registerAllPluginsForCli } from "./plugin/core/PluginCommand.js";
-export { listBuiltinPluginAuthPolicies } from "./plugin/core/HttpRoutes.js";
 export { persistProjectPluginConfig } from "./plugin/core/ProjectConfigStore.js";
 
 // 项目与配置集成
 export {
   initializeAgentProject,
   isAgentProjectInitialized,
-  listPlatformModelChoices,
-  normalizeDefaultAgentName,
-} from "./config/project/AgentInitializer.js";
-export type { PlatformModelChoice } from "./config/project/AgentInitializer.js";
+  normalizeDefaultAgentId,
+} from "./config/AgentInitializer.js";
+export { loadDowncityConfig } from "./config/Config.js";
 export {
-  ensureRuntimeExecutionBindingReady,
   ensureRuntimeProjectReady,
 } from "./runtime/host/daemon/ProjectSetup.js";
 export { assertProjectExecutionTarget } from "./config/ExecutionBinding.js";
@@ -155,7 +141,6 @@ export { getLogger, logger, type Logger } from "./utils/logger/Logger.js";
 // 宿主端口类型
 export type {
   AgentPathRuntime,
-  AgentPlatformRuntime,
   AgentPluginConfigRuntime,
 } from "./types/runtime/host/AgentHost.js";
 
@@ -164,7 +149,7 @@ export type {
   AgentProjectChannel,
   AgentProjectInitializationInput,
   AgentProjectInitializationResult,
-} from "./config/project/types/AgentProject.js";
+} from "./types/config/AgentProject.js";
 export type { ExecutionBindingConfig } from "./types/config/ExecutionBinding.js";
 export type { StartOptions } from "./types/config/Start.js";
 
@@ -194,6 +179,7 @@ export type {
   PlatformConfigStatusResponse,
   PlatformLocalModelsResponse,
 } from "./types/runtime/platform/Platform.js";
+
 export type {
   PlatformAgentChatChannelStatus,
   PlatformAgentDaemonMeta,
@@ -207,7 +193,7 @@ export type {
   PlatformAgentShipStartConfig,
 } from "./types/runtime/platform/PlatformGateway.js";
 
-// Daemon / RPC 协议类型
+// Daemon 协议类型
 export {
   DAEMON_LOG_FILENAME,
   DAEMON_META_FILENAME,
@@ -217,10 +203,6 @@ export type {
   DaemonMeta,
   DaemonStaleReason,
 } from "./types/runtime/daemon/Daemon.js";
-export type {
-  LocalRpcRequest,
-  LocalRpcResponse,
-} from "./types/runtime/rpc/LocalRpc.js";
 
 // Inline instant 协议类型
 export type {
@@ -274,11 +256,11 @@ export type {
   PluginState,
 } from "./plugin/types/Plugin.js";
 export type {
-  CreateScheduledJobInput,
-  ScheduledJobRecord,
-  ScheduledJobStatus,
-  PluginCommandScheduleInput,
-} from "./plugin/types/PluginSchedule.js";
+  ActionScheduleJobRecord,
+  ActionScheduleJobStatus,
+  CreateActionScheduleJobInput,
+  PluginActionScheduleInput,
+} from "./plugin/types/ActionSchedule.js";
 export type {
   PluginCliBaseOptions,
   PluginCommandResponse,
@@ -293,46 +275,15 @@ export type {
   PluginStateSnapshot,
 } from "./plugin/core/Manager.js";
 
-// Chat authorization plugin 协议类型
-export {
-  CHAT_AUTHORIZATION_CHANNELS,
-  createDefaultChatAuthorizationRoles,
-  isChatAuthorizationChannel,
-} from "./plugin/builtins/auth/types/AuthPlugin.js";
-export type {
-  AuthObservePrincipalPayload,
-  AuthObservePrincipalResult,
-  AuthResolveUserRolePayload,
-  AuthSetUserRolePayload,
-  AuthWriteConfigPayload,
-  ChatAuthorizationCatalog,
-  ChatAuthorizationChannel,
-  ChatAuthorizationConfig,
-  ChatAuthorizationDecision,
-  ChatAuthorizationEvaluateInput,
-  ChatAuthorizationEvaluateResult,
-  ChatAuthorizationObservedChat,
-  ChatAuthorizationObservedUser,
-  ChatAuthorizationPermission,
-  ChatAuthorizationPermissionMeta,
-  ChatAuthorizationRole,
-  ChatAuthorizationSnapshot,
-  ChatAuthorizationStateFile,
-  ChatChannelAuthorizationConfig,
-} from "./plugin/builtins/auth/types/AuthPlugin.js";
-
 // Platform store 类型
 export type {
-  StoredAgentEnvEntry,
   StoredChannelAccount,
   StoredChannelAccountChannel,
   StoredEnvEntry,
-  StoredEnvScope,
   StoredGlobalEnvEntry,
   StoredModel,
   StoredModelProvider,
   StoredProviderMeta,
-  UpsertAgentEnvEntryInput,
   UpsertChannelAccountInput,
   UpsertEnvEntryInput,
   UpsertGlobalEnvEntryInput,

package/src/plugin/core/ActionScheduleExecutor.ts

@@ -0,0 +1,58 @@
+/**
+ * ActionSchedule 到期执行器。
+ *
+ * 关键点（中文）
+ * - 只负责“把到点的 action schedule 任务执行掉并更新状态”。
+ * - 不负责调度入口、持久化初始化和轮询生命周期管理。
+ * - 到期后重新走 `runPluginCommand`，复用 plugin action 的统一执行规则。
+ */
+
+import type { AgentContext } from "@/types/runtime/agent/AgentContext.js";
+import type { ActionScheduleStore } from "@/plugin/core/ActionScheduleStore.js";
+import { runPluginCommand } from "@/plugin/core/Manager.js";
+
+/**
+ * 执行当前已到点的 pending 任务。
+ */
+export async function runDueActionScheduleJobs(params: {
+  context: AgentContext;
+  store: ActionScheduleStore;
+}): Promise<void> {
+  const dueJobs = params.store.listDuePendingJobs(Date.now());
+  for (const job of dueJobs) {
+    const claimed = params.store.markJobRunning(job.id);
+    if (!claimed) continue;
+
+    try {
+      const result = await runPluginCommand({
+        pluginName: job.pluginName,
+        command: job.actionName,
+        payload: job.payload,
+        context: params.context,
+      });
+      if (!result.success) {
+        params.store.markJobFailed(
+          job.id,
+          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",
+        });
+        continue;
+      }
+
+      params.store.markJobSucceeded(job.id);
+    } catch (error) {
+      params.store.markJobFailed(job.id, String(error));
+      params.context.logger.warn("[action-schedule] job failed", {
+        jobId: job.id,
+        pluginName: job.pluginName,
+        actionName: job.actionName,
+        error: String(error),
+      });
+    }
+  }
+}