@downcity/agent 1.1.25 → 1.1.32

package/src/plugin/types/Plugins.ts

@@ -0,0 +1,67 @@
+/**
+ * plugin 管理命令类型。
+ */
+
+import type { JsonValue } from "@/types/common/Json.js";
+
+export type PluginControlAction = "start" | "stop" | "restart" | "status";
+
+/**
+ * 单个 plugin 的对外状态视图。
+ */
+export type PluginStateView = {
+  /** plugin 稳定名称。 */
+  name: string;
+  /** 当前运行状态。 */
+  state: "running" | "stopped" | "starting" | "stopping" | "error";
+  /** 最近一次状态更新时间（毫秒时间戳）。 */
+  updatedAt: number;
+  /** 最近一次错误信息。 */
+  lastError?: string;
+  /** 最近一次执行的命令名称。 */
+  lastCommand?: string;
+  /** 最近一次执行命令的时间（毫秒时间戳）。 */
+  lastCommandAt?: number;
+  /** 当前 plugin 是否支持显式 start/stop 生命周期控制。 */
+  supportsLifecycle: boolean;
+  /** 当前 plugin 是否支持 command/action 调用。 */
+  supportsCommand: boolean;
+};
+
+/**
+ * plugin 列表响应。
+ */
+export type PluginListResponse = {
+  success: boolean;
+  plugins?: PluginStateView[];
+  error?: string;
+};
+
+/**
+ * plugin 生命周期控制响应。
+ */
+export type PluginControlResponse = {
+  success: boolean;
+  plugin?: PluginStateView;
+  error?: string;
+};
+
+/**
+ * plugin command/action 执行响应。
+ */
+export type PluginCommandResponse = {
+  success: boolean;
+  plugin?: PluginStateView;
+  message?: string;
+  data?: JsonValue;
+  error?: string;
+};
+
+export type PluginCliBaseOptions = {
+  path?: string;
+  agent?: string;
+  host?: string;
+  port?: number;
+  token?: string;
+  json?: boolean;
+};

package/src/runtime/host/AgentHostRuntime.ts

@@ -28,10 +28,15 @@ import type { DowncityConfig } from "@/types/config/DowncityConfig.js";
 /**
  * 创建当前项目的路径能力集合。
  */
