@downcity/agent 1.1.13 → 1.1.15

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

@@ -11,94 +11,110 @@ import { Hono } from "hono";
 import fs from "fs-extra";
 import path from "path";
 import { getDowncityPublicDirPath } from "@/config/Paths.js";
-import { getAgentRuntime } from "@/runtime/AgentRuntime.js";
+import type { AgentRuntime } from "@/core/AgentCoreTypes.js";
 
 /**
- * 静态资源路由。
+ * 静态资源路由参数。
  */
-export const staticRouter = new Hono();
+type StaticRouterOptions = {
+  /**
+   * 读取当前 agent runtime。
+   */
+  getAgentRuntime: () => AgentRuntime;
+};
 
-staticRouter.get("/", async (c) => {
-  const indexPath = path.join(getAgentRuntime().rootPath, "public", "index.html");
-  if (await fs.pathExists(indexPath)) {
-    const content = await fs.readFile(indexPath, "utf-8");
-    return c.body(content, 200, {
-      "Content-Type": "text/html; charset=utf-8",
-      "Cache-Control": "no-cache",
-    });
-  }
-  return c.text("Downcity Agent Server", 200);
-});
+/**
+ * 创建静态资源路由。
+ */
+export function createStaticRouter(
+  options: StaticRouterOptions,
+): Hono {
+  const router = new Hono();
 
-staticRouter.get("/styles.css", async (c) => {
-  const cssPath = path.join(getAgentRuntime().rootPath, "public", "styles.css");
-  if (await fs.pathExists(cssPath)) {
-    const content = await fs.readFile(cssPath, "utf-8");
-    return c.body(content, 200, {
-      "Content-Type": "text/css; charset=utf-8",
-      "Cache-Control": "no-cache",
-    });
-  }
-  return c.text("Not Found", 404);
-});
+  router.get("/", async (c) => {
+    const indexPath = path.join(options.getAgentRuntime().rootPath, "public", "index.html");
+    if (await fs.pathExists(indexPath)) {
+      const content = await fs.readFile(indexPath, "utf-8");
+      return c.body(content, 200, {
+        "Content-Type": "text/html; charset=utf-8",
+        "Cache-Control": "no-cache",
+      });
+    }
+    return c.text("Downcity Agent Server", 200);
+  });
 
-staticRouter.get("/app.js", async (c) => {
-  const jsPath = path.join(getAgentRuntime().rootPath, "public", "app.js");
-  if (await fs.pathExists(jsPath)) {
-    const content = await fs.readFile(jsPath, "utf-8");
-    return c.body(content, 200, {
-      "Content-Type": "application/javascript; charset=utf-8",
-      "Cache-Control": "no-cache",
-    });
-  }
-  return c.text("Not Found", 404);
-});
+  router.get("/styles.css", async (c) => {
+    const cssPath = path.join(options.getAgentRuntime().rootPath, "public", "styles.css");
+    if (await fs.pathExists(cssPath)) {
+      const content = await fs.readFile(cssPath, "utf-8");
+      return c.body(content, 200, {
+        "Content-Type": "text/css; charset=utf-8",
+        "Cache-Control": "no-cache",
+      });
+    }
+    return c.text("Not Found", 404);
+  });
 
-staticRouter.get("/downcity/public/*", async (c) => {
-  const root = getDowncityPublicDirPath(getAgentRuntime().rootPath);
-  const prefix = "/downcity/public/";
-  const requestPath = c.req.path;
-  const rel = requestPath.startsWith(prefix)
-    ? requestPath.slice(prefix.length)
-    : "";
-  if (!rel) return c.text("Not Found", 404);
+  router.get("/app.js", async (c) => {
+    const jsPath = path.join(options.getAgentRuntime().rootPath, "public", "app.js");
+    if (await fs.pathExists(jsPath)) {
+      const content = await fs.readFile(jsPath, "utf-8");
+      return c.body(content, 200, {
+        "Content-Type": "application/javascript; charset=utf-8",
+        "Cache-Control": "no-cache",
+      });
+    }
+    return c.text("Not Found", 404);
+  });
 
-  const full = path.resolve(root, rel);
-  const rootResolved = path.resolve(root);
-  if (full !== rootResolved && !full.startsWith(rootResolved + path.sep)) {
-    return c.text("Forbidden", 403);
-  }
+  router.get("/downcity/public/*", async (c) => {
+    const root = getDowncityPublicDirPath(options.getAgentRuntime().rootPath);
+    const prefix = "/downcity/public/";
+    const requestPath = c.req.path;
+    const rel = requestPath.startsWith(prefix)
+      ? requestPath.slice(prefix.length)
+      : "";
+    if (!rel) return c.text("Not Found", 404);
 
-  try {
-    const stat = await fs.stat(full);
-    if (!stat.isFile()) return c.text("Not Found", 404);
-  } catch {
-    return c.text("Not Found", 404);
-  }
+    const full = path.resolve(root, rel);
+    const rootResolved = path.resolve(root);
+    if (full !== rootResolved && !full.startsWith(rootResolved + path.sep)) {
+      return c.text("Forbidden", 403);
+    }
 
-  const ext = path.extname(full).toLowerCase();
-  const contentType =
-    ext === ".html"
-      ? "text/html; charset=utf-8"
-      : ext === ".css"
-        ? "text/css; charset=utf-8"
-        : ext === ".js"
-          ? "application/javascript; charset=utf-8"
-          : ext === ".json"
-            ? "application/json; charset=utf-8"
-            : ext === ".txt" || ext === ".md"
-              ? "text/plain; charset=utf-8"
-              : ext === ".pdf"
-                ? "application/pdf"
-                : ext === ".png"
-                  ? "image/png"
-                  : ext === ".jpg" || ext === ".jpeg"
-                    ? "image/jpeg"
-                    : "application/octet-stream";
+    try {
+      const stat = await fs.stat(full);
+      if (!stat.isFile()) return c.text("Not Found", 404);
+    } catch {
+      return c.text("Not Found", 404);
+    }
 
-  const buf = await fs.readFile(full);
-  return c.body(buf, 200, {
-    "Content-Type": contentType,
-    "Cache-Control": "no-cache",
+    const ext = path.extname(full).toLowerCase();
+    const contentType =
+      ext === ".html"
+        ? "text/html; charset=utf-8"
+        : ext === ".css"
+          ? "text/css; charset=utf-8"
+          : ext === ".js"
+            ? "application/javascript; charset=utf-8"
+            : ext === ".json"
+              ? "application/json; charset=utf-8"
+              : ext === ".txt" || ext === ".md"
+                ? "text/plain; charset=utf-8"
+                : ext === ".pdf"
+                  ? "application/pdf"
+                  : ext === ".png"
+                    ? "image/png"
+                    : ext === ".jpg" || ext === ".jpeg"
+                      ? "image/jpeg"
+                      : "application/octet-stream";
+
+    const buf = await fs.readFile(full);
+    return c.body(buf, 200, {
+      "Content-Type": contentType,
+      "Cache-Control": "no-cache",
+    });
   });
-});
+
+  return router;
+}

package/src/server/rpc/Server.ts

@@ -9,8 +9,9 @@
 import fs from "fs-extra";
 import net, { type Server } from "node:net";
 import path from "node:path";
-import type { AgentRuntime } from "@/runtime/AgentRuntimeTypes.js";
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentRuntime } from "@/core/AgentCoreTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
+import type { AgentCore } from "@/core/AgentCore.js";
 import type { JsonValue } from "@/types/common/Json.js";
 import type { LocalRpcRequest, LocalRpcResponse, LocalRpcServerHandle } from "@/types/rpc/LocalRpc.js";
 import type { ControlSessionExecuteRequestBody } from "@/server/http/control/types/ControlSessionExecute.js";
@@ -27,6 +28,7 @@ import type {
 } from "@/service/types/Services.js";
 import { listServiceStates, controlServiceState } from "@/service/core/ServiceStateController.js";
 import { runServiceCommand } from "@/service/core/ServiceActionRunner.js";
+import { parseServiceCommandRequestBody } from "@/service/core/ServiceCommandRequest.js";
 import { executeBySessionId } from "@/server/http/control/ExecuteBySession.js";
 import { getLocalRpcEndpoint } from "@/transport/rpc/Paths.js";
 
@@ -106,17 +108,20 @@ async function handleServiceCommand(params: {
   body: JsonValue | undefined;
   context: AgentContext;
 }): Promise<LocalRpcResponse> {
-  const body = isObjectRecord(params.body) ? params.body : {};
-  const serviceName = String(body.serviceName || "").trim();
-  const command = String(body.command || "").trim();
-  if (!serviceName || !command) {
+  let body;
+  try {
+    body = parseServiceCommandRequestBody(params.body);
+  } catch (error) {
+    return createErrorResponse(params.requestId, 400, String(error));
+  }
+  if (!body.serviceName || !body.command) {
     return createErrorResponse(params.requestId, 400, "serviceName and command are required");
   }
   const result = await runServiceCommand({
-    serviceName,
-    command,
-    payload: (body.payload ?? {}) as JsonValue,
-    ...(body.schedule !== undefined ? { schedule: body.schedule as JsonValue } : {}),
+    serviceName: body.serviceName,
+    command: body.command,
+    payload: body.payload,
+    schedule: body.schedule,
     context: params.context,
   });
   const payload: ServiceCommandResponse = {
@@ -249,7 +254,7 @@ async function dispatchRequest(params: {
   if (request.method === "GET" && request.path === "/api/services/list") {
     const payload: ServiceListResponse = {
       success: true,
-      services: listServiceStates(),
+      services: listServiceStates({ context: params.context }),
     };
     return createSuccessResponse(request.requestId, payload as unknown as JsonValue);
   }
@@ -363,17 +368,23 @@ function bindConnectionHandler(params: {
  * 启动本地 RPC server。
  */
 export async function startLocalRpcServer(params: {
-  context: AgentContext;
+  context?: AgentContext;
   runtime?: AgentRuntime;
+  core?: Pick<AgentCore, "getContext" | "getRuntime">;
 }): Promise<LocalRpcServerHandle> {
-  const endpoint = getLocalRpcEndpoint(params.context.rootPath);
+  const context = params.context || params.core?.getContext();
+  if (!context) {
+    throw new Error("startLocalRpcServer requires a context or core");
+  }
+  const runtime = params.runtime || params.core?.getRuntime();
+  const endpoint = getLocalRpcEndpoint(context.rootPath);
   await ensureEndpointReady(endpoint);
 
   const server = net.createServer();
   bindConnectionHandler({
     server,
-    context: params.context,
-    runtime: params.runtime,
+    context,
+    runtime,
   });
 
   await new Promise<void>((resolve, reject) => {

package/src/service/builtins/BaseService.ts

@@ -6,13 +6,13 @@
  * - 各 service 的长期状态应归属于实例本身，而不是模块级单例。
  */
 
-import type { AgentRuntime } from "@/runtime/AgentRuntimeTypes.js";
+import type { AgentRuntime } from "@/core/AgentCoreTypes.js";
 import type {
   Service,
   ServiceActions,
   ServiceLifecycle,
 } from "@/service/types/Service.js";
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 import type { ServiceStateRecord } from "@/service/types/ServiceState.js";
 
 /**

package/src/service/builtins/chat/Action.ts

@@ -6,7 +6,7 @@
  * - 通过 SessionRunScope（ALS）读取当前请求上下文
  */
 
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 import { getSessionRunScope } from "@session/SessionRunScope.js";
 import {
   sendActionByChatKey,

package/src/service/builtins/chat/ChatService.ts

@@ -8,10 +8,10 @@
  * - action 注册表已经拆到独立模块，当前文件只保留实例骨架。
  */
 
-import type { AgentRuntime } from "@/runtime/AgentRuntimeTypes.js";
+import type { AgentRuntime } from "@/core/AgentCoreTypes.js";
 import { BaseService } from "@/service/builtins/BaseService.js";
 import type { ServiceActions } from "@/service/types/Service.js";
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 import type { ChatChannelState } from "@/service/builtins/chat/types/ChatRuntime.js";
 import type { StoredChannelAccount } from "@/types/host/Store.js";
 import type { ChatQueueWorkerConfig } from "@/service/builtins/chat/types/ChatQueueWorker.js";

package/src/service/builtins/chat/ChatServiceTypes.ts

@@ -7,7 +7,7 @@
  * - 若未显式注入，则 ChatService 仍可回退到现有 `downcity.json + PlatformStore` 读取路径。
  */
 
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 import type { ChatQueueWorkerConfig } from "@/service/builtins/chat/types/ChatQueueWorker.js";
 import type { StoredChannelAccount } from "@/types/host/Store.js";
 import type { ChatChannelName } from "@/service/builtins/chat/types/ChannelStatus.js";

package/src/service/builtins/chat/channels/BaseChatChannel.ts

@@ -15,7 +15,7 @@ import type {
   ChatDispatcher,
 } from "@/service/builtins/chat/types/ChatDispatcher.js";
 import type { Logger } from "@/utils/logger/Logger.js";
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 import { resolveChatQueueStore } from "@/service/builtins/chat/runtime/ChatQueue.js";
 import { deleteChatSessionById } from "@/service/builtins/chat/runtime/ChatSessionDelete.js";
 import {

package/src/service/builtins/chat/channels/BaseChatChannelQueue.ts

@@ -15,7 +15,7 @@ import {
   prepareChatEnqueue,
 } from "@/service/builtins/chat/runtime/EnqueueDispatch.js";
 import type { ChatDispatchChannel } from "@/service/builtins/chat/types/ChatDispatcher.js";
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 import type { JsonObject } from "@/types/common/Json.js";
 import type { IncomingChatMessage } from "./BaseChatChannel.js";
 import {

package/src/service/builtins/chat/channels/BaseChatChannelSupport.ts

@@ -8,7 +8,7 @@
 
 import type { ChatDispatchChannel } from "@/service/builtins/chat/types/ChatDispatcher.js";
 import type { Logger } from "@/utils/logger/Logger.js";
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 import type { JsonObject, JsonValue } from "@/types/common/Json.js";
 import {
   resolveSessionIdByChatTarget,

package/src/service/builtins/chat/channels/feishu/Feishu.ts

@@ -14,7 +14,7 @@ import type {
   ChannelChatKeyParams,
   ChannelSendTextParams,
 } from "@/service/builtins/chat/channels/BaseChatChannel.js";
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 import type { JsonObject } from "@/types/common/Json.js";
 import type { ChatChannelTestResult } from "@/service/builtins/chat/types/ChannelStatus.js";
 import type { ParsedFeishuAttachmentCommand } from "@/service/builtins/chat/types/FeishuAttachment.js";

package/src/service/builtins/chat/channels/feishu/FeishuMessageHandler.ts

@@ -9,7 +9,7 @@
 
 import path from "path";
 import type { Logger } from "@/utils/logger/Logger.js";
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 import type {
   IncomingAuthorizationParams,
   IncomingAuthorizationResult,

package/src/service/builtins/chat/channels/feishu/FeishuPlatformClient.ts

@@ -8,7 +8,7 @@
  */
 
 import * as Lark from "@larksuiteoapi/node-sdk";
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 import type {
   FeishuConfig,
   FeishuDownloadedAttachment,

package/src/service/builtins/chat/channels/qq/QQ.ts

@@ -28,7 +28,7 @@ import type {
   ChannelChatKeyParams,
   ChannelSendTextParams,
 } from "@/service/builtins/chat/channels/BaseChatChannel.js";
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 import type { JsonObject } from "@/types/common/Json.js";
 import type { ChatChannelTestResult } from "@/service/builtins/chat/types/ChannelStatus.js";
 import type { QQConfig, QQMessageData } from "@/service/builtins/chat/channels/qq/types/QqChannel.js";

package/src/service/builtins/chat/channels/qq/QQMessageHandler.ts

@@ -8,7 +8,7 @@
  */
 
 import type { Logger } from "@/utils/logger/Logger.js";
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 import type {
   ChannelChatKeyParams,
   IncomingAuthorizationParams,

package/src/service/builtins/chat/channels/qq/QQSupport.ts

@@ -7,7 +7,7 @@
  */
 
 import { buildChatInboundText, augmentChatInboundInput } from "@/service/builtins/chat/runtime/InboundAugment.js";
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 import type { JsonObject } from "@/types/common/Json.js";
 import type { QQMessageData, QQReadyUser } from "@/service/builtins/chat/channels/qq/types/QqChannel.js";
 import type { QqIncomingAttachment } from "@/service/builtins/chat/types/QqVoice.js";

package/src/service/builtins/chat/channels/telegram/Bot.ts

@@ -22,7 +22,7 @@ import {
   type TelegramUpdate,
   type TelegramUser,
 } from "./Shared.js";
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 import type { JsonObject } from "@/types/common/Json.js";
 import type { ChatChannelTestResult } from "@/service/builtins/chat/types/ChannelStatus.js";
 import {

package/src/service/builtins/chat/channels/telegram/TelegramMessageHandler.ts

@@ -9,7 +9,7 @@
 
 import path from "path";
 import type { Logger } from "@/utils/logger/Logger.js";
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 import type { JsonObject } from "@/types/common/Json.js";
 import type {
   IncomingAuthorizationParams,

package/src/service/builtins/chat/channels/telegram/TelegramPlatformClient.ts

@@ -7,7 +7,7 @@
  * - `TelegramBot` 只保留入站授权、命令分发、消息入队等业务编排。
  */
 
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 import type { ChatChannelTestResult } from "@/service/builtins/chat/types/ChannelStatus.js";
 import { TelegramApiClient } from "./ApiClient.js";
 import { TelegramStateStore } from "./StateStore.js";

package/src/service/builtins/chat/runtime/ChannelContextStore.ts

@@ -9,7 +9,7 @@
 
 import fs from "fs-extra";
 import { generateId } from "@/utils/Id.js";
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 import type {
   ChannelContextMetaFileV1,
   ChannelContextRouteV1,

package/src/service/builtins/chat/runtime/ChatActionExecution.ts

@@ -9,7 +9,7 @@
 
 import path from "node:path";
 import type { JsonObject } from "@/types/common/Json.js";
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 import type {
   ChatDeleteActionPayload,
   ChatHistoryActionPayload,