@averyyy/pi-coding-agent 1.0.0-piclient.1 → 1.0.0-piclient.2

package/dist/core/agent-session.js

@@ -344,6 +344,8 @@ export class AgentSession {
                 env: result.env,
             };
         }
+        if (isPiServerMode())
+            return { model };
         const isOAuth = this._modelRuntime.isUsingOAuth(model.provider);
         if (isOAuth) {
             throw new Error(`Authentication failed for "${model.provider}". ` +
@@ -361,7 +363,7 @@ export class AgentSession {
                 signal,
             })
             : { model: selectedModel, thinkingLevel: this.thinkingLevel };
-        if (this.agent.streamFunction === streamSimple) {
+        if (isPiServerMode() || this.agent.streamFunction === streamSimple) {
             return { ...(await this._getRequiredRequestAuth(model, signal)), thinkingLevel };
         }
         try {
@@ -2316,6 +2318,7 @@ export class AgentSession {
             return this._abortPromise;
         }
         if (this._isAborting) {
+            this._continueAfterAbortRequested ||= this.agent.hasQueuedMessages();
             this._abortError = undefined;
         }
         else {
@@ -2352,7 +2355,10 @@ export class AgentSession {
      * @throws Error if no auth is configured for the model
      */
     async setModel(model, options = {}) {
-        if (!(await this._modelRuntime.checkAuth(model.provider))) {
+        const hasAuth = isPiServerMode()
+            ? this._modelRuntime.hasConfiguredAuth(model.provider)
+            : await this._modelRuntime.checkAuth(model.provider);
+        if (!hasAuth) {
             throw new Error(`No API key for ${model.provider}/${model.id}`);
         }
         if (this.isStreaming) {
@@ -2968,6 +2974,7 @@ export class AgentSession {
         let started = false;
         let fromExtension = false;
         let cancelledByExtension = false;
+        let warmCancellationPending = false;
         if (externalSignal?.aborted)
             return false;
         const abortExternal = () => abortController?.abort();
@@ -2976,12 +2983,21 @@ export class AgentSession {
             if (!model) {
                 return false;
             }
+            this._cacheWarmer?.cancel();
             if (isPiServerMode()) {
                 abortController = new AbortController();
                 this._autoCompactionAbortController = abortController;
                 started = true;
                 this._emit({ type: "compaction_start", reason });
                 abortController.signal.throwIfAborted();
+                if (this._cacheWarmer) {
+                    // A warm replay can update static context. Confirm its remote cancellation
+                    // before compaction captures the session revision and synchronizes the tree.
+                    warmCancellationPending = true;
+                    await cancelPiServerOperations(this.sessionId);
+                    warmCancellationPending = false;
+                    abortController.signal.throwIfAborted();
+                }
                 const { model: requestModel, apiKey, headers, thinkingLevel, } = await this._getSummarizationRequestAuth(model, abortController.signal);
                 abortController.signal.throwIfAborted();
                 const cacheInput = await this._buildCompactionCacheInput(requestModel);
@@ -3142,6 +3158,17 @@ export class AgentSession {
                     fromExtension,
                 });
             }
+            if (warmCancellationPending) {
+                // Agent core records thrown preparation failures as assistant errors.
+                // Keep unconfirmed cancellation terminal until an explicit abort retry.
+                this._agentRunAbortRequested = true;
+                this._isAborting = true;
+                this._continueAfterAbortRequested ||= this.agent.hasQueuedMessages();
+                this._abortError = message;
+                this._abortPromise = undefined;
+                this._emit({ type: "abort_error", errorMessage: message });
+                throw error;
+            }
             return false;
         }
         finally {