pi-ui-extend 0.1.57 → 0.1.60

package/dist/app/app.js

@@ -3,6 +3,7 @@ import { InputEditor } from "../input-editor.js";
 import { compileOutputFilterPatterns, defaultPixConfig, loadPixConfig, resolveToolRule, } from "../config.js";
 import { AppCommandController } from "./commands/command-controller.js";
 import { ConversationViewport } from "./rendering/conversation-viewport.js";
+import { renderRegisteredExtensionEntry } from "./rendering/extension-entry-renderer.js";
 import { EditorLayoutRenderer } from "./rendering/editor-layout-renderer.js";
 import { AppExtensionActionsController } from "./extensions/extension-actions-controller.js";
 import { ExtensionUiController } from "./extensions/extension-ui-controller.js";
@@ -462,6 +463,7 @@ export class PiUiExtendApp {
             hasDynamicConversationBlock: () => this.popupMenus.hasDynamicConversationBlock(),
             isDynamicConversationBlock: (entry) => this.popupMenus.isDynamicConversationBlock(entry),
             renderInlineUserMessageMenu: (entry, context) => this.popupMenus.renderInlineUserMessageMenu(entry, context),
+            renderExtensionEntry: (entry, width) => renderRegisteredExtensionEntry(entry, width, this.runtime?.session.extensionRunner.getEntryRenderer(entry.sessionEntry.customType), this.theme),
         });
         this.scrollController = new AppScrollController({
             conversationViewport: () => this.conversationViewport,

package/dist/app/commands/command-session-actions.js

@@ -10,6 +10,7 @@ import { copyTextToClipboard } from "../screen/clipboard.js";
 import { formatAccountUsageReport, queryAccountUsageReport } from "../model/model-usage-status.js";
 import { checkPixUpdate, formatPixUpdateCheck, parsePixUpdateArgs, pixUpdateUsage } from "../cli/update.js";
 import { createStartupInfoMessage } from "../cli/startup-info.js";
+import { getCompleteSessionStats } from "../session/session-stats.js";
 import { loadSessionTitleConfig } from "../../bundled-extensions/session-title/config.js";
 import { fallbackSessionTitleFromInput, firstUserMessageText, generateSessionTitle, sessionTitleModelRefs, } from "../../bundled-extensions/session-title/title-generation.js";
 export class SessionCommandActions {
@@ -141,7 +142,7 @@ export class SessionCommandActions {
         const runtime = getRuntime(this.host, "session");
         if (!runtime)
             return;
-        const stats = runtime.session.getSessionStats();
+        const stats = await getCompleteSessionStats(runtime.session);
         const lines = [
             createStartupInfoMessage(runtime),
             "",
@@ -181,7 +182,7 @@ export class SessionCommandActions {
             this.host.setSessionStatus(runtime.session);
             return;
         }
-        const stats = runtime.session.getSessionStats();
+        const stats = await getCompleteSessionStats(runtime.session);
         const contextUsage = stats.contextUsage ?? runtime.session.getContextUsage();
         const model = runtime.session.model ? this.host.modelRef(runtime.session.model) : "not selected";
         const lines = [

package/dist/app/extensions/extension-actions-controller.js

@@ -54,9 +54,7 @@ export class AppExtensionActionsController {
         };
     }
     async waitForSessionIdle(runtime) {
-        while (runtime.session.isStreaming || runtime.session.isCompacting) {
-            await new Promise((resolve) => setTimeout(resolve, 50));
-        }
+        await runtime.session.waitForIdle();
     }
     handleExtensionError(error) {
         const sourceText = formatExtensionErrorSource(error.extensionPath);

package/dist/app/model/model-usage-status.js

@@ -2,6 +2,7 @@ import { createHash } from "node:crypto";
 import { readFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { join } from "node:path";
+import { AuthStorage } from "@earendil-works/pi-coding-agent";
 import { formatCompactProgressBar } from "../../context-progress-bar.js";
 import { APP_ICONS } from "../icons.js";
 const OPENAI_USAGE_URL = "https://chatgpt.com/backend-api/wham/usage";
@@ -168,26 +169,25 @@ export function openAIUsageStatusFromResponse(data, modelKey, now = Date.now())
     };
 }
 async function queryOpenAIModelUsage(modelKey) {
-    const authData = await readOpenAIAuth();
+    let authData = await readOpenAIAuth();
     if (!authData || authData.type !== "oauth" || !authData.access)
         return undefined;
     if (isExpired(authData))
-        return undefined;
+        authData = await refreshOpenAICodexAuth();
+    if (!authData.access)
+        throw new Error("OpenAI Codex OAuth refresh returned no access token");
     const usage = await fetchOpenAIUsage(authData.access);
     return openAIUsageStatusFromResponse(usage, modelKey);
 }
 async function queryOpenAIAccountUsage(now) {
-    const authData = await readOpenAIAuth();
+    let authData = await readOpenAIAuth();
     if (!authData || authData.type !== "oauth" || !authData.access)
         return undefined;
-    if (isExpired(authData))
-        return {
-            account: accountLabelFromOpenAIAuth(authData),
-            windows: [],
-            limitReached: false,
-            error: "OAuth token is expired",
-        };
     try {
+        if (isExpired(authData))
+            authData = await refreshOpenAICodexAuth();
+        if (!authData.access)
+            throw new Error("OpenAI Codex OAuth refresh returned no access token");
         const usage = await fetchOpenAIUsage(authData.access);
         const windows = [usage.rate_limit?.primary_window, usage.rate_limit?.secondary_window]
             .filter(isRateLimitWindow)
@@ -219,6 +219,22 @@ async function queryOpenAIAccountUsage(now) {
         };
     }
 }
+async function refreshOpenAICodexAuth() {
+    // Delegate to pi core so refresh-token rotation is persisted under the same
+    // cross-process auth.json lock used by model requests.
+    const authStorage = AuthStorage.create(getPiAuthPath());
+    const access = await authStorage.getApiKey("openai-codex", { includeFallback: false });
+    const credential = authStorage.get("openai-codex");
+    if (!access || credential?.type !== "oauth" || !credential.access || isExpired(credential)) {
+        throw new Error("OpenAI Codex OAuth token refresh failed");
+    }
+    return {
+        type: "oauth",
+        access: credential.access,
+        refresh: credential.refresh,
+        expires: credential.expires,
+    };
+}
 async function readOpenAIAuth() {
     const authData = await readOpenCodeAuth();
     const piAuth = await readPiAuth();

package/dist/app/rendering/conversation-entry-renderer.d.ts

@@ -18,5 +18,8 @@ export type ConversationEntryRenderOptions = {
     renderInlineUserMessageMenu: (entry: Extract<Entry, {
         kind: "user";
     }>, context: InlineUserMessageMenuContext) => RenderedLine[];
+    renderExtensionEntry?: (entry: Extract<Entry, {
+        kind: "extension-entry";
+    }>, width: number) => RenderedLine[];
 };
 export declare function renderConversationEntry(entry: Entry, width: number, options: ConversationEntryRenderOptions): RenderedLine[];

package/dist/app/rendering/conversation-entry-renderer.js

@@ -49,6 +49,8 @@ export function renderConversationEntry(entry, width, options) {
             return renderAssistantLines(entry.text, width, options);
         case "custom":
             return renderCustomEntry(entry, width);
+        case "extension-entry":
+            return options.renderExtensionEntry?.(entry, width) ?? [];
         case "session-aborted":
             return wrapTextLines(entry.text, width).map((line) => ({ text: line.text, copyText: line.copyText, ...(line.continuesOnNextLine ? { continuesOnNextLine: true } : {}), variant: "error" }));
         case "shell":

package/dist/app/rendering/conversation-viewport.d.ts

@@ -17,6 +17,9 @@ export type ConversationViewportHost = {
     renderInlineUserMessageMenu(entry: Extract<Entry, {
         kind: "user";
     }>, context: InlineUserMessageMenuContext): RenderedLine[];
+    renderExtensionEntry?(entry: Extract<Entry, {
+        kind: "extension-entry";
+    }>, width: number): RenderedLine[];
 };
 export type ConversationEntryBlockPosition = {
     entry: Entry;

package/dist/app/rendering/conversation-viewport.js

@@ -85,6 +85,7 @@ export class ConversationViewport {
             allThinkingExpanded: Boolean(this.host.allThinkingExpanded),
             currentTimeMs: Date.now(),
             renderInlineUserMessageMenu: (userEntry, context) => this.host.renderInlineUserMessageMenu(userEntry, context),
+            renderExtensionEntry: (extensionEntry, renderWidth) => this.host.renderExtensionEntry?.(extensionEntry, renderWidth) ?? [],
         });
         const block = {
             version,
@@ -297,6 +298,7 @@ export class ConversationViewport {
     }
     isDynamicConversationBlock(entry) {
         return (entry.kind === "thinking" && entry.status === "running" && entry.startedAt !== undefined)
+            || entry.kind === "extension-entry"
             || this.host.isDynamicConversationBlock(entry);
     }
     refreshLayoutEntry(layout, width, index, measure) {
@@ -342,6 +344,8 @@ export class ConversationViewport {
             case "custom":
             case "session-aborted":
                 return estimateWrappedLineCount(entry.text, width);
+            case "extension-entry":
+                return 1;
             case "user": {
                 const { contentWidth } = horizontalPaddingLayout(width);
                 return estimateWrappedLineCount(entry.text, contentWidth);

package/dist/app/rendering/extension-entry-renderer.d.ts

@@ -0,0 +1,6 @@
+import { type EntryRenderer } from "@earendil-works/pi-coding-agent";
+import type { Theme as PixTheme } from "../../theme.js";
+import type { Entry, RenderedLine } from "../types.js";
+export declare function renderRegisteredExtensionEntry(entry: Extract<Entry, {
+    kind: "extension-entry";
+}>, width: number, renderer: EntryRenderer | undefined, theme: PixTheme): RenderedLine[];

package/dist/app/rendering/extension-entry-renderer.js

@@ -0,0 +1,100 @@
+import { Theme as PiTheme } from "@earendil-works/pi-coding-agent";
+import { ansiStyledLine } from "./tool-block-renderer.js";
+const themes = new WeakMap();
+const components = new WeakMap();
+export function renderRegisteredExtensionEntry(entry, width, renderer, theme) {
+    if (!renderer || width <= 0)
+        return [];
+    try {
+        const cached = components.get(entry);
+        let component = cached?.component;
+        if (!cached || cached.renderer !== renderer || cached.theme !== theme || cached.expanded !== entry.expanded) {
+            component = renderer(entry.sessionEntry, { expanded: entry.expanded }, extensionRendererTheme(theme)) ?? undefined;
+            if (!component) {
+                components.delete(entry);
+                return [];
+            }
+            components.set(entry, { renderer, theme, expanded: entry.expanded, component });
+        }
+        if (!component)
+            return [];
+        return component.render(width).map((rawLine) => {
+            const line = ansiStyledLine(rawLine.replace(/\r/gu, ""));
+            return {
+                text: line.text,
+                copyText: line.text,
+                target: { kind: "tool", id: entry.id },
+                ...(line.segments.length > 0 ? { segments: line.segments } : {}),
+            };
+        });
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        return [{ text: `[${entry.sessionEntry.customType}] renderer failed: ${message}`, variant: "error" }];
+    }
+}
+function extensionRendererTheme(theme) {
+    const cached = themes.get(theme);
+    if (cached)
+        return cached;
+    const colors = theme.colors;
+    const foregrounds = {
+        accent: colors.accent,
+        border: colors.inputBorder,
+        borderAccent: colors.accent,
+        borderMuted: colors.muted,
+        success: colors.success,
+        error: colors.error,
+        warning: colors.warning,
+        muted: colors.muted,
+        dim: colors.muted,
+        text: colors.foreground,
+        thinkingText: colors.thinkingForeground,
+        userMessageText: colors.userForeground,
+        customMessageText: colors.foreground,
+        customMessageLabel: colors.accent,
+        toolTitle: colors.toolTitle,
+        toolOutput: colors.foreground,
+        mdHeading: colors.heading,
+        mdLink: colors.info,
+        mdLinkUrl: colors.muted,
+        mdCode: colors.info,
+        mdCodeBlock: colors.foreground,
+        mdCodeBlockBorder: colors.muted,
+        mdQuote: colors.foreground,
+        mdQuoteBorder: colors.muted,
+        mdHr: colors.muted,
+        mdListBullet: colors.accent,
+        toolDiffAdded: colors.success,
+        toolDiffRemoved: colors.error,
+        toolDiffContext: colors.muted,
+        syntaxComment: colors.muted,
+        syntaxKeyword: colors.toolEdit,
+        syntaxFunction: colors.toolIndex,
+        syntaxVariable: colors.foreground,
+        syntaxString: colors.toolRead,
+        syntaxNumber: colors.warning,
+        syntaxType: colors.toolSearch,
+        syntaxOperator: colors.muted,
+        syntaxPunctuation: colors.muted,
+        thinkingOff: colors.muted,
+        thinkingMinimal: colors.muted,
+        thinkingLow: colors.info,
+        thinkingMedium: colors.accent,
+        thinkingHigh: colors.warning,
+        thinkingXhigh: colors.thinkingXHigh,
+        thinkingMax: colors.thinkingMax,
+        bashMode: colors.toolBash,
+    };
+    const backgrounds = {
+        selectedBg: colors.popupSelectedBackground,
+        userMessageBg: colors.userMessageBackground || colors.background,
+        customMessageBg: colors.assistantMessageBackground || colors.background,
+        toolPendingBg: colors.thinkingMessageBackground || colors.background,
+        toolSuccessBg: colors.assistantMessageBackground || colors.background,
+        toolErrorBg: colors.assistantMessageBackground || colors.background,
+    };
+    const created = new PiTheme(foregrounds, backgrounds, "truecolor", { name: `pix-${theme.name}` });
+    themes.set(theme, created);
+    return created;
+}

package/dist/app/rendering/tool-block-renderer.d.ts

@@ -29,3 +29,8 @@ export type ToolBlockRenderOptions = {
     headerColorOverride?: string;
 };
 export declare function renderToolBlock(entry: ToolBlockEntry, rule: ResolvedToolRule, width: number, colors: Theme["colors"], options?: ToolBlockRenderOptions): RenderedLine[];
+export type AnsiStyledLine = {
+    text: string;
+    segments: StyledSegment[];
+};
+export declare function ansiStyledLine(rawLine: string): AnsiStyledLine;

package/dist/app/rendering/tool-block-renderer.js

@@ -279,7 +279,7 @@ function sanitizeToolBodyText(text, preserveAnsi) {
 function stripAnsi(text) {
     return ansiStyledLine(text).text;
 }
-function ansiStyledLine(rawLine) {
+export function ansiStyledLine(rawLine) {
     let text = "";
     let style = {};
     let segmentStart;

package/dist/app/screen/mouse-controller.js

@@ -161,7 +161,7 @@ export class AppMouseController {
             if (!this.toolTargetContainsEvent(event))
                 return;
             const entry = this.host.findEntry(target.id);
-            if (entry?.kind === "tool" || entry?.kind === "thinking" || entry?.kind === "shell") {
+            if (entry?.kind === "tool" || entry?.kind === "thinking" || entry?.kind === "shell" || entry?.kind === "extension-entry") {
                 entry.expanded = !entry.expanded;
                 this.host.touchEntry(entry);
                 this.showClickFlashForEvent(event);

package/dist/app/session/lazy-session-manager.js

@@ -3,7 +3,7 @@ import { appendFileSync, createReadStream, existsSync, mkdirSync, writeFileSync
 import { mkdir, open as openFile, stat, writeFile } from "node:fs/promises";
 import { dirname, join, resolve } from "node:path";
 import { createInterface } from "node:readline";
-import { buildSessionContext, SessionManager, } from "@earendil-works/pi-coding-agent";
+import { buildContextEntries as buildSdkContextEntries, buildSessionContext, SessionManager, } from "@earendil-works/pi-coding-agent";
 import { isRecord } from "../guards.js";
 const CURRENT_SESSION_VERSION = 3;
 const DEFAULT_TAIL_ENTRY_COUNT = 180;
@@ -39,6 +39,11 @@ class LazySessionManager {
     async initialize(cwdOverride) {
         this.header = await this.loadHeaderAsync(cwdOverride);
         this.cwdPath = resolve(cwdOverride ?? this.header.cwd ?? process.cwd());
+        if ((this.header.version ?? 1) < CURRENT_SESSION_VERSION) {
+            this.hydrated = SessionManager.open(this.sessionFilePath, this.sessionDirPath, this.cwdPath);
+            this.header = this.hydrated.getHeader() ?? this.header;
+            return;
+        }
         await this.loadTailEntriesAsync();
     }
     setSessionFile(sessionFile) {
@@ -140,6 +145,18 @@ class LazySessionManager {
         const entries = await readAllSessionEntries(this.sessionFilePath);
         return branchEntries(entries, this.leafId ?? entries.at(-1)?.id);
     }
+    async readFullSessionEntries() {
+        if (this.hydrated)
+            return this.hydrated.getEntries();
+        return readAllSessionEntries(this.sessionFilePath);
+    }
+    buildContextEntries() {
+        if (this.hydrated)
+            return this.hydrated.buildContextEntries();
+        const entries = this.contextEntries();
+        const byId = new Map(entries.map((entry) => [entry.id, entry]));
+        return buildSdkContextEntries(entries, entries.at(-1)?.id ?? null, byId);
+    }
     buildSessionContext() {
         if (this.hydrated)
             return this.hydrated.buildSessionContext();

package/dist/app/session/pix-system-message.d.ts

@@ -1,6 +1,7 @@
 import type { AgentSession, SessionEntry } from "@earendil-works/pi-coding-agent";
 export declare const PIX_SYSTEM_MESSAGE_CUSTOM_TYPE = "pix-system";
 export declare const PIX_SYSTEM_DISPLAY_ENTRY_CUSTOM_TYPE = "pix:system_message";
+export declare const PIX_EXTENSION_ENTRY_ROLE = "pix:extension_entry";
 export declare const PIX_SESSION_ENTRY_ID_FIELD = "__pixSessionEntryId";
 export declare const PIX_THINKING_LEVEL_FIELD = "__pixThinkingLevel";
 export declare function appendPixSystemDisplayEntry(session: AgentSession, text: string): void;

package/dist/app/session/pix-system-message.js

@@ -1,6 +1,7 @@
 import { isRecord } from "../guards.js";
 export const PIX_SYSTEM_MESSAGE_CUSTOM_TYPE = "pix-system";
 export const PIX_SYSTEM_DISPLAY_ENTRY_CUSTOM_TYPE = "pix:system_message";
+export const PIX_EXTENSION_ENTRY_ROLE = "pix:extension_entry";
 export const PIX_SESSION_ENTRY_ID_FIELD = "__pixSessionEntryId";
 export const PIX_THINKING_LEVEL_FIELD = "__pixThinkingLevel";
 export function appendPixSystemDisplayEntry(session, text) {
@@ -50,6 +51,9 @@ export function sessionHistoryDisplayMessagesFromEntries(branch) {
                 display: true,
             });
         }
+        else if (entry.type === "custom") {
+            messages.push({ role: PIX_EXTENSION_ENTRY_ROLE, entry });
+        }
     }
     return messages;
 }

package/dist/app/session/session-event-controller.js

@@ -1,6 +1,6 @@
 import { createId } from "../id.js";
 import { extractImageContents, renderContent, renderUserMessageContent, stringifyUnknown } from "../rendering/message-content.js";
-import { customMessageEntry, loadSessionHistoryEntries, loadSessionHistoryEntriesAsync } from "./session-history.js";
+import { customMessageEntry, extensionSessionEntry, loadSessionHistoryEntries, loadSessionHistoryEntriesAsync } from "./session-history.js";
 import { sessionHistoryDisplayMessages, sessionHistoryDisplayMessagesFromEntries, sessionHistoryFullBranchEntries } from "./pix-system-message.js";
 import { THINKING_TOOL_NAME } from "../constants.js";
 import { isRecord } from "../guards.js";
@@ -212,6 +212,12 @@ export class AppSessionEventController {
             case "message_end":
                 this.handleMessageEnd(event.message);
                 break;
+            case "entry_appended": {
+                const entry = extensionSessionEntry(event.entry);
+                if (entry)
+                    this.addEntry(entry);
+                break;
+            }
             case "agent_start":
                 this.assistantMessageClosed = false;
                 this.host.setSessionActivity("running");

package/dist/app/session/session-history.d.ts

@@ -38,4 +38,7 @@ export type OlderSessionHistoryMessagesReader = {
 export declare function loadSessionHistoryEntries(options: LoadSessionHistoryOptions): void;
 export declare function loadSessionHistoryEntriesAsync(options: LoadSessionHistoryAsyncOptions): Promise<boolean>;
 export declare function customMessageEntry(message: Record<string, unknown>): Entry | undefined;
+export declare function extensionSessionEntry(value: unknown): Extract<Entry, {
+    kind: "extension-entry";
+}> | undefined;
 export {};

package/dist/app/session/session-history.js

@@ -3,7 +3,7 @@ import { createId } from "../id.js";
 import { isOnlyHiddenMetadata } from "../../markdown-format.js";
 import { extractImageContents, renderContent, renderUserMessageContent, stringifyUnknown } from "../rendering/message-content.js";
 import { THINKING_TOOL_NAME } from "../constants.js";
-import { PIX_SESSION_ENTRY_ID_FIELD, PIX_SYSTEM_MESSAGE_CUSTOM_TYPE, PIX_THINKING_LEVEL_FIELD } from "./pix-system-message.js";
+import { PIX_EXTENSION_ENTRY_ROLE, PIX_SESSION_ENTRY_ID_FIELD, PIX_SYSTEM_DISPLAY_ENTRY_CUSTOM_TYPE, PIX_SYSTEM_MESSAGE_CUSTOM_TYPE, PIX_THINKING_LEVEL_FIELD } from "./pix-system-message.js";
 const HISTORICAL_SUBAGENTS_OBSERVATION = { showSnapshot: false };
 const DEFAULT_HISTORY_CHUNK_SIZE = 50;
 const DEFAULT_HISTORY_TAIL_MESSAGE_COUNT = 80;
@@ -142,7 +142,12 @@ function addSessionHistoryRangeEntries(messages, start, end, toolResults, addEnt
         const message = messages[index];
         if (!isRecord(message))
             continue;
-        if (message.role === "custom") {
+        if (message.role === PIX_EXTENSION_ENTRY_ROLE) {
+            const entry = extensionSessionEntry(message.entry);
+            if (entry)
+                addEntry(entry);
+        }
+        else if (message.role === "custom") {
             const entry = customMessageEntry(message);
             if (entry)
                 addEntry(entry);
@@ -175,6 +180,18 @@ export function customMessageEntry(message) {
         return { id: createId("system"), kind: "system", text };
     return { id: createId("custom"), kind: "custom", customType, text };
 }
+export function extensionSessionEntry(value) {
+    if (!isRecord(value) || value.type !== "custom" || typeof value.id !== "string" || typeof value.customType !== "string")
+        return undefined;
+    if (value.customType === PIX_SYSTEM_DISPLAY_ENTRY_CUSTOM_TYPE)
+        return undefined;
+    return {
+        id: `extension-entry-${value.id}`,
+        kind: "extension-entry",
+        sessionEntry: value,
+        expanded: false,
+    };
+}
 function renderAssistantHistoryMessage(message, toolResults, options) {
     const content = message.content;
     if (!Array.isArray(content))

package/dist/app/session/session-search.js

@@ -145,6 +145,8 @@ function entrySearchText(entry) {
             return `${entry.toolName}\n${entry.argsText}\n${entry.output}`;
         case "shell":
             return `${entry.command}\n${entry.output}`;
+        case "extension-entry":
+            return entry.sessionEntry.customType;
         case "user":
         case "assistant":
         case "custom":

package/dist/app/session/session-stats.d.ts

@@ -0,0 +1,3 @@
+import type { AgentSession, SessionEntry, SessionStats } from "@earendil-works/pi-coding-agent";
+export declare function getCompleteSessionStats(session: AgentSession): Promise<SessionStats>;
+export declare function aggregateSessionStats(entries: readonly SessionEntry[], base: SessionStats): SessionStats;

package/dist/app/session/session-stats.js

@@ -0,0 +1,65 @@
+export async function getCompleteSessionStats(session) {
+    const base = session.getSessionStats();
+    const manager = session.sessionManager;
+    if (typeof manager.readFullSessionEntries !== "function")
+        return base;
+    const entries = await manager.readFullSessionEntries();
+    return aggregateSessionStats(entries, base);
+}
+export function aggregateSessionStats(entries, base) {
+    let userMessages = 0;
+    let assistantMessages = 0;
+    let toolResults = 0;
+    let totalMessages = 0;
+    let toolCalls = 0;
+    let input = 0;
+    let output = 0;
+    let cacheRead = 0;
+    let cacheWrite = 0;
+    let cost = 0;
+    for (const entry of entries) {
+        if (entry.type !== "message")
+            continue;
+        totalMessages += 1;
+        const message = entry.message;
+        if (message.role === "user") {
+            userMessages += 1;
+            continue;
+        }
+        if (message.role === "toolResult") {
+            toolResults += 1;
+            continue;
+        }
+        if (message.role !== "assistant")
+            continue;
+        assistantMessages += 1;
+        if (Array.isArray(message.content)) {
+            toolCalls += message.content.filter((content) => content.type === "toolCall").length;
+        }
+        const usage = message.usage;
+        input += finiteNumber(usage?.input);
+        output += finiteNumber(usage?.output);
+        cacheRead += finiteNumber(usage?.cacheRead);
+        cacheWrite += finiteNumber(usage?.cacheWrite);
+        cost += finiteNumber(usage?.cost?.total);
+    }
+    return {
+        ...base,
+        userMessages,
+        assistantMessages,
+        toolCalls,
+        toolResults,
+        totalMessages,
+        tokens: {
+            input,
+            output,
+            cacheRead,
+            cacheWrite,
+            total: input + output + cacheRead + cacheWrite,
+        },
+        cost,
+    };
+}
+function finiteNumber(value) {
+    return typeof value === "number" && Number.isFinite(value) ? value : 0;
+}

package/dist/app/types.d.ts

@@ -1,4 +1,4 @@
-import type { AgentSession, ExtensionUIContext, SessionManager, SessionInfo, SlashCommandSource, SourceInfo } from "@earendil-works/pi-coding-agent";
+import type { AgentSession, ExtensionUIContext, CustomEntry, SessionManager, SessionInfo, SlashCommandSource, SourceInfo } from "@earendil-works/pi-coding-agent";
 import type { ImageContent } from "../input-editor.js";
 import type { SyntaxLineHighlight } from "../syntax-highlight.js";
 import type { ThemeName } from "../theme.js";
@@ -53,6 +53,11 @@ export type Entry = {
     kind: "custom";
     customType: string;
     text: string;
+} | {
+    id: string;
+    kind: "extension-entry";
+    sessionEntry: CustomEntry;
+    expanded: boolean;
 } | {
     id: string;
     kind: "session-aborted";

package/dist/bundled-extensions/terminal-bell/index.js

@@ -9,12 +9,6 @@ const IDLE_RETRY_DELAY_MS = 100;
 const MAX_IDLE_RETRIES = 40;
 const SUBAGENTS_LIVE_COUNT_EVENT = "pi-tools-suite:async-subagents:live-count";
 const TERMINAL_BELL_ATTENTION_EVENT = "pix:terminal-bell:attention";
-/**
- * Renderer-relayed signal that the session is in an auto-retry cycle.
- * Payload: `{ active: boolean }`. The SDK does not forward retry state to
- * extensions, so the renderer emits this on the extension event bus.
- */
-const RETRY_ACTIVE_EVENT = "pix:retry-active";
 /**
  * Renderer-relayed signal that the user interrupted the session (Esc/Ctrl-C).
  * Payload: `{ aborted: boolean }`. Aborting the SDK stream during tool
@@ -224,9 +218,6 @@ function retryFailureMessageTemplate() {
 function notificationTitleTemplate(defaultTitle) {
     return process.env.PI_TERMINAL_BELL_NOTIFY_TITLE ?? defaultTitle;
 }
-function willRetryAfterAgentEnd(event) {
-    return event.willRetry === true;
-}
 function isAbortedMessageUpdate(event) {
     return event.type === "error" && event.reason === "aborted";
 }
@@ -405,11 +396,6 @@ export default function terminalBell(pi) {
     // attention bell should never ring for a user-initiated abort, so this flag
     // suppresses any queued/pending bell until the next agent_start resets it.
     let userAborted = false;
-    // True while the session is in an auto-retry cycle (relayed via the
-    // extension event bus). Suppresses the failure bell on intermediate retry
-    // attempts; the final exhausted failure still rings because no retry-start
-    // signal precedes it.
-    let retryActive = false;
     const activeSubagentWaitToolCallIds = new Set();
     const notifiedAskUserToolCallIds = new Set();
     const idleDelayMs = parseDelayMs(process.env.PI_TERMINAL_BELL_DELAY_MS);
@@ -440,10 +426,6 @@ export default function terminalBell(pi) {
     function attemptBell(pending, attempt) {
         timer = undefined;
         const { ctx, notification, message } = pending;
-        // Safety net: if a retry-start signal arrives between the agent_end that
-        // queued this bell and the timer firing, suppress the bell entirely.
-        if (retryActive)
-            return;
         // Safety net: if the user aborted after the bell was queued (e.g. an
         // aborted agent_end with no aborted message_update), suppress it.
         if (userAborted) {
@@ -527,18 +509,6 @@ export default function terminalBell(pi) {
             scheduleBell(pendingBell.ctx, idleDelayMs, 0, pendingBell.message, pendingBell.notification);
         }
     });
-    pi.events.on(RETRY_ACTIVE_EVENT, (data) => {
-        retryActive = data != null && typeof data === "object" && data.active === true;
-        if (retryActive) {
-            // A retry is starting right after an intermediate agent_end: cancel
-            // any bell queued from that attempt so we don't chime on every
-            // failed retry attempt. The final exhausted failure rings normally
-            // because it is not followed by a retry-start signal.
-            clearTimer();
-            pendingBell = undefined;
-            deferredUntilSubagentsFinish = false;
-        }
-    });
     pi.events.on(SESSION_ABORTED_EVENT, (data) => {
         const aborted = data != null && typeof data === "object" && data.aborted === true;
         if (!aborted)
@@ -557,7 +527,6 @@ export default function terminalBell(pi) {
         deferredUntilSubagentsFinish = false;
         lastFailureReason = undefined;
         userAborted = false;
-        retryActive = false;
         activeSubagentWaitToolCallIds.clear();
         notifiedAskUserToolCallIds.clear();
     });
@@ -598,11 +567,7 @@ export default function terminalBell(pi) {
         activeSubagentWaitToolCallIds.delete(event.toolCallId);
         notifiedAskUserToolCallIds.delete(event.toolCallId);
     });
-    pi.on("agent_end", async (event, ctx) => {
-        if (willRetryAfterAgentEnd(event)) {
-            clearTimer();
-            return;
-        }
+    pi.on("agent_settled", async (_event, ctx) => {
         if (userAborted) {
             clearTimer();
             return;
@@ -623,7 +588,6 @@ export default function terminalBell(pi) {
         liveSubagentCount = 0;
         lastFailureReason = undefined;
         userAborted = false;
-        retryActive = false;
         activeSubagentWaitToolCallIds.clear();
         notifiedAskUserToolCallIds.clear();
     });