-export function createAgentPathRuntime(projectRoot: string): AgentPathRuntime {
+export function createAgentPathRuntime(
+  projectRoot: string,
+  agentIdInput: string,
+): AgentPathRuntime {
   const rootPath = String(projectRoot || "").trim();
+  const agentId = String(agentIdInput || "").trim();
   return {
     projectRoot: rootPath,
+    agentId,
     getDowncityDirPath: () => getDowncityDirPath(rootPath),
     getCacheDirPath: () => getCacheDirPath(rootPath),
     getDowncityChannelDirPath: () => getDowncityChannelDirPath(rootPath),
@@ -40,8 +45,9 @@ export function createAgentPathRuntime(projectRoot: string): AgentPathRuntime {
     getDowncityMemoryLongTermPath: () => getDowncityMemoryLongTermPath(rootPath),
     getDowncityMemoryDailyDirPath: () => getDowncityMemoryDailyDirPath(rootPath),
     getDowncityMemoryDailyPath: (date) => getDowncityMemoryDailyPath(rootPath, date),
-    getDowncitySessionRootDirPath: () => getDowncitySessionRootDirPath(rootPath),
-    getDowncitySessionDirPath: (sessionId) => getDowncitySessionDirPath(rootPath, sessionId),
+    getDowncitySessionRootDirPath: () => getDowncitySessionRootDirPath(rootPath, agentId),
+    getDowncitySessionDirPath: (sessionId) =>
+      getDowncitySessionDirPath(rootPath, agentId, sessionId),
   };
 }
 

package/src/runtime/host/daemon/ProjectSetup.ts

@@ -15,6 +15,7 @@ import {
 import type { AgentPlatformRuntime } from "@/types/runtime/host/AgentHost.js";
 import {
   getCacheDirPath,
+  getDowncityAgentsRootDirPath,
   getLogsDirPath,
   getProfileMdPath,
   getDowncityConfigDirPath,
@@ -24,7 +25,6 @@ import {
   getDowncityJsonPath,
   getDowncityProfileDirPath,
   getDowncityPublicDirPath,
-  getDowncitySessionRootDirPath,
   getDowncityTasksDirPath,
 } from "@/config/Paths.js";
 
@@ -59,7 +59,7 @@ function ensureShipDirectories(projectRoot: string): void {
   fs.ensureDirSync(getCacheDirPath(projectRoot));
   fs.ensureDirSync(getDowncityProfileDirPath(projectRoot));
   fs.ensureDirSync(getDowncityDataDirPath(projectRoot));
-  fs.ensureDirSync(getDowncitySessionRootDirPath(projectRoot));
+  fs.ensureDirSync(getDowncityAgentsRootDirPath(projectRoot));
   fs.ensureDirSync(getDowncityPublicDirPath(projectRoot));
   fs.ensureDirSync(getDowncityConfigDirPath(projectRoot));
   fs.ensureDirSync(path.join(getDowncityDirPath(projectRoot), "schema"));

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

@@ -10,15 +10,10 @@ import type { AgentRuntime } from "@/core/AgentCoreTypes.js";
 import type { AgentContext } from "@/core/AgentContextTypes.js";
 import type { JsonObject } from "@/types/common/Json.js";
 import type { ControlSessionExecuteAttachmentInput } from "@/runtime/server/http/control/types/ControlSessionExecute.js";
-import { drainDeferredPersistedUserMessages } from "@session/SessionRunScope.js";
-import { resolveChatQueueStore } from "@/service/builtins/chat/runtime/ChatQueue.js";
-import { resolveDispatchTargetByChatKey } from "@/service/builtins/chat/runtime/ChatkeySend.js";
-import { appendExecIngress } from "@/service/builtins/chat/runtime/ChatIngressStore.js";
-import { buildQueuedUserMessageWithInfo } from "@/service/builtins/chat/runtime/QueuedUserMessage.js";
-import {
-  pickLastSuccessfulChatSendText,
-  resolveAssistantMessageForPersistence,
-} from "@/service/builtins/chat/runtime/UserVisibleText.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";
 
 /**
@@ -94,7 +89,6 @@ export async function executeBySessionId(params: {
         ? { threadId: dispatchTarget.messageThreadId }
         : {}),
       ...(dispatchTarget.messageId ? { messageId: dispatchTarget.messageId } : {}),
-      sessionPersisted: true,
       extra: ingressExtra,
     });
 
@@ -108,44 +102,16 @@ export async function executeBySessionId(params: {
   }
 
   const session = params.agentState.getSession(sessionId);
-  await session.appendUserMessage({
-    text: executeInput,
-  });
-
-  const result = await session.execute({
+  const turn = await session.prompt({
     query: executeInput,
   });
-
-  const userVisible = pickLastSuccessfulChatSendText(result.assistantMessage).trim();
-  try {
-    const messageForPersistence = resolveAssistantMessageForPersistence(
-      result.assistantMessage,
-    );
-    if (messageForPersistence) {
-      await session.appendAssistantMessage({
-        message: messageForPersistence,
-        fallbackText: userVisible,
-        extra: {
-          via: "tui_session_execute",
-          note: "assistant_message_missing",
-        },
-      });
-    }
-    const deferredInjectedMessages = drainDeferredPersistedUserMessages(
-      sessionId,
-    );
-    for (const message of deferredInjectedMessages) {
-      await session.appendUserMessage({
-        message,
-      });
-    }
-  } catch {
-    // ignore
-  }
+  const result = await turn.finished;
 
   return {
-    ...result,
-    userVisible,
+    success: result.success,
+    ...(result.error ? { error: result.error } : {}),
+    assistantMessage: result.assistantMessage,
+    userVisible: result.text.trim(),
     queued: false,
   };
 }

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 "@/service/builtins/chat/runtime/ChatMessageMarkup.js";
+import { renderChatMessageFileTag } from "@/plugin/builtins/chat/runtime/ChatMessageMarkup.js";
 import type {
   ControlSessionExecuteAttachmentInput,
   ControlSessionExecuteAttachmentType,

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

@@ -17,8 +17,8 @@ import type {
   SessionMessageV1,
   SessionMetadataV1,
 } from "@/session/types/SessionMessages.js";
-import { pickLastSuccessfulChatSendText } from "@/service/builtins/chat/runtime/UserVisibleText.js";
-import { extractToolCallsFromUiMessage } from "@/service/builtins/chat/runtime/UIMessageTransformer.js";
+import { pickLastSuccessfulChatSendText } from "@/plugin/builtins/chat/runtime/UserVisibleText.js";
+import { extractToolCallsFromUiMessage } from "@/plugin/builtins/chat/runtime/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

@@ -2,15 +2,15 @@
  * Control 概览路由。
  *
  * 关键点（中文）
- * - 聚合 overview 与 services 两块轻量只读接口。
+ * - 聚合 overview 与 runtime plugins 两块轻量只读接口。
  * - 只负责路由层拼装，不承载复杂业务状态机。
  */
 
 import fs from "fs-extra";
 import { dirname, join } from "path";
 import { fileURLToPath } from "url";
-import { listServiceStates } from "@/service/core/Manager.js";
-import { listTaskDefinitions } from "@/service/builtins/task/Action.js";
+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";
@@ -34,7 +34,7 @@ const DC_VERSION = (() => {
 })();
 
 /**
- * 注册概览与服务路由。
+ * 注册概览与运行态 plugin 路由。
  */
 export function registerControlOverviewRoutes(
   params: ControlRouteRegistrationParams,
@@ -51,10 +51,11 @@ export function registerControlOverviewRoutes(
         );
         const sessions = await listControlSessionSummaries({
           projectRoot: runtime.rootPath,
+          agentId: runtime.paths.agentId,
           executionContext: params.getAgentContext(),
           limit: sessionLimit,
         });
-        const services = listServiceStates({
+        const runtimePlugins = listPluginStates({
           context: params.getAgentContext(),
         });
         const taskResult = await listTaskDefinitions({
@@ -84,7 +85,8 @@ export function registerControlOverviewRoutes(
             total: sessions.length,
             items: sessions,
           },
-          services,
+          services: runtimePlugins,
+          plugins: runtimePlugins,
           tasks: {
             total: tasks.length,
             statusCount,
@@ -101,7 +103,10 @@ export function registerControlOverviewRoutes(
     app.get(routePath, (c) => {
       return c.json({
         success: true,
-        services: listServiceStates({
+        services: listPluginStates({
+          context: params.getAgentContext(),
+        }),
+        plugins: listPluginStates({
           context: params.getAgentContext(),
         }),
       });

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

@@ -104,6 +104,7 @@ export function registerControlSessionRoutes(
         );
         const sessions = await listControlSessionSummaries({
           projectRoot: runtime.rootPath,
+          agentId: runtime.paths.agentId,
           executionContext: params.getAgentContext(),
           limit,
           executingSessionIds,
@@ -145,7 +146,11 @@ export function registerControlSessionRoutes(
           return c.json({ success: false, error: "Missing sessionId" }, 400);
         }
 
-        const filePath = getDowncitySessionMessagesPath(runtime.rootPath, sessionId);
+        const filePath = getDowncitySessionMessagesPath(
+          runtime.rootPath,
+          runtime.paths.agentId,
+          sessionId,
+        );
         const messages = await loadSessionMessagesFromFile(filePath);
         const sliced = messages
           .slice(-limit)
@@ -172,7 +177,11 @@ export function registerControlSessionRoutes(
           return c.json({ success: false, error: "Missing sessionId" }, 400);
         }
 
-        const messagesPath = getDowncitySessionMessagesPath(runtime.rootPath, sessionId);
+        const messagesPath = getDowncitySessionMessagesPath(
+          runtime.rootPath,
+          runtime.paths.agentId,
+          sessionId,
+        );
         const messagesDirPath = dirname(messagesPath);
         await fs.remove(messagesDirPath);
         // 关键点（中文）：清理消息文件后，同步清掉内存中的 session runtime，避免旧上下文继续运行。
@@ -224,6 +233,7 @@ export function registerControlSessionRoutes(
 
         const archiveDirPath = getDowncitySessionMessagesArchiveDirPath(
           runtime.rootPath,
+          runtime.paths.agentId,
           sessionId,
         );
         if (!(await fs.pathExists(archiveDirPath))) {
@@ -248,6 +258,7 @@ export function registerControlSessionRoutes(
 
           const archivePath = getDowncitySessionMessagesArchivePath(
             runtime.rootPath,
+            runtime.paths.agentId,
             sessionId,
             archiveId,
           );
@@ -312,6 +323,7 @@ export function registerControlSessionRoutes(
 
         const archivePath = getDowncitySessionMessagesArchivePath(
           runtime.rootPath,
+          runtime.paths.agentId,
           sessionId,
           archiveId,
         );

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

@@ -12,7 +12,7 @@ import {
   getDowncitySessionMessagesPath,
   getDowncitySessionRootDirPath,
 } from "@/config/Paths.js";
-import { readChatMetaBySessionId } from "@/service/builtins/chat/runtime/ChatMetaStore.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";
@@ -22,11 +22,15 @@ import { loadSessionMessagesFromFile, resolveUiMessagePreview } from "./MessageT
  */
 export async function listControlSessionSummaries(params: {
   projectRoot: string;
+  agentId: string;
   executionContext?: AgentContext;
   limit: number;
   executingSessionIds?: Set<string>;
 }): Promise<ControlSessionSummary[]> {
-  const rootDir = getDowncitySessionRootDirPath(params.projectRoot);
+  const rootDir = getDowncitySessionRootDirPath(
+    params.projectRoot,
+    params.agentId,
+  );
   if (!(await fs.pathExists(rootDir))) return [];
 
   const entries = await fs.readdir(rootDir, { withFileTypes: true });
@@ -37,7 +41,11 @@ export async function listControlSessionSummaries(params: {
     const sessionId = decodeMaybe(entry.name);
     if (!sessionId) continue;
 
-    const filePath = getDowncitySessionMessagesPath(params.projectRoot, sessionId);
+    const filePath = getDowncitySessionMessagesPath(
+      params.projectRoot,
+      params.agentId,
+      sessionId,
+    );
     const messages = await loadSessionMessagesFromFile(filePath);
     const last = messages.at(-1);
     const lastTs =

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

@@ -3,15 +3,15 @@
  *
  * 关键点（中文）
  * - 聚合 tasks/runs/logs 相关接口。
- * - 任务动作统一复用 task service command，不在 UI 层重复实现业务语义。
+ * - 任务动作统一复用 task runtime plugin command，不在 UI 层重复实现业务语义。
  */
 
 import fs from "fs-extra";
 import { join } from "path";
 import { getDowncityTasksDirPath } from "@/config/Paths.js";
-import { runServiceCommand } from "@/service/core/Manager.js";
-import { listTaskDefinitions } from "@/service/builtins/task/Action.js";
-import { resolveTaskIdByTitle } from "@/service/builtins/task/runtime/Store.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,
@@ -111,8 +111,8 @@ export function registerControlTaskRoutes(
         }
 
         const reason = toOptionalString(body.reason);
-        const result = await runServiceCommand({
-          serviceName: "task",
+        const result = await runPluginCommand({
+          pluginName: "task",
           command: "run",
           payload: {
             title,
@@ -142,8 +142,8 @@ export function registerControlTaskRoutes(
           return c.json({ success: false, error: "Invalid status" }, 400);
         }
 
-        const result = await runServiceCommand({
-          serviceName: "task",
+        const result = await runPluginCommand({
+          pluginName: "task",
           command: "status",
           payload: {
             title,
@@ -179,8 +179,8 @@ export function registerControlTaskRoutes(
           return c.json({ success: false, error: "Invalid title" }, 400);
         }
 
-        const result = await runServiceCommand({
-          serviceName: "task",
+        const result = await runPluginCommand({
+          pluginName: "task",
           command: "delete",
           payload: {
             title,

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

@@ -9,7 +9,7 @@
 import fs from "fs-extra";
 import path from "node:path";
 import { getLogsDirPath, getDowncityTasksDirPath } from "@/config/Paths.js";
-import { resolveTaskIdByTitle } from "@/service/builtins/task/runtime/Store.js";
+import { resolveTaskIdByTitle } from "@/plugin/builtins/task/runtime/Store.js";
 import type {
   ControlLogEntry,
   ControlTaskRunDetail,

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

@@ -8,12 +8,7 @@
  */
 
 import { Hono } from "hono";
-import { drainDeferredPersistedUserMessages } from "@session/SessionRunScope.js";
 import type { AgentRuntime } from "@/core/AgentCoreTypes.js";
-import {
-  pickLastSuccessfulChatSendText,
-  resolveAssistantMessageForPersistence,
-} from "@/service/builtins/chat/runtime/UserVisibleText.js";
 
 /**
  * 执行入口路由参数。
@@ -72,13 +67,6 @@ export function createExecuteRouter(
       typeof body?.chatId === "string" && body.chatId.trim()
         ? body.chatId.trim()
         : "default";
-    const actorId =
-      typeof body?.userId === "string" && body.userId.trim()
-        ? body.userId.trim()
-        : typeof body?.actorId === "string" && body.actorId.trim()
-          ? body.actorId.trim()
-          : "api";
-
     if (!instructions) {
       return c.json(
         { success: false, message: "Missing instructions field" },
@@ -90,43 +78,16 @@ export function createExecuteRouter(
       const sessionId = `api:chat:${chatId}`;
       const agentState = options.getAgentRuntime();
       const session = agentState.getSession(sessionId);
-      await session.appendUserMessage({
-        text: String(instructions),
-      });
-
-      const result = await session.execute({
+      const turn = await session.prompt({
         query: String(instructions),
       });
+      const result = await turn.finished;
 
-      const userVisible = pickLastSuccessfulChatSendText(result.assistantMessage);
-      try {
-        const messageForPersistence = resolveAssistantMessageForPersistence(
-          result.assistantMessage,
-        );
-        if (messageForPersistence) {
-          await session.appendAssistantMessage({
-            message: messageForPersistence,
-            fallbackText: userVisible,
-            extra: {
-              via: "api_execute",
-              note: "assistant_message_missing",
-              actorId,
-            },
-          });
-        }
-        const deferredInjectedMessages = drainDeferredPersistedUserMessages(
-          sessionId,
-        );
-        for (const message of deferredInjectedMessages) {
-          await session.appendUserMessage({
-            message,
-          });
-        }
-      } catch {
-        // ignore
-      }
-
-      return c.json(result);
+      return c.json({
+        success: result.success,
+        ...(result.error ? { error: result.error } : {}),
+        assistantMessage: result.assistantMessage,
+      });
     } catch (error) {
       return c.json({ success: false, message: String(error) }, 500);
     }