@downcity/agent 1.1.14 → 1.1.17

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

@@ -2,21 +2,23 @@
  * TaskRunnerSession：task runner 的 session 装配模块。
  *
  * 关键点（中文）
- * - 负责构建 task 专用 Runner / JsonlSessionHistoryComposer 运行时。
+ * - 负责构建 task 专用 Executor / JsonlSessionHistoryStore 运行时。
  * - 负责把每轮 user/assistant 消息写入 run 目录对应的 messages.jsonl。
- * - 这些能力与任务编排逻辑解耦后，Runner 主流程会更聚焦于状态流转。
+ * - 这些能力与任务编排逻辑解耦后，task 主流程会更聚焦于状态流转。
  * - 当前只有 api 执行模式。
  */
 
 import path from "node:path";
+import type { LanguageModel } from "ai";
 import type { AgentContext } from "@/core/AgentContextTypes.js";
+import { Executor } from "@/session/Executor.js";
 import type { SessionRunResult } from "@/session/types/SessionRun.js";
 import type { TaskSessionRuntimePort } from "@/service/builtins/task/runtime/TaskRunnerTypes.js";
-import { Runner } from "@session/executors/local/Runner.js";
 import { drainDeferredPersistedUserMessages } from "@session/SessionRunScope.js";
 import { JsonlSessionHistoryComposer } from "@session/composer/history/jsonl/JsonlSessionHistoryComposer.js";
+import { JsonlSessionHistoryStore } from "@/session/store/history/jsonl/JsonlSessionHistoryStore.js";
 import { JsonlSessionCompactionComposer } from "@session/composer/compaction/jsonl/JsonlSessionCompactionComposer.js";
-import { LocalSessionExecutionComposer } from "@session/composer/execution/LocalSessionExecutionComposer.js";
+import { LocalSessionContextComposer } from "@session/composer/context/LocalSessionContextComposer.js";
 import { DefaultSessionSystemComposer } from "@session/composer/system/default/DefaultSessionSystemComposer.js";
 import { shellTools } from "@session/tools/shell/ShellToolDefinition.js";
 import type { SessionExecutor } from "@/session/types/SessionExecutor.js";
