@averyyy/pi-coding-agent 0.82.1-piclient.4 → 0.82.1-piclient.6

package/dist/core/agent-session.js

@@ -32,7 +32,6 @@ import { emitSessionShutdownEvent } from "./extensions/runner.js";
 import { ModelRegistry } from "./model-registry.js";
 import { acknowledgePiServerCompaction, acknowledgePiServerRunMessage, acquirePiServerSessionLease, compactPiServer, getPiServerRunDiagnostic, recordPiServerCompactionApplied, recoverPendingPiServerCompaction, releasePiServerRunLease, releasePiServerSessionLease, syncPiServerTree, } from "./pi-server-client.js";
 import { getPiServerCompactStatePath, readPiServerPendingCompact } from "./pi-server-compact-state.js";
-import { assertPiServerProviderExecution, } from "./pi-server-provider-execution.js";
 import { getPiServerRunStatePath, readPiServerPendingRun } from "./pi-server-run-state.js";
 import { expandPromptTemplate } from "./prompt-templates.js";
 import { CURRENT_SESSION_VERSION, getLatestCompactionEntry } from "./session-manager.js";
@@ -377,14 +376,14 @@ export class AgentSession {
         const compactStatePath = getPiServerCompactStatePath(sessionFile);
         if (!readPiServerPendingCompact(compactStatePath))
             return undefined;
-        const result = await recoverPendingPiServerCompaction(this.sessionId, { entries: this.sessionManager.getEntries(), leafId: this.sessionManager.getLeafId() }, compactStatePath, { signal });
+        const result = await recoverPendingPiServerCompaction(this.sessionId, { entries: this.sessionManager.getEntries(), leafId: this.sessionManager.getLeafId() }, compactStatePath, {
+            signal,
+            onHistoryReconciled: (snapshot) => this.reconcilePiServerHistory(snapshot),
+        });
         if (!result)
             return undefined;
         return this._applyPiServerCompactionResult(result, reason, willRetry);
     }
-    _assertPiServerProviderExecution(model) {
-        return assertPiServerProviderExecution(this._modelRuntime, model, this._extensionRunner);
-    }
     async _getRequiredRequestAuth(model) {
         let result;
         try {
@@ -1121,9 +1120,6 @@ export class AgentSession {
     // Prompting
     // =========================================================================
     async _runAgentPrompt(messages) {
-        if (isPiServerMode() && this.model) {
-            this._assertPiServerProviderExecution(this.model);
-        }
         const piServerLease = this._acquirePiServerOperationLease();
         this._resetValidationHintState();
         this._isAgentRunActive = true;
@@ -1320,9 +1316,6 @@ export class AgentSession {
             if (!this.model) {
                 throw new Error(formatNoModelSelectedMessage());
             }
-            if (isPiServerMode()) {
-                this._assertPiServerProviderExecution(this.model);
-            }
             const hasConfiguredAuth = this._modelRuntime.hasConfiguredAuth(this.model.provider) ||
                 (await this._modelRuntime.checkAuth(this.model.provider)) !== undefined;
             if (!hasConfiguredAuth) {
@@ -1896,7 +1889,6 @@ export class AgentSession {
      * @param customInstructions Optional instructions for the compaction summary
      */
     async compact(customInstructions) {
-        const piServerExecution = isPiServerMode() && this.model ? this._assertPiServerProviderExecution(this.model) : undefined;
         this._disconnectFromAgent();
         await this.abort();
         this._compactionAbortController = new AbortController();
@@ -1978,7 +1970,6 @@ export class AgentSession {
                     extensionCompaction,
                     retry: this.settingsManager.getRetrySettings(),
                     sessionTree: { entries: this.sessionManager.getEntries(), leafId: this.sessionManager.getLeafId() },
-                    providerExecutionFingerprint: piServerExecution?.providerExecutionFingerprint,
                     piServerCompactStatePath: getPiServerCompactStatePath(sessionFile),
                     signal: this._compactionAbortController.signal,
                     reasoning: toProviderReasoning(this.thinkingLevel),
@@ -2124,9 +2115,6 @@ export class AgentSession {
         // but must not retry: the assistant answer already completed and agent.continue() cannot
         // continue from an assistant message.
         if (sameModel && isContextOverflow(assistantMessage, contextWindow)) {
-            if (isPiServerMode() && this.model) {
-                this._assertPiServerProviderExecution(this.model);
-            }
             const willRetry = assistantMessage.stopReason !== "stop";
             if (!willRetry) {
                 return await this._runAutoCompaction("overflow", false);
@@ -2185,9 +2173,6 @@ export class AgentSession {
             contextTokens = directContextTokens;
         }
         if (shouldCompact(contextTokens, contextWindow, settings)) {
-            if (isPiServerMode() && this.model) {
-                this._assertPiServerProviderExecution(this.model);
-            }
             return await this._runAutoCompaction("threshold", false);
         }
         return false;
@@ -2198,7 +2183,6 @@ export class AgentSession {
     async _runAutoCompaction(reason, willRetry, preparationOverride, preparationOptions) {
         const settings = this.settingsManager.getCompactionSettings();
         const model = this.model;
-        const piServerExecution = isPiServerMode() && model ? this._assertPiServerProviderExecution(model) : undefined;
         let started = false;
         let piServerLease = {
             path: undefined,
@@ -2280,7 +2264,6 @@ export class AgentSession {
                     preparation: preparationOptions ?? { firstKeptEntryId: preparation.firstKeptEntryId },
                     extensionCompaction,
                     sessionTree: { entries: this.sessionManager.getEntries(), leafId: this.sessionManager.getLeafId() },
-                    providerExecutionFingerprint: piServerExecution?.providerExecutionFingerprint,
                     piServerCompactStatePath: getPiServerCompactStatePath(sessionFile),
                     signal,
                     reasoning: toProviderReasoning(this.thinkingLevel),
@@ -2428,9 +2411,6 @@ export class AgentSession {
         }
         const settings = this.settingsManager.getCompactionSettings();
         const markerParentId = this.sessionManager.getLeafId();
-        if (isPiServerMode() && this.model) {
-            this._assertPiServerProviderExecution(this.model);
-        }
         const markerId = this._appendIntraTurnCompactionMarker();
         const preparationOptions = { firstKeptEntryId: markerId };
         const branchWithMarker = this.sessionManager.getBranch();
@@ -3039,9 +3019,6 @@ export class AgentSession {
      * @returns Result with editorText (if user message) and cancelled status
      */
     async navigateTree(targetId, options = {}) {
-        if (isPiServerMode() && options.summarize && this.model) {
-            this._assertPiServerProviderExecution(this.model);
-        }
         const oldLeafId = this.sessionManager.getLeafId();
         // No-op if already at target
         if (targetId === oldLeafId) {