@myassis/gateway 1.0.98 → 1.0.99

package/dist/config/index.js

@@ -116,7 +116,10 @@ exports.appConfig = {
      * 体积完全可能在轮内涨破预算。超过此阈值就在轮内先做摘要，
      * 而不是等到裁剪到最重级别仍超限、把整轮请求打断。
      */
-    turnCompactTriggerChars: parseInt(process.env.TURN_COMPACT_TRIGGER_CHARS || '144000', 10),
+    /** 模型 maxTokens 缺失时的轮内压缩兜底阈值（字符） */
+    turnCompactTriggerChars: parseInt(process.env.TURN_COMPACT_TRIGGER_CHARS || '1000000', 10),
+    /** 轮内压缩阈值占模型上下文窗口的百分比（对齐 Codex 的 90%） */
+    turnCompactTriggerPercent: parseInt(process.env.TURN_COMPACT_TRIGGER_PERCENT || '90', 10),
     /** 轮内压缩时保留原文的最近工具调用轮数 */
     turnCompactKeepPairs: parseInt(process.env.TURN_COMPACT_KEEP_PAIRS || '2', 10),
     /** 单轮请求内最多做几次轮内压缩，防止摘要模型被反复调用 */

package/dist/services/memory/ContextBuilder.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.nextTrimLevel = exports.planTurnCompaction = exports.buildContext = exports.estimateTokens = exports.estimateChars = exports.TrimLevel = void 0;
+exports.nextTrimLevel = exports.planTurnCompaction = exports.buildContext = exports.estimateTokens = exports.estimateChars = exports.TrimLevel = exports.CHARS_PER_TOKEN = void 0;
 const shared_1 = require("@myassis/shared");
 const index_js_1 = require("../../config/index.js");
 const ToolLedger_js_1 = require("./ToolLedger.js");
@@ -14,7 +14,7 @@ const logger = (0, shared_1.getLogger)('ContextBuilder');
  * 关键约束：本模块只对 *投影副本* 做裁剪，绝不修改会话持久化数据。
  */
 /** 中英混合场景下的粗略 token 估算系数 */
-const CHARS_PER_TOKEN = 1.6;
+exports.CHARS_PER_TOKEN = 1.6;
 /** 骨架化后单条工具结果保留的长度 */
 const SKELETON_OUTPUT_LIMIT = 120;
 /**
@@ -76,7 +76,7 @@ function estimateChars(messages) {
 exports.estimateChars = estimateChars;
 /** 估算 token 数（粗略） */
 function estimateTokens(messages) {
-    return Math.ceil(estimateChars(messages) / CHARS_PER_TOKEN);
+    return Math.ceil(estimateChars(messages) / exports.CHARS_PER_TOKEN);
 }
 exports.estimateTokens = estimateTokens;
 /** 按上限截断字符串，保留可读提示 */

package/dist/services/models.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toSystemModel = exports.toModel = void 0;
+exports.toSystemModel = exports.toModel = exports.DEFAULT_CONTEXT_WINDOW = void 0;
+/** 未知模型的默认上下文窗口（对齐 Codex 的 fallback 272000 tokens） */
+exports.DEFAULT_CONTEXT_WINDOW = 272000;
 function toModel(m) {
     return {
         id: String(m.id),
@@ -10,7 +12,7 @@ function toModel(m) {
         type: m.type || 'chat',
         description: m.description || '',
         capabilities: m.capabilities || [],
-        maxTokens: m.maxTokens || 0,
+        maxTokens: m.maxTokens || exports.DEFAULT_CONTEXT_WINDOW,
         isActive: m.isActive,
         baseUrl: m.baseUrl,
         score: m.score || 0,
@@ -27,7 +29,7 @@ function toSystemModel(m) {
         type: m.type || 'chat',
         description: m.description || '',
         capabilities: m.capabilities || [],
-        maxTokens: m.maxTokens || 0,
+        maxTokens: m.maxTokens || exports.DEFAULT_CONTEXT_WINDOW,
         isActive: 1,
         baseUrl: m.baseUrl,
         score: m.score || 0,

package/dist/services/session/Session.js

@@ -925,6 +925,13 @@ class Session {
         const models = this.useSystemMode
             ? (await dataService_js_1.modelsService.listSystem()).data.map(x => (0, models_js_1.toSystemModel)(x))
             : (await dataService_js_1.modelsService.list(token)).data.map(x => (0, models_js_1.toModel)(x));
+        // 轮内压缩阈值：优先按当前模型上下文窗口的百分比（对齐 Codex 的 90%），
+        // 模型未声明 maxTokens 时回退到固定字符阈值。
+        const activeModel = models.find(m => m.modelId === this.selectModelId || m.id === this.selectModelId) || models[0];
+        const modelMaxTokens = activeModel?.maxTokens || 0;
+        const turnCompactTokenThreshold = modelMaxTokens > 0
+            ? Math.floor(modelMaxTokens * index_js_2.appConfig.turnCompactTriggerPercent / 100)
+            : Math.floor(index_js_2.appConfig.turnCompactTriggerChars / ContextBuilder_js_1.CHARS_PER_TOKEN);
         // 工具调用轮次计数，防止无限循环
         let toolRound = 0;
         // 达到工具轮上限后置位：强制模型停止调用工具、直接产出最终回复
@@ -1010,7 +1017,7 @@ class Session {
             while (true) {
                 // 预防式压缩：等到厂商报超限才处理已经太晚（那意味着一次废掉的请求，
                 // 且部分厂商在超限时返回的是难以识别的 400），这里提前把体积降下来。
-                if ((0, ContextBuilder_js_1.estimateChars)(messages) > index_js_2.appConfig.turnCompactTriggerChars) {
+                if ((0, ContextBuilder_js_1.estimateTokens)(messages) > turnCompactTokenThreshold) {
                     await compactInTurn();
                 }
                 const built = (0, ContextBuilder_js_1.buildContext)(messages, messagesLength, index_js_2.appConfig.contextMaxChars, trimLevel);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myassis/gateway",
-  "version": "1.0.98",
+  "version": "1.0.99",
   "description": "我的助手 Gateway Service - 本地 AI 网关服务，支持认证、WebSocket 实时通信和任务调度",
   "main": "dist/index.js",
   "bin": {