oc-codex-multi-auth 6.0.0

package/dist/lib/recovery.d.ts

@@ -0,0 +1,31 @@
+import type { PluginInput } from "@opencode-ai/plugin";
+import type { PluginConfig } from "./types.js";
+import type { MessageInfo, MessageData, RecoveryErrorType, ResumeConfig } from "./recovery/types.js";
+export type { RecoveryErrorType, MessageInfo, MessageData, ResumeConfig };
+type PluginClient = PluginInput["client"];
+export declare function detectErrorType(error: unknown): RecoveryErrorType;
+export declare function isRecoverableError(error: unknown): boolean;
+export declare function getRecoveryToastContent(errorType: RecoveryErrorType): {
+    title: string;
+    message: string;
+};
+export declare function getRecoverySuccessToast(): {
+    title: string;
+    message: string;
+};
+export declare function getRecoveryFailureToast(): {
+    title: string;
+    message: string;
+};
+export interface SessionRecoveryHook {
+    handleSessionRecovery: (info: MessageInfo) => Promise<boolean>;
+    isRecoverableError: (error: unknown) => boolean;
+    setOnAbortCallback: (callback: (sessionID: string) => void) => void;
+    setOnRecoveryCompleteCallback: (callback: (sessionID: string) => void) => void;
+}
+export interface SessionRecoveryContext {
+    client: PluginClient;
+    directory: string;
+}
+export declare function createSessionRecoveryHook(ctx: SessionRecoveryContext, config: PluginConfig): SessionRecoveryHook | null;
+//# sourceMappingURL=recovery.d.ts.map

package/dist/lib/recovery.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"recovery.d.ts","sourceRoot":"","sources":["../../lib/recovery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAEvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAS/C,OAAO,KAAK,EACV,WAAW,EACX,WAAW,EAEX,iBAAiB,EACjB,YAAY,EAEb,MAAM,qBAAqB,CAAC;AAE7B,YAAY,EAAE,iBAAiB,EAAE,WAAW,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC;AAE1E,KAAK,YAAY,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;AAwC1C,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,iBAAiB,CAsBjE;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAE1D;AAsKD,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,iBAAiB,GAAG;IACrE,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB,CAWA;AAED,wBAAgB,uBAAuB,IAAI;IACzC,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB,CAKA;AAED,wBAAgB,uBAAuB,IAAI;IACzC,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB,CAKA;AAED,MAAM,WAAW,mBAAmB;IAClC,qBAAqB,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/D,kBAAkB,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC;IAChD,kBAAkB,EAAE,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,KAAK,IAAI,CAAC;IACpE,6BAA6B,EAAE,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,KAAK,IAAI,CAAC;CAChF;AAED,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,YAAY,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,sBAAsB,EAC3B,MAAM,EAAE,YAAY,GACnB,mBAAmB,GAAG,IAAI,CA6H5B"}

package/dist/lib/recovery.js

