antigravity-auth 1.6.0

package/dist/plugin/recovery.js

@@ -0,0 +1,360 @@
+/**
+ * Session recovery hook for handling recoverable errors.
+ *
+ * Supports:
+ * - tool_result_missing: When ESC is pressed during tool execution
+ * - thinking_block_order: When thinking blocks are corrupted/stripped
+ * - thinking_disabled_violation: Thinking in non-thinking model
+ *
+ * Based on oh-my-opencode/src/hooks/session-recovery/index.ts
+ */
+import { createLogger } from "./logger";
+import { logToast } from "./debug";
+import { readParts, findMessagesWithThinkingBlocks, findMessagesWithOrphanThinking, findMessageByIndexNeedingThinking, prependThinkingPart, stripThinkingParts, } from "./recovery/storage";
+// =============================================================================
+// =============================================================================
+const RECOVERY_RESUME_TEXT = "[session recovered - continuing previous task]";
+// =============================================================================
+// =============================================================================
+/**
+ * Extract a normalized error message string from an unknown error.
+ */
+function getErrorMessage(error) {
+    if (!error)
+        return "";
+    if (typeof error === "string")
+        return error.toLowerCase();
+    const errorObj = error;
+    const paths = [
+        errorObj.data,
+        errorObj.error,
+        errorObj,
+        errorObj.data?.error,
+    ];
+    for (const obj of paths) {
+        if (obj && typeof obj === "object") {
+            const msg = obj.message;
+            if (typeof msg === "string" && msg.length > 0) {
+                return msg.toLowerCase();
+            }
+        }
+    }
+    try {
+        return JSON.stringify(error).toLowerCase();
+    }
+    catch {
+        return "";
+    }
+}
+/**
+ * Extract the message index from an error message (e.g., "messages.79").
+ */
+function extractMessageIndex(error) {
+    const message = getErrorMessage(error);
+    const match = message.match(/messages\.(\d+)/);
+    if (!match || !match[1])
+        return null;
+    return parseInt(match[1], 10);
+}
+/**
+ * Detect the type of recoverable error from an error object.
+ */
+export function detectErrorType(error) {
+    const message = getErrorMessage(error);
+    const hasExpectedFoundThinkingOrder = (message.includes("expected thinking") || message.includes("expected a thinking")) &&
+        message.includes("found");
+    // tool_result_missing: Happens when ESC is pressed during tool execution
+    if (message.includes("tool_use") && message.includes("tool_result")) {
+        return "tool_result_missing";
+    }
+    // thinking_block_order: Happens when thinking blocks are corrupted
+    if (message.includes("thinking") &&
+        (message.includes("first block") ||
+            message.includes("must start with") ||
+            message.includes("preceeding") ||
+            message.includes("preceding") ||
+            hasExpectedFoundThinkingOrder)) {
+        return "thinking_block_order";
+    }
+    // thinking_disabled_violation: Thinking in non-thinking model
+    if (message.includes("thinking is disabled") && message.includes("cannot contain")) {
+        return "thinking_disabled_violation";
+    }
+    return null;
+}
+/**
+ * Check if an error is recoverable.
+ */
+export function isRecoverableError(error) {
+    return detectErrorType(error) !== null;
+}
+function extractToolUseIds(parts) {
+    return parts
+        .filter((p) => p.type === "tool_use" && !!p.id)
+        .map((p) => p.id);
+}
+// =============================================================================
+// =============================================================================
+/**
+ * Recover from tool_result_missing error by injecting synthetic tool_result blocks.
+ */
+async function recoverToolResultMissing(client, sessionID, failedMsg) {
+    let parts = failedMsg.parts || [];
+    if (parts.length === 0 && failedMsg.info?.id) {
+        const storedParts = readParts(failedMsg.info.id);
+        parts = storedParts.map((p) => ({
+            type: p.type === "tool" ? "tool_use" : p.type,
+            id: "callID" in p ? p.callID : p.id,
+            name: "tool" in p ? p.tool : undefined,
+            input: "state" in p ? p.state?.input : undefined,
+        }));
+    }
+    const toolUseIds = extractToolUseIds(parts);
+    if (toolUseIds.length === 0) {
+        return false;
+    }
+    const toolResultParts = toolUseIds.map((id) => ({
+        type: "tool_result",
+        tool_use_id: id,
+        content: "Operation cancelled by user (ESC pressed)",
+    }));
+    try {
+        await client.session.prompt({
+            path: { id: sessionID },
+            // @ts-expect-error - SDK types may not include tool_result parts
+            body: { parts: toolResultParts },
+        });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Recover from thinking_block_order error by prepending thinking parts.
+ */
+async function recoverThinkingBlockOrder(sessionID, _failedMsg, error) {
+    const targetIndex = extractMessageIndex(error);
+    if (targetIndex !== null) {
+        const targetMessageID = findMessageByIndexNeedingThinking(sessionID, targetIndex);
+        if (targetMessageID) {
+            return prependThinkingPart(sessionID, targetMessageID);
+        }
+    }
+    const orphanMessages = findMessagesWithOrphanThinking(sessionID);
+    if (orphanMessages.length === 0) {
+        return false;
+    }
+    let anySuccess = false;
+    for (const messageID of orphanMessages) {
+        if (prependThinkingPart(sessionID, messageID)) {
+            anySuccess = true;
+        }
+    }
+    return anySuccess;
+}
+/**
+ * Recover from thinking_disabled_violation by stripping thinking parts.
+ */
+async function recoverThinkingDisabledViolation(sessionID, _failedMsg) {
+    const messagesWithThinking = findMessagesWithThinkingBlocks(sessionID);
+    if (messagesWithThinking.length === 0) {
+        return false;
+    }
+    let anySuccess = false;
+    for (const messageID of messagesWithThinking) {
+        if (stripThinkingParts(messageID)) {
+            anySuccess = true;
+        }
+    }
+    return anySuccess;
+}
+// =============================================================================
+// =============================================================================
+function findLastUserMessage(messages) {
+    for (let i = messages.length - 1; i >= 0; i--) {
+        if (messages[i]?.info?.role === "user") {
+            return messages[i];
+        }
+    }
+    return undefined;
+}
+function extractResumeConfig(userMessage, sessionID) {
+    return {
+        sessionID,
+        agent: userMessage?.info?.agent,
+        model: userMessage?.info?.model,
+    };
+}
+async function resumeSession(client, config, directory) {
+    try {
+        await client.session.prompt({
+            path: { id: config.sessionID },
+            body: {
+                parts: [{ type: "text", text: RECOVERY_RESUME_TEXT }],
+                agent: config.agent,
+                model: config.model,
+            },
+            query: { directory },
+        });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+// =============================================================================
+// =============================================================================
+const TOAST_TITLES = {
+    tool_result_missing: "Tool Crash Recovery",
+    thinking_block_order: "Thinking Block Recovery",
+    thinking_disabled_violation: "Thinking Strip Recovery",
+};
+const TOAST_MESSAGES = {
+    tool_result_missing: "Injecting cancelled tool results...",
+    thinking_block_order: "Fixing message structure...",
+    thinking_disabled_violation: "Stripping thinking blocks...",
+};
+export function getRecoveryToastContent(errorType) {
+    if (!errorType) {
+        return {
+            title: "Session Recovery",
+            message: "Attempting to recover session...",
+        };
+    }
+    return {
+        title: TOAST_TITLES[errorType] || "Session Recovery",
+        message: TOAST_MESSAGES[errorType] || "Attempting to recover session...",
+    };
+}
+export function getRecoverySuccessToast() {
+    return {
+        title: "Session Recovered",
+        message: "Continuing where you left off...",
+    };
+}
+export function getRecoveryFailureToast() {
+    return {
+        title: "Recovery Failed",
+        message: "Please retry or start a new session.",
+    };
+}
+/**
+ * Create a session recovery hook with the given configuration.
+ */
+export function createSessionRecoveryHook(ctx, config) {
+    if (!config.session_recovery) {
+        return null;
+    }
+    const { client, directory } = ctx;
+    const processingErrors = new Set();
+    let onAbortCallback = null;
+    let onRecoveryCompleteCallback = null;
+    const setOnAbortCallback = (callback) => {
+        onAbortCallback = callback;
+    };
+    const setOnRecoveryCompleteCallback = (callback) => {
+        onRecoveryCompleteCallback = callback;
+    };
+    const handleSessionRecovery = async (info) => {
+        if (!info || info.role !== "assistant" || !info.error)
+            return false;
+        const errorType = detectErrorType(info.error);
+        if (!errorType)
+            return false;
+        const sessionID = info.sessionID;
+        if (!sessionID)
+            return false;
+        let assistantMsgID = info.id;
+        let msgs;
+        const log = createLogger("session-recovery");
+        log.debug("Recovery attempt started", {
+            errorType,
+            sessionID,
+            providedMsgID: assistantMsgID ?? "none",
+        });
+        if (onAbortCallback) {
+            onAbortCallback(sessionID);
+        }
+        await client.session.abort({ path: { id: sessionID } }).catch(() => { });
+        const messagesResp = await client.session.messages({
+            path: { id: sessionID },
+            query: { directory },
+        });
+        msgs = messagesResp.data;
+        if (!assistantMsgID && msgs && msgs.length > 0) {
+            for (let i = msgs.length - 1; i >= 0; i--) {
+                const m = msgs[i];
+                if (m && m.info?.role === "assistant" && m.info?.id) {
+                    assistantMsgID = m.info.id;
+                    log.debug("Found assistant message ID from session messages", {
+                        msgID: assistantMsgID,
+                        msgIndex: i,
+                    });
+                    break;
+                }
+            }
+        }
+        if (!assistantMsgID) {
+            log.debug("No assistant message ID found, cannot recover");
+            return false;
+        }
+        if (processingErrors.has(assistantMsgID))
+            return false;
+        processingErrors.add(assistantMsgID);
+        try {
+            const failedMsg = msgs?.find((m) => m.info?.id === assistantMsgID);
+            if (!failedMsg) {
+                return false;
+            }
+            const toastContent = getRecoveryToastContent(errorType);
+            logToast(`${toastContent.title}: ${toastContent.message}`, "warning");
+            await client.tui
+                .showToast({
+                body: {
+                    title: toastContent.title,
+                    message: toastContent.message,
+                    variant: "warning",
+                },
+            })
+                .catch(() => { });
+            let success = false;
+            if (errorType === "tool_result_missing") {
+                success = await recoverToolResultMissing(client, sessionID, failedMsg);
+            }
+            else if (errorType === "thinking_block_order") {
+                success = await recoverThinkingBlockOrder(sessionID, failedMsg, info.error);
+                if (success && config.auto_resume) {
+                    const lastUser = findLastUserMessage(msgs ?? []);
+                    const resumeConfig = extractResumeConfig(lastUser, sessionID);
+                    await resumeSession(client, resumeConfig, directory);
+                }
+            }
+            else if (errorType === "thinking_disabled_violation") {
+                success = await recoverThinkingDisabledViolation(sessionID, failedMsg);
+                if (success && config.auto_resume) {
+                    const lastUser = findLastUserMessage(msgs ?? []);
+                    const resumeConfig = extractResumeConfig(lastUser, sessionID);
+                    await resumeSession(client, resumeConfig, directory);
+                }
+            }
+            return success;
+        }
+        catch (err) {
+            log.error("Recovery failed", { error: String(err) });
+            return false;
+        }
+        finally {
+            processingErrors.delete(assistantMsgID);
+            if (sessionID && onRecoveryCompleteCallback) {
+                onRecoveryCompleteCallback(sessionID);
+            }
+        }
+    };
+    return {
+        handleSessionRecovery,
+        isRecoverableError,
+        setOnAbortCallback,
+        setOnRecoveryCompleteCallback,
+    };
+}

package/dist/plugin/refresh-queue.d.ts

@@ -0,0 +1,99 @@
+/**
+ * Proactive Token Refresh Queue
+ *
+ * Ported from LLM-API-Key-Proxy's BackgroundRefresher.
+ *
+ * This module provides background token refresh to ensure OAuth tokens
+ * remain valid without blocking user requests. It periodically checks
+ * all accounts and refreshes tokens that are approaching expiry.
+ *
+ * Features:
+ * - Non-blocking background refresh (doesn't block requests)
+ * - Configurable refresh buffer (default: 30 minutes before expiry)
+ * - Configurable check interval (default: 5 minutes)
+ * - Serialized refresh to prevent concurrent refresh storms
+ * - Integrates with existing AccountManager and token refresh logic
+ * - Silent operation: no console output, uses structured logger
+ */
+import type { AccountManager, ManagedAccount } from "./accounts";
+import type { PluginClient } from "./types";
+/** Configuration for the proactive refresh queue */
+export interface ProactiveRefreshConfig {
+    /** Enable proactive token refresh (default: true) */
+    enabled: boolean;
+    /** Seconds before expiry to trigger proactive refresh (default: 1800 = 30 minutes) */
+    bufferSeconds: number;
+    /** Interval between refresh checks in seconds (default: 300 = 5 minutes) */
+    checkIntervalSeconds: number;
+}
+export declare const DEFAULT_PROACTIVE_REFRESH_CONFIG: ProactiveRefreshConfig;
+/**
+ * Proactive Token Refresh Queue
+ *
+ * Runs in the background and proactively refreshes tokens before they expire.
+ * This ensures that user requests never block on token refresh.
+ *
+ * All logging is silent by default - uses structured logger with TUI integration.
+ */
+export declare class ProactiveRefreshQueue {
+    private readonly config;
+    private readonly client;
+    private readonly providerId;
+    private accountManager;
+    private state;
+    constructor(client: PluginClient, providerId: string, config?: Partial<ProactiveRefreshConfig>);
+    /**
+     * Set the account manager to use for refresh operations.
+     * Must be called before start().
+     */
+    setAccountManager(manager: AccountManager): void;
+    /**
+     * Check if a token needs proactive refresh.
+     * Returns true if the token expires within the buffer period.
+     */
+    needsRefresh(account: ManagedAccount): boolean;
+    /**
+     * Check if a token is already expired.
+     */
+    isExpired(account: ManagedAccount): boolean;
+    /**
+     * Get all accounts that need proactive refresh.
+     */
+    getAccountsNeedingRefresh(): ManagedAccount[];
+    /**
+     * Perform a single refresh check iteration.
+     * This is called periodically by the background interval.
+     */
+    private runRefreshCheck;
+    /**
+     * Refresh a single token.
+     */
+    private refreshToken;
+    /**
+     * Start the background refresh queue.
+     */
+    start(): void;
+    /**
+     * Stop the background refresh queue.
+     */
+    stop(): void;
+    /**
+     * Get current queue statistics.
+     */
+    getStats(): {
+        isRunning: boolean;
+        isRefreshing: boolean;
+        lastCheckTime: number;
+        lastRefreshTime: number;
+        refreshCount: number;
+        errorCount: number;
+    };
+    /**
+     * Check if the queue is currently running.
+     */
+    isRunning(): boolean;
+}
+/**
+ * Create a proactive refresh queue instance.
+ */
+export declare function createProactiveRefreshQueue(client: PluginClient, providerId: string, config?: Partial<ProactiveRefreshConfig>): ProactiveRefreshQueue;

package/dist/plugin/refresh-queue.js

@@ -0,0 +1,235 @@
+/**
+ * Proactive Token Refresh Queue
+ *
+ * Ported from LLM-API-Key-Proxy's BackgroundRefresher.
+ *
+ * This module provides background token refresh to ensure OAuth tokens
+ * remain valid without blocking user requests. It periodically checks
+ * all accounts and refreshes tokens that are approaching expiry.
+ *
+ * Features:
+ * - Non-blocking background refresh (doesn't block requests)
+ * - Configurable refresh buffer (default: 30 minutes before expiry)
+ * - Configurable check interval (default: 5 minutes)
+ * - Serialized refresh to prevent concurrent refresh storms
+ * - Integrates with existing AccountManager and token refresh logic
+ * - Silent operation: no console output, uses structured logger
+ */
+import { refreshAccessToken } from "./token";
+import { createLogger } from "./logger";
+const log = createLogger("refresh-queue");
+export const DEFAULT_PROACTIVE_REFRESH_CONFIG = {
+    enabled: true,
+    bufferSeconds: 1800, // 30 minutes
+    checkIntervalSeconds: 300, // 5 minutes
+};
+/**
+ * Proactive Token Refresh Queue
+ *
+ * Runs in the background and proactively refreshes tokens before they expire.
+ * This ensures that user requests never block on token refresh.
+ *
+ * All logging is silent by default - uses structured logger with TUI integration.
+ */
+export class ProactiveRefreshQueue {
+    config;
+    client;
+    providerId;
+    accountManager = null;
+    state = {
+        isRunning: false,
+        intervalHandle: null,
+        isRefreshing: false,
+        lastCheckTime: 0,
+        lastRefreshTime: 0,
+        refreshCount: 0,
+        errorCount: 0,
+    };
+    constructor(client, providerId, config) {
+        this.client = client;
+        this.providerId = providerId;
+        this.config = {
+            ...DEFAULT_PROACTIVE_REFRESH_CONFIG,
+            ...config,
+        };
+    }
+    /**
+     * Set the account manager to use for refresh operations.
+     * Must be called before start().
+     */
+    setAccountManager(manager) {
+        this.accountManager = manager;
+    }
+    /**
+     * Check if a token needs proactive refresh.
+     * Returns true if the token expires within the buffer period.
+     */
+    needsRefresh(account) {
+        if (!account.expires) {
+            return false;
+        }
+        const now = Date.now();
+        const bufferMs = this.config.bufferSeconds * 1000;
+        const refreshThreshold = now + bufferMs;
+        return account.expires <= refreshThreshold;
+    }
+    /**
+     * Check if a token is already expired.
+     */
+    isExpired(account) {
+        if (!account.expires) {
+            return false;
+        }
+        return account.expires <= Date.now();
+    }
+    /**
+     * Get all accounts that need proactive refresh.
+     */
+    getAccountsNeedingRefresh() {
+        if (!this.accountManager) {
+            return [];
+        }
+        return this.accountManager.getAccounts().filter((account) => {
+            if (account.enabled === false) {
+                return false;
+            }
+            if (this.isExpired(account)) {
+                return false;
+            }
+            return this.needsRefresh(account);
+        });
+    }
+    /**
+     * Perform a single refresh check iteration.
+     * This is called periodically by the background interval.
+     */
+    async runRefreshCheck() {
+        if (this.state.isRefreshing) {
+            return;
+        }
+        if (!this.accountManager) {
+            return;
+        }
+        this.state.isRefreshing = true;
+        this.state.lastCheckTime = Date.now();
+        try {
+            const accountsToRefresh = this.getAccountsNeedingRefresh();
+            if (accountsToRefresh.length === 0) {
+                return;
+            }
+            log.debug("Found accounts needing refresh", { count: accountsToRefresh.length });
+            for (const account of accountsToRefresh) {
+                if (!this.state.isRunning) {
+                    break;
+                }
+                try {
+                    const auth = this.accountManager.toAuthDetails(account);
+                    const refreshed = await this.refreshToken(auth, account);
+                    if (refreshed) {
+                        this.accountManager.updateFromAuth(account, refreshed);
+                        this.state.refreshCount++;
+                        this.state.lastRefreshTime = Date.now();
+                        try {
+                            await this.accountManager.saveToDisk();
+                        }
+                        catch {
+                        }
+                    }
+                }
+                catch (error) {
+                    this.state.errorCount++;
+                    log.warn("Failed to refresh account", {
+                        accountIndex: account.index,
+                        error: error instanceof Error ? error.message : String(error),
+                    });
+                }
+            }
+        }
+        finally {
+            this.state.isRefreshing = false;
+        }
+    }
+    /**
+     * Refresh a single token.
+     */
+    async refreshToken(auth, account) {
+        const minutesUntilExpiry = account.expires
+            ? Math.round((account.expires - Date.now()) / 60000)
+            : "unknown";
+        log.debug("Proactively refreshing token", {
+            accountIndex: account.index,
+            email: account.email ?? "unknown",
+            minutesUntilExpiry,
+        });
+        return refreshAccessToken(auth, this.client, this.providerId);
+    }
+    /**
+     * Start the background refresh queue.
+     */
+    start() {
+        if (this.state.isRunning) {
+            return;
+        }
+        if (!this.config.enabled) {
+            log.debug("Proactive refresh disabled by config");
+            return;
+        }
+        this.state.isRunning = true;
+        const intervalMs = this.config.checkIntervalSeconds * 1000;
+        log.debug("Started proactive refresh queue", {
+            checkIntervalSeconds: this.config.checkIntervalSeconds,
+            bufferSeconds: this.config.bufferSeconds,
+        });
+        setTimeout(() => {
+            if (this.state.isRunning) {
+                this.runRefreshCheck().catch((error) => {
+                    log.error("Initial check failed", {
+                        error: error instanceof Error ? error.message : String(error),
+                    });
+                });
+            }
+        }, 5000);
+        this.state.intervalHandle = setInterval(() => {
+            this.runRefreshCheck().catch((error) => {
+                log.error("Check failed", {
+                    error: error instanceof Error ? error.message : String(error),
+                });
+            });
+        }, intervalMs);
+    }
+    /**
+     * Stop the background refresh queue.
+     */
+    stop() {
+        if (!this.state.isRunning) {
+            return;
+        }
+        this.state.isRunning = false;
+        if (this.state.intervalHandle) {
+            clearInterval(this.state.intervalHandle);
+            this.state.intervalHandle = null;
+        }
+        log.debug("Stopped proactive refresh queue", {
+            refreshCount: this.state.refreshCount,
+            errorCount: this.state.errorCount,
+        });
+    }
+    /**
+     * Get current queue statistics.
+     */
+    getStats() {
+        return { ...this.state };
+    }
+    /**
+     * Check if the queue is currently running.
+     */
+    isRunning() {
+        return this.state.isRunning;
+    }
+}
+/**
+ * Create a proactive refresh queue instance.
+ */
+export function createProactiveRefreshQueue(client, providerId, config) {
+    return new ProactiveRefreshQueue(client, providerId, config);
+}