@downcity/agent 1.1.15 → 1.1.17

package/src/{sandbox → runtime/sandbox}/MacOsSeatbeltSandbox.ts

@@ -13,7 +13,7 @@ import fs from "fs-extra";
 import type {
   SandboxSpawnParams,
   SandboxSpawnResult,
-} from "@/sandbox/types/SandboxRuntime.js";
+} from "@/runtime/sandbox/types/SandboxRuntime.js";
 
 const DEFAULT_PATH_VALUE =
   "/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin";

package/src/{sandbox → runtime/sandbox}/SandboxConfigResolver.ts

@@ -9,7 +9,7 @@
 
 import path from "node:path";
 import type { AgentContext } from "@/core/AgentContextTypes.js";
-import type { ResolvedSandboxConfig } from "@/sandbox/types/SandboxRuntime.js";
+import type { ResolvedSandboxConfig } from "@/runtime/sandbox/types/SandboxRuntime.js";
 
 const DEFAULT_ENV_ALLOWLIST = [
   "PATH",

package/src/{sandbox → runtime/sandbox}/SandboxRunner.ts

@@ -8,9 +8,9 @@
  */
 
 import type { AgentContext } from "@/core/AgentContextTypes.js";
-import type { SandboxSpawnResult } from "@/sandbox/types/SandboxRuntime.js";
-import { resolveSandboxConfig, resolveSandboxCwd } from "@/sandbox/SandboxConfigResolver.js";
-import { spawnMacOsSeatbeltSandbox } from "@/sandbox/MacOsSeatbeltSandbox.js";
+import type { SandboxSpawnResult } from "@/runtime/sandbox/types/SandboxRuntime.js";
+import { resolveSandboxConfig, resolveSandboxCwd } from "@/runtime/sandbox/SandboxConfigResolver.js";
+import { spawnMacOsSeatbeltSandbox } from "@/runtime/sandbox/MacOsSeatbeltSandbox.js";
 
 /**
  * 启动 shell 子进程。

package/src/{sandbox → runtime/sandbox}/types/SandboxRuntime.ts

@@ -8,8 +8,8 @@
  */
 
 import type { ChildProcessWithoutNullStreams } from "node:child_process";
-import type { SandboxConfig } from "@/sandbox/types/Sandbox.js";
-import type { SandboxNetworkMode } from "@/sandbox/types/Sandbox.js";
+import type { SandboxConfig } from "@/runtime/sandbox/types/Sandbox.js";
+import type { SandboxNetworkMode } from "@/runtime/sandbox/types/Sandbox.js";
 
 /**
  * sandbox 会话状态。

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

@@ -12,14 +12,14 @@ 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 { createExecuteRouter } from "@/server/http/execute/execute.js";
-import { healthRouter } from "@/server/http/health/health.js";
+import { createExecuteRouter } from "@/runtime/server/http/execute/execute.js";
+import { healthRouter } from "@/runtime/server/http/health/health.js";
 import {
   createServicesRouter,
-} from "@/server/http/services/services.js";
-import { createPluginsRouter } from "@/server/http/plugins/plugins.js";
-import { createStaticRouter } from "@/server/http/static/static.js";
-import { createControlRouter } from "@/server/http/control/ControlRouter.js";
+} from "@/runtime/server/http/services/services.js";
+import { createPluginsRouter } from "@/runtime/server/http/plugins/plugins.js";
+import { createStaticRouter } from "@/runtime/server/http/static/static.js";
+import { createControlRouter } from "@/runtime/server/http/control/ControlRouter.js";
 import {
   registerBuiltinPluginHttpRoutes,
 } from "@/plugin/core/HttpRoutes.js";

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

@@ -9,7 +9,7 @@
 
 import type { AgentContext } from "@/core/AgentContextTypes.js";
 import type { JsonObject } from "@/types/common/Json.js";
-import type { AuthControlPayload } from "@/server/http/control/types/AuthControl.js";
+import type { AuthControlPayload } from "@/runtime/server/http/control/types/AuthControl.js";
 import type {
   AuthSetUserRolePayload,
   AuthWriteConfigPayload,

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

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

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

@@ -12,14 +12,14 @@ import {
   readAuthControlPayload,
   setAuthControlUserRole,
   writeAuthControlConfig,
-} from "@/server/http/control/AuthControlService.js";
+} from "@/runtime/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 "@/server/http/control/CommonHelpers.js";
+import { buildControlRouteAliases } from "@/runtime/server/http/control/CommonHelpers.js";
 
 function normalizeChatChannel(value: unknown): ChatAuthorizationChannel | null {
   const text = String(value || "").trim().toLowerCase();

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

@@ -15,7 +15,7 @@
 import { Hono } from "hono";
 import type { AgentRuntime } from "@/core/AgentCoreTypes.js";
 import type { AgentContext } from "@/core/AgentContextTypes.js";
-import { registerControlApiRoutes } from "@/server/http/control/ControlApiRoutes.js";
+import { registerControlApiRoutes } from "@/runtime/server/http/control/ControlApiRoutes.js";
 
 /**
  * control router 参数。

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

@@ -9,7 +9,7 @@
 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 "@/server/http/control/types/ControlSessionExecute.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";

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

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

package/src/{server → runtime/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 "@/server/http/control/types/ControlViewData.js";
+import type { ControlTimelineEvent, ControlTimelineRole } from "@/runtime/server/http/control/types/ControlViewData.js";
 import { truncateText } from "./CommonHelpers.js";
 
 type AnyUiPart = UIMessagePart<Record<string, never>, Record<string, never>>;

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

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

package/src/{server → runtime/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 "@/server/http/control/types/ControlRoutes.js";
+import type { ControlRouteRegistrationParams } from "@/runtime/server/http/control/types/ControlRoutes.js";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);

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

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

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

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

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

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

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

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

@@ -13,8 +13,8 @@ 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";
+import type { LocalRpcRequest, LocalRpcResponse, LocalRpcServerHandle } from "@/types/runtime/rpc/LocalRpc.js";
+import type { ControlSessionExecuteRequestBody } from "@/runtime/server/http/control/types/ControlSessionExecute.js";
 import type {
   PluginActionResponse,
   PluginAvailabilityResponse,
@@ -29,8 +29,8 @@ import type {
 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";
+import { executeBySessionId } from "@/runtime/server/http/control/ExecuteBySession.js";
+import { getLocalRpcEndpoint } from "@/runtime/transport/rpc/Paths.js";
 
 async function isSocketEndpointActive(endpoint: string): Promise<boolean> {
   return await new Promise<boolean>((resolve) => {

package/src/{transport → runtime/transport}/rpc/Client.ts

@@ -11,8 +11,8 @@ import { nanoid } from "nanoid";
 import type {
   DaemonJsonApiCallParams,
   DaemonJsonApiCallResult,
-} from "@/host/daemon/Api.js";
-import type { LocalRpcRequest, LocalRpcResponse } from "@/types/rpc/LocalRpc.js";
+} from "@/runtime/host/daemon/Api.js";
+import type { LocalRpcRequest, LocalRpcResponse } from "@/types/runtime/rpc/LocalRpc.js";
 import { getLocalRpcEndpoint } from "./Paths.js";
 
 const LOCAL_RPC_TIMEOUT_MS = 5_000;

package/src/{transport → runtime/transport}/rpc/Transport.ts

@@ -10,8 +10,8 @@
 import type {
   DaemonJsonApiCallParams,
   DaemonJsonApiCallResult,
-} from "@/host/daemon/Api.js";
-import { callServer } from "@/host/daemon/Client.js";
+} from "@/runtime/host/daemon/Api.js";
+import { callServer } from "@/runtime/host/daemon/Client.js";
 import { callLocalServer } from "./Client.js";
 
 /**

package/src/sdk/Agent.ts

@@ -27,8 +27,8 @@ import type {
 import { Session } from "@/sdk/Session.js";
 import { AgentCore } from "@/core/AgentCore.js";
 import { startAllServices, stopAllServices } from "@/service/core/Manager.js";
-import { startServer } from "@/server/http/Server.js";
-import { startLocalRpcServer } from "@/server/rpc/Server.js";
+import { startServer } from "@/runtime/server/http/Server.js";
+import { startLocalRpcServer } from "@/runtime/server/rpc/Server.js";
 
 /**
  * SDK 本地 Agent。

package/src/sdk/AgentSdkTypes.ts

@@ -12,9 +12,9 @@ import type { BaseService } from "@/service/builtins/BaseService.js";
 import type { JsonValue } from "@/types/common/Json.js";
 import type { Plugin } from "@/plugin/types/Plugin.js";
 import type { SessionMessageV1 } from "@/session/types/SessionMessages.js";
-import type { AgentPlatformRuntime } from "@/types/host/AgentHost.js";
-import type { LocalRpcServerHandle } from "@/types/rpc/LocalRpc.js";
-import type { ServerInstance } from "@/server/http/Server.js";
+import type { AgentPlatformRuntime } from "@/types/runtime/host/AgentHost.js";
+import type { LocalRpcServerHandle } from "@/types/runtime/rpc/LocalRpc.js";
+import type { ServerInstance } from "@/runtime/server/http/Server.js";
 import type { Session } from "@/sdk/Session.js";
 
 /**

package/src/sdk/Session.ts

@@ -4,13 +4,14 @@
  * 关键点（中文）
  * - 面向 `new Agent(...)` 的本地会话使用场景。
  * - 统一收口消息落盘、session 级模型配置、run/stream/fork 等高层 API。
- * - 内部继续复用 `Executor` / `JsonlSessionHistoryComposer` / `Runner`。
+ * - 内部继续复用 `Executor` / `JsonlSessionHistoryStore` / Composer 体系。
  */
 
 import { nanoid } from "nanoid";
 import type { LanguageModel, Tool } from "ai";
 import { Executor } from "@session/Executor.js";
 import { JsonlSessionHistoryComposer } from "@session/composer/history/jsonl/JsonlSessionHistoryComposer.js";
+import { JsonlSessionHistoryStore } from "@/session/store/history/jsonl/JsonlSessionHistoryStore.js";
 import { extractTextFromUiMessage } from "@/service/builtins/chat/runtime/UIMessageTransformer.js";
 import type {
   AgentSessionConfigSnapshot,
@@ -106,6 +107,7 @@ export class Session {
   private readonly getInstructionSystemBlocks: SessionOptions["getInstructionSystemBlocks"];
   private readonly getServiceSystemBlocks: SessionOptions["getServiceSystemBlocks"];
   private readonly getPluginSystemBlocks: SessionOptions["getPluginSystemBlocks"];
+  private readonly historyStore: JsonlSessionHistoryStore;
   private readonly historyComposer: JsonlSessionHistoryComposer;
   private readonly executor: Executor;
   private sessionConfig: AgentSessionConfigSnapshot = {};
@@ -139,7 +141,7 @@ export class Session {
       this.id,
     );
     const messagesDirPath = `${sessionDirPath}/messages`;
-    this.historyComposer = new JsonlSessionHistoryComposer({
+    this.historyStore = new JsonlSessionHistoryStore({
       rootPath: this.projectRoot,
       sessionId: this.id,
       paths: {
@@ -154,9 +156,13 @@ export class Session {
         ),
       },
     });
+    this.historyComposer = new JsonlSessionHistoryComposer({
+      store: this.historyStore,
+    });
 
     this.executor = new Executor({
       sessionId: this.id,
+      historyStore: this.historyStore,
       historyComposer: this.historyComposer,
       getModel: () => this.sessionConfig.model,
       logger: this.logger as never,
@@ -275,7 +281,7 @@ export class Session {
    * 读取完整消息历史。
    */
   async history(): Promise<SessionMessageV1[]> {
-    return await this.historyComposer.list();
+    return await this.historyStore.list();
   }
 
   /**
@@ -404,7 +410,7 @@ export class Session {
    */
   async fork(input?: AgentSessionForkInput["messageId"]): Promise<Session> {
     const messageId = String(input || "").trim() || undefined;
-    const messages = await this.historyComposer.list();
+    const messages = await this.historyStore.list();
     const forkMessages =
       !messageId
         ? messages
@@ -437,7 +443,7 @@ export class Session {
       });
     }
     for (const message of forkMessages) {
-      await forked.historyComposer.append(message);
+      await forked.historyStore.append(message);
     }
     await forked.touchMetadata();
     return forked;
@@ -452,7 +458,7 @@ export class Session {
       agentId: this.agentId,
       sessionId: this.id,
     });
-    const messageCount = await this.historyComposer.size();
+    const messageCount = await this.historyStore.size();
     return {
       agentId: this.agentId,
       sessionId: this.id,
@@ -471,7 +477,7 @@ export class Session {
     this.servicePort = createSessionServicePort({
       sessionId: this.id,
       executor: this.executor,
-      historyComposer: this.historyComposer,
+      historyStore: this.historyStore,
       touchMetadata: async () => {
         await this.touchMetadata();
       },

package/src/sdk/SessionSystemBuilder.ts

@@ -7,7 +7,7 @@
  * - SDK 不在 system 中注入动态变量；动态上下文应由调用方放入 user message。
  */
 
-import { SessionSystemComposer } from "@session/composer/system/SessionSystemComposer.js";
+import type { SessionSystemComposer } from "@session/composer/system/SessionSystemComposer.js";
 import { getSessionRunScope } from "@session/SessionRunScope.js";
 import type { SessionSystemMessage } from "@/session/types/SessionPrompts.js";
 import type {
@@ -211,7 +211,7 @@ export async function buildSessionSystemMessages(
 /**
  * SDK Session system composer 实现。
  */
-export class SessionSystemBuilder extends SessionSystemComposer {
+export class SessionSystemBuilder implements SessionSystemComposer {
   readonly name = "sdk_prompt_system";
 
   private readonly agentId: string;
@@ -223,7 +223,6 @@ export class SessionSystemBuilder extends SessionSystemComposer {
   private readonly getPluginSystemBlocks: SessionSystemBuilderOptions["getPluginSystemBlocks"];
 
   constructor(options: SessionSystemBuilderOptions) {
-    super();
     this.agentId = String(options.agentId || "").trim();
     this.projectRoot = String(options.projectRoot || "").trim();
     this.getSessionCreatedAt = options.getSessionCreatedAt;

package/src/sdk/session/ServicePort.ts

@@ -7,6 +7,7 @@
  */
 
 import type { SessionPort } from "@/core/AgentContextTypes.js";
+import type { SessionHistoryStore } from "@/session/store/history/SessionHistoryStore.js";
 
 /**
  * 构造 SDK SessionPort 的参数。
@@ -19,11 +20,11 @@ export interface CreateSessionServicePortParams {
   /**
    * 底层执行编排器。
    */
-  executor: Omit<SessionPort, "sessionId" | "getHistoryComposer">;
+  executor: Omit<SessionPort, "sessionId" | "getHistoryStore">;
   /**
    * 当前 session 历史持久化端口。
    */
-  historyComposer: ReturnType<SessionPort["getHistoryComposer"]>;
+  historyStore: SessionHistoryStore;
   /**
    * session 更新后需要同步执行的持久化回调。
    */
@@ -39,7 +40,7 @@ export function createSessionServicePort(
   return {
     sessionId: params.sessionId,
     getExecutor: () => params.executor.getExecutor(),
-    getHistoryComposer: () => params.historyComposer,
+    getHistoryStore: () => params.historyStore,
     run: async (runParams) => {
       return await params.executor.run(runParams);
     },

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

@@ -13,7 +13,7 @@ import { BaseService } from "@/service/builtins/BaseService.js";
 import type { ServiceActions } from "@/service/types/Service.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 { StoredChannelAccount } from "@/types/runtime/host/Store.js";
 import type { ChatQueueWorkerConfig } from "@/service/builtins/chat/types/ChatQueueWorker.js";
 import type {
   ChatServiceFeishuOptions,

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

@@ -9,7 +9,7 @@
 
 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 { StoredChannelAccount } from "@/types/runtime/host/Store.js";
 import type { ChatChannelName } from "@/service/builtins/chat/types/ChannelStatus.js";
 
 /**

package/src/service/builtins/chat/accounts/ChannelAccountService.ts

@@ -8,8 +8,8 @@
  */
 
 import crypto from "node:crypto";
-import type { AgentPlatformRuntime } from "@/types/host/AgentHost.js";
-import type { StoredChannelAccountChannel } from "@/types/host/Store.js";
+import type { AgentPlatformRuntime } from "@/types/runtime/host/AgentHost.js";
+import type { StoredChannelAccountChannel } from "@/types/runtime/host/Store.js";
 import { resolveChatChannelBotInfo } from "@/service/builtins/chat/channels/BotInfoProvider.js";
 import type {
   ChatChannelAccountCreateInput,

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

@@ -11,7 +11,7 @@ import fs from "node:fs/promises";
 import path from "node:path";
 import type { JsonObject, JsonValue } from "@/types/common/Json.js";
 import type { AgentContext } from "@/core/AgentContextTypes.js";
-import type { StoredChannelAccount } from "@/types/host/Store.js";
+import type { StoredChannelAccount } from "@/types/runtime/host/Store.js";
 import type {
   ChatChannelName,
   ChatChannelStateSnapshot,

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

@@ -8,7 +8,7 @@
  */
 
 import type { AgentContext } from "@/core/AgentContextTypes.js";
-import type { StoredChannelAccount } from "@/types/host/Store.js";
+import type { StoredChannelAccount } from "@/types/runtime/host/Store.js";
 import type { ChatChannelName } from "@/service/builtins/chat/types/ChannelStatus.js";
 import type { ChatChannelState } from "@/service/builtins/chat/types/ChatRuntime.js";
 

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

@@ -2,7 +2,7 @@
  * ChatSession：chat 专用 Executor 实现。
  *
  * 关键点（中文）
- * - ChatSession 在实例化时持有自己的 execution composer 实例。
+ * - ChatSession 在实例化时持有自己的 context composer 实例。
  * - chat 当前 turn 的 step 合并/step 回发状态都绑定在 Session 自身，不再新增 `runChat` 一层入口。
  * - 外层仍只调用标准 `run(...)`；chat 语义由 ChatSession 内部收敛。
  */
@@ -10,9 +10,10 @@
 import type { LanguageModel, Tool } from "ai";
 import { Executor } from "@session/Executor.js";
 import type { SessionHistoryComposer } from "@session/composer/history/SessionHistoryComposer.js";
+import type { SessionHistoryStore } from "@/session/store/history/SessionHistoryStore.js";
 import type { SessionCompactionComposer } from "@session/composer/compaction/SessionCompactionComposer.js";
 import type { SessionSystemComposer } from "@session/composer/system/SessionSystemComposer.js";
-import type { ChatSessionExecutionComposer } from "@/service/builtins/chat/runtime/ChatSessionExecutionComposer.js";
+import type { ChatSessionContextComposer } from "@/service/builtins/chat/runtime/ChatSessionContextComposer.js";
 import type { Logger } from "@/utils/logger/Logger.js";
 import type { SessionAssistantStepCallback } from "@/session/types/SessionRun.js";
 import type { SessionRunResult } from "@/session/types/SessionRun.js";
@@ -24,6 +25,11 @@ type ChatSessionOptions = {
    */
   sessionId: string;
 
+  /**
+   * 当前 session 的 history store。
+   */
+  historyStore: SessionHistoryStore;
+
   /**
    * 当前 session 的 history composer。
    */
@@ -55,9 +61,9 @@ type ChatSessionOptions = {
   getTools: () => Record<string, Tool>;
 
   /**
-   * 当前 session 绑定的 chat execution composer。
+   * 当前 session 绑定的 chat context composer。
    */
-  executionComposer: ChatSessionExecutionComposer;
+  contextComposer: ChatSessionContextComposer;
 
   /**
    * session 更新后的异步回调。
@@ -72,26 +78,27 @@ export class ChatSession extends Executor {
   /**
    * ChatSession 持有的 composer 实例。
    */
-  readonly executionComposer: ChatSessionExecutionComposer;
+  readonly contextComposer: ChatSessionContextComposer;
 
   private activeTurnState: ChatSessionTurnState | null = null;
 
   constructor(options: ChatSessionOptions) {
-    const executionComposer = options.executionComposer;
+    const contextComposer = options.contextComposer;
     super({
       sessionId: options.sessionId,
+      historyStore: options.historyStore,
       historyComposer: options.historyComposer,
       getModel: options.getModel,
       logger: options.logger,
       compactionComposer: options.compactionComposer,
       systemComposer: options.systemComposer,
       getTools: options.getTools,
-      executionComposer,
+      contextComposer,
       ...(options.runAfterSessionUpdated
         ? { runAfterSessionUpdated: options.runAfterSessionUpdated }
         : {}),
     });
-    this.executionComposer = executionComposer;
+    this.contextComposer = contextComposer;
   }
 
   /**

package/src/service/builtins/chat/runtime/{ChatSessionExecutionComposer.ts → ChatSessionContextComposer.ts}

@@ -1,5 +1,5 @@
 /**
- * ChatSessionExecutionComposer：chat 专用 execution composer。
+ * ChatSessionContextComposer：chat 专用 context composer。
  *
  * 关键点（中文）
  * - 由 chat 层在 Session 实例化时注入，不再依赖 run 时层层传 callback。
@@ -9,12 +9,12 @@
 
 import type { ModelMessage, Tool } from "ai";
 import { drainInjectedUserMessages } from "@session/SessionRunScope.js";
-import { LocalSessionExecutionComposer } from "@session/composer/execution/LocalSessionExecutionComposer.js";
+import { LocalSessionContextComposer } from "@session/composer/context/LocalSessionContextComposer.js";
 import type { SessionMessageV1 } from "@/session/types/SessionMessages.js";
 import type { SessionSystemMessage } from "@/session/types/SessionPrompts.js";
 import type { ChatSessionTurnState } from "@/service/builtins/chat/runtime/ChatSessionTypes.js";
 
-type ChatSessionExecutionComposerOptions = {
+type ChatSessionContextComposerOptions = {
   /**
    * 当前 session 标识。
    */
@@ -32,12 +32,12 @@ type ChatSessionExecutionComposerOptions = {
 };
 
 /**
- * ChatSession 专用 execution composer。
+ * ChatSession 专用 context composer。
  */
-export class ChatSessionExecutionComposer extends LocalSessionExecutionComposer {
-  private readonly getTurnState: ChatSessionExecutionComposerOptions["getTurnState"];
+export class ChatSessionContextComposer extends LocalSessionContextComposer {
+  private readonly getTurnState: ChatSessionContextComposerOptions["getTurnState"];
 
-  constructor(options: ChatSessionExecutionComposerOptions) {
+  constructor(options: ChatSessionContextComposerOptions) {
     super({
       sessionId: options.sessionId,
       getTools: options.getTools,

package/src/service/builtins/chat/types/ChannelAccount.ts

@@ -6,7 +6,7 @@
  * - 凭据明文只允许出现在写入输入中，读取结果必须是脱敏后的安全视图。
  */
 
-import type { StoredChannelAccountChannel } from "@/types/host/Store.js";
+import type { StoredChannelAccountChannel } from "@/types/runtime/host/Store.js";
 
 /**
  * 支持的 chat channel account 类型。