@myassis/gateway 1.0.106 → 1.0.108

package/dist/config/index.js

@@ -100,7 +100,7 @@ exports.appConfig = {
     /** 摘要后保留的原始历史消息条数 */
     historyKeep: parseInt(process.env.HISTORY_KEEP || '4', 10),
     /** 保留完整输出的最近工具调用轮数 */
-    toolPairKeep: parseInt(process.env.TOOL_PAIR_KEEP || '2', 10),
+    toolPairKeep: parseInt(process.env.TOOL_PAIR_KEEP || '4', 10),
     /** 极端裁剪时至少保留的工具调用轮数 */
     minToolPairKeep: 2,
     /** 单次请求上下文字符预算（LLMClient 硬上限为 200000，此处留出余量） */
@@ -121,7 +121,7 @@ exports.appConfig = {
     /** 模型上下文窗口的可用百分比（折算为字符预算，对齐 Codex 的 90%） */
     turnCompactTriggerPercent: parseInt(process.env.TURN_COMPACT_TRIGGER_PERCENT || '90', 10),
     /** 轮内压缩时保留原文的最近工具调用轮数 */
-    turnCompactKeepPairs: parseInt(process.env.TURN_COMPACT_KEEP_PAIRS || '2', 10),
+    turnCompactKeepPairs: parseInt(process.env.TURN_COMPACT_KEEP_PAIRS || '4', 10),
     /** 单轮请求内最多做几次轮内压缩，防止摘要模型被反复调用 */
     maxInTurnCompactions: parseInt(process.env.MAX_IN_TURN_COMPACTIONS || '4', 10),
     /** 模型瞬时故障（空回复 / 超时 / 网络抖动）的自动重试次数 */

package/dist/services/memory/ContextBuilder.js

@@ -200,6 +200,9 @@ function clipPair(messages, pair, limit, sessionId) {
     // 以避免在「未真正裁剪」时产生无提示可引用的孤儿存档。
     if (Array.isArray(head.tool_calls)) {
         for (const tc of head.tool_calls) {
+            const tcName = tc?.toolName || tc?.function?.name;
+            if (tcName === 'updatePlan')
+                continue;
             tc.input = clipJsonArguments(tc.input, limit);
             if (tc.function) {
                 tc.function.arguments = clipJsonArguments(tc.function.arguments, limit);
@@ -210,6 +213,8 @@ function clipPair(messages, pair, limit, sessionId) {
         const msg = messages[i];
         if (!msg || typeof msg.content !== 'string')
             continue;
+        if (msg.tool_call_name === 'updatePlan')
+            continue; // plan state must stay intact
         const original = msg.content;
         if (original.length <= limit)
             continue; // 仅当真正被截断才归档 + 提示
@@ -319,6 +324,9 @@ function skeletonizePair(messages, pair, sessionId) {
                     toolName: tc?.toolName || tc?.function?.name || 'unknown',
                 });
             }
+            const tcName = tc?.toolName || tc?.function?.name;
+            if (tcName === 'updatePlan')
+                continue;
             tc.input = skeletonArguments(tc.input);
             if (tc.function) {
                 tc.function.arguments = skeletonArguments(tc.function.arguments);
@@ -329,6 +337,8 @@ function skeletonizePair(messages, pair, sessionId) {
         const msg = messages[i];
         if (!msg)
             continue;
+        if (msg.tool_call_name === 'updatePlan')
+            continue;
         const original = typeof msg.content === 'string' ? msg.content : JSON.stringify(msg.content ?? '');
         // 骨架化总是有损，但仅在原文较长时值得归档 + 提示
         if (original.length <= SKELETON_OUTPUT_LIMIT) {

package/dist/services/session/Session.js

@@ -898,6 +898,7 @@ class Session {
             }
         }
         systemPrompt = await (0, systemPrompt_js_1.getSystemPromptAsync)(agent, systemPrompt);
+        systemPrompt += '\n【防重复规则】1.不要重复执行已经成功完成的工具调用。若工具结果被截断（标记为内容过长已截断或完整结果请调阅detailTool），必须先用detailTool获取完整内容，切勿重新执行原工具。2.完成阶段性目标后（如编辑验证通过、提交代码后）直接总结结果回复用户，不要重新检查已解决的问题。';
         if (messages.some(x => x.role === 'system')) {
             messages = messages.map(m => m.role == 'system' ? { ...m, content: systemPrompt + '\n以下为之前对话内容摘要：\n' + m.content } : m);
         }
@@ -1397,6 +1398,11 @@ class Session {
                     };
                     messages.push(toolResultMessage);
                 }
+                // 每轮注入简短计划状态，防止上下文裁剪导致模型丢失计划而重新创建
+                if (this.plan.length > 0 && !this.isPlanCompleted()) {
+                    const planStatus = this.plan.map((s, i) => (i + 1) + '.' + s.step + '[' + s.status + ']').join('; ');
+                    messages.push({ role: 'user', content: '[计划状态] ' + planStatus, attachments: [] });
+                }
                 // 计划模式：模型常常只在开头和结尾调用 updatePlan，中间过程不同步进度。
                 // 这里在已有计划且连续多轮未同步时，主动注入一条提醒，迫使模型推进计划状态。
                 const reminder = this.buildPlanReminder(roundsSincePlanUpdate, forceFinalize);

package/package.json

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

package/scripts/pkg-build-win.js

@@ -1,64 +1,64 @@
-#!/usr/bin/env node
-// pkg-build-win.js - Windows pkg build using PKG_CACHE_PATH
-// Points to ~/.pkg-cache which contains the correct v3.6 patched binary (40.6 MB, hash matches)
-'use strict';
-const { spawn } = require('child_process');
-const path = require('path');
-const os = require('os');
-const fs = require('fs');
-
-const TARGET = process.argv[2] || 'node18-win-x64';
-const OUTPUT = process.argv[3] || 'myassis-gateway-win.exe';
-
-const CACHE_DIR = path.join(os.homedir(), '.pkg-cache');
-const PKG_BIN = path.resolve(__dirname, '../node_modules/@yao-pkg/pkg/lib-es5/bin.js');
-
-function log(msg) { console.error('[pkg-build] ' + msg); }
-
-/** 根据 target (如 node24-win-x64) 在缓存目录中找到匹配的二进制 */
-function findCachedBinary(target) {
-  const m = target.match(/^node(\d+)-(.+)$/);
-  if (!m) return null;
-  const [, major, plat] = m;
-  const v36dir = path.join(CACHE_DIR, 'v3.6');
-  if (!fs.existsSync(v36dir)) return null;
-  const candidates = fs.readdirSync(v36dir)
-    .filter(f => new RegExp(`^fetched-v${major}\\.\\d+\\.\\d+-${plat}$`).test(f))
-    .sort()
-    .reverse();
-  return candidates.length > 0 ? path.join(v36dir, candidates[0]) : null;
-}
-
-async function main() {
-    log(`Building for ${TARGET}`);
-    log(`Output: ${OUTPUT}`);
-
-    // Verify cached binary exists (dynamically match by target)
-    const cachedBinary = findCachedBinary(TARGET);
-    if (!cachedBinary) {
-        log(`ERROR: No cached binary found for target ${TARGET} in ${CACHE_DIR}`);
-        log(`Please run: node node_modules/@yao-pkg/pkg/lib-es5/bin.js --targets ${TARGET} first`);
-        process.exit(1);
-    }
-    const size = (fs.statSync(cachedBinary).size / 1024 / 1024).toFixed(1);
-    log(`Using cached binary: ${cachedBinary} (${size} MB)`);
-
-    // Use PKG_CACHE_PATH so pkg-fetch finds the correct v3.6 binary by hash
-    const env = { ...process.env };
-    delete env.PKG_NODE_PATH;  // MUST NOT use PKG_NODE_PATH - it bypasses placeholders check
-    env.PKG_CACHE_PATH = CACHE_DIR;
-    log(`PKG_CACHE_PATH=${CACHE_DIR}`);
-
-    log('Starting pkg...');
-    return new Promise((resolve) => {
-        const child = spawn(process.execPath, [PKG_BIN, '.', '--targets', TARGET, '--output', OUTPUT], {
-            cwd: path.resolve(__dirname, '..'),
-            env,
-            stdio: 'inherit'
-        });
-        child.on('exit', (code) => process.exit(code || 0));
-        child.on('error', (e) => { log('Spawn error: ' + e.message); process.exit(1); });
-    });
-}
-
-main().catch(e => { console.error('[pkg-build] Fatal:', e.message); process.exit(1); });
+#!/usr/bin/env node
+// pkg-build-win.js - Windows pkg build using PKG_CACHE_PATH
+// Points to ~/.pkg-cache which contains the correct v3.6 patched binary (40.6 MB, hash matches)
+'use strict';
+const { spawn } = require('child_process');
+const path = require('path');
+const os = require('os');
+const fs = require('fs');
+
+const TARGET = process.argv[2] || 'node18-win-x64';
+const OUTPUT = process.argv[3] || 'myassis-gateway-win.exe';
+
+const CACHE_DIR = path.join(os.homedir(), '.pkg-cache');
+const PKG_BIN = path.resolve(__dirname, '../node_modules/@yao-pkg/pkg/lib-es5/bin.js');
+
+function log(msg) { console.error('[pkg-build] ' + msg); }
+
+/** 根据 target (如 node24-win-x64) 在缓存目录中找到匹配的二进制 */
+function findCachedBinary(target) {
+  const m = target.match(/^node(\d+)-(.+)$/);
+  if (!m) return null;
+  const [, major, plat] = m;
+  const v36dir = path.join(CACHE_DIR, 'v3.6');
+  if (!fs.existsSync(v36dir)) return null;
+  const candidates = fs.readdirSync(v36dir)
+    .filter(f => new RegExp(`^fetched-v${major}\\.\\d+\\.\\d+-${plat}$`).test(f))
+    .sort()
+    .reverse();
+  return candidates.length > 0 ? path.join(v36dir, candidates[0]) : null;
+}
+
+async function main() {
+    log(`Building for ${TARGET}`);
+    log(`Output: ${OUTPUT}`);
+
+    // Verify cached binary exists (dynamically match by target)
+    const cachedBinary = findCachedBinary(TARGET);
+    if (!cachedBinary) {
+        log(`ERROR: No cached binary found for target ${TARGET} in ${CACHE_DIR}`);
+        log(`Please run: node node_modules/@yao-pkg/pkg/lib-es5/bin.js --targets ${TARGET} first`);
+        process.exit(1);
+    }
+    const size = (fs.statSync(cachedBinary).size / 1024 / 1024).toFixed(1);
+    log(`Using cached binary: ${cachedBinary} (${size} MB)`);
+
+    // Use PKG_CACHE_PATH so pkg-fetch finds the correct v3.6 binary by hash
+    const env = { ...process.env };
+    delete env.PKG_NODE_PATH;  // MUST NOT use PKG_NODE_PATH - it bypasses placeholders check
+    env.PKG_CACHE_PATH = CACHE_DIR;
+    log(`PKG_CACHE_PATH=${CACHE_DIR}`);
+
+    log('Starting pkg...');
+    return new Promise((resolve) => {
+        const child = spawn(process.execPath, [PKG_BIN, '.', '--targets', TARGET, '--output', OUTPUT], {
+            cwd: path.resolve(__dirname, '..'),
+            env,
+            stdio: 'inherit'
+        });
+        child.on('exit', (code) => process.exit(code || 0));
+        child.on('error', (e) => { log('Spawn error: ' + e.message); process.exit(1); });
+    });
+}
+
+main().catch(e => { console.error('[pkg-build] Fatal:', e.message); process.exit(1); });

package/dist/test_write.tmp

@@ -1 +0,0 @@
-ok