opencode-antigravity-auth 1.2.4 → 1.2.5-beta.1

package/dist/src/plugin/recovery.js

@@ -0,0 +1,347 @@
+/**
+ * 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 { readParts, findMessagesWithThinkingBlocks, findMessagesWithOrphanThinking, findMessageByIndexNeedingThinking, prependThinkingPart, stripThinkingParts, } from "./recovery/storage";
+// =============================================================================
+// Constants
+// =============================================================================
+const RECOVERY_RESUME_TEXT = "[session recovered - continuing previous task]";
+// =============================================================================
+// Error Detection
+// =============================================================================
+/**
+ * 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);
+    // 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("expected") && message.includes("found")))) {
+        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);
+}
+// =============================================================================
+// Recovery Functions
+// =============================================================================
+/**
+ * Recover from tool_result_missing error by injecting synthetic tool_result blocks.
+ */
+async function recoverToolResultMissing(client, sessionID, failedMsg) {
+    // Try API parts first, fallback to filesystem if empty
+    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) {
+    // Try to find the target message index from error
+    const targetIndex = extractMessageIndex(error);
+    if (targetIndex !== null) {
+        const targetMessageID = findMessageByIndexNeedingThinking(sessionID, targetIndex);
+        if (targetMessageID) {
+            return prependThinkingPart(sessionID, targetMessageID);
+        }
+    }
+    // Fallback: find all orphan thinking messages
+    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;
+}
+// =============================================================================
+// Resume Session Helper
+// =============================================================================
+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;
+    }
+}
+// =============================================================================
+// Toast Messages
+// =============================================================================
+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 session recovery is disabled, return null
+    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) => {
+        // Validate input
+        if (!info || info.role !== "assistant" || !info.error)
+            return false;
+        const errorType = detectErrorType(info.error);
+        if (!errorType)
+            return false;
+        const sessionID = info.sessionID;
+        const assistantMsgID = info.id;
+        if (!sessionID || !assistantMsgID)
+            return false;
+        if (processingErrors.has(assistantMsgID))
+            return false;
+        processingErrors.add(assistantMsgID);
+        try {
+            // Notify abort callback
+            if (onAbortCallback) {
+                onAbortCallback(sessionID);
+            }
+            // Abort current request
+            await client.session.abort({ path: { id: sessionID } }).catch(() => { });
+            // Fetch messages to find the failed one
+            const messagesResp = await client.session.messages({
+                path: { id: sessionID },
+                query: { directory },
+            });
+            const msgs = messagesResp.data;
+            const failedMsg = msgs?.find((m) => m.info?.id === assistantMsgID);
+            if (!failedMsg) {
+                return false;
+            }
+            // Show toast notification
+            const toastContent = getRecoveryToastContent(errorType);
+            await client.tui
+                .showToast({
+                body: {
+                    title: toastContent.title,
+                    message: toastContent.message,
+                    variant: "warning",
+                },
+            })
+                .catch(() => { });
+            // Perform recovery based on error type
+            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) {
+            console.error("[session-recovery] Recovery failed:", err);
+            return false;
+        }
+        finally {
+            processingErrors.delete(assistantMsgID);
+            // Always notify recovery complete
+            if (sessionID && onRecoveryCompleteCallback) {
+                onRecoveryCompleteCallback(sessionID);
+            }
+        }
+    };
+    return {
+        handleSessionRecovery,
+        isRecoverableError,
+        setOnAbortCallback,
+        setOnRecoveryCompleteCallback,
+    };
+}
+//# sourceMappingURL=recovery.js.map

package/dist/src/plugin/recovery.js.map

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

package/dist/src/plugin/request.d.ts

