@downcity/agent 1.1.35 → 1.1.43

package/src/runtime/server/http/control/ExecuteBySession.ts

@@ -2,26 +2,20 @@
  * Control execute by session helper。
  *
  * 关键点（中文）
- * - chatKey session 优先复用 chat 平台队列链路（与平台入站执行一致）。
- * - 非 chat session 保留原有直接执行语义。
+ * - control 层只负责把请求转成 session prompt。
+ * - chat / queue 等渠道语义由宿主显式注入的 plugin 自行实现。
  */
 
-import type { AgentRuntime } from "@/core/AgentCoreTypes.js";
-import type { AgentContext } from "@/core/AgentContextTypes.js";
-import type { JsonObject } from "@/types/common/Json.js";
+import type { AgentRuntime } from "@/types/runtime/agent/AgentRuntime.js";
+import type { AgentContext } from "@/types/runtime/agent/AgentContext.js";
 import type { ControlSessionExecuteAttachmentInput } from "@/runtime/server/http/control/types/ControlSessionExecute.js";
-import { resolveChatQueueStore } from "@/plugin/builtins/chat/runtime/ChatQueue.js";
-import { resolveDispatchTargetByChatKey } from "@/plugin/builtins/chat/runtime/ChatkeySend.js";
-import { appendExecIngress } from "@/plugin/builtins/chat/runtime/ChatIngressStore.js";
-import { buildQueuedUserMessageWithInfo } from "@/plugin/builtins/chat/runtime/QueuedUserMessage.js";
 import { buildExecuteInputText } from "./Helpers.js";
 
 /**
  * 在指定 session 中执行一轮请求。
  *
  * 说明（中文）
- * - 若 `sessionId` 能解析为 chat 分发目标，则改为入 chat queue。
- * - 否则按普通 session 同步执行。
+ * - 按普通 session 同步执行。
  */
 export async function executeBySessionId(params: {
   agentState: AgentRuntime;
@@ -42,65 +36,6 @@ export async function executeBySessionId(params: {
     attachments: params.attachments,
   });
 
-  const dispatchTarget = await resolveDispatchTargetByChatKey({
-    context: params.executionContext,
-    chatKey: sessionId,
-  });
-  if (dispatchTarget) {
-    const queuedText = buildQueuedUserMessageWithInfo({
-      messageId: dispatchTarget.messageId,
-      text: executeInput,
-    });
-    const ingressExtra: JsonObject = {
-      source: "tui_session_execute",
-      ingressKind: "exec",
-      trigger: "api_execute",
-    };
-
-    try {
-      await appendExecIngress({
-        context: params.executionContext,
-        sessionId,
-        channel: dispatchTarget.channel,
-        chatId: dispatchTarget.chatId,
-        text: queuedText,
-        ...(dispatchTarget.chatType ? { targetType: dispatchTarget.chatType } : {}),
-        ...(typeof dispatchTarget.messageThreadId === "number"
-          ? { threadId: dispatchTarget.messageThreadId }
-          : {}),
-        ...(dispatchTarget.messageId ? { messageId: dispatchTarget.messageId } : {}),
-        extra: ingressExtra,
-      });
-    } catch (error) {
-      params.agentState.logger.warn("Control execute ingress append failed", {
-        sessionId,
-        error: String(error),
-      });
-    }
-
-    const enqueueResult = resolveChatQueueStore(params.executionContext).enqueue({
-      kind: "exec",
-      channel: dispatchTarget.channel,
-      targetId: dispatchTarget.chatId,
-      sessionId,
-      text: queuedText,
-      ...(dispatchTarget.chatType ? { targetType: dispatchTarget.chatType } : {}),
-      ...(typeof dispatchTarget.messageThreadId === "number"
-        ? { threadId: dispatchTarget.messageThreadId }
-        : {}),
-      ...(dispatchTarget.messageId ? { messageId: dispatchTarget.messageId } : {}),
-      extra: ingressExtra,
-    });
-
-    return {
-      success: true,
-      queued: true,
-      queueItemId: enqueueResult.itemId,
-      queuePosition: enqueueResult.lanePosition,
-      userVisible: "",
-    };
-  }
-
   const session = params.agentState.getSession(sessionId);
   const turn = await session.prompt({
     query: executeInput,

package/src/runtime/server/http/control/ExecuteInput.ts

@@ -9,7 +9,7 @@
 import fs from "fs-extra";
 import path from "node:path";
 import { getCacheDirPath } from "@/config/Paths.js";
-import { renderChatMessageFileTag } from "@/plugin/builtins/chat/runtime/ChatMessageMarkup.js";
+import { renderChatMessageFileTag } from "@/executor/messages/ChatMessageMarkup.js";
 import type {
   ControlSessionExecuteAttachmentInput,
   ControlSessionExecuteAttachmentType,

package/src/runtime/server/http/control/MessageTimeline.ts

@@ -17,8 +17,8 @@ import type {
   SessionMessageV1,
   SessionMetadataV1,
 } from "@/executor/types/SessionMessages.js";
-import { pickLastSuccessfulChatSendText } from "@/plugin/builtins/chat/runtime/UserVisibleText.js";
-import { extractToolCallsFromUiMessage } from "@/plugin/builtins/chat/runtime/UIMessageTransformer.js";
+import { pickLastSuccessfulChatSendText } from "@/executor/messages/UserVisibleText.js";
+import { extractToolCallsFromUiMessage } from "@/executor/messages/UIMessageTransformer.js";
 import type { ControlTimelineEvent, ControlTimelineRole } from "@/runtime/server/http/control/types/ControlViewData.js";
 import { truncateText } from "./CommonHelpers.js";
 

package/src/runtime/server/http/control/OverviewRoutes.ts

@@ -10,7 +10,6 @@ import fs from "fs-extra";
 import { dirname, join } from "path";
 import { fileURLToPath } from "url";
 import { listPluginStates } from "@/plugin/core/Manager.js";
-import { listTaskDefinitions } from "@/plugin/builtins/task/Action.js";
 import { buildControlRouteAliases, toLimit } from "./CommonHelpers.js";
 import { listControlSessionSummaries, readRecentLogs } from "./Helpers.js";
 import type { ControlRouteRegistrationParams } from "@/runtime/server/http/control/types/ControlRoutes.js";
@@ -58,10 +57,15 @@ export function registerControlOverviewRoutes(
         const runtimePlugins = listPluginStates({
           context: params.getAgentContext(),
         });
-        const taskResult = await listTaskDefinitions({
-          projectRoot: runtime.rootPath,
+        const taskResult = await params.getAgentContext().plugins.runAction({
+          plugin: "task",
+          action: "list",
         });
-        const tasks = Array.isArray(taskResult.tasks) ? taskResult.tasks : [];
+        const taskData =
+          taskResult.data && typeof taskResult.data === "object" && !Array.isArray(taskResult.data)
+            ? taskResult.data as { tasks?: Array<{ status?: string }> }
+            : {};
+        const tasks = Array.isArray(taskData.tasks) ? taskData.tasks : [];
         const logs = await readRecentLogs({
           projectRoot: runtime.rootPath,
           limit: 50,

package/src/runtime/server/http/control/SessionSummaryStore.ts

@@ -7,12 +7,11 @@
  */
 
 import fs from "fs-extra";
-import type { AgentContext } from "@/core/AgentContextTypes.js";
+import type { AgentContext } from "@/types/runtime/agent/AgentContext.js";
 import {
   getDowncitySessionMessagesPath,
   getDowncitySessionRootDirPath,
 } from "@/config/Paths.js";
-import { readChatMetaBySessionId } from "@/plugin/builtins/chat/runtime/ChatMetaStore.js";
 import type { ControlSessionSummary } from "@/runtime/server/http/control/types/ControlViewData.js";
 import { decodeMaybe, truncateText } from "./CommonHelpers.js";
 import { loadSessionMessagesFromFile, resolveUiMessagePreview } from "./MessageTimeline.js";
@@ -55,12 +54,6 @@ export async function listControlSessionSummaries(params: {
       .then((s) => s)
       .catch(() => null);
     const updatedAt = lastTs || (stat ? stat.mtimeMs : undefined);
-    const chatMeta = params.executionContext
-      ? await readChatMetaBySessionId({
-          context: params.executionContext,
-          sessionId,
-        })
-      : null;
 
     items.push({
       sessionId,
@@ -70,11 +63,6 @@ export async function listControlSessionSummaries(params: {
       ...(last
         ? { lastText: truncateText(resolveUiMessagePreview(last), 180) }
         : {}),
-      ...(typeof chatMeta?.channel === "string" ? { channel: chatMeta.channel } : {}),
-      ...(typeof chatMeta?.chatId === "string" ? { chatId: chatMeta.chatId } : {}),
-      ...(typeof chatMeta?.chatTitle === "string" ? { chatTitle: chatMeta.chatTitle } : {}),
-      ...(typeof chatMeta?.targetType === "string" ? { chatType: chatMeta.targetType } : {}),
-      ...(typeof chatMeta?.threadId === "number" ? { threadId: chatMeta.threadId } : {}),
       ...(params.executingSessionIds?.has(sessionId) ? { executing: true } : {}),
     });
   }

package/src/runtime/server/http/control/TaskRoutes.ts

@@ -7,11 +7,9 @@
  */
 
 import fs from "fs-extra";
-import { join } from "path";
+import { basename, dirname, join } from "path";
 import { getDowncityTasksDirPath } from "@/config/Paths.js";
 import { runPluginCommand } from "@/plugin/core/Manager.js";
-import { listTaskDefinitions } from "@/plugin/builtins/task/Action.js";
-import { resolveTaskIdByTitle } from "@/plugin/builtins/task/runtime/Store.js";
 import type { ControlRouteRegistrationParams } from "@/runtime/server/http/control/types/ControlRoutes.js";
 import {
   buildControlRouteAliases,
@@ -26,11 +24,58 @@ import {
   readTaskRunDetail,
 } from "./Helpers.js";
 
+type TaskListItem = {
+  title?: string;
+  status?: string;
+  taskMdPath?: string;
+  lastRunTimestamp?: string;
+  [key: string]: unknown;
+};
+
+function resolveTaskIdFromTaskMdPath(taskMdPath: unknown): string {
+  const text = String(taskMdPath || "").trim();
+  if (!text) return "";
+  return basename(dirname(text));
+}
+
+async function listTasksViaPlugin(params: {
+  routes: ControlRouteRegistrationParams;
+  status?: string;
+}): Promise<TaskListItem[]> {
+  const result = await params.routes.getAgentContext().plugins.runAction({
+    plugin: "task",
+    action: "list",
+    payload: params.status ? { status: params.status } : undefined,
+  });
+  if (!result.success) {
+    throw new Error(result.error || result.message || "task list failed");
+  }
+  const data =
+    result.data && typeof result.data === "object" && !Array.isArray(result.data)
+      ? result.data as { tasks?: TaskListItem[] }
+      : {};
+  return Array.isArray(data.tasks) ? data.tasks : [];
+}
+
+async function resolveTaskIdByTitleViaPlugin(params: {
+  routes: ControlRouteRegistrationParams;
+  title: string;
+}): Promise<string> {
+  const title = String(params.title || "").trim();
+  const tasks = await listTasksViaPlugin({ routes: params.routes });
+  const matched = tasks.filter((task) => String(task.title || "").trim() === title);
+  if (matched.length !== 1) throw new Error(`Task not found: ${title}`);
+  const taskId = resolveTaskIdFromTaskMdPath(matched[0]?.taskMdPath);
+  if (!taskId) throw new Error(`Task id not found: ${title}`);
+  return taskId;
+}
+
 /**
  * 读取任务当前是否仍在执行。
  */
 async function readTaskRunningState(params: {
   projectRoot: string;
+  routes: ControlRouteRegistrationParams;
   title: string;
   lastRunTimestamp?: string;
 }): Promise<boolean> {
@@ -40,8 +85,8 @@ async function readTaskRunningState(params: {
 
   let taskId = "";
   try {
-    taskId = await resolveTaskIdByTitle({
-      projectRoot: params.projectRoot,
+    taskId = await resolveTaskIdByTitleViaPlugin({
+      routes: params.routes,
       title,
     });
   } catch {
@@ -73,15 +118,15 @@ export function registerControlTaskRoutes(
       try {
         const runtime = params.getAgentRuntime();
         const status = toOptionalString(c.req.query("status"));
-        const result = await listTaskDefinitions({
-          projectRoot: runtime.rootPath,
-          ...(status ? { status: status as "enabled" | "paused" | "disabled" } : {}),
+        const tasks = await listTasksViaPlugin({
+          routes: params,
+          ...(status ? { status } : {}),
         });
-        const tasks = Array.isArray(result.tasks) ? result.tasks : [];
         const tasksWithRunning = await Promise.all(
           tasks.map(async (task) => {
             const running = await readTaskRunningState({
               projectRoot: runtime.rootPath,
+              routes: params,
               title: String(task.title || "").trim(),
               lastRunTimestamp: task.lastRunTimestamp,
             });
@@ -219,8 +264,8 @@ export function registerControlTaskRoutes(
 
         let taskId = "";
         try {
-          taskId = await resolveTaskIdByTitle({
-            projectRoot: runtime.rootPath,
+          taskId = await resolveTaskIdByTitleViaPlugin({
+            routes: params,
             title,
           });
         } catch {
@@ -266,8 +311,8 @@ export function registerControlTaskRoutes(
 
         let taskId = "";
         try {
-          taskId = await resolveTaskIdByTitle({
-            projectRoot: runtime.rootPath,
+          taskId = await resolveTaskIdByTitleViaPlugin({
+            routes: params,
             title,
           });
         } catch {

package/src/runtime/server/http/control/TaskStore.ts

@@ -9,7 +9,6 @@
 import fs from "fs-extra";
 import path from "node:path";
 import { getLogsDirPath, getDowncityTasksDirPath } from "@/config/Paths.js";
-import { resolveTaskIdByTitle } from "@/plugin/builtins/task/runtime/Store.js";
 import type {
   ControlLogEntry,
   ControlTaskRunDetail,
@@ -19,6 +18,27 @@ import { truncateText } from "./CommonHelpers.js";
 import { loadSessionMessagesFromFile, toUiMessageTimeline } from "./MessageTimeline.js";
 
 export const TASK_RUN_DIR_REGEX = /^\d{8}-\d{6}-\d{3}$/;
+const TASK_ID_REGEXP = /^[\p{L}\p{N}][\p{L}\p{N}_\-\s]{0,63}$/u;
+
+function normalizeTaskId(input: string): string {
+  const id = String(input || "").trim();
+  if (!TASK_ID_REGEXP.test(id)) {
+    throw new Error(`Invalid taskId: "${id}"`);
+  }
+  return id;
+}
+
+function deriveTaskIdFromTitle(title: string): string {
+  const normalized = String(title || "")
+    .normalize("NFKC")
+    .replace(/[\\/:\u0000]/g, " ")
+    .replace(/[^\p{L}\p{N}_\-\s]/gu, " ")
+    .replace(/\s+/g, " ")
+    .trim()
+    .slice(0, 64)
+    .trim();
+  return normalizeTaskId(normalized);
+}
 
 /**
  * 读取近期日志。
@@ -68,7 +88,7 @@ export async function readRecentLogs(params: {
 }
 
 async function resolveTaskDir(projectRoot: string, title: string): Promise<string> {
-  const taskId = await resolveTaskIdByTitle({ projectRoot, title });
+  const taskId = deriveTaskIdFromTitle(title);
   return path.join(getDowncityTasksDirPath(projectRoot), taskId);
 }
 

package/src/runtime/server/http/control/types/AuthControl.ts

@@ -6,11 +6,7 @@
  * - 这是控制面 UI 数据类型，不属于 auth plugin 内核协议。
  */
 
-import type {
-  ChatAuthorizationCatalog,
-  ChatAuthorizationConfig,
-  ChatAuthorizationSnapshot,
-} from "@/plugin/builtins/auth/types/AuthPlugin.js";
+import type { JsonObject } from "@/types/common/Json.js";
 
 /**
  * authorization 页面完整载荷。
@@ -19,20 +15,20 @@ export interface AuthControlPayload {
   /**
    * 后端提供的授权目录定义。
    */
-  catalog: ChatAuthorizationCatalog;
+  catalog: JsonObject;
 
   /**
    * 当前静态授权配置。
    */
-  config: ChatAuthorizationConfig;
+  config: JsonObject;
 
   /**
    * 已观测用户列表。
    */
-  users: ChatAuthorizationSnapshot["users"];
+  users: JsonObject[];
 
   /**
    * 已观测会话列表。
    */
-  chats: ChatAuthorizationSnapshot["chats"];
+  chats: JsonObject[];
 }

package/src/runtime/server/http/control/types/ControlRoutes.ts

@@ -7,8 +7,8 @@
  */
 
 import type { Hono } from "hono";
-import type { AgentRuntime } from "@/core/AgentCoreTypes.js";
-import type { AgentContext } from "@/core/AgentContextTypes.js";
+import type { AgentRuntime } from "@/types/runtime/agent/AgentRuntime.js";
+import type { AgentContext } from "@/types/runtime/agent/AgentContext.js";
 
 /**
  * Control 路由注册入参。

package/src/runtime/server/http/execute/execute.ts

@@ -8,7 +8,7 @@
  */
 
 import { Hono } from "hono";
-import type { AgentRuntime } from "@/core/AgentCoreTypes.js";
+import type { AgentRuntime } from "@/types/runtime/agent/AgentRuntime.js";
 
 /**
  * 执行入口路由参数。

package/src/runtime/server/http/plugins/plugins.ts

@@ -8,7 +8,7 @@
  */
 
 import { Hono } from "hono";
-import type { AgentContext } from "@/core/AgentContextTypes.js";
+import type { AgentContext } from "@/types/runtime/agent/AgentContext.js";
 import {
   controlPluginState,
   listPluginStates,

package/src/runtime/server/http/sdk/Router.ts

@@ -7,7 +7,7 @@
  */
 
 import { Hono } from "hono";
-import type { AgentSessionCollection } from "@/sdk/AgentSdkTypes.js";
+import type { AgentSessionCollection } from "@/types/agent/AgentTypes.js";
 import { registerSdkSessionRoutes } from "@/runtime/server/http/sdk/SessionRoutes.js";
 
 /**

package/src/runtime/server/http/sdk/SessionRoutes.ts

@@ -11,7 +11,7 @@ import { Hono } from "hono";
 import type {
   AgentListSessionsInput,
   AgentSessionCollection,
-} from "@/sdk/AgentSdkTypes.js";
+} from "@/types/agent/AgentTypes.js";
 import type { AgentSessionPromptInput } from "@/types/sdk/AgentSessionPrompt.js";
 import type { AgentSessionEvent } from "@/types/sdk/AgentSessionEvent.js";
 

package/src/runtime/server/http/static/static.ts

@@ -11,7 +11,7 @@ import { Hono } from "hono";
 import fs from "fs-extra";
 import path from "path";
 import { getDowncityPublicDirPath } from "@/config/Paths.js";
-import type { AgentRuntime } from "@/core/AgentCoreTypes.js";
+import type { AgentRuntime } from "@/types/runtime/agent/AgentRuntime.js";
 
 /**
  * 静态资源路由参数。

package/src/runtime/server/rpc/Server.ts

@@ -9,8 +9,8 @@
 import fs from "fs-extra";
 import net, { type Server } from "node:net";
 import path from "node:path";
-import type { AgentRuntime } from "@/core/AgentCoreTypes.js";
-import type { AgentContext } from "@/core/AgentContextTypes.js";
+import type { AgentRuntime } from "@/types/runtime/agent/AgentRuntime.js";
+import type { AgentContext } from "@/types/runtime/agent/AgentContext.js";
 import type { JsonValue } from "@/types/common/Json.js";
 import type { LocalRpcRequest, LocalRpcResponse, LocalRpcServerHandle } from "@/types/runtime/rpc/LocalRpc.js";
 import type { ControlSessionExecuteRequestBody } from "@/runtime/server/http/control/types/ControlSessionExecute.js";

package/src/runtime/transport/rpc/Paths.ts

@@ -9,21 +9,8 @@
  */
 
 import crypto from "node:crypto";
-import os from "node:os";
 import path from "node:path";
-
-/**
- * 读取 Downcity 平台级根目录。
- *
- * 关键点（中文）
- * - local RPC socket 必须和 city 包使用同一个全局 runtime 目录。
- * - 这里保留路径约定，但不引入 city runtime/registry 实现。
- */
-function getPlatformRootDirPath(): string {
-  const explicitRoot = String(process.env.DC_PLATFORM_ROOT || "").trim();
-  if (explicitRoot) return path.resolve(explicitRoot);
-  return path.join(os.homedir(), ".downcity");
-}
+import { getPlatformRootDirPath } from "@/config/PlatformPaths.js";
 
 /**
  * 读取平台级运行目录。