open-multi-agent-kit 1.2.0 → 1.2.2

package/dist/core/agent-session.js

@@ -31,10 +31,11 @@ import { formatNoApiKeyFoundMessage, formatNoModelSelectedMessage } from "./auth
 import { parseBangInvocation } from "./bang-skill-invocation.js";
 import { getCompactionHeadroomThreshold } from "./compaction/compaction.js";
 import { createCompactionHysteresisConfig, createCompactionHysteresisState, stepCompactionHysteresis, } from "./compaction/hysteresis.js";
-import { calculateContextTokens, collectEntriesForBranchSummary, compact, estimateContextTokens, estimateProjectedContextTokens, generateBranchSummary, prepareCompaction, resolveCompactionModel, summarizeWithFallback, } from "./compaction/index.js";
+import { calculateContextTokens, collectEntriesForBranchSummary, compact, estimateContextTokens, estimateProjectedContextTokens, generateBranchSummary, prepareCompaction, resolveCompactionModel, } from "./compaction/index.js";
 import { summarizeWithOAuthRecovery } from "./compaction/oauth-recovery.js";
 import { overflowRetryBlocked } from "./compaction/overflow-retry-guard.js";
 import { compactionEmitWillRetry } from "./compaction/resume-policy.js";
+import { summarizeSessionCompaction } from "./compaction/session-summary.js";
 import { isSessionModelOverflow, shouldSkipCompactionCheck } from "./compaction-gate.js";
 import { estimateToolResultReserve, } from "./context-budget-reserved-tokens.js";
 import { createDiskContextBudgetCacheProviderV2, DiskContextBudgetCacheProviderV2, } from "./context-budget-v2-cache-disk.js";
@@ -1867,6 +1868,9 @@ export class AgentSession {
                     return;
                 }
             }
+            if (this._compactionAbortController !== undefined) {
+                throw new Error("Cannot submit a prompt while compaction is in progress. Wait for compaction to finish and retry.");
+            }
             // Emit input event for extension interception (before skill/template expansion)
             let currentImages = options?.images;
             if (this._extensionRunner.hasHandlers("input")) {
@@ -1921,18 +1925,11 @@ export class AgentSession {
                 }
                 throw new Error(formatNoApiKeyFoundMessage(this.model.provider));
             }
-            // Check if we need to compact before sending (catches aborted responses)
+            // Check if we need to compact before sending (catches aborted responses).
+            // The user's new prompt is sent below, so do not call agent.continue() here.
             const lastAssistant = this._findLastAssistantMessage();
-            if (lastAssistant && (await this._checkCompaction(lastAssistant, false))) {
-                try {
-                    await this.agent.continue();
-                    while (await this._handlePostAgentRun()) {
-                        await this.agent.continue();
-                    }
-                }
-                finally {
-                    this._flushPendingBashMessages();
-                }
+            if (lastAssistant) {
+                await this._checkCompaction(lastAssistant, false);
             }
             // Auto thinking mode: resolve this turn's level from the prompt content.
             // Manual mode never enters the router, so /think <level> always wins.
@@ -2881,7 +2878,11 @@ export class AgentSession {
             apiKey: input.apiKey,
             provider: model.provider,
             refreshRejectedToken: (rejected) => this._modelRegistry.refreshRejectedOAuthToken(model, rejected),
-            run: (requestApiKey) => compact(input.preparation, model, requestApiKey, input.headers, input.customInstructions, input.signal, this.thinkingLevel, this.agent.streamFn, this.settingsManager.getRetrySettings(), this._summarizationRetryCallbacks({ source: "compaction", reason: input.reason }), this._compactionFailoverModels(model)),
+            run: (requestApiKey) => compact(input.preparation, model, requestApiKey, input.headers, input.customInstructions, input.signal, this.thinkingLevel, this.agent.streamFn, this.settingsManager.getRetrySettings(), this._summarizationRetryCallbacks({ source: "compaction", reason: input.reason }), this._compactionFailoverModels(model), {
+                // The primary's key belongs to its provider; each cross-provider
+                // candidate resolves its own credential or is skipped.
+                resolveCandidateAuth: (candidate) => this._getCompactionRequestAuth(candidate),
+            }),
         });
     }
     _compactionFailoverModels(primary) {
@@ -2959,7 +2960,10 @@ export class AgentSession {
                 details = extensionCompaction.details;
             }
             else {
-                const result = await this._summarizeCompaction({
+                // Same resilience ladder as auto-compaction: a quota-dead pinned
+                // compaction.model rescues onto the live session model, then a
+                // deterministic trim, instead of leaving /compact hard-failed.
+                const result = await summarizeSessionCompaction({
                     preparation,
                     model: compactionModel,
                     apiKey,
@@ -2967,6 +2971,9 @@ export class AgentSession {
                     customInstructions,
                     signal: this._compactionAbortController.signal,
                     reason: "manual",
+                    sessionModel: this.model,
+                    resolveAuth: (model) => this._getCompactionRequestAuth(model),
+                    summarize: (input) => this._summarizeCompaction(input),
                 });
                 summary = result.summary;
                 firstKeptEntryId = result.firstKeptEntryId;
@@ -3315,26 +3322,16 @@ export class AgentSession {
                 // Summarization can fail in a way no retry fixes (quota). The ladder
                 // tries the live session model, then a deterministic trim, because a
                 // failed compaction over the context window strands the whole run.
-                const signal = this._autoCompactionAbortController.signal;
-                const primaryModel = compactionModel;
-                const compactResult = await summarizeWithFallback({
+                const compactResult = await summarizeSessionCompaction({
                     preparation,
-                    primaryModel,
+                    model: compactionModel,
+                    apiKey,
+                    headers,
+                    signal: this._autoCompactionAbortController.signal,
+                    reason,
                     sessionModel: this.model,
-                    isAborted: () => signal.aborted,
-                    summarize: async (model) => {
-                        const auth = model.provider === primaryModel.provider && model.id === primaryModel.id
-                            ? { apiKey, headers }
-                            : await this._getCompactionRequestAuth(model);
-                        return this._summarizeCompaction({
-                            preparation,
-                            model,
-                            apiKey: auth.apiKey,
-                            headers: auth.headers,
-                            signal,
-                            reason,
-                        });
-                    },
+                    resolveAuth: (model) => this._getCompactionRequestAuth(model),
+                    summarize: (input) => this._summarizeCompaction(input),
                 });
                 summary = compactResult.summary;
                 firstKeptEntryId = compactResult.firstKeptEntryId;
@@ -4184,7 +4181,9 @@ export class AgentSession {
      */
     setSessionName(name) {
         this.sessionManager.appendSessionInfo(name);
-        this._emit({ type: "session_info_changed", name: this.sessionManager.getSessionName() });
+        const event = { type: "session_info_changed", name: this.sessionManager.getSessionName() };
+        this._emit(event);
+        void this._extensionRunner.emit(event);
     }
     // =========================================================================
     // Tree Navigation