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

package/dist/core/agent-session.js

@@ -14,6 +14,7 @@
  */
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { basename, dirname } from "node:path";
+import { contentText } from "@earendil-works/pi-ai";
 import { clampThinkingLevel, cleanupSessionResources, getSupportedThinkingLevels, isContextOverflow, isRetryableAssistantError, modelsAreEqual, resetApiProviders, streamSimple, } from "@earendil-works/pi-ai/compat";
 import { getThemeByName, theme } from "../modes/interactive/theme/theme.js";
 import { stripFrontmatter } from "../utils/frontmatter.js";
@@ -36,6 +37,7 @@ import { buildSystemPrompt } from "./system-prompt.js";
 import { createLocalBashOperations } from "./tools/bash.js";
 import { createAllToolDefinitions } from "./tools/index.js";
 import { createToolDefinitionFromAgentTool } from "./tools/tool-definition-wrapper.js";
+import { addUsageToTotals, createUsageTotals } from "./usage-totals.js";
 /**
  * Parse a skill block from message text.
  * Returns null if the text doesn't contain a skill block.
@@ -286,7 +288,7 @@ export class AgentSession {
         throw new Error(formatNoApiKeyFoundMessage(model.provider));
     }
     async _getSummarizationRequestAuth(model) {
-        if (this.agent.streamFn === streamSimple) {
+        if (this.agent.streamFunction === streamSimple) {
             return this._getRequiredRequestAuth(model);
         }
         try {
@@ -404,6 +406,7 @@ export class AgentSession {
                     content: result.content,
                     details: result.details,
                     isError,
+                    usage: result.usage,
                 })
                 : undefined;
             const finalContent = hookResult?.content ?? result.content;
@@ -416,6 +419,7 @@ export class AgentSession {
                 content: hookResult.content,
                 details: hookResult.details,
                 isError: hookResult.isError ?? isError,
+                usage: hookResult.usage,
             };
         };
     }
@@ -492,7 +496,7 @@ export class AgentSession {
         // This ensures the UI sees the updated queue state
         if (event.type === "message_start" && event.message.role === "user") {
             this._overflowRecoveryAttempted = false;
-            const messageText = this._getUserMessageText(event.message);
+            const messageText = contentText(event.message.content, "");
             if (messageText) {
                 // Check steering queue first
                 const steeringIndex = this._steeringMessages.indexOf(messageText);
@@ -568,16 +572,6 @@ export class AgentSession {
         }
         return false;
     }
-    /** Extract text content from a message */
-    _getUserMessageText(message) {
-        if (message.role !== "user")
-            return "";
-        const content = message.content;
-        if (typeof content === "string")
-            return content;
-        const textBlocks = content.filter((c) => c.type === "text");
-        return textBlocks.map((c) => c.text).join("");
-    }
     /** Find the last assistant message in agent state (including aborted ones) */
     _findLastAssistantMessage() {
         const messages = this.agent.state.messages;
@@ -1042,7 +1036,7 @@ export class AgentSession {
         if (!model || !transcript)
             return;
         try {
-            const stream = await this.agent.streamFn(model, {
+            const stream = await this.agent.streamFunction(model, {
                 systemPrompt: this.systemPrompt,
                 messages: [
                     {
@@ -1691,8 +1685,17 @@ export class AgentSession {
         this.sessionManager.replaceTree(result.entries, result.leafId);
         const sessionContext = this.sessionManager.buildSessionContext();
         this.agent.state.messages = sessionContext.messages;
+        const firstKeptEntryId = result.compaction.firstKeptEntryId;
+        if (!firstKeptEntryId) {
+            throw new Error("Pi-server compaction result is missing firstKeptEntryId");
+        }
+        const compaction = result.compaction;
         const compactionResult = {
-            ...result.compaction,
+            summary: compaction.summary,
+            firstKeptEntryId,
+            tokensBefore: compaction.tokensBefore,
+            usage: compaction.usage,
+            details: compaction.details,
             estimatedTokensAfter: estimateMessagesTokens(sessionContext.messages),
         };
         const savedCompactionEntry = this.sessionManager.getEntry(result.compactionEntry.id);
@@ -1784,26 +1787,29 @@ export class AgentSession {
             let summary;
             let firstKeptEntryId;
             let tokensBefore;
+            let usage;
             let details;
             if (extensionCompaction) {
                 // Extension provided compaction content
                 summary = extensionCompaction.summary;
                 firstKeptEntryId = extensionCompaction.firstKeptEntryId;
                 tokensBefore = extensionCompaction.tokensBefore;
+                usage = extensionCompaction.usage;
                 details = extensionCompaction.details;
             }
             else {
                 // Generate compaction result
-                const result = await compact(preparation, this.model, apiKey, headers, customInstructions, this._compactionAbortController.signal, this.thinkingLevel, this.agent.streamFn, env);
+                const result = await compact(preparation, this.model, apiKey, headers, customInstructions, this._compactionAbortController.signal, this.thinkingLevel, this.agent.streamFunction, env, this.settingsManager.getRetrySettings(), this._summarizationRetryCallbacks({ source: "compaction", reason: "manual" }));
                 summary = result.summary;
                 firstKeptEntryId = result.firstKeptEntryId;
                 tokensBefore = result.tokensBefore;
+                usage = result.usage;
                 details = result.details;
             }
             if (this._compactionAbortController.signal.aborted) {
                 throw new Error("Compaction cancelled");
             }
-            this.sessionManager.appendCompaction(summary, firstKeptEntryId, tokensBefore, details, fromExtension);
+            this.sessionManager.appendCompaction(summary, firstKeptEntryId, tokensBefore, details, fromExtension, usage);
             const newEntries = this.sessionManager.getEntries();
             const sessionContext = this.sessionManager.buildSessionContext();
             this.agent.state.messages = sessionContext.messages;
@@ -1824,6 +1830,7 @@ export class AgentSession {
                 firstKeptEntryId,
                 tokensBefore,
                 estimatedTokensAfter,
+                usage,
                 details,
             };
             this._emit({
@@ -1980,7 +1987,7 @@ export class AgentSession {
             let apiKey;
             let headers;
             let env;
-            if (this.agent.streamFn === streamSimple) {
+            if (this.agent.streamFunction === streamSimple) {
                 const authResult = await this._modelRuntime.getAuth(this.model);
                 if (!authResult?.auth.apiKey)
                     return false;
@@ -2054,20 +2061,23 @@ export class AgentSession {
             let summary;
             let firstKeptEntryId;
             let tokensBefore;
+            let usage;
             let details;
             if (extensionCompaction) {
                 // Extension provided compaction content
                 summary = extensionCompaction.summary;
                 firstKeptEntryId = extensionCompaction.firstKeptEntryId;
                 tokensBefore = extensionCompaction.tokensBefore;
+                usage = extensionCompaction.usage;
                 details = extensionCompaction.details;
             }
             else {
                 // Generate compaction result
-                const compactResult = await compact(preparation, this.model, apiKey, headers, undefined, this._autoCompactionAbortController.signal, this.thinkingLevel, this.agent.streamFn, env);
+                const compactResult = await compact(preparation, this.model, apiKey, headers, undefined, this._autoCompactionAbortController.signal, this.thinkingLevel, this.agent.streamFunction, env, this.settingsManager.getRetrySettings(), this._summarizationRetryCallbacks({ source: "compaction", reason }));
                 summary = compactResult.summary;
                 firstKeptEntryId = compactResult.firstKeptEntryId;
                 tokensBefore = compactResult.tokensBefore;
+                usage = compactResult.usage;
                 details = compactResult.details;
             }
             if (this._autoCompactionAbortController.signal.aborted) {
@@ -2080,7 +2090,7 @@ export class AgentSession {
                 });
                 return false;
             }
-            this.sessionManager.appendCompaction(summary, firstKeptEntryId, tokensBefore, details, fromExtension);
+            this.sessionManager.appendCompaction(summary, firstKeptEntryId, tokensBefore, details, fromExtension, usage);
             const newEntries = this.sessionManager.getEntries();
             const sessionContext = this.sessionManager.buildSessionContext();
             this.agent.state.messages = sessionContext.messages;
@@ -2101,6 +2111,7 @@ export class AgentSession {
                 firstKeptEntryId,
                 tokensBefore,
                 estimatedTokensAfter,
+                usage,
                 details,
             };
             this._emit({ type: "compaction_end", reason, result, aborted: false, willRetry });
@@ -2388,6 +2399,10 @@ export class AgentSession {
                 this._modelRuntime.registerProvider(name, config);
                 this._refreshCurrentModelFromRegistry();
             },
+            registerNativeProvider: (provider) => {
+                this._modelRuntime.registerNativeProvider(provider);
+                this._refreshCurrentModelFromRegistry();
+            },
             unregisterProvider: (name) => {
                 this._modelRuntime.unregisterProvider(name);
                 this._refreshCurrentModelFromRegistry();
@@ -2551,6 +2566,34 @@ export class AgentSession {
             return false;
         return isRetryableAssistantError(message);
     }
+    /**
+     * Retry policy + callbacks shared by compaction and branch-summary summarization calls.
+     * Uses the same `settings.retry` budget/backoff as agent-turn retries so a single transient
+     * stream drop no longer fails the whole operation. `source` carries the context
+     * the TUI needs to render the retry and recreate the underlying indicator.
+     */
+    _summarizationRetryCallbacks(source) {
+        return {
+            onRetryScheduled: (attempt, maxAttempts, delayMs, errorMessage) => {
+                this._emit({
+                    type: "summarization_retry_scheduled",
+                    attempt,
+                    maxAttempts,
+                    delayMs,
+                    errorMessage,
+                });
+            },
+            onRetryAttemptStart: () => {
+                this._emit({
+                    type: "summarization_retry_attempt_start",
+                    ...source,
+                });
+            },
+            onRetryFinished: () => {
+                this._emit({ type: "summarization_retry_finished" });
+            },
+        };
+    }
     /**
      * Prepare a retryable error for continuation with exponential backoff.
      * @returns true if the caller should continue the agent, false otherwise
@@ -2813,6 +2856,7 @@ export class AgentSession {
             // Run default summarizer if needed
             let summaryText;
             let summaryDetails;
+            let summaryUsage;
             if (options.summarize && entriesToSummarize.length > 0 && !extensionSummary) {
                 const model = this.model;
                 const { apiKey, headers, env } = await this._getSummarizationRequestAuth(model);
@@ -2826,7 +2870,9 @@ export class AgentSession {
                     customInstructions,
                     replaceInstructions,
                     reserveTokens: branchSummarySettings.reserveTokens,
-                    streamFn: this.agent.streamFn,
+                    streamFn: this.agent.streamFunction,
+                    retry: this.settingsManager.getRetrySettings(),
+                    callbacks: this._summarizationRetryCallbacks({ source: "branchSummary" }),
                 });
                 if (result.aborted) {
                     return { cancelled: true, aborted: true };
@@ -2835,6 +2881,7 @@ export class AgentSession {
                     throw new Error(result.error);
                 }
                 summaryText = result.summary;
+                summaryUsage = result.usage;
                 summaryDetails = {
                     readFiles: result.readFiles || [],
                     modifiedFiles: result.modifiedFiles || [],
@@ -2843,6 +2890,7 @@ export class AgentSession {
             else if (extensionSummary) {
                 summaryText = extensionSummary.summary;
                 summaryDetails = extensionSummary.details;
+                summaryUsage = extensionSummary.usage;
             }
             // Determine the new leaf position based on target type
             let newLeafId;
@@ -2850,18 +2898,12 @@ export class AgentSession {
             if (targetEntry.type === "message" && targetEntry.message.role === "user") {
                 // User message: leaf = parent (null if root), text goes to editor
                 newLeafId = targetEntry.parentId;
-                editorText = this._extractUserMessageText(targetEntry.message.content);
+                editorText = contentText(targetEntry.message.content, "");
             }
             else if (targetEntry.type === "custom_message") {
                 // Custom message: leaf = parent (null if root), text goes to editor
                 newLeafId = targetEntry.parentId;
-                editorText =
-                    typeof targetEntry.content === "string"
-                        ? targetEntry.content
-                        : targetEntry.content
-                            .filter((c) => c.type === "text")
-                            .map((c) => c.text)
-                            .join("");
+                editorText = contentText(targetEntry.content, "");
             }
             else {
                 // Non-user message: leaf = selected node
@@ -2872,7 +2914,7 @@ export class AgentSession {
             let summaryEntry;
             if (summaryText) {
                 // Create summary at target position (can be null for root)
-                const summaryId = this.sessionManager.branchWithSummary(newLeafId, summaryText, summaryDetails, fromExtension);
+                const summaryId = this.sessionManager.branchWithSummary(newLeafId, summaryText, summaryDetails, fromExtension, summaryUsage);
                 summaryEntry = this.sessionManager.getEntry(summaryId);
                 // Attach label to the summary entry
                 if (label) {
@@ -2927,24 +2969,13 @@ export class AgentSession {
                 continue;
             if (entry.message.role !== "user")
                 continue;
-            const text = this._extractUserMessageText(entry.message.content);
+            const text = contentText(entry.message.content, "");
             if (text) {
                 result.push({ entryId: entry.id, text });
             }
         }
         return result;
     }
-    _extractUserMessageText(content) {
-        if (typeof content === "string")
-            return content;
-        if (Array.isArray(content)) {
-            return content
-                .filter((c) => c.type === "text")
-                .map((c) => c.text)
-                .join("");
-        }
-        return "";
-    }
     /**
      * Get session statistics. Aggregates over ALL session entries (including
      * history that was compacted away), so token/cost totals reflect what was
@@ -2956,12 +2987,11 @@ export class AgentSession {
         let toolResults = 0;
         let totalMessages = 0;
         let toolCalls = 0;
-        let totalInput = 0;
-        let totalOutput = 0;
-        let totalCacheRead = 0;
-        let totalCacheWrite = 0;
-        let totalCost = 0;
+        const usageTotals = createUsageTotals();
         for (const entry of this.sessionManager.getEntries()) {
+            if ((entry.type === "branch_summary" || entry.type === "compaction") && entry.usage) {
+                addUsageToTotals(usageTotals, entry.usage);
+            }
             if (entry.type !== "message")
                 continue;
             totalMessages++;
@@ -2971,6 +3001,9 @@ export class AgentSession {
             }
             else if (message.role === "toolResult") {
                 toolResults++;
+                if (message.usage) {
+                    addUsageToTotals(usageTotals, message.usage);
+                }
             }
             else if (message.role === "assistant") {
                 assistantMessages++;
@@ -2978,12 +3011,7 @@ export class AgentSession {
                 if (Array.isArray(assistantMsg.content)) {
                     toolCalls += assistantMsg.content.filter((c) => c.type === "toolCall").length;
                 }
-                const usage = assistantMsg.usage;
-                totalInput += usage.input;
-                totalOutput += usage.output;
-                totalCacheRead += usage.cacheRead;
-                totalCacheWrite += usage.cacheWrite;
-                totalCost += usage.cost.total;
+                addUsageToTotals(usageTotals, assistantMsg.usage);
             }
         }
         return {
@@ -2995,13 +3023,13 @@ export class AgentSession {
             toolResults,
             totalMessages,
             tokens: {
-                input: totalInput,
-                output: totalOutput,
-                cacheRead: totalCacheRead,
-                cacheWrite: totalCacheWrite,
-                total: totalInput + totalOutput + totalCacheRead + totalCacheWrite,
+                input: usageTotals.input,
+                output: usageTotals.output,
+                cacheRead: usageTotals.cacheRead,
+                cacheWrite: usageTotals.cacheWrite,
+                total: usageTotals.input + usageTotals.output + usageTotals.cacheRead + usageTotals.cacheWrite,
             },
-            cost: totalCost,
+            cost: usageTotals.cost,
             contextUsage: this.getContextUsage(),
         };
     }