pi-ui-extend 0.1.29 → 0.1.31

package/dist/app/app.d.ts

@@ -81,6 +81,8 @@ export declare class PiUiExtendApp {
     private setVoicePartialTranscript;
     private addVoiceSystemMessage;
     private resetSessionView;
+    private captureSessionView;
+    private restoreSessionView;
     private loadSessionHistory;
     private openSearchResultInNewTab;
     private scrollToUserMessageJumpTarget;

package/dist/app/app.js

@@ -41,7 +41,7 @@ import { TabLineRenderer } from "./rendering/tab-line-renderer.js";
 import { AppTerminalController } from "./terminal/terminal-controller.js";
 import { TerminalBellSoundController } from "./terminal/terminal-bell-sound-controller.js";
 import { AppToastController } from "./rendering/toast-controller.js";
-import { checkPixUpdate, formatPixStartupUpdateDialog } from "./cli/update.js";
+import { checkPiUpdate, checkPixUpdate, formatPixStartupUpdateDialog, formatPiStartupUpdateToast } from "./cli/update.js";
 import { AppVoiceController } from "./input/voice-controller.js";
 import { createIsolatedExtensionEventBus } from "./extensions/extension-event-bus.js";
 import { setAppIconTheme } from "./icons.js";
@@ -181,6 +181,8 @@ export class PiUiExtendApp {
             resetSessionView: () => this.resetSessionView(),
             loadSessionHistory: () => this.loadSessionHistory(),
             loadSessionHistoryAsync: (options) => this.loadSessionHistoryAsync(options),
+            captureSessionView: () => this.captureSessionView(),
+            restoreSessionView: (view) => this.restoreSessionView(view),
             syncUserSessionEntryMetadata: () => this.workspaceActions.syncUserSessionEntryMetadata(),
             captureInputState: () => this.inputEditor.draftState,
             restoreInputState: (state) => this.restoreTabInputState(state),
@@ -785,18 +787,27 @@ export class PiUiExtendApp {
         await this.sessionLifecycle.start();
         this.modelUsageController.startPolling();
         this.nerdFontController.ensureInstalledOnStartup();
-        void this.checkPixUpdateOnStartup();
+        this.checkPixUpdateOnStartup();
     }
-    async checkPixUpdateOnStartup() {
-        try {
-            const result = await checkPixUpdate();
+    checkPixUpdateOnStartup() {
+        void checkPiUpdate()
+            .then((result) => {
+            if (result.status !== "newer")
+                return;
+            this.showToast(formatPiStartupUpdateToast(result), "warning");
+        })
+            .catch(() => {
+            // Startup update checks should never interrupt the TUI.
+        });
+        void checkPixUpdate()
+            .then((result) => {
             if (result.status !== "newer")
                 return;
             this.showToast(formatPixStartupUpdateDialog(result), "warning", { variant: "dialog" });
-        }
-        catch {
+        })
+            .catch(() => {
             // Startup update checks should never interrupt the TUI.
-        }
+        });
     }
     async bindCurrentSession(options) {
         await this.sessionLifecycle.bindCurrentSession(options);
@@ -889,6 +900,18 @@ export class PiUiExtendApp {
     resetSessionView() {
         this.sessionLifecycle.resetSessionView();
     }
+    captureSessionView() {
+        return {
+            entries: [...this.entries],
+            eventState: this.sessionEvents.snapshotState(),
+        };
+    }
+    restoreSessionView(view) {
+        this.entries.splice(0, this.entries.length, ...view.entries);
+        this.sessionEvents.restoreState(view.eventState);
+        this.conversationViewport.clear();
+        this.workspaceActions.syncUserSessionEntryMetadata();
+    }
     loadSessionHistory() {
         void this.sessionEvents.loadSessionHistoryAsync({
             isCancelled: () => !this.running,

package/dist/app/cli/update.d.ts

@@ -33,12 +33,17 @@ export type PixUpdateCheckOptions = {
     packageRoot?: string;
     fetchLatestVersion?: (packageName: string, currentVersion: string, timeoutMs: number) => Promise<string | undefined>;
 };
+export type PiUpdateCheckOptions = PixUpdateCheckOptions & {
+    pixPackageRoot?: string;
+};
 export declare function pixUpdateUsage(): string;
 export declare function parsePixUpdateArgs(argv: readonly string[]): PixUpdateCliOptions;
 export declare function getPixPackageVersion(packageRoot?: string): string;
 export declare function checkPixUpdate(options?: PixUpdateCheckOptions): Promise<PixUpdateCheckResult>;
+export declare function checkPiUpdate(options?: PiUpdateCheckOptions): Promise<PixUpdateCheckResult>;
 export declare function formatPixUpdateCheck(result: PixUpdateCheckResult): string;
 export declare function formatPixStartupUpdateDialog(result: PixUpdateCheckResult): string;
+export declare function formatPiStartupUpdateToast(result: PixUpdateCheckResult): string;
 export declare function getPixSelfUpdateCommand(packageName: string, latestVersion?: string, packageRoot?: string): PixSelfUpdateCommand | undefined;
 export declare function runPixUpdateCli(argv?: readonly string[]): Promise<number>;
 declare function runCommand(command: PixSelfUpdateCommand): Promise<void>;

package/dist/app/cli/update.js

@@ -1,10 +1,13 @@
 import { spawn } from "node:child_process";
 import { existsSync, readFileSync } from "node:fs";
+import { createRequire } from "node:module";
 import { dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { getAgentDir, SettingsManager } from "@earendil-works/pi-coding-agent";
 const DEFAULT_UPDATE_TIMEOUT_MS = 10_000;
 const NPM_REGISTRY_URL = "https://registry.npmjs.org";
+const PI_PACKAGE_NAME = "@earendil-works/pi-coding-agent";
+const requireFromUpdateModule = createRequire(import.meta.url);
 const defaultPixUpdateDeps = {
     checkPixUpdate,
     runCommand,
@@ -53,6 +56,14 @@ export function getPixPackageVersion(packageRoot) {
 }
 export async function checkPixUpdate(options = {}) {
     const packageInfo = readPixPackageInfo(options.packageRoot);
+    return await checkPackageUpdate(packageInfo, options);
+}
+export async function checkPiUpdate(options = {}) {
+    const packageRoot = options.packageRoot ?? findPiPackageRoot(options.pixPackageRoot);
+    const packageInfo = readPackageInfo(packageRoot, PI_PACKAGE_NAME);
+    return await checkPackageUpdate(packageInfo, options);
+}
+async function checkPackageUpdate(packageInfo, options) {
     const base = {
         packageName: packageInfo.name,
         currentVersion: packageInfo.version,
@@ -124,6 +135,9 @@ export function formatPixStartupUpdateDialog(result) {
         `current: ${result.packageName} v${result.currentVersion}`,
         ...(result.latestVersion ? [`latest: ${result.latestVersion}`] : []),
         "",
+        "Pix includes the pinned Pi SDK/dependencies used by this renderer.",
+        "Updating only the global `pi` CLI is not enough for Pix.",
+        "",
         "To update:",
         "1. Exit Pix.",
         "2. Run `pix update` in your shell.",
@@ -131,6 +145,11 @@ export function formatPixStartupUpdateDialog(result) {
     ];
     return lines.join("\n");
 }
+export function formatPiStartupUpdateToast(result) {
+    return result.latestVersion
+        ? `Pi ${result.latestVersion} is available; Pix bundles Pi ${result.currentVersion}. Waiting for a matching Pix update.`
+        : `Pi update detected; Pix bundles Pi ${result.currentVersion}. Waiting for a matching Pix update.`;
+}
 export function getPixSelfUpdateCommand(packageName, latestVersion, packageRoot = readPixPackageInfo().packageRoot) {
     if (!packageRootLooksPackageManaged(packageRoot))
         return undefined;
@@ -191,9 +210,12 @@ export async function runPixUpdateCli(argv = process.argv.slice(2)) {
     }
 }
 function readPixPackageInfo(packageRoot = findPixPackageRoot()) {
+    return readPackageInfo(packageRoot, "pi-ui-extend");
+}
+function readPackageInfo(packageRoot, fallbackName) {
     const packageJsonPath = join(packageRoot, "package.json");
     const raw = JSON.parse(readFileSync(packageJsonPath, "utf8"));
-    const name = typeof raw.name === "string" && raw.name.trim() ? raw.name.trim() : "pi-ui-extend";
+    const name = typeof raw.name === "string" && raw.name.trim() ? raw.name.trim() : fallbackName;
     const version = typeof raw.version === "string" && raw.version.trim() ? raw.version.trim() : "0.0.0";
     return {
         name,
@@ -214,6 +236,12 @@ function findPixPackageRoot() {
         currentDir = nextDir;
     }
 }
+function findPiPackageRoot(pixPackageRoot = readPixPackageInfo().packageRoot) {
+    const packageJsonPath = requireFromUpdateModule.resolve(`${PI_PACKAGE_NAME}/package.json`, {
+        paths: [pixPackageRoot],
+    });
+    return dirname(packageJsonPath);
+}
 async function fetchLatestNpmVersion(packageName, currentVersion, timeoutMs) {
     const response = await fetch(`${NPM_REGISTRY_URL}/${encodeURIComponent(packageName)}/latest`, {
         headers: {

package/dist/app/model/model-usage-status.d.ts

@@ -89,6 +89,8 @@ type AntigravityQuotaAccount = {
     readonly email?: string;
     readonly refreshToken: string;
     readonly accessToken?: string;
+    readonly clientId?: string;
+    readonly clientSecret?: string;
     readonly cachedQuota?: AntigravityCachedQuota;
     readonly cachedQuotaUpdatedAt?: number;
     readonly projectId: string;

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

@@ -8,6 +8,8 @@ const OPENAI_USAGE_URL = "https://chatgpt.com/backend-api/wham/usage";
 const ZAI_QUOTA_URL = "https://api.z.ai/api/monitor/usage/quota/limit";
 const ZHIPU_QUOTA_URL = "https://bigmodel.cn/api/monitor/usage/quota/limit";
 const GOOGLE_QUOTA_API_URL = "https://cloudcode-pa.googleapis.com/v1internal:fetchAvailableModels";
+const GOOGLE_TOKEN_REFRESH_URL = "https://oauth2.googleapis.com/token";
+const GOOGLE_ANTIGRAVITY_USER_AGENT = "antigravity/1.11.9 windows/amd64";
 const REQUEST_TIMEOUT_MS = 10_000;
 const DAY_SECONDS = 86_400;
 const HOUR_SECONDS = 3_600;
@@ -383,11 +385,11 @@ export function resolveAntigravityQuotaModelKey(model) {
 }
 export function googleAntigravityUsageStatusFromResponse(data, descriptor, now = Date.now()) {
     const quotaInfo = data.models[descriptor.quotaModelKey]?.quotaInfo;
-    if (!quotaInfo || !Number.isFinite(quotaInfo.remainingFraction))
+    if (!quotaInfo)
         return undefined;
     const resetAt = parseResetTime(quotaInfo.resetTime, now);
     const window = {
-        remainingPercent: clampPercent(Math.round((quotaInfo.remainingFraction ?? 0) * 100)),
+        remainingPercent: quotaRemainingPercent(quotaInfo),
         resetAt,
         windowSeconds: Math.max(0, Math.round((resetAt - now) / 1000)),
     };
@@ -404,13 +406,8 @@ export function googleAntigravityUsageStatusFromResponse(data, descriptor, now =
 }
 async function queryGoogleAntigravityModelUsage(descriptor) {
     const now = Date.now();
-    const cachedResponse = googleQuotaResponseFromCachedQuota(descriptor.account.cachedQuota, descriptor.account.cachedQuotaUpdatedAt, now);
-    if (cachedResponse)
-        return googleAntigravityUsageStatusFromResponse(cachedResponse, descriptor, now);
-    if (!descriptor.account.accessToken)
-        return undefined;
-    const response = await fetchGoogleAntigravityQuota(descriptor.account.accessToken, descriptor.account.projectId);
-    return googleAntigravityUsageStatusFromResponse(response, descriptor);
+    const response = await fetchGoogleAntigravityQuotaForAccount(descriptor.account, now);
+    return googleAntigravityUsageStatusFromResponse(response, descriptor, now);
 }
 const GOOGLE_ACCOUNT_QUOTA_WINDOWS = [
     { label: "Claude Opus", quotaModelKey: "claude-opus-4-6-thinking" },
@@ -424,12 +421,8 @@ async function queryGoogleAntigravityAccountUsage(now) {
     const results = await Promise.all(accounts.map(async (account) => {
         const accountLabel = account.email ?? maskCredential(account.refreshToken);
         try {
-            const response = account.cachedQuota ? googleQuotaResponseFromCachedQuota(account.cachedQuota, account.cachedQuotaUpdatedAt, now) : undefined;
-            const windows = response ? googleAccountWindowsFromResponse(response, now) : [];
-            if (windows.length === 0 && account.accessToken) {
-                const liveResponse = await fetchGoogleAntigravityQuota(account.accessToken, account.projectId);
-                windows.push(...googleAccountWindowsFromResponse(liveResponse, now));
-            }
+            const response = await fetchGoogleAntigravityQuotaForAccount(account, now);
+            const windows = googleAccountWindowsFromResponse(response, now);
             return {
                 account: accountLabel,
                 windows,
@@ -456,12 +449,14 @@ function readAllAntigravityQuotaAccounts() {
     const credential = readPiAuthSync().antigravity;
     if (!credential)
         return [];
+    const credentialClient = getGoogleOAuthClientCredentials(credential);
     const accounts = storedAntigravityAccounts(credential);
     if (accounts.length > 0) {
         const activeIndex = clampAccountIndex(credential.activeIndex, accounts.length);
         const activeAccess = antigravityAccessFromCredential(credential);
         return accounts.map((account, accountIndex) => antigravityQuotaAccount(account, {
             ...(credential.email ? { fallbackEmail: credential.email } : {}),
+            ...(credentialClient ? { clientCredentials: credentialClient } : {}),
             ...(accountIndex === activeIndex && activeAccess ? { accessToken: activeAccess.accessToken } : {}),
             accountIndex,
             accountCount: accounts.length,
@@ -471,6 +466,7 @@ function readAllAntigravityQuotaAccounts() {
     const fallbackAccess = antigravityAccessFromCredential(credential);
     const account = fallbackAccount ? antigravityQuotaAccount(fallbackAccount, {
         ...(credential.email ? { fallbackEmail: credential.email } : {}),
+        ...(credentialClient ? { clientCredentials: credentialClient } : {}),
         ...(fallbackAccess ? { accessToken: fallbackAccess.accessToken } : {}),
     }) : undefined;
     return account ? [account] : [];
@@ -483,9 +479,41 @@ function readPiAuthSync() {
         return {};
     }
 }
+function getAccountRefreshToken(account) {
+    if (account.refreshToken)
+        return account.refreshToken;
+    if (!account.refresh)
+        return undefined;
+    return splitAntigravityRefresh(account.refresh).refreshToken;
+}
+function stringProperty(source, keys) {
+    if (!source || typeof source !== "object")
+        return undefined;
+    const record = source;
+    for (const key of keys) {
+        const value = record[key];
+        if (typeof value === "string" && value)
+            return value;
+    }
+    return undefined;
+}
+function getGoogleOAuthClientCredentials(...sources) {
+    for (const source of sources) {
+        const nested = source && typeof source === "object"
+            ? source.oauthClient
+            : undefined;
+        const nestedClientId = stringProperty(nested, ["clientId", "client_id", "id"]);
+        const nestedClientSecret = stringProperty(nested, ["clientSecret", "client_secret", "secret"]);
+        const clientId = nestedClientId ?? stringProperty(source, ["clientId", "client_id", "googleClientId", "google_client_id", "oauthClientId", "oauth_client_id"]);
+        const clientSecret = nestedClientSecret ?? stringProperty(source, ["clientSecret", "client_secret", "googleClientSecret", "google_client_secret", "oauthClientSecret", "oauth_client_secret"]);
+        if (clientId)
+            return { clientId, ...(clientSecret ? { clientSecret } : {}) };
+    }
+    return undefined;
+}
 function storedAntigravityAccounts(credential) {
     return Array.isArray(credential.accounts)
-        ? credential.accounts.filter((account) => account.enabled !== false && !!account.refreshToken)
+        ? credential.accounts.filter((account) => account.enabled !== false && !!getAccountRefreshToken(account))
         : [];
 }
 function antigravityAccountFromCredential(credential) {
@@ -506,16 +534,19 @@ function antigravityAccountFromCredential(credential) {
     };
 }
 function antigravityQuotaAccount(account, options = {}) {
-    const refreshToken = account.refreshToken;
+    const refreshToken = getAccountRefreshToken(account);
     if (!refreshToken)
         return undefined;
     const email = account.email || options.fallbackEmail;
     const projectId = account.projectId || account.managedProjectId || DEFAULT_ANTIGRAVITY_PROJECT_ID;
+    const clientCredentials = getGoogleOAuthClientCredentials(account, options.clientCredentials);
     return {
         refreshToken,
         projectId,
         cacheKey: email ? email.toLowerCase() : shortHash(refreshToken),
         ...(options.accessToken ? { accessToken: options.accessToken } : {}),
+        ...(clientCredentials ? { clientId: clientCredentials.clientId } : {}),
+        ...(clientCredentials?.clientSecret ? { clientSecret: clientCredentials.clientSecret } : {}),
         ...(account.cachedQuota ? { cachedQuota: account.cachedQuota } : {}),
         ...(typeof account.cachedQuotaUpdatedAt === "number" ? { cachedQuotaUpdatedAt: account.cachedQuotaUpdatedAt } : {}),
         ...(email ? { email } : {}),
@@ -590,13 +621,49 @@ function clampAccountIndex(index, accountCount) {
 function shortHash(value) {
     return createHash("sha256").update(value).digest("hex").slice(0, 12);
 }
+async function fetchGoogleAntigravityQuotaForAccount(account, now = Date.now()) {
+    if (account.accessToken)
+        return await fetchGoogleAntigravityQuota(account.accessToken, account.projectId);
+    if (account.clientId) {
+        const { accessToken } = await refreshGoogleAntigravityAccessToken(account);
+        return await fetchGoogleAntigravityQuota(accessToken, account.projectId);
+    }
+    const cachedResponse = googleQuotaResponseFromCachedQuota(account.cachedQuota, account.cachedQuotaUpdatedAt, now);
+    if (cachedResponse)
+        return cachedResponse;
+    throw new Error("Missing Google OAuth client credentials, cannot query live Antigravity quota.");
+}
+async function refreshGoogleAntigravityAccessToken(account) {
+    if (!account.clientId)
+        throw new Error("Missing Google OAuth client id, cannot refresh Antigravity access token.");
+    const params = new URLSearchParams({
+        client_id: account.clientId,
+        refresh_token: account.refreshToken,
+        grant_type: "refresh_token",
+    });
+    if (account.clientSecret)
+        params.set("client_secret", account.clientSecret);
+    const response = await fetchWithTimeout(GOOGLE_TOKEN_REFRESH_URL, {
+        method: "POST",
+        headers: { "Content-Type": "application/x-www-form-urlencoded" },
+        body: params,
+    });
+    if (!response.ok) {
+        const errorText = await response.text();
+        throw new Error(`Google token refresh failed (${response.status}): ${errorText}`);
+    }
+    const data = await response.json();
+    if (!data.access_token)
+        throw new Error("Google token refresh did not return an access token.");
+    return { accessToken: data.access_token };
+}
 async function fetchGoogleAntigravityQuota(accessToken, projectId) {
     const response = await fetchWithTimeout(GOOGLE_QUOTA_API_URL, {
         method: "POST",
         headers: {
             "Content-Type": "application/json",
             Authorization: `Bearer ${accessToken}`,
-            "User-Agent": "antigravity/1.18.3 darwin/arm64",
+            "User-Agent": GOOGLE_ANTIGRAVITY_USER_AGENT,
         },
         body: JSON.stringify({ project: projectId }),
     });
@@ -757,16 +824,19 @@ function accountWindowFromRateLimit(window, now) {
 }
 function googleAccountWindowFromResponse(data, label, quotaModelKey, now) {
     const quotaInfo = data.models[quotaModelKey]?.quotaInfo;
-    if (!quotaInfo || !Number.isFinite(quotaInfo.remainingFraction))
+    if (!quotaInfo)
         return undefined;
     const resetAt = parseResetTime(quotaInfo.resetTime, now);
     return {
         label,
-        remainingPercent: clampPercent(Math.round((quotaInfo.remainingFraction ?? 0) * 100)),
+        remainingPercent: quotaRemainingPercent(quotaInfo),
         resetAt,
         windowSeconds: Math.max(0, Math.round((resetAt - now) / 1000)),
     };
 }
+function quotaRemainingPercent(quotaInfo) {
+    return clampPercent(Math.round((Number.isFinite(quotaInfo.remainingFraction) ? quotaInfo.remainingFraction : 0) * 100));
+}
 function googleAccountWindowsFromResponse(data, now) {
     return GOOGLE_ACCOUNT_QUOTA_WINDOWS
         .map((window) => googleAccountWindowFromResponse(data, window.label, window.quotaModelKey, now))

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

@@ -1,8 +1,22 @@
 import type { AgentSessionEvent, AgentSessionRuntime } from "@earendil-works/pi-coding-agent";
 import type { ConversationViewport } from "../rendering/conversation-viewport.js";
-import { type LoadOlderSessionHistoryOptions } from "./session-history.js";
+import { type LoadOlderSessionHistoryOptions, type SessionHistoryOlderLoader } from "./session-history.js";
 import type { Entry, SessionActivity } from "../types.js";
 import type { WorkspaceMutation, WorkspaceMutationPreparation } from "../workspace/workspace-undo.js";
+export type AppSessionEventControllerState = {
+    toolEntryIdsByCallId: Map<string, string>;
+    toolMutationPreparationsByCallId: Map<string, {
+        userEntryId: string;
+        args: unknown;
+        preparation?: WorkspaceMutationPreparation;
+    }>;
+    olderHistoryLoader: SessionHistoryOlderLoader | undefined;
+    currentUserEntryId: string | undefined;
+    currentAssistantEntryId: string | undefined;
+    currentThinkingEntryId: string | undefined;
+    assistantTextBuffer: string;
+    entryRenderVersions: Map<string, number>;
+};
 export type AppSessionEventControllerHost = {
     readonly entries: Entry[];
     runtime(): AgentSessionRuntime | undefined;
@@ -45,6 +59,8 @@ export declare class AppSessionEventController {
     private currentThinkingEntryId;
     private assistantTextBuffer;
     constructor(host: AppSessionEventControllerHost);
+    snapshotState(): AppSessionEventControllerState;
+    restoreState(state: AppSessionEventControllerState): void;
     reset(): void;
     loadSessionHistory(): void;
     loadSessionHistoryAsync(options: {

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

@@ -20,6 +20,34 @@ export class AppSessionEventController {
     constructor(host) {
         this.host = host;
     }
+    snapshotState() {
+        return {
+            toolEntryIdsByCallId: new Map(this.toolEntryIdsByCallId),
+            toolMutationPreparationsByCallId: new Map(this.toolMutationPreparationsByCallId),
+            olderHistoryLoader: this.olderHistoryLoader,
+            currentUserEntryId: this.currentUserEntryId,
+            currentAssistantEntryId: this.currentAssistantEntryId,
+            currentThinkingEntryId: this.currentThinkingEntryId,
+            assistantTextBuffer: this.assistantTextBuffer,
+            entryRenderVersions: new Map(this.entryRenderVersions),
+        };
+    }
+    restoreState(state) {
+        this.toolEntryIdsByCallId.clear();
+        for (const [key, value] of state.toolEntryIdsByCallId)
+            this.toolEntryIdsByCallId.set(key, value);
+        this.toolMutationPreparationsByCallId.clear();
+        for (const [key, value] of state.toolMutationPreparationsByCallId)
+            this.toolMutationPreparationsByCallId.set(key, value);
+        this.olderHistoryLoader = state.olderHistoryLoader;
+        this.currentUserEntryId = state.currentUserEntryId;
+        this.currentAssistantEntryId = state.currentAssistantEntryId;
+        this.currentThinkingEntryId = state.currentThinkingEntryId;
+        this.assistantTextBuffer = state.assistantTextBuffer;
+        this.entryRenderVersions.clear();
+        for (const [key, value] of state.entryRenderVersions)
+            this.entryRenderVersions.set(key, value);
+    }
     reset() {
         this.toolEntryIdsByCallId.clear();
         this.toolMutationPreparationsByCallId.clear();

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

@@ -1,8 +1,13 @@
 import { type AgentSession, type AgentSessionRuntime } from "@earendil-works/pi-coding-agent";
 import type { BindCurrentSessionOptions } from "./session-lifecycle-controller.js";
+import type { AppSessionEventControllerState } from "./session-event-controller.js";
 import type { InputEditorDraftState } from "../../input-editor.js";
 import type { AppBlinkController } from "../screen/blink-controller.js";
 import type { AppOptions, Entry, SessionActivity, SessionTab, SubmittedUserMessage } from "../types.js";
+type TabSessionView = {
+    entries: Entry[];
+    eventState: AppSessionEventControllerState;
+};
 export type TabInputState = InputEditorDraftState;
 export type AppTabsControllerHost = {
     readonly options: AppOptions;
@@ -24,6 +29,8 @@ export type AppTabsControllerHost = {
         render: () => void;
         lazyOlderHistory?: boolean;
     }): Promise<boolean>;
+    captureSessionView?(): TabSessionView;
+    restoreSessionView?(view: TabSessionView): void;
     syncUserSessionEntryMetadata(): void;
     captureInputState(): TabInputState;
     restoreInputState(state: TabInputState): void;
@@ -44,6 +51,7 @@ export declare class AppTabsController {
     private readonly historyReloadTimersByTabId;
     private readonly inputStatesByTabId;
     private readonly deferredUserMessagesByTabId;
+    private readonly sessionViewsByTabId;
     private readonly tabIdsNeedingHistoryReload;
     private activeTabId;
     private pendingActiveTabId;
@@ -83,6 +91,7 @@ export declare class AppTabsController {
     private activeTab;
     private clearStartupTabPlaceholders;
     private storeActiveRuntime;
+    private storeActiveSessionView;
     private setRuntimeForTab;
     private deleteRuntimeForTab;
     private clearRuntimeSubscriptions;
@@ -138,3 +147,4 @@ export declare class AppTabsController {
     private preservedSessionPaths;
     private maxProjectSessions;
 }
+export {};

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

@@ -12,6 +12,7 @@ const BACKGROUND_PREWARM_TAB_LIMIT = 2;
 const TAB_ATTENTION_BLINK_KEY = "tab-attention";
 const LOADING_TAB_TITLE_PATTERN = /^loading(?:…|\.\.\.)?$/iu;
 const DEFAULT_SESSION_TITLE_PATTERN = /^session [0-9a-f]{8}$/iu;
+const SESSION_TITLE_HEAD_SCAN_MAX_BYTES = 256 * 1024;
 const SESSION_TITLE_SCAN_MAX_BYTES = 2 * 1024 * 1024;
 export class AppTabsController {
     host;
@@ -23,6 +24,7 @@ export class AppTabsController {
     historyReloadTimersByTabId = new Map();
     inputStatesByTabId = new Map();
     deferredUserMessagesByTabId = new Map();
+    sessionViewsByTabId = new Map();
     tabIdsNeedingHistoryReload = new Set();
     activeTabId;
     pendingActiveTabId;
@@ -576,6 +578,7 @@ export class AppTabsController {
         const previousRuntime = runtime;
         const previousTargetActivity = target.activity;
         this.storeActiveRuntime(runtime);
+        this.storeActiveSessionView();
         this.storeActiveInputState();
         this.storeActiveDeferredUserMessages();
         this.activeTabId = target.id;
@@ -584,8 +587,6 @@ export class AppTabsController {
         this.clearTabAttention(target);
         this.restoreInputState(target.id);
         this.host.closeMenusForTabSwitch?.();
-        this.host.resetSessionView();
-        this.restoreDeferredUserMessages(target.id);
         this.host.setStatus("switching tab");
         this.host.setSessionActivity("thinking");
         this.host.render();
@@ -633,7 +634,18 @@ export class AppTabsController {
         this.restoreInputState(target.id);
         void this.saveTabs();
         this.scheduleTabPrewarm();
-        await this.loadActiveSessionHistory(targetRuntime);
+        const cachedView = this.sessionViewsByTabId.get(target.id);
+        if (cachedView && this.host.restoreSessionView) {
+            this.host.restoreSessionView(cachedView);
+            this.restoreDeferredUserMessages(target.id);
+            this.host.setSessionStatus(targetRuntime.session);
+            this.host.setSessionActivity(this.sessionActivity(targetRuntime.session));
+            this.host.render();
+        }
+        else {
+            await this.loadActiveSessionHistory(targetRuntime);
+            this.tabIdsNeedingHistoryReload.delete(target.id);
+        }
         this.scheduleDelayedHistoryReload(target.id, targetRuntime);
     }
     async closeTab(tabId) {
@@ -809,6 +821,11 @@ export class AppTabsController {
             return;
         this.setRuntimeForTab(this.activeTabId, runtime);
     }
+    storeActiveSessionView() {
+        if (!this.activeTabId || !this.host.captureSessionView)
+            return;
+        this.sessionViewsByTabId.set(this.activeTabId, this.host.captureSessionView());
+    }
     setRuntimeForTab(tabId, runtime) {
         this.runtimesByTabId.set(tabId, runtime);
         this.observeRuntimeForTab(tabId, runtime);
@@ -816,6 +833,7 @@ export class AppTabsController {
     deleteRuntimeForTab(tabId) {
         this.runtimesByTabId.delete(tabId);
         this.runtimeLoadsByTabId.delete(tabId);
+        this.sessionViewsByTabId.delete(tabId);
         this.clearRuntimeRefreshTimers(tabId);
         this.clearHistoryReloadTimers(tabId);
         this.tabIdsNeedingHistoryReload.delete(tabId);
@@ -900,11 +918,15 @@ export class AppTabsController {
             return;
         if (tabId !== this.activeTabId || this.pendingActiveTabId !== undefined)
             return;
+        if (this.sessionActivity(runtime.session) === "running") {
+            this.clearHistoryReloadTimers(tabId);
+            return;
+        }
         this.clearHistoryReloadTimers(tabId);
         for (const delayMs of [150, 1000, 3000]) {
             const timer = setTimeout(() => {
                 this.historyReloadTimersByTabId.get(tabId)?.delete(timer);
-                void this.reloadActiveTabHistoryIfNeeded(tabId, runtime, delayMs === 3000);
+                void this.reloadActiveTabHistoryIfNeeded(tabId, runtime);
             }, delayMs);
             timer.unref?.();
             let timers = this.historyReloadTimersByTabId.get(tabId);
@@ -915,13 +937,15 @@ export class AppTabsController {
             timers.add(timer);
         }
     }
-    async reloadActiveTabHistoryIfNeeded(tabId, runtime, finalAttempt) {
+    async reloadActiveTabHistoryIfNeeded(tabId, runtime) {
         if (tabId !== this.activeTabId || this.pendingActiveTabId !== undefined || this.host.runtime() !== runtime)
             return;
         if (!this.tabIdsNeedingHistoryReload.has(tabId))
             return;
+        if (this.sessionActivity(runtime.session) === "running")
+            return;
         await this.loadActiveSessionHistory(runtime);
-        if (finalAttempt && tabId === this.activeTabId && this.host.runtime() === runtime) {
+        if (tabId === this.activeTabId && this.host.runtime() === runtime) {
             this.tabIdsNeedingHistoryReload.delete(tabId);
         }
     }
@@ -1027,6 +1051,7 @@ export class AppTabsController {
         this.clearRuntimeSubscriptions();
         this.inputStatesByTabId.clear();
         this.deferredUserMessagesByTabId.clear();
+        this.sessionViewsByTabId.clear();
         const seen = new Set();
         for (const tab of tabs) {
             const sessionPath = tab.sessionPath ? resolve(tab.sessionPath) : undefined;
@@ -1505,28 +1530,14 @@ async function readLatestSessionTitle(sessionPath) {
         const { size } = await file.stat();
         if (size <= 0)
             return undefined;
-        const byteCount = Math.min(size, SESSION_TITLE_SCAN_MAX_BYTES);
-        const buffer = Buffer.alloc(byteCount);
-        await file.read(buffer, 0, byteCount, size - byteCount);
-        const text = buffer.toString("utf8");
-        const lines = text.split("\n");
-        if (size > byteCount)
-            lines.shift();
-        for (let index = lines.length - 1; index >= 0; index -= 1) {
-            const line = lines[index]?.trim();
-            if (!line)
-                continue;
-            let parsed;
-            try {
-                parsed = JSON.parse(line);
-            }
-            catch {
-                continue;
-            }
-            if (!isRecord(parsed) || parsed.type !== "session_info" || typeof parsed.name !== "string")
-                continue;
-            return validSessionTitle(parsed.name);
-        }
+        const tailByteCount = Math.min(size, SESSION_TITLE_SCAN_MAX_BYTES);
+        const tailTitle = await readSessionTitleChunk(file, size - tailByteCount, tailByteCount, { dropFirstLine: size > tailByteCount });
+        if (tailTitle)
+            return tailTitle;
+        if (size <= tailByteCount)
+            return undefined;
+        const headByteCount = Math.min(size - tailByteCount, SESSION_TITLE_HEAD_SCAN_MAX_BYTES);
+        return await readSessionTitleChunk(file, 0, headByteCount, { dropLastLine: headByteCount < size });
     }
     catch {
         return undefined;
@@ -1534,6 +1545,32 @@ async function readLatestSessionTitle(sessionPath) {
     finally {
         await file?.close();
     }
+}
+async function readSessionTitleChunk(file, position, byteCount, options = {}) {
+    if (byteCount <= 0)
+        return undefined;
+    const buffer = Buffer.alloc(byteCount);
+    await file.read(buffer, 0, byteCount, position);
+    const lines = buffer.toString("utf8").split("\n");
+    if (options.dropFirstLine)
+        lines.shift();
+    if (options.dropLastLine)
+        lines.pop();
+    for (let index = lines.length - 1; index >= 0; index -= 1) {
+        const line = lines[index]?.trim();
+        if (!line)
+            continue;
+        let parsed;
+        try {
+            parsed = JSON.parse(line);
+        }
+        catch {
+            continue;
+        }
+        if (!isRecord(parsed) || parsed.type !== "session_info" || typeof parsed.name !== "string")
+            continue;
+        return validSessionTitle(parsed.name);
+    }
     return undefined;
 }
 function validSessionTitle(value) {

package/external/pi-tools-suite/package.json

@@ -41,9 +41,6 @@
     "@earendil-works/pi-ai": "*",
     "@earendil-works/pi-coding-agent": "*",
     "@earendil-works/pi-tui": "*",
-    "@mariozechner/pi-ai": "*",
-    "@mariozechner/pi-coding-agent": "*",
-    "@mariozechner/pi-tui": "*",
     "typebox": "*"
   },
   "devDependencies": {

package/external/pi-tools-suite/src/async-subagents/commands.ts

@@ -1,4 +1,4 @@
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import * as fs from "node:fs";
 import * as path from "node:path";
 import {

package/external/pi-tools-suite/src/async-subagents/core/tool-guard.ts

@@ -1,4 +1,4 @@
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 
 export const SUBAGENT_DENIED_TOOLS = new Set([
 	"question",

package/external/pi-tools-suite/src/async-subagents/index.ts

@@ -1,4 +1,4 @@
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import * as fs from "node:fs";
 import * as path from "node:path";
 import {

package/external/pi-tools-suite/src/async-subagents/render.ts

@@ -1,4 +1,4 @@
-import { truncateToWidth, visibleWidth } from "@mariozechner/pi-tui";
+import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 import type { AgentState } from "./lib.js";
 import { modelName, plural, statusGlyph, statusLabel } from "./format.js";
 import type { AgentTaskPreview, SubagentRunRenderDetails } from "./types.js";

package/external/pi-tools-suite/src/async-subagents/tools/cleanup.ts

@@ -1,5 +1,5 @@
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
-import { Type } from "@mariozechner/pi-ai";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { Type } from "@earendil-works/pi-ai";
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { ASYNC_SUBAGENT_TOOL_DESCRIPTIONS } from "../../tool-descriptions.js";

package/external/pi-tools-suite/src/async-subagents/tools/result.ts

@@ -1,5 +1,5 @@
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
-import { Type } from "@mariozechner/pi-ai";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { Type } from "@earendil-works/pi-ai";
 import * as path from "node:path";
 import { ASYNC_SUBAGENT_TOOL_DESCRIPTIONS } from "../../tool-descriptions.js";
 import { readResult, resolveSubagentAgentRunDir, validateBasename } from "../lib.js";

package/external/pi-tools-suite/src/async-subagents/tools/spawn.ts

@@ -1,8 +1,8 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
-import { Type } from "@mariozechner/pi-ai";
-import { Text } from "@mariozechner/pi-tui";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { Type } from "@earendil-works/pi-ai";
+import { Text } from "@earendil-works/pi-tui";
 import { ASYNC_SUBAGENT_TOOL_DESCRIPTIONS } from "../../tool-descriptions.js";
 import type { AgentCompletionHandler, AgentTask, ResolvedAgentTaskConfig, Semaphore, SpawnedAgent } from "../lib.js";
 import {

package/external/pi-tools-suite/src/async-subagents/tools/status.ts

@@ -1,6 +1,6 @@
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
-import { Type } from "@mariozechner/pi-ai";
-import { Text } from "@mariozechner/pi-tui";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { Type } from "@earendil-works/pi-ai";
+import { Text } from "@earendil-works/pi-tui";
 import { ASYNC_SUBAGENT_TOOL_DESCRIPTIONS } from "../../tool-descriptions.js";
 import { getRunState, resolveSubagentRunDir, validateBasename } from "../lib.js";
 import { INLINE_RENDERING } from "../constants.js";

package/external/pi-tools-suite/src/async-subagents/tools/stop.ts

@@ -1,5 +1,5 @@
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
-import { Type } from "@mariozechner/pi-ai";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { Type } from "@earendil-works/pi-ai";
 import { ASYNC_SUBAGENT_TOOL_DESCRIPTIONS } from "../../tool-descriptions.js";
 import { getRunState, resolveSubagentRunDir, stopAgents, validateBasename, validateStopSignal } from "../lib.js";
 import { INLINE_RENDERING } from "../constants.js";

package/external/pi-tools-suite/src/async-subagents/tools/subagents.ts

@@ -1,6 +1,6 @@
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
-import { Type } from "@mariozechner/pi-ai";
-import { Text } from "@mariozechner/pi-tui";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { Type } from "@earendil-works/pi-ai";
+import { Text } from "@earendil-works/pi-tui";
 import { asyncSubagentToolDescriptions } from "../../tool-descriptions.js";
 import { hasIndexedProjectRoot } from "../../lib/project.js";
 import type { AgentCompletionHandler } from "../lib.js";

package/external/pi-tools-suite/src/async-subagents/tools/wait.ts

@@ -1,5 +1,5 @@
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
-import { Type } from "@mariozechner/pi-ai";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { Type } from "@earendil-works/pi-ai";
 import { ASYNC_SUBAGENT_TOOL_DESCRIPTIONS } from "../../tool-descriptions.js";
 import { resolveSubagentRunDir, validateBasename } from "../lib.js";
 import { INLINE_RENDERING } from "../constants.js";

package/external/pi-tools-suite/src/async-subagents/ui.ts

@@ -1,4 +1,4 @@
-import { Container } from "@mariozechner/pi-tui";
+import { Container } from "@earendil-works/pi-tui";
 
 export function emptyToolSlot(): Container {
 	return new Container();

package/external/pi-tools-suite/src/dcp/commands.ts

@@ -1,5 +1,5 @@
-import type { ExtensionAPI, ExtensionCommandContext } from "@mariozechner/pi-coding-agent"
-import type { AutocompleteItem } from "@mariozechner/pi-tui"
+import type { ExtensionAPI, ExtensionCommandContext } from "@earendil-works/pi-coding-agent"
+import type { AutocompleteItem } from "@earendil-works/pi-tui"
 import type { DcpState } from "./state.js"
 import type { DcpConfig } from "./config.js"
 import type { DcpNudgeType } from "./pruner-types.js"

package/external/pi-tools-suite/src/dcp/compress-tool.ts

@@ -3,7 +3,7 @@
 // ---------------------------------------------------------------------------
 
 import { Type } from "typebox"
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent"
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent"
 import type { DcpState } from "./state.js"
 import type { DcpConfig } from "./config.js"
 import { clearDcpNudgeAnchors } from "./pruner.js"

package/external/pi-tools-suite/src/dcp/index.ts

@@ -2,7 +2,7 @@
 // Dynamic Context Pruning (DCP) — module entry point for pi-tools-suite
 // ---------------------------------------------------------------------------
 
-import type { ExtensionAPI, ExtensionContext } from "@mariozechner/pi-coding-agent"
+import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent"
 import { loadConfig } from "./config.js"
 import {
 	createState,

package/external/pi-tools-suite/src/model-tools/apply-patch.ts

@@ -2,7 +2,7 @@ import { spawn } from "node:child_process";
 import { mkdir, mkdtemp, readFile, realpath, rm, stat, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { dirname, join, resolve } from "node:path";
-import { withFileMutationQueue } from "@mariozechner/pi-coding-agent";
+import { withFileMutationQueue } from "@earendil-works/pi-coding-agent";
 import { isPathInside } from "./path-utils";
 
 export interface ApplyPatchResult {

package/external/pi-tools-suite/src/model-tools/index.ts

@@ -11,7 +11,7 @@ import {
   type ExtensionContext,
   type ToolDefinition,
   type ToolRenderResultOptions,
-} from "@mariozechner/pi-coding-agent";
+} from "@earendil-works/pi-coding-agent";
 import { realpath } from "node:fs/promises";
 import { resolve } from "node:path";
 import { Type, type TSchema } from "typebox";

package/external/pi-tools-suite/src/todo/tool/response-envelope.ts

@@ -145,7 +145,7 @@ function appendWorkflowReminder(text: string, op: Op, state: TaskState): string
 	const lines = [text];
 	if (op.kind === "create" || op.kind === "batch_create") {
 		lines.push(
-			"Reminder: if this is a multi-step task, include a final todo item for the user-facing final report before completion. Give that final-report todo an explicit description/acceptance criteria: summarize changed files and behavior, list verification commands/results, mention any remaining manual action, and never replace the user-facing report with a compression/housekeeping note.",
+			"Reminder: if this is a multi-step task, include a final todo item for the user-facing final report before completion. Give that final-report todo an explicit description/acceptance criteria: summarize changed files and behavior, list verification commands/results, mention any remaining manual action, and never replace the user-facing report with a compression/housekeeping note. Close that report todo immediately before sending the report.",
 		);
 		const createdIds = new Set(op.kind === "create" ? [op.taskId] : op.ids);
 		const hasOlderUnfinished = !op.replacedCount && state.tasks.some((task) => {
@@ -167,7 +167,7 @@ function appendWorkflowReminder(text: string, op: Op, state: TaskState): string
 	}
 	if (hasInProgress) {
 		lines.push(
-			"Reminder: before your final response, update any finished todo items to completed. Treat the final user-facing report step like any other todo: mark it completed immediately before sending the report.",
+			"Reminder: before your final response, update any finished todo items to completed. If one todo is the final user-facing report step, mark it completed immediately before sending the report.",
 		);
 	}
 	return lines.join("\n\n");

package/external/pi-tools-suite/src/tool-descriptions.ts

@@ -250,10 +250,10 @@ export const TODO_TOOL_DESCRIPTION: ToolDescription = {
 	name: "todo",
 	label: "Todo",
 	description: "Track and keep in sync non-trivial multi-step work as todos. Actions: create, update, batch_create, batch_update, list, get, delete, clear, export, import. Supports parent/subtask hierarchy, blockers, deferred out-of-scope items, dependencies, and replace:true on create/batch_create/import for intentionally replacing an obsolete plan; skip trivial or chat-only requests. Resynchronize the plan when requirements are added, canceled, or become obsolete, whether from user input or discovered facts. For multi-step plans, include a final user-facing report todo in the initial create/batch_create plan when possible. Keep exactly one task in_progress and complete it only after verification.",
-	promptSnippet: "Track/sync non-trivial multi-step work; include final report item; resync when requirements change; keep one task in_progress",
+	promptSnippet: "Track/sync non-trivial multi-step work; include final report item and close it before sending the report; resync when requirements change; keep one task in_progress",
 	promptGuidelines: [
 		"Use `todo` for complex work with 3+ steps, explicit user task lists, or new non-trivial requirements. Skip single trivial tasks and purely conversational requests.",
-		"For any multi-step implementation/debugging plan, include a final todo item in the initial create/batch_create plan for the user-facing final report. Treat it like any other todo item: as soon as that step is finished, mark it completed immediately. Give it explicit description/acceptance criteria covering changed files/behavior, verification commands/results, remaining manual actions, and never substitute a compression/housekeeping note for the final report.",
+		"For any multi-step implementation/debugging plan, include a final todo item in the initial create/batch_create plan for the user-facing final report. Give it explicit description/acceptance criteria covering changed files/behavior, verification commands/results, remaining manual actions, and never substitute a compression/housekeeping note for the final report. Close that report todo immediately before sending the final report to the user.",
 		"When the user adds, removes, cancels, reprioritizes, or changes the goal, scope, requirements, constraints, or chosen approach, use `todo` before continuing to synchronize the plan: update still-relevant tasks, defer or delete obsolete tasks, add new required tasks, and adjust dependencies/order.",
 		"When your own investigation or verification discovers new facts that make the current todo plan stale, incomplete, impossible, unsafe, or no longer the best approach, use `todo` to revise the plan immediately instead of following outdated tasks.",
 		"Update todos as part of the workflow, not as end-of-task cleanup: whenever you start, finish, block, split, abandon, or materially change a step, call `todo` immediately before continuing.",

package/external/pi-tools-suite/src/usage/lib/google.ts

@@ -52,6 +52,7 @@ type PiAntigravityCredential = {
   type?: string;
   refresh?: string;
   email?: string;
+  activeIndex?: number;
   clientId?: string;
   clientSecret?: string;
   googleClientId?: string;
@@ -62,6 +63,8 @@ type PiAntigravityCredential = {
 
 type GoogleOAuthClientCredentials = { clientId: string; clientSecret?: string };
 
+type PreparedAccount = AntigravityAccount & { originalIndex: number };
+
 // ============================================================================
 // 常量
 // ============================================================================
@@ -149,10 +152,10 @@ async function readAntigravityAccounts(): Promise<AntigravityAccount[]> {
 
     if (!credential) return [];
     const credentialClient = getGoogleOAuthClientCredentials(credential);
-    const accounts = Array.isArray(credential.accounts)
+    const accounts: PreparedAccount[] = Array.isArray(credential.accounts)
       ? credential.accounts
           .filter((account) => getAccountRefreshToken(account))
-          .map((account) => ({ ...credentialClient, ...account }))
+          .map((account, originalIndex) => ({ ...credentialClient, ...account, originalIndex }))
       : [];
     const primaryAccount =
       credential.type === "oauth" && credential.refresh
@@ -161,16 +164,48 @@ async function readAntigravityAccounts(): Promise<AntigravityAccount[]> {
     if (primaryAccount) {
       primaryAccount.email = credential.email;
       Object.assign(primaryAccount, credentialClient);
-      accounts.unshift(primaryAccount);
+      const matchIndex = accounts.findIndex((account) =>
+        (primaryAccount.email && account.email === primaryAccount.email)
+        || (primaryAccount.refreshToken && getAccountRefreshToken(account) === primaryAccount.refreshToken),
+      );
+      if (matchIndex >= 0) {
+        accounts[matchIndex] = { ...accounts[matchIndex], ...primaryAccount };
+      } else {
+        accounts.unshift({ ...primaryAccount, originalIndex: -1 });
+      }
     }
 
     const seen = new Set<string>();
-    return accounts.filter((account) => {
+    const deduped = accounts.filter((account) => {
       const key = account.email || account.refreshToken;
       if (!key || seen.has(key)) return false;
       seen.add(key);
       return true;
     });
+
+    const fallbackActiveIndex = deduped.findIndex((account) =>
+      (credential.email && account.email === credential.email)
+      || (primaryAccount?.refreshToken && getAccountRefreshToken(account) === primaryAccount.refreshToken),
+    );
+    const activeIndex = Number.isInteger(credential.activeIndex)
+      ? credential.activeIndex as number
+      : fallbackActiveIndex;
+    const mostRecentLastUsed = deduped.reduce(
+      (best, account, index) => (account.lastUsed > best.lastUsed ? { index, lastUsed: account.lastUsed } : best),
+      { index: -1, lastUsed: 0 },
+    ).index;
+    const priorityIndex = mostRecentLastUsed >= 0 ? mostRecentLastUsed : activeIndex;
+
+    return deduped
+      .map((account, index) => ({ account, index }))
+      .sort((a, b) => {
+        const aPriority = a.index === priorityIndex ? 1 : 0;
+        const bPriority = b.index === priorityIndex ? 1 : 0;
+        if (aPriority !== bPriority) return bPriority - aPriority;
+        if (a.account.lastUsed !== b.account.lastUsed) return b.account.lastUsed - a.account.lastUsed;
+        return a.account.originalIndex - b.account.originalIndex;
+      })
+      .map(({ account }) => account);
   } catch (error) {
     if ((error as NodeJS.ErrnoException).code === "ENOENT") return [];
     throw error;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-ui-extend",
-  "version": "0.1.29",
+  "version": "0.1.31",
   "private": false,
   "type": "module",
   "bin": {
@@ -61,12 +61,9 @@
     "prepublishOnly": "npm run check && npm run build:pix && npm run generate-schemas"
   },
   "dependencies": {
-    "@earendil-works/pi-tui": "0.79.1",
-    "@earendil-works/pi-ai": "0.79.1",
-    "@earendil-works/pi-coding-agent": "0.79.1",
-    "@mariozechner/pi-ai": "npm:@earendil-works/pi-ai@0.79.1",
-    "@mariozechner/pi-coding-agent": "npm:@earendil-works/pi-coding-agent@0.79.1",
-    "@mariozechner/pi-tui": "npm:@earendil-works/pi-tui@0.79.1",
+    "@earendil-works/pi-ai": "0.79.3",
+    "@earendil-works/pi-coding-agent": "0.79.3",
+    "@earendil-works/pi-tui": "0.79.3",
     "@mariozechner/clipboard": "^0.3.9",
     "jsonc-parser": "3.3.1",
     "typebox": "1.1.38",