@earendil-works/pi-coding-agent 0.84.3 → 0.85.0

package/dist/core/agent-session.js

@@ -91,6 +91,8 @@ export class AgentSession {
     _followUpMessages = [];
     /** Messages queued to be included with the next user prompt as context ("asides"). */
     _pendingNextTurnMessages = [];
+    /** Context-only custom messages queued during a run, flushed once the current turn's tool results are in. */
+    _pendingCustomMessages = [];
     // Compaction state
     _compactionAbortController = undefined;
     _autoCompactionAbortController = undefined;
@@ -269,18 +271,33 @@ export class AgentSession {
             };
         };
     }
+    async _compactBeforeNextAssistantResponse(context) {
+        const model = this.model;
+        const settings = this.settingsManager.getCompactionSettings();
+        if (!model ||
+            model.contextWindow <= 0 ||
+            !shouldCompact(estimateContextTokens(context.messages).tokens, model.contextWindow, settings)) {
+            return context;
+        }
+        await this._runAutoCompaction("threshold", false);
+        return {
+            ...context,
+            messages: this.agent.state.messages.slice(),
+        };
+    }
     _installAgentNextTurnRefresh() {
         const previousPrepareNextTurnWithContext = this.agent.prepareNextTurnWithContext ??
             (this.agent.prepareNextTurn
                 ? async (_turn, signal) => await this.agent.prepareNextTurn?.(signal)
                 : undefined);
         this.agent.prepareNextTurnWithContext = async (turn, signal) => {
-            const previousSnapshot = await previousPrepareNextTurnWithContext?.(turn, signal);
-            const previousContext = previousSnapshot?.context ?? turn.context;
+            const context = await this._compactBeforeNextAssistantResponse(turn.context);
+            const previousSnapshot = await previousPrepareNextTurnWithContext?.({ ...turn, context }, signal);
+            const nextContext = previousSnapshot?.context ?? context;
             return {
                 ...previousSnapshot,
                 context: {
-                    ...previousContext,
+                    ...nextContext,
                     systemPrompt: this._systemPromptOverride ?? this._baseSystemPrompt,
                     tools: this.agent.state.tools.slice(),
                 },
@@ -319,7 +336,7 @@ export class AgentSession {
         return this._idleWaitPromise;
     }
     _resolveIdleWaitIfIdle() {
-        if (this._isAgentRunActive || !this._resolveIdleWait) {
+        if (!this.isIdle || !this._resolveIdleWait) {
             return;
         }
         const resolve = this._resolveIdleWait;
@@ -400,6 +417,14 @@ export class AgentSession {
                 }
             }
         }
+        // A turn ends after its assistant message and every tool result has been appended,
+        // so this is the first point in the run where a context-only custom message can be
+        // inserted without landing between a tool call and its result. Flushing after the
+        // extension and listener dispatch above also picks up messages that turn_end
+        // handlers queued.
+        if (event.type === "turn_end") {
+            this._flushPendingCustomMessages();
+        }
     };
     _willRetryAfterAgentEnd(event) {
         const settings = this.settingsManager.getRetrySettings();
@@ -591,9 +616,9 @@ export class AgentSession {
     get isStreaming() {
         return this._isAgentRunActive;
     }
-    /** Whether the session has no active agent run, retry, auto-compaction, or queued continuation. */
+    /** Whether the session has no active agent run, compaction, branch summary, retry, or queued continuation. */
     get isIdle() {
-        return !this._isAgentRunActive;
+        return !this._isAgentRunActive && !this.isCompacting;
     }
     /** Current effective system prompt (includes any per-turn extension modifications) */
     get systemPrompt() {
@@ -755,6 +780,7 @@ export class AgentSession {
         finally {
             this._systemPromptOverride = undefined;
             this._flushPendingBashMessages();
+            this._flushPendingCustomMessages();
             await this._emitAgentSettled();
         }
     }
@@ -844,8 +870,9 @@ export class AgentSession {
                 preflightResult?.(true);
                 return;
             }
-            // Flush any pending bash messages before the new prompt
+            // Flush any pending bash and custom messages before the new prompt
             this._flushPendingBashMessages();
+            this._flushPendingCustomMessages();
             // Validate model
             if (!this.model) {
                 throw new Error(formatNoModelSelectedMessage());
@@ -1059,8 +1086,9 @@ export class AgentSession {
     /**
      * Send a custom message to the session. Creates a CustomMessageEntry.
      *
-     * Handles three cases:
+     * Handles four cases:
      * - Streaming: queues message, processed when loop pulls from queue
+     * - Streaming + triggerTurn false: appended to state/session once the current turn ends
      * - Not streaming + triggerTurn: appends to state/session, starts new turn
      * - Not streaming + no trigger: appends to state/session, no turn
      *
@@ -1092,11 +1120,34 @@ export class AgentSession {
         else if (options?.triggerTurn) {
             await this._runAgentPrompt(appMessage);
         }
+        else if (this.isStreaming) {
+            // Appending now would put the message between an assistant tool call and its
+            // result, which providers that validate message order reject on replay. Defer
+            // to the end of the turn. Nothing is emitted yet: message events must not
+            // describe messages the session tree does not contain.
+            this._pendingCustomMessages.push(appMessage);
+        }
         else {
-            this.agent.state.messages.push(appMessage);
-            this.sessionManager.appendCustomMessageEntry(message.customType, message.content, message.display, message.details);
-            this._emit({ type: "message_start", message: appMessage });
-            this._emit({ type: "message_end", message: appMessage });
+            this._appendCustomMessage(appMessage);
+        }
+    }
+    _appendCustomMessage(appMessage) {
+        this.agent.state.messages.push(appMessage);
+        this.sessionManager.appendCustomMessageEntry(appMessage.customType, appMessage.content, appMessage.display, appMessage.details);
+        this._emit({ type: "message_start", message: appMessage });
+        this._emit({ type: "message_end", message: appMessage });
+    }
+    /**
+     * Append custom messages queued while the agent was running.
+     * Called once the current turn's tool results are in agent state and session history.
+     */
+    _flushPendingCustomMessages() {
+        if (this._pendingCustomMessages.length === 0)
+            return;
+        const pending = this._pendingCustomMessages;
+        this._pendingCustomMessages = [];
+        for (const appMessage of pending) {
+            this._appendCustomMessage(appMessage);
         }
     }
     /**
@@ -1170,6 +1221,8 @@ export class AgentSession {
      */
     async abort() {
         this.abortRetry();
+        this.abortCompaction();
+        this.abortBranchSummary();
         this.agent.abort();
         await this.waitForIdle();
     }
@@ -1208,6 +1261,7 @@ export class AgentSession {
         this.sessionManager.appendModelChange(model.provider, model.id);
         if (options.persist) {
             this.settingsManager.setDefaultModelAndProvider(model.provider, model.id);
+            this._addPersistedDefaultToNonEmptyScope(model);
         }
         // Apply thinking level for the new model.
         // Per-model thinking level overrides take priority over the global default.
@@ -1215,6 +1269,20 @@ export class AgentSession {
         this.setThinkingLevel(thinkingLevel);
         await this._emitModelSelect(model, previousModel, "set");
     }
+    _addPersistedDefaultToNonEmptyScope(model) {
+        if (this._scopedModels.length === 0)
+            return;
+        if (this._scopedModels.some((scoped) => modelsAreEqual(scoped.model, model)))
+            return;
+        this._scopedModels = [...this._scopedModels, { model }];
+        const enabledModels = this.settingsManager.getEnabledModels();
+        if (!enabledModels?.length)
+            return;
+        const modelReference = `${model.provider}/${model.id}`;
+        if (enabledModels.some((pattern) => pattern.toLowerCase() === modelReference.toLowerCase()))
+            return;
+        this.settingsManager.setEnabledModels([...enabledModels, modelReference]);
+    }
     /**
      * Cycle to next/previous model.
      * Uses scoped models (from --models flag) if available, otherwise all available models.
@@ -1245,6 +1313,7 @@ export class AgentSession {
         this.sessionManager.appendModelChange(next.model.provider, next.model.id);
         if (options.persist) {
             this.settingsManager.setDefaultModelAndProvider(next.model.provider, next.model.id);
+            this._addPersistedDefaultToNonEmptyScope(next.model);
         }
         // Apply thinking level for the new model.
         // - Explicit scoped model thinking level overrides defaults
@@ -1271,6 +1340,7 @@ export class AgentSession {
         this.sessionManager.appendModelChange(nextModel.provider, nextModel.id);
         if (options.persist) {
             this.settingsManager.setDefaultModelAndProvider(nextModel.provider, nextModel.id);
+            this._addPersistedDefaultToNonEmptyScope(nextModel);
         }
         // Apply thinking level for the new model.
         // Model persistence does not implicitly rewrite the global thinking default.
@@ -1382,6 +1452,10 @@ export class AgentSession {
     async _runDefaultCompaction(preparation, requestModel, apiKey, headers, customInstructions, signal, env, reason) {
         return compact(preparation, requestModel, apiKey, headers, customInstructions, signal, this.thinkingLevel, this.agent.streamFunction, env, this.settingsManager.getRetrySettings(), this._summarizationRetryCallbacks({ source: "compaction", reason }), undefined);
     }
+    _clearManualCompactionState() {
+        this._compactionAbortController = undefined;
+        this._resolveIdleWaitIfIdle();
+    }
     /**
      * Manually compact the session context.
      *
@@ -1487,7 +1561,7 @@ export class AgentSession {
                 details,
             };
             // compaction_end listeners may submit queued prompts, so expose idle state before notifying them.
-            this._compactionAbortController = undefined;
+            this._clearManualCompactionState();
             this._emit({
                 type: "compaction_end",
                 reason: "manual",
@@ -1501,7 +1575,7 @@ export class AgentSession {
             const message = error instanceof Error ? error.message : String(error);
             const aborted = message === "Compaction cancelled" || (error instanceof Error && error.name === "AbortError");
             const errorMessage = aborted ? undefined : `Compaction failed: ${message}`;
-            this._compactionAbortController = undefined;
+            this._clearManualCompactionState();
             this._emit({
                 type: "compaction_end",
                 reason: "manual",
@@ -1520,7 +1594,7 @@ export class AgentSession {
             throw error;
         }
         finally {
-            this._compactionAbortController = undefined;
+            this._clearManualCompactionState();
         }
     }
     /**
@@ -1816,6 +1890,7 @@ export class AgentSession {
         }
         finally {
             this._autoCompactionAbortController = undefined;
+            this._resolveIdleWaitIfIdle();
         }
     }
     /**
@@ -2552,6 +2627,7 @@ export class AgentSession {
         }
         finally {
             this._branchSummaryAbortController = undefined;
+            this._resolveIdleWaitIfIdle();
         }
     }
     /**