@@ -0,0 +1,313 @@
+import { createLogger } from "./logger.js";
+import { readParts, findMessagesWithThinkingBlocks, findMessagesWithOrphanThinking, findMessageByIndexNeedingThinking, prependThinkingPart, stripThinkingParts, } from "./recovery/storage.js";
+const RECOVERY_RESUME_TEXT = "[session recovered - continuing previous task]";
+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 "";
+    }
+}
+function extractMessageIndex(error) {
+    const message = getErrorMessage(error);
+    const match = message.match(/messages\.(\d+)/);
+    if (!match || !match[1])
+        return null;
+    return parseInt(match[1], 10);
+}
+export function detectErrorType(error) {
+    const message = getErrorMessage(error);
+    if (message.includes("tool_use") && message.includes("tool_result")) {
+        return "tool_result_missing";
+    }
+    if (message.includes("thinking") &&
+        (message.includes("first block") ||
+            message.includes("must start with") ||
+            message.includes("preceeding") ||
+            (message.includes("expected") && message.includes("found")))) {
+        return "thinking_block_order";
+    }
+    if (message.includes("thinking is disabled") && message.includes("cannot contain")) {
+        return "thinking_disabled_violation";
+    }
+    return null;
+}
+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);
+}
+async function sendToolResultsForRecovery(client, sessionID, toolResultParts) {
+    const bodyWithParts = {
+        parts: toolResultParts,
+    };
+    await client.session.prompt({
+        path: { id: sessionID },
+        body: bodyWithParts,
+    });
+}
+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 sendToolResultsForRecovery(client, sessionID, toolResultParts);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+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;
+}
+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.",
+    };
+}
+export function createSessionRecoveryHook(ctx, config) {
+    if (!config.sessionRecovery) {
+        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;
+        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 },
+        });
+        const 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);
+            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 = recoverThinkingBlockOrder(sessionID, failedMsg, info.error);
+                if (success && config.autoResume) {
+                    const lastUser = findLastUserMessage(msgs ?? []);
+                    const resumeConfig = extractResumeConfig(lastUser, sessionID);
+                    await resumeSession(client, resumeConfig, directory);
+                }
+            }
+            else if (errorType === "thinking_disabled_violation") {
+                success = recoverThinkingDisabledViolation(sessionID, failedMsg);
+                if (success && config.autoResume) {
+                    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,
+    };
+}
+//# sourceMappingURL=recovery.js.map

