@downcity/agent 1.1.14 → 1.1.17

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,
@@ -34,19 +35,19 @@ import {
   readSessionMetadata,
   resolveSystemTimezone,
   writeSessionMetadata,
-} from "@/sdk/SessionMetadata.js";
+} from "@/sdk/session/index.js";
 import {
   getSdkAgentSessionArchiveDirPath,
   getSdkAgentSessionDirPath,
-} from "@/sdk/Paths.js";
+} from "@/sdk/session/index.js";
 import { AsyncQueue } from "@/sdk/AsyncQueue.js";
 import type { SessionPort } from "@/core/AgentContextTypes.js";
 import { pushUiMessageChunkAsSdkEvent } from "@/sdk/StreamEvents.js";
 import {
   persistSdkAssistantResult,
   touchSessionMetadata,
-} from "@/sdk/SessionPersistence.js";
-import { createSessionServicePort } from "@/sdk/SessionServicePort.js";
+} from "@/sdk/session/index.js";
+import { createSessionServicePort } from "@/sdk/session/index.js";
 
 type SessionOptions = {
   /**
@@ -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/{SessionMetadata.ts → session/Metadata.ts}

@@ -12,7 +12,7 @@ import type {
   SessionHistoryMetaV1,
   SessionHistorySdkConfigV1,
 } from "@/session/types/SessionHistoryMeta.js";
-import { getSdkAgentSessionMetaPath } from "@/sdk/Paths.js";
+import { getSdkAgentSessionMetaPath } from "@/sdk/session/Paths.js";
 
 type ReadSessionMetadataInput = {
   /**

package/src/sdk/{Paths.ts → session/Paths.ts}

@@ -1,5 +1,5 @@
 /**
- * SDK Session 落盘路径规则。
+ * SDK Session 路径规则。
  *
  * 关键点（中文）
  * - 与旧 `.downcity/session/<sessionId>` 路径分开，避免不同 agent 在同一项目目录下互相污染。

package/src/sdk/{SessionPersistence.ts → session/Persistence.ts}

@@ -14,7 +14,7 @@ import type { AgentSessionConfigSnapshot } from "@/sdk/AgentSdkTypes.js";
 import {
   readSessionMetadata,
   writeSessionMetadata,
-} from "@/sdk/SessionMetadata.js";
+} from "@/sdk/session/Metadata.js";
 
 /**
  * SDK Session 元数据写入参数。

package/src/sdk/{SessionServicePort.ts → 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/sdk/session/index.ts

@@ -0,0 +1,34 @@
+/**
+ * SDK Session 辅助模块聚合入口。
+ *
+ * 关键点（中文）
+ * - 这里收口 `Session.ts` 依赖的路径、元数据、持久化与 service 端口适配能力。
+ * - 避免这些实现继续平铺在 `sdk/` 顶层，提升目录语义清晰度。
+ */
+
+export {
+  getSdkAgentDirPath,
+  getSdkAgentRpcEndpointPath,
+  getSdkAgentSessionArchiveDirPath,
+  getSdkAgentSessionDirPath,
+  getSdkAgentSessionMessagesDirPath,
+  getSdkAgentSessionMessagesPath,
+  getSdkAgentSessionMetaPath,
+  getSdkAgentSessionsRootDirPath,
+  getSdkAgentsRootDirPath,
+  getSdkDowncityDirPath,
+} from "./Paths.js";
+export {
+  inferModelLabel,
+  patchSessionModelLabel,
+  readSessionMetadata,
+  resolveSystemTimezone,
+  writeSessionMetadata,
+} from "./Metadata.js";
+export {
+  persistSdkAssistantResult,
+  touchSessionMetadata,
+} from "./Persistence.js";
+export {
+  createSessionServicePort,
+} from "./ServicePort.js";

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 类型。

package/src/service/builtins/memory/runtime/Flush.ts

@@ -54,10 +54,10 @@ export async function flushMemory(
   const maxMessages = Number.isFinite(payload.maxMessages)
     ? Math.max(1, Math.floor(payload.maxMessages as number))
     : 30;
-  const historyComposer = context.session.get(sessionId).getHistoryComposer();
-  const total = await historyComposer.size();
+  const historyStore = context.session.get(sessionId).getHistoryStore();
+  const total = await historyStore.size();
   const start = Math.max(0, total - maxMessages);
-  const messages = await historyComposer.slice(start, total);
+  const messages = await historyStore.slice(start, total);
   const lines = messages
     .map((msg) => extractReadableLine(msg))
     .filter((line) => line.length > 0);

package/src/service/builtins/schedule/ScheduleService.ts

@@ -10,9 +10,9 @@
 import type { AgentRuntime } from "@/core/AgentCoreTypes.js";
 import type { AgentContext } from "@/core/AgentContextTypes.js";
 import { BaseService } from "@/service/builtins/BaseService.js";
+import { runDueScheduledJobs } from "@/service/core/schedule/Executor.js";
+import { ServiceScheduleStore } from "@/service/core/schedule/Store.js";
 import type { ServiceActions } from "@/service/types/Service.js";
-import { ServiceScheduleStore } from "@/service/schedule/Store.js";
-import { runDueScheduledJobs } from "@/service/schedule/Executor.js";
 
 const SCHEDULE_POLL_INTERVAL_MS = 200;
 const SCHEDULE_LOG_PREFIX = "[SCHEDULE]";

package/src/service/builtins/shell/runtime/ShellActionRuntime.ts

@@ -9,7 +9,7 @@
 
 import fs from "fs-extra";
 import type { AgentContext } from "@/core/AgentContextTypes.js";
-import { spawnShellProcess } from "@/sandbox/SandboxRunner.js";
+import { spawnShellProcess } from "@/runtime/sandbox/SandboxRunner.js";
 import type {
   ShellServiceState,
   ShellSessionRuntimeState,

package/src/service/builtins/shell/runtime/ShellRuntimeEnvironment.ts

@@ -8,7 +8,7 @@
 
 import path from "node:path";
 import type { AgentContext } from "@/core/AgentContextTypes.js";
-import { stripInvocationAuthEnv } from "@/server/http/auth/AuthEnv.js";
+import { stripInvocationAuthEnv } from "@/runtime/server/http/auth/AuthEnv.js";
 import { getSessionRunScope } from "@session/SessionRunScope.js";
 
 /**

package/src/service/builtins/task/runtime/Runner.ts

@@ -148,8 +148,15 @@ export async function runTaskNow(params: {
 
   const runSessionId = createTaskRunSessionId(task.taskId, timestamp);
   const userSimulatorSessionId = `task-user-sim:${task.taskId}:${timestamp}`;
+  const taskModel = await context.session.resolveModel(task.frontmatter.sessionId);
+  if (!taskModel) {
+    throw new Error(
+      `Task "${task.taskId}" requires a configured model on session "${task.frontmatter.sessionId}"`,
+    );
+  }
   const taskSessionRuntime = createTaskSessionRuntimePort({
     context,
+    model: taskModel,
     runDirAbs,
     runSessionId,
     userSimulatorSessionId,

package/src/service/builtins/task/runtime/TaskRunnerRound.ts

@@ -8,9 +8,9 @@
 
 import path from "node:path";
 import fs from "fs-extra";
-import { stripInvocationAuthEnv } from "@/server/http/auth/AuthEnv.js";
+import { stripInvocationAuthEnv } from "@/runtime/server/http/auth/AuthEnv.js";
 import type { AgentContext } from "@/core/AgentContextTypes.js";
-import { runSandboxCommand } from "@/sandbox/SandboxRunner.js";
+import { runSandboxCommand } from "@/runtime/sandbox/SandboxRunner.js";
 import type { SessionRunResult } from "@/session/types/SessionRun.js";
 import type { JsonObject } from "@/types/common/Json.js";
 import type {