@ashx-j/lunr 0.2.15 → 0.2.16

package/dist/core/agent-session.js

@@ -98,6 +98,7 @@ export class AgentSession {
     _pendingNextTurnMessages = [];
     // Compaction state
     _compactionAbortController = undefined;
+    _manualCompactionPromise = undefined;
     _autoCompactionAbortController = undefined;
     _overflowRecoveryAttempted = false;
     // Branch summarization state
@@ -330,7 +331,19 @@ export class AgentSession {
                 : undefined);
         this.agent.prepareNextTurnWithContext = async (turn, signal) => {
             const previousSnapshot = await previousPrepareNextTurnWithContext?.(turn, signal);
-            const previousContext = previousSnapshot?.context ?? turn.context;
+            let previousContext = previousSnapshot?.context ?? turn.context;
+            const model = this.model;
+            const settings = this.settingsManager.getCompactionSettings();
+            if (model?.provider === "openai-codex" &&
+                settings.enabled &&
+                shouldCompact(estimateContextTokens(previousContext.messages).tokens, model.contextWindow, settings)) {
+                const previousCompactionId = getLatestCompactionEntry(this.sessionManager.getBranch())?.id;
+                await this._runAutoCompaction("threshold", true);
+                const currentCompaction = getLatestCompactionEntry(this.sessionManager.getBranch());
+                if (currentCompaction && currentCompaction.id !== previousCompactionId) {
+                    previousContext = { ...previousContext, messages: this.agent.state.messages.slice() };
+                }
+            }
             return {
                 ...previousSnapshot,
                 context: {
@@ -1517,14 +1530,48 @@ export class AgentSession {
     // =========================================================================
     // Compaction
     // =========================================================================
+    _latestCompactionResult() {
+        const pathEntries = this.sessionManager.getBranch();
+        const lastEntry = pathEntries[pathEntries.length - 1];
+        if (lastEntry?.type !== "compaction")
+            return undefined;
+        return {
+            summary: lastEntry.summary,
+            firstKeptEntryId: lastEntry.firstKeptEntryId,
+            tokensBefore: lastEntry.tokensBefore,
+            estimatedTokensAfter: estimateMessagesTokens(this.sessionManager.buildSessionContext().messages),
+            details: lastEntry.details,
+        };
+    }
     /**
      * Manually compact the session context.
      * Aborts current agent operation first.
      * @param customInstructions Optional instructions for the compaction summary
      */
     async compact(customInstructions) {
+        const existing = this._latestCompactionResult();
+        if (existing)
+            return existing;
+        if (this._manualCompactionPromise)
+            return this._manualCompactionPromise;
+        const promise = this._compact(customInstructions);
+        this._manualCompactionPromise = promise;
+        try {
+            return await promise;
+        }
+        finally {
+            if (this._manualCompactionPromise === promise)
+                this._manualCompactionPromise = undefined;
+        }
+    }
+    async _compact(customInstructions) {
         this._disconnectFromAgent();
         await this.abort();
+        const existing = this._latestCompactionResult();
+        if (existing) {
+            this._reconnectToAgent();
+            return existing;
+        }
         this._compactionAbortController = new AbortController();
         this._emit({ type: "compaction_start", reason: "manual" });
         try {
@@ -1743,12 +1790,11 @@ export class AgentSession {
      * Internal: Run auto-compaction with events.
      */
     async _runAutoCompaction(reason, willRetry) {
+        if (!this.model || this._compactionAbortController || this._autoCompactionAbortController)
+            return false;
         const settings = this.settingsManager.getCompactionSettings();
         let started = false;
         try {
-            if (!this.model) {
-                return false;
-            }
             let apiKey;
             let headers;
             let env;