@code-yeongyu/senpi 2026.5.16 → 2026.5.18-2

package/dist/core/agent-session.js

@@ -15,7 +15,7 @@
 import { randomUUID } from "node:crypto";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { basename, dirname, resolve } from "node:path";
-import { cleanupSessionResources, isContextOverflow, modelsAreEqual, resetApiProviders } from "@earendil-works/pi-ai";
+import { cleanupSessionResources, isContextOverflow, modelsAreEqual, resetApiProviders, streamSimple, } from "@earendil-works/pi-ai";
 import { expandTildePath } from "../config.js";
 import { theme } from "../modes/interactive/theme/theme.js";
 import { stripFrontmatter } from "../utils/frontmatter.js";
@@ -97,6 +97,7 @@ export class AgentSession {
     _retryAttempt = 0;
     _retryPromise = undefined;
     _retryResolve = undefined;
+    _userAbortPromise = undefined;
     // Bash execution state
     _bashAbortController = undefined;
     _pendingBashMessages = [];
@@ -150,6 +151,19 @@ export class AgentSession {
         }
         this._unsubscribeAgent = this.agent.subscribe(this._handleAgentEvent);
         this._installAgentToolHooks();
+        const previousPrepareNextTurn = this.agent.prepareNextTurn;
+        this.agent.prepareNextTurn = async (signal) => {
+            const nextTurn = await previousPrepareNextTurn?.(signal);
+            const model = this.agent.state.model;
+            if (!model) {
+                return nextTurn;
+            }
+            return {
+                ...nextTurn,
+                model,
+                thinkingLevel: this.agent.state.thinkingLevel,
+            };
+        };
         this._buildRuntime({
             activeToolNames: this._initialActiveToolNames,
             includeAllExtensionTools: true,
@@ -178,6 +192,13 @@ export class AgentSession {
         }
         throw new Error(formatNoApiKeyFoundMessage(model.provider));
     }
+    async _getCompactionRequestAuth(model) {
+        if (this.agent.streamFn === streamSimple) {
+            return this._getRequiredRequestAuth(model);
+        }
+        const result = await this._modelRegistry.getApiKeyAndHeaders(model);
+        return result.ok ? { apiKey: result.apiKey, headers: result.headers, extraBody: result.extraBody } : {};
+    }
     /**
      * Install tool hooks once on the Agent instance.
      *
@@ -746,6 +767,10 @@ export class AgentSession {
      * @throws Error if no model selected or no API key available (when not streaming)
      */
     async prompt(text, options) {
+        const userAbortPromise = this._userAbortPromise;
+        if (userAbortPromise) {
+            await userAbortPromise;
+        }
         const expandPromptTemplates = options?.expandPromptTemplates ?? true;
         const preflightResult = options?.preflightResult;
         let messages;
@@ -1115,8 +1140,24 @@ export class AgentSession {
      */
     async abort() {
         this.abortRetry();
-        this.agent.abort();
-        await this.agent.waitForIdle();
+        if (this._userAbortPromise) {
+            this.agent.abort();
+            await this._userAbortPromise;
+            return;
+        }
+        const abortPromise = (async () => {
+            this.agent.abort();
+            await this.agent.waitForIdle();
+        })();
+        this._userAbortPromise = abortPromise;
+        try {
+            await abortPromise;
+        }
+        finally {
+            if (this._userAbortPromise === abortPromise) {
+                this._userAbortPromise = undefined;
+            }
+        }
     }
     // =========================================================================
     // Model Management
@@ -1485,8 +1526,8 @@ export class AgentSession {
                 }
             }
             if (!compactionResult) {
-                const { apiKey, headers, extraBody } = await this._getRequiredRequestAuth(this.model);
-                compactionResult = await compact(preparation, this.model, apiKey, headers, request.customInstructions, signal, extraBody, this.thinkingLevel);
+                const { apiKey, headers, extraBody } = await this._getCompactionRequestAuth(this.model);
+                compactionResult = await compact(preparation, this.model, apiKey, headers, request.customInstructions, signal, extraBody, this.thinkingLevel, this.agent.streamFn);
             }
         }
         if (signal.aborted) {
@@ -1724,7 +1765,7 @@ export class AgentSession {
                 return;
             }
             const authResult = await this._modelRegistry.getApiKeyAndHeaders(this.model);
-            if (!authResult.ok || !authResult.apiKey) {
+            if (this.agent.streamFn === streamSimple && (!authResult.ok || !authResult.apiKey)) {
                 if (reason === "overflow")
                     this._overflowRecoveryAttempted = false;
                 this._emit({