sema-core 2.0.4 → 2.0.5

package/dist/services/commands/runCommand.js

@@ -71,21 +71,33 @@ async function handleCompactCommand(sessionId) {
     runtime.currentAbortController = new AbortController();
     try {
         (0, log_1.logDebug)(`开始手动压缩，当前消息数: ${messages.length}`);
-        const compactedMessages = await (0, compact_1.compactMessages)(messages, runtime.currentAbortController, sessionId);
-        const summaryContent = compactedMessages[1]?.message?.content;
-        const summaryText = typeof summaryContent === 'string'
-            ? summaryContent
-            : Array.isArray(summaryContent)
-                ? summaryContent
-                    .filter((b) => b.type === 'text')
-                    .map((b) => b.text)
-                    .join('\n')
-                : '';
+        const result = await (0, compact_1.compactMessages)(messages, runtime.currentAbortController, sessionId, {
+            allowTruncationFallback: false,
+        });
+        if (result.kind === 'unchanged') {
+            (0, log_1.logInfo)('Not enough history to compact, skip compact');
+            return;
+        }
+        if (result.kind !== 'summary') {
+            const errorMsg = `Compact did not produce a valid summary: ${result.kind}`;
+            (0, log_1.logError)(errorMsg);
+            eventBus.emit('session:error', {
+                type: 'compact_error',
+                error: {
+                    code: 'COMPACT_FAILED',
+                    message: errorMsg,
+                    details: result.kind === 'failed'
+                        ? { error: result.error }
+                        : { reason: result.reason },
+                },
+            }, sessionId);
+            return;
+        }
         // 压缩后清空 todos 和 readFileTimestamps（历史上下文已丢失，它们不再有意义）
         mainAgentState.updateTodosIntelligently([]);
         mainAgentState.setReadFileTimestamps({});
         mainAgentState.setMessageHistory([
-            (0, message_1.buildUserMsg)(summaryText),
+            (0, message_1.buildUserMsg)(result.summary),
         ]);
         (0, log_1.logDebug)('压缩完成，已替换为 local-command 格式消息历史');
     }

package/dist/services/commands/runCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"runCommand.js","sourceRoot":"","sources":["../../../src/services/commands/runCommand.ts"],"names":[],"mappings":";;AAsBA,sCAKC;AA1BD,wCAA6D;AAC7D,0DAAoD;AACpD,6DAA4E;AAC5E,gDAAqD;AAErD,+CAA4D;AAC5D,uDAAuD;AACvD,gDAAkD;AAClD,8CAA8C;AAC9C,2DAA2D;AAU3D,6EAA6E;AAEtE,KAAK,UAAU,aAAa,CAAC,KAAa,EAAE,SAAiB;IAClE,MAAM,YAAY,GAAG,MAAM,mBAAmB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IACjE,IAAI,YAAY,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IACvC,IAAI,YAAY,KAAK,KAAK;QAAE,OAAO,YAAY,CAAC;IAChD,OAAO,mBAAmB,CAAC,KAAK,CAAC,CAAC;AACpC,CAAC;AAED,4EAA4E;AAE5E,KAAK,UAAU,mBAAmB,CAAC,KAAa,EAAE,SAAiB;IACjE,IAAI,KAAK,KAAK,UAAU,EAAE,CAAC;QACzB,MAAM,oBAAoB,CAAC,SAAS,CAAC,CAAC;QACtC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QACtD,MAAM,kBAAkB,CAAC,SAAS,CAAC,CAAC;QACpC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,KAAK,UAAU,kBAAkB,CAAC,SAAiB;IACjD,IAAA,aAAO,EAAC,WAAW,CAAC,CAAC;IAErB,aAAa;IACb,IAAA,4BAAc,GAAE,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;IAE3C,MAAM,QAAQ,GAAG,sBAAQ,CAAC,WAAW,EAAE,CAAC;IACxC,MAAM,OAAO,GAAG,IAAA,8BAAe,GAAE,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACrD,MAAM,cAAc,GAAG,OAAO,CAAC,QAAQ,CAAC,4BAAa,CAAC,CAAC;IAEvD,8CAA8C;IAC9C,cAAc,CAAC,wBAAwB,CAAC,EAAE,CAAC,CAAC;IAC5C,cAAc,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC;IAEzC,cAAc,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC;IACrC,cAAc,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IACnC,QAAQ,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,SAAS,EAAE,EAAE,SAAS,CAAC,CAAC;IAC3D,QAAQ,CAAC,IAAI,CAAC,oBAAoB,EAAE,EAAE,KAAK,EAAE,IAAA,kBAAS,EAAC,EAAE,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;IACzE,OAAO,CAAC,aAAa,EAAE,CAAC;AAC1B,CAAC;AAED,KAAK,UAAU,oBAAoB,CAAC,SAAiB;IACnD,IAAA,aAAO,EAAC,WAAW,CAAC,CAAC;IAErB,aAAa;IACb,IAAA,4BAAc,GAAE,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;IAE3C,MAAM,QAAQ,GAAG,sBAAQ,CAAC,WAAW,EAAE,CAAC;IACxC,MAAM,OAAO,GAAG,IAAA,8BAAe,GAAE,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACrD,MAAM,cAAc,GAAG,OAAO,CAAC,QAAQ,CAAC,4BAAa,CAAC,CAAC;IACvD,MAAM,QAAQ,GAAG,cAAc,CAAC,iBAAiB,EAAE,CAAC;IAEpD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,MAAM,GAAG,6BAA6B,CAAC;QAC7C,IAAA,aAAO,EAAC,MAAM,CAAC,CAAC;QAChB,QAAQ,CAAC,IAAI,CAAC,cAAc,EAAE;YAC5B,MAAM;YACN,WAAW,EAAE,CAAC;YACd,YAAY,EAAE,CAAC;YACf,WAAW,EAAE,CAAC;SACW,EAAE,SAAS,CAAC,CAAC;QACxC,OAAO,CAAC,sBAAsB,GAAG,IAAI,CAAC;QACtC,cAAc,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACnC,OAAO;IACT,CAAC;IAED,OAAO,CAAC,sBAAsB,GAAG,IAAI,eAAe,EAAE,CAAC;IAEvD,IAAI,CAAC;QACH,IAAA,cAAQ,EAAC,iBAAiB,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;QAE7C,MAAM,iBAAiB,GAAG,MAAM,IAAA,yBAAe,EAAC,QAAQ,EAAE,OAAO,CAAC,sBAAsB,EAAE,SAAS,CAAC,CAAC;QAErG,MAAM,cAAc,GAAG,iBAAiB,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC;QAC9D,MAAM,WAAW,GACf,OAAO,cAAc,KAAK,QAAQ;YAChC,CAAC,CAAC,cAAc;YAChB,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC;gBAC7B,CAAC,CAAC,cAAc;qBACX,MAAM,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC;qBACrC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;qBACvB,IAAI,CAAC,IAAI,CAAC;gBACf,CAAC,CAAC,EAAE,CAAC;QAEX,qDAAqD;QACrD,cAAc,CAAC,wBAAwB,CAAC,EAAE,CAAC,CAAC;QAC5C,cAAc,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC;QAEzC,cAAc,CAAC,iBAAiB,CAAC;YAC/B,IAAA,sBAAY,EAAC,WAAW,CAAC;SAC1B,CAAC,CAAC;QAEH,IAAA,cAAQ,EAAC,gCAAgC,CAAC,CAAC;IAC7C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,IAAA,+BAAsB,EAAC,KAAK,CAAC,EAAE,CAAC;YAClC,IAAA,aAAO,EAAC,WAAW,CAAC,CAAC;YACrB,OAAO;QACT,CAAC;QACD,MAAM,QAAQ,GAAG,SAAS,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QACnF,IAAA,cAAQ,EAAC,QAAQ,CAAC,CAAC;QACnB,QAAQ,CAAC,IAAI,CAAC,eAAe,EAAE;YAC7B,IAAI,EAAE,eAAe;YACrB,KAAK,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,EAAE;SACzE,EAAE,SAAS,CAAC,CAAC;IAChB,CAAC;YAAS,CAAC;QACT,OAAO,CAAC,sBAAsB,GAAG,IAAI,CAAC;QACtC,cAAc,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IACrC,CAAC;IAED,IAAA,cAAQ,EAAC,UAAU,CAAC,CAAC;AACvB,CAAC;AAED,2EAA2E;AAE3E,KAAK,UAAU,mBAAmB,CAAC,KAAa;IAC9C,MAAM,aAAa,GAAwB;QACzC,aAAa,EAAE,KAAK;QACpB,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;KACxC,CAAC;IAEF,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC;QAAE,OAAO,aAAa,CAAC;IAEjD,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACzC,MAAM,WAAW,GAAG,aAAa,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC;IAC1F,MAAM,OAAO,GAAG,aAAa,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,aAAa,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAClF,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAEjD,MAAM,aAAa,GAAG,IAAA,oCAAkB,GAAE,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;IACzE,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,IAAA,cAAQ,EAAC,aAAa,WAAW,EAAE,CAAC,CAAC;QACrC,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,MAAM,eAAe,GAAG,IAAI,CAAC,MAAM,CACjC,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,EACzE,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,CAC5D,CAAC;IAEF,IAAA,aAAO,EAAC,YAAY,WAAW,QAAQ,OAAO,EAAE,CAAC,CAAC;IAElD,OAAO;QACL,aAAa,EAAE,eAAe;QAC9B,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC;KAClD,CAAC;AACJ,CAAC"}
+{"version":3,"file":"runCommand.js","sourceRoot":"","sources":["../../../src/services/commands/runCommand.ts"],"names":[],"mappings":"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"}