@@ -26,6 +26,7 @@ export declare function prepareAntigravityRequest(input: RequestInfo, init: Requ
     toolDebugPayload?: string;
     needsSignedThinkingWarmup?: boolean;
     headerStyle: HeaderStyle;
+    thinkingRecoveryMessage?: string;
 };
 export declare function buildThinkingWarmupBody(bodyText: string | undefined, isClaudeThinkingModel: boolean): string | null;
 /**

package/dist/src/plugin/request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../src/plugin/request.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,KAAK,WAAW,EACjB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAIL,KAAK,uBAAuB,EAC7B,MAAM,SAAS,CAAC;AA4ejB;;GAEG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C;AAaD;;GAEG;AACH,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,WAAW,GAAG,KAAK,IAAI,MAAM,CAE/E;AAsLD;;;GAGG;AACH,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,WAAW,GAAG,SAAS,EAC7B,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,gBAAgB,CAAC,EAAE,MAAM,EACzB,WAAW,GAAE,WAA2B,GACvC;IACD,OAAO,EAAE,WAAW,CAAC;IACrB,IAAI,EAAE,WAAW,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,WAAW,EAAE,WAAW,CAAC;CAC1B,CAsmBA;AAED,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,qBAAqB,EAAE,OAAO,GAC7B,MAAM,GAAG,IAAI,CAuCf;AAED;;;;;;GAMG;AACH,wBAAsB,4BAA4B,CAChD,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,OAAO,EAClB,YAAY,CAAC,EAAE,uBAAuB,GAAG,IAAI,EAC7C,cAAc,CAAC,EAAE,MAAM,EACvB,SAAS,CAAC,EAAE,MAAM,EAClB,QAAQ,CAAC,EAAE,MAAM,EACjB,cAAc,CAAC,EAAE,MAAM,EACvB,SAAS,CAAC,EAAE,MAAM,EAClB,gBAAgB,CAAC,EAAE,MAAM,EACzB,gBAAgB,CAAC,EAAE,MAAM,EACzB,gBAAgB,CAAC,EAAE,MAAM,EACzB,UAAU,CAAC,EAAE,MAAM,EAAE,GACpB,OAAO,CAAC,QAAQ,CAAC,CA0InB"}
+{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../src/plugin/request.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,KAAK,WAAW,EACjB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAIL,KAAK,uBAAuB,EAC7B,MAAM,SAAS,CAAC;AAkfjB;;GAEG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C;AAaD;;GAEG;AACH,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,WAAW,GAAG,KAAK,IAAI,MAAM,CAE/E;AAsLD;;;GAGG;AACH,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,WAAW,GAAG,SAAS,EAC7B,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,gBAAgB,CAAC,EAAE,MAAM,EACzB,WAAW,GAAE,WAA2B,GACvC;IACD,OAAO,EAAE,WAAW,CAAC;IACrB,IAAI,EAAE,WAAW,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,WAAW,EAAE,WAAW,CAAC;IACzB,uBAAuB,CAAC,EAAE,MAAM,CAAC;CAClC,CAooBA;AAED,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,qBAAqB,EAAE,OAAO,GAC7B,MAAM,GAAG,IAAI,CAuCf;AAED;;;;;;GAMG;AACH,wBAAsB,4BAA4B,CAChD,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,OAAO,EAClB,YAAY,CAAC,EAAE,uBAAuB,GAAG,IAAI,EAC7C,cAAc,CAAC,EAAE,MAAM,EACvB,SAAS,CAAC,EAAE,MAAM,EAClB,QAAQ,CAAC,EAAE,MAAM,EACjB,cAAc,CAAC,EAAE,MAAM,EACvB,SAAS,CAAC,EAAE,MAAM,EAClB,gBAAgB,CAAC,EAAE,MAAM,EACzB,gBAAgB,CAAC,EAAE,MAAM,EACzB,gBAAgB,CAAC,EAAE,MAAM,EACzB,UAAU,CAAC,EAAE,MAAM,EAAE,GACpB,OAAO,CAAC,QAAQ,CAAC,CAoJnB"}

package/dist/src/plugin/request.js

@@ -3,6 +3,8 @@ import { ANTIGRAVITY_HEADERS, GEMINI_CLI_HEADERS, ANTIGRAVITY_ENDPOINT, } from "
 import { cacheSignature, getCachedSignature } from "./cache";
 import { DEBUG_MESSAGE_PREFIX, isDebugEnabled, logAntigravityDebugResponse, } from "./debug";
 import { cleanJSONSchemaForAntigravity, DEFAULT_THINKING_BUDGET, deepFilterThinkingBlocks, extractThinkingConfig, extractUsageFromSsePayload, extractUsageMetadata, isThinkingCapableModel, normalizeThinkingConfig, parseAntigravityApiBody, resolveThinkingConfig, rewriteAntigravityPreviewAccessError, transformThinkingParts, } from "./request-helpers";
+import { analyzeConversationState, closeToolLoopForThinking, needsThinkingRecovery, } from "./thinking-recovery";
+import { detectErrorType } from "./recovery";
 /**
  * Stable session ID for the plugin's lifetime.
  * This is used for caching thinking signatures across multi-turn conversations.
@@ -550,6 +552,7 @@ export function prepareAntigravityRequest(input, init, accessToken, projectId, e
     let toolDebugPayload;
     let sessionId;
     let needsSignedThinkingWarmup = false;
+    let thinkingRecoveryMessage;
     if (!isGenerativeLanguageRequest(input)) {
         return {
             request: input,
@@ -981,6 +984,30 @@ export function prepareAntigravityRequest(input, init, accessToken, projectId, e
                         return { ...content, parts: newParts };
                     });
                 }
+                // =====================================================================
+                // LAST RESORT RECOVERY: "Let it crash and start again"
+                // =====================================================================
+                // If after all our processing we're STILL in a bad state (tool loop without
+                // thinking at turn start), don't try to fix it - just close the turn and
+                // start fresh. This prevents permanent session breakage.
+                //
+                // This handles cases where:
+                // - Context compaction stripped thinking blocks
+                // - Signature cache miss
+                // - Any other corruption we couldn't repair
+                //
+                // The synthetic messages allow Claude to generate fresh thinking on the
+                // new turn instead of failing with "Expected thinking but found text".
+                if (isClaudeThinkingModel && Array.isArray(requestPayload.contents)) {
+                    const conversationState = analyzeConversationState(requestPayload.contents);
+                    if (needsThinkingRecovery(conversationState)) {
+                        // Set message for toast notification (shown in plugin.ts, respects quiet mode)
+                        thinkingRecoveryMessage = "Thinking recovery: restarting turn (corrupted context)";
+                        requestPayload.contents = closeToolLoopForThinking(requestPayload.contents);
+                        // Clear the cached thinking for this session since we're starting fresh
+                        lastSignedThinkingBySessionKey.delete(signatureSessionKey);
+                    }
+                }
                 if ("model" in requestPayload) {
                     delete requestPayload.model;
                 }
@@ -1052,6 +1079,7 @@ export function prepareAntigravityRequest(input, init, accessToken, projectId, e
         toolDebugPayload,
         needsSignedThinkingWarmup,
         headerStyle,
+        thinkingRecoveryMessage,
     };
 }
 export function buildThinkingWarmupBody(bodyText, isClaudeThinkingModel) {
@@ -1143,6 +1171,15 @@ export async function transformAntigravityResponse(response, streaming, debugCon
                 const debugInfo = `\n\n[Debug Info]\nRequested Model: ${requestedModel || "Unknown"}\nEffective Model: ${effectiveModel || "Unknown"}\nProject: ${projectId || "Unknown"}\nEndpoint: ${endpoint || "Unknown"}\nStatus: ${response.status}\nRequest ID: ${headers.get("x-request-id") || "N/A"}${toolDebugMissing !== undefined ? `\nTool Debug Missing: ${toolDebugMissing}` : ""}${toolDebugSummary ? `\nTool Debug Summary: ${toolDebugSummary}` : ""}${toolDebugPayload ? `\nTool Debug Payload: ${toolDebugPayload}` : ""}`;
                 const injectedDebug = debugText ? `\n\n${debugText}` : "";
                 errorBody.error.message = (errorBody.error.message || "Unknown error") + debugInfo + injectedDebug;
+                // Check if this is a recoverable thinking error - throw to trigger retry
+                const errorType = detectErrorType(errorBody.error.message || "");
+                if (errorType === "thinking_block_order") {
+                    const recoveryError = new Error("THINKING_RECOVERY_NEEDED");
+                    recoveryError.recoveryType = errorType;
+                    recoveryError.originalError = errorBody;
+                    recoveryError.debugInfo = debugInfo;
+                    throw recoveryError;
+                }
                 return new Response(JSON.stringify(errorBody), {
                     status: response.status,
                     statusText: response.statusText,