@myassis/gateway 1.0.107 → 1.0.109

package/dist/.env

@@ -0,0 +1,6 @@
+# Gateway 环境配置
+# Server API 地址（desktop 端通过 gateway 访问 server）
+SERVER_BASE_URL=https://api.my-assis.com
+# 服务端口
+PORT=3001
+HTTP_PROXY=http://127.0.0.1:7890

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),
     /** 模型瞬时故障（空回复 / 超时 / 网络抖动）的自动重试次数 */
@@ -146,7 +146,7 @@ exports.appConfig = {
      * 必定压缩，与内容多少无关 —— 这是「没聊几句就压缩」最直接的原因。
      * 条数只作为体积估算失真时的兜底，阈值应远高于正常对话轮数。
      */
-    summaryThreshold: parseInt(process.env.SUMMARY_THRESHOLD || '60', 10),
+    summaryThreshold: parseInt(process.env.SUMMARY_THRESHOLD || '10', 10),
     appName: '我的助手'
 };
 /**

package/dist/middleware/auth.js

@@ -9,7 +9,7 @@ exports.requireAuth = void 0;
  * 注：Gateway 不自行验证 JWT 签名，而是比对 authStore 中由 Server 下发并本地持久化的 token。
  * 因此无需也不应持有 JWT_SECRET，避免密钥在末端多处散落。
  */
-const authStore_js_1 = require("@/stores/authStore.js");
+const authStore_js_1 = require("../stores/authStore.js");
 const shared_1 = require("@myassis/shared");
 const logger = (0, shared_1.getLogger)('middleware/auth');
 /**

package/dist/middleware/broadcast.js

@@ -18,7 +18,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.broadcastDataChanges = void 0;
 const shared_1 = require("@myassis/shared");
-const WebSocketService_js_1 = require("@/services/WebSocketService.js");
+const WebSocketService_js_1 = require("../services/WebSocketService.js");
 const logger = (0, shared_1.getLogger)('middleware/broadcast');
 /**
  * 路由前缀 -> 资源类型。

package/dist/routes/agent.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const express_1 = require("express");
-const auth_js_1 = require("@/middleware/auth.js");
-const index_js_1 = require("@/api/index.js");
-const index_js_2 = require("@/services/session/index.js");
-const AgentManager_js_1 = require("@/services/agent/AgentManager.js");
-const AgentStore_js_1 = require("@/services/agent/AgentStore.js");
+const auth_js_1 = require("../middleware/auth.js");
+const index_js_1 = require("../api/index.js");
+const index_js_2 = require("../services/session/index.js");
+const AgentManager_js_1 = require("../services/agent/AgentManager.js");
+const AgentStore_js_1 = require("../services/agent/AgentStore.js");
 const shared_1 = require("@myassis/shared");
 const logger = (0, shared_1.getLogger)('AgentRoutes');
-const SessionStore_js_1 = require("@/services/session/SessionStore.js");
+const SessionStore_js_1 = require("../services/session/SessionStore.js");
 const router = (0, express_1.Router)();
 // 所有路由需要认证
 router.use(auth_js_1.requireAuth, (req, _res, next) => {

package/dist/routes/upload.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteFile = void 0;
 const express_1 = require("express");
 const multer_1 = __importDefault(require("multer"));
-const index_js_1 = require("@/config/index.js");
-const auth_js_1 = require("@/middleware/auth.js");
-const index_js_2 = require("@/api/index.js");
+const index_js_1 = require("../config/index.js");
+const auth_js_1 = require("../middleware/auth.js");
+const index_js_2 = require("../api/index.js");
 const shared_1 = require("@myassis/shared");
 const logger = (0, shared_1.getLogger)('UploadRoutes');
 const router = (0, express_1.Router)();

package/dist/services/TaskSchedulerService.js

@@ -11,7 +11,7 @@ const WebSocketService_js_1 = require("./WebSocketService.js");
 const index_js_1 = require("./session/index.js");
 const shared_1 = require("@myassis/shared");
 const dataService_js_1 = require("./dataService.js");
-const authStore_js_1 = require("@/stores/authStore.js");
+const authStore_js_1 = require("../stores/authStore.js");
 const logger = (0, shared_1.getLogger)('TaskSchedulerService');
 const EXPIRED_THRESHOLD = 60 * 60 * 1000; // 1小时
 const CHECK_INTERVAL = 60 * 1000; // 1分钟

package/dist/services/TaskService.js

@@ -10,7 +10,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.taskService = void 0;
-const index_js_1 = require("@/stores/index.js");
+const index_js_1 = require("../stores/index.js");
 const index_js_2 = require("../api/index.js");
 const LocalTaskService_js_1 = require("./LocalTaskService.js");
 const shared_1 = require("@myassis/shared");

package/dist/services/agent/AgentManager.js

@@ -7,9 +7,9 @@ exports.initAgentManager = exports.agentManagerMap = exports.AgentManager = void
 const uuid_1 = require("uuid");
 const Agent_js_1 = require("./Agent.js");
 const SessionManager_js_1 = require("../session/SessionManager.js");
-const authStore_js_1 = require("@/stores/authStore.js");
+const authStore_js_1 = require("../../stores/authStore.js");
 const shared_1 = require("@myassis/shared");
-const index_js_1 = __importDefault(require("@/config/index.js"));
+const index_js_1 = __importDefault(require("../../config/index.js"));
 const logger = (0, shared_1.getLogger)('AgentManager');
 /**
  * AgentManager - Business logic layer

package/dist/services/llm/LLMClient.js

@@ -4,15 +4,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGlobalModelSelector = exports.parseAruments = exports.LLMClient = void 0;
-const index_js_1 = require("@/stores/index.js");
+const index_js_1 = require("../../stores/index.js");
 const shared_1 = require("@myassis/shared");
 const promises_1 = __importDefault(require("fs/promises"));
-const index_js_2 = require("@/config/index.js");
+const index_js_2 = require("../../config/index.js");
 const logger = (0, shared_1.getLogger)('LLMClient');
 /** 历史工具输出在上下文中的最大保留长度 */
 const HISTORY_TOOL_OUTPUT_LIMIT = index_js_2.appConfig.oldToolContentLimit;
 /** 请求体字符硬上限，超过则视为上下文超限 */
