@downcity/agent 1.1.287 → 1.1.310

package/bin/executor/Executor.d.ts

@@ -3,33 +3,33 @@
  *
  * 关键点（中文）
  * - SDK 对外对象叫 `Session`，这里是内部执行层。
- * - 一个 Executor 只对应一个固定的 `sessionId`。
- * - 负责 history 写入、显式运行上下文、executing 状态、Composer 编排与 tool-loop 执行。
+ * - 一个 Executor 只对应一个固定的 `session_id`。
+ * - 负责显式 Turn 上下文消费、executing 状态、Composer 编排与 Tool Loop 执行。
  */
 import type { LanguageModel } from "ai";
 import type { Logger } from "../utils/logger/Logger.js";
-import type { SessionExecutor } from "../executor/types/SessionExecutor.js";
-import type { SessionRunContext } from "../types/executor/SessionRunContext.js";
+import type { SessionCompactHistory, SessionExecutor } from "../types/session/SessionExecution.js";
+import type { SessionTurnContext } from "../types/executor/SessionTurnContext.js";
 import type { AgentPluginExecutionRuntime } from "../types/plugin/PluginRuntime.js";
-import type { SessionRunResult } from "../executor/types/SessionRun.js";
-import type { SessionComposer, SessionCompactionPlan, SessionComposeInput, SessionStepInput } from "../types/session/SessionComposer.js";
+import type { SessionTurnExecutionResult } from "../types/session/SessionExecution.js";
+import type { SessionComposer, SessionComposeInput, SessionStepInput } from "../types/session/SessionComposer.js";
 type ExecutorOptions = {
     /**
      * 当前会话 ID。
      */
-    sessionId: string;
+    session_id: string;
     /** 当前 Session 使用的统一 Composer。 */
     composer: SessionComposer;
     /** 为 Composer 创建当前 Step 的只读输入快照。 */
-    get_compose_input: (run_context: SessionRunContext, retry_count: number) => Promise<SessionComposeInput>;
+    get_compose_input: (turn_context: SessionTurnContext | undefined, retry_count: number) => Promise<SessionComposeInput>;
     /** 应用 Session 级固定 system snapshot。 */
     apply_system_snapshot?: (input: SessionStepInput) => SessionStepInput;
-    /** 提交 Composer 生成的持久化压缩计划。 */
-    commit_compaction: (plan: SessionCompactionPlan, run_context: SessionRunContext) => Promise<void>;
+    /** 请求 Session 领域生成并提交 canonical 历史压缩。 */
+    compact_history: SessionCompactHistory;
     /**
      * 读取当前 session 使用的模型实例。
      */
-    getModel: () => LanguageModel | undefined;
+    get_model: () => LanguageModel | undefined;
     /**
      * 统一日志器。
      */
@@ -44,63 +44,41 @@ export declare class Executor implements SessionExecutor {
     /**
      * 当前 session 标识。
      */
-    readonly sessionId: string;
+    readonly session_id: string;
     private readonly composer;
     private readonly get_compose_input;
     private readonly apply_system_snapshot?;
-    private readonly commit_compaction;
-    private readonly getModel;
+    private readonly compact_history;
+    private readonly get_model;
     private readonly get_plugins;
     private readonly logger;
     private readonly recovery_policy;
     private readonly core_engine_runner;
     private executing;
-    private abort_controller;
     constructor(options: ExecutorOptions);
     /**
      * 返回当前 session 是否正在执行。
      */
-    isExecuting(): boolean;
+    is_executing(): boolean;
     /**
-     * 请求停止当前执行。
-     */
-    stop(): boolean;
-    /**
-     * 获取当前 session 的执行端口。
+     * 执行当前 Session 的一次 Turn。
      *
      * 关键点（中文）
-     * - 兼容 runtime/service 端口语义：Executor 自己就是执行端口。
-     */
-    getExecutor(): SessionExecutor;
-    /**
-     * 运行当前 session 的一次请求。
-     *
-     * 关键点（中文）
-     * - 这里直接承接单个 Session 实例的一次 run 外层编排。
+     * - 这里直接承接单个 Session 实例的一次 Turn 执行编排。
      * - scope 绑定、assistant step 持久化、executing 状态都收在实例内部。
      */
-    run(params: {
+    execute(params: {
         query: string;
-        runContext?: SessionRunContext;
-    }): Promise<SessionRunResult>;
+        turn_context: SessionTurnContext;
+    }): Promise<SessionTurnExecutionResult>;
     /**
      * 调用 Composer 组装当前轮执行输入。
      */
-    private prepareExecuteInput;
+    private prepare_execute_input;
     /**
-     * 执行一次已装配完成的运行材料。
+     * 执行一次已装配完成的 Step 输入。
      */
-    private executePreparedRun;
-    /**
-     * 在 Assistant writer 完成后归档当前 canonical 历史。
-     *
-     * 关键点（中文）：持久化 compact 不能发生在流式 Assistant 草稿仍打开时，
-     * 因此由 SessionTurn 在 writer complete/fail 之后显式调用。
-     */
-    compact_history(run_context: SessionRunContext, retry_count?: number): Promise<{
-        compacted: boolean;
-        reason?: string;
-    }>;
+    private execute_prepared_input;
     /**
      * 解析下一 Session step 实际使用的运行配置。
      *
@@ -115,10 +93,6 @@ export declare class Executor implements SessionExecutor {
      * 刷新当前 Session step 的 effective Agent 运行视图。
      */
     private refresh_step_runtime;
-    /**
-     * 释放当前 Session step 持有的 Plugin execution lease。
-     */
-    private release_step_plugins;
     /**
      * 为所有 tool execute callback 绑定显式 Session 运行上下文。
      *
@@ -126,15 +100,11 @@ export declare class Executor implements SessionExecutor {
      * - 每个 step 使用独立包装工具，不会在并行 Session 间共享可变指针。
      * - Agent 与 Shell 工具通过 ToolExecutionOptions.experimental_context 读取显式快照。
      */
-    private bind_run_context_to_tools;
-    /**
-     * 归一化本轮显式运行上下文。
-     */
-    private createRunContext;
+    private bind_turn_context_to_tools;
     /**
      * 读取当前 session 模型。
      */
-    private resolveModelOrThrow;
+    private resolve_model_or_throw;
 }
 export {};
 //# sourceMappingURL=Executor.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Executor.d.ts","sourceRoot":"","sources":["../../src/executor/Executor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Executor.d.ts","sourceRoot":"","sources":["../../src/executor/Executor.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,aAAa,EAA8B,MAAM,IAAI,CAAC;AAGpE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,KAAK,EACV,qBAAqB,EACrB,eAAe,EAChB,MAAM,qCAAqC,CAAC;AAC7C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAEjF,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,iCAAiC,CAAC;AAGnF,OAAO,KAAK,EAEV,0BAA0B,EAC3B,MAAM,qCAAqC,CAAC;AAC7C,OAAO,KAAK,EACV,eAAe,EACf,mBAAmB,EACnB,gBAAgB,EACjB,MAAM,oCAAoC,CAAC;AAE5C,KAAK,eAAe,GAAG;IACrB;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB,iCAAiC;IACjC,QAAQ,EAAE,eAAe,CAAC;IAE1B,oCAAoC;IACpC,iBAAiB,EAAE,CACjB,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,WAAW,EAAE,MAAM,KAChB,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAElC,sCAAsC;IACtC,qBAAqB,CAAC,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,gBAAgB,CAAC;IAEtE,yCAAyC;IACzC,eAAe,EAAE,qBAAqB,CAAC;IAEvC;;OAEG;IACH,SAAS,EAAE,MAAM,aAAa,GAAG,SAAS,CAAC;IAE3C;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf,0CAA0C;IAC1C,WAAW,CAAC,EAAE,MAAM,2BAA2B,CAAC;CACjD,CAAC;AAEF;;GAEG;AACH,qBAAa,QAAS,YAAW,eAAe;IAC9C;;OAEG;IACH,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAE5B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkB;IAC3C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAuC;IACzE,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAA2C;IAClF,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAqC;IACrE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA+B;IACzD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAiC;IAC7D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAyB;IACzD,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAmB;IAEtD,OAAO,CAAC,SAAS,CAAS;gBAEd,OAAO,EAAE,eAAe;IA2BpC;;OAEG;IACH,YAAY,IAAI,OAAO;IAIvB;;;;;;OAMG;IACG,OAAO,CAAC,MAAM,EAAE;QACpB,KAAK,EAAE,MAAM,CAAC;QACd,YAAY,EAAE,kBAAkB,CAAC;KAClC,GAAG,OAAO,CAAC,0BAA0B,CAAC;IA6CvC;;OAEG;YACW,qBAAqB;IAuBnC;;OAEG;YACW,sBAAsB;IAgBpC;;;;;;OAMG;YACW,mBAAmB;IAuBjC,qCAAqC;YACvB,YAAY;IA8B1B;;OAEG;YACW,oBAAoB;IAMlC;;;;;;OAMG;IACH,OAAO,CAAC,0BAA0B;IAwElC;;OAEG;IACH,OAAO,CAAC,sBAAsB;CAO/B"}

package/bin/executor/Executor.js

@@ -3,12 +3,13 @@
  *
  * 关键点（中文）
  * - SDK 对外对象叫 `Session`，这里是内部执行层。
- * - 一个 Executor 只对应一个固定的 `sessionId`。
- * - 负责 history 写入、显式运行上下文、executing 状态、Composer 编排与 tool-loop 执行。
+ * - 一个 Executor 只对应一个固定的 `session_id`。
+ * - 负责显式 Turn 上下文消费、executing 状态、Composer 编排与 Tool Loop 执行。
  */
 import { CoreEngineRunner } from "./core-engine/CoreEngineRunner.js";
 import { ExecutorRecoveryPolicy } from "./services/ExecutorRecoveryPolicy.js";
-import { inject_read_image_user_message } from "./tools/file/ReadImageToolBridge.js";
+import { is_action_result } from "../types/action/ActionResult.js";
+import { generate_id } from "../utils/Id.js";
 /**
  * Executor 单实例实现。
  */
@@ -16,38 +17,37 @@ export class Executor {
     /**
      * 当前 session 标识。
      */
-    sessionId;
+    session_id;
     composer;
     get_compose_input;
     apply_system_snapshot;
-    commit_compaction;
-    getModel;
+    compact_history;
+    get_model;
     get_plugins;
     logger;
     recovery_policy;
     core_engine_runner;
     executing = false;
-    abort_controller = null;
     constructor(options) {
-        const sessionId = String(options.sessionId || "").trim();
-        if (!sessionId) {
-            throw new Error("Executor requires a non-empty sessionId");
+        const session_id = String(options.session_id || "").trim();
+        if (!session_id) {
+            throw new Error("Executor requires a non-empty session_id");
         }
-        this.sessionId = sessionId;
+        this.session_id = session_id;
         this.composer = options.composer;
         this.get_compose_input = options.get_compose_input;
         this.apply_system_snapshot = options.apply_system_snapshot;
-        this.commit_compaction = options.commit_compaction;
-        this.getModel = options.getModel;
+        this.compact_history = options.compact_history;
+        this.get_model = options.get_model;
         this.get_plugins = options.get_plugins;
         this.logger = options.logger;
         this.recovery_policy = new ExecutorRecoveryPolicy({
-            session_id: this.sessionId,
+            session_id: this.session_id,
             should_compact: (error) => this.composer.should_compact(error),
             logger: this.logger,
         });
         this.core_engine_runner = new CoreEngineRunner({
-            session_id: this.sessionId,
+            session_id: this.session_id,
             logger: this.logger,
             should_compact_on_error: (error) => this.composer.should_compact(error),
         });
@@ -55,94 +55,54 @@ export class Executor {
     /**
      * 返回当前 session 是否正在执行。
      */
-    isExecuting() {
+    is_executing() {
         return this.executing;
     }
     /**
-     * 请求停止当前执行。
-     */
-    stop() {
-        if (!this.executing || !this.abort_controller)
-            return false;
-        if (!this.abort_controller.signal.aborted) {
-            this.abort_controller.abort(new Error("Turn stopped"));
-        }
-        return true;
-    }
-    /**
-     * 获取当前 session 的执行端口。
+     * 执行当前 Session 的一次 Turn。
      *
      * 关键点（中文）
-     * - 兼容 runtime/service 端口语义：Executor 自己就是执行端口。
-     */
-    getExecutor() {
-        return this;
-    }
-    /**
-     * 运行当前 session 的一次请求。
-     *
-     * 关键点（中文）
-     * - 这里直接承接单个 Session 实例的一次 run 外层编排。
+     * - 这里直接承接单个 Session 实例的一次 Turn 执行编排。
      * - scope 绑定、assistant step 持久化、executing 状态都收在实例内部。
      */
-    async run(params) {
+    async execute(params) {
         if (this.executing) {
-            // 关键点（中文）：同一个 Session 实例只允许一个活跃 run，
+            // 关键点（中文）：同一个 Session 实例只允许一个活跃 Turn 执行，
             // 否则 step 回调、scope 与执行器状态都会互相污染。
-            throw new Error("Executor.run does not support concurrent execution");
+            throw new Error("Executor.execute does not support concurrent execution");
         }
         const query = String(params.query || "").trim();
-        const run_context = this.createRunContext(params.runContext);
-        const upstream_abort_signal = run_context.abortSignal;
-        const abort_controller = new AbortController();
-        const abort_from_upstream = () => {
-            if (!abort_controller.signal.aborted) {
-                abort_controller.abort(upstream_abort_signal?.reason);
-            }
-        };
-        if (upstream_abort_signal?.aborted) {
-            abort_from_upstream();
-        }
-        else {
-            upstream_abort_signal?.addEventListener("abort", abort_from_upstream, {
-                once: true,
-            });
-        }
-        this.abort_controller = abort_controller;
-        run_context.abortSignal = abort_controller.signal;
+        const turn_context = params.turn_context;
         this.executing = true;
-        this.recovery_policy.reset_run_state();
+        this.recovery_policy.reset_execution_state();
         try {
-            const result = await this.recovery_policy.run_with_retry({
+            const result = await this.recovery_policy.execute_with_retry({
                 query,
-                model: this.resolveModelOrThrow(),
-                run_context,
-                prepare_execute_input: async ({ query: next_query, model, run_context: next_run_context, retry_count, }) => await this.prepareExecuteInput(next_query, model, next_run_context, retry_count),
-                execute_prepared_run: async ({ execute_input, model, run_context: next_run_context, }) => await this.executePreparedRun(execute_input, model, next_run_context),
+                model: this.resolve_model_or_throw(),
+                turn_context,
+                prepare_execute_input: async ({ query: next_query, model, turn_context: next_turn_context, retry_count, }) => await this.prepare_execute_input(next_query, model, next_turn_context, retry_count),
+                execute_prepared_input: async ({ execute_input, model, turn_context: next_turn_context, }) => await this.execute_prepared_input(execute_input, model, next_turn_context),
             });
             return result;
         }
         finally {
-            await this.release_step_plugins(run_context);
-            this.recovery_policy.reset_run_state();
-            if (this.abort_controller === abort_controller) {
-                this.abort_controller = null;
-            }
-            upstream_abort_signal?.removeEventListener("abort", abort_from_upstream);
+            this.recovery_policy.reset_execution_state();
             this.executing = false;
         }
     }
     /**
      * 调用 Composer 组装当前轮执行输入。
      */
-    async prepareExecuteInput(query, _model, run_context, retry_count) {
+    async prepare_execute_input(query, _model, turn_context, retry_count) {
         if (retry_count > 0) {
             await this.logger.log("info", "[agent] compacting", {
                 retryCount: retry_count,
             });
-            await this.compact_history(run_context, retry_count);
+            await this.compact_history({
+                turn_id: turn_context.session.turn_id,
+            });
         }
-        const step = await this.compose_step(run_context, retry_count, true);
+        const step = await this.compose_step(turn_context, retry_count, true);
         return {
             query,
             system: step.input.system,
@@ -151,42 +111,17 @@ export class Executor {
         };
     }
     /**
-     * 执行一次已装配完成的运行材料。
+     * 执行一次已装配完成的 Step 输入。
      */
-    async executePreparedRun(input, model, run_context) {
-        return await this.core_engine_runner.run({
+    async execute_prepared_input(input, model, turn_context) {
+        return await this.core_engine_runner.execute({
             execute_input: input,
             model,
-            run_context,
-            resolve_step_inputs: async () => await this.resolve_step_inputs(run_context),
-            reload_history: async () => (await this.compose_step(run_context, 0, false)).input.messages,
+            turn_context,
+            resolve_step_inputs: async () => await this.resolve_step_inputs(turn_context),
+            reload_history: async () => (await this.compose_step(turn_context, 0, false)).input.messages,
         });
     }
-    /**
-     * 在 Assistant writer 完成后归档当前 canonical 历史。
-     *
-     * 关键点（中文）：持久化 compact 不能发生在流式 Assistant 草稿仍打开时，
-     * 因此由 SessionTurn 在 writer complete/fail 之后显式调用。
-     */
-    async compact_history(run_context, retry_count = 0) {
-        try {
-            const composed = await this.compose_step(run_context, retry_count, true);
-            const plan = await this.composer.compact({
-                ...composed.compose_input,
-                force: true,
-            });
-            if (!plan)
-                return { compacted: false, reason: "nothing_to_compact" };
-            await this.commit_compaction(plan, run_context);
-            return { compacted: true };
-        }
-        catch (error) {
-            return { compacted: false, reason: "compact_failed" };
-        }
-        finally {
-            await this.release_step_plugins(run_context);
-        }
-    }
     /**
      * 解析下一 Session step 实际使用的运行配置。
      *
@@ -194,12 +129,12 @@ export class Executor {
      * - 调用方必须先提交 Session 统一输入队列，再调用本方法。
      * - 每次调用只读取一次 model、system 与 tools，并把它们传给同一个 `streamText()`。
      */
-    async resolve_step_inputs(run_context) {
-        const composed = await this.compose_step(run_context, 0, true);
+    async resolve_step_inputs(turn_context) {
+        const composed = await this.compose_step(turn_context, 0, true);
         return {
             model: composed.model,
             system: composed.input.system,
-            tools: this.bind_run_context_to_tools(composed.input.tools, run_context),
+            tools: this.bind_turn_context_to_tools(composed.input.tools, turn_context),
             ...(composed.compose_input.state.model_context_window !== undefined
                 ? {
                     context_window: composed.compose_input.state.model_context_window,
@@ -208,17 +143,17 @@ export class Executor {
         };
     }
     /** 读取只读 Session 快照并交给统一 Composer。 */
-    async compose_step(run_context, retry_count, refresh_plugins) {
-        if (refresh_plugins)
-            await this.refresh_step_runtime(run_context);
-        const compose_input = await this.get_compose_input(run_context, retry_count);
+    async compose_step(turn_context, retry_count, refresh_plugins) {
+        if (refresh_plugins && turn_context)
+            await this.refresh_step_runtime(turn_context);
+        const compose_input = await this.get_compose_input(turn_context, retry_count);
         const model = compose_input.state.model;
         if (!model)
             throw new Error("requires a configured model.");
-        run_context.agentEnv = Object.freeze({ ...compose_input.state.env });
-        run_context.agentSystems = Object.freeze([
-            ...compose_input.state.systems,
-        ]);
+        turn_context?.step.commit({
+            workspace_env: compose_input.state.env,
+            agent_systems: compose_input.state.systems,
+        });
         const raw_input = await this.composer.compose(compose_input);
         return {
             compose_input,
@@ -231,24 +166,8 @@ export class Executor {
     /**
      * 刷新当前 Session step 的 effective Agent 运行视图。
      */
-    async refresh_step_runtime(run_context) {
-        await this.release_step_plugins(run_context);
-        if (this.get_plugins) {
-            run_context.agentPlugins = this.get_plugins().acquire();
-        }
-        else {
-            delete run_context.agentPlugins;
-        }
-    }
-    /**
-     * 释放当前 Session step 持有的 Plugin execution lease。
-     */
-    async release_step_plugins(run_context) {
-        const plugins = run_context.agentPlugins;
-        if (!plugins)
-            return;
-        delete run_context.agentPlugins;
-        await plugins.release();
+    async refresh_step_runtime(turn_context) {
+        await turn_context.step.replace_plugins(this.get_plugins?.().acquire());
     }
     /**
      * 为所有 tool execute callback 绑定显式 Session 运行上下文。
@@ -257,15 +176,17 @@ export class Executor {
      * - 每个 step 使用独立包装工具，不会在并行 Session 间共享可变指针。
      * - Agent 与 Shell 工具通过 ToolExecutionOptions.experimental_context 读取显式快照。
      */
-    bind_run_context_to_tools(tools, run_context) {
+    bind_turn_context_to_tools(tools, turn_context) {
         const execution_context = {
-            session_run_context: run_context,
+            session_turn_context: turn_context,
             shell_run_context: {
-                ownerContextId: String(run_context.sessionId || "").trim() || undefined,
-                turnId: String(run_context.turnId || "").trim() || undefined,
-                ...(run_context.agentEnv ? { env: run_context.agentEnv } : {}),
-                ...(run_context.shell_approval_gateway
-                    ? { approval_gateway: run_context.shell_approval_gateway }
+                ownerContextId: turn_context.session.session_id,
+                turnId: turn_context.session.turn_id,
+                ...(turn_context.step.workspace_env
+                    ? { env: turn_context.step.workspace_env }
+                    : {}),
+                ...(turn_context.shell.approval_gateway
+                    ? { approval_gateway: turn_context.shell.approval_gateway }
                     : {}),
             },
         };
@@ -280,8 +201,8 @@ export class Executor {
                 ...tool,
                 execute: async (args, options) => {
                     const tool_call_id = String(options.toolCallId || "").trim();
-                    if (tool_call_id && run_context.on_tool_input_ready) {
-                        await run_context.on_tool_input_ready({
+                    if (tool_call_id && turn_context.output.assistant) {
+                        await turn_context.output.assistant.prepare_tool_input({
                             tool_call_id,
                             tool_name: name,
                             input: args,
@@ -291,49 +212,43 @@ export class Executor {
                         ...options,
                         experimental_context: execution_context,
                     });
-                    return inject_read_image_user_message({
-                        tool_name: name,
-                        output,
-                        run_context,
-                    });
+                    if (!is_action_result(output))
+                        return output;
+                    for (const message of output.messages) {
+                        if (message.role === "assistant") {
+                            turn_context.output.enqueue_assistant_parts(message.parts);
+                            continue;
+                        }
+                        turn_context.input.inject_user_message({
+                            id: `u:${turn_context.session.session_id}:${generate_id()}`,
+                            role: "user",
+                            metadata: {
+                                v: 1,
+                                ts: Date.now(),
+                                session_id: turn_context.session.session_id,
+                                turn_id: turn_context.session.turn_id,
+                                source: "ingress",
+                                kind: "normal",
+                                extra: {
+                                    internal: "action_result",
+                                    tool_name: name,
+                                    ...(tool_call_id ? { tool_call_id } : {}),
+                                },
+                            },
+                            parts: [...message.parts],
+                        });
+                    }
+                    return output.output;
                 },
             };
         }
         return wrapped;
     }
-    /**
-     * 归一化本轮显式运行上下文。
-     */
-    createRunContext(input) {
-        const source = input || {
-            sessionId: this.sessionId,
-            injectedUserMessages: [],
-            deferredPersistedUserMessages: [],
-            pendingAssistantFileParts: [],
-        };
-        const { sessionId, projectRoot, injectedUserMessages, deferredPersistedUserMessages, pendingAssistantFileParts, ...runtime_context } = source;
-        return {
-            ...runtime_context,
-            sessionId: String(sessionId || this.sessionId).trim(),
-            ...(typeof projectRoot === "string" && projectRoot.trim()
-                ? { projectRoot: projectRoot.trim() }
-                : {}),
-            injectedUserMessages: Array.isArray(injectedUserMessages)
-                ? [...injectedUserMessages]
-                : [],
-            deferredPersistedUserMessages: Array.isArray(deferredPersistedUserMessages)
-                ? [...deferredPersistedUserMessages]
-                : [],
-            pendingAssistantFileParts: Array.isArray(pendingAssistantFileParts)
-                ? [...pendingAssistantFileParts]
-                : [],
-        };
-    }
     /**
      * 读取当前 session 模型。
      */
-    resolveModelOrThrow() {
-        const model = this.getModel();
+    resolve_model_or_throw() {
+        const model = this.get_model();
         if (!model) {
             throw new Error("requires a configured model.");
         }

package/bin/executor/Executor.js.map

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

package/bin/executor/composer/system/SessionSystemComposer.d.ts

@@ -6,7 +6,7 @@
  * - 与 tools / step 编排解耦，避免 Executor 过载。
  */
 import type { SystemModelMessage } from "ai";
-import type { SessionRunContext } from "../../../types/executor/SessionRunContext.js";
+import type { SessionComposeInput } from "../../../types/session/SessionComposer.js";
 /**
  * Session system Composer 协议。
  */
@@ -18,6 +18,6 @@ export interface SessionSystemComposer {
     /**
      * 解析本轮 system messages。
      */
-    resolve(run_context: SessionRunContext): Promise<SystemModelMessage[]>;
+    resolve(input: SessionComposeInput): Promise<SystemModelMessage[]>;
 }
 //# sourceMappingURL=SessionSystemComposer.d.ts.map

package/bin/executor/composer/system/SessionSystemComposer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SessionSystemComposer.d.ts","sourceRoot":"","sources":["../../../../src/executor/composer/system/SessionSystemComposer.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,IAAI,CAAC;AAC7C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAE/E;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,OAAO,CAAC,WAAW,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAAC;CACxE"}
+{"version":3,"file":"SessionSystemComposer.d.ts","sourceRoot":"","sources":["../../../../src/executor/composer/system/SessionSystemComposer.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,IAAI,CAAC;AAC7C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAE9E;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,OAAO,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAAC;CACpE"}