@@ -34,9 +36,9 @@ export async function appendTaskRoundUserMessage(params: {
 }): Promise<void> {
   const text = String(params.query || "").trim();
   if (!text) return;
-  const historyComposer = params.taskSessionRuntime.getHistoryComposer(params.sessionId);
-  await historyComposer.append(
-    historyComposer.userText({
+  const historyStore = params.taskSessionRuntime.getHistoryStore(params.sessionId);
+  await historyStore.append(
+    historyStore.userText({
       text,
       metadata: {
         sessionId: params.sessionId,
@@ -54,15 +56,23 @@ export async function appendTaskRoundUserMessage(params: {
  * 构建 task 专用 Session 运行时（独立于普通 Session 实例缓存）。
  *
  * 关键点（中文）
- * - 使用 Runner 执行，模型来自 context.session.model（agent 级模型）。
+ * - 使用 Executor 执行，但模型显式来自“任务绑定 session”的 session 级配置。
+ * - task runner 自己维护独立 history，不复用原 session 的消息落盘。
  */
 export function createTaskSessionRuntimePort(params: {
   context: AgentContext;
+  model: LanguageModel;
   runDirAbs: string;
   runSessionId: string;
   userSimulatorSessionId: string;
 }): TaskSessionRuntimePort {
-  const { context, runDirAbs, runSessionId, userSimulatorSessionId } = params;
+  const {
+    context,
+    model,
+    runDirAbs,
+    runSessionId,
+    userSimulatorSessionId,
+  } = params;
   const compactionComposer = new JsonlSessionCompactionComposer({
     keepLastMessages: context.config.context?.messages?.keepLastMessages,
     maxInputTokensApprox: context.config.context?.messages?.maxInputTokensApprox,
@@ -75,11 +85,12 @@ export function createTaskSessionRuntimePort(params: {
     getContext: () => context,
     profile: "task",
   });
+  const historyStoresBySessionId = new Map<string, JsonlSessionHistoryStore>();
   const historyComposersBySessionId = new Map<string, JsonlSessionHistoryComposer>();
   const runtimesBySessionId = new Map<string, SessionExecutor>();
 
-  const resolveTaskHistoryComposer = (sessionId: string): JsonlSessionHistoryComposer => {
-    const existing = historyComposersBySessionId.get(sessionId);
+  const resolveTaskHistoryStore = (sessionId: string): JsonlSessionHistoryStore => {
+    const existing = historyStoresBySessionId.get(sessionId);
     if (existing) return existing;
 
     const key = String(sessionId || "").trim();
@@ -93,7 +104,7 @@ export function createTaskSessionRuntimePort(params: {
           ? path.join(runDirAbs, "user-simulator")
           : undefined;
 
-    const created = new JsonlSessionHistoryComposer({
+    const created = new JsonlSessionHistoryStore({
       rootPath: context.rootPath,
       sessionId: key,
       ...(runMessagesDirPath
@@ -108,13 +119,24 @@ export function createTaskSessionRuntimePort(params: {
           }
         : {}),
     });
+    historyStoresBySessionId.set(key, created);
+    return created;
+  };
+
+  const resolveTaskHistoryComposer = (sessionId: string): JsonlSessionHistoryComposer => {
+    const key = String(sessionId || "").trim();
+    const existing = historyComposersBySessionId.get(key);
+    if (existing) return existing;
+    const created = new JsonlSessionHistoryComposer({
+      store: resolveTaskHistoryStore(key),
+    });
     historyComposersBySessionId.set(key, created);
     return created;
   };
 
   return {
-    getHistoryComposer(sessionId: string): JsonlSessionHistoryComposer {
-      return resolveTaskHistoryComposer(sessionId);
+    getHistoryStore(sessionId: string): JsonlSessionHistoryStore {
+      return resolveTaskHistoryStore(sessionId);
     },
     getExecutor(sessionId: string): SessionExecutor {
       const key = String(sessionId || "").trim();
@@ -124,21 +146,22 @@ export function createTaskSessionRuntimePort(params: {
       const existing = runtimesBySessionId.get(key);
       if (existing) return existing;
 
+      const historyStore = resolveTaskHistoryStore(key);
       const historyComposer = resolveTaskHistoryComposer(key);
-      if (!context.session.model) {
-        throw new Error("TaskSessionRuntimePort requires session.model");
-      }
-      const executionComposer = new LocalSessionExecutionComposer({
+      const contextComposer = new LocalSessionContextComposer({
         sessionId: key,
         getTools: () => shellTools,
       });
-      const created = new Runner({
-        model: context.session.model,
+      const created = new Executor({
+        sessionId: key,
+        getModel: () => model,
         logger: context.logger,
+        historyStore,
         historyComposer,
         compactionComposer,
-        executionComposer,
+        contextComposer,
         systemComposer,
+        getTools: () => shellTools,
       });
       runtimesBySessionId.set(key, created);
       return created;
@@ -147,7 +170,7 @@ export function createTaskSessionRuntimePort(params: {
 }
 
 /**
- * 把 task session 的 assistant 消息落盘到对应 run context history Composer。
+ * 把 task session 的 assistant 消息落盘到对应 run context history Store。
  */
 export async function appendTaskAssistantMessage(params: {
   taskSessionRuntime: TaskSessionRuntimePort;
@@ -156,12 +179,12 @@ export async function appendTaskAssistantMessage(params: {
   rawResult: SessionRunResult;
 }): Promise<void> {
   const { taskSessionRuntime, sessionId, rawResult } = params;
-  const historyComposer = taskSessionRuntime.getHistoryComposer(sessionId);
+  const historyStore = taskSessionRuntime.getHistoryStore(sessionId);
   if (rawResult.assistantMessage) {
-    await historyComposer.append(rawResult.assistantMessage);
+    await historyStore.append(rawResult.assistantMessage);
   }
   const deferredUserMessages = drainDeferredPersistedUserMessages(sessionId);
   for (const deferred of deferredUserMessages) {
-    await historyComposer.append(deferred);
+    await historyStore.append(deferred);
   }
 }

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

@@ -6,7 +6,7 @@
  * - 这些类型服务于 task 运行链路，统一归档到 `src/types/task/`。
  */
 
-import type { JsonlSessionHistoryComposer } from "@session/composer/history/jsonl/JsonlSessionHistoryComposer.js";
+import type { JsonlSessionHistoryStore } from "@/session/store/history/jsonl/JsonlSessionHistoryStore.js";
 import type { SessionExecutor } from "@/session/types/SessionExecutor.js";
 import type {
   ShipTaskRunExecutionStatusV1,
@@ -171,7 +171,7 @@ export type ScriptExecutionResult = {
  *
  * 关键点（中文）
  * - task runner 不直接依赖具体 SDK `Session` 实现。
- * - 这里暴露的是 task 场景最小可用端口：执行器 + history Composer。
+ * - 这里暴露的是 task 场景最小可用端口：执行器 + history Store。
  */
 export type TaskSessionRuntimePort = {
   /**
@@ -179,9 +179,9 @@ export type TaskSessionRuntimePort = {
    */
   getExecutor(sessionId: string): SessionExecutor;
   /**
-   * 获取指定 sessionId 对应的 JsonlSessionHistoryComposer。
+   * 获取指定 sessionId 对应的 JsonlSessionHistoryStore。
    */
-  getHistoryComposer(sessionId: string): JsonlSessionHistoryComposer;
+  getHistoryStore(sessionId: string): JsonlSessionHistoryStore;
 };
 
 /**

package/src/service/core/ServiceActionRunner.ts

@@ -15,8 +15,8 @@ import type {
   ServiceStateSnapshot,
 } from "@/service/types/ServiceState.js";
 import type { BaseService } from "@/service/builtins/BaseService.js";
-import { ServiceScheduleStore } from "../schedule/Store.js";
-import { normalizeRunAtMsOrThrow } from "../schedule/Time.js";
+import { ServiceScheduleStore } from "./schedule/Store.js";
+import { normalizeRunAtMsOrThrow } from "./schedule/Time.js";
 import type {
   ServiceAction,
   ServiceActionResult,

package/src/service/core/ServiceCommandRequest.ts

@@ -12,7 +12,7 @@ import type { ServiceCommandScheduleInput } from "@/service/types/ServiceSchedul
 import {
   normalizeRunAtMsOrThrow,
   parseScheduledRunAtMsOrThrow,
-} from "@/service/schedule/Time.js";
+} from "@/service/core/schedule/Time.js";
 
 type JsonRecord = Record<string, unknown>;
 

package/src/service/{schedule → core/schedule}/Executor.ts

@@ -7,7 +7,7 @@
  */
 
 import type { AgentContext } from "@/core/AgentContextTypes.js";
-import type { ServiceScheduleStore } from "./Store.js";
+import type { ServiceScheduleStore } from "@/service/core/schedule/Store.js";
 import { runServiceCommand } from "@/service/core/Manager.js";
 
 /**

package/src/service/{schedule → core/schedule}/Store.ts

@@ -14,7 +14,6 @@ import type {
   ScheduledJobRecord,
   ScheduledJobStatus,
 } from "@/service/types/ServiceSchedule.js";
-import type { JsonValue } from "@/types/common/Json.js";
 import { generateId } from "@/utils/Id.js";
 import { getDowncityScheduleDbPath } from "@/config/Paths.js";
 
@@ -318,7 +317,10 @@ export class ServiceScheduleStore {
   /**
    * 执行 pending -> target 的状态迁移。
    */
-  private transitionPendingJob(jobId: string, status: "running" | "cancelled"): boolean {
+  private transitionPendingJob(
+    jobId: string,
+    status: "running" | "cancelled",
+  ): boolean {
     const current = this.getJobById(jobId);
     if (!current || current.status !== "pending") {
       return false;

package/src/service/types/Service.ts

@@ -4,7 +4,7 @@
  * 关键点（中文）
  * - 这里集中声明 service 体系的共享契约。
  * - 这些类型会被 service 管理层、内建 service 与测试多处复用，因此收敛在 `service/types/`。
- * - `service/core/ServiceManager.ts` 之后只保留门面 re-export，不再承担类型源文件职责。
+ * - service 共享契约统一放在 `service/types/`，避免管理层门面文件承载类型来源职责。
  */
 
 import type { Command } from "commander";