@downcity/agent 1.1.11 → 1.1.13

package/bin/sdk/SessionSystemBuilder.js

@@ -0,0 +1,150 @@
+/**
+ * SDK Session 默认 system composer。
+ *
+ * 关键点（中文）
+ * - 面向 `Agent` SDK 的本地会话执行场景。
+ * - 注入调用方显式传入的静态 instruction、显式注入 service system 与显式注册 plugin system。
+ * - SDK 不在 system 中注入动态变量；动态上下文应由调用方放入 user message。
+ */
+import { SessionSystemComposer } from "../session/composer/system/SessionSystemComposer.js";
+import { getSessionRunScope } from "../session/SessionRunScope.js";
+function normalizeSystemBlocks(blocks) {
+    if (!Array.isArray(blocks))
+        return [];
+    return blocks
+        .map((block) => {
+        const content = String(block?.content || "").trim();
+        if (!content)
+            return null;
+        const source = block.source;
+        if (source !== "core" &&
+            source !== "instruction" &&
+            source !== "service" &&
+            source !== "plugin" &&
+            source !== "session") {
+            return null;
+        }
+        return {
+            source,
+            name: String(block.name || source).trim() || source,
+            content,
+        };
+    })
+        .filter((block) => Boolean(block));
+}
+function createSessionInfo(params) {
+    const createdAt = Number.isFinite(params.createdAt) ? params.createdAt : 0;
+    return {
+        agentId: String(params.agentId || "").trim(),
+        sessionId: String(params.sessionId || "").trim(),
+        projectRoot: String(params.projectRoot || "").trim(),
+        createdAt: new Date(createdAt).toISOString(),
+        timezone: String(params.timezone || "").trim() || "UTC",
+    };
+}
+function createSessionSystemBlock(session) {
+    const content = [
+        "当前会话上下文：",
+        `你正在服务 agent "${session.agentId}" 的 session "${session.sessionId}"。`,
+        `当前项目根目录是 "${session.projectRoot}"。`,
+        `本会话创建于 ${session.createdAt}，参考时区是 ${session.timezone}。`,
+        "这个创建时间是当前会话的稳定参考时间，不代表每轮运行时的当前时间。",
+        "如果用户消息中提供了新的当前时间、相对时间或其他动态上下文，应优先使用用户消息中的动态信息。",
+    ].join("\n");
+    return {
+        source: "session",
+        name: "context",
+        content,
+    };
+}
+/**
+ * 解析 SDK session 当前生效的 system blocks。
+ */
+export async function buildSessionSystemBlocks(params) {
+    const agentId = String(params.agentId || "").trim();
+    const projectRoot = String(params.projectRoot || "").trim();
+    const sessionId = String(params.sessionId || "").trim();
+    const createdAt = Number(params.createdAt || 0);
+    const timezone = String(params.timezone || "").trim();
+    if (!agentId) {
+        throw new Error("buildSessionSystemBlocks requires a non-empty agentId");
+    }
+    if (!projectRoot) {
+        throw new Error("buildSessionSystemBlocks requires a non-empty projectRoot");
+    }
+    if (!sessionId) {
+        throw new Error("buildSessionSystemBlocks requires a non-empty sessionId");
+    }
+    if (!Number.isFinite(createdAt) || createdAt <= 0) {
+        throw new Error("buildSessionSystemBlocks requires a valid createdAt");
+    }
+    if (!timezone) {
+        throw new Error("buildSessionSystemBlocks requires a non-empty timezone");
+    }
+    return [
+        ...normalizeSystemBlocks(params.getInstructionSystemBlocks()),
+        ...normalizeSystemBlocks(await params.getServiceSystemBlocks()),
+        ...normalizeSystemBlocks(await params.getPluginSystemBlocks()),
+        // session block 放在最后，尽量保留前缀 system blocks 的跨 session 缓存命中。
+        createSessionSystemBlock(createSessionInfo({ agentId, projectRoot, sessionId, createdAt, timezone })),
+    ];
+}
+/**
+ * 解析 SDK session 当前生效的 system messages。
+ */
+export async function buildSessionSystemMessages(params) {
+    const blocks = await buildSessionSystemBlocks(params);
+    return blocks.map((block) => ({
+        role: "system",
+        content: block.content,
+    }));
+}
+/**
+ * SDK Session system composer 实现。
+ */
+export class SessionSystemBuilder extends SessionSystemComposer {
+    name = "sdk_prompt_system";
+    agentId;
+    projectRoot;
+    getSessionCreatedAt;
+    getSessionTimezone;
+    getInstructionSystemBlocks;
+    getServiceSystemBlocks;
+    getPluginSystemBlocks;
+    constructor(options) {
+        super();
+        this.agentId = String(options.agentId || "").trim();
+        this.projectRoot = String(options.projectRoot || "").trim();
+        this.getSessionCreatedAt = options.getSessionCreatedAt;
+        this.getSessionTimezone = options.getSessionTimezone;
+        this.getInstructionSystemBlocks = options.getInstructionSystemBlocks;
+        this.getServiceSystemBlocks = options.getServiceSystemBlocks;
+        this.getPluginSystemBlocks = options.getPluginSystemBlocks;
+        if (!this.agentId) {
+            throw new Error("SessionSystemBuilder requires a non-empty agentId");
+        }
+        if (!this.projectRoot) {
+            throw new Error("SessionSystemBuilder requires a non-empty projectRoot");
+        }
+    }
+    /**
+     * 解析本轮 SDK session system messages。
+     */
+    async resolve() {
+        const sessionId = String(getSessionRunScope()?.sessionId || "").trim();
+        if (!sessionId) {
+            throw new Error("SessionSystemBuilder.resolve requires a non-empty sessionId");
+        }
+        return await buildSessionSystemMessages({
+            agentId: this.agentId,
+            projectRoot: this.projectRoot,
+            sessionId,
+            createdAt: this.getSessionCreatedAt(),
+            timezone: this.getSessionTimezone(),
+            getInstructionSystemBlocks: this.getInstructionSystemBlocks,
+            getServiceSystemBlocks: this.getServiceSystemBlocks,
+            getPluginSystemBlocks: this.getPluginSystemBlocks,
+        });
+    }
+}
+//# sourceMappingURL=SessionSystemBuilder.js.map

