@downcity/agent 1.1.13 → 1.1.15

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

@@ -9,112 +9,128 @@
 
 import { Hono } from "hono";
 import { drainDeferredPersistedUserMessages } from "@session/SessionRunScope.js";
-import { getAgentRuntime } from "@/runtime/AgentRuntime.js";
+import type { AgentRuntime } from "@/core/AgentCoreTypes.js";
 import {
   pickLastSuccessfulChatSendText,
   resolveAssistantMessageForPersistence,
 } from "@/service/builtins/chat/runtime/UserVisibleText.js";
 
 /**
- * 执行入口路由。
+ * 执行入口路由参数。
  */
-export const executeRouter = new Hono();
+type ExecuteRouterOptions = {
+  /**
+   * 读取当前 agent runtime。
+   */
+  getAgentRuntime: () => AgentRuntime;
+};
 
-executeRouter.post("/api/execute", async (c) => {
-  let bodyText = "";
-  try {
-    bodyText = await c.req.text();
-  } catch {
-    return c.json(
-      { success: false, message: "Unable to read request body" },
-      400,
-    );
-  }
-
-  if (!bodyText) {
-    return c.json({ success: false, message: "Request body is empty" }, 400);
-  }
+/**
+ * 创建执行入口路由。
+ */
+export function createExecuteRouter(
+  options: ExecuteRouterOptions,
+): Hono {
+  const router = new Hono();
 
-  let body: {
-    instructions?: string;
-    chatId?: string;
-    userId?: string;
-    actorId?: string;
-    messageId?: string;
-  };
-  try {
-    body = JSON.parse(bodyText) as typeof body;
-  } catch {
-    return c.json(
-      {
-        success: false,
-        message: `JSON parse failed: ${bodyText.substring(0, 50)}...`,
-      },
-      400,
-    );
-  }
+  router.post("/api/execute", async (c) => {
+    let bodyText = "";
+    try {
+      bodyText = await c.req.text();
+    } catch {
+      return c.json(
+        { success: false, message: "Unable to read request body" },
+        400,
+      );
+    }
 
-  const instructions = body?.instructions;
-  const chatId =
-    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 (!bodyText) {
+      return c.json({ success: false, message: "Request body is empty" }, 400);
+    }
 
-  if (!instructions) {
-    return c.json(
-      { success: false, message: "Missing instructions field" },
-      400,
-    );
-  }
+    let body: {
+      instructions?: string;
+      chatId?: string;
+      userId?: string;
+      actorId?: string;
+      messageId?: string;
+    };
+    try {
+      body = JSON.parse(bodyText) as typeof body;
+    } catch {
+      return c.json(
+        {
+          success: false,
+          message: `JSON parse failed: ${bodyText.substring(0, 50)}...`,
+        },
+        400,
+      );
+    }
 
-  try {
-    const sessionId = `api:chat:${chatId}`;
-    const agentState = getAgentRuntime();
-    const session = agentState.getSession(sessionId);
-    await session.appendUserMessage({
-      text: String(instructions),
-    });
+    const instructions = body?.instructions;
+    const chatId =
+      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";
 
-    const result = await session.run({
-      query: String(instructions),
-    });
+    if (!instructions) {
+      return c.json(
+        { success: false, message: "Missing instructions field" },
+        400,
+      );
+    }
 
-    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,
-        });
+      const sessionId = `api:chat:${chatId}`;
+      const agentState = options.getAgentRuntime();
+      const session = agentState.getSession(sessionId);
+      await session.appendUserMessage({
+        text: String(instructions),
+      });
+
+      const result = await session.run({
+        query: String(instructions),
+      });
+
+      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
       }
-    } catch {
-      // ignore
+
+      return c.json(result);
+    } catch (error) {
+      return c.json({ success: false, message: String(error) }, 500);
     }
+  });
 
-    return c.json(result);
-  } catch (error) {
-    return c.json({ success: false, message: String(error) }, 500);
-  }
-});
+  return router;
+}

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

@@ -8,60 +8,76 @@
  */
 
 import { Hono } from "hono";
-import { getAgentContext } from "@/runtime/AgentRuntime.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 
 /**
- * Plugin 路由。
+ * Plugin 路由参数。
  */
