@downcity/agent 1.1.74 → 1.1.81

package/bin/executor/SessionRunScope.js

@@ -4,18 +4,9 @@ import { AsyncLocalStorage } from "node:async_hooks";
  *
  * 关键点（中文）
  * - 同一条异步调用链内可读取一致的 SessionRunScope。
- * - 用于把 `sessionId` 从入口透传到 plugin runtime 与工具层。
+ * - 当前主要用于 tool 深层桥接层读取活跃 runContext。
  */
 export const sessionRunScopeStorage = new AsyncLocalStorage();
-/**
- * 待持久化的运行时注入 user 消息队列（按 sessionId）。
- *
- * 关键点（中文）
- * - sessionRunScopeStorage 中的 injectedUserMessages 只负责“下一 step 临时可见”。
- * - 为了让时间线顺序稳定，这里把“真正写入历史”的动作延后到
- *   assistant message 落盘之后再统一执行。
- */
-const deferredPersistedUserMessagesBySession = new Map();
 /**
  * 在当前异步调用链内绑定 session run 作用域。
  */
@@ -28,6 +19,12 @@ export function withSessionRunScope(ctx, fn) {
 export function getSessionRunScope() {
     return sessionRunScopeStorage.getStore();
 }
+/**
+ * 读取当前异步链路上的显式 runContext。
+ */
+export function getSessionRunContext() {
+    return sessionRunScopeStorage.getStore()?.runContext;
+}
 /**
  * 入队一条“待注入 user 消息”。
  *
@@ -35,13 +32,10 @@ export function getSessionRunScope() {
  * - 若当前不在 session run 作用域内，静默忽略（fail-open）。
  */
 export function enqueueInjectedUserMessage(message) {
-    const store = sessionRunScopeStorage.getStore();
-    if (!store || !message)
+    const run_context = getSessionRunContext();
+    if (!run_context || !message)
         return;
-    if (!Array.isArray(store.injectedUserMessages)) {
-        store.injectedUserMessages = [];
-    }
-    store.injectedUserMessages.push(message);
+    run_context.injectedUserMessages.push(message);
 }
 /**
  * 读取并清空“待注入 user 消息”队列。
@@ -50,33 +44,53 @@ export function enqueueInjectedUserMessage(message) {
  * - 采用 drain 语义，确保每条注入消息只在下一 step 使用一次。
  */
 export function drainInjectedUserMessages() {
-    const store = sessionRunScopeStorage.getStore();
-    if (!store || !Array.isArray(store.injectedUserMessages))
+    const run_context = getSessionRunContext();
+    if (!run_context)
         return [];
-    const out = [...store.injectedUserMessages];
-    store.injectedUserMessages = [];
+    const out = [...run_context.injectedUserMessages];
+    run_context.injectedUserMessages = [];
     return out;
 }
 /**
  * 入队一条“待持久化 user 消息”。
  */
 export function enqueueDeferredPersistedUserMessage(sessionId, message) {
+    const run_context = getSessionRunContext();
     const key = String(sessionId || "").trim();
-    if (!key || !message)
+    if (!run_context || !key || !message)
+        return;
+    if (run_context.sessionId !== key)
         return;
-    const current = deferredPersistedUserMessagesBySession.get(key) || [];
-    current.push(message);
-    deferredPersistedUserMessagesBySession.set(key, current);
+    run_context.deferredPersistedUserMessages.push(message);
 }
 /**
  * 读取并清空指定 session 的待持久化 user 消息。
  */
 export function drainDeferredPersistedUserMessages(sessionId) {
+    const run_context = getSessionRunContext();
     const key = String(sessionId || "").trim();
-    if (!key)
+    if (!run_context || !key || run_context.sessionId !== key)
+        return [];
+    const current = [...run_context.deferredPersistedUserMessages];
+    run_context.deferredPersistedUserMessages = [];
+    return current;
+}
+/**
+ * 入队一组“待并入 assistant 消息的 file parts”。
+ */
+export function enqueueAssistantFileParts(parts) {
+    const run_context = getSessionRunContext();
+    if (!run_context || !Array.isArray(parts) || parts.length === 0)
+        return;
+    run_context.pendingAssistantFileParts.push(...parts);
+}
+/**
+ * 读取当前 run 内待并入 assistant 消息的 file parts。
+ */
+export function readPendingAssistantFileParts() {
+    const run_context = getSessionRunContext();
+    if (!run_context)
         return [];
-    const current = deferredPersistedUserMessagesBySession.get(key) || [];
-    deferredPersistedUserMessagesBySession.delete(key);
-    return [...current];
+    return [...run_context.pendingAssistantFileParts];
 }
 //# sourceMappingURL=SessionRunScope.js.map

package/bin/executor/SessionRunScope.js.map

@@ -1 +1 @@
-{"version":3,"file":"SessionRunScope.js","sourceRoot":"","sources":["../../src/executor/SessionRunScope.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAqDrD;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,IAAI,iBAAiB,EAAmB,CAAC;AAE/E;;;;;;;GAOG;AACH,MAAM,sCAAsC,GAAG,IAAI,GAAG,EAGnD,CAAC;AAEJ;;GAEG;AACH,MAAM,UAAU,mBAAmB,CAAI,GAAoB,EAAE,EAAW;IACtE,OAAO,sBAAsB,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;AAC7C,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,kBAAkB;IAChC,OAAO,sBAAsB,CAAC,QAAQ,EAAE,CAAC;AAC3C,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,0BAA0B,CACxC,OAA6B;IAE7B,MAAM,KAAK,GAAG,sBAAsB,CAAC,QAAQ,EAAE,CAAC;IAChD,IAAI,CAAC,KAAK,IAAI,CAAC,OAAO;QAAE,OAAO;IAC/B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAAE,CAAC;QAC/C,KAAK,CAAC,oBAAoB,GAAG,EAAE,CAAC;IAClC,CAAC;IACD,KAAK,CAAC,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAC3C,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,yBAAyB;IACvC,MAAM,KAAK,GAAG,sBAAsB,CAAC,QAAQ,EAAE,CAAC;IAChD,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC;QAAE,OAAO,EAAE,CAAC;IACpE,MAAM,GAAG,GAAG,CAAC,GAAG,KAAK,CAAC,oBAAoB,CAAC,CAAC;IAC5C,KAAK,CAAC,oBAAoB,GAAG,EAAE,CAAC;IAChC,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,mCAAmC,CACjD,SAAiB,EACjB,OAA6B;IAE7B,MAAM,GAAG,GAAG,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC3C,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO;QAAE,OAAO;IAC7B,MAAM,OAAO,GAAG,sCAAsC,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;IACtE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACtB,sCAAsC,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AAC3D,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,kCAAkC,CAChD,SAAiB;IAEjB,MAAM,GAAG,GAAG,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC3C,IAAI,CAAC,GAAG;QAAE,OAAO,EAAE,CAAC;IACpB,MAAM,OAAO,GAAG,sCAAsC,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;IACtE,sCAAsC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACnD,OAAO,CAAC,GAAG,OAAO,CAAC,CAAC;AACtB,CAAC"}
+{"version":3,"file":"SessionRunScope.js","sourceRoot":"","sources":["../../src/executor/SessionRunScope.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAmBrD;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,IAAI,iBAAiB,EAAmB,CAAC;AAE/E;;GAEG;AACH,MAAM,UAAU,mBAAmB,CAAI,GAAoB,EAAE,EAAW;IACtE,OAAO,sBAAsB,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;AAC7C,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,kBAAkB;IAChC,OAAO,sBAAsB,CAAC,QAAQ,EAAE,CAAC;AAC3C,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,oBAAoB;IAClC,OAAO,sBAAsB,CAAC,QAAQ,EAAE,EAAE,UAAU,CAAC;AACvD,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,0BAA0B,CACxC,OAA6B;IAE7B,MAAM,WAAW,GAAG,oBAAoB,EAAE,CAAC;IAC3C,IAAI,CAAC,WAAW,IAAI,CAAC,OAAO;QAAE,OAAO;IACrC,WAAW,CAAC,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AACjD,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,yBAAyB;IACvC,MAAM,WAAW,GAAG,oBAAoB,EAAE,CAAC;IAC3C,IAAI,CAAC,WAAW;QAAE,OAAO,EAAE,CAAC;IAC5B,MAAM,GAAG,GAAG,CAAC,GAAG,WAAW,CAAC,oBAAoB,CAAC,CAAC;IAClD,WAAW,CAAC,oBAAoB,GAAG,EAAE,CAAC;IACtC,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,mCAAmC,CACjD,SAAiB,EACjB,OAA6B;IAE7B,MAAM,WAAW,GAAG,oBAAoB,EAAE,CAAC;IAC3C,MAAM,GAAG,GAAG,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC3C,IAAI,CAAC,WAAW,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO;QAAE,OAAO;IAC7C,IAAI,WAAW,CAAC,SAAS,KAAK,GAAG;QAAE,OAAO;IAC1C,WAAW,CAAC,6BAA6B,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAC1D,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,kCAAkC,CAChD,SAAiB;IAEjB,MAAM,WAAW,GAAG,oBAAoB,EAAE,CAAC;IAC3C,MAAM,GAAG,GAAG,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC3C,IAAI,CAAC,WAAW,IAAI,CAAC,GAAG,IAAI,WAAW,CAAC,SAAS,KAAK,GAAG;QAAE,OAAO,EAAE,CAAC;IACrE,MAAM,OAAO,GAAG,CAAC,GAAG,WAAW,CAAC,6BAA6B,CAAC,CAAC;IAC/D,WAAW,CAAC,6BAA6B,GAAG,EAAE,CAAC;IAC/C,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,yBAAyB,CAAC,KAAmB;IAC3D,MAAM,WAAW,GAAG,oBAAoB,EAAE,CAAC;IAC3C,IAAI,CAAC,WAAW,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IACxE,WAAW,CAAC,yBAAyB,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC;AACvD,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,6BAA6B;IAC3C,MAAM,WAAW,GAAG,oBAAoB,EAAE,CAAC;IAC3C,IAAI,CAAC,WAAW;QAAE,OAAO,EAAE,CAAC;IAC5B,OAAO,CAAC,GAAG,WAAW,CAAC,yBAAyB,CAAC,CAAC;AACpD,CAAC"}

package/bin/executor/composer/context/LocalSessionContextComposer.d.ts

@@ -10,6 +10,7 @@ import type { SessionContextComposer, SessionContextComposeResult } from "../../
 import type { SessionMessageV1 } from "../../../executor/types/SessionMessages.js";
 import type { SessionSystemMessage } from "../../../executor/types/SessionPrompts.js";
 import type { Tool } from "ai";
+import type { SessionRunContext } from "../../../types/executor/SessionRunContext.js";
 type LocalSessionContextComposerOptions = {
     /**
      * 可选默认 session id。
@@ -28,21 +29,22 @@ export declare class LocalSessionContextComposer implements SessionContextCompos
     private readonly sessionId;
     private readonly getTools;
     constructor(options: LocalSessionContextComposerOptions);
-    compose(): Promise<SessionContextComposeResult>;
+    compose(run_context: SessionRunContext): Promise<SessionContextComposeResult>;
     createPrepareStepHandler(input: {
         system: SessionSystemMessage[];
         appendMergedUserMessages: (messages: SessionMessageV1[]) => Promise<ModelMessage[]>;
+        runContext: SessionRunContext;
     }): (input: {
         messages?: ModelMessage[];
     }) => Promise<{
         system: SessionSystemMessage[];
         messages?: ModelMessage[];
     }>;
-    createOnStepFinishHandler(): (stepResult: unknown) => Promise<void>;
+    createOnStepFinishHandler(run_context: SessionRunContext): (stepResult: unknown) => Promise<void>;
     /**
      * 构造 fallback assistant 消息。
      */
-    buildFallbackAssistantMessage(text: string): SessionMessageV1;
+    buildFallbackAssistantMessage(text: string, run_context: SessionRunContext): SessionMessageV1;
 }
 export {};
 //# sourceMappingURL=LocalSessionContextComposer.d.ts.map

package/bin/executor/composer/context/LocalSessionContextComposer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LocalSessionContextComposer.d.ts","sourceRoot":"","sources":["../../../../src/executor/composer/context/LocalSessionContextComposer.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAMvC,OAAO,KAAK,EACV,sBAAsB,EACtB,2BAA2B,EAC5B,MAAM,sDAAsD,CAAC;AAC9D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC/E,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAE/B,KAAK,kCAAkC,GAAG;IACxC;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,QAAQ,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;CACtC,CAAC;AAEF;;GAEG;AACH,qBAAa,2BAA4B,YAAW,sBAAsB;IACxE,QAAQ,CAAC,IAAI,8BAA8B;IAC3C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAiD;gBAE9D,OAAO,EAAE,kCAAkC;IAKjD,OAAO,IAAI,OAAO,CAAC,2BAA2B,CAAC;IAkBrD,wBAAwB,CACtB,KAAK,EAAE;QACL,MAAM,EAAE,oBAAoB,EAAE,CAAC;QAC/B,wBAAwB,EAAE,CACxB,QAAQ,EAAE,gBAAgB,EAAE,KACzB,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;KAC9B,GACA,CAAC,KAAK,EAAE;QAAE,QAAQ,CAAC,EAAE,YAAY,EAAE,CAAA;KAAE,KAAK,OAAO,CAAC;QACnD,MAAM,EAAE,oBAAoB,EAAE,CAAC;QAC/B,QAAQ,CAAC,EAAE,YAAY,EAAE,CAAC;KAC3B,CAAC;IA+CF,yBAAyB,IAAI,CAAC,UAAU,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC;IAqBnE;;OAEG;IACH,6BAA6B,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB;CAqB9D"}
+{"version":3,"file":"LocalSessionContextComposer.d.ts","sourceRoot":"","sources":["../../../../src/executor/composer/context/LocalSessionContextComposer.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAEvC,OAAO,KAAK,EACV,sBAAsB,EACtB,2BAA2B,EAC5B,MAAM,sDAAsD,CAAC;AAC9D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC/E,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAC/B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAE/E,KAAK,kCAAkC,GAAG;IACxC;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,QAAQ,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;CACtC,CAAC;AAEF;;GAEG;AACH,qBAAa,2BAA4B,YAAW,sBAAsB;IACxE,QAAQ,CAAC,IAAI,8BAA8B;IAC3C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAiD;gBAE9D,OAAO,EAAE,kCAAkC;IAKjD,OAAO,CACX,WAAW,EAAE,iBAAiB,GAC7B,OAAO,CAAC,2BAA2B,CAAC;IAevC,wBAAwB,CACtB,KAAK,EAAE;QACL,MAAM,EAAE,oBAAoB,EAAE,CAAC;QAC/B,wBAAwB,EAAE,CACxB,QAAQ,EAAE,gBAAgB,EAAE,KACzB,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;QAC7B,UAAU,EAAE,iBAAiB,CAAC;KAC/B,GACA,CAAC,KAAK,EAAE;QAAE,QAAQ,CAAC,EAAE,YAAY,EAAE,CAAA;KAAE,KAAK,OAAO,CAAC;QACnD,MAAM,EAAE,oBAAoB,EAAE,CAAC;QAC/B,QAAQ,CAAC,EAAE,YAAY,EAAE,CAAC;KAC3B,CAAC;IAgDF,yBAAyB,CACvB,WAAW,EAAE,iBAAiB,GAC7B,CAAC,UAAU,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC;IAqBzC;;OAEG;IACH,6BAA6B,CAC3B,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,iBAAiB,GAC7B,gBAAgB;CAsBpB"}

package/bin/executor/composer/context/LocalSessionContextComposer.js

@@ -6,7 +6,6 @@
  * - step 边界回调从 SessionRunScope 读取，Executor 不直接管理来源。
  */
 import { generateId } from "../../../utils/Id.js";
-import { drainInjectedUserMessages, getSessionRunScope, } from "../../SessionRunScope.js";
 /**
  * LocalSessionContextComposer 默认 Composer 实现。
  */
@@ -18,17 +17,11 @@ export class LocalSessionContextComposer {
         this.sessionId = String(options.sessionId || "").trim();
         this.getTools = options.getTools;
     }
-    async compose() {
+    async compose(run_context) {
         const tools = this.getTools();
-        const ctx = getSessionRunScope();
-        const sessionId = String(ctx?.sessionId || this.sessionId || "").trim();
+        const sessionId = String(run_context.sessionId || this.sessionId || "").trim();
         if (!sessionId) {
-            throw new Error("LocalSessionContextComposer.compose requires a sessionId from sessionRunScope or options.sessionId");
-        }
-        // 关键点（中文）：sessionId 统一回填到请求上下文，后续组件直接读取。
-        if (ctx && typeof ctx === "object") {
-            if (!ctx.sessionId)
-                ctx.sessionId = sessionId;
+            throw new Error("LocalSessionContextComposer.compose requires a non-empty sessionId");
         }
         return {
             tools,
@@ -36,8 +29,9 @@ export class LocalSessionContextComposer {
     }
     createPrepareStepHandler(input) {
         return async ({ messages, }) => {
-            const injectedMessages = drainInjectedUserMessages();
-            const onStepCallback = getSessionRunScope()?.onStepCallback;
+            const injectedMessages = [...input.runContext.injectedUserMessages];
+            input.runContext.injectedUserMessages = [];
+            const onStepCallback = input.runContext.onStepCallback;
             if (typeof onStepCallback !== "function" &&
                 injectedMessages.length === 0) {
                 return { system: input.system };
@@ -67,8 +61,8 @@ export class LocalSessionContextComposer {
             };
         };
     }
-    createOnStepFinishHandler() {
-        const onAssistantStepCallback = getSessionRunScope()?.onAssistantStepCallback;
+    createOnStepFinishHandler(run_context) {
+        const onAssistantStepCallback = run_context.onAssistantStepCallback;
         let assistantStepIndex = 0;
         return async (stepResult) => {
             const step = stepResult;
@@ -92,11 +86,10 @@ export class LocalSessionContextComposer {
     /**
      * 构造 fallback assistant 消息。
      */
-    buildFallbackAssistantMessage(text) {
-        const ctx = getSessionRunScope();
-        const sessionId = String(ctx?.sessionId || this.sessionId || "").trim();
+    buildFallbackAssistantMessage(text, run_context) {
+        const sessionId = String(run_context.sessionId || this.sessionId || "").trim();
         if (!sessionId) {
-            throw new Error("LocalSessionContextComposer.buildFallbackAssistantMessage requires a sessionId from sessionRunScope or options.sessionId");
+            throw new Error("LocalSessionContextComposer.buildFallbackAssistantMessage requires a non-empty sessionId");
         }
         return {
             id: `a:${sessionId}:${generateId()}`,

package/bin/executor/composer/context/LocalSessionContextComposer.js.map

@@ -1 +1 @@
-{"version":3,"file":"LocalSessionContextComposer.js","sourceRoot":"","sources":["../../../../src/executor/composer/context/LocalSessionContextComposer.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EACL,yBAAyB,EACzB,kBAAkB,GACnB,MAAM,8BAA8B,CAAC;AAqBtC;;GAEG;AACH,MAAM,OAAO,2BAA2B;IAC7B,IAAI,GAAG,0BAA0B,CAAC;IAC1B,SAAS,CAAS;IAClB,QAAQ,CAAiD;IAE1E,YAAY,OAA2C;QACrD,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACxD,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC9B,MAAM,GAAG,GAAG,kBAAkB,EAAE,CAAC;QACjC,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,EAAE,SAAS,IAAI,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACxE,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CACb,oGAAoG,CACrG,CAAC;QACJ,CAAC;QACD,yCAAyC;QACzC,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;YACnC,IAAI,CAAC,GAAG,CAAC,SAAS;gBAAE,GAAG,CAAC,SAAS,GAAG,SAAS,CAAC;QAChD,CAAC;QACD,OAAO;YACL,KAAK;SACN,CAAC;IACJ,CAAC;IAED,wBAAwB,CACtB,KAKC;QAKD,OAAO,KAAK,EAAE,EACZ,QAAQ,GAGT,EAGE,EAAE;YACH,MAAM,gBAAgB,GAAG,yBAAyB,EAAE,CAAC;YACrD,MAAM,cAAc,GAAG,kBAAkB,EAAE,EAAE,cAAc,CAAC;YAC5D,IACE,OAAO,cAAc,KAAK,UAAU;gBACpC,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAC7B,CAAC;gBACD,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC;YAClC,CAAC;YAED,MAAM,gBAAgB,GAAmB,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;gBAC9D,CAAC,CAAC,QAAQ;gBACV,CAAC,CAAC,EAAE,CAAC;YACP,IAAI,WAAuC,CAAC;YAC5C,IAAI,CAAC;gBACH,MAAM,cAAc,GAClB,OAAO,cAAc,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACrE,MAAM,kBAAkB,GAAG;oBACzB,GAAG,gBAAgB;oBACnB,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC;iBACzD,CAAC;gBACF,MAAM,mBAAmB,GAAG,MAAM,KAAK,CAAC,wBAAwB,CAC9D,kBAAkB,CACnB,CAAC;gBACF,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACnC,gDAAgD;oBAChD,WAAW,GAAG,CAAC,GAAG,gBAAgB,EAAE,GAAG,mBAAmB,CAAC,CAAC;gBAC9D,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACP,6BAA6B;YAC/B,CAAC;YAED,OAAO;gBACL,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACjE,CAAC;QACJ,CAAC,CAAC;IACJ,CAAC;IAED,yBAAyB;QACvB,MAAM,uBAAuB,GAAG,kBAAkB,EAAE,EAAE,uBAAuB,CAAC;QAC9E,IAAI,kBAAkB,GAAG,CAAC,CAAC;QAC3B,OAAO,KAAK,EAAE,UAAmB,EAAiB,EAAE;YAClD,MAAM,IAAI,GAAG,UAAgC,CAAC;YAC9C,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;YAChD,IAAI,OAAO,uBAAuB,KAAK,UAAU;gBAAE,OAAO;YAC1D,IAAI,CAAC;gBACH,kBAAkB,IAAI,CAAC,CAAC;gBACxB,MAAM,uBAAuB,CAAC;oBAC5B,IAAI,EAAE,QAAQ;oBACd,qCAAqC;oBACrC,SAAS,EAAE,kBAAkB;oBAC7B,UAAU;iBACX,CAAC,CAAC;YACL,CAAC;YAAC,MAAM,CAAC;gBACP,0CAA0C;YAC5C,CAAC;QACH,CAAC,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,6BAA6B,CAAC,IAAY;QACxC,MAAM,GAAG,GAAG,kBAAkB,EAAE,CAAC;QACjC,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,EAAE,SAAS,IAAI,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACxE,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CACb,0HAA0H,CAC3H,CAAC;QACJ,CAAC;QACD,OAAO;YACL,EAAE,EAAE,KAAK,SAAS,IAAI,UAAU,EAAE,EAAE;YACpC,IAAI,EAAE,WAAW;YACjB,QAAQ,EAAE;gBACR,CAAC,EAAE,CAAC;gBACJ,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE;gBACd,SAAS;gBACT,MAAM,EAAE,QAAQ;gBAChB,IAAI,EAAE,QAAQ;aACf;YACD,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,CAAC;SACpD,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"LocalSessionContextComposer.js","sourceRoot":"","sources":["../../../../src/executor/composer/context/LocalSessionContextComposer.ts"],"names":[],"mappings":"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"}

package/bin/executor/composer/context/SessionContextComposer.d.ts

@@ -8,6 +8,7 @@
 import type { ModelMessage, Tool } from "ai";
 import type { SessionMessageV1 } from "../../../executor/types/SessionMessages.js";
 import type { SessionSystemMessage } from "../../../executor/types/SessionPrompts.js";
+import type { SessionRunContext } from "../../../types/executor/SessionRunContext.js";
 /**
  * 本轮运行上下文组装输出。
  */
@@ -28,7 +29,7 @@ export interface SessionContextComposer {
     /**
      * 组装一次 run 所需上下文。
      */
-    compose(): Promise<SessionContextComposeResult>;
+    compose(run_context: SessionRunContext): Promise<SessionContextComposeResult>;
     /**
      * 构造 prepareStep 回调。
      */
@@ -41,6 +42,10 @@ export interface SessionContextComposer {
          * 将新增 user 消息转换为可追加的模型消息。
          */
         appendMergedUserMessages: (messages: SessionMessageV1[]) => Promise<ModelMessage[]>;
+        /**
+         * 当前显式运行上下文。
+         */
+        runContext: SessionRunContext;
     }): (input: {
         messages?: ModelMessage[];
     }) => Promise<{
@@ -50,13 +55,13 @@ export interface SessionContextComposer {
     /**
      * 构造 onStepFinish 回调。
      */
-    createOnStepFinishHandler(): (stepResult: unknown) => Promise<void>;
+    createOnStepFinishHandler(run_context: SessionRunContext): (stepResult: unknown) => Promise<void>;
     /**
      * 构造 fallback assistant 消息。
      *
      * 关键点（中文）
      * - fallback 消息构造由 ContextComposer 内部实现，Executor 不直接依赖 history Composer。
      */
-    buildFallbackAssistantMessage(text: string): SessionMessageV1;
+    buildFallbackAssistantMessage(text: string, run_context: SessionRunContext): SessionMessageV1;
 }
 //# sourceMappingURL=SessionContextComposer.d.ts.map

package/bin/executor/composer/context/SessionContextComposer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SessionContextComposer.d.ts","sourceRoot":"","sources":["../../../../src/executor/composer/context/SessionContextComposer.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAC7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAE/E;;GAEG;AACH,MAAM,MAAM,2BAA2B,GAAG;IACxC;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;CAC7B,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,OAAO,IAAI,OAAO,CAAC,2BAA2B,CAAC,CAAC;IAEhD;;OAEG;IACH,wBAAwB,CACtB,KAAK,EAAE;QACL;;WAEG;QACH,MAAM,EAAE,oBAAoB,EAAE,CAAC;QAC/B;;WAEG;QACH,wBAAwB,EAAE,CACxB,QAAQ,EAAE,gBAAgB,EAAE,KACzB,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;KAC9B,GACA,CAAC,KAAK,EAAE;QAAE,QAAQ,CAAC,EAAE,YAAY,EAAE,CAAA;KAAE,KAAK,OAAO,CAAC;QACnD,MAAM,EAAE,oBAAoB,EAAE,CAAC;QAC/B,QAAQ,CAAC,EAAE,YAAY,EAAE,CAAC;KAC3B,CAAC,CAAC;IAEH;;OAEG;IACH,yBAAyB,IAAI,CAAC,UAAU,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAEpE;;;;;OAKG;IACH,6BAA6B,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,CAAC;CAC/D"}
+{"version":3,"file":"SessionContextComposer.d.ts","sourceRoot":"","sources":["../../../../src/executor/composer/context/SessionContextComposer.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAC7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC/E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAE/E;;GAEG;AACH,MAAM,MAAM,2BAA2B,GAAG;IACxC;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;CAC7B,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,OAAO,CAAC,WAAW,EAAE,iBAAiB,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;IAE9E;;OAEG;IACH,wBAAwB,CACtB,KAAK,EAAE;QACL;;WAEG;QACH,MAAM,EAAE,oBAAoB,EAAE,CAAC;QAC/B;;WAEG;QACH,wBAAwB,EAAE,CACxB,QAAQ,EAAE,gBAAgB,EAAE,KACzB,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;QAC7B;;WAEG;QACH,UAAU,EAAE,iBAAiB,CAAC;KAC/B,GACA,CAAC,KAAK,EAAE;QAAE,QAAQ,CAAC,EAAE,YAAY,EAAE,CAAA;KAAE,KAAK,OAAO,CAAC;QACnD,MAAM,EAAE,oBAAoB,EAAE,CAAC;QAC/B,QAAQ,CAAC,EAAE,YAAY,EAAE,CAAC;KAC3B,CAAC,CAAC;IAEH;;OAEG;IACH,yBAAyB,CACvB,WAAW,EAAE,iBAAiB,GAC7B,CAAC,UAAU,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1C;;;;;OAKG;IACH,6BAA6B,CAC3B,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,iBAAiB,GAC7B,gBAAgB,CAAC;CACrB"}

package/bin/executor/composer/history/SessionHistoryWriter.js

@@ -69,14 +69,14 @@ export class SessionHistoryWriter {
         try {
             const historyStore = this.getHistoryStore();
             if (params.message && typeof params.message === "object") {
-                await historyStore.append(params.message);
+                await historyStore.finalizeInflight(params.message);
                 void this.afterSessionUpdatedAsync();
                 return;
             }
             const fallbackText = String(params.fallbackText || "").trim();
             if (!fallbackText)
                 return;
-            await historyStore.append(historyStore.assistantText({
+            await historyStore.finalizeInflight(historyStore.assistantText({
                 text: fallbackText,
                 metadata: {
                     sessionId: this.sessionId,

package/bin/executor/composer/history/SessionHistoryWriter.js.map

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

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

@@ -6,6 +6,7 @@
  * - 与 tools / step 编排解耦，避免 Executor 过载。
  */
 import type { SystemModelMessage } from "ai";
+import type { SessionRunContext } from "../../../types/executor/SessionRunContext.js";
 /**
  * Session system Composer 协议。
  */
@@ -17,6 +18,6 @@ export interface SessionSystemComposer {
     /**
      * 解析本轮 system messages。
      */
-    resolve(): Promise<SystemModelMessage[]>;
+    resolve(run_context: SessionRunContext): 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;AAE7C;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,OAAO,IAAI,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAAC;CAC1C"}
+{"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"}

package/bin/executor/composer/system/default/DefaultSessionSystemComposer.d.ts

@@ -7,6 +7,7 @@
  */
 import type { SessionSystemComposer } from "../../../composer/system/SessionSystemComposer.js";
 import type { AgentContext } from "../../../../types/runtime/agent/AgentContext.js";
+import type { SessionRunContext } from "../../../../types/executor/SessionRunContext.js";
 import { type SystemProfile } from "../../../composer/system/default/SystemDomain.js";
 type DefaultSessionSystemComposerOptions = {
     /**
@@ -36,7 +37,7 @@ export declare class DefaultSessionSystemComposer implements SessionSystemCompos
     private readonly getContext;
     private readonly profile;
     constructor(options: DefaultSessionSystemComposerOptions);
-    resolve(): Promise<import("ai").SystemModelMessage[]>;
+    resolve(run_context: SessionRunContext): Promise<import("ai").SystemModelMessage[]>;
 }
 export {};
 //# sourceMappingURL=DefaultSessionSystemComposer.d.ts.map

package/bin/executor/composer/system/default/DefaultSessionSystemComposer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DefaultSessionSystemComposer.d.ts","sourceRoot":"","sources":["../../../../../src/executor/composer/system/default/DefaultSessionSystemComposer.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,oDAAoD,CAAC;AAE5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AAC1E,OAAO,EAEL,KAAK,aAAa,EACnB,MAAM,mDAAmD,CAAC;AAE3D,KAAK,mCAAmC,GAAG;IACzC;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,sBAAsB,EAAE,MAAM,MAAM,EAAE,CAAC;IAEvC;;OAEG;IACH,UAAU,EAAE,MAAM,YAAY,CAAC;IAE/B;;OAEG;IACH,OAAO,CAAC,EAAE,aAAa,CAAC;CACzB,CAAC;AAEF;;GAEG;AACH,qBAAa,4BAA6B,YAAW,qBAAqB;IACxE,QAAQ,CAAC,IAAI,mBAAmB;IAEhC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAgE;IACvG,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAoD;IAC/E,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgB;gBAE5B,OAAO,EAAE,mCAAmC;IAWlD,OAAO;CAcd"}
+{"version":3,"file":"DefaultSessionSystemComposer.d.ts","sourceRoot":"","sources":["../../../../../src/executor/composer/system/default/DefaultSessionSystemComposer.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,oDAAoD,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AAC1E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAEL,KAAK,aAAa,EACnB,MAAM,mDAAmD,CAAC;AAE3D,KAAK,mCAAmC,GAAG;IACzC;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,sBAAsB,EAAE,MAAM,MAAM,EAAE,CAAC;IAEvC;;OAEG;IACH,UAAU,EAAE,MAAM,YAAY,CAAC;IAE/B;;OAEG;IACH,OAAO,CAAC,EAAE,aAAa,CAAC;CACzB,CAAC;AAEF;;GAEG;AACH,qBAAa,4BAA6B,YAAW,qBAAqB;IACxE,QAAQ,CAAC,IAAI,mBAAmB;IAEhC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAgE;IACvG,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAoD;IAC/E,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgB;gBAE5B,OAAO,EAAE,mCAAmC;IAWlD,OAAO,CAAC,WAAW,EAAE,iBAAiB;CAa7C"}

package/bin/executor/composer/system/default/DefaultSessionSystemComposer.js

@@ -5,7 +5,6 @@
  * - 该实现归属默认 system Composer，统一负责 Session system 解析入口。
  * - 具体“解析 / 加载 / 组装”下沉到 SystemDomain，保持类本身轻量。
  */
-import { getSessionRunScope } from "../../../SessionRunScope.js";
 import { resolveSessionSystemMessages, } from "../../../composer/system/default/SystemDomain.js";
 /**
  * SessionSystemComposer 默认实现。
@@ -26,9 +25,8 @@ export class DefaultSessionSystemComposer {
         this.getContext = options.getContext;
         this.profile = options.profile === "task" ? "task" : "chat";
     }
-    async resolve() {
-        const ctx = getSessionRunScope();
-        const sessionId = String(ctx?.sessionId || "").trim();
+    async resolve(run_context) {
+        const sessionId = String(run_context.sessionId || "").trim();
         if (!sessionId) {
             throw new Error("DefaultSessionSystemComposer.resolve requires a non-empty sessionId");
         }

package/bin/executor/composer/system/default/DefaultSessionSystemComposer.js.map

@@ -1 +1 @@
-{"version":3,"file":"DefaultSessionSystemComposer.js","sourceRoot":"","sources":["../../../../../src/executor/composer/system/default/DefaultSessionSystemComposer.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAElE,OAAO,EACL,4BAA4B,GAE7B,MAAM,mDAAmD,CAAC;AAwB3D;;GAEG;AACH,MAAM,OAAO,4BAA4B;IAC9B,IAAI,GAAG,eAAe,CAAC;IAEf,WAAW,CAAS;IACpB,sBAAsB,CAAgE;IACtF,UAAU,CAAoD;IAC9D,OAAO,CAAgB;IAExC,YAAY,OAA4C;QACtD,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC7D,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAC;QACnF,CAAC;QACD,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,sBAAsB,GAAG,OAAO,CAAC,sBAAsB,CAAC;QAC7D,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;QACrC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,GAAG,GAAG,kBAAkB,EAAE,CAAC;QACjC,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,EAAE,SAAS,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACtD,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,qEAAqE,CAAC,CAAC;QACzF,CAAC;QACD,OAAO,MAAM,4BAA4B,CAAC;YACxC,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,SAAS;YACT,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,mBAAmB,EAAE,IAAI,CAAC,sBAAsB,EAAE;YAClD,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE;SAC3B,CAAC,CAAC;IACL,CAAC;CACF"}
+{"version":3,"file":"DefaultSessionSystemComposer.js","sourceRoot":"","sources":["../../../../../src/executor/composer/system/default/DefaultSessionSystemComposer.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAOH,OAAO,EACL,4BAA4B,GAE7B,MAAM,mDAAmD,CAAC;AAwB3D;;GAEG;AACH,MAAM,OAAO,4BAA4B;IAC9B,IAAI,GAAG,eAAe,CAAC;IAEf,WAAW,CAAS;IACpB,sBAAsB,CAAgE;IACtF,UAAU,CAAoD;IAC9D,OAAO,CAAgB;IAExC,YAAY,OAA4C;QACtD,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC7D,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAC;QACnF,CAAC;QACD,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,sBAAsB,GAAG,OAAO,CAAC,sBAAsB,CAAC;QAC7D,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;QACrC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,WAA8B;QAC1C,MAAM,SAAS,GAAG,MAAM,CAAC,WAAW,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC7D,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,qEAAqE,CAAC,CAAC;QACzF,CAAC;QACD,OAAO,MAAM,4BAA4B,CAAC;YACxC,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,SAAS;YACT,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,mBAAmB,EAAE,IAAI,CAAC,sBAAsB,EAAE;YAClD,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE;SAC3B,CAAC,CAAC;IACL,CAAC;CACF"}

package/bin/executor/core-engine/CoreEngineRunner.d.ts

@@ -0,0 +1,62 @@
+/**
+ * CoreEngineRunner：模型与 tool-loop 主循环执行器。
+ *
+ * 关键点（中文）
+ * - 只负责单次已装配输入的执行，不负责 run scope、外层重试与历史准备。
+ * - 把 step 循环、续写恢复、最终 assistant 汇总等细节从 Executor 中剥离。
+ * - 保持失败返回结构稳定，避免对外 Session 行为变化。
+ */
+import { type LanguageModel } from "ai";
+import type { Logger } from "../../utils/logger/Logger.js";
+import type { SessionHistoryStore } from "../../executor/store/history/SessionHistoryStore.js";
+import type { SessionContextComposer } from "../composer/context/SessionContextComposer.js";
+import type { SessionRunContext } from "../../types/executor/SessionRunContext.js";
+import type { SessionExecuteInput, SessionRunResult } from "../../executor/types/SessionRun.js";
+interface CoreEngineRunnerOptions {
+    /**
+     * 当前 session 对应的 history 事实源。
+     */
+    history_store: SessionHistoryStore;
+    /**
+     * 当前 session 对应的 context Composer。
+     */
+    context_composer: SessionContextComposer;
+    /**
+     * 当前 session 统一日志器。
+     */
+    logger: Logger;
+    /**
+     * 判断某次执行错误是否应该上抛给外层压缩重试。
+     */
+    should_compact_on_error: (error: unknown) => boolean;
+}
+interface CoreEngineRunInput {
+    /**
+     * 已装配好的执行输入。
+     */
+    execute_input: SessionExecuteInput;
+    /**
+     * 当前轮模型实例。
+     */
+    model: LanguageModel;
+    /**
+     * 当前显式运行上下文。
+     */
+    run_context: SessionRunContext;
+}
+/**
+ * 模型与 tool-loop 主循环执行器。
+ */
+export declare class CoreEngineRunner {
+    private readonly history_store;
+    private readonly context_composer;
+    private readonly logger;
+    private readonly should_compact_on_error;
+    constructor(options: CoreEngineRunnerOptions);
+    /**
+     * 执行一次已装配完成的模型/tool-loop 运行。
+     */
+    run(input: CoreEngineRunInput): Promise<SessionRunResult>;
+}
+export {};
+//# sourceMappingURL=CoreEngineRunner.d.ts.map

package/bin/executor/core-engine/CoreEngineRunner.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"CoreEngineRunner.d.ts","sourceRoot":"","sources":["../../../src/executor/core-engine/CoreEngineRunner.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAA+B,KAAK,aAAa,EAAE,MAAM,IAAI,CAAC;AA0BrE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AAC3F,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sDAAsD,CAAC;AACnG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,KAAK,EACV,mBAAmB,EACnB,gBAAgB,EACjB,MAAM,gCAAgC,CAAC;AA2CxC,UAAU,uBAAuB;IAC/B;;OAEG;IACH,aAAa,EAAE,mBAAmB,CAAC;IAEnC;;OAEG;IACH,gBAAgB,EAAE,sBAAsB,CAAC;IAEzC;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,uBAAuB,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC;CACtD;AAED,UAAU,kBAAkB;IAC1B;;OAEG;IACH,aAAa,EAAE,mBAAmB,CAAC;IAEnC;;OAEG;IACH,KAAK,EAAE,aAAa,CAAC;IAErB;;OAEG;IACH,WAAW,EAAE,iBAAiB,CAAC;CAChC;AAED;;GAEG;AACH,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAsB;IACpD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAyB;IAC1D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAqD;gBAEjF,OAAO,EAAE,uBAAuB;IAO5C;;OAEG;IACG,GAAG,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAiShE"}