pi-ui-extend 0.1.20 → 0.1.21

package/dist/app/app.d.ts

@@ -60,6 +60,9 @@ export declare class PiUiExtendApp {
     private resumeLoading;
     constructor(options: AppOptions);
     private createRuntime;
+    private loadStartupConfig;
+    private applyPixConfig;
+    private updateOutputFilters;
     start(): Promise<void>;
     private checkPixUpdateOnStartup;
     private bindCurrentSession;

package/dist/app/app.js

@@ -1,6 +1,6 @@
 import { THEMES } from "../theme.js";
 import { InputEditor } from "../input-editor.js";
-import { compileOutputFilterPatterns, loadPixConfig, resolveToolRule, } from "../config.js";
+import { compileOutputFilterPatterns, defaultPixConfig, loadPixConfig, resolveToolRule, } from "../config.js";
 import { AppCommandController } from "./commands/command-controller.js";
 import { ConversationViewport } from "./rendering/conversation-viewport.js";
 import { EditorLayoutRenderer } from "./rendering/editor-layout-renderer.js";
@@ -68,7 +68,7 @@ export class PiUiExtendApp {
     extensionUiController;
     extensionActions;
     pixConfig;
-    outputFilters;
+    outputFilters = [];
     commandController;
     inputActions;
     inputController;
@@ -127,7 +127,7 @@ export class PiUiExtendApp {
     constructor(options) {
         this.options = options;
         this.theme = THEMES[options.themeName];
-        this.pixConfig = loadPixConfig(this.options.cwd);
+        this.pixConfig = defaultPixConfig();
         setAppIconTheme(this.pixConfig.iconTheme.name);
         const app = this;
         this.blinkController = new AppBlinkController({
@@ -160,7 +160,7 @@ export class PiUiExtendApp {
         });
         this.tabsController = new AppTabsController({
             options: this.options,
-            maxProjectSessions: this.pixConfig.maxProjectSessions,
+            maxProjectSessions: () => this.pixConfig.maxProjectSessions,
             blinkController: this.blinkController,
             runtime: () => this.runtime,
             createRuntimeForNewSession: () => this.createRuntime(newTabRuntimeOptions(this.options)),
@@ -398,18 +398,16 @@ export class PiUiExtendApp {
             get subagentsWidgetState() { return app.subagentsWidgetController.widgetState; },
             get voicePartialText() { return app.voicePartialText; },
             get autocompleteSuggestion() { return app.autocompleteController.suggestionText(); },
-            get queuedMessageWidgetEntries() { return app.queuedMessages.deferredQueuedEntries(); },
+            get queuedMessageWidgetEntries() { return app.queuedMessages.queuedEntries(); },
             renderExtensionInputComponent: (width) => this.extensionUiController.renderActiveCustomUi(width),
             extensionInputUsesEditor: () => this.extensionUiController.activeCustomUiUsesEditor(),
             widgetTuiHandle: () => this.extensionUiController.widgetTuiHandle(),
             createExtensionTheme: () => this.extensionUiController.createExtensionTheme(),
             suppressExtensionWidget: (key) => this.extensionUiController.suppressWidget(key),
         });
-        this.outputFilters = compileOutputFilterPatterns(this.pixConfig.outputFilters.patterns);
+        this.updateOutputFilters();
         this.conversationViewport = new ConversationViewport({
             get entries() { return app.entries; },
-            get session() { return app.runtime?.session; },
-            get deferredUserMessages() { return app.queuedMessages.deferredUserMessages; },
             get entryRenderVersions() { return app.sessionEvents.entryRenderVersions; },
             get superCompactTools() { return app.superCompactTools; },
             get allThinkingExpanded() { return app.allThinkingExpanded; },
@@ -700,6 +698,7 @@ export class PiUiExtendApp {
             inputEditor: () => this.inputEditor,
             enableTerminal: () => this.terminalController.enableTerminal(),
             disposeRuntimeForQuit: (runtime) => this.terminalController.disposeRuntimeForQuit(runtime),
+            loadStartupConfig: () => this.loadStartupConfig(),
             loadRequestHistory: () => this.requestHistory.load(),
             startSubagentsPolling: () => this.subagentsWidgetController.startPolling(),
             closeSdkMenuForBind: () => this.popupMenus.closeSdkMenu(undefined, { render: false, restoreStatus: false }),
@@ -750,8 +749,35 @@ export class PiUiExtendApp {
     createRuntime(options) {
         return createPixRuntime(options, {
             eventBus: this.createExtensionEventBus(),
+            config: this.pixConfig,
         });
     }
+    async loadStartupConfig() {
+        await yieldToEventLoop();
+        this.applyPixConfig(loadPixConfig(this.options.cwd));
+    }
+    applyPixConfig(config) {
+        replaceRecord(this.pixConfig.toolRenderer, config.toolRenderer);
+        replaceRecord(this.pixConfig.outputFilters, config.outputFilters);
+        replaceRecord(this.pixConfig.promptEnhancer, config.promptEnhancer);
+        replaceRecord(this.pixConfig.autocomplete, config.autocomplete);
+        replaceRecord(this.pixConfig.modelColors, config.modelColors);
+        replaceRecord(this.pixConfig.iconTheme, config.iconTheme);
+        replaceRecord(this.pixConfig.dictation, config.dictation);
+        if (config.defaultModel === undefined)
+            delete this.pixConfig.defaultModel;
+        else
+            this.pixConfig.defaultModel = { ...config.defaultModel };
+        this.pixConfig.ignoreContextFiles = config.ignoreContextFiles;
+        this.pixConfig.maxProjectSessions = config.maxProjectSessions;
+        this.updateOutputFilters();
+        this.voiceController.updateDictationConfig(this.pixConfig.dictation);
+        setAppIconTheme(this.pixConfig.iconTheme.name);
+        this.conversationViewport.clear();
+    }
+    updateOutputFilters() {
+        this.outputFilters.splice(0, this.outputFilters.length, ...compileOutputFilterPatterns(this.pixConfig.outputFilters.patterns));
+    }
     async start() {
         await this.sessionLifecycle.start();
         this.modelUsageController.startPolling();
@@ -1053,3 +1079,37 @@ function newTabRuntimeOptions(options) {
         ...(options.modelRef === undefined ? {} : { modelRef: options.modelRef }),
     };
 }
+async function yieldToEventLoop() {
+    await new Promise((resolve) => { setTimeout(resolve, 0); });
+}
+function replaceRecord(target, source) {
+    for (const key of Object.keys(target)) {
+        if (!(key in source))
+            delete target[key];
+    }
+    for (const [key, value] of Object.entries(source)) {
+        const existing = target[key];
+        if (isMutableRecord(existing) && isMutableRecord(value)) {
+            replaceRecord(existing, value);
+        }
+        else {
+            target[key] = cloneConfigValue(value);
+        }
+    }
+}
+function cloneConfigValue(value) {
+    if (Array.isArray(value))
+        return value.map(cloneConfigValue);
+    if (isMutableRecord(value))
+        return cloneConfigRecord(value);
+    return value;
+}
+function cloneConfigRecord(value) {
+    const cloned = {};
+    for (const [key, nested] of Object.entries(value))
+        cloned[key] = cloneConfigValue(nested);
+    return cloned;
+}
+function isMutableRecord(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}

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

@@ -1,4 +1,4 @@
-import { ANSI_RESET, colorize, THEMES } from "../../theme.js";
+import { ANSI_RESET, ansiStylePrefix, colorize, THEMES } from "../../theme.js";
 import { isToastKind } from "../../ui.js";
 import { ellipsizeDisplay, sanitizeText } from "../rendering/render-text.js";
 const CUSTOM_UI_WIDGET_KEY = "pix-custom-ui";
@@ -20,7 +20,7 @@ export class ExtensionUiController {
         const colors = this.host.theme.colors;
         const foreground = (color) => extensionForegroundColor(colors, String(color));
         const background = (color) => extensionBackgroundColor(colors, String(color));
-        const prefix = (options) => (colorize("", options).replace(new RegExp(`${escapeRegExp(ANSI_RESET)}$`), ""));
+        const prefix = (options) => ansiStylePrefix(options);
         return {
             fg: (color, text) => colorize(text, { foreground: foreground(color) }),
             bg: (color, text) => colorize(text, { background: background(color) }),

package/dist/app/input/voice-controller.d.ts

@@ -54,8 +54,8 @@ type VoiceControllerTestDeps = {
 export declare function setVoiceControllerTestDeps(overrides?: Partial<VoiceControllerTestDeps>): void;
 export declare class AppVoiceController {
     private readonly host;
-    private readonly modelDefinitions;
-    private readonly languages;
+    private modelDefinitions;
+    private languages;
     private language;
     private state;
     private readonly modelCache;
@@ -69,6 +69,7 @@ export declare class AppVoiceController {
     private partialTranscriptTimer;
     private startGeneration;
     constructor(host: AppVoiceControllerHost, dictationConfig: DictationConfig);
+    updateDictationConfig(dictationConfig: DictationConfig): void;
     statusWidgetText(): string;
     showLanguageSwitcher(): boolean;
     statusWidgetActive(): boolean;

package/dist/app/input/voice-controller.js

@@ -51,6 +51,15 @@ export class AppVoiceController {
         this.languages = Object.keys(this.modelDefinitions);
         this.language = this.initialLanguage(dictationConfig.language);
     }
+    updateDictationConfig(dictationConfig) {
+        this.modelDefinitions = dictationConfig.languages;
+        this.languages = Object.keys(this.modelDefinitions);
+        this.language = this.initialLanguage(dictationConfig.language ?? this.language);
+        for (const language of this.modelCache.keys()) {
+            if (!this.modelDefinitions[language])
+                this.modelCache.delete(language);
+        }
+    }
     statusWidgetText() {
         const languageLabel = this.showLanguageSwitcher() ? ` ${this.language.toUpperCase()}` : "";
         switch (this.state) {

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

@@ -1,5 +1,6 @@
 import { applyOutputFilters } from "../../config.js";
 import { renderMarkdownTextLines } from "../../markdown-format.js";
+import { stringDisplayWidth } from "../../terminal-width.js";
 import { attachImageClickTargets } from "../screen/image-click-targets.js";
 import { APP_ICONS } from "../icons.js";
 import { horizontalPaddingLayout, padHorizontalText, wrapText } from "./render-text.js";
@@ -7,13 +8,36 @@ import { renderConversationShellEntry } from "./conversation-shell-renderer.js";
 import { renderConversationToolEntry, renderThinkingEntry } from "./conversation-tool-renderer.js";
 export function renderConversationEntry(entry, width, options) {
     const { left: userContentLeft, contentWidth: userContentWidth } = horizontalPaddingLayout(width);
-    const userLine = (text, entryId, syntaxHighlight, segments) => ({
-        text: padHorizontalText(text, width),
-        colorOverride: options.colors.userForeground,
-        ...(segments && segments.length > 0 ? { segments: segments.map((segment) => ({ ...segment, start: segment.start + userContentLeft, end: segment.end + userContentLeft })) } : {}),
-        ...(syntaxHighlight === undefined ? {} : { syntaxHighlight }),
-        ...(entryId === undefined ? {} : { target: { kind: "user-message", id: entryId } }),
-    });
+    const userLine = (text, entryId, syntaxHighlight, segments) => {
+        const textWidth = stringDisplayWidth(text);
+        const padding = Math.max(0, width - textWidth);
+        const paddedText = " ".repeat(padding) + text;
+        const offset = padding;
+        return {
+            text: paddedText,
+            colorOverride: options.colors.userForeground,
+            backgroundOverride: options.colors.userMessageBackground,
+            ...(segments && segments.length > 0
+                ? {
+                    segments: segments.map((segment) => ({
+                        ...segment,
+                        start: segment.start + offset,
+                        end: segment.end + offset,
+                        foreground: options.colors.userForeground,
+                    })),
+                }
+                : {}),
+            ...(syntaxHighlight === undefined
+                ? {}
+                : {
+                    syntaxHighlight: {
+                        ...syntaxHighlight,
+                        start: syntaxHighlight.start + offset,
+                    },
+                }),
+            ...(entryId === undefined ? {} : { target: { kind: "user-message", id: entryId } }),
+        };
+    };
     const queuedLine = (text, entryId, segments) => ({
         text,
         colorOverride: options.colors.userForeground,
@@ -69,10 +93,16 @@ function renderAssistantLines(text, width, options) {
         return [];
     const lines = [];
     for (const line of contentLines) {
+        const headingSegment = line.heading
+            ? { start: contentLeft, end: contentLeft + line.text.length, foreground: options.colors.assistantForeground, bold: true }
+            : undefined;
+        const existingSegments = line.segments?.map((segment) => ({ ...segment, start: segment.start + contentLeft, end: segment.end + contentLeft })) ?? [];
+        const allSegments = headingSegment ? [headingSegment, ...existingSegments] : existingSegments;
         lines.push({
             text: padHorizontalText(line.text, width),
             colorOverride: options.colors.assistantForeground,
-            ...(line.segments && line.segments.length > 0 ? { segments: line.segments.map((segment) => ({ ...segment, start: segment.start + contentLeft, end: segment.end + contentLeft })) } : {}),
+            backgroundOverride: options.colors.assistantMessageBackground,
+            ...(allSegments.length > 0 ? { segments: allSegments } : {}),
             ...(line.syntaxHighlight ? { syntaxHighlight: line.syntaxHighlight } : {}),
         });
     }

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

@@ -63,7 +63,7 @@ export function renderThinkingEntry(entry, width, options) {
         expandedText: compactExpandedText || "(empty)",
         bodyWrap: "word",
         syntaxHighlight: compactExpandedText ? markdownSyntaxHighlightsForText(compactExpandedText) : undefined,
-    }, rule, width, options.colors, { superCompact: Boolean(options.superCompactTools && !forceExpanded) });
+    }, rule, width, options.colors, { superCompact: Boolean(options.superCompactTools && !forceExpanded), backgroundOverride: options.colors.thinkingMessageBackground, skipHeaderBackground: true });
 }
 function trimTrailingBlankLines(text) {
     return text.replace(/(?:\r?\n[ \t]*)+$/u, "");

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

@@ -1,12 +1,9 @@
-import type { AgentSession } from "@earendil-works/pi-coding-agent";
 import { type PixConfig } from "../../config.js";
 import type { Theme } from "../../theme.js";
 import { type InlineUserMessageMenuContext } from "./conversation-entry-renderer.js";
-import type { ConversationBlockCache, Entry, RenderedLine, SubmittedUserMessage } from "../types.js";
+import type { ConversationBlockCache, Entry, RenderedLine } from "../types.js";
 export type ConversationViewportHost = {
     readonly entries: readonly Entry[];
-    readonly session: AgentSession | undefined;
-    readonly deferredUserMessages: readonly SubmittedUserMessage[];
     readonly entryRenderVersions: ReadonlyMap<string, number>;
     readonly cwd: string;
     readonly colors: Theme["colors"];
@@ -40,7 +37,6 @@ export declare class ConversationViewport {
     blockForEntry(entry: Entry, width: number): ConversationBlockCache;
     entryBlockPositions(width: number): ConversationEntryBlockPosition[];
     measuredLineCountForEntries(width: number, entryIds: readonly string[]): number;
-    private queuedEntries;
     private layoutForWidth;
     private buildLayout;
     private previousMeasuredLineCount;

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

@@ -2,7 +2,6 @@ import { resolveToolRule } from "../../config.js";
 import { stringDisplayWidth } from "../../terminal-width.js";
 import { renderConversationEntry as renderConversationEntryLines } from "./conversation-entry-renderer.js";
 import { horizontalPaddingLayout } from "./render-text.js";
-import { sdkQueuedMessageEntries } from "../session/queued-message-entries.js";
 export class ConversationViewport {
     host;
     blockCachesByWidth = new Map();
@@ -63,8 +62,7 @@ export class ConversationViewport {
         return { lines: visible, changed: false };
     }
     entries() {
-        const queued = this.queuedEntries();
-        return queued.length === 0 ? [...this.host.entries] : [...this.host.entries, ...queued];
+        return [...this.host.entries];
     }
     blockForEntry(entry, width) {
         const blockCache = this.blockCacheForWidth(width);
@@ -119,21 +117,16 @@ export class ConversationViewport {
         }
         return lineCount;
     }
-    queuedEntries() {
-        return sdkQueuedMessageEntries(this.host.session);
-    }
     layoutForWidth(width) {
-        const queued = this.queuedEntries();
-        const entries = queued.length === 0 ? this.host.entries : [...this.host.entries, ...queued];
-        const queuedSignature = queued.map((entry) => entry.id).join("\n");
+        const entries = this.host.entries;
         const superCompactTools = Boolean(this.host.superCompactTools);
         const allThinkingExpanded = Boolean(this.host.allThinkingExpanded);
         let layout = this.layoutCachesByWidth.get(width);
-        if (!layout || this.layoutStructureChanged(layout, entries, queuedSignature, superCompactTools, allThinkingExpanded)) {
-            const previousLayout = layout && layout.queuedSignature === queuedSignature && layout.superCompactTools === superCompactTools && layout.allThinkingExpanded === allThinkingExpanded
+        if (!layout || this.layoutStructureChanged(layout, entries, superCompactTools, allThinkingExpanded)) {
+            const previousLayout = layout && layout.superCompactTools === superCompactTools && layout.allThinkingExpanded === allThinkingExpanded
                 ? layout
                 : undefined;
-            layout = this.buildLayout(entries, width, queuedSignature, superCompactTools, allThinkingExpanded, previousLayout);
+            layout = this.buildLayout(entries, width, superCompactTools, allThinkingExpanded, previousLayout);
             this.layoutCachesByWidth.set(width, layout);
         }
         else {
@@ -144,7 +137,7 @@ export class ConversationViewport {
         }
         return layout;
     }
-    buildLayout(entries, width, queuedSignature, superCompactTools, allThinkingExpanded, previousLayout) {
+    buildLayout(entries, width, superCompactTools, allThinkingExpanded, previousLayout) {
         const entryIds = [];
         const lineCounts = [];
         const measuredLineCounts = [];
@@ -163,7 +156,7 @@ export class ConversationViewport {
             totalLineCount += lineCount;
         }
         offsets.push(totalLineCount);
-        return { entries, entryIds, lineCounts, measuredLineCounts, offsets, positions, dirtyEntryIds: new Set(), totalLineCount, queuedSignature, superCompactTools, allThinkingExpanded };
+        return { entries, entryIds, lineCounts, measuredLineCounts, offsets, positions, dirtyEntryIds: new Set(), totalLineCount, superCompactTools, allThinkingExpanded };
     }
     previousMeasuredLineCount(previousLayout, entries, index, entry) {
         const previousIndex = previousLayout?.positions.get(entry.id);
@@ -179,8 +172,8 @@ export class ConversationViewport {
             return undefined;
         return previousLayout.lineCounts[previousIndex];
     }
-    layoutStructureChanged(layout, entries, queuedSignature, superCompactTools, allThinkingExpanded) {
-        if (layout.entries.length !== entries.length || layout.queuedSignature !== queuedSignature || layout.superCompactTools !== superCompactTools || layout.allThinkingExpanded !== allThinkingExpanded)
+    layoutStructureChanged(layout, entries, superCompactTools, allThinkingExpanded) {
+        if (layout.entries.length !== entries.length || layout.superCompactTools !== superCompactTools || layout.allThinkingExpanded !== allThinkingExpanded)
             return true;
         if (layout.entries.length === 0)
             return false;

package/dist/app/rendering/editor-layout-renderer.js

@@ -111,7 +111,7 @@ export class EditorLayoutRenderer {
             for (const [index, text] of wrapped.entries()) {
                 lines.push({
                     text: padHorizontalText(text, width),
-                    colorOverride: this.host.theme.colors.warning,
+                    colorOverride: this.host.theme.colors.userForeground,
                     target: { kind: "queue-message", id: entry.id },
                     ...(index === 0 ? { segments: [{ start: 0, end: icon.length, foreground: this.host.theme.colors.info }] } : {}),
                 });

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

@@ -23,5 +23,7 @@ export type ToolBlockEntry = {
 };
 export type ToolBlockRenderOptions = {
     superCompact?: boolean;
+    backgroundOverride?: string;
+    skipHeaderBackground?: boolean;
 };
 export declare function renderToolBlock(entry: ToolBlockEntry, rule: ResolvedToolRule, width: number, colors: Theme["colors"], options?: ToolBlockRenderOptions): RenderedLine[];

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

@@ -10,7 +10,10 @@ export function renderToolBlock(entry, rule, width, colors, options = {}) {
     const stateIcon = toolStatusIcon(entry);
     const toolColor = resolveColor(rule.color, colors);
     const toolOutputColor = colors.statusForeground;
-    const headerLabel = entry.headerLabel ?? entry.toolName;
+    const headerLabel = (entry.headerLabel ?? entry.toolName).toLowerCase();
+    const bg = options.backgroundOverride;
+    const applyBackground = bg ? (lines) => { for (const line of lines)
+        line.backgroundOverride = bg; } : (_lines) => { };
     const headerPrefix = headerLabel ? `${stateIcon} ${headerLabel}` : stateIcon;
     const headerArgs = formatToolHeaderArgs(entry.headerArgs);
     const headerArgsWidth = width - stringDisplayWidth(headerPrefix) - 1;
@@ -22,14 +25,22 @@ export function renderToolBlock(entry, rule, width, colors, options = {}) {
         text: header,
         target,
         colorOverride: toolColor,
+        ...(options.backgroundOverride && !options.skipHeaderBackground ? { backgroundOverride: options.backgroundOverride } : {}),
         segments: [
             { start: 0, end: stateIcon.length, foreground: toolStatusIconColor(entry, colors), bold: true },
+            { start: stateIcon.length, end: headerPrefix.length, bold: true },
             ...headerArgsStyledSegments(headerArgsStart, clippedHeaderArgs.length, entry.headerArgsSegments, colors),
         ],
     };
     const headerLines = [headerLine];
     if (expanded) {
         headerLines.push(...renderToolBodyLines(entry.expandedText, width, target, toolOutputColor, entry.bodyStyle, colors, entry.syntaxHighlight, entry.bodyWrap, hasLspDiagnostics, entry.bodyLineStyles, entry.preserveAnsi));
+        if (options.skipHeaderBackground && headerLines.length > 1) {
+            applyBackground(headerLines.slice(1));
+        }
+        else {
+            applyBackground(headerLines);
+        }
         return headerLines;
     }
     if (rule.compactHidden || (rule.defaultExpanded === true && !options.superCompact))
@@ -39,6 +50,7 @@ export function renderToolBlock(entry, rule, width, colors, options = {}) {
         return headerLines;
     if (!options.superCompact) {
         headerLines.push(...renderCollapsedPreviewLines(entry, body, rule, width, target, toolOutputColor, colors, hasLspDiagnostics));
+        applyBackground(headerLines);
         return headerLines;
     }
     const preview = collapsedInlinePreview(body, rule, entry.preserveAnsi);

package/dist/app/runtime.d.ts

@@ -33,9 +33,11 @@ export declare function bundledSkillsInstallPath(homeDir?: string): string;
 export declare function ensurePiToolsSuiteExtensionInstalled(options?: PiToolsSuiteInstallOptions): Promise<PiToolsSuiteInstallResult>;
 export declare function ensureBundledSkillsInstalled(options?: BundledSkillsInstallOptions): Promise<BundledSkillsInstallResult>;
 export declare function getBundledExtensionPaths(): string[];
+export declare function getBundledExtensionPathsAsync(): Promise<string[]>;
 export declare function prioritizeBundledQuestionExtension(base: LoadExtensionsResult, questionExtensionPath?: string): LoadExtensionsResult;
 export type CreatePixRuntimeOptions = {
     eventBus?: EventBus;
+    config?: PixConfig;
 };
 type RuntimeSessionManagerModelState = Pick<SessionManager, "getEntries" | "getBranch">;
 export declare function resolvePixRuntimeModelRef(options: Pick<AppOptions, "modelRef">, sessionManager: RuntimeSessionManagerModelState, config?: PixConfig): string | undefined;

package/dist/app/runtime.js

@@ -1,5 +1,5 @@
 import { existsSync } from "node:fs";
-import { cp, lstat, mkdir, readlink, realpath, rm, symlink } from "node:fs/promises";
+import { access, cp, lstat, mkdir, readlink, realpath, rm, symlink } from "node:fs/promises";
 import { homedir } from "node:os";
 import { dirname, isAbsolute, join, relative, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -40,7 +40,7 @@ export function bundledSkillsInstallPath(homeDir = homedir()) {
 export async function ensurePiToolsSuiteExtensionInstalled(options = {}) {
     const sourcePath = resolve(options.sourcePath ?? piToolsSuiteExtensionSourcePath());
     const targetPath = resolve(options.targetPath ?? piToolsSuiteExtensionInstallPath(options.agentDir));
-    if (!extensionEntryExists(sourcePath)) {
+    if (!(await extensionEntryExistsAsync(sourcePath))) {
         return { action: "missing-source", sourcePath, targetPath };
     }
     await mkdir(dirname(targetPath), { recursive: true });
@@ -84,6 +84,14 @@ export function getBundledExtensionPaths() {
         bundledTerminalBellExtensionPath(),
     ].filter(extensionEntryExists);
 }
+export async function getBundledExtensionPathsAsync() {
+    const paths = await Promise.all([
+        bundledQuestionExtensionPath(),
+        bundledSessionTitleExtensionPath(),
+        bundledTerminalBellExtensionPath(),
+    ].map(async (extensionPath) => await extensionEntryExistsAsync(extensionPath) ? extensionPath : undefined));
+    return paths.filter((path) => path !== undefined);
+}
 export function prioritizeBundledQuestionExtension(base, questionExtensionPath = bundledQuestionExtensionPath()) {
     const bundledQuestionExtensions = base.extensions.filter((extension) => isBundledQuestionExtension(extension, questionExtensionPath));
     if (bundledQuestionExtensions.length === 0)
@@ -101,6 +109,21 @@ export function prioritizeBundledQuestionExtension(base, questionExtensionPath =
 function extensionEntryExists(extensionPath) {
     return existsSync(join(extensionPath, "index.ts")) || existsSync(join(extensionPath, "index.js"));
 }
+async function extensionEntryExistsAsync(extensionPath) {
+    try {
+        await access(join(extensionPath, "index.ts"));
+        return true;
+    }
+    catch {
+        try {
+            await access(join(extensionPath, "index.js"));
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
+}
 function extensionSymlinkType() {
     return process.platform === "win32" ? "junction" : "dir";
 }
@@ -198,13 +221,13 @@ export function resolveSessionModelRefFromTail(entries) {
 export async function createPixRuntime(options, runtimeOptions = {}) {
     const agentDir = getAgentDir();
     const createRuntime = async ({ cwd, sessionManager, sessionStartEvent }) => {
-        const config = loadPixConfig(cwd);
+        const config = runtimeOptions.config ?? loadPixConfig(cwd);
         const effectiveModelRef = resolvePixRuntimeModelRef(options, sessionManager, config);
         const parsedModel = effectiveModelRef ? parseModelRef(effectiveModelRef) : undefined;
         const initialThinkingLevel = resolvePixRuntimeInitialThinkingLevel(options, sessionManager, config);
         await ensureBundledSkillsInstalledOnce();
         await ensurePiToolsSuiteExtensionInstalledOnce({ agentDir });
-        const bundledExtensionPaths = getBundledExtensionPaths();
+        const bundledExtensionPaths = await getBundledExtensionPathsAsync();
         const services = await createAgentSessionServices({
             cwd,
             agentDir,

package/dist/app/screen/screen-styler.js

@@ -1,4 +1,4 @@
-import { ANSI_RESET, colorize } from "../../theme.js";
+import { ANSI_RESET, ansiStylePrefix, colorize } from "../../theme.js";
 import { renderMarkdownLine } from "../../markdown-format.js";
 import { syntaxHighlightSegmentsForLine } from "../../syntax-highlight.js";
 import { displayIndexForColumn } from "../../terminal-width.js";
@@ -105,7 +105,7 @@ export class ScreenStyler {
         return chunks.join("");
     }
     styleAnsiLine(text, options) {
-        const prefix = colorize("", options).replace(new RegExp(`${escapeRegExp(ANSI_RESET)}$`), "");
+        const prefix = ansiStylePrefix(options);
         if (!prefix)
             return text;
         return `${prefix}${text.replaceAll(ANSI_RESET, `${ANSI_RESET}${prefix}`)}${ANSI_RESET}`;

package/dist/app/session/session-lifecycle-controller.d.ts

@@ -14,6 +14,7 @@ export type AppSessionLifecycleHost = {
     inputEditor(): InputEditor;
     enableTerminal(): void;
     disposeRuntimeForQuit(runtime: AgentSessionRuntime): Promise<void>;
+    loadStartupConfig(): Promise<void>;
     loadRequestHistory(): Promise<void>;
     startSubagentsPolling(): void;
     closeSdkMenuForBind(): void;
@@ -67,6 +68,7 @@ export declare class AppSessionLifecycleController {
     loadSessionHistory(): void;
     requireRuntime(): AgentSessionRuntime;
     private bindSessionExtensions;
+    private collectAvailabilityIssues;
     private isCurrentRuntimeSession;
     private extensionUiScope;
 }

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

@@ -16,11 +16,17 @@ export class AppSessionLifecycleController {
             throw new Error("pi-ui-extend needs an interactive TTY");
         }
         this.host.enableTerminal();
-        await this.host.loadRequestHistory();
         this.host.setRunning(true);
         this.host.startSubagentsPolling();
         this.host.render();
+        void this.host.loadRequestHistory().catch((error) => {
+            if (!this.host.isRunning())
+                return;
+            this.host.addEntry({ id: createId("warning"), kind: "system", text: `Request history failed to load: ${stringifyUnknown(error)}` });
+            this.host.render();
+        });
         try {
+            await this.host.loadStartupConfig();
             const runtime = await this.host.createRuntime();
             if (!this.host.isRunning()) {
                 await this.host.disposeRuntimeForQuit(runtime);
@@ -34,21 +40,6 @@ export class AppSessionLifecycleController {
             if (isEmptyStartupSession(runtime)) {
                 this.host.addEntry({ id: createId("system"), kind: "system", text: createStartupInfoMessage(runtime) });
             }
-            await this.host.restoreTabsAfterStartup();
-            const availabilityIssues = await collectStartupAvailabilityIssues(runtime);
-            for (const issue of availabilityIssues) {
-                this.host.addEntry({
-                    id: createId(issue.kind),
-                    kind: issue.kind === "error" ? "error" : "system",
-                    text: issue.message,
-                });
-            }
-            if (availabilityIssues.some((issue) => issue.kind === "error")) {
-                this.host.showToast("Startup dependency unavailable", "error");
-            }
-            else if (availabilityIssues.length > 0) {
-                this.host.showToast("Startup dependency warning", "warning");
-            }
             if (runtime.modelFallbackMessage) {
                 this.host.addEntry({ id: createId("system"), kind: "system", text: runtime.modelFallbackMessage });
             }
@@ -59,6 +50,14 @@ export class AppSessionLifecycleController {
             this.host.setSessionStatus(runtime.session);
             this.host.setSessionActivity(runtime.session.isStreaming ? "running" : "idle");
             this.host.render();
+            void this.collectAvailabilityIssues(runtime);
+            void this.host.restoreTabsAfterStartup().catch((error) => {
+                if (!this.host.isRunning())
+                    return;
+                this.host.addEntry({ id: createId("warning"), kind: "system", text: `Tab restore failed: ${stringifyUnknown(error)}` });
+                this.host.showToast("Could not restore tabs", "warning");
+                this.host.render();
+            });
         }
         catch (error) {
             this.host.addEntry({ id: createId("error"), kind: "error", text: stringifyUnknown(error) });
@@ -154,6 +153,34 @@ export class AppSessionLifecycleController {
         this.extensionBindSession = session;
         return promise;
     }
+    async collectAvailabilityIssues(runtime) {
+        try {
+            const availabilityIssues = await collectStartupAvailabilityIssues(runtime);
+            if (!this.host.isRunning() || this.host.runtime() !== runtime)
+                return;
+            for (const issue of availabilityIssues) {
+                this.host.addEntry({
+                    id: createId(issue.kind),
+                    kind: issue.kind === "error" ? "error" : "system",
+                    text: issue.message,
+                });
+            }
+            if (availabilityIssues.some((issue) => issue.kind === "error")) {
+                this.host.showToast("Startup dependency unavailable", "error");
+            }
+            else if (availabilityIssues.length > 0) {
+                this.host.showToast("Startup dependency warning", "warning");
+            }
+            if (availabilityIssues.length > 0)
+                this.host.render();
+        }
+        catch (error) {
+            if (!this.host.isRunning() || this.host.runtime() !== runtime)
+                return;
+            this.host.addEntry({ id: createId("warning"), kind: "system", text: `Startup dependency check failed: ${stringifyUnknown(error)}` });
+            this.host.render();
+        }
+    }
     isCurrentRuntimeSession(runtime, session) {
         return this.host.isRunning() && this.host.runtime() === runtime && runtime.session === session;
     }

package/dist/app/session/tabs-controller.d.ts

@@ -6,7 +6,7 @@ import type { AppOptions, Entry, SessionActivity, SessionTab, SubmittedUserMessa
 export type TabInputState = InputEditorDraftState;
 export type AppTabsControllerHost = {
     readonly options: AppOptions;
-    readonly maxProjectSessions?: number;
+    readonly maxProjectSessions?: number | (() => number | undefined);
     readonly blinkController: AppBlinkController;
     runtime(): AgentSessionRuntime | undefined;
     createRuntimeForNewSession(): Promise<AgentSessionRuntime>;

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

@@ -220,17 +220,12 @@ export class AppTabsController {
         }
         this.syncActiveTabFromRuntime({ save: false });
         this.settleStartupTabPlaceholders();
-        this.host.resetSessionView();
-        if (this.activeTabId)
-            this.restoreDeferredUserMessages(this.activeTabId);
-        this.host.loadSessionHistory();
-        this.host.setSessionStatus(restoredRuntime.session);
-        this.host.setSessionActivity(this.sessionActivity(restoredRuntime.session));
         if (this.activeTabId)
             this.restoreInputState(this.activeTabId);
         await this.saveTabs();
         this.scheduleProjectSessionRetention();
         this.scheduleTabPrewarm();
+        await this.loadActiveSessionHistory(restoredRuntime);
     }
     async openNewTab() {
         if (this.pendingActiveTabId) {
@@ -1377,7 +1372,8 @@ export class AppTabsController {
         return preserved;
     }
     maxProjectSessions() {
-        const value = this.host.maxProjectSessions;
+        const configured = this.host.maxProjectSessions;
+        const value = typeof configured === "function" ? configured() : configured;
         return typeof value === "number" && Number.isFinite(value) ? Math.max(0, Math.floor(value)) : 0;
     }
 }

package/dist/config.d.ts

@@ -72,6 +72,7 @@ export type PixConfig = {
 };
 export declare function getPixConfigPath(homeDir?: string): string;
 export declare function getProjectPixConfigPath(cwd: string): string;
+export declare function defaultPixConfig(): PixConfig;
 export declare function resolveDefaultModelRef(config: PixConfig): string | undefined;
 export declare function savePixDefaultModel(modelRef: string): DefaultModelConfig | undefined;
 export declare function savePixDefaultThinking(thinking: string, fallbackModelRef?: string): DefaultModelConfig | undefined;

package/dist/config.js

@@ -285,19 +285,31 @@ function numberInRange(value, fallback, min, max) {
     const rounded = Math.round(value);
     return Math.min(max, Math.max(min, rounded));
 }
-function defaultPixConfig() {
+export function defaultPixConfig() {
     return {
-        toolRenderer: DEFAULT_TOOL_RENDERER,
-        outputFilters: DEFAULT_OUTPUT_FILTERS,
-        promptEnhancer: DEFAULT_PROMPT_ENHANCER,
-        autocomplete: DEFAULT_AUTOCOMPLETE,
-        modelColors: DEFAULT_MODEL_COLORS,
+        toolRenderer: cloneToolRendererConfig(DEFAULT_TOOL_RENDERER),
+        outputFilters: { patterns: [...DEFAULT_OUTPUT_FILTERS.patterns] },
+        promptEnhancer: { ...DEFAULT_PROMPT_ENHANCER },
+        autocomplete: { ...DEFAULT_AUTOCOMPLETE },
+        modelColors: { rules: { ...DEFAULT_MODEL_COLORS.rules } },
         iconTheme: { name: resolveAppIconThemeNameFromEnv() },
-        dictation: DEFAULT_DICTATION,
+        dictation: cloneDictationConfig(DEFAULT_DICTATION),
         ignoreContextFiles: false,
         maxProjectSessions: 0,
     };
 }
+function cloneToolRendererConfig(config) {
+    return {
+        default: { ...config.default },
+        tools: Object.fromEntries(Object.entries(config.tools).map(([name, rule]) => [name, { ...rule }])),
+    };
+}
+function cloneDictationConfig(config) {
+    return {
+        languages: Object.fromEntries(Object.entries(config.languages).map(([language, model]) => [language, { ...model }])),
+        ...(config.language === undefined ? {} : { language: config.language }),
+    };
+}
 function pixConfigFromParsed(parsed, fallback = defaultPixConfig()) {
     const toolRenderer = extractToolRendererConfig(parsed) ?? fallback.toolRenderer;
     const outputFilters = extractOutputFiltersConfig(parsed) ?? fallback.outputFilters;

package/dist/markdown-format.d.ts

@@ -6,6 +6,7 @@ export type RenderedMarkdownLine = {
         end: number;
         bold: true;
     }[];
+    heading?: boolean;
 };
 export type RenderedMarkdownTextLine = {
     text: string;
@@ -15,6 +16,7 @@ export type RenderedMarkdownTextLine = {
         bold: true;
     }[] | undefined;
     syntaxHighlight?: SyntaxLineHighlight | undefined;
+    heading?: boolean;
 };
 export declare function formatMarkdownTables(text: string, maxWidth?: number): string;
 export declare function renderMarkdownLine(text: string, start?: number): RenderedMarkdownLine;

package/dist/markdown-format.js

@@ -46,6 +46,7 @@ export function renderMarkdownLine(text, start = 0) {
     let rendered = text.slice(0, safeStart);
     let index = safeStart;
     let inCode = false;
+    const isHeading = /^\s{0,3}#{1,6}\s/.test(text);
     while (index < text.length) {
         const char = text[index] ?? "";
         if (char === "`" && !isEscaped(text, index)) {
@@ -67,7 +68,7 @@ export function renderMarkdownLine(text, start = 0) {
         rendered += char;
         index += 1;
     }
-    return { text: rendered, segments };
+    return { text: rendered, segments, ...(isHeading ? { heading: true } : {}) };
 }
 export function renderMarkdownTextLines(text, width, start = 0) {
     const lines = [];
@@ -80,12 +81,14 @@ export function renderMarkdownTextLines(text, width, start = 0) {
         const closesFence = Boolean(fence && nextFence && fence.marker === nextFence.marker && nextFence.length >= fence.length);
         const opensFence = !fence && nextFence !== undefined;
         const syntaxHighlight = markdownLineSyntaxHighlight(fence, Boolean(opensFence || closesFence), start);
-        const markdownLine = syntaxHighlight?.language === "markdown" ? renderMarkdownLine(rawLine) : undefined;
+        const isHeadingLine = !fence && /^\s{0,3}#{1,6}\s/.test(rawLine);
+        const markdownLine = syntaxHighlight?.language === "markdown" || isHeadingLine ? renderMarkdownLine(rawLine) : undefined;
         for (const wrapped of wrapRenderedMarkdownLine(markdownLine ?? { text: rawLine, segments: [] }, width)) {
             lines.push({
                 text: wrapped.text,
                 ...(wrapped.segments.length > 0 ? { segments: wrapped.segments } : {}),
                 ...(syntaxHighlight ? { syntaxHighlight } : {}),
+                ...(isHeadingLine ? { heading: true } : {}),
             });
         }
         if (opensFence && nextFence) {

package/dist/syntax-highlight.js

@@ -44,6 +44,8 @@ const MARKDOWN_FENCE_LANGUAGES = {
     javascript: "javascript",
     js: "javascript",
     json: "json",
+    markdown: "markdown",
+    md: "markdown",
     jsonc: "json",
     jsx: "javascript",
     python: "python",
@@ -227,7 +229,7 @@ function markdownSegments(code, colors) {
     const segments = [];
     const heading = /^(\s{0,3}#{1,6}\s+)(.*)$/.exec(code);
     if (heading) {
-        addSegment(segments, 0, code.length, "tag", colors, true);
+        segments.push({ start: 0, end: code.length, foreground: colors.heading, bold: true });
         return segments;
     }
     const fence = /^\s*`{3,}/.exec(code);

package/dist/theme.d.ts

@@ -17,6 +17,7 @@ export type Theme = {
         tabBorder: string;
         assistantMessageBackground: string;
         userMessageBackground: string;
+        thinkingMessageBackground: string;
         inputCursorBackground: string;
         popupForeground: string;
         popupBackground: string;
@@ -32,6 +33,7 @@ export type Theme = {
         accent: string;
         success: string;
         warning: string;
+        heading: string;
         info: string;
         toolMutation: string;
         toolSearch: string;
@@ -63,5 +65,6 @@ export type TextStyleOptions = {
 };
 export declare function parseThemeName(value: string): ThemeName | undefined;
 export declare function colorize(text: string, options: TextStyleOptions): string;
+export declare function ansiStylePrefix(options: TextStyleOptions): string;
 export declare function colorLine(text: string, width: number, options: TextStyleOptions): string;
 export declare function padOrTrimPlain(text: string, width: number): string;

package/dist/theme.js

@@ -5,7 +5,7 @@ export const THEMES = {
         colors: {
             background: "#090d13",
             foreground: "#d6deeb",
-            assistantForeground: "#c9d1d9",
+            assistantForeground: "#a4bce0",
             muted: "#7d8590",
             headerForeground: "#c9d1d9",
             headerBackground: "#161b22",
@@ -16,8 +16,9 @@ export const THEMES = {
             inputBorder: "#30363d",
             inputBorderWidgetBackground: "#2a2f36",
             tabBorder: "#7d8590",
-            assistantMessageBackground: "#161b22",
-            userMessageBackground: "#262224",
+            assistantMessageBackground: "",
+            userMessageBackground: "",
+            thinkingMessageBackground: "",
             inputCursorBackground: "#7fb3c8",
             popupForeground: "#e6edf3",
             popupBackground: "#1e1e1e",
@@ -33,18 +34,19 @@ export const THEMES = {
             accent: "#7aa2d6",
             success: "#7ca982",
             warning: "#d49a4a",
+            heading: "#d4b35e",
             info: "#7fb3c8",
-            toolMutation: "#d47aa2",
-            toolSearch: "#a889d6",
-            toolTitle: "#9aa7b4",
-            toolBash: "#c99670",
-            toolRead: "#6daa8a",
-            toolIndex: "#7a9ec7",
-            toolEdit: "#c76a8a",
-            toolWeb: "#8a9cc7",
-            toolMeta: "#8b8fa3",
-            thinkingForeground: "#b8a0d4",
-            userForeground: "#88b4dc",
+            toolMutation: "#b8899e", // ~10% brighter from #a67c8f
+            toolSearch: "#9d8abb", // ~10% brighter from #8c7aa8
+            toolTitle: "#899199", // ~10% brighter from #7b848c
+            toolBash: "#b89071", // ~10% brighter from #a68266
+            toolRead: "#6d9b82", // ~10% brighter from #628c76
+            toolIndex: "#7692b4", // ~10% brighter from #6a84a3
+            toolEdit: "#b47389", // ~10% brighter from #a3687c
+            toolWeb: "#8192b6", // ~10% brighter from #7584a6
+            toolMeta: "#7d8192", // ~10% brighter from #707485
+            thinkingForeground: "#64748b",
+            userForeground: "#d97706",
             thinkingXHigh: "#ff8a86",
             modelOpenAI: "#c8b45a",
             statusDotBase: "#30363d",
@@ -69,8 +71,9 @@ export const THEMES = {
             inputBorder: "#334155",
             inputBorderWidgetBackground: "#f1f5f9",
             tabBorder: "#64748b",
-            assistantMessageBackground: "#eef2f7",
-            userMessageBackground: "#f9f0ee",
+            assistantMessageBackground: "",
+            userMessageBackground: "",
+            thinkingMessageBackground: "",
             inputCursorBackground: "#0284c7",
             popupForeground: "#0f172a",
             popupBackground: "#ffffff",
@@ -86,18 +89,19 @@ export const THEMES = {
             accent: "#315f9f",
             success: "#47794c",
             warning: "#9a631d",
+            heading: "#b88a28",
             info: "#246b8e",
-            toolMutation: "#a33a68",
-            toolSearch: "#6d52a5",
-            toolTitle: "#526070",
-            toolBash: "#8a6535",
-            toolRead: "#3d7a56",
-            toolIndex: "#3a6d96",
-            toolEdit: "#963a5e",
-            toolWeb: "#4a6096",
-            toolMeta: "#6b7280",
+            toolMutation: "#8c5c70", // reverted
+            toolSearch: "#6e608c", // reverted
+            toolTitle: "#626c78", // reverted
+            toolBash: "#8c7556", // reverted
+            toolRead: "#507a62", // reverted
+            toolIndex: "#567a96", // reverted
+            toolEdit: "#8c586c", // reverted
+            toolWeb: "#5c6a8c", // reverted
+            toolMeta: "#787e8a", // reverted
             thinkingForeground: "#6b5491",
-            userForeground: "#4a78b5",
+            userForeground: "#854d0e",
             thinkingXHigh: "#cf333d",
             modelOpenAI: "#75671f",
             statusDotBase: "#334155",
@@ -108,10 +112,20 @@ export const THEMES = {
     },
 };
 export const ANSI_RESET = "\x1b[0m";
+const rgbCodeCache = new Map();
+const stylePrefixCache = new Map();
 export function parseThemeName(value) {
     return value === "dark" || value === "light" ? value : undefined;
 }
 export function colorize(text, options) {
+    const prefix = ansiStylePrefix(options);
+    return prefix ? `${prefix}${text}${ANSI_RESET}` : text;
+}
+export function ansiStylePrefix(options) {
+    const cacheKey = styleCacheKey(options);
+    const cached = stylePrefixCache.get(cacheKey);
+    if (cached !== undefined)
+        return cached;
     const codes = [];
     if (options.bold)
         codes.push("1");
@@ -123,7 +137,9 @@ export function colorize(text, options) {
         codes.push(rgbCode("38", options.foreground));
     if (options.background)
         codes.push(rgbCode("48", options.background));
-    return codes.length === 0 ? text : `\x1b[${codes.join(";")}m${text}${ANSI_RESET}`;
+    const prefix = codes.length === 0 ? "" : `\x1b[${codes.join(";")}m`;
+    stylePrefixCache.set(cacheKey, prefix);
+    return prefix;
 }
 export function colorLine(text, width, options) {
     return colorize(padOrTrimPlain(text, width), options);
@@ -133,8 +149,17 @@ export function padOrTrimPlain(text, width) {
 }
 function rgbCode(prefix, hex) {
     const normalized = hex.replace(/^#/, "");
+    const cacheKey = `${prefix}:${normalized}`;
+    const cached = rgbCodeCache.get(cacheKey);
+    if (cached)
+        return cached;
     const red = Number.parseInt(normalized.slice(0, 2), 16);
     const green = Number.parseInt(normalized.slice(2, 4), 16);
     const blue = Number.parseInt(normalized.slice(4, 6), 16);
-    return `${prefix};2;${red};${green};${blue}`;
+    const code = `${prefix};2;${red};${green};${blue}`;
+    rgbCodeCache.set(cacheKey, code);
+    return code;
+}
+function styleCacheKey(options) {
+    return `${options.bold ? 1 : 0}|${options.underline ? 1 : 0}|${options.strikethrough ? 1 : 0}|${options.foreground ?? ""}|${options.background ?? ""}`;
 }

package/external/pi-tools-suite/src/antigravity-auth/auth-store.ts

@@ -96,6 +96,9 @@ export function getGoogleOAuthClientCredentials(...sources: Array<unknown>): Goo
 		const clientSecret = nestedClientSecret ?? stringProperty(source, ["clientSecret", "client_secret", "googleClientSecret", "google_client_secret", "oauthClientSecret", "oauth_client_secret"]);
 		if (clientId) return { clientId, ...(clientSecret ? { clientSecret } : {}) };
 	}
+	const clientId = process.env.PI_ANTIGRAVITY_GOOGLE_CLIENT_ID;
+	const clientSecret = process.env.PI_ANTIGRAVITY_GOOGLE_CLIENT_SECRET;
+	if (clientId) return { clientId, ...(clientSecret ? { clientSecret } : {}) };
 	return undefined;
 }
 
@@ -215,13 +218,15 @@ export async function importOpencodeAntigravityAccount(options: {
 		};
 	}
 
+	const oauthClient = getGoogleOAuthClientCredentials(selected.account, existing);
 	piAuth[PROVIDER_ID] = {
+		...existing,
 		type: "oauth",
 		refresh,
 		access: "",
 		expires: 0,
 		email: selected.account.email,
-		...getGoogleOAuthClientCredentials(selected.account),
+		...(oauthClient ? { oauthClient } : {}),
 		accounts: storage.accounts.filter((account) => account.enabled !== false && getAccountRefreshToken(account)),
 		activeIndex: selected.index,
 	};

package/external/pi-tools-suite/src/antigravity-auth/oauth.ts

@@ -224,7 +224,7 @@ export async function addAntigravityAccount(
 async function refreshAccountToken(account: OpencodeAntigravityAccount, oauthClient?: GoogleOAuthClientCredentials): Promise<RefreshedAntigravityAccount> {
 	const refreshToken = getAccountRefreshToken(account);
 	if (!refreshToken) throw new Error(`Missing refresh token for Antigravity account ${account.email ?? "<unknown>"}`);
-	const clientCredentials = getGoogleOAuthClientCredentials(account) ?? oauthClient;
+	const clientCredentials = getGoogleOAuthClientCredentials(account, oauthClient);
 	assertGoogleOAuthCredentialsConfigured(clientCredentials);
 	const projectId = getAccountProjectId(account);
 	const start = Date.now();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-ui-extend",
-  "version": "0.1.20",
+  "version": "0.1.21",
   "private": false,
   "type": "module",
   "bin": {