@downcity/agent 1.1.10 → 1.1.12

package/src/{host/sdk → sdk}/SessionMetadata.ts

@@ -12,7 +12,7 @@ import type {
   SessionHistoryMetaV1,
   SessionHistorySdkConfigV1,
 } from "@/session/types/SessionHistoryMeta.js";
-import { getSdkAgentSessionMetaPath } from "@/host/sdk/Paths.js";
+import { getSdkAgentSessionMetaPath } from "@/sdk/Paths.js";
 
 type ReadSessionMetadataInput = {
   /**
@@ -36,6 +36,21 @@ function normalizeModelLabel(input: unknown): string | undefined {
   return label || undefined;
 }
 
+/**
+ * 读取当前系统时区。
+ */
+export function resolveSystemTimezone(): string {
+  const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+  return typeof timezone === "string" && timezone.trim()
+    ? timezone.trim()
+    : "UTC";
+}
+
+function normalizeTimezone(input: unknown): string | undefined {
+  const timezone = typeof input === "string" ? input.trim() : "";
+  return timezone || undefined;
+}
+
 /**
  * 从模型实例推导轻量可读标签。
  */
@@ -83,6 +98,7 @@ export async function readSdkSessionMetadata(
         typeof raw.createdAt === "number" && Number.isFinite(raw.createdAt)
           ? raw.createdAt
           : Date.now(),
+      timezone: normalizeTimezone(raw.timezone) || resolveSystemTimezone(),
       updatedAt:
         typeof raw.updatedAt === "number" && Number.isFinite(raw.updatedAt)
           ? raw.updatedAt
@@ -116,6 +132,7 @@ export async function readSdkSessionMetadata(
       sessionId: input.sessionId,
       agentId: input.agentId,
       createdAt: Date.now(),
+      timezone: resolveSystemTimezone(),
       updatedAt: 0,
       pinnedSkillIds: [],
     };
@@ -160,6 +177,7 @@ export async function patchSdkSessionModelLabel(
     agentId: input.agentId,
     createdAt:
       typeof current.createdAt === "number" ? current.createdAt : Date.now(),
+    timezone: normalizeTimezone(current.timezone) || resolveSystemTimezone(),
     updatedAt: Date.now(),
     ...(modelLabel
       ? {

package/src/sdk/SessionPersistence.ts

@@ -0,0 +1,113 @@
+/**
+ * SDK Session 持久化辅助。
+ *
+ * 关键点（中文）
+ * - 集中处理 session meta 更新时间、模型展示标签与 assistant 消息落盘。
+ * - `SdkSession` 只负责调用这些能力，不直接拼装 meta 结构。
+ */
+
+import { resolveAssistantMessageForPersistence } from "@/service/builtins/chat/runtime/UserVisibleText.js";
+import { extractTextFromUiMessage } from "@/service/builtins/chat/runtime/UIMessageTransformer.js";
+import type { SessionHistoryMetaV1 } from "@/session/types/SessionHistoryMeta.js";
+import type { SessionMessageV1 } from "@/session/types/SessionMessages.js";
+import type { AgentSessionConfigSnapshot } from "@/sdk/AgentSdkTypes.js";
+import {
+  readSdkSessionMetadata,
+  writeSdkSessionMetadata,
+} from "@/sdk/SessionMetadata.js";
+
+/**
+ * SDK Session 元数据写入参数。
+ */
+export interface TouchSdkSessionMetadataParams {
+  /**
+   * 当前项目根目录。
+   */
+  projectRoot: string;
+  /**
+   * 当前 agent 稳定标识。
+   */
+  agentId: string;
+  /**
+   * 当前 sessionId。
+   */
+  sessionId: string;
+  /**
+   * 当前 session 内存配置快照。
+   */
+  sessionConfig: AgentSessionConfigSnapshot;
+}
+
+/**
+ * Assistant 结果落盘参数。
+ */
+export interface PersistSdkAssistantResultParams
+  extends TouchSdkSessionMetadataParams {
+  /**
+   * 追加 assistant 消息的底层 session 端口。
+   */
+  coreSession: {
+    appendAssistantMessage(params: {
+      /**
+       * 已构造好的完整消息。
+       */
+      message?: SessionMessageV1 | null;
+      /**
+       * 兜底文本内容。
+       */
+      fallbackText?: string;
+    }): Promise<void>;
+  };
+  /**
+   * 本轮执行得到的 assistant 消息。
+   */
+  assistantMessage: SessionMessageV1;
+}
+
+/**
+ * 刷新 SDK session 元数据。
+ */
+export async function touchSdkSessionMetadata(
+  params: TouchSdkSessionMetadataParams,
+): Promise<void> {
+  const current = await readSdkSessionMetadata({
+    projectRoot: params.projectRoot,
+    agentId: params.agentId,
+    sessionId: params.sessionId,
+  });
+  const next: SessionHistoryMetaV1 = {
+    ...current,
+    agentId: params.agentId,
+    createdAt:
+      typeof current.createdAt === "number" ? current.createdAt : Date.now(),
+    updatedAt: Date.now(),
+    ...(params.sessionConfig.modelLabel
+      ? {
+          sdkConfig: {
+            ...(current.sdkConfig || {}),
+            modelLabel: params.sessionConfig.modelLabel,
+          },
+        }
+      : {}),
+  };
+  await writeSdkSessionMetadata({
+    projectRoot: params.projectRoot,
+    agentId: params.agentId,
+    sessionId: params.sessionId,
+    meta: next,
+  });
+}
+
+/**
+ * 持久化 assistant 结果并同步刷新 session meta。
+ */
+export async function persistSdkAssistantResult(
+  params: PersistSdkAssistantResultParams,
+): Promise<void> {
+  const persisted = resolveAssistantMessageForPersistence(params.assistantMessage);
+  await params.coreSession.appendAssistantMessage({
+    ...(persisted ? { message: persisted } : {}),
+    fallbackText: extractTextFromUiMessage(params.assistantMessage),
+  });
+  await touchSdkSessionMetadata(params);
+}

package/src/sdk/SessionServicePort.ts

@@ -0,0 +1,62 @@
+/**
+ * SDK Session service 端口构造器。
+ *
+ * 关键点（中文）
+ * - 把 SDK 本地 session 适配成 chat service 依赖的 `SessionPort`。
+ * - service 侧直接复用底层 `CoreSession` 协议，避免 SDK `run()` 包装层重复补写消息。
+ */
+
+import type { SessionPort } from "@/runtime/AgentContextTypes.js";
+
+/**
+ * 构造 SDK SessionPort 的参数。
+ */
+export interface CreateSdkSessionServicePortParams {
+  /**
+   * 当前 sessionId。
+   */
+  sessionId: string;
+  /**
+   * 底层 session 实例。
+   */
+  coreSession: Omit<SessionPort, "sessionId" | "getHistoryComposer">;
+  /**
+   * 当前 session 历史持久化端口。
+   */
+  historyComposer: ReturnType<SessionPort["getHistoryComposer"]>;
+  /**
+   * session 更新后需要同步执行的持久化回调。
+   */
+  touchMetadata: () => Promise<void>;
+}
+
+/**
+ * 创建供 service 使用的 session 端口。
+ */
+export function createSdkSessionServicePort(
+  params: CreateSdkSessionServicePortParams,
+): SessionPort {
+  return {
+    sessionId: params.sessionId,
+    getExecutor: () => params.coreSession.getExecutor(),
+    getHistoryComposer: () => params.historyComposer,
+    run: async (runParams) => {
+      return await params.coreSession.run(runParams);
+    },
+    clearExecutor: () => {
+      params.coreSession.clearExecutor();
+    },
+    afterSessionUpdatedAsync: async () => {
+      await params.coreSession.afterSessionUpdatedAsync();
+    },
+    appendUserMessage: async (messageParams) => {
+      await params.coreSession.appendUserMessage(messageParams);
+      await params.touchMetadata();
+    },
+    appendAssistantMessage: async (messageParams) => {
+      await params.coreSession.appendAssistantMessage(messageParams);
+      await params.touchMetadata();
+    },
+    isExecuting: () => params.coreSession.isExecuting(),
+  };
+}

package/src/{host/sdk → sdk}/StreamEvents.ts

@@ -7,8 +7,9 @@
  */
 
 import type { UIMessageChunk } from "ai";
-import type { JsonValue } from "@/utils/types/Json.js";
-import type { AgentSessionStreamEvent } from "@/host/sdk/AgentSdkTypes.js";
+import type { JsonValue } from "@/types/common/Json.js";
+import type { AgentSessionStreamEvent } from "@/sdk/AgentSdkTypes.js";
+import type { AsyncQueue } from "@/sdk/AsyncQueue.js";
 
 function toJsonValue(value: unknown): JsonValue {
   if (value === undefined) return null;
@@ -93,3 +94,45 @@ export function mapUiMessageChunkToSdkEvent(
       return null;
   }
 }
+
+/**
+ * 把 UI chunk 推入 SDK stream 队列。
+ *
+ * 关键点（中文）
+ * - `tool-output-*` chunk 本身不总是携带 toolName。
+ * - 这里用调用 id 维护一次流式执行内的工具名称映射，避免上层重复关心底层 chunk 细节。
+ */
+export function pushUiMessageChunkAsSdkEvent(params: {
+  /**
+   * SDK stream 事件队列。
+   */
+  queue: AsyncQueue<AgentSessionStreamEvent>;
+  /**
+   * 底层 AI SDK UI chunk。
+   */
+  chunk: UIMessageChunk;
+  /**
+   * 当前 stream 生命周期内的 toolCallId 到 toolName 映射。
+   */
+  toolNameByCallId: Map<string, string>;
+}): void {
+  const { queue, chunk, toolNameByCallId } = params;
+  if (chunk.type === "tool-input-start") {
+    toolNameByCallId.set(chunk.toolCallId, chunk.toolName);
+    return;
+  }
+  const event = mapUiMessageChunkToSdkEvent(chunk);
+  if (!event) return;
+  if (event.type === "tool-call" || event.type === "tool-error") {
+    toolNameByCallId.set(event.toolCallId, event.toolName);
+  }
+  if (
+    (event.type === "tool-result" || event.type === "tool-error") &&
+    event.toolName === "unknown"
+  ) {
+    const toolName = toolNameByCallId.get(event.toolCallId);
+    queue.push(toolName ? { ...event, toolName } : event);
+    return;
+  }
+  queue.push(event);
+}

package/src/{host → server}/http/Server.ts

@@ -12,20 +12,20 @@ import { cors } from "hono/cors";
 import { logger } from "hono/logger";
 import http from "node:http";
 import { logger as serverLogger } from "@/utils/logger/Logger.js";
-import { executeRouter } from "@/host/http/execute/execute.js";
-import { healthRouter } from "@/host/http/health/health.js";
+import { executeRouter } from "@/server/http/execute/execute.js";
+import { healthRouter } from "@/server/http/health/health.js";
 import {
   ensureServiceActionRoutesRegistered,
   servicesRouter,
-} from "@/host/http/services/services.js";
-import { pluginsRouter } from "@/host/http/plugins/plugins.js";
-import { staticRouter } from "@/host/http/static/static.js";
-import { controlRouter } from "@/host/http/control/ControlRouter.js";
+} from "@/server/http/services/services.js";
+import { pluginsRouter } from "@/server/http/plugins/plugins.js";
+import { staticRouter } from "@/server/http/static/static.js";
+import { controlRouter } from "@/server/http/control/ControlRouter.js";
 import {
   listBuiltinPluginRuntimeAuthPolicies,
   registerBuiltinPluginHttpRoutes,
 } from "@/plugin/core/HttpRoutes.js";
-import { getAgentContext } from "@/agent/AgentRuntime.js";
+import { getAgentContext } from "@/runtime/AgentRuntime.js";
 
 /**
  * Server 启动参数。

package/src/{host → server}/http/control/AuthControlService.ts

@@ -7,9 +7,9 @@
  * - 这样调用方不需要知道 plugin action 名称，也不需要依赖 `plugin/builtins/auth/*` 目录。
  */
 
-import type { AgentContext } from "@/agent/AgentContextTypes.js";
-import type { JsonObject } from "@/utils/types/Json.js";
-import type { AuthControlPayload } from "@/host/http/control/types/AuthControl.js";
+import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { JsonObject } from "@/types/common/Json.js";
+import type { AuthControlPayload } from "@/server/http/control/types/AuthControl.js";
 import type {
   AuthSetUserRolePayload,
   AuthWriteConfigPayload,

package/src/{host → server}/http/control/ControlApiRoutes.ts

@@ -7,12 +7,12 @@
  * - 单 agent control API 统一暴露在 `/api/control/*` 下。
  */
 
-import type { ControlRouteRegistrationParams } from "@/host/http/control/types/ControlRoutes.js";
-import { registerControlAuthorizationRoutes } from "@/host/http/control/ControlAuthorizationRoutes.js";
-import { registerControlSessionRoutes } from "@/host/http/control/SessionRoutes.js";
-import { registerControlModelRoutes } from "@/host/http/control/ModelRoutes.js";
-import { registerControlOverviewRoutes } from "@/host/http/control/OverviewRoutes.js";
-import { registerControlTaskRoutes } from "@/host/http/control/TaskRoutes.js";
+import type { ControlRouteRegistrationParams } from "@/server/http/control/types/ControlRoutes.js";
+import { registerControlAuthorizationRoutes } from "@/server/http/control/ControlAuthorizationRoutes.js";
+import { registerControlSessionRoutes } from "@/server/http/control/SessionRoutes.js";
+import { registerControlModelRoutes } from "@/server/http/control/ModelRoutes.js";
+import { registerControlOverviewRoutes } from "@/server/http/control/OverviewRoutes.js";
+import { registerControlTaskRoutes } from "@/server/http/control/TaskRoutes.js";
 
 /**
  * 注册单 agent control API 路由。

package/src/{host → server}/http/control/ControlAuthorizationRoutes.ts

@@ -7,19 +7,19 @@
  */
 
 import type { Hono } from "hono";
-import type { AgentContext } from "@/agent/AgentContextTypes.js";
+import type { AgentContext } from "@/runtime/AgentContextTypes.js";
 import {
   readAuthControlPayload,
   setAuthControlUserRole,
   writeAuthControlConfig,
-} from "@/host/http/control/AuthControlService.js";
+} from "@/server/http/control/AuthControlService.js";
 import {
   isChatAuthorizationChannel,
   type AuthSetUserRolePayload,
   type ChatAuthorizationConfig,
 } from "@/plugin/builtins/auth/types/AuthPlugin.js";
 import type { ChatAuthorizationChannel } from "@/plugin/builtins/auth/types/AuthPlugin.js";
-import { buildControlRouteAliases } from "@/host/http/control/CommonHelpers.js";
+import { buildControlRouteAliases } from "@/server/http/control/CommonHelpers.js";
 
 function normalizeChatChannel(value: unknown): ChatAuthorizationChannel | null {
   const text = String(value || "").trim().toLowerCase();

package/src/{host → server}/http/control/ControlRouter.ts

@@ -3,7 +3,7 @@
  *
  * 职责说明：
  * 1. 为单 agent control API 暴露独立 router。
- * 2. 将控制域的 API 装配收敛在 `host/http/control/` 下。
+ * 2. 将控制域的 API 装配收敛在 `server/http/control/` 下。
  * 3. server 只负责挂载该 router，不再持有控制面细节。
  *
  * 命名说明（中文）
@@ -16,8 +16,8 @@ import { Hono } from "hono";
 import {
   getAgentRuntime,
   getAgentContext,
-} from "@/agent/AgentRuntime.js";
-import { registerControlApiRoutes } from "@/host/http/control/ControlApiRoutes.js";
+} from "@/runtime/AgentRuntime.js";
+import { registerControlApiRoutes } from "@/server/http/control/ControlApiRoutes.js";
 
 /**
  * 单 agent control API 专用路由。

package/src/{host → server}/http/control/ExecuteBySession.ts

@@ -6,10 +6,10 @@
  * - 非 chat session 保留原有直接执行语义。
  */
 
-import type { AgentRuntime } from "@/agent/AgentRuntime.js";
-import type { AgentContext } from "@/agent/AgentContextTypes.js";
-import type { JsonObject } from "@/utils/types/Json.js";
-import type { ControlSessionExecuteAttachmentInput } from "@/host/http/control/types/ControlSessionExecute.js";
+import type { AgentRuntime } from "@/runtime/AgentRuntime.js";
+import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { JsonObject } from "@/types/common/Json.js";
+import type { ControlSessionExecuteAttachmentInput } from "@/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";

package/src/{host → server}/http/control/ExecuteInput.ts

@@ -13,7 +13,7 @@ import { renderChatMessageFileTag } from "@/service/builtins/chat/runtime/ChatMe
 import type {
   ControlSessionExecuteAttachmentInput,
   ControlSessionExecuteAttachmentType,
-} from "@/host/http/control/types/ControlSessionExecute.js";
+} from "@/server/http/control/types/ControlSessionExecute.js";
 
 const EXECUTE_ATTACHMENT_MAX_COUNT = 8;
 const EXECUTE_ATTACHMENT_MAX_BYTES = 2 * 1024 * 1024;

package/src/{host → server}/http/control/MessageTimeline.ts

@@ -19,7 +19,7 @@ import type {
 } from "@/session/types/SessionMessages.js";
 import { pickLastSuccessfulChatSendText } from "@/service/builtins/chat/runtime/UserVisibleText.js";
 import { extractToolCallsFromUiMessage } from "@/service/builtins/chat/runtime/UIMessageTransformer.js";
-import type { ControlTimelineEvent, ControlTimelineRole } from "@/host/http/control/types/ControlViewData.js";
+import type { ControlTimelineEvent, ControlTimelineRole } from "@/server/http/control/types/ControlViewData.js";
 import { truncateText } from "./CommonHelpers.js";
 
 type AnyUiPart = UIMessagePart<Record<string, never>, Record<string, never>>;

package/src/{host → server}/http/control/ModelRoutes.ts

@@ -8,8 +8,8 @@
 
 import fs from "fs-extra";
 import { getDowncityJsonPath } from "@/config/Paths.js";
-import type { ControlRouteRegistrationParams } from "@/host/http/control/types/ControlRoutes.js";
-import { buildControlRouteAliases } from "@/host/http/control/CommonHelpers.js";
+import type { ControlRouteRegistrationParams } from "@/server/http/control/types/ControlRoutes.js";
+import { buildControlRouteAliases } from "@/server/http/control/CommonHelpers.js";
 
 /**
  * 注册模型相关路由。

package/src/{host → server}/http/control/OverviewRoutes.ts

@@ -13,7 +13,7 @@ import { listServiceStates } from "@/service/core/Manager.js";
 import { listTaskDefinitions } from "@/service/builtins/task/Action.js";
 import { buildControlRouteAliases, toLimit } from "./CommonHelpers.js";
 import { listControlSessionSummaries, readRecentLogs } from "./Helpers.js";
-import type { ControlRouteRegistrationParams } from "@/host/http/control/types/ControlRoutes.js";
+import type { ControlRouteRegistrationParams } from "@/server/http/control/types/ControlRoutes.js";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);

package/src/{host → server}/http/control/SessionRoutes.ts

@@ -17,8 +17,8 @@ import {
   getDowncitySessionMessagesArchivePath,
   getDowncitySessionMessagesPath,
 } from "@/config/Paths.js";
-import type { ControlSessionExecuteRequestBody } from "@/host/http/control/types/ControlSessionExecute.js";
-import type { ControlRouteRegistrationParams } from "@/host/http/control/types/ControlRoutes.js";
+import type { ControlSessionExecuteRequestBody } from "@/server/http/control/types/ControlSessionExecute.js";
+import type { ControlRouteRegistrationParams } from "@/server/http/control/types/ControlRoutes.js";
 import {
   buildControlRouteAliases,
   decodeMaybe,

package/src/{host → server}/http/control/SessionSummaryStore.ts

@@ -7,13 +7,13 @@
  */
 
 import fs from "fs-extra";
-import type { AgentContext } from "@/agent/AgentContextTypes.js";
+import type { AgentContext } from "@/runtime/AgentContextTypes.js";
 import {
   getDowncitySessionMessagesPath,
   getDowncitySessionRootDirPath,
 } from "@/config/Paths.js";
 import { readChatMetaBySessionId } from "@/service/builtins/chat/runtime/ChatMetaStore.js";
-import type { ControlSessionSummary } from "@/host/http/control/types/ControlViewData.js";
+import type { ControlSessionSummary } from "@/server/http/control/types/ControlViewData.js";
 import { decodeMaybe, truncateText } from "./CommonHelpers.js";
 import { loadSessionMessagesFromFile, resolveUiMessagePreview } from "./MessageTimeline.js";
 

package/src/{host → server}/http/control/TaskRoutes.ts

@@ -12,7 +12,7 @@ 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 type { ControlRouteRegistrationParams } from "@/host/http/control/types/ControlRoutes.js";
+import type { ControlRouteRegistrationParams } from "@/server/http/control/types/ControlRoutes.js";
 import {
   buildControlRouteAliases,
   decodeMaybe,

package/src/{host → server}/http/control/TaskStore.ts

@@ -14,7 +14,7 @@ import type {
   ControlLogEntry,
   ControlTaskRunDetail,
   ControlTaskRunSummary,
-} from "@/host/http/control/types/ControlViewData.js";
+} from "@/server/http/control/types/ControlViewData.js";
 import { truncateText } from "./CommonHelpers.js";
 import { loadSessionMessagesFromFile, toUiMessageTimeline } from "./MessageTimeline.js";
 

package/src/{host → server}/http/control/types/ControlRoutes.ts

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

package/src/{host → server}/http/control/types/ControlViewData.ts

@@ -6,7 +6,7 @@
  * - 仅描述 control UI 所需的投影视图，不包含底层上下文原始协议类型。
  */
 
-import type { JsonObject } from "@/utils/types/Json.js";
+import type { JsonObject } from "@/types/common/Json.js";
 
 /**
  * Control 时间线消息角色。

package/src/{host → server}/http/execute/execute.ts

@@ -9,7 +9,7 @@
 
 import { Hono } from "hono";
 import { drainDeferredPersistedUserMessages } from "@session/SessionRunScope.js";
-import { getAgentRuntime } from "@/agent/AgentRuntime.js";
+import { getAgentRuntime } from "@/runtime/AgentRuntime.js";
 import {
   pickLastSuccessfulChatSendText,
   resolveAssistantMessageForPersistence,

package/src/{host → server}/http/plugins/plugins.ts

@@ -8,7 +8,7 @@
  */
 
 import { Hono } from "hono";
-import { getAgentContext } from "@/agent/AgentRuntime.js";
+import { getAgentContext } from "@/runtime/AgentRuntime.js";
 
 /**
  * Plugin 路由。

package/src/{host → server}/http/services/services.ts

@@ -15,7 +15,7 @@ import {
   runServiceCommand,
 } from "@/service/core/Manager.js";
 import type { ServiceStateControlAction } from "@/service/core/Manager.js";
-import { getAgentContext } from "@/agent/AgentRuntime.js";
+import { getAgentContext } from "@/runtime/AgentRuntime.js";
 
 /**
  * Service 路由。

package/src/{host → 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 { getAgentRuntime } from "@/agent/AgentRuntime.js";
+import { getAgentRuntime } from "@/runtime/AgentRuntime.js";
 
 /**
  * 静态资源路由。

package/src/{host → server}/rpc/Server.ts

@@ -9,11 +9,11 @@
 import fs from "fs-extra";
 import net, { type Server } from "node:net";
 import path from "node:path";
-import type { AgentRuntime } from "@/agent/AgentRuntimeTypes.js";
-import type { AgentContext } from "@/agent/AgentContextTypes.js";
-import type { JsonValue } from "@/utils/types/Json.js";
-import type { LocalRpcRequest, LocalRpcResponse, LocalRpcServerHandle } from "@/host/rpc/types/LocalRpc.js";
-import type { ControlSessionExecuteRequestBody } from "@/host/http/control/types/ControlSessionExecute.js";
+import type { AgentRuntime } from "@/runtime/AgentRuntimeTypes.js";
+import type { AgentContext } from "@/runtime/AgentContextTypes.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";
 import type {
   PluginActionResponse,
   PluginAvailabilityResponse,
@@ -27,8 +27,8 @@ import type {
 } from "@/service/types/Services.js";
 import { listServiceStates, controlServiceState } from "@/service/core/ServiceStateController.js";
 import { runServiceCommand } from "@/service/core/ServiceActionRunner.js";
-import { executeBySessionId } from "@/host/http/control/ExecuteBySession.js";
-import { getLocalRpcEndpoint } from "./Paths.js";
+import { executeBySessionId } from "@/server/http/control/ExecuteBySession.js";
+import { getLocalRpcEndpoint } from "@/transport/rpc/Paths.js";
 
 async function isSocketEndpointActive(endpoint: string): Promise<boolean> {
   return await new Promise<boolean>((resolve) => {

package/src/service/builtins/BaseService.ts

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