package/dist/lib/recovery.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"recovery.js","sourceRoot":"","sources":["../../lib/recovery.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,131 @@
+/**
+ * Refresh Queue Module
+ *
+ * Prevents race conditions when multiple concurrent requests try to refresh
+ * the same account's token simultaneously. Instead of firing parallel refresh
+ * requests, subsequent callers await the existing in-flight refresh.
+ *
+ * Ported from antigravity-auth refresh-queue.ts pattern.
+ */
+import type { TokenResult } from "./types.js";
+export interface RefreshQueueMetrics {
+    started: number;
+    deduplicated: number;
+    rotationReused: number;
+    succeeded: number;
+    failed: number;
+    exceptions: number;
+    rotated: number;
+    staleEvictions: number;
+    lastDurationMs: number;
+    lastFailureReason: string | null;
+    pending: number;
+}
+/**
+ * Manages queued token refresh operations to prevent race conditions.
+ *
+ * When multiple concurrent requests need to refresh the same account's token,
+ * only the first request triggers the actual refresh. Subsequent requests
+ * await the same promise, ensuring:
+ * - No duplicate refresh API calls for the same refresh token
+ * - Consistent token state across all waiting callers
+ * - Reduced load on OpenAI's token endpoint
+ *
+ * Token Rotation Handling:
+ * When OpenAI rotates the refresh token during a refresh operation, we maintain
+ * a mapping from old token → new token. This ensures that requests arriving with
+ * either the old or new token will find the in-flight refresh and not trigger
+ * duplicate refreshes.
+ *
+ * @example
+ * ```typescript
+ * const queue = new RefreshQueue();
+ *
+ * // These three concurrent calls will only trigger ONE actual refresh
+ * const [result1, result2, result3] = await Promise.all([
+ *   queue.refresh(refreshToken),
+ *   queue.refresh(refreshToken),
+ *   queue.refresh(refreshToken),
+ * ]);
+ *
+ * // All three get the same result
+ * console.log(result1 === result2); // true (same object reference)
+ * ```
+ */
+export declare class RefreshQueue {
+    private pending;
+    private metrics;
+    /**
+     * Maps old refresh tokens to new tokens after rotation.
+     * This allows lookups with either old or new token to find the same entry.
+     * Format: oldToken → newToken
+     */
+    private tokenRotationMap;
+    /**
+     * Maximum time to keep a refresh entry in the queue (prevents memory leaks
+     * from stuck requests). After this timeout, the entry is removed and new
+     * callers will trigger a fresh refresh.
+     */
+    private readonly maxEntryAgeMs;
+    /**
+     * Create a new RefreshQueue instance.
+     * @param maxEntryAgeMs - Maximum age for pending entries before cleanup (default: 30s)
+     */
+    constructor(maxEntryAgeMs?: number);
+    /**
+     * Refresh a token, deduplicating concurrent requests for the same refresh token.
+     *
+     * If a refresh is already in-flight for this token, returns the existing promise.
+     * Otherwise, initiates a new refresh and caches the promise for other callers.
+     *
+     * @param refreshToken - The refresh token to use
+     * @returns Token result (success with new tokens, or failure)
+     */
+    refresh(refreshToken: string): Promise<TokenResult>;
+    private findOriginalToken;
+    private cleanupRotationMapping;
+    private executeRefreshWithRotationTracking;
+    /**
+     * Execute the actual refresh and log results.
+     */
+    private executeRefresh;
+    /**
+     * Remove stale entries that have been pending too long.
+     * This prevents memory leaks from stuck or abandoned refresh operations.
+     */
+    private cleanup;
+    /**
+     * Check if there's an in-flight refresh for a given token.
+     * @param refreshToken - The refresh token to check
+     * @returns True if refresh is in progress
+     */
+    isRefreshing(refreshToken: string): boolean;
+    /**
+     * Get the number of pending refresh operations.
+     * Useful for debugging and monitoring.
+     */
+    get pendingCount(): number;
+    /**
+     * Clear all pending entries (primarily for testing).
+     */
+    clear(): void;
+    getMetricsSnapshot(): RefreshQueueMetrics;
+}
+/**
+ * Get the singleton RefreshQueue instance.
+ * @param maxEntryAgeMs - Maximum age for pending entries (only used on first call)
+ * @returns The global RefreshQueue instance
+ */
+export declare function getRefreshQueue(maxEntryAgeMs?: number): RefreshQueue;
+/**
+ * Reset the singleton instance (primarily for testing).
+ */
+export declare function resetRefreshQueue(): void;
+/**
+ * Convenience function to refresh a token using the singleton queue.
+ * @param refreshToken - The refresh token to use
+ * @returns Token result
+ */
+export declare function queuedRefresh(refreshToken: string): Promise<TokenResult>;
+export declare function getRefreshQueueMetrics(): RefreshQueueMetrics;
+//# sourceMappingURL=refresh-queue.d.ts.map

package/dist/lib/refresh-queue.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"refresh-queue.d.ts","sourceRoot":"","sources":["../../lib/refresh-queue.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAa9C,MAAM,WAAW,mBAAmB;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,OAAO,EAAE,MAAM,CAAC;CAChB;AAkBD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,qBAAa,YAAY;IACvB,OAAO,CAAC,OAAO,CAAwC;IACvD,OAAO,CAAC,OAAO,CAA+C;IAE9D;;;;OAIG;IACH,OAAO,CAAC,gBAAgB,CAAkC;IAE1D;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IAEvC;;;OAGG;gBACS,aAAa,GAAE,MAAe;IAI1C;;;;;;;;OAQG;IACG,OAAO,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAiDzD,OAAO,CAAC,iBAAiB;IASzB,OAAO,CAAC,sBAAsB;YAShB,kCAAkC;IAehD;;OAEG;YACW,cAAc;IAgD5B;;;OAGG;IACH,OAAO,CAAC,OAAO;IAuBf;;;;OAIG;IACH,YAAY,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO;IAI3C;;;OAGG;IACH,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED;;OAEG;IACH,KAAK,IAAI,IAAI;IAMb,kBAAkB,IAAI,mBAAmB;CAM1C;AAQD;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,YAAY,CAKpE;AAED;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,IAAI,CAGxC;AAED;;;;GAIG;AACH,wBAAsB,aAAa,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAE9E;AAED,wBAAgB,sBAAsB,IAAI,mBAAmB,CAE5D"}