@earendil-works/pi-coding-agent 0.79.9 → 0.80.1

package/dist/core/agent-session.js

@@ -14,7 +14,7 @@
  */
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { basename, dirname } from "node:path";
-import { clampThinkingLevel, cleanupSessionResources, getSupportedThinkingLevels, isContextOverflow, modelsAreEqual, resetApiProviders, streamSimple, } from "@earendil-works/pi-ai";
+import { clampThinkingLevel, cleanupSessionResources, getSupportedThinkingLevels, isContextOverflow, modelsAreEqual, resetApiProviders, streamSimple, } from "@earendil-works/pi-ai/compat";
 import { getThemeByName, theme } from "../modes/interactive/theme/theme.js";
 import { stripFrontmatter } from "../utils/frontmatter.js";
 import { resolvePath } from "../utils/paths.js";
@@ -1300,6 +1300,8 @@ export class AgentSession {
                     preparation,
                     branchEntries: pathEntries,
                     customInstructions,
+                    reason: "manual",
+                    willRetry: false,
                     signal: this._compactionAbortController.signal,
                 }));
                 if (result?.cancel) {
@@ -1344,6 +1346,8 @@ export class AgentSession {
                     type: "session_compact",
                     compactionEntry: savedCompactionEntry,
                     fromExtension,
+                    reason: "manual",
+                    willRetry: false,
                 });
             }
             const compactionResult = {
@@ -1455,10 +1459,12 @@ export class AgentSession {
             return await this._runAutoCompaction("overflow", willRetry);
         }
         // Case 2: Threshold - context is getting large
-        // For error messages (no usage data), estimate from last successful response.
-        // This ensures sessions that hit persistent API errors (e.g. 529) can still compact.
+        // For error messages or all-zero usage messages, estimate from the last valid response.
+        // This ensures sessions that hit persistent API errors (e.g. 529) or malformed zero-usage
+        // responses can still compact and do not reset context accounting.
         let contextTokens;
-        if (assistantMessage.stopReason === "error") {
+        const directContextTokens = assistantMessage.usage ? calculateContextTokens(assistantMessage.usage) : 0;
+        if (assistantMessage.stopReason === "error" || directContextTokens === 0) {
             const messages = this.agent.state.messages;
             const estimate = estimateContextTokens(messages);
             if (estimate.lastUsageIndex === null)
@@ -1475,7 +1481,7 @@ export class AgentSession {
             contextTokens = estimate.tokens;
         }
         else {
-            contextTokens = calculateContextTokens(assistantMessage.usage);
+            contextTokens = directContextTokens;
         }
         if (shouldCompact(contextTokens, contextWindow, settings)) {
             return await this._runAutoCompaction("threshold", false);
@@ -1523,6 +1529,8 @@ export class AgentSession {
                     preparation,
                     branchEntries: pathEntries,
                     customInstructions: undefined,
+                    reason,
+                    willRetry,
                     signal: this._autoCompactionAbortController.signal,
                 }));
                 if (extensionResult?.cancel) {
@@ -1581,6 +1589,8 @@ export class AgentSession {
                     type: "session_compact",
                     compactionEntry: savedCompactionEntry,
                     fromExtension,
+                    reason,
+                    willRetry,
                 });
             }
             const result = {
@@ -1935,7 +1945,7 @@ export class AgentSession {
             includeAllExtensionTools: options.includeAllExtensionTools,
         });
     }
-    async reload() {
+    async reload(options) {
         const previousFlagValues = this._extensionRunner.getFlagValues();
         await emitSessionShutdownEvent(this._extensionRunner, { type: "session_shutdown", reason: "reload" });
         await this.settingsManager.reload();
@@ -1952,6 +1962,7 @@ export class AgentSession {
             this._extensionShutdownHandler ||
             this._extensionErrorListener;
         if (hasBindings) {
+            await options?.beforeSessionStart?.();
             await this._extensionRunner.emit({ type: "session_start", reason: "reload" });
             await this.extendResourcesFromExtensions("reload");
         }
@@ -2415,8 +2426,8 @@ export class AgentSession {
                         const contextTokens = calculateContextTokens(assistant.usage);
                         if (contextTokens > 0) {
                             hasPostCompactionUsage = true;
+                            break;
                         }
-                        break;
                     }
                 }
             }