-const HARD_MAX_CHARS = 200000;
+const HARD_MAX_CHARS = index_js_2.appConfig.contextMaxChars;
 /**
  * 规范化工具调用参数。
  *
@@ -371,30 +371,16 @@ class LLMClient {
      */
     async buildRequest(stream, model) {
         // 系统模式：转发到 Server LLM 代理
-        if (this.systemMode) {
-            const { mapped } = this.mapMessages(this.messages);
-            return {
-                url: `${this.serverUrl}/api/v1/llm/${stream ? 'chat' : 'invoke'}`,
-                headers: {
-                    'Content-Type': 'application/json',
-                    'Authorization': `Bearer ${this.authToken}`,
-                },
-                body: {
-                    modelId: model.modelId,
-                    messages: mapped,
-                    temperature: 0.7,
-                    tools: this.tools,
-                },
-                isSystemMode: true,
-            };
-        }
         // 自定义模式：直接调用 LLM API
         if (!model) {
             throw new Error('No available model');
         }
-        const apiKey = index_js_1.persistStore.getModelApiKey(model.id);
-        if (!apiKey) {
-            throw new Error('No API Key');
+        var apiKey;
+        if (!this.systemMode) {
+            apiKey = index_js_1.persistStore.getModelApiKey(model.id);
+            if (!apiKey) {
+                throw new Error('No API Key');
+            }
         }
         // 使用统一的消息映射
         const { mapped: mappedMessages, existAttachments, existScreenShot } = this.mapMessages(this.messages);
@@ -410,17 +396,17 @@ class LLMClient {
         const bodyChars = JSON.stringify(body).length;
         logger.debug('context chars', bodyChars);
         // 附件/截图场景 base64 体积大但不可裁剪，跳过硬上限检查
-        if (bodyChars > HARD_MAX_CHARS && !existAttachments && !existScreenShot) {
-            throw Error('exceed max message tokens');
-        }
+        // if (bodyChars > HARD_MAX_CHARS && !existAttachments && !existScreenShot) {
+        //   throw Error('exceed max message tokens')
+        // }
         return {
-            url: `${model.baseUrl}/chat/completions`,
+            url: this.systemMode ? `${this.serverUrl}/api/v1/llm/${stream ? 'chat' : 'invoke'}` : `${model.baseUrl}/chat/completions`,
             headers: {
                 'Content-Type': 'application/json',
-                'Authorization': `Bearer ${apiKey}`,
+                'Authorization': `Bearer ${this.systemMode ? this.authToken : apiKey}`,
             },
             body,
-            isSystemMode: false,
+            isSystemMode: this.systemMode,
         };
     }
     /**

package/dist/services/memory/ContextBuilder.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 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 index_js_1 = require("../../config/index.js");
 const ToolLedger_js_1 = require("./ToolLedger.js");
 const ToolCallArchive_js_1 = require("./ToolCallArchive.js");
 const logger = (0, shared_1.getLogger)('ContextBuilder');

package/dist/services/memory/MemoryManager.js

@@ -28,9 +28,9 @@ const shared_1 = require("@myassis/shared");
 const logger = (0, shared_1.getLogger)('MemoryManager');
 const models_js_1 = require("../models.js");
 const dataService_js_1 = require("../dataService.js");
-const index_js_1 = require("@/stores/index.js");
+const index_js_1 = require("../../stores/index.js");
 const LLMClient_js_1 = require("../llm/LLMClient.js");
-const index_js_2 = require("@/config/index.js");
+const index_js_2 = require("../../config/index.js");
 const ToolLedger_js_1 = require("./ToolLedger.js");
 const DEFAULT_CONFIG = {
     summaryThreshold: index_js_2.appConfig.summaryThreshold,

package/dist/services/session/Session.js

@@ -27,15 +27,15 @@ exports.Session = exports.handleApprovalResponse = exports.registerApprovalWaite
 const uuid_1 = require("uuid");
 const shared_1 = require("@myassis/shared");
 const SessionStore_js_1 = require("./SessionStore.js");
-const AgentStore_js_1 = require("@/services/agent/AgentStore.js");
-const authStore_js_1 = require("@/stores/authStore.js");
-const models_js_1 = require("@/services/models.js");
-const index_js_1 = require("@/services/tools/index.js");
+const AgentStore_js_1 = require("../../services/agent/AgentStore.js");
+const authStore_js_1 = require("../../stores/authStore.js");
+const models_js_1 = require("../../services/models.js");
+const index_js_1 = require("../../services/tools/index.js");
 const systemPrompt_js_1 = require("../systemPrompt.js");
 const LLMClient_js_1 = require("../llm/LLMClient.js");
-const dataService_js_1 = require("@/services/dataService.js");
+const dataService_js_1 = require("../../services/dataService.js");
 const MemoryManager_js_1 = require("../memory/MemoryManager.js");
-const index_js_2 = require("@/config/index.js");
+const index_js_2 = require("../../config/index.js");
 const ContextBuilder_js_1 = require("../memory/ContextBuilder.js");
 const SessionManager_js_1 = require("./SessionManager.js");
 const SessionNotificationService_js_1 = require("../SessionNotificationService.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);
         }
@@ -1030,6 +1031,7 @@ class Session {
                 if (built.trimmed) {
                     logger.debug(`上下文裁剪: level=${built.level} chars=${built.chars}`);
                 }
+                logger.debug(`调用模型${this.selectModelId},messages:`, built.messages);
                 // 收尾阶段不再下发工具定义：只要工具还在，模型大概率继续调用而不收尾
                 const llmClient = new LLMClient_js_1.LLMClient(models, built.messages, this.abortController.signal, forceFinalize ? [] : tools);
                 llmClient.setPreferredModel(this.selectModelId);
@@ -1369,12 +1371,6 @@ class Session {
                 };
                 await Promise.all(llmResult.toolCalls.map(x => startToolCall(x)));
                 toolCalls.push(toolCall);
-                // 重置 toolCall：下一轮工具调用必须开启新的分组。
-                // 否则模型连续多轮只返回工具调用（无正文）时，所有轮次的结果会
-                // 累积进同一个 toolCall 对象，并被重复 push 到 toolCalls 数组，
-                // 导致持久化消息出现重复的工具调用组，历史回放时模型看到重复
-                // 的 tool_calls/tool 结果对，进而重复执行工具。
-                toolCall = null;
                 // 本轮工具已执行完，增量落库一次。工具轮次可能很多且每轮都耗时，
                 // 这里保存能让崩溃后仍保留已完成的工具调用记录。
                 if (!childAgent) {

package/dist/services/session/SessionManager.js

@@ -5,7 +5,7 @@ const uuid_1 = require("uuid");
 const shared_1 = require("@myassis/shared");
 const logger = (0, shared_1.getLogger)('SessionManager');
 const SessionStore_js_1 = require("./SessionStore.js");
-const authStore_js_1 = require("@/stores/authStore.js");
+const authStore_js_1 = require("../../stores/authStore.js");
 const Session_js_1 = require("./Session.js");
 const ToolCallArchive_js_1 = require("../memory/ToolCallArchive.js");
 /**

package/dist/services/systemPrompt.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSystemPromptAsync = exports.LANGUAGES = exports.CHAT_STYLE_TEMPLATES = void 0;
-const index_js_1 = require("@/stores/index.js");
+const index_js_1 = require("../stores/index.js");
 const os_1 = __importDefault(require("os"));
 const dataService_js_1 = require("./dataService.js");
 const shared_1 = require("@myassis/shared");

package/dist/services/tools/model.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.modelTool = void 0;
 const dataService_js_1 = require("../dataService.js");
-const index_js_1 = require("@/stores/index.js");
+const index_js_1 = require("../../stores/index.js");
 exports.modelTool = {
     name: 'model',
     description: '模型管理工具',

package/dist/services/tools/skill.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.skillTool = void 0;
 const dataService_js_1 = require("../dataService.js");
-const index_js_1 = require("@/stores/index.js");
+const index_js_1 = require("../../stores/index.js");
 const shared_1 = require("@myassis/shared");
 const logger = (0, shared_1.getLogger)('skill');
 exports.skillTool = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myassis/gateway",
-  "version": "1.0.107",
+  "version": "1.0.109",
   "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); });