package/bin/sdk/SessionSystemBuilder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SessionSystemBuilder.js","sourceRoot":"","sources":["../../src/sdk/SessionSystemBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAyFjE,SAAS,qBAAqB,CAC5B,MAAiC;IAEjC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QAAE,OAAO,EAAE,CAAC;IACtC,OAAO,MAAM;SACV,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACb,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,EAAE,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACpD,IAAI,CAAC,OAAO;YAAE,OAAO,IAAI,CAAC;QAC1B,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAC5B,IACE,MAAM,KAAK,MAAM;YACjB,MAAM,KAAK,aAAa;YACxB,MAAM,KAAK,SAAS;YACpB,MAAM,KAAK,QAAQ;YACnB,MAAM,KAAK,SAAS,EACpB,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO;YACL,MAAM;YACN,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,MAAM;YACnD,OAAO;SAC0B,CAAC;IACtC,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,KAAK,EAAoC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;AACzE,CAAC;AAED,SAAS,iBAAiB,CACxB,MAGC;IAED,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3E,OAAO;QACL,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE;QAC5C,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE;QAChD,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE;QACpD,SAAS,EAAE,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE;QAC5C,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,KAAK;KACxD,CAAC;AACJ,CAAC;AAED,SAAS,wBAAwB,CAC/B,OAAsC;IAEtC,MAAM,OAAO,GAAG;QACd,UAAU;QACV,gBAAgB,OAAO,CAAC,OAAO,gBAAgB,OAAO,CAAC,SAAS,IAAI;QACpE,aAAa,OAAO,CAAC,WAAW,IAAI;QACpC,UAAU,OAAO,CAAC,SAAS,UAAU,OAAO,CAAC,QAAQ,GAAG;QACxD,mCAAmC;QACnC,gDAAgD;KACjD,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACb,OAAO;QACL,MAAM,EAAE,SAAS;QACjB,IAAI,EAAE,SAAS;QACf,OAAO;KACR,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,MAAsC;IAEtC,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACpD,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC5D,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACxD,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,IAAI,CAAC,CAAC,CAAC;IAChD,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACtD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;IAC3E,CAAC;IACD,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAC;IAC/E,CAAC;IACD,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;IAC7E,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,SAAS,IAAI,CAAC,EAAE,CAAC;QAClD,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;IACzE,CAAC;IACD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;IAC5E,CAAC;IACD,OAAO;QACL,GAAG,qBAAqB,CAAC,MAAM,CAAC,0BAA0B,EAAE,CAAC;QAC7D,GAAG,qBAAqB,CAAC,MAAM,MAAM,CAAC,sBAAsB,EAAE,CAAC;QAC/D,GAAG,qBAAqB,CAAC,MAAM,MAAM,CAAC,qBAAqB,EAAE,CAAC;QAC9D,2DAA2D;QAC3D,wBAAwB,CACtB,iBAAiB,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,CAC5E;KACF,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,MAAsC;IAEtC,MAAM,MAAM,GAAG,MAAM,wBAAwB,CAAC,MAAM,CAAC,CAAC;IACtD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC5B,IAAI,EAAE,QAAiB;QACvB,OAAO,EAAE,KAAK,CAAC,OAAO;KACvB,CAAC,CAAC,CAAC;AACN,CAAC;AAED;;GAEG;AACH,MAAM,OAAO,oBAAqB,SAAQ,qBAAqB;IACpD,IAAI,GAAG,mBAAmB,CAAC;IAEnB,OAAO,CAAS;IAChB,WAAW,CAAS;IACpB,mBAAmB,CAAqD;IACxE,kBAAkB,CAAoD;IACtE,0BAA0B,CAA4D;IACtF,sBAAsB,CAAwD;IAC9E,qBAAqB,CAAuD;IAE7F,YAAY,OAAoC;QAC9C,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACpD,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC5D,IAAI,CAAC,mBAAmB,GAAG,OAAO,CAAC,mBAAmB,CAAC;QACvD,IAAI,CAAC,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;QACrD,IAAI,CAAC,0BAA0B,GAAG,OAAO,CAAC,0BAA0B,CAAC;QACrE,IAAI,CAAC,sBAAsB,GAAG,OAAO,CAAC,sBAAsB,CAAC;QAC7D,IAAI,CAAC,qBAAqB,GAAG,OAAO,CAAC,qBAAqB,CAAC;QAC3D,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;QACvE,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,OAAO;QACX,MAAM,SAAS,GAAG,MAAM,CAAC,kBAAkB,EAAE,EAAE,SAAS,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACvE,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC;QACjF,CAAC;QACD,OAAO,MAAM,0BAA0B,CAAC;YACtC,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,SAAS;YACT,SAAS,EAAE,IAAI,CAAC,mBAAmB,EAAE;YACrC,QAAQ,EAAE,IAAI,CAAC,kBAAkB,EAAE;YACnC,0BAA0B,EAAE,IAAI,CAAC,0BAA0B;YAC3D,sBAAsB,EAAE,IAAI,CAAC,sBAAsB;YACnD,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;SAClD,CAAC,CAAC;IACL,CAAC;CACF"}

package/bin/service/builtins/chat/runtime/ChatSession.d.ts

