npm - @downcity/agent - Versions diffs - 1.1.228 → 1.1.236 - Mend

@downcity/agent 1.1.228 → 1.1.236

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (221) hide show

package/bin/agent/remote/transports/RpcRemoteAgentTransport.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"RpcRemoteAgentTransport.js","sourceRoot":"","sources":["../../../../src/agent/remote/transports/RpcRemoteAgentTransport.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AA2BH,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAa3D;;GAEG;AACH,MAAM,OAAO,uBAAuB;IACjB,MAAM,CAAY;IAEnC,YAAY,GAAW;QACrB,IAAI,CAAC,MAAM,GAAG,IAAI,SAAS,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,KAA+B;QAClD,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,UAAkB;QAC/B,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,GAAG,CACP,UAAkB,EAClB,KAA2B;QAE3B,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,MAAM,CACV,UAAkB,EAClB,KAA8B;QAE9B,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC;YACtC,UAAU;YACV,KAAK;SACN,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,UAAkB;QAC3B,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,MAKf;QACC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC;YACvD,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ;SAC1B,CAAC,CAAC;QACH,OAAO;YACL,KAAK,EAAE,KAAK,IAAI,EAAE;gBAChB,MAAM,YAAY,CAAC,WAAW,EAAE,CAAC;YACnC,CAAC;SACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,QAAQ,CACZ,UAAkB,EAClB,KAAgC;QAEhC,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC;YAC5C,UAAU;YACV,KAAK;SACN,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,UAAkB;QAC7B,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,IAAI,CACR,UAAkB,EAClB,KAAsC;QAEtC,MAAM,UAAU,GACd,OAAO,KAAK,KAAK,QAAQ;YACvB,CAAC,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,SAAS;YACzC,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,SAAS,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,SAAS,CAAC;QACzD,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC;YACpC,UAAU;YACV,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACtC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,KAA8B;QAChD,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,KAA+B;QAE/B,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,gBAAgB,CACpB,KAAiC;QAEjC,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,iBAAiB,CACrB,KAAmC;QAEnC,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,0BAA0B,CAAC;YAClD,WAAW,EAAE,KAAK,CAAC,MAAM;YACzB,WAAW,EAAE,KAAK,CAAC,MAAM;YACzB,GAAG,CAAC,KAAK,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACnE,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,UAAkB;QAChC,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;IAC7D,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,UAAkB;QACpC,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC,UAAU,CAAC,CAAC;IACjE,CAAC;IAED,KAAK,CAAC,iBAAiB,CACrB,UAAkB,EAClB,KAAkC;QAElC,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IACxE,CAAC;IAED,KAAK,CAAC,gBAAgB,CACpB,UAAkB,EAClB,KAAkC;QAElC,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,wBAAwB,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IACvE,CAAC;IAED,KAAK,CAAC,KAAK;QACT,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IAC5B,CAAC;CACF"}
1	+ {"version":3,"file":"RpcRemoteAgentTransport.js","sourceRoot":"","sources":["../../../../src/agent/remote/transports/RpcRemoteAgentTransport.ts"],"names":[],"mappings":"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"}

package/bin/executor/Executor.d.ts CHANGED Viewed

@@ -17,6 +17,7 @@ import type { JsonObject } from "../types/common/Json.js";
 import type { SessionRecordV1 } from "../executor/types/SessionRecords.js";
 import type { SessionExecutor } from "../executor/types/SessionExecutor.js";
 import type { SessionRunContext } from "../types/executor/SessionRunContext.js";