-export const pluginsRouter = new Hono();
+type PluginsRouterOptions = {
+  /**
+   * 读取当前 agent 执行上下文。
+   */
+  getAgentContext: () => AgentContext;
+};
 
-pluginsRouter.get("/api/plugins/list", (c) => {
-  return c.json({
-    success: true,
-    plugins: getAgentContext().plugins.list(),
+/**
+ * 创建 plugin 路由。
+ */
+export function createPluginsRouter(
+  options: PluginsRouterOptions,
+): Hono {
+  const router = new Hono();
+
+  router.get("/api/plugins/list", (c) => {
+    return c.json({
+      success: true,
+      plugins: options.getAgentContext().plugins.list(),
+    });
   });
-});
 
-pluginsRouter.post("/api/plugins/availability", async (c) => {
-  const body = await c.req.json().catch(() => null);
-  const pluginName = String(body?.pluginName || "").trim();
+  router.post("/api/plugins/availability", async (c) => {
+    const body = await c.req.json().catch(() => null);
+    const pluginName = String(body?.pluginName || "").trim();
 
-  if (!pluginName) {
-    return c.json({ success: false, error: "pluginName is required" }, 400);
-  }
+    if (!pluginName) {
+      return c.json({ success: false, error: "pluginName is required" }, 400);
+    }
 
-  const availability =
-    await getAgentContext().plugins.availability(pluginName);
-  return c.json({
-    success: true,
-    pluginName,
-    availability,
+    const availability =
+      await options.getAgentContext().plugins.availability(pluginName);
+    return c.json({
+      success: true,
+      pluginName,
+      availability,
+    });
   });
-});
 
-pluginsRouter.post("/api/plugins/action", async (c) => {
-  const body = await c.req.json().catch(() => null);
-  const pluginName = String(body?.pluginName || "").trim();
-  const actionName = String(body?.actionName || "").trim();
+  router.post("/api/plugins/action", async (c) => {
+    const body = await c.req.json().catch(() => null);
+    const pluginName = String(body?.pluginName || "").trim();
+    const actionName = String(body?.actionName || "").trim();
 
-  if (!pluginName) {
-    return c.json({ success: false, error: "pluginName is required" }, 400);
-  }
-  if (!actionName) {
-    return c.json({ success: false, error: "actionName is required" }, 400);
-  }
+    if (!pluginName) {
+      return c.json({ success: false, error: "pluginName is required" }, 400);
+    }
+    if (!actionName) {
+      return c.json({ success: false, error: "actionName is required" }, 400);
+    }
 
-  const result = await getAgentContext().plugins.runAction({
-    plugin: pluginName,
-    action: actionName,
-    payload: body?.payload,
+    const result = await options.getAgentContext().plugins.runAction({
+      plugin: pluginName,
+      action: actionName,
+      payload: body?.payload,
+    });
+    return c.json(
+      {
+        ...result,
+        pluginName,
+        actionName,
+      },
+      result.success ? 200 : 400,
+    );
   });
-  return c.json(
-    {
-      ...result,
-      pluginName,
-      actionName,
-    },
-    result.success ? 200 : 400,
-  );
-});
+
+  return router;
+}

package/src/server/http/services/services.ts

@@ -4,91 +4,95 @@
  * 职责说明：
  * 1. 提供 service 状态列表接口。
  * 2. 提供 service lifecycle 控制接口。
- * 3. 提供 service command 桥接，并挂载各 service 自身路由。
+ * 3. 提供统一 service command 桥接。
  */
 
 import { Hono } from "hono";
 import {
   controlServiceState,
   listServiceStates,
-  registerAllServicesForServer,
   runServiceCommand,
 } from "@/service/core/Manager.js";
 import type { ServiceStateControlAction } from "@/service/core/Manager.js";
-import { getAgentContext } from "@/runtime/AgentRuntime.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
+import { parseServiceCommandRequestBody } from "@/service/core/ServiceCommandRequest.js";
 
 /**
- * Service 路由。
+ * Service 路由参数。
  */
-export const servicesRouter = new Hono();
-let serviceActionRoutesRegistered = false;
+type ServicesRouterOptions = {
+  /**
+   * 读取当前 agent 执行上下文。
+   */
+  getAgentContext: () => AgentContext;
+};
 
-servicesRouter.get("/api/services/list", (c) => {
-  return c.json({
-    success: true,
-    services: listServiceStates(),
+/**
+ * 创建 service 路由。
+ */
+export function createServicesRouter(
+  options: ServicesRouterOptions,
+): Hono {
+  const router = new Hono();
+
+  router.get("/api/services/list", (c) => {
+    const context = options.getAgentContext();
+    return c.json({
+      success: true,
+      services: listServiceStates({ context }),
+    });
   });
-});
 
-servicesRouter.post("/api/services/control", async (c) => {
-  const body = await c.req.json().catch(() => null);
-  const serviceName = String(body?.serviceName || "").trim();
-  const action = String(body?.action || "")
-    .trim()
-    .toLowerCase();
+  router.post("/api/services/control", async (c) => {
+    const body = await c.req.json().catch(() => null);
+    const serviceName = String(body?.serviceName || "").trim();
+    const action = String(body?.action || "")
+      .trim()
+      .toLowerCase();
 
-  if (!serviceName) {
-    return c.json({ success: false, error: "serviceName is required" }, 400);
-  }
-  if (!action) {
-    return c.json({ success: false, error: "action is required" }, 400);
-  }
-  if (!["start", "stop", "restart", "status"].includes(action)) {
-    return c.json({ success: false, error: "invalid action" }, 400);
-  }
+    if (!serviceName) {
+      return c.json({ success: false, error: "serviceName is required" }, 400);
+    }
+    if (!action) {
+      return c.json({ success: false, error: "action is required" }, 400);
+    }
+    if (!["start", "stop", "restart", "status"].includes(action)) {
+      return c.json({ success: false, error: "invalid action" }, 400);
+    }
 
-  const result = await controlServiceState({
-    serviceName,
-    action: action as ServiceStateControlAction,
-    context: getAgentContext(),
+    const result = await controlServiceState({
+      serviceName,
+      action: action as ServiceStateControlAction,
+      context: options.getAgentContext(),
+    });
+    return c.json(result, result.success ? 200 : 400);
   });
-  return c.json(result, result.success ? 200 : 400);
-});
 
-servicesRouter.post("/api/services/command", async (c) => {
-  const body = await c.req.json().catch(() => null);
-  const serviceName = String(body?.serviceName || "").trim();
-  const command = String(body?.command || "").trim();
-  const schedule =
-    body?.schedule && typeof body.schedule === "object" && !Array.isArray(body.schedule)
-      ? body.schedule
-      : undefined;
+  router.post("/api/services/command", async (c) => {
+    const body = await c.req.json().catch(() => null);
+    let requestBody;
+    try {
+      requestBody = parseServiceCommandRequestBody(body);
+    } catch (error) {
+      return c.json({ success: false, error: String(error) }, 400);
+    }
 
-  if (!serviceName) {
-    return c.json({ success: false, error: "serviceName is required" }, 400);
-  }
-  if (!command) {
-    return c.json({ success: false, error: "command is required" }, 400);
-  }
+    if (!requestBody.serviceName) {
+      return c.json({ success: false, error: "serviceName is required" }, 400);
+    }
+    if (!requestBody.command) {
+      return c.json({ success: false, error: "command is required" }, 400);
+    }
 
-  const result = await runServiceCommand({
-    serviceName,
-    command,
-    payload: body?.payload,
-    schedule,
-    context: getAgentContext(),
+    const result = await runServiceCommand({
+      serviceName: requestBody.serviceName,
+      command: requestBody.command,
+      payload: requestBody.payload,
+      schedule: requestBody.schedule,
+      context: options.getAgentContext(),
+    });
+    return c.json(result, result.success ? 200 : 400);
   });
-  return c.json(result, result.success ? 200 : 400);
-});
 
-/**
- * 确保 service action API 路由只注册一次。
- *
- * 关键点（中文）
- * - 延迟到 server 启动阶段再注册，避免 `city agent create` 等无需执行上下文的命令在 import 时触发初始化错误。
- */
-export function ensureServiceActionRoutesRegistered(): void {
-  if (serviceActionRoutesRegistered) return;
-  registerAllServicesForServer(servicesRouter, getAgentContext());
-  serviceActionRoutesRegistered = true;
+  return router;
 }