@downcity/agent 1.1.408 → 1.1.437

package/bin/executor/core-engine/CoreEngineContextCompaction.js

@@ -1,18 +1,11 @@
 /**
  * CoreEngine Downcity 模型上下文压缩模块。
  *
- * 压缩基于标准 ModelMessage，保留 system、最新 user 及其后的完整工具事务。
+ * 本模块只判断真实 Provider usage 是否达到恢复阈值；具体选择、摘要和持久化全部
+ * 归属于 SessionComposer 的 Context Policy。
  */
 /** usage 达到模型上下文窗口 95% 时安排下一 step 压缩。 */
 export const MODEL_CONTEXT_COMPACTION_TRIGGER_RATIO = 0.95;
-/** 压缩后的真实 usage 需要回落到模型上下文窗口 50% 以内。 */
-export const MODEL_CONTEXT_COMPACTION_TARGET_RATIO = 0.5;
-/** 历史 checkpoint 的基础最大字符数。 */
-const INITIAL_HISTORY_CHECKPOINT_CHARS = 24_000;
-/** 单条保留消息的基础字符预算。 */
-const INITIAL_RETAINED_MESSAGE_CHARS = 16_000;
-/** 折叠后至少保留的字符数。 */
-const MIN_FOLDED_PART_CHARS = 64;
 /** 读取 Provider usage 中的实际总 token。 */
 export function resolve_model_usage_tokens(usage) {
     if (!usage || typeof usage !== "object")
@@ -35,129 +28,10 @@ export function resolve_model_usage_ratio(usage, context_window) {
     return used_tokens === null ? null : used_tokens / Number(context_window);
 }
 /** 判断一次真实 usage 是否要求下一 step 继续压缩。 */
-export function should_compact_after_usage(usage_ratio, validating_compaction) {
+export function should_compact_after_usage(usage_ratio) {
     if (usage_ratio === null || !Number.isFinite(usage_ratio))
         return false;
-    return validating_compaction
-        ? usage_ratio > MODEL_CONTEXT_COMPACTION_TARGET_RATIO
-        : usage_ratio >= MODEL_CONTEXT_COMPACTION_TRIGGER_RATIO;
-}
-/** 对当前模型消息做一次确定性深度压缩。 */
-export function deep_compact_model_messages(messages, compact_depth = 0) {
-    if (!Array.isArray(messages) || messages.length === 0)
-        return [];
-    const depth = Math.max(0, Math.min(8, Math.floor(compact_depth)));
-    const last_user_index = find_last_user_index(messages);
-    if (depth === 0) {
-        const limit = resolve_depth_budget(INITIAL_RETAINED_MESSAGE_CHARS, depth);
-        return messages.flatMap((message, index) => {
-            const compacted = compact_message(message, limit, index >= last_user_index);
-            return compacted ? [compacted] : [];
-        });
-    }
-    const system_messages = messages.filter((message) => message.role === "system");
-    const retained_start = last_user_index >= 0 ? last_user_index : Math.max(0, messages.length - 2);
-    const history = messages.filter((message, index) => message.role !== "system" && index < retained_start);
-    const retained = messages.filter((message, index) => message.role !== "system" && index >= retained_start);
-    const checkpoint = build_checkpoint(history, resolve_depth_budget(INITIAL_HISTORY_CHECKPOINT_CHARS, depth));
-    const limit = resolve_depth_budget(INITIAL_RETAINED_MESSAGE_CHARS, depth);
-    return [
-        ...system_messages.flatMap((message) => {
-            const compacted = compact_message(message, limit, false);
-            return compacted ? [compacted] : [];
-        }),
-        ...(checkpoint ? [{ role: "assistant", content: [{ type: "text", text: checkpoint }] }] : []),
-        ...retained.flatMap((message) => {
-            const compacted = compact_message(message, limit, true);
-            return compacted ? [compacted] : [];
-        }),
-    ];
-}
-/** 对文本做确定性的 head/tail 折叠。 */
-export function fold_compacted_text(text, max_chars) {
-    const value = String(text || "");
-    const limit = Math.max(MIN_FOLDED_PART_CHARS, Math.floor(max_chars));
-    if (value.length <= limit)
-        return value;
-    const marker = `\n...[compacted ${String(value.length - limit)} chars]...\n`;
-    const available = Math.max(0, limit - marker.length);
-    const head = Math.ceil(available / 2);
-    return `${value.slice(0, head)}${marker}${value.slice(-(available - head))}`;
-}
-/** 压缩单条消息中的高体积内容。 */
-function compact_message(message, max_chars, keep_tools) {
-    const part_limit = Math.max(MIN_FOLDED_PART_CHARS, Math.floor(max_chars / Math.max(1, message.content.length)));
-    const content = message.content.flatMap((part) => {
-        // 推理过程不属于压缩后仍需保留的稳定事实。
-        if (part.type === "reasoning")
-            return [];
-        if (part.type === "text") {
-            return [{ ...part, text: fold_compacted_text(part.text, part_limit) }];
-        }
-        if (part.type === "tool_call" && !keep_tools)
-            return [];
-        if (part.type === "tool_result") {
-            if (!keep_tools)
-                return [];
-            return [{
-                    ...part,
-                    content: part.content.map((result_part) => {
-                        if (result_part.type === "text") {
-                            return {
-                                ...result_part,
-                                text: fold_compacted_text(result_part.text, part_limit),
-                            };
-                        }
-                        if (result_part.type !== "json")
-                            return result_part;
-                        const serialized = JSON.stringify(result_part.value);
-                        if (serialized.length <= part_limit)
-                            return result_part;
-                        return {
-                            type: "json",
-                            value: {
-                                compacted: true,
-                                preview: fold_compacted_text(serialized, part_limit),
-                            },
-                        };
-                    }),
-                }];
-        }
-        return [part];
-    });
-    if (content.length === 0)
-        return undefined;
-    return { ...message, content };
-}
-/** 生成历史 checkpoint 文本。 */
-function build_checkpoint(messages, max_chars) {
-    const text = messages.map((message) => {
-        const content = message.content.map((part) => {
-            if (part.type === "text")
-                return part.text;
-            if (part.type === "reasoning")
-                return "";
-            if (part.type === "file")
-                return `[file ${part.media_type}${part.filename ? ` ${part.filename}` : ""}]`;
-            if (part.type === "tool_call")
-                return `[tool_call ${part.tool_name}]`;
-            return `[tool_result ${part.tool_name} ${part.outcome}]`;
-        }).join("\n");
-        return `${message.role}: ${content}`;
-    }).join("\n\n");
-    return text ? `Earlier conversation checkpoint:\n${fold_compacted_text(text, max_chars)}` : "";
-}
-/** 查找最新用户消息索引。 */
-function find_last_user_index(messages) {
-    for (let index = messages.length - 1; index >= 0; index -= 1) {
-        if (messages[index]?.role === "user")
-            return index;
-    }
-    return -1;
-}
-/** 按压缩深度计算当前字符预算。 */
-function resolve_depth_budget(initial_budget, depth) {
-    return Math.max(MIN_FOLDED_PART_CHARS, Math.floor(initial_budget / (2 ** depth)));
+    return usage_ratio >= MODEL_CONTEXT_COMPACTION_TRIGGER_RATIO;
 }
 /** 读取非负数字。 */
 function read_non_negative_number(value) {

package/bin/executor/core-engine/CoreEngineContextCompaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"CoreEngineContextCompaction.js","sourceRoot":"","sources":["../../../src/executor/core-engine/CoreEngineContextCompaction.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CoreEngineContextCompaction.js","sourceRoot":"","sources":["../../../src/executor/core-engine/CoreEngineContextCompaction.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,yCAAyC;AACzC,MAAM,CAAC,MAAM,sCAAsC,GAAG,IAAI,CAAC;AAE3D,qCAAqC;AACrC,MAAM,UAAU,0BAA0B,CAAC,KAAc;IACvD,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC;IACrD,MAAM,MAAM,GAAG,KAAgC,CAAC;IAChD,MAAM,YAAY,GAAG,wBAAwB,CAAC,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,WAAW,CAAC,CAAC;IACzF,IAAI,YAAY,KAAK,IAAI;QAAE,OAAO,YAAY,CAAC;IAC/C,MAAM,YAAY,GAAG,wBAAwB,CAAC,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,WAAW,CAAC,CAAC;IACzF,MAAM,aAAa,GAAG,wBAAwB,CAAC,MAAM,CAAC,aAAa,IAAI,MAAM,CAAC,YAAY,CAAC,CAAC;IAC5F,IAAI,YAAY,KAAK,IAAI,IAAI,aAAa,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IACjE,OAAO,CAAC,YAAY,IAAI,CAAC,CAAC,GAAG,CAAC,aAAa,IAAI,CAAC,CAAC,CAAC;AACpD,CAAC;AAED,gCAAgC;AAChC,MAAM,UAAU,yBAAyB,CACvC,KAAc,EACd,cAAkC;IAElC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,cAAc,CAAC,IAAI,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACtF,MAAM,WAAW,GAAG,0BAA0B,CAAC,KAAK,CAAC,CAAC;IACtD,OAAO,WAAW,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;AAC5E,CAAC;AAED,qCAAqC;AACrC,MAAM,UAAU,0BAA0B,CACxC,WAA0B;IAE1B,IAAI,WAAW,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC;QAAE,OAAO,KAAK,CAAC;IACxE,OAAO,WAAW,IAAI,sCAAsC,CAAC;AAC/D,CAAC;AAED,cAAc;AACd,SAAS,wBAAwB,CAAC,KAAc;IAC9C,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;AAC1F,CAAC"}

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

@@ -5,7 +5,7 @@
  * - 模型流的最终错误可能只是兜底包装，底层 Provider 错误应优先保留。
  * - Executor 内部 CoreEngine 流程只需要消费这里输出的日志字段与最终错误文本。
  */
-import type { JsonObject } from "../../types/common/Json.js";
+import type { JsonObject } from "@downcity/type";
 /**
  * 归一化 stream 错误日志字段。
  */

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

@@ -1 +1 @@
-{"version":3,"file":"CoreEngineError.d.ts","sourceRoot":"","sources":["../../../src/executor/core-engine/CoreEngineError.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,OAAO,GAAG,UAAU,CAYjE;AAED;;GAEG;AACH,wBAAgB,mCAAmC,CAAC,MAAM,EAAE;IAC1D;;OAEG;IACH,KAAK,EAAE,OAAO,CAAC;IACf;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,GAAG,MAAM,CAOT"}
+{"version":3,"file":"CoreEngineError.d.ts","sourceRoot":"","sources":["../../../src/executor/core-engine/CoreEngineError.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEjD;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,OAAO,GAAG,UAAU,CAYjE;AAED;;GAEG;AACH,wBAAgB,mCAAmC,CAAC,MAAM,EAAE;IAC1D;;OAEG;IACH,KAAK,EAAE,OAAO,CAAC;IACf;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,GAAG,MAAM,CAOT"}

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

@@ -5,7 +5,7 @@
  * - 把 “是否继续下一轮” 的分支优先级从 CoreEngine 主流程中拆出。
  * - 保持纯函数，不依赖模型、持久化或 logger，便于直接测试。
  */
-import type { SessionLoopDecision, SessionLoopDecisionInput, SessionTailMergeContinuationInput } from "../types/SessionLoop.js";
+import type { SessionLoopDecision, SessionLoopDecisionInput, SessionTailMergeContinuationInput } from "../../executor/types/SessionLoop.js";
 /**
  * 评估当前 step 完成后，tool-loop 是否应继续下一轮。
  *

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

@@ -2,11 +2,10 @@
  * CoreEngineRunner：模型与 tool-loop 主循环执行器。
  *
  * 关键点（中文）
- * - 只负责单次已装配输入的执行，不负责外层运行上下文、重试与历史准备。
- * - 把 step 循环、续写恢复、最终 assistant 汇总等细节从 Executor 中剥离。
+ * - 每个 Provider Step 都通过回调取得 Composer 生成的完整输入。
+ * - 只负责 step 循环、续写恢复与最终 assistant 汇总，不持有历史副本。
  * - 保持失败返回结构稳定，避免对外 Session 行为变化。
  */
-import type { ModelClient, ModelMessage } from "@downcity/type";
 import type { Logger } from "../../utils/logger/Logger.js";
 import type { SessionTurnContext } from "../../types/executor/SessionTurnContext.js";
 import type { SessionStepExecutionInput, SessionTurnExecutionResult } from "../../types/session/SessionExecution.js";
@@ -23,14 +22,6 @@ interface CoreEngineRunnerOptions {
     should_compact_on_error: (error: unknown) => boolean;
 }
 interface CoreEngineTurnInput {
-    /**
-     * 已装配好的执行输入。
-     */
-    execute_input: SessionStepExecutionInput;
-    /**
-     * 当前轮模型实例。
-     */
-    model: ModelClient;
     /**
      * 当前显式运行上下文。
      */
@@ -38,23 +29,7 @@ interface CoreEngineTurnInput {
     /**
      * 在统一输入队列提交后解析当前 Session step 的 effective 配置。
      */
-    resolve_step_inputs: () => Promise<{
-        /** 当前 Session step 使用的模型。 */
-        model: ModelClient;
-        /** 当前 Session step 使用的 system messages。 */
-        system: SessionStepExecutionInput["system"];
-        /** 当前 Session step 使用的工具集合。 */
-        tools: SessionStepExecutionInput["tools"];
-        /** 当前 Session step 模型支持的总上下文窗口长度。 */
-        context_window?: number;
-    }>;
-    /** 持久化 compact 后重新读取 Composer 生成的模型历史与 Summary 身份。 */
-    reload_history: () => Promise<{
-        /** Composer 重新生成的标准模型消息。 */
-        messages: ModelMessage[];
-        /** 当前模型历史包含的最新持久化 Summary 标识。 */
-        summary_id?: string;
-    }>;
+    resolve_step_input: () => Promise<SessionStepExecutionInput>;
 }
 /**
  * 模型与 tool-loop 主循环执行器。
@@ -63,8 +38,6 @@ export declare class CoreEngineRunner {
     private readonly session_id;
     private readonly logger;
     private readonly should_compact_on_error;
-    /** 最近一次已经通过真实 usage 验收的持久化 Summary 标识。 */
-    private validated_compaction_summary_id;
     constructor(options: CoreEngineRunnerOptions);
     /**
      * 执行一次已装配完成的模型/tool-loop 运行。

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

@@ -1 +1 @@
-{"version":3,"file":"CoreEngineRunner.d.ts","sourceRoot":"","sources":["../../../src/executor/core-engine/CoreEngineRunner.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAkChE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAEjF,OAAO,KAAK,EACV,yBAAyB,EACzB,0BAA0B,EAC3B,MAAM,qCAAqC,CAAC;AAgB7C,UAAU,uBAAuB;IAC/B,uBAAuB;IACvB,UAAU,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,uBAAuB,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC;CACtD;AAED,UAAU,mBAAmB;IAC3B;;OAEG;IACH,aAAa,EAAE,yBAAyB,CAAC;IAEzC;;OAEG;IACH,KAAK,EAAE,WAAW,CAAC;IAEnB;;OAEG;IACH,YAAY,EAAE,kBAAkB,CAAC;IAEjC;;OAEG;IACH,mBAAmB,EAAE,MAAM,OAAO,CAAC;QACjC,6BAA6B;QAC7B,KAAK,EAAE,WAAW,CAAC;QACnB,2CAA2C;QAC3C,MAAM,EAAE,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QAC5C,+BAA+B;QAC/B,KAAK,EAAE,yBAAyB,CAAC,OAAO,CAAC,CAAC;QAC1C,qCAAqC;QACrC,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,CAAC,CAAC;IAEH,sDAAsD;IACtD,cAAc,EAAE,MAAM,OAAO,CAAC;QAC5B,4BAA4B;QAC5B,QAAQ,EAAE,YAAY,EAAE,CAAC;QACzB,iCAAiC;QACjC,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC,CAAC;CACJ;AAED;;GAEG;AACH,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAqD;IAE7F,0CAA0C;IAC1C,OAAO,CAAC,+BAA+B,CAAM;gBAEjC,OAAO,EAAE,uBAAuB;IAS5C;;OAEG;IACG,OAAO,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,0BAA0B,CAAC;CA+Z/E"}
+{"version":3,"file":"CoreEngineRunner.d.ts","sourceRoot":"","sources":["../../../src/executor/core-engine/CoreEngineRunner.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAgCH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAEjF,OAAO,KAAK,EACV,yBAAyB,EACzB,0BAA0B,EAC3B,MAAM,qCAAqC,CAAC;AAO7C,UAAU,uBAAuB;IAC/B,uBAAuB;IACvB,UAAU,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,uBAAuB,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC;CACtD;AAED,UAAU,mBAAmB;IAC3B;;OAEG;IACH,YAAY,EAAE,kBAAkB,CAAC;IAEjC;;OAEG;IACH,kBAAkB,EAAE,MAAM,OAAO,CAAC,yBAAyB,CAAC,CAAC;CAC9D;AAED;;GAEG;AACH,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAqD;gBAEjF,OAAO,EAAE,uBAAuB;IAS5C;;OAEG;IACG,OAAO,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,0BAA0B,CAAC;CA4S/E"}