+import type { AgentPluginExecutionRuntime } from "../types/plugin/PluginRuntime.js";
 import type { SessionRunResult } from "../executor/types/SessionRun.js";
 type ExecutorOptions = {
     /**
@@ -38,6 +39,10 @@ type ExecutorOptions = {
      * 读取当前 session 使用的模型实例。
      */
     getModel: () => LanguageModel | undefined;
+    /**
+     * 读取当前 session 模型支持的总上下文窗口长度。
+     */
+    get_model_context_window?: () => number | undefined;
     /**
      * 统一日志器。
      */
@@ -54,6 +59,14 @@ type ExecutorOptions = {
      * 获取当前可用工具集合。
      */
     getTools: () => Record<string, Tool>;
+    /**
+     * 读取当前 Session effective Agent env。
+     */
+    getEnv: () => Record<string, string>;
+    /** 读取当前 Session effective Agent instruction 文本。 */
+    get_systems?: () => string[];
+    /** 创建当前 Session effective Plugin 执行视图。 */
+    get_plugins?: () => AgentPluginExecutionRuntime;
     /**
      * 可选自定义 context Composer。
      */
@@ -70,6 +83,10 @@ export declare class Executor implements SessionExecutor {
     private readonly historyComposer;
     private readonly historyStore;
     private readonly getModel;
+    private readonly getEnv;
+    private readonly get_systems;
+    private readonly get_plugins;
+    private readonly get_model_context_window?;
     private readonly logger;
     private readonly compactionComposer;
     private readonly systemComposer;
@@ -135,6 +152,32 @@ export declare class Executor implements SessionExecutor {
      * 执行一次已装配完成的运行材料。
      */
     private executePreparedRun;
+    /**
+     * 在 Assistant writer 完成后归档当前 canonical 历史。
+     *
+     * 关键点（中文）：持久化 compact 不能发生在流式 Assistant 草稿仍打开时，
+     * 因此由 SessionTurnService 在 writer complete/fail 之后显式调用。
+     */
+    compact_history(run_context: SessionRunContext): Promise<{
+        compacted: boolean;
+        reason?: string;
+    }>;
+    /**
+     * 解析下一 Session step 实际使用的运行配置。
+     *
+     * 关键点（中文）
+     * - 调用方必须先提交 Session 统一输入队列，再调用本方法。
+     * - 每次调用只读取一次 model、system 与 tools，并把它们传给同一个 `streamText()`。
+     */
+    private resolve_step_inputs;
+    /**
+     * 刷新当前 Session step 的 effective Agent 运行视图。
+     */
+    private refresh_step_runtime;
+    /**
+     * 释放当前 Session step 持有的 Plugin execution lease。
+     */
+    private release_step_plugins;
     /**
      * 为所有 tool 的 execute callback 绑定 ShellRunScope。
      *

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

	@@ -1 +1 @@
1	- {"version":3,"file":"Executor.d.ts","sourceRoot":"","sources":["../../src/executor/Executor.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAc,KAAK,aAAa,EAAE,KAAK,IAAI,EAA6B,MAAM,IAAI,CAAC;AAG1F,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sDAAsD,CAAC;AACnG,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AAM3F,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,4DAA4D,CAAC;AAC5G,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sDAAsD,CAAC;AACnG,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oDAAoD,CAAC;AAIhG,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAEV,eAAe,EAChB,MAAM,oCAAoC,CAAC;AAE5C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,KAAK,EAEV,gBAAgB,EACjB,MAAM,gCAAgC,CAAC;AAExC,KAAK,eAAe,GAAG;IACrB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,YAAY,EAAE,mBAAmB,CAAC;IAElC;;;;;OAKG;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,CAAC,EAAE,yBAAyB,CAAC;IAE/C;;OAEG;IACH,cAAc,EAAE,qBAAqB,CAAC;IAEtC;;OAEG;IACH,QAAQ,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAErC;;OAEG;IACH,eAAe,CAAC,EAAE,sBAAsB,CAAC;CAE1C,CAAC;AAEF;;GAEG;AACH,qBAAa,QAAS,YAAW,eAAe;IAC9C;;OAEG;IACH,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAE3B,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAyB;IACzD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAsB;IACnD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA8B;IACvD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA4B;IAC/D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAwB;IACvD,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,sBAAsB,CAAC;IAC3D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAuB;IACrD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA0B;IAC3D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAyB;IACzD,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAmB;IAEtD,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,gBAAgB,CAAgC;gBAE5C,OAAO,EAAE,eAAe;~~IA0CpC~~;;OAEG;IACH,WAAW,IAAI,OAAO;IAItB;;OAEG;IACH,IAAI,IAAI,OAAO;IAQf;;OAEG;IACH,eAAe,IAAI,mBAAmB;IAItC;;;;;OAKG;IACH,WAAW,IAAI,eAAe;IAI9B;;OAEG;IACG,mBAAmB,CAAC,MAAM,EAAE;QAChC,OAAO,CAAC,EAAE,eAAe,GAAG,IAAI,CAAC;QACjC,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,KAAK,CAAC,EAAE,UAAU,CAAC;KACpB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIjB;;OAEG;IACG,wBAAwB,CAAC,MAAM,EAAE;QACrC,OAAO,CAAC,EAAE,eAAe,GAAG,IAAI,CAAC;QACjC,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,KAAK,CAAC,EAAE,UAAU,CAAC;KACpB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIjB;;;;;;OAMG;IACG,GAAG,CAAC,MAAM,EAAE;QAChB,KAAK,EAAE,MAAM,CAAC;QACd,UAAU,CAAC,EAAE,iBAAiB,CAAC;KAChC,GAAG,OAAO,CAAC,gBAAgB,CAAC;~~IAyG7B~~;;OAEG;YACW,mBAAmB;~~IAwEjC~~;;OAEG;YACW,kBAAkB;~~IAYhC~~;;;;;;OAMG;IACH,OAAO,CAAC,uBAAuB;~~IAiC~~/B;;OAEG;IACH,OAAO,CAAC,gBAAgB;~~IAmCxB~~;;OAEG;YACW,UAAU;IAsBxB;;OAEG;IACH,OAAO,CAAC,mBAAmB;CAO5B"}
1	+ {"version":3,"file":"Executor.d.ts","sourceRoot":"","sources":["../../src/executor/Executor.ts"],"names":[],"mappings":"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"}

package/bin/executor/Executor.js CHANGED Viewed

@@ -28,6 +28,10 @@ export class Executor {
     historyComposer;
     historyStore;
     getModel;
+    getEnv;
+    get_systems;
+    get_plugins;
+    get_model_context_window;
     logger;
     compactionComposer;
     systemComposer;
@@ -47,6 +51,10 @@ export class Executor {
         this.historyStore = options.historyStore;
         this.historyComposer = options.historyComposer;
         this.getModel = options.getModel;
+        this.getEnv = options.getEnv;
+        this.get_systems = options.get_systems;
+        this.get_plugins = options.get_plugins;
+        this.get_model_context_window = options.get_model_context_window;
         this.logger = options.logger;
         this.compactionComposer =
             options.compactionComposer || new JsonlSessionCompactionComposer();
@@ -189,6 +197,7 @@ export class Executor {
             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;
@@ -204,6 +213,7 @@ export class Executor {
         if (!String(this.historyComposer.sessionId || "").trim()) {
             throw new Error("Executor.run requires historyComposer.sessionId");
         }
+        await this.refresh_step_runtime(run_context);
         const composed_context = await this.contextComposer.compose(run_context);
         const tools = this.bind_run_scope_to_tools(composed_context.tools, run_context);
         const system = await this.systemComposer.resolve(run_context);
@@ -220,13 +230,18 @@ export class Executor {
                 }
                 await this.emitAction(run_context, action);
             };
-            await this.compactionComposer.run({
-                historyStore: this.historyStore,
-                model,
-                system,
-                retryCount: retry_count,
-                onAction: emit_compaction_action,
-            });
+            const context_window = this.get_model_context_window?.();
+            if (retry_count > 0) {
+                await this.compactionComposer.run({
+                    historyStore: this.historyStore,
+                    model,
+                    ...(context_window !== undefined ? { context_window } : {}),
+                    system,
+                    retryCount: retry_count,
+                    force: true,
+                    onAction: emit_compaction_action,
+                });
+            }
         }
         catch (error) {
             await this.emitAction(run_context, {
@@ -266,8 +281,104 @@ export class Executor {
             execute_input: input,
             model,
             run_context,
+            resolve_step_inputs: async () => await this.resolve_step_inputs(run_context),
         });
     }
+    /**
+     * 在 Assistant writer 完成后归档当前 canonical 历史。
+     *
+     * 关键点（中文）：持久化 compact 不能发生在流式 Assistant 草稿仍打开时，
+     * 因此由 SessionTurnService 在 writer complete/fail 之后显式调用。
+     */
+    async compact_history(run_context) {
+        let compaction_action_id = "";
+        try {
+            await this.refresh_step_runtime(run_context);
+            const model = this.resolveModelOrThrow();
+            const system = await this.systemComposer.resolve(run_context);
+            const emit_compaction_action = async (action) => {
+                if (action.state === "running")
+                    compaction_action_id = action.id;
+                await this.emitAction(run_context, action);
+            };
+            const context_window = this.get_model_context_window?.();
+            return await this.compactionComposer.run({
+                historyStore: this.historyStore,
+                model,
+                ...(context_window !== undefined ? { context_window } : {}),
+                system,
+                retryCount: 0,
+                force: true,
+                onAction: emit_compaction_action,
+            });
+        }
+        catch (error) {
+            await this.emitAction(run_context, {
+                type: "action",
+                id: compaction_action_id ||
+                    `compacting:${this.sessionId}:failed:${Date.now()}:${generateId()}`,
+                title: "Session records compact failed",
+                description: error instanceof Error ? error.message : String(error),
+                state: "failed",
+                metadata: {
+                    v: 1,
+                    ts: Date.now(),
+                    sessionId: this.sessionId,
+                },
+            });
+            return { compacted: false, reason: "compact_failed" };
+        }
+        finally {
+            await this.release_step_plugins(run_context);
+        }
+    }
+    /**
+     * 解析下一 Session step 实际使用的运行配置。
+     *
+     * 关键点（中文）
+     * - 调用方必须先提交 Session 统一输入队列，再调用本方法。
+     * - 每次调用只读取一次 model、system 与 tools，并把它们传给同一个 `streamText()`。
+     */
+    async resolve_step_inputs(run_context) {
+        await this.refresh_step_runtime(run_context);
+        const composed_context = await this.contextComposer.compose(run_context);
+        const context_window = this.get_model_context_window?.();
+        return {
+            model: this.resolveModelOrThrow(),
+            system: await this.systemComposer.resolve(run_context),
+            tools: this.bind_run_scope_to_tools(composed_context.tools, run_context),
+            ...(context_window !== undefined ? { context_window } : {}),
+        };
+    }
+    /**
+     * 刷新当前 Session step 的 effective Agent 运行视图。
+     */
+    async refresh_step_runtime(run_context) {
+        await this.release_step_plugins(run_context);
+        run_context.agentEnv = Object.freeze({ ...this.getEnv() });
+        if (this.get_systems) {
+            run_context.agentSystems = Object.freeze([...this.get_systems()]);
+        }
+        else {
+            delete run_context.agentSystems;
+        }
+        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();
+    }
     /**
      * 为所有 tool 的 execute callback 绑定 ShellRunScope。
      *
@@ -294,6 +405,9 @@ export class Executor {
                         run_context: {
                             ...(session_id ? { session_id } : {}),
                             ...(turn_id ? { turn_id } : {}),
+                            ...(run_context.agentEnv
+                                ? { env: run_context.agentEnv }
+                                : {}),
                         },
                     }, async () => await original_execute(args, options));
                 },
@@ -313,6 +427,12 @@ export class Executor {
             ...(typeof input?.onStepCallback === "function"
                 ? { onStepCallback: input.onStepCallback }
                 : {}),
+            ...(typeof input?.hasPendingStepInput === "function"
+                ? { hasPendingStepInput: input.hasPendingStepInput }
+                : {}),
+            ...(typeof input?.consume_history_reload === "function"
+                ? { consume_history_reload: input.consume_history_reload }
+                : {}),
             ...(typeof input?.onAssistantStepCallback === "function"
                 ? { onAssistantStepCallback: input.onAssistantStepCallback }
                 : {}),

package/bin/executor/Executor.js.map CHANGED Viewed

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

package/bin/executor/composer/compaction/SessionCompactionComposer.d.ts CHANGED Viewed

@@ -20,6 +20,10 @@ export type SessionCompactionInput = {
      * 当前模型实例。
      */
     model: LanguageModel;
+    /**
+     * 当前模型支持的总上下文窗口长度，单位为 token。
+     */
+    context_window?: number;
     /**
      * 当前轮 system messages。
      */
@@ -36,6 +40,12 @@ export type SessionCompactionInput = {
      * - 回调由上层 Session 负责转成订阅事件与 action record。
      */
     onAction?: (action: SessionActionRecordV1) => Promise<void>;
+    /**
+     * 是否明确要求持久化 deep compact。
+     *
+     * 普通模型调用不应因为历史字符数量而触发 compact；仅 usage 反馈或超限恢复会设置此值。
+     */
+    force?: boolean;
 };
 /**
  * Compaction Composer 协议。

package/bin/executor/composer/compaction/SessionCompactionComposer.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SessionCompactionComposer.d.ts","sourceRoot":"","sources":["../../../../src/executor/composer/compaction/SessionCompactionComposer.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,IAAI,CAAC;AAC5D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AAC3F,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAEhF;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC;;OAEG;IACH,YAAY,EAAE,mBAAmB,CAAC;IAElC;;OAEG;IACH,KAAK,EAAE,aAAa,CAAC;IAErB;;OAEG;IACH,MAAM,EAAE,kBAAkB,EAAE,CAAC;IAE7B;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,qBAAqB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;~~CAC7D~~,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACxC;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,GAAG,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO,CAAC;QAC1C,SAAS,EAAE,OAAO,CAAC;QACnB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC,CAAC;IAEH;;;;;;OAMG;IACH,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC;CAC/C"}
1	+ {"version":3,"file":"SessionCompactionComposer.d.ts","sourceRoot":"","sources":["../../../../src/executor/composer/compaction/SessionCompactionComposer.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,IAAI,CAAC;AAC5D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AAC3F,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAEhF;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC;;OAEG;IACH,YAAY,EAAE,mBAAmB,CAAC;IAElC;;OAEG;IACH,KAAK,EAAE,aAAa,CAAC;IAErB;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;OAEG;IACH,MAAM,EAAE,kBAAkB,EAAE,CAAC;IAE7B;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,qBAAqB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5D;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACxC;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,GAAG,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO,CAAC;QAC1C,SAAS,EAAE,OAAO,CAAC;QACnB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC,CAAC;IAEH;;;;;;OAMG;IACH,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC;CAC/C"}

package/bin/executor/composer/compaction/jsonl/JsonlSessionCompactionComposer.d.ts CHANGED Viewed

@@ -6,20 +6,11 @@
  * - 真正的读写与 compact 执行交由 history Store。
  */
 import type { SessionCompactionComposer, SessionCompactionInput } from "../../../composer/compaction/SessionCompactionComposer.js";
-type JsonlSessionCompactionComposerOptions = {
-    keepLastMessages?: number;
-    maxInputTokensApprox?: number;
-    archiveOnCompact?: boolean;
-    compactRatio?: number;
-};
 /**
  * JsonlSessionCompactionComposer 默认实现。
  */
 export declare class JsonlSessionCompactionComposer implements SessionCompactionComposer {
     readonly name = "summary_compaction_composer";
-    private readonly options;
-    constructor(options?: JsonlSessionCompactionComposerOptions);
-    private resolvePolicy;
     run(input: SessionCompactionInput): Promise<{
         compacted: boolean;
         reason?: string;
@@ -33,5 +24,4 @@ export declare class JsonlSessionCompactionComposer implements SessionCompaction
      */
     shouldCompactOnError(error: unknown): boolean;
 }
-export {};
 //# sourceMappingURL=JsonlSessionCompactionComposer.d.ts.map

package/bin/executor/composer/compaction/jsonl/JsonlSessionCompactionComposer.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"JsonlSessionCompactionComposer.d.ts","sourceRoot":"","sources":["../../../../../src/executor/composer/compaction/jsonl/JsonlSessionCompactionComposer.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EACV,yBAAyB,EACzB,sBAAsB,EACvB,MAAM,4DAA4D,CAAC;AAEpE~~,KAAK,qCAAqC,GAAG;IAC3C,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF~~;;GAEG;AACH,qBAAa,8BAA+B,YAAW,yBAAyB;IAC9E,QAAQ,CAAC,IAAI,iCAAiC;~~IAC9C~~,~~OAAO,CAAC,QAAQ,CAAC,OAAO,CAAwC;gBAEpD,OAAO,CAAC,EAAE,qCAAqC;IAI3D,OAAO,CAAC,aAAa;IAsCf,~~GAAG,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO,CAAC;QAChD,SAAS,EAAE,OAAO,CAAC;QACnB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;~~IAaF~~;;;;;;OAMG;IACH,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO;CAS9C"}
1	+ {"version":3,"file":"JsonlSessionCompactionComposer.d.ts","sourceRoot":"","sources":["../../../../../src/executor/composer/compaction/jsonl/JsonlSessionCompactionComposer.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EACV,yBAAyB,EACzB,sBAAsB,EACvB,MAAM,4DAA4D,CAAC;AAEpE;;GAEG;AACH,qBAAa,8BAA+B,YAAW,yBAAyB;IAC9E,QAAQ,CAAC,IAAI,iCAAiC;IAExC,GAAG,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO,CAAC;QAChD,SAAS,EAAE,OAAO,CAAC;QACnB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IAYF;;;;;;OAMG;IACH,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO;CAS9C"}

package/bin/executor/composer/compaction/jsonl/JsonlSessionCompactionComposer.js CHANGED Viewed

@@ -10,44 +10,14 @@
  */
 export class JsonlSessionCompactionComposer {
     name = "summary_compaction_composer";
-    options;
-    constructor(options) {
-        this.options = options || {};
-    }
-    resolvePolicy(retryCount) {
-        const baseKeepLastMessages = typeof this.options.keepLastMessages === "number"
-            ? Math.max(6, Math.min(5000, Math.floor(this.options.keepLastMessages)))
-            : 30;
-        const baseMaxInputTokensApprox = typeof this.options.maxInputTokensApprox === "number"
-            ? Math.max(2000, Math.min(200_000, Math.floor(this.options.maxInputTokensApprox)))
-            : 128000;
-        const retryFactor = Math.max(1, Math.pow(2, retryCount));
-        const keepLastMessages = Math.max(6, Math.floor(baseKeepLastMessages / retryFactor));
-        const maxInputTokensApprox = Math.max(2000, Math.floor(baseMaxInputTokensApprox / retryFactor));
-        const archiveOnCompact = this.options.archiveOnCompact === undefined
-            ? true
-            : Boolean(this.options.archiveOnCompact);
-        const compactRatioRaw = typeof this.options.compactRatio === "number" &&
-            Number.isFinite(this.options.compactRatio)
-            ? this.options.compactRatio
-            : 0.5;
-        const compactRatio = Math.max(0.1, Math.min(0.9, compactRatioRaw));
-        return {
-            keepLastMessages,
-            maxInputTokensApprox,
-            archiveOnCompact,
-            compactRatio,
-        };
-    }
     async run(input) {
-        const policy = this.resolvePolicy(input.retryCount);
+        if (!input.force && input.retryCount <= 0) {
+            return { compacted: false, reason: "not_requested" };
+        }
         return await input.historyStore.compact({
             model: input.model,
             system: input.system,
-            keepLastMessages: policy.keepLastMessages,
-            maxInputTokensApprox: policy.maxInputTokensApprox,
-            archiveOnCompact: policy.archiveOnCompact,
-            compactRatio: policy.compactRatio,
+            force: true,
             ...(input.onAction ? { onAction: input.onAction } : {}),
         });
     }

package/bin/executor/composer/compaction/jsonl/JsonlSessionCompactionComposer.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"JsonlSessionCompactionComposer.js","sourceRoot":"","sources":["../../../../../src/executor/composer/compaction/jsonl/JsonlSessionCompactionComposer.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;~~AAcH~~;;GAEG;AACH,MAAM,OAAO,8BAA8B;IAChC,IAAI,GAAG,6BAA6B,CAAC;~~IAC7B~~,~~OAAO~~,~~CAAwC;IAEhE,YAAY,OAA+C;QACzD,IAAI,~~CAAC,~~OAAO,~~GAAG,~~OAAO,IAAI,EAAE,~~CAAC~~;IAC/B~~,~~CAAC~~;~~IAEO~~,~~aAAa,CAAC,UAAkB;QAMtC,MAAM,oBAAoB,GACxB,OAAO,~~IAAI,CAAC,~~OAAO~~,CAAC,~~gBAAgB,~~KAAK,~~QAAQ;YAC/C,CAAC,CAAC,~~IAAI,~~CAAC~~,~~GAAG,~~CAAC,~~CAAC~~,~~EAAE,~~IAAI,CAAC,~~GAAG,CAAC,IAAI,~~EAAE,~~IAAI,~~CAAC~~,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC~~;~~YACxE~~,~~CAAC,CAAC,EAAE,CAAC;QACT,MAAM,wBAAwB,GAC5B,~~OAAO,~~IAAI,CAAC,OAAO,CAAC,oBAAoB,KAAK,QAAQ;YACnD,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,~~EAAE,~~IAAI~~,~~CAAC,GAAG,CAAC,OAAO,~~EAAE,~~IAAI,CAAC,~~KAAK,~~CAAC,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC;YAClF,CAAC,CAAC,MAAM,CAAC;QACb,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,~~EAAE,~~IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC;QACzD,~~MAAM,~~gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,~~EAAE,IAAI,CAAC,KAAK,CAAC,oBAAoB,GAAG,WAAW,CAAC,CAAC,CAAC;QACrF,MAAM,oBAAoB,GAAG,IAAI,CAAC,GAAG,CACnC,IAAI,EACJ,IAAI,CAAC,KAAK,CAAC,wBAAwB,GAAG,WAAW,CAAC,CACnD,CAAC;QACF,MAAM,gBAAgB,GACpB,IAAI,CAAC,OAAO,CAAC,gBAAgB,KAAK,SAAS;YACzC,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAC7C,MAAM,eAAe,GACnB,OAAO,IAAI,CAAC,OAAO,CAAC,YAAY,KAAK,QAAQ;YAC7C,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC;YACxC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY;YAC3B,CAAC,CAAC,GAAG,CAAC;QACV,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,~~IAAI,~~CAAC~~,GAAG,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC,CAAC~~;~~QACnE~~,~~OAAO;YACL,gBAAgB;YAChB,oBAAoB;YACpB,gBAAgB;YAChB,YAAY;SACb,~~CAAC;~~IACJ~~,~~CAAC;IAED,KAAK,CAAC,GAAG,CAAC,KAA6B;QAIrC,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACpD,~~OAAO,MAAM,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC;YACtC,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,~~gBAAgB~~,EAAE,~~MAAM,CAAC,gBAAgB~~;~~YACzC~~,~~oBAAoB,EAAE,MAAM,CAAC,oBAAoB;YACjD,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,~~GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACxD,CAAC,CAAC;IACL,CAAC;IAED;;;;;;OAMG;IACH,oBAAoB,CAAC,KAAc;QACjC,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;QACrC,OAAO,CACL,QAAQ,CAAC,QAAQ,CAAC,gBAAgB,CAAC;YACnC,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC;YAC7B,QAAQ,CAAC,QAAQ,CAAC,iBAAiB,CAAC;YACpC,QAAQ,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CACpC,CAAC;IACJ,CAAC;CACF"}
1	+ {"version":3,"file":"JsonlSessionCompactionComposer.js","sourceRoot":"","sources":["../../../../../src/executor/composer/compaction/jsonl/JsonlSessionCompactionComposer.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAOH;;GAEG;AACH,MAAM,OAAO,8BAA8B;IAChC,IAAI,GAAG,6BAA6B,CAAC;IAE9C,KAAK,CAAC,GAAG,CAAC,KAA6B;QAIrC,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,UAAU,IAAI,CAAC,EAAE,CAAC;YAC1C,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC;QACvD,CAAC;QACD,OAAO,MAAM,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC;YACtC,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,KAAK,EAAE,IAAI;YACX,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACxD,CAAC,CAAC;IACL,CAAC;IAED;;;;;;OAMG;IACH,oBAAoB,CAAC,KAAc;QACjC,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;QACrC,OAAO,CACL,QAAQ,CAAC,QAAQ,CAAC,gBAAgB,CAAC;YACnC,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC;YAC7B,QAAQ,CAAC,QAAQ,CAAC,iBAAiB,CAAC;YACpC,QAAQ,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CACpC,CAAC;IACJ,CAAC;CACF"}

package/bin/executor/composer/compaction/jsonl/JsonlSessionCompactionExecutor.d.ts CHANGED Viewed

@@ -11,10 +11,8 @@ import type { SessionActionRecordV1, SessionRecordV1, SessionMetadataV1 } from "
 export type SessionCompactParams = {
     model: LanguageModel;
     system: Array<SystemModelMessage>;
-    keepLastMessages: number;
-    maxInputTokensApprox: number;
     archiveOnCompact: boolean;
-    compactRatio: number;
+    force?: boolean;
     onAction?: (action: SessionActionRecordV1) => Promise<void>;
 };
 type SessionCompactDeps = {

package/bin/executor/composer/compaction/jsonl/JsonlSessionCompactionExecutor.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"JsonlSessionCompactionExecutor.d.ts","sourceRoot":"","sources":["../../../../../src/executor/composer/compaction/jsonl/JsonlSessionCompactionExecutor.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,EAGL,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACxB,MAAM,IAAI,CAAC;AAGZ,OAAO,KAAK,EACV,qBAAqB,EACrB,eAAe,EACf,iBAAiB,EAElB,MAAM,oCAAoC,CAAC;AAY5C,MAAM,MAAM,oBAAoB,GAAG;IACjC,KAAK,EAAE,aAAa,CAAC;IACrB,MAAM,EAAE,KAAK,CAAC,kBAAkB,CAAC,CAAC;IAClC,gBAAgB,EAAE,~~MAAM~~,CAAC;~~IACzB~~,~~oBAAoB~~,~~EAAE,MAAM,~~CAAC~~;IAC7B~~,~~gBAAgB,~~EAAE,OAAO,CAAC;~~IAC1B~~,~~YAAY,EAAE,MAAM,CAAC;IACrB,~~QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,qBAAqB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7D,CAAC;AAEF,KAAK,kBAAkB,GAAG;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IACvD,OAAO,EAAE,MAAM,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC;IAC1C,oBAAoB,EAAE,CAAC,MAAM,EAAE;QAC7B,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,WAAW,CAAC,EAAE,iBAAiB,CAAC,aAAa,CAAC,CAAC;KAChD,KAAK,eAAe,CAAC;IACtB,iBAAiB,EAAE,MAAM,MAAM,CAAC;IAChC,mBAAmB,EAAE,MAAM,MAAM,CAAC;IAClC,yBAAyB,EAAE,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1E,CAAC;AAEF;;;;;;GAMG;AACH,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,kBAAkB,EACxB,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC;IAAE,SAAS,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,~~CAwMlD~~"}
1	+ {"version":3,"file":"JsonlSessionCompactionExecutor.d.ts","sourceRoot":"","sources":["../../../../../src/executor/composer/compaction/jsonl/JsonlSessionCompactionExecutor.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,EAGL,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACxB,MAAM,IAAI,CAAC;AAGZ,OAAO,KAAK,EACV,qBAAqB,EACrB,eAAe,EACf,iBAAiB,EAElB,MAAM,oCAAoC,CAAC;AAY5C,MAAM,MAAM,oBAAoB,GAAG;IACjC,KAAK,EAAE,aAAa,CAAC;IACrB,MAAM,EAAE,KAAK,CAAC,kBAAkB,CAAC,CAAC;IAClC,gBAAgB,EAAE,OAAO,CAAC;IAC1B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,qBAAqB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7D,CAAC;AAEF,KAAK,kBAAkB,GAAG;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IACvD,OAAO,EAAE,MAAM,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC;IAC1C,oBAAoB,EAAE,CAAC,MAAM,EAAE;QAC7B,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,WAAW,CAAC,EAAE,iBAAiB,CAAC,aAAa,CAAC,CAAC;KAChD,KAAK,eAAe,CAAC;IACtB,iBAAiB,EAAE,MAAM,MAAM,CAAC;IAChC,mBAAmB,EAAE,MAAM,MAAM,CAAC;IAClC,yBAAyB,EAAE,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1E,CAAC;AAEF;;;;;;GAMG;AACH,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,kBAAkB,EACxB,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC;IAAE,SAAS,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAsLlD"}

package/bin/executor/composer/compaction/jsonl/JsonlSessionCompactionExecutor.js CHANGED Viewed

@@ -52,28 +52,14 @@ export async function compactSessionMessagesIfNeeded(deps, params) {
                 ? String(snapshot[snapshot.length - 1].id || "")
                 : "";
     });
-    if (snapshot.length < 4) {
-        return { compacted: false, reason: "small_messages" };
-    }
-    const systemText = (params.system || [])
-        .map((m) => String(m.content ?? ""))
-        .join("\n\n");
-    // 关键点（中文）：session messages 现在可能包含 tool parts / output，必须把它们计入预算估算，否则会低估 token。
-    let messagesJson = "";
-    try {
-        messagesJson = JSON.stringify(snapshot);
-    }
-    catch {
-        messagesJson = "";
+    if (snapshot.length === 0) {
+        return { compacted: false, reason: "nothing_to_compact" };
     }
-    const est = estimateTokensApproxFromText(systemText + "\n\n" + messagesJson);
-    if (est <= params.maxInputTokensApprox) {
-        return { compacted: false, reason: "under_budget" };
+    if (!params.force) {
+        return { compacted: false, reason: "not_requested" };
     }
-    // 关键点（中文）：触发 compact 后，优先压缩“最早一段消息”，默认比例 50%。
-    const compactRatio = normalizeCompactRatio(params.compactRatio);
-    const compactCount = resolveCompactCount(snapshot.length, compactRatio);
-    const older = snapshot.slice(0, compactCount);
+    // 关键点（中文）：明确 compact 时归档全部当前模型历史，避免单条巨大 assistant 永远留在 Active。
+    const older = snapshot;
     if (older.length === 0)
         return { compacted: false, reason: "nothing_to_compact" };
     action_started = true;
@@ -150,8 +136,7 @@ export async function compactSessionMessagesIfNeeded(deps, params) {
         // snapshotTailId 用于 debug，不作为强一致性依赖。
         void snapshotTailId;
         const current_model_messages = current.filter(is_session_message_record);
-        const currentCompactCount = resolveCompactCount(current_model_messages.length, compactRatio);
-        const currentOlder = current_model_messages.slice(0, currentCompactCount);
+        const currentOlder = current_model_messages;
         if (currentOlder.length === 0)
             return;
         const compacted_ids = new Set(currentOlder
@@ -188,43 +173,6 @@ export async function compactSessionMessagesIfNeeded(deps, params) {
     }
     return { compacted: true };
 }
-/**
- * 归一化压缩比例。
- *
- * 关键点（中文）
- * - 仅允许 0.1~0.9，避免“几乎不压缩”或“几乎全压缩”。
- */
-function normalizeCompactRatio(value) {
-    if (!Number.isFinite(value))
-        return 0.5;
-    return Math.max(0.1, Math.min(0.9, value));
-}
-/**
- * 按比例计算前段压缩条数。
- *
- * 关键点（中文）
- * - 至少压缩 1 条；
- * - 至少保留 1 条未压缩消息。
- */
-function resolveCompactCount(total, ratio) {
-    const n = Math.max(0, Math.floor(total));
-    if (n <= 1)
-        return 0;
-    const raw = Math.floor(n * ratio);
-    return Math.max(1, Math.min(n - 1, raw));
-}
-/**
- * 近似 token 估算。
- *
- * 算法说明（中文）
- * - 这里使用经验近似，不追求精确 tokenizer 一致性。
- * - 目标是为 compact 提供保守预算，宁可略高估也不要低估。
- */
-function estimateTokensApproxFromText(text) {
-    const t = String(text || "");
-    // 经验值：英文 ~4 chars/token；中文更接近 1-2 chars/token。这里用保守的 3 chars/token。
-    return Math.ceil(t.length / 3);
-}
 /**
  * 从 UIMessage 提取可摘要的纯文本。
  *

package/bin/executor/composer/compaction/jsonl/JsonlSessionCompactionExecutor.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"JsonlSessionCompactionExecutor.js","sourceRoot":"","sources":["../../../../../src/executor/composer/compaction/jsonl/JsonlSessionCompactionExecutor.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EACL,YAAY,EACZ,YAAY,GAGb,MAAM,IAAI,CAAC;AACZ,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAOrD,OAAO,EACL,yBAAyB,GAC1B,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EACL,yCAAyC,EACzC,uCAAuC,EACvC,sCAAsC,EACtC,gCAAgC,GACjC,MAAM,sEAAsE,CAAC;AAC9E,OAAO,EAAE,yCAAyC,EAAE,MAAM,6EAA6E,CAAC;~~AA2BxI~~;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAClD,IAAwB,EACxB,MAA4B;IAE5B,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAChD,MAAM,SAAS,GAAG,cAAc,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE,IAAI,UAAU,EAAE,EAAE,CAAC;IAC/E,IAAI,cAAc,GAAG,KAAK,CAAC;IAE3B,MAAM,cAAc,GAAG,KAAK,EAC1B,MAA+D,EAChD,EAAE;QACjB,IAAI,OAAO,MAAM,CAAC,QAAQ,KAAK,UAAU;YAAE,OAAO;QAClD,MAAM,MAAM,CAAC,QAAQ,CAAC;YACpB,IAAI,EAAE,QAAQ;YACd,EAAE,EAAE,SAAS;YACb,GAAG,MAAM;YACT,QAAQ,EAAE;gBACR,CAAC,EAAE,CAAC;gBACJ,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE;gBACd,SAAS,EAAE,IAAI,CAAC,SAAS;aAC1B;SACF,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,WAAW;IACX,uBAAuB;IACvB,yBAAyB;IACzB,mBAAmB;IACnB,IAAI,QAAQ,GAA6B,EAAE,CAAC;IAC5C,IAAI,cAAc,GAAG,EAAE,CAAC;IACxB,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,IAAI,EAAE;QAClC,QAAQ,GAAG,CAAC,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,yBAAyB,CAAC,CAAC;QACpE,cAAc;YACZ,QAAQ,CAAC,MAAM,GAAG,CAAC;gBACjB,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;gBAChD,CAAC,CAAC,EAAE,CAAC;IACX,CAAC,CAAC,CAAC;IAEH,IAAI,QAAQ,CAAC,MAAM,~~GAAG~~,CAAC,EAAE,CAAC;~~QACxB~~,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,~~gBAAgB~~,EAAE,CAAC;~~IACxD~~,CAAC;~~IAED~~,~~MAAM,UAAU,GAAG,CAAC,MAAM,CAAC,MAAM,~~IAAI,~~EAAE,~~CAAC~~;SACrC~~,~~GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,~~MAAM,CAAC,~~CAAC~~,~~CAAC,OAAO,IAAI,~~EAAE,CAAC~~,CAAC~~;~~SACnC~~,IAAI,CAAC,MAAM,CAAC,CAAC;IAChB,+EAA+E;IAC/E,IAAI,YAAY,GAAG,EAAE,CAAC;IACtB,IAAI,CAAC;QACH,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IAC1C,CAAC;IAAC,MAAM,CAAC;QACP,YAAY,GAAG,EAAE,CAAC;IACpB,CAAC;IACD,MAAM,GAAG,GAAG,4BAA4B,CAAC,UAAU,GAAG,MAAM,GAAG,YAAY,CAAC,CAAC;IAC7E,IAAI,GAAG,IAAI,MAAM,CAAC,oBAAoB,EAAE,CAAC;QACvC,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,~~cAAc~~,EAAE,CAAC;~~IACtD~~,CAAC;IAED~~,8CAA8C~~;~~IAC9C~~,MAAM,~~YAAY,GAAG,qBAAqB,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAChE,MAAM,YAAY,GAAG,mBAAmB,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACxE,MAAM,~~KAAK,GAAG,QAAQ,CAAC~~,KAAK,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC~~;~~IAC9C~~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~~mBAAmB,GAAG,mBAAmB,CAC7C,sBAAsB,CAAC,MAAM,EAC7B,~~YAAY,~~CACb,CAAC;QACF,MAAM,YAAY,~~GAAG,sBAAsB,CAAC~~,KAAK,CAAC,CAAC,EAAE,mBAAmB,CAAC,CAAC~~;~~QAC1E~~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~~IAAY;IAChD,MAAM,CAAC,GAAG,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;IAC7B,oEAAoE;IACpE,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AACjC,CAAC;AAED;;;;;;GAMG;AACH,SAAS,4BAA4B,CAAC,~~QAAkC;IACtE,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;QACzB,IAAI,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ;YAAE,SAAS;QAC1C,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC;QACtD,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;QACpD,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;QAC9E,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;QACzC,IAAI,CAAC,IAAI;YAAE,SAAS;QACpB,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,KAAK,IAAI,EAAE,CAAC,CAAC;IACjC,CAAC;IACD,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC;AAED;;;;;;GAMG;AACH,SAAS,mCAAmC,CAC1C,OAA2C;IAE3C,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ;QAAE,OAAO,EAAE,CAAC;IACvD,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;IAClC,IAAI,QAAQ,EAAE,MAAM,KAAK,SAAS,IAAI,QAAQ,CAAC,IAAI,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IAC7E,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IAChE,OAAO,KAAK;SACT,MAAM,CAAC,YAAY,CAAC;SACpB,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;SACtC,IAAI,CAAC,IAAI,CAAC;SACV,IAAI,EAAE,CAAC;AACZ,CAAC"}
1	+ {"version":3,"file":"JsonlSessionCompactionExecutor.js","sourceRoot":"","sources":["../../../../../src/executor/composer/compaction/jsonl/JsonlSessionCompactionExecutor.ts"],"names":[],"mappings":"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"}