@@ -1,15 +1,18 @@
 /**
- * ChatSession：chat 专用 Session 实现。
+ * ChatSession：chat 专用 Executor 实现。
  *
  * 关键点（中文）
  * - ChatSession 在实例化时持有自己的 execution composer 实例。
  * - chat 当前 turn 的 step 合并/step 回发状态都绑定在 Session 自身，不再新增 `runChat` 一层入口。
  * - 外层仍只调用标准 `run(...)`；chat 语义由 ChatSession 内部收敛。
  */
-import { Session } from "../../../../session/Session.js";
+import type { LanguageModel, Tool } from "ai";
+import { Executor } from "../../../../session/Executor.js";
 import type { SessionHistoryComposer } from "../../../../session/composer/history/SessionHistoryComposer.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 { SessionExecutor } from "../../../../session/types/SessionExecutor.js";
+import type { Logger } from "../../../../utils/logger/Logger.js";
 import type { SessionRunResult } from "../../../../session/types/SessionRun.js";
 import type { ChatSessionTurnState } from "../../../../service/builtins/chat/runtime/ChatSessionTypes.js";
 type ChatSessionOptions = {
@@ -22,13 +25,29 @@ type ChatSessionOptions = {
      */
     historyComposer: SessionHistoryComposer;
     /**
-     * 当前 session 绑定的 chat execution composer。
+     * 读取当前 session 使用的模型实例。
      */
-    executionComposer: ChatSessionExecutionComposer;
+    getModel: () => LanguageModel | undefined;
+    /**
+     * 统一日志器。
+     */
+    logger: Logger;
+    /**
+     * 当前 session 对应的 compaction Composer。
+     */
+    compactionComposer: SessionCompactionComposer;
     /**
-     * 创建当前 session 的执行器。
+     * 当前 session 对应的 system Composer。
      */
-    createExecutor: (historyComposer: SessionHistoryComposer, executionComposer: ChatSessionExecutionComposer) => SessionExecutor;
+    systemComposer: SessionSystemComposer;
+    /**
+     * 获取当前可用工具集合。
+     */
+    getTools: () => Record<string, Tool>;
+    /**
+     * 当前 session 绑定的 chat execution composer。
+     */
+    executionComposer: ChatSessionExecutionComposer;
     /**
      * session 更新后的异步回调。
      */
@@ -37,7 +56,7 @@ type ChatSessionOptions = {
 /**
  * Chat 专用 Session。
  */
-export declare class ChatSession extends Session {
+export declare class ChatSession extends Executor {
     /**
      * ChatSession 持有的 composer 实例。
      */

package/bin/service/builtins/chat/runtime/ChatSession.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ChatSession.d.ts","sourceRoot":"","sources":["../../../../../src/service/builtins/chat/runtime/ChatSession.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qDAAqD,CAAC;AAClG,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,iEAAiE,CAAC;AACpH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAE1E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qDAAqD,CAAC;AAEhG,KAAK,kBAAkB,GAAG;IACxB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,eAAe,EAAE,sBAAsB,CAAC;IAExC;;OAEG;IACH,iBAAiB,EAAE,4BAA4B,CAAC;IAEhD;;OAEG;IACH,cAAc,EAAE,CACd,eAAe,EAAE,sBAAsB,EACvC,iBAAiB,EAAE,4BAA4B,KAC5C,eAAe,CAAC;IAErB;;OAEG;IACH,sBAAsB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/D,CAAC;AAEF;;GAEG;AACH,qBAAa,WAAY,SAAQ,OAAO;IACtC;;OAEG;IACH,QAAQ,CAAC,iBAAiB,EAAE,4BAA4B,CAAC;IAEzD,OAAO,CAAC,eAAe,CAAqC;gBAEhD,OAAO,EAAE,kBAAkB;IAcvC;;OAEG;IACH,YAAY,IAAI,oBAAoB,GAAG,IAAI;IAI3C;;;;;;OAMG;IACH,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAMnC;IAEF;;;;;;OAMG;IACY,GAAG,CAAC,MAAM,EAAE;QACzB,KAAK,EAAE,MAAM,CAAC;QACd,cAAc,CAAC,EAAE,oBAAoB,CAAC,gBAAgB,CAAC,CAAC;QACxD,uBAAuB,CAAC,EAAE,oBAAoB,CAAC,yBAAyB,CAAC,CAAC;KAC3E,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAmB9B"}
+{"version":3,"file":"ChatSession.d.ts","sourceRoot":"","sources":["../../../../../src/service/builtins/chat/runtime/ChatSession.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qDAAqD,CAAC;AAClG,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,2DAA2D,CAAC;AAC3G,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC/F,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,iEAAiE,CAAC;AACpH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qDAAqD,CAAC;AAEhG,KAAK,kBAAkB,GAAG;IACxB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,eAAe,EAAE,sBAAsB,CAAC;IAExC;;OAEG;IACH,QAAQ,EAAE,MAAM,aAAa,GAAG,SAAS,CAAC;IAE1C;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,kBAAkB,EAAE,yBAAyB,CAAC;IAE9C;;OAEG;IACH,cAAc,EAAE,qBAAqB,CAAC;IAEtC;;OAEG;IACH,QAAQ,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAErC;;OAEG;IACH,iBAAiB,EAAE,4BAA4B,CAAC;IAEhD;;OAEG;IACH,sBAAsB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/D,CAAC;AAEF;;GAEG;AACH,qBAAa,WAAY,SAAQ,QAAQ;IACvC;;OAEG;IACH,QAAQ,CAAC,iBAAiB,EAAE,4BAA4B,CAAC;IAEzD,OAAO,CAAC,eAAe,CAAqC;gBAEhD,OAAO,EAAE,kBAAkB;IAkBvC;;OAEG;IACH,YAAY,IAAI,oBAAoB,GAAG,IAAI;IAI3C;;;;;;OAMG;IACH,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAMnC;IAEF;;;;;;OAMG;IACY,GAAG,CAAC,MAAM,EAAE;QACzB,KAAK,EAAE,MAAM,CAAC;QACd,cAAc,CAAC,EAAE,oBAAoB,CAAC,gBAAgB,CAAC,CAAC;QACxD,uBAAuB,CAAC,EAAE,oBAAoB,CAAC,yBAAyB,CAAC,CAAC;KAC3E,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAmB9B"}

package/bin/service/builtins/chat/runtime/ChatSession.js

@@ -1,16 +1,16 @@
 /**
- * ChatSession：chat 专用 Session 实现。
+ * ChatSession：chat 专用 Executor 实现。
  *
  * 关键点（中文）
  * - ChatSession 在实例化时持有自己的 execution composer 实例。
  * - chat 当前 turn 的 step 合并/step 回发状态都绑定在 Session 自身，不再新增 `runChat` 一层入口。
  * - 外层仍只调用标准 `run(...)`；chat 语义由 ChatSession 内部收敛。
  */
-import { Session } from "../../../../session/Session.js";
+import { Executor } from "../../../../session/Executor.js";
 /**
  * Chat 专用 Session。
  */
-export class ChatSession extends Session {
+export class ChatSession extends Executor {
     /**
      * ChatSession 持有的 composer 实例。
      */
@@ -21,7 +21,12 @@ export class ChatSession extends Session {
         super({
             sessionId: options.sessionId,
             historyComposer: options.historyComposer,
-            createExecutor: (historyComposer) => options.createExecutor(historyComposer, executionComposer),
+            getModel: options.getModel,
+            logger: options.logger,
+            compactionComposer: options.compactionComposer,
+            systemComposer: options.systemComposer,
+            getTools: options.getTools,
+            executionComposer,
             ...(options.runAfterSessionUpdated
                 ? { runAfterSessionUpdated: options.runAfterSessionUpdated }
                 : {}),

package/bin/service/builtins/chat/runtime/ChatSession.js.map

@@ -1 +1 @@
-{"version":3,"file":"ChatSession.js","sourceRoot":"","sources":["../../../../../src/service/builtins/chat/runtime/ChatSession.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAsC9C;;GAEG;AACH,MAAM,OAAO,WAAY,SAAQ,OAAO;IACtC;;OAEG;IACM,iBAAiB,CAA+B;IAEjD,eAAe,GAAgC,IAAI,CAAC;IAE5D,YAAY,OAA2B;QACrC,MAAM,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC;QACpD,KAAK,CAAC;YACJ,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,cAAc,EAAE,CAAC,eAAe,EAAE,EAAE,CAClC,OAAO,CAAC,cAAc,CAAC,eAAe,EAAE,iBAAiB,CAAC;YAC5D,GAAG,CAAC,OAAO,CAAC,sBAAsB;gBAChC,CAAC,CAAC,EAAE,sBAAsB,EAAE,OAAO,CAAC,sBAAsB,EAAE;gBAC5D,CAAC,CAAC,EAAE,CAAC;SACR,CAAC,CAAC;QACH,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;IAC7C,CAAC;IAED;;OAEG;IACH,YAAY;QACV,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAED;;;;;;OAMG;IACc,oBAAoB,GAAiC,KAAK,EACzE,IAAI,EACW,EAAE;QACjB,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,EAAE,uBAAuB,CAAC;QAC/D,IAAI,OAAO,QAAQ,KAAK,UAAU;YAAE,OAAO;QAC3C,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC,CAAC;IAEF;;;;;;OAMG;IACM,KAAK,CAAC,GAAG,CAAC,MAIlB;QACC,IAAI,CAAC,eAAe,GAAG;YACrB,GAAG,CAAC,OAAO,MAAM,CAAC,cAAc,KAAK,UAAU;gBAC7C,CAAC,CAAC,EAAE,cAAc,EAAE,MAAM,CAAC,cAAc,EAAE;gBAC3C,CAAC,CAAC,EAAE,CAAC;YACP,GAAG,CAAC,OAAO,MAAM,CAAC,uBAAuB,KAAK,UAAU;gBACtD,CAAC,CAAC,EAAE,uBAAuB,EAAE,MAAM,CAAC,uBAAuB,EAAE;gBAC7D,CAAC,CAAC,EAAE,CAAC;SACR,CAAC;QACF,IAAI,CAAC;YACH,OAAO,MAAM,KAAK,CAAC,GAAG,CAAC;gBACrB,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,cAAc,EAAE,MAAM,CAAC,cAAc;gBACrC,uBAAuB,EAAE,IAAI,CAAC,oBAAoB;aACnD,CAAC,CAAC;QACL,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;QAC9B,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"ChatSession.js","sourceRoot":"","sources":["../../../../../src/service/builtins/chat/runtime/ChatSession.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAyDhD;;GAEG;AACH,MAAM,OAAO,WAAY,SAAQ,QAAQ;IACvC;;OAEG;IACM,iBAAiB,CAA+B;IAEjD,eAAe,GAAgC,IAAI,CAAC;IAE5D,YAAY,OAA2B;QACrC,MAAM,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC;QACpD,KAAK,CAAC;YACJ,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;YAC9C,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,iBAAiB;YACjB,GAAG,CAAC,OAAO,CAAC,sBAAsB;gBAChC,CAAC,CAAC,EAAE,sBAAsB,EAAE,OAAO,CAAC,sBAAsB,EAAE;gBAC5D,CAAC,CAAC,EAAE,CAAC;SACR,CAAC,CAAC;QACH,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;IAC7C,CAAC;IAED;;OAEG;IACH,YAAY;QACV,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAED;;;;;;OAMG;IACc,oBAAoB,GAAiC,KAAK,EACzE,IAAI,EACW,EAAE;QACjB,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,EAAE,uBAAuB,CAAC;QAC/D,IAAI,OAAO,QAAQ,KAAK,UAAU;YAAE,OAAO;QAC3C,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC,CAAC;IAEF;;;;;;OAMG;IACM,KAAK,CAAC,GAAG,CAAC,MAIlB;QACC,IAAI,CAAC,eAAe,GAAG;YACrB,GAAG,CAAC,OAAO,MAAM,CAAC,cAAc,KAAK,UAAU;gBAC7C,CAAC,CAAC,EAAE,cAAc,EAAE,MAAM,CAAC,cAAc,EAAE;gBAC3C,CAAC,CAAC,EAAE,CAAC;YACP,GAAG,CAAC,OAAO,MAAM,CAAC,uBAAuB,KAAK,UAAU;gBACtD,CAAC,CAAC,EAAE,uBAAuB,EAAE,MAAM,CAAC,uBAAuB,EAAE;gBAC7D,CAAC,CAAC,EAAE,CAAC;SACR,CAAC;QACF,IAAI,CAAC;YACH,OAAO,MAAM,KAAK,CAAC,GAAG,CAAC;gBACrB,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,cAAc,EAAE,MAAM,CAAC,cAAc;gBACrC,uBAAuB,EAAE,IAAI,CAAC,oBAAoB;aACnD,CAAC,CAAC;QACL,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;QAC9B,CAAC;IACH,CAAC;CACF"}

package/bin/service/builtins/task/runtime/Runner.d.ts

@@ -3,7 +3,7 @@
  *
  * 职责（中文）
  * - 创建 run 目录（timestamp）。
- * - 以“干净历史”调用当前 runtime 的 LocalSessionCore（逻辑与正常 chat 一致）。
+ * - 以“干净历史”调用当前 runtime 的 Runner（逻辑与正常 chat 一致）。
  * - 协调 script / agent 两类执行主链。
  * - 把最终产物写入 run 目录的具体格式委托给 `TaskRunArtifacts.ts`。
  */

package/bin/service/builtins/task/runtime/Runner.js

@@ -3,7 +3,7 @@
  *
  * 职责（中文）
  * - 创建 run 目录（timestamp）。
- * - 以“干净历史”调用当前 runtime 的 LocalSessionCore（逻辑与正常 chat 一致）。
+ * - 以“干净历史”调用当前 runtime 的 Runner（逻辑与正常 chat 一致）。
  * - 协调 script / agent 两类执行主链。
  * - 把最终产物写入 run 目录的具体格式委托给 `TaskRunArtifacts.ts`。
  */

package/bin/service/builtins/task/runtime/TaskRunnerSession.d.ts

@@ -2,7 +2,7 @@
  * TaskRunnerSession：task runner 的 session 装配模块。
  *
  * 关键点（中文）
- * - 负责构建 task 专用 LocalSessionCore / JsonlSessionHistoryComposer 运行时。
+ * - 负责构建 task 专用 Runner / JsonlSessionHistoryComposer 运行时。
  * - 负责把每轮 user/assistant 消息写入 run 目录对应的 messages.jsonl。
  * - 这些能力与任务编排逻辑解耦后，Runner 主流程会更聚焦于状态流转。
  * - 当前只有 api 执行模式。
@@ -25,7 +25,7 @@ export declare function appendTaskRoundUserMessage(params: {
  * 构建 task 专用 Session 运行时（独立于普通 Session 实例缓存）。
  *
  * 关键点（中文）
- * - 使用 LocalSessionCore 执行，模型来自 context.session.model（agent 级模型）。
+ * - 使用 Runner 执行，模型来自 context.session.model（agent 级模型）。
  */
 export declare function createTaskSessionRuntimePort(params: {
     context: AgentContext;

package/bin/service/builtins/task/runtime/TaskRunnerSession.js

@@ -2,13 +2,13 @@
  * TaskRunnerSession：task runner 的 session 装配模块。
  *
  * 关键点（中文）
- * - 负责构建 task 专用 LocalSessionCore / JsonlSessionHistoryComposer 运行时。
+ * - 负责构建 task 专用 Runner / JsonlSessionHistoryComposer 运行时。
  * - 负责把每轮 user/assistant 消息写入 run 目录对应的 messages.jsonl。
  * - 这些能力与任务编排逻辑解耦后，Runner 主流程会更聚焦于状态流转。
  * - 当前只有 api 执行模式。
  */
 import path from "node:path";
-import { LocalSessionCore } from "../../../../session/executors/local/LocalSessionCore.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 { JsonlSessionCompactionComposer } from "../../../../session/composer/compaction/jsonl/JsonlSessionCompactionComposer.js";
@@ -39,7 +39,7 @@ export async function appendTaskRoundUserMessage(params) {
  * 构建 task 专用 Session 运行时（独立于普通 Session 实例缓存）。
  *
  * 关键点（中文）
- * - 使用 LocalSessionCore 执行，模型来自 context.session.model（agent 级模型）。
+ * - 使用 Runner 执行，模型来自 context.session.model（agent 级模型）。
  */
 export function createTaskSessionRuntimePort(params) {
     const { context, runDirAbs, runSessionId, userSimulatorSessionId } = params;
@@ -108,7 +108,7 @@ export function createTaskSessionRuntimePort(params) {
                 sessionId: key,
                 getTools: () => shellTools,
             });
-            const created = new LocalSessionCore({
+            const created = new Runner({
                 model: context.session.model,
                 logger: context.logger,
                 historyComposer,

package/bin/service/builtins/task/runtime/TaskRunnerSession.js.map

@@ -1 +1 @@
-{"version":3,"file":"TaskRunnerSession.js","sourceRoot":"","sources":["../../../../../src/service/builtins/task/runtime/TaskRunnerSession.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAI7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAC;AAChF,OAAO,EAAE,kCAAkC,EAAE,MAAM,6BAA6B,CAAC;AACjF,OAAO,EAAE,2BAA2B,EAAE,MAAM,gEAAgE,CAAC;AAC7G,OAAO,EAAE,8BAA8B,EAAE,MAAM,sEAAsE,CAAC;AACtH,OAAO,EAAE,6BAA6B,EAAE,MAAM,8DAA8D,CAAC;AAC7G,OAAO,EAAE,4BAA4B,EAAE,MAAM,kEAAkE,CAAC;AAChH,OAAO,EAAE,UAAU,EAAE,MAAM,6CAA6C,CAAC;AAGzE;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAAC,MAOhD;IACC,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC/C,IAAI,CAAC,IAAI;QAAE,OAAO;IAClB,MAAM,eAAe,GAAG,MAAM,CAAC,kBAAkB,CAAC,kBAAkB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACvF,MAAM,eAAe,CAAC,MAAM,CAC1B,eAAe,CAAC,QAAQ,CAAC;QACvB,IAAI;QACJ,QAAQ,EAAE;YACR,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,KAAK,EAAE;gBACL,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,SAAS,EAAE,MAAM,CAAC,SAAS;aAC5B;SACF;KACF,CAAC,CACH,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,4BAA4B,CAAC,MAK5C;IACC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,sBAAsB,EAAE,GAAG,MAAM,CAAC;IAC5E,MAAM,kBAAkB,GAAG,IAAI,8BAA8B,CAAC;QAC5D,gBAAgB,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB;QACpE,oBAAoB,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,oBAAoB;QAC5E,gBAAgB,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB;QACpE,YAAY,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,YAAY;KAC7D,CAAC,CAAC;IACH,MAAM,cAAc,GAAG,IAAI,4BAA4B,CAAC;QACtD,WAAW,EAAE,OAAO,CAAC,QAAQ;QAC7B,sBAAsB,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO;QAC7C,UAAU,EAAE,GAAG,EAAE,CAAC,OAAO;QACzB,OAAO,EAAE,MAAM;KAChB,CAAC,CAAC;IACH,MAAM,2BAA2B,GAAG,IAAI,GAAG,EAAuC,CAAC;IACnF,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAA2B,CAAC;IAE/D,MAAM,0BAA0B,GAAG,CAAC,SAAiB,EAA+B,EAAE;QACpF,MAAM,QAAQ,GAAG,2BAA2B,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC5D,IAAI,QAAQ;YAAE,OAAO,QAAQ,CAAC;QAE9B,MAAM,GAAG,GAAG,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC3C,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;QAC3E,CAAC;QACD,MAAM,kBAAkB,GACtB,GAAG,KAAK,YAAY;YAClB,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,GAAG,KAAK,sBAAsB;gBAC9B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC;gBACxC,CAAC,CAAC,SAAS,CAAC;QAElB,MAAM,OAAO,GAAG,IAAI,2BAA2B,CAAC;YAC9C,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,SAAS,EAAE,GAAG;YACd,GAAG,CAAC,kBAAkB;gBACpB,CAAC,CAAC;oBACE,KAAK,EAAE;wBACL,cAAc,EAAE,kBAAkB;wBAClC,eAAe,EAAE,kBAAkB;wBACnC,gBAAgB,EAAE,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,gBAAgB,CAAC;wBACjE,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,WAAW,CAAC;wBACxD,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,SAAS,CAAC;qBACzD;iBACF;gBACH,CAAC,CAAC,EAAE,CAAC;SACR,CAAC,CAAC;QACH,2BAA2B,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC9C,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC;IAEF,OAAO;QACL,kBAAkB,CAAC,SAAiB;YAClC,OAAO,0BAA0B,CAAC,SAAS,CAAC,CAAC;QAC/C,CAAC;QACD,WAAW,CAAC,SAAiB;YAC3B,MAAM,GAAG,GAAG,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;YAC3C,IAAI,CAAC,GAAG,EAAE,CAAC;gBACT,MAAM,IAAI,KAAK,CAAC,mEAAmE,CAAC,CAAC;YACvF,CAAC;YACD,MAAM,QAAQ,GAAG,mBAAmB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC9C,IAAI,QAAQ;gBAAE,OAAO,QAAQ,CAAC;YAE9B,MAAM,eAAe,GAAG,0BAA0B,CAAC,GAAG,CAAC,CAAC;YACxD,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;gBAC3B,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;YACnE,CAAC;YACD,MAAM,iBAAiB,GAAG,IAAI,6BAA6B,CAAC;gBAC1D,SAAS,EAAE,GAAG;gBACd,QAAQ,EAAE,GAAG,EAAE,CAAC,UAAU;aAC3B,CAAC,CAAC;YACH,MAAM,OAAO,GAAG,IAAI,gBAAgB,CAAC;gBACnC,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK;gBAC5B,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,eAAe;gBACf,kBAAkB;gBAClB,iBAAiB;gBACjB,cAAc;aACf,CAAC,CAAC;YACH,mBAAmB,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YACtC,OAAO,OAAO,CAAC;QACjB,CAAC;KACF,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAAC,MAKhD;IACC,MAAM,EAAE,kBAAkB,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;IAC5D,MAAM,eAAe,GAAG,kBAAkB,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;IACzE,IAAI,SAAS,CAAC,gBAAgB,EAAE,CAAC;QAC/B,MAAM,eAAe,CAAC,MAAM,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;IAC3D,CAAC;IACD,MAAM,oBAAoB,GAAG,kCAAkC,CAAC,SAAS,CAAC,CAAC;IAC3E,KAAK,MAAM,QAAQ,IAAI,oBAAoB,EAAE,CAAC;QAC5C,MAAM,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACzC,CAAC;AACH,CAAC"}
+{"version":3,"file":"TaskRunnerSession.js","sourceRoot":"","sources":["../../../../../src/service/builtins/task/runtime/TaskRunnerSession.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAI7B,OAAO,EAAE,MAAM,EAAE,MAAM,oCAAoC,CAAC;AAC5D,OAAO,EAAE,kCAAkC,EAAE,MAAM,6BAA6B,CAAC;AACjF,OAAO,EAAE,2BAA2B,EAAE,MAAM,gEAAgE,CAAC;AAC7G,OAAO,EAAE,8BAA8B,EAAE,MAAM,sEAAsE,CAAC;AACtH,OAAO,EAAE,6BAA6B,EAAE,MAAM,8DAA8D,CAAC;AAC7G,OAAO,EAAE,4BAA4B,EAAE,MAAM,kEAAkE,CAAC;AAChH,OAAO,EAAE,UAAU,EAAE,MAAM,6CAA6C,CAAC;AAGzE;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAAC,MAOhD;IACC,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC/C,IAAI,CAAC,IAAI;QAAE,OAAO;IAClB,MAAM,eAAe,GAAG,MAAM,CAAC,kBAAkB,CAAC,kBAAkB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACvF,MAAM,eAAe,CAAC,MAAM,CAC1B,eAAe,CAAC,QAAQ,CAAC;QACvB,IAAI;QACJ,QAAQ,EAAE;YACR,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,KAAK,EAAE;gBACL,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,SAAS,EAAE,MAAM,CAAC,SAAS;aAC5B;SACF;KACF,CAAC,CACH,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,4BAA4B,CAAC,MAK5C;IACC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,sBAAsB,EAAE,GAAG,MAAM,CAAC;IAC5E,MAAM,kBAAkB,GAAG,IAAI,8BAA8B,CAAC;QAC5D,gBAAgB,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB;QACpE,oBAAoB,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,oBAAoB;QAC5E,gBAAgB,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB;QACpE,YAAY,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,YAAY;KAC7D,CAAC,CAAC;IACH,MAAM,cAAc,GAAG,IAAI,4BAA4B,CAAC;QACtD,WAAW,EAAE,OAAO,CAAC,QAAQ;QAC7B,sBAAsB,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO;QAC7C,UAAU,EAAE,GAAG,EAAE,CAAC,OAAO;QACzB,OAAO,EAAE,MAAM;KAChB,CAAC,CAAC;IACH,MAAM,2BAA2B,GAAG,IAAI,GAAG,EAAuC,CAAC;IACnF,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAA2B,CAAC;IAE/D,MAAM,0BAA0B,GAAG,CAAC,SAAiB,EAA+B,EAAE;QACpF,MAAM,QAAQ,GAAG,2BAA2B,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC5D,IAAI,QAAQ;YAAE,OAAO,QAAQ,CAAC;QAE9B,MAAM,GAAG,GAAG,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC3C,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;QAC3E,CAAC;QACD,MAAM,kBAAkB,GACtB,GAAG,KAAK,YAAY;YAClB,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,GAAG,KAAK,sBAAsB;gBAC9B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC;gBACxC,CAAC,CAAC,SAAS,CAAC;QAElB,MAAM,OAAO,GAAG,IAAI,2BAA2B,CAAC;YAC9C,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,SAAS,EAAE,GAAG;YACd,GAAG,CAAC,kBAAkB;gBACpB,CAAC,CAAC;oBACE,KAAK,EAAE;wBACL,cAAc,EAAE,kBAAkB;wBAClC,eAAe,EAAE,kBAAkB;wBACnC,gBAAgB,EAAE,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,gBAAgB,CAAC;wBACjE,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,WAAW,CAAC;wBACxD,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,SAAS,CAAC;qBACzD;iBACF;gBACH,CAAC,CAAC,EAAE,CAAC;SACR,CAAC,CAAC;QACH,2BAA2B,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC9C,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC;IAEF,OAAO;QACL,kBAAkB,CAAC,SAAiB;YAClC,OAAO,0BAA0B,CAAC,SAAS,CAAC,CAAC;QAC/C,CAAC;QACD,WAAW,CAAC,SAAiB;YAC3B,MAAM,GAAG,GAAG,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;YAC3C,IAAI,CAAC,GAAG,EAAE,CAAC;gBACT,MAAM,IAAI,KAAK,CAAC,mEAAmE,CAAC,CAAC;YACvF,CAAC;YACD,MAAM,QAAQ,GAAG,mBAAmB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC9C,IAAI,QAAQ;gBAAE,OAAO,QAAQ,CAAC;YAE9B,MAAM,eAAe,GAAG,0BAA0B,CAAC,GAAG,CAAC,CAAC;YACxD,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;gBAC3B,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;YACnE,CAAC;YACD,MAAM,iBAAiB,GAAG,IAAI,6BAA6B,CAAC;gBAC1D,SAAS,EAAE,GAAG;gBACd,QAAQ,EAAE,GAAG,EAAE,CAAC,UAAU;aAC3B,CAAC,CAAC;YACH,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC;gBACzB,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK;gBAC5B,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,eAAe;gBACf,kBAAkB;gBAClB,iBAAiB;gBACjB,cAAc;aACf,CAAC,CAAC;YACH,mBAAmB,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YACtC,OAAO,OAAO,CAAC;QACjB,CAAC;KACF,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAAC,MAKhD;IACC,MAAM,EAAE,kBAAkB,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;IAC5D,MAAM,eAAe,GAAG,kBAAkB,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;IACzE,IAAI,SAAS,CAAC,gBAAgB,EAAE,CAAC;QAC/B,MAAM,eAAe,CAAC,MAAM,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;IAC3D,CAAC;IACD,MAAM,oBAAoB,GAAG,kCAAkC,CAAC,SAAS,CAAC,CAAC;IAC3E,KAAK,MAAM,QAAQ,IAAI,oBAAoB,EAAE,CAAC;QAC5C,MAAM,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACzC,CAAC;AACH,CAAC"}

package/bin/service/builtins/task/runtime/TaskRunnerTypes.d.ts

@@ -157,7 +157,7 @@ export type ScriptExecutionResult = {
  * task 运行专用的 session runtime 端口。
  *
  * 关键点（中文）
- * - task runner 不直接依赖具体 `LocalSessionExecutor` 实现。
+ * - task runner 不直接依赖具体 SDK `Session` 实现。
  * - 这里暴露的是 task 场景最小可用端口：执行器 + history Composer。
  */
 export type TaskSessionRuntimePort = {

package/bin/session/{Session.d.ts → Executor.d.ts}

@@ -1,18 +1,23 @@
 /**
- * Session：单个会话实例。
+ * Executor：单个 session 的执行编排器。
  *
  * 关键点（中文）
- * - 一个 Session 只对应一个固定的 `sessionId`。
- * - 对外直接暴露 `run / appendUserMessage / appendAssistantMessage / getExecutor / getHistoryComposer`。
- * - 运行态（如 executing）直接收在实例内部，不再拆 `Facade / Runner / ExecutionRegistry`。
+ * - SDK 对外对象叫 `Session`，这里是内部执行层。
+ * - 一个 Executor 只对应一个固定的 `sessionId`。
+ * - 负责 history 写入、run scope、executing 状态与本地 Runner 的懒创建。
  */
+import type { LanguageModel, Tool } from "ai";
 import type { SessionHistoryComposer } from "./composer/history/SessionHistoryComposer.js";
 import type { SessionRunScope } from "./SessionRunScope.js";
+import type { SessionCompactionComposer } from "./composer/compaction/SessionCompactionComposer.js";
+import type { SessionExecutionComposer } from "./composer/execution/SessionExecutionComposer.js";
+import type { SessionSystemComposer } from "./composer/system/SessionSystemComposer.js";
+import type { Logger } from "../utils/logger/Logger.js";
 import type { JsonObject } from "../types/common/Json.js";
 import type { SessionMessageV1 } from "../session/types/SessionMessages.js";
 import type { SessionExecutor } from "../session/types/SessionExecutor.js";
 import type { SessionRunResult } from "../session/types/SessionRun.js";
-type SessionOptions = {
+type ExecutorOptions = {
     /**
      * 当前会话 ID。
      */
@@ -22,28 +27,53 @@ type SessionOptions = {
      */
     historyComposer: SessionHistoryComposer;
     /**
-     * 创建当前 session 对应的执行器。
+     * 读取当前 session 使用的模型实例。
      */
-    createExecutor: (historyComposer: SessionHistoryComposer) => SessionExecutor;
+    getModel: () => LanguageModel | undefined;
+    /**
+     * 统一日志器。
+     */
+    logger: Logger;
+    /**
+     * 当前 session 对应的 compaction Composer。
+     */
+    compactionComposer?: SessionCompactionComposer;
+    /**
+     * 当前 session 对应的 system Composer。
+     */
+    systemComposer: SessionSystemComposer;
+    /**
+     * 获取当前可用工具集合。
+     */
+    getTools: () => Record<string, Tool>;
+    /**
+     * 可选自定义 execution Composer。
+     */
+    executionComposer?: SessionExecutionComposer;
     /**
      * session 更新后的异步回调。
      */
     runAfterSessionUpdated?: (sessionId: string) => Promise<void>;
 };
 /**
- * Session 单实例实现。
+ * Executor 单实例实现。
  */
-export declare class Session {
+export declare class Executor implements SessionExecutor {
     /**
      * 当前 session 标识。
      */
     readonly sessionId: string;
     private readonly historyComposer;
-    private readonly createExecutor;
+    private readonly getModel;
+    private readonly logger;
+    private readonly compactionComposer;
+    private readonly systemComposer;
+    private readonly getTools;
+    private readonly runnerExecutionComposer?;
     private readonly historyWriter;
-    private executor;
+    private runner;
     private executing;
-    constructor(options: SessionOptions);
+    constructor(options: ExecutorOptions);
     /**
      * 返回当前 session 是否正在执行。
      */
@@ -53,15 +83,22 @@ export declare class Session {
      */
     getHistoryComposer(): SessionHistoryComposer;
     /**
-     * 获取当前 session 的执行器。
+     * 获取当前 session 的执行端口。
+     *
+     * 关键点（中文）
+     * - 兼容 runtime/service 端口语义：Executor 自己就是执行端口。
      */
     getExecutor(): SessionExecutor;
     /**
-     * 清理当前 session 的执行器缓存。
+     * 获取或创建当前本地 Runner。
+     */
+    private getRunner;
+    /**
+     * 清理当前 session 的 Runner 缓存。
      *
      * 关键点（中文）
-     * - 这里只清 executor，不清 history Composer。
-     * - history 是事实源，不应随着 executor 一起丢失。
+     * - 这里只清 Runner，不清 history Composer。
+     * - history 是事实源，不应随着 Runner 一起丢失。
      */
     clearExecutor(): void;
     /**
@@ -99,4 +136,4 @@ export declare class Session {
     }): Promise<SessionRunResult>;
 }
 export {};
-//# sourceMappingURL=Session.d.ts.map
+//# sourceMappingURL=Executor.d.ts.map

package/bin/session/Executor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Executor.d.ts","sourceRoot":"","sources":["../../src/session/Executor.ts"],"names":[],"mappings":"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"}