package/dist/tools/FetchUrl.js

@@ -46,8 +46,8 @@ exports.FetchUrl = {
     },
     genToolPermission(input) {
         return {
-            title: '',
-            content: input.url,
+            title: input.url,
+            content: '',
         };
     },
     getDisplayTitle(input) {

package/dist/tools/FetchUrl.js.map

@@ -1 +1 @@
-{"version":3,"file":"FetchUrl.js","sourceRoot":"","sources":["../../src/tools/FetchUrl.ts"],"names":[],"mappings":";;;AAAA,6BAAuB;AAEvB,uDAA2D;AAC3D,+CAKyB;AACzB,uDAAmD;AAEnD,0DAAuD;AACvD,uCAAyC;AACzC,yCAAoD;AAEpD,MAAM,SAAS,GAAG,0BAAmB,CAAA;AAErC,MAAM,UAAU,GAAG,OAAC,CAAC,YAAY,CAAC;IAChC,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,qCAAqC,CAAC;IACrE,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,8DAA8D,CAAC;CAC5F,CAAC,CAAA;AAWW,QAAA,QAAQ,GAAG;IACtB,IAAI,EAAE,SAAS;IACf,WAAW;QACT,OAAO,2BAAgB,CAAA;IACzB,CAAC;IACD,UAAU;IACV,MAAM;QACJ,OAAO,KAAK,CAAA;IACd,CAAC;IACD,KAAK,CAAC,aAAa,CAAC,EAAE,GAAG,EAAE;QACzB,IAAI,CAAC;YACH,IAAI,GAAG,CAAC,GAAG,CAAC,CAAA;QACd,CAAC;QAAC,MAAM,CAAC;YACP,OAAO;gBACL,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,YAAY,GAAG,yCAAyC;gBACjE,SAAS,EAAE,CAAC;aACb,CAAA;QACH,CAAC;QACD,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAA;IACzB,CAAC;IACD,oBAAoB,CAAC,IAAa;QAChC,MAAM,MAAM,GAAG,CAAC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;QAC7C,MAAM,gBAAgB,GAAG,IAAI,CAAA;QAC7B,OAAO;YACL,KAAK,EAAE,IAAI,CAAC,GAAG;YACf,OAAO,EAAE,EAAE;YACX,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,gBAAgB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;SACvG,CAAA;IACH,CAAC;IACD,iBAAiB,CAAC,KAAsC;QACtD,OAAO;YACL,KAAK,EAAE,EAAE;YACT,OAAO,EAAE,KAAK,CAAC,GAAG;SACnB,CAAA;IACH,CAAC;IACD,eAAe,CAAC,KAAwB;QACtC,IAAI,CAAC,KAAK,EAAE,GAAG;YAAE,OAAO,UAAU,CAAA;QAClC,IAAI,CAAC;YACH,OAAO,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAA;QACpC,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,UAAU,CAAA;QACnB,CAAC;IACH,CAAC;IACD,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,MAAM,EAAmC,EAAE,YAAiB;QAC7E,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QACxB,MAAM,EAAE,eAAe,EAAE,GAAG,YAAY,CAAA;QAExC,MAAM,WAAW,GAAG,YAAY,CAAC,OAAO,KAAK,4BAAa,CAAA;QAC1D,MAAM,SAAS,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,OAAe,EAAE,EAAE;YAClD,MAAM,SAAS,GAA2B;gBACxC,OAAO,EAAE,YAAY,CAAC,OAAO;gBAC7B,MAAM,EAAE,YAAY,CAAC,gBAAgB,IAAI,EAAE;gBAC3C,QAAQ,EAAE,SAAS;gBACnB,KAAK,EAAE,GAAG;gBACV,OAAO,EAAE,EAAE;gBACX,OAAO;aACR,CAAA;YACD,IAAA,yBAAW,GAAE,CAAC,IAAI,CAAC,sBAAsB,EAAE,SAAS,EAAE,YAAY,CAAC,SAAS,CAAC,CAAA;QAC/E,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;QAEb,SAAS,EAAE,CAAC,GAAG,IAAA,iBAAU,GAAE,yBAAyB,CAAC,CAAA;QACrD,MAAM,QAAQ,GAAG,MAAM,IAAA,6BAAkB,EAAC,GAAG,EAAE,eAAe,CAAC,CAAA;QAE/D,oBAAoB;QACpB,IAAI,MAAM,IAAI,QAAQ,IAAI,QAAQ,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;YACvD,MAAM,UAAU,GACd,QAAQ,CAAC,UAAU,KAAK,GAAG,CAAC,CAAC,CAAC,mBAAmB;gBACjD,CAAC,CAAC,QAAQ,CAAC,UAAU,KAAK,GAAG,CAAC,CAAC,CAAC,oBAAoB;oBACpD,CAAC,CAAC,QAAQ,CAAC,UAAU,KAAK,GAAG,CAAC,CAAC,CAAC,oBAAoB;wBACpD,CAAC,CAAC,OAAO,CAAA;YAEX,MAAM,OAAO,GAAG;;QAEd,QAAQ,CAAC,WAAW;QACpB,QAAQ,CAAC,WAAW;UAClB,QAAQ,CAAC,UAAU,IAAI,UAAU;;cAE7B,0BAAmB;UACvB,QAAQ,CAAC,WAAW;aACjB,MAAM,GAAG,CAAA;YAEhB,MAAM,MAAM,GAAY;gBACtB,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC;gBACjC,IAAI,EAAE,QAAQ,CAAC,UAAU;gBACzB,QAAQ,EAAE,UAAU;gBACpB,MAAM,EAAE,OAAO;gBACf,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK;gBAC9B,GAAG;aACJ,CAAA;YAED,MAAM;gBACJ,IAAI,EAAE,QAAiB;gBACvB,IAAI,EAAE,MAAM;gBACZ,kBAAkB,EAAE,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC;aACvD,CAAA;YACD,OAAM;QACR,CAAC;QAED,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,QAA0B,CAAA;QAElF,MAAM,MAAM,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;QACxC,SAAS,EAAE,CAAC,GAAG,IAAA,iBAAU,GAAE,aAAa,MAAM,YAAY,IAAI,4BAA4B,CAAC,CAAA;QAE3F,IAAI,MAAc,CAAA;QAClB,iCAAiC;QACjC,IAAI,WAAW,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,OAAO,CAAC,MAAM,GAAG,qCAA0B,EAAE,CAAC;YACzF,MAAM,GAAG,OAAO,CAAA;QAClB,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,MAAM,IAAA,mCAAwB,EAAC,MAAM,EAAE,OAAO,EAAE,eAAe,CAAC,MAAM,CAAC,CAAA;QAClF,CAAC;QAED,MAAM,MAAM,GAAY;YACtB,KAAK;YACL,IAAI;YACJ,QAAQ;YACR,MAAM;YACN,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK;YAC9B,GAAG;SACJ,CAAA;QAED,MAAM;YACJ,IAAI,EAAE,QAAiB;YACvB,IAAI,EAAE,MAAM;YACZ,kBAAkB,EAAE,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC;SACvD,CAAA;IACH,CAAC;IACD,qBAAqB,CAAC,MAAe;QACnC,OAAO,MAAM,CAAC,MAAM,CAAA;IACtB,CAAC;CACyC,CAAA"}
+{"version":3,"file":"FetchUrl.js","sourceRoot":"","sources":["../../src/tools/FetchUrl.ts"],"names":[],"mappings":"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"}

package/dist/util/compact.d.ts

@@ -1,9 +1,40 @@
 import { Message } from '../types/message';
+import { queryLLM } from '../services/api/queryLLM';
 import { Tool } from '../tools/base/Tool';
-/**
- * 基于主模型能力计算上下文使用阈值
- * 采用主模型上下文长度作为基准，因为压缩任务需要由性能足够的模型处理
- */
+declare const defaultCompactDependencies: {
+    queryLLM: typeof queryLLM;
+    getModelManager: () => import("../manager/ModelManager").ModelManager;
+    getEventBus: () => import("../events/EventSystem").EventBus;
+};
+export declare const __compactTestHooks: {
+    setDependencies(dependencies: Partial<typeof defaultCompactDependencies>): void;
+    resetDependencies(): void;
+};
+export type CompactTruncatedReason = 'EMPTY_SUMMARY' | 'INVALID_COMPACT_RESPONSE' | 'COMPACT_ERROR';
+export type CompactResult = {
+    kind: 'unchanged';
+    messages: Message[];
+} | {
+    kind: 'summary';
+    messages: Message[];
+    summary: string;
+} | {
+    kind: 'truncated';
+    messages: Message[];
+    reason: CompactTruncatedReason;
+} | {
+    kind: 'failed';
+    error: unknown;
+};
+export type AutoCompactResult = {
+    changed: true;
+    messages: Message[];
+    mode: 'summary' | 'truncated';
+} | {
+    changed: false;
+    messages: Message[];
+    error?: unknown;
+};
 /**
  * 根据令牌使用量判断是否应触发自动压缩
  * 只计算输入token数，因为API调用时主要关心的是输入token限制
@@ -21,7 +52,9 @@ export declare function needsAutoCompact(messages: Message[]): boolean;
  * - 确保系统在各种异常情况下都能保持功能正常
  * - 提供多层降级方案以避免完全失败
  */
-export declare function compactMessages(messages: Message[], abortController: AbortController, sessionId?: string): Promise<Message[]>;
+export declare function compactMessages(messages: Message[], abortController: AbortController, sessionId?: string, options?: {
+    allowTruncationFallback?: boolean;
+}): Promise<CompactResult>;
 /**
  * 自动上下文压缩的主要入口函数
  *
@@ -34,11 +67,12 @@ export declare function compactMessages(messages: Message[], abortController: Ab
  *
  * 执行自动压缩（调用前应先通过 needsAutoCompact 判断是否需要压缩）
  */
-export declare function autoCompact(messages: Message[], abortController: AbortController, sessionId?: string): Promise<Message[]>;
+export declare function autoCompact(messages: Message[], abortController: AbortController, sessionId?: string): Promise<AutoCompactResult>;
 /**
  * Null Tool - 用于占位避免工具调用
  * 在某些场景下（如压缩），模型必须提供 tools 参数，但我们不希望模型调用任何工具
  * 此工具作为占位符，确保 API 调用合法但不会被实际使用
  */
 export declare const NULL_TOOL: Tool;
+export {};
 //# sourceMappingURL=compact.d.ts.map

package/dist/util/compact.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compact.d.ts","sourceRoot":"","sources":["../../src/util/compact.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAQ1C,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAA;AA6HzC;;;GAGG;AACH;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAO7D;AAGD;;;;;;;;;;;GAWG;AACH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,OAAO,EAAE,EACnB,eAAe,EAAE,eAAe,EAChC,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,OAAO,EAAE,CAAC,CA8CpB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,WAAW,CAC/B,QAAQ,EAAE,OAAO,EAAE,EACnB,eAAe,EAAE,eAAe,EAChC,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,OAAO,EAAE,CAAC,CAgDpB;AAED;;;;GAIG;AACH,eAAO,MAAM,SAAS,EAAE,IASvB,CAAA"}
+{"version":3,"file":"compact.d.ts","sourceRoot":"","sources":["../../src/util/compact.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAGrD,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AAKnD,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAA;AAKzC,QAAA,MAAM,0BAA0B;;;;CAI/B,CAAA;AAID,eAAO,MAAM,kBAAkB;kCACC,OAAO,CAAC,OAAO,0BAA0B,CAAC,GAAG,IAAI;yBAG1D,IAAI;CAG1B,CAAA;AASD,MAAM,MAAM,sBAAsB,GAC9B,eAAe,GACf,0BAA0B,GAC1B,eAAe,CAAA;AAEnB,MAAM,MAAM,aAAa,GACrB;IACE,IAAI,EAAE,WAAW,CAAA;IACjB,QAAQ,EAAE,OAAO,EAAE,CAAA;CACpB,GACD;IACE,IAAI,EAAE,SAAS,CAAA;IACf,QAAQ,EAAE,OAAO,EAAE,CAAA;IACnB,OAAO,EAAE,MAAM,CAAA;CAChB,GACD;IACE,IAAI,EAAE,WAAW,CAAA;IACjB,QAAQ,EAAE,OAAO,EAAE,CAAA;IACnB,MAAM,EAAE,sBAAsB,CAAA;CAC/B,GACD;IACE,IAAI,EAAE,QAAQ,CAAA;IACd,KAAK,EAAE,OAAO,CAAA;CACf,CAAA;AAEL,MAAM,MAAM,iBAAiB,GACzB;IACE,OAAO,EAAE,IAAI,CAAA;IACb,QAAQ,EAAE,OAAO,EAAE,CAAA;IACnB,IAAI,EAAE,SAAS,GAAG,WAAW,CAAA;CAC9B,GACD;IACE,OAAO,EAAE,KAAK,CAAA;IACd,QAAQ,EAAE,OAAO,EAAE,CAAA;IACnB,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB,CAAA;AA+LL;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAO7D;AAGD;;;;;;;;;;;GAWG;AACH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,OAAO,EAAE,EACnB,eAAe,EAAE,eAAe,EAChC,SAAS,CAAC,EAAE,MAAM,EAClB,OAAO,GAAE;IAAE,uBAAuB,CAAC,EAAE,OAAO,CAAA;CAAO,GAClD,OAAO,CAAC,aAAa,CAAC,CAsExB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,WAAW,CAC/B,QAAQ,EAAE,OAAO,EAAE,EACnB,eAAe,EAAE,eAAe,EAChC,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,iBAAiB,CAAC,CAwD5B;AAED;;;;GAIG;AACH,eAAO,MAAM,SAAS,EAAE,IASvB,CAAA"}

package/dist/util/compact.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NULL_TOOL = void 0;
+exports.NULL_TOOL = exports.__compactTestHooks = void 0;
 exports.needsAutoCompact = needsAutoCompact;
 exports.compactMessages = compactMessages;
 exports.autoCompact = autoCompact;
@@ -13,6 +13,20 @@ const EventSystem_1 = require("../events/EventSystem");
 const zod_1 = require("zod");
 const tokens_2 = require("./tokens");
 const compact_1 = require("../prompt/compact");
+const defaultCompactDependencies = {
+    queryLLM: queryLLM_1.queryLLM,
+    getModelManager: ModelManager_1.getModelManager,
+    getEventBus: EventSystem_1.getEventBus,
+};
+const compactDependencies = { ...defaultCompactDependencies };
+exports.__compactTestHooks = {
+    setDependencies(dependencies) {
+        Object.assign(compactDependencies, dependencies);
+    },
+    resetDependencies() {
+        Object.assign(compactDependencies, defaultCompactDependencies);
+    },
+};
 /**
  * 触发自动上下文压缩的阈值比例
  * 当上下文使用量超过模型限制的75%时，将自动激活紧凑化处理
@@ -21,7 +35,7 @@ const compact_1 = require("../prompt/compact");
 const AUTO_COMPACT_THRESHOLD_RATIO = 0.75;
 function getContextLimit() {
     try {
-        return (0, ModelManager_1.getModelManager)().getModel('main')?.contextLength ?? 128_000;
+        return compactDependencies.getModelManager().getModel('main')?.contextLength ?? 128_000;
     }
     catch {
         return 128_000;
@@ -113,10 +127,59 @@ function truncateMessages(messages, targetTokenLimit) {
 function calculateCompactRate(tokenBefore, tokenAfter) {
     return tokenAfter / tokenBefore;
 }
-/**
- * 基于主模型能力计算上下文使用阈值
- * 采用主模型上下文长度作为基准，因为压缩任务需要由性能足够的模型处理
- */
+function isInvalidCompactResponse(response) {
+    const usage = response.message.usage;
+    if (!usage || typeof usage !== 'object')
+        return true;
+    const inputTokens = usage.input_tokens ?? usage.prompt_tokens ?? 0;
+    const outputTokens = usage.output_tokens ?? usage.completion_tokens ?? 0;
+    if (response.message.stop_reason == null)
+        return true;
+    if (inputTokens === 0 && outputTokens === 0)
+        return true;
+    const content = response.message.content;
+    if (typeof content === 'string')
+        return content.length === 0;
+    return !Array.isArray(content) || content.length === 0;
+}
+function extractSummaryText(response) {
+    const content = response.message.content;
+    if (typeof content === 'string') {
+        return content;
+    }
+    if (Array.isArray(content)) {
+        const textBlock = content.find((block) => block.type === 'text');
+        return textBlock?.type === 'text' ? textBlock.text : '';
+    }
+    return '';
+}
+function emitCompactUsage(messagesBefore, messagesAfter, sessionId, mode, reason, error) {
+    try {
+        // `compact:exec` means a compacted transcript was actually committed.
+        // Failed compact attempts must not emit it, otherwise clients may hide the
+        // visible transcript even though persisted history remains unchanged.
+        if (mode === 'failed' || !messagesAfter) {
+            return;
+        }
+        const tokensBeforeInfo = (0, tokens_1.countTokens)(messagesBefore);
+        const tokenBefore = tokensBeforeInfo.inputTokens + tokensBeforeInfo.outputTokens;
+        const usage = (0, tokens_2.getTokens)(messagesAfter);
+        const eventBus = compactDependencies.getEventBus();
+        const compactExecData = {
+            tokenBefore,
+            tokenCompact: usage.useTokens,
+            compactRate: calculateCompactRate(tokenBefore, usage.useTokens),
+            mode,
+            reason,
+            errMsg: error instanceof Error ? error.message : error ? String(error) : undefined,
+        };
+        eventBus.emit('compact:exec', compactExecData, sessionId);
+        eventBus.emit('conversation:usage', { usage }, sessionId);
+    }
+    catch (usageError) {
+        (0, log_1.logError)(`Failed to emit compact usage: ${usageError}`);
+    }
+}
 /**
  * 根据令牌使用量判断是否应触发自动压缩
  * 只计算输入token数，因为API调用时主要关心的是输入token限制
@@ -140,45 +203,66 @@ function needsAutoCompact(messages) {
  * - 确保系统在各种异常情况下都能保持功能正常
  * - 提供多层降级方案以避免完全失败
  */
-async function compactMessages(messages, abortController, sessionId) {
+async function compactMessages(messages, abortController, sessionId, options = {}) {
+    const allowTruncationFallback = options.allowTruncationFallback ?? true;
     if (messages.length < 2) {
-        return messages;
+        return { kind: 'unchanged', messages };
     }
-    // 计算压缩前的输入token数
-    const tokensBeforeInfo = (0, tokens_1.countTokens)(messages);
-    const tokenBefore = tokensBeforeInfo.inputTokens + tokensBeforeInfo.outputTokens;
-    let compactedMessages;
     try {
-        compactedMessages = await executeAutoCompact(messages, abortController);
+        const summaryResult = await executeAutoCompact(messages, abortController);
+        if (summaryResult.kind === 'summary') {
+            emitCompactUsage(messages, summaryResult.messages, sessionId, 'summary');
+            return summaryResult;
+        }
+        if (!allowTruncationFallback) {
+            emitCompactUsage(messages, null, sessionId, 'failed', summaryResult.reason);
+            return {
+                kind: 'failed',
+                error: new Error(`Compact did not produce a valid summary: ${summaryResult.reason}`),
+            };
+        }
+        const contextLimit = getContextLimit();
+        const targetLimit = contextLimit * 0.5; // 截断到50%容量
+        const truncatedMessages = truncateMessages(messages, targetLimit);
+        emitCompactUsage(messages, truncatedMessages, sessionId, 'truncated', summaryResult.reason);
+        return {
+            kind: 'truncated',
+            messages: truncatedMessages,
+            reason: summaryResult.reason,
+        };
     }
     catch (error) {
+        if (!allowTruncationFallback) {
+            emitCompactUsage(messages, null, sessionId, 'failed', 'COMPACT_ERROR', error);
+            return {
+                kind: 'failed',
+                error,
+            };
+        }
         // 压缩完全失败时的备用策略：使用截断方式
         (0, log_1.logError)(`Compact failed, attempting truncation fallback: ${error}`);
         try {
             const contextLimit = getContextLimit();
             const targetLimit = contextLimit * 0.5; // 截断到50%容量
-            compactedMessages = truncateMessages(messages, targetLimit);
-            (0, log_1.logError)(`Successfully applied truncation fallback, reduced from ${messages.length} to ${compactedMessages.length} messages`);
+            const truncatedMessages = truncateMessages(messages, targetLimit);
+            (0, log_1.logError)(`Successfully applied truncation fallback, reduced from ${messages.length} to ${truncatedMessages.length} messages`);
+            emitCompactUsage(messages, truncatedMessages, sessionId, 'truncated', 'COMPACT_ERROR', error);
+            return {
+                kind: 'truncated',
+                messages: truncatedMessages,
+                reason: 'COMPACT_ERROR',
+            };
         }
         catch (truncationError) {
-            // 如果连截断都失败，抛出错误
+            // 如果连截断都失败，返回失败结果
             (0, log_1.logError)(`Truncation fallback also failed: ${truncationError}`);
-            throw truncationError;
+            emitCompactUsage(messages, null, sessionId, 'failed', 'COMPACT_ERROR', truncationError);
+            return {
+                kind: 'failed',
+                error: truncationError,
+            };
         }
     }
-    // 计算压缩后的输入token数并触发事件
-    const usage = (0, tokens_2.getTokens)(compactedMessages);
-    // 触发压缩执行事件
-    const eventBus = (0, EventSystem_1.getEventBus)();
-    const compactExecData = {
-        tokenBefore: tokenBefore,
-        tokenCompact: usage.useTokens,
-        compactRate: calculateCompactRate(tokenBefore, usage.useTokens)
-    };
-    eventBus.emit('compact:exec', compactExecData, sessionId);
-    // 自动压缩后发送更新的 usage 事件
-    eventBus.emit('conversation:usage', { usage }, sessionId);
-    return compactedMessages;
 }
 /**
  * 自动上下文压缩的主要入口函数
@@ -209,7 +293,7 @@ async function autoCompact(messages, abortController, sessionId) {
     }
     if (lastRealUserIdx === -1) {
         // 没有找到真实用户消息，跳过压缩
-        return messages;
+        return { changed: false, messages };
     }
     // 只压缩最后一条真实用户消息之前的历史
     const messagesToCompact = messages.slice(0, lastRealUserIdx);
@@ -217,23 +301,28 @@ async function autoCompact(messages, abortController, sessionId) {
     const messagesToKeep = messages.slice(lastRealUserIdx);
     if (messagesToCompact.length < 2) {
         // 历史消息太少，不值得压缩
-        return messages;
+        return { changed: false, messages };
     }
-    try {
-        const compactedHistory = await compactMessages(messagesToCompact, abortController, sessionId);
+    const compactResult = await compactMessages(messagesToCompact, abortController, sessionId);
+    if (compactResult.kind === 'summary' || compactResult.kind === 'truncated') {
         // 组合结果示例（工具调用场景）：
         //   [compactNotice(user), summaryMsg(assistant), lastRealUserMsg(user), assistantMsg(assistant), toolResult(user)]
         // 组合结果示例（新查询场景）：
         //   [compactNotice(user), summaryMsg(assistant), newUserQuery(user)]
         // 两种场景均以 user 消息结尾，API 调用合法
-        const finalMessages = [...compactedHistory, ...messagesToKeep];
+        const finalMessages = [...compactResult.messages, ...messagesToKeep];
         (0, log_1.logDebug)(`[Compact] Final messages count: ${finalMessages.length}, kept current turn: ${messagesToKeep.length} messages`);
-        return finalMessages;
+        return {
+            changed: true,
+            messages: finalMessages,
+            mode: compactResult.kind,
+        };
     }
-    catch (error) {
-        (0, log_1.logError)(`Auto-compact failed completely: ${error}. Continuing with original messages`);
-        return messages;
+    if (compactResult.kind === 'unchanged') {
+        return { changed: false, messages };
     }
+    (0, log_1.logError)(`Auto-compact failed completely: ${compactResult.error}. Continuing with original messages`);
+    return { changed: false, messages, error: compactResult.error };
 }
 /**
  * Null Tool - 用于占位避免工具调用
@@ -259,7 +348,7 @@ exports.NULL_TOOL = {
  * 1. 压缩传入的历史对话消息
  * 2. 返回结构：[压缩指令(user), 压缩摘要(assistant+usage)]
  *
- * 注意：新用户消息的分离和添加由 checkAutoCompact 统一处理
+ * 注意：新用户消息的分离和添加由 autoCompact 统一处理
  */
 async function executeAutoCompact(messages, abortController) {
     // 使用 null tool 作为占位，避免模型调用任何工具
@@ -269,30 +358,24 @@ async function executeAutoCompact(messages, abortController) {
         ...(0, message_1.prepareMessagesForApi)([...messages]),
         (0, message_1.buildUserMsg)(compact_1.COMPRESSION_PROMPT)
     ];
-    const summaryResponse = await (0, queryLLM_1.queryLLM)(messagesWithPrompt, [
+    const summaryResponse = await compactDependencies.queryLLM(messagesWithPrompt, [
         {
             type: 'text',
             text: 'An AI assistant that helps summarize coding conversations.'
         }
     ], abortController.signal, tools, { modelPointer: 'main', disableChunkEvents: true });
-    // 解析 summary 结果，兼容 Anthropic 和 OpenAI 两种格式
-    const content = summaryResponse.message.content;
-    let summary = null;
-    if (typeof content === 'string') {
-        // OpenAI 格式：content 直接是字符串
-        summary = content;
+    if (isInvalidCompactResponse(summaryResponse)) {
+        return {
+            kind: 'invalid',
+            reason: 'INVALID_COMPACT_RESPONSE',
+        };
     }
-    else if (Array.isArray(content)) {
-        // Anthropic 格式：content 是 ContentBlock[] 数组
-        const textBlock = content.find(block => block.type === 'text');
-        summary = textBlock?.type === 'text' ? textBlock.text : null;
-    }
-    if (!summary || summary.trim().length === 0) {
-        // 压缩失败时的备用策略：尝试简单截断而不是完全失败
-        const contextLimit = getContextLimit();
-        const targetLimit = contextLimit * 0.5; // 截断到50%容量
-        (0, log_1.logError)('压缩生成摘要失败，使用截断策略作为备用方案');
-        return truncateMessages(messages, targetLimit);
+    const summary = extractSummaryText(summaryResponse);
+    if (summary.trim().length === 0) {
+        return {
+            kind: 'invalid',
+            reason: 'EMPTY_SUMMARY',
+        };
     }
     // 压缩后的消息结构：
     // 1. User: 压缩通知
@@ -308,6 +391,9 @@ The conversation has been automatically compressed due to token limit. Below is
     const originalUsage = summaryResponse.message.usage;
     const estimatedNoticeTokens = 30;
     const summaryTokens = originalUsage.completion_tokens || originalUsage.output_tokens || 0;
+    const correctedInputTokens = estimatedNoticeTokens + summaryTokens;
+    const originalInputTokens = originalUsage.input_tokens ?? originalUsage.prompt_tokens ?? 0;
+    const originalOutputTokens = originalUsage.output_tokens ?? originalUsage.completion_tokens ?? 0;
     // 创建修正后的 summary message
     const correctedSummaryMessage = {
         ...summaryResponse,
@@ -316,19 +402,22 @@ The conversation has been automatically compressed due to token limit. Below is
             usage: {
                 ...originalUsage,
                 // 修正 input_tokens：压缩通知 + 摘要内容
-                input_tokens: estimatedNoticeTokens + summaryTokens,
+                input_tokens: correctedInputTokens,
                 // 修正 output_tokens：摘要内容
                 output_tokens: summaryTokens,
                 // 如果是 OpenAI 格式，也要修正
-                prompt_tokens: estimatedNoticeTokens + summaryTokens,
+                prompt_tokens: correctedInputTokens,
                 completion_tokens: summaryTokens,
             }
         }
     };
-    // logDebug(`[Compact] Original usage: input=${originalUsage.input_tokens || originalUsage.prompt_tokens}, output=${originalUsage.output_tokens || originalUsage.completion_tokens}`)
-    // logDebug(`[Compact] Corrected usage: input=${estimatedNoticeTokens + summaryTokens}, output=${summaryTokens}`)
+    (0, log_1.logDebug)(`[Compact] Corrected summary usage: originalInput=${originalInputTokens}, originalOutput=${originalOutputTokens}, correctedInput=${correctedInputTokens}, correctedOutput=${summaryTokens}`);
     // 构建压缩后的消息列表（只包含压缩通知和摘要，不包含新用户消息）
     const compactedMessages = [compactNoticeMessage, correctedSummaryMessage];
-    return compactedMessages;
+    return {
+        kind: 'summary',
+        messages: compactedMessages,
+        summary,
+    };
 }
 //# sourceMappingURL=compact.js.map

package/dist/util/compact.js.map

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

package/dist/util/fileReference.js

@@ -159,7 +159,7 @@ async function processSingleReference(match, agentContext, fileReadTool) {
     const fullReference = match[0]; // 完整的引用字符串，如 @index.js:13-17
     const referenceText = match[1]; // 去掉@的部分，如 index.js:13-17
     // 解析文件引用
-    const parsed = parseFileReference(referenceText);
+    const parsed = parseFileReference((referenceText ?? match[2]));
     const fullPath = (0, file_1.canonicalizeFilePath)(parsed.fileName);
     (0, log_1.logInfo)(`Processing file reference: ${fullReference} -> ${fullPath}${parsed.startLine ? `:${parsed.startLine}${parsed.endLine !== parsed.startLine ? `-${parsed.endLine}` : ''}` : ''}`);
     try {
@@ -339,7 +339,7 @@ async function processFileReferences(userInput, agentContext) {
     // 不含 . : / \ 等路径合法字符，避免截断文件名/路径
     // 左边界：@ 必须位于行首或边界字符之后（避免误匹配 email@example.com 等）
     // 右边界：遇到边界字符则停止
-    const fileReferenceRegex = /(?:^|(?<=[\s。，、；：！？""''「」『』（）《》〈〉【】,;!?]))@([^\s。，、；：！？""''「」『』（）《》〈〉【】,;!?]+)/g;
+    const fileReferenceRegex = /(?:^|(?<=[\s。，、；：！？""''「」『』（）《》〈〉【】,;!?]))@(?:"([^"]+)"|([^\s。，、；：！？""''「」『』（）《》〈〉【】,;!?]+))/g;
     const allMatches = [...userInput.matchAll(fileReferenceRegex)];
     // 如果没有找到文件引用,直接返回
     if (allMatches.length === 0) {
@@ -348,7 +348,7 @@ async function processFileReferences(userInput, agentContext) {
     // 对文件引用进行去重，保持首次出现的顺序
     const seen = new Set();
     const matches = allMatches.filter(match => {
-        const ref = match[1];
+        const ref = (match[1] ?? match[2]);
         if (seen.has(ref)) {
             return false;
         }