@playwo/opencode-cursor-oauth 0.0.0-dev.c80ebcb27754 → 0.0.0-dev.f7099c3761b9

package/README.md

@@ -44,7 +44,7 @@ OpenAI-compatible proxy on demand and routes requests through Cursor's gRPC API.
 ## How it works
 
 1. OAuth — browser-based login to Cursor via PKCE.
-2. Model discovery — queries Cursor's gRPC API for all available models.
+2. Model discovery — queries Cursor's gRPC API for all available models; if discovery fails, the plugin disables the Cursor provider for that load and shows a visible error toast instead of crashing OpenCode.
 3. Local proxy — translates `POST /v1/chat/completions` into Cursor's
    protobuf/Connect protocol.
 4. Native tool routing — rejects Cursor's built-in filesystem/shell tools and

package/dist/auth.js

@@ -1,4 +1,5 @@
 import { generatePKCE } from "./pkce";
+import { errorDetails, logPluginError, logPluginWarn } from "./logger";
 const CURSOR_LOGIN_URL = "https://cursor.com/loginDeepControl";
 const CURSOR_POLL_URL = "https://api2.cursor.sh/auth/poll";
 const CURSOR_REFRESH_URL = process.env.CURSOR_REFRESH_URL ??
@@ -40,13 +41,32 @@ export async function pollCursorAuth(uuid, verifier) {
             }
             throw new Error(`Poll failed: ${response.status}`);
         }
-        catch {
+        catch (error) {
             consecutiveErrors++;
             if (consecutiveErrors >= 3) {
+                logPluginError("Cursor auth polling failed repeatedly", {
+                    stage: "oauth_poll",
+                    uuid,
+                    attempts: attempt + 1,
+                    consecutiveErrors,
+                    ...errorDetails(error),
+                });
                 throw new Error("Too many consecutive errors during Cursor auth polling");
             }
+            logPluginWarn("Cursor auth polling attempt failed", {
+                stage: "oauth_poll",
+                uuid,
+                attempt: attempt + 1,
+                consecutiveErrors,
+                ...errorDetails(error),
+            });
         }
     }
+    logPluginError("Cursor authentication polling timed out", {
+        stage: "oauth_poll",
+        uuid,
+        attempts: POLL_MAX_ATTEMPTS,
+    });
     throw new Error("Cursor authentication polling timeout");
 }
 export async function refreshCursorToken(refreshToken) {
@@ -60,6 +80,11 @@ export async function refreshCursorToken(refreshToken) {
     });
     if (!response.ok) {
         const error = await response.text();
+        logPluginError("Cursor token refresh failed", {
+            stage: "token_refresh",
+            status: response.status,
+            responseBody: error,
+        });
         throw new Error(`Cursor token refresh failed: ${error}`);
     }
     const data = (await response.json());

package/dist/index.js

@@ -1,42 +1,27 @@
 import { generateCursorAuthParams, getTokenExpiry, pollCursorAuth, refreshCursorToken, } from "./auth";
+import { configurePluginLogger, errorDetails, logPluginError, logPluginWarn } from "./logger";
 import { getCursorModels } from "./models";
-import { startProxy } from "./proxy";
+import { startProxy, stopProxy } from "./proxy";
 const CURSOR_PROVIDER_ID = "cursor";
+let lastModelDiscoveryError = null;
 /**
  * OpenCode plugin that provides Cursor authentication and model access.
  * Register in opencode.json: { "plugin": ["opencode-cursor-oauth"] }
  */
 export const CursorAuthPlugin = async (input) => {
+    configurePluginLogger(input);
     return {
         auth: {
             provider: CURSOR_PROVIDER_ID,
             async loader(getAuth, provider) {
-                const auth = await getAuth();
-                if (!auth || auth.type !== "oauth")
-                    return {};
-                // Ensure we have a valid access token, refreshing if expired
-                let accessToken = auth.access;
-                if (!accessToken || auth.expires < Date.now()) {
-                    const refreshed = await refreshCursorToken(auth.refresh);
-                    await input.client.auth.set({
-                        path: { id: CURSOR_PROVIDER_ID },
-                        body: {
-                            type: "oauth",
-                            refresh: refreshed.refresh,
-                            access: refreshed.access,
-                            expires: refreshed.expires,
-                        },
-                    });
-                    accessToken = refreshed.access;
-                }
-                const models = await getCursorModels(accessToken);
-                const port = await startProxy(async () => {
-                    const currentAuth = await getAuth();
-                    if (currentAuth.type !== "oauth") {
-                        throw new Error("Cursor auth not configured");
-                    }
-                    if (!currentAuth.access || currentAuth.expires < Date.now()) {
-                        const refreshed = await refreshCursorToken(currentAuth.refresh);
+                try {
+                    const auth = await getAuth();
+                    if (!auth || auth.type !== "oauth")
+                        return {};
+                    // Ensure we have a valid access token, refreshing if expired
+                    let accessToken = auth.access;
+                    if (!accessToken || auth.expires < Date.now()) {
+                        const refreshed = await refreshCursorToken(auth.refresh);
                         await input.client.auth.set({
                             path: { id: CURSOR_PROVIDER_ID },
                             body: {
@@ -46,32 +31,78 @@ export const CursorAuthPlugin = async (input) => {
                                 expires: refreshed.expires,
                             },
                         });
-                        return refreshed.access;
+                        accessToken = refreshed.access;
                     }
-                    return currentAuth.access;
-                }, models);
-                if (provider) {
-                    provider.models = buildCursorProviderModels(models, port);
-                }
-                return {
-                    baseURL: `http://localhost:${port}/v1`,
-                    apiKey: "cursor-proxy",
-                    async fetch(requestInput, init) {
-                        if (init?.headers) {
-                            if (init.headers instanceof Headers) {
-                                init.headers.delete("authorization");
-                            }
-                            else if (Array.isArray(init.headers)) {
-                                init.headers = init.headers.filter(([key]) => key.toLowerCase() !== "authorization");
-                            }
-                            else {
-                                delete init.headers["authorization"];
-                                delete init.headers["Authorization"];
-                            }
+                    let models;
+                    models = await getCursorModels(accessToken);
+                    lastModelDiscoveryError = null;
+                    const port = await startProxy(async () => {
+                        const currentAuth = await getAuth();
+                        if (currentAuth.type !== "oauth") {
+                            const authError = new Error("Cursor auth not configured");
+                            logPluginError("Cursor proxy access token lookup failed", {
+                                stage: "proxy_access_token",
+                                ...errorDetails(authError),
+                            });
+                            throw authError;
                         }
-                        return fetch(requestInput, init);
-                    },
-                };
+                        if (!currentAuth.access || currentAuth.expires < Date.now()) {
+                            const refreshed = await refreshCursorToken(currentAuth.refresh);
+                            await input.client.auth.set({
+                                path: { id: CURSOR_PROVIDER_ID },
+                                body: {
+                                    type: "oauth",
+                                    refresh: refreshed.refresh,
+                                    access: refreshed.access,
+                                    expires: refreshed.expires,
+                                },
+                            });
+                            return refreshed.access;
+                        }
+                        return currentAuth.access;
+                    }, models);
+                    if (provider) {
+                        provider.models = buildCursorProviderModels(models, port);
+                    }
+                    return {
+                        baseURL: `http://localhost:${port}/v1`,
+                        apiKey: "cursor-proxy",
+                        async fetch(requestInput, init) {
+                            if (init?.headers) {
+                                if (init.headers instanceof Headers) {
+                                    init.headers.delete("authorization");
+                                }
+                                else if (Array.isArray(init.headers)) {
+                                    init.headers = init.headers.filter(([key]) => key.toLowerCase() !== "authorization");
+                                }
+                                else {
+                                    delete init.headers["authorization"];
+                                    delete init.headers["Authorization"];
+                                }
+                            }
+                            return fetch(requestInput, init);
+                        },
+                    };
+                }
+                catch (error) {
+                    const message = error instanceof Error
+                        ? error.message
+                        : "Cursor model discovery failed.";
+                    logPluginError("Cursor auth loader failed", {
+                        stage: "loader",
+                        providerID: CURSOR_PROVIDER_ID,
+                        ...errorDetails(error),
+                    });
+                    stopProxy();
+                    if (provider) {
+                        provider.models = {};
+                    }
+                    if (message !== lastModelDiscoveryError) {
+                        lastModelDiscoveryError = message;
+                        await showDiscoveryFailureToast(input, message);
+                    }
+                    return buildDisabledProviderConfig(message);
+                }
             },
             methods: [
                 {
@@ -145,6 +176,43 @@ function buildCursorProviderModels(models, port) {
         },
     ]));
 }
+async function showDiscoveryFailureToast(input, message) {
+    try {
+        await input.client.tui.showToast({
+            body: {
+                title: "Cursor plugin disabled",
+                message,
+                variant: "error",
+                duration: 8_000,
+            },
+        });
+    }
+    catch (error) {
+        logPluginWarn("Failed to display Cursor plugin toast", {
+            title: "Cursor plugin disabled",
+            message,
+            ...errorDetails(error),
+        });
+    }
+}
+function buildDisabledProviderConfig(message) {
+    return {
+        baseURL: "http://127.0.0.1/cursor-disabled/v1",
+        apiKey: "cursor-disabled",
+        async fetch() {
+            return new Response(JSON.stringify({
+                error: {
+                    message,
+                    type: "server_error",
+                    code: "cursor_model_discovery_failed",
+                },
+            }), {
+                status: 503,
+                headers: { "Content-Type": "application/json" },
+            });
+        },
+    };
+}
 // $/M token rates from cursor.com/docs/models-and-pricing
 const MODEL_COST_TABLE = {
     // Anthropic

package/dist/logger.d.ts

@@ -0,0 +1,6 @@
+import type { PluginInput } from "@opencode-ai/plugin";
+export declare function configurePluginLogger(input: PluginInput): void;
+export declare function errorDetails(error: unknown): Record<string, unknown>;
+export declare function logPluginWarn(message: string, extra?: Record<string, unknown>): void;
+export declare function logPluginError(message: string, extra?: Record<string, unknown>): void;
+export declare function flushPluginLogs(): Promise<void>;

package/dist/logger.js

@@ -0,0 +1,142 @@
+const PLUGIN_LOG_SERVICE = "opencode-cursor-oauth";
+const MAX_STRING_LENGTH = 1_500;
+const MAX_ARRAY_LENGTH = 20;
+const MAX_OBJECT_KEYS = 25;
+let currentLogger;
+let pendingLogWrites = Promise.resolve();
+export function configurePluginLogger(input) {
+    currentLogger = {
+        client: input.client,
+        directory: input.directory,
+    };
+}
+export function errorDetails(error) {
+    if (error instanceof Error) {
+        return {
+            errorName: error.name,
+            errorMessage: error.message,
+            errorStack: error.stack,
+            errorCause: serializeValue(error.cause, 1),
+        };
+    }
+    return {
+        errorType: typeof error,
+        errorValue: serializeValue(error, 1),
+    };
+}
+export function logPluginWarn(message, extra = {}) {
+    logPlugin("warn", message, extra);
+}
+export function logPluginError(message, extra = {}) {
+    logPlugin("error", message, extra);
+}
+export function flushPluginLogs() {
+    return pendingLogWrites;
+}
+function logPlugin(level, message, extra) {
+    const serializedExtra = serializeValue(extra, 0);
+    writeConsoleLog(level, message, serializedExtra);
+    if (!currentLogger?.client?.app?.log) {
+        return;
+    }
+    pendingLogWrites = pendingLogWrites
+        .catch(() => { })
+        .then(async () => {
+        try {
+            await currentLogger?.client.app.log({
+                query: { directory: currentLogger.directory },
+                body: {
+                    service: PLUGIN_LOG_SERVICE,
+                    level,
+                    message,
+                    extra: serializedExtra,
+                },
+            });
+        }
+        catch (logError) {
+            writeConsoleLog("warn", "Failed to forward plugin log to OpenCode", {
+                originalLevel: level,
+                originalMessage: message,
+                ...errorDetails(logError),
+            });
+        }
+    });
+}
+function writeConsoleLog(level, message, extra) {
+    const prefix = `[${PLUGIN_LOG_SERVICE}] ${message}`;
+    const suffix = Object.keys(extra).length > 0 ? ` ${JSON.stringify(extra)}` : "";
+    if (level === "error") {
+        console.error(`${prefix}${suffix}`);
+        return;
+    }
+    console.warn(`${prefix}${suffix}`);
+}
+function serializeValue(value, depth, seen = new WeakSet()) {
+    if (value === null || value === undefined)
+        return value;
+    if (typeof value === "string")
+        return truncateString(value);
+    const valueType = typeof value;
+    if (valueType === "number" || valueType === "boolean")
+        return value;
+    if (valueType === "bigint")
+        return value.toString();
+    if (valueType === "symbol")
+        return String(value);
+    if (valueType === "function")
+        return `[function ${value.name || "anonymous"}]`;
+    if (value instanceof URL)
+        return value.toString();
+    if (value instanceof Headers)
+        return Object.fromEntries(value.entries());
+    if (value instanceof Error) {
+        return {
+            name: value.name,
+            message: value.message,
+            stack: truncateString(value.stack),
+            cause: serializeValue(value.cause, depth + 1, seen),
+        };
+    }
+    if (value instanceof Uint8Array) {
+        return serializeBinary(value);
+    }
+    if (Array.isArray(value)) {
+        if (depth >= 3)
+            return `[array(${value.length})]`;
+        return value.slice(0, MAX_ARRAY_LENGTH).map((entry) => serializeValue(entry, depth + 1, seen));
+    }
+    if (typeof value === "object") {
+        if (seen.has(value))
+            return "[circular]";
+        seen.add(value);
+        if (depth >= 3) {
+            return `[object ${value.constructor?.name || "Object"}]`;
+        }
+        const entries = Object.entries(value).slice(0, MAX_OBJECT_KEYS);
+        return Object.fromEntries(entries.map(([key, entry]) => [key, serializeValue(entry, depth + 1, seen)]));
+    }
+    return String(value);
+}
+function serializeBinary(value) {
+    const text = new TextDecoder().decode(value);
+    const printable = /^[\x09\x0a\x0d\x20-\x7e]*$/.test(text);
+    if (printable) {
+        return {
+            type: "uint8array",
+            length: value.length,
+            text: truncateString(text),
+        };
+    }
+    return {
+        type: "uint8array",
+        length: value.length,
+        base64: truncateString(Buffer.from(value).toString("base64")),
+    };
+}
+function truncateString(value) {
+    if (value === undefined)
+        return undefined;
+    if (value.length <= MAX_STRING_LENGTH)
+        return value;
+    return `${value.slice(0, MAX_STRING_LENGTH - 3)}...`;
+}

package/dist/models.d.ts

@@ -5,6 +5,9 @@ export interface CursorModel {
     contextWindow: number;
     maxTokens: number;
 }
+export declare class CursorModelDiscoveryError extends Error {
+    constructor(message: string);
+}
 export declare function getCursorModels(apiKey: string): Promise<CursorModel[]>;
 /** @internal Test-only. */
 export declare function clearModelCache(): void;

package/dist/models.js

@@ -1,13 +1,10 @@
-/**
- * Cursor model discovery via GetUsableModels.
- * Uses the H2 bridge for transport. Falls back to a hardcoded list
- * when discovery fails.
- */
 import { create, fromBinary, toBinary } from "@bufbuild/protobuf";
 import { z } from "zod";
+import { errorDetails, logPluginError, logPluginWarn } from "./logger";
 import { callCursorUnaryRpc } from "./proxy";
 import { GetUsableModelsRequestSchema, GetUsableModelsResponseSchema, } from "./proto/agent_pb";
 const GET_USABLE_MODELS_PATH = "/agent.v1.AgentService/GetUsableModels";
+const MODEL_DISCOVERY_TIMEOUT_MS = 5_000;
 const DEFAULT_CONTEXT_WINDOW = 200_000;
 const DEFAULT_MAX_TOKENS = 64_000;
 const CursorModelDetailsSchema = z.object({
@@ -22,24 +19,12 @@ const CursorModelDetailsSchema = z.object({
         .transform((aliases) => (aliases ?? []).filter((alias) => typeof alias === "string")),
     thinkingDetails: z.unknown().optional(),
 });
-const FALLBACK_MODELS = [
-    // Composer models
-    { id: "composer-1", name: "Composer 1", reasoning: true, contextWindow: 200_000, maxTokens: 64_000 },
-    { id: "composer-1.5", name: "Composer 1.5", reasoning: true, contextWindow: 200_000, maxTokens: 64_000 },
-    // Claude models
-    { id: "claude-4.6-opus-high", name: "Claude 4.6 Opus", reasoning: true, contextWindow: 200_000, maxTokens: 128_000 },
-    { id: "claude-4.6-sonnet-medium", name: "Claude 4.6 Sonnet", reasoning: true, contextWindow: 200_000, maxTokens: 64_000 },
-    { id: "claude-4.5-sonnet", name: "Claude 4.5 Sonnet", reasoning: true, contextWindow: 200_000, maxTokens: 64_000 },
-    // GPT models
-    { id: "gpt-5.4-medium", name: "GPT-5.4", reasoning: true, contextWindow: 272_000, maxTokens: 128_000 },
-    { id: "gpt-5.2", name: "GPT-5.2", reasoning: true, contextWindow: 400_000, maxTokens: 128_000 },
-    { id: "gpt-5.2-codex", name: "GPT-5.2 Codex", reasoning: true, contextWindow: 400_000, maxTokens: 128_000 },
-    { id: "gpt-5.3-codex", name: "GPT-5.3 Codex", reasoning: true, contextWindow: 400_000, maxTokens: 128_000 },
-    { id: "gpt-5.3-codex-spark-preview", name: "GPT-5.3 Codex Spark", reasoning: true, contextWindow: 128_000, maxTokens: 128_000 },
-    // Other models
-    { id: "gemini-3.1-pro", name: "Gemini 3.1 Pro", reasoning: true, contextWindow: 1_000_000, maxTokens: 64_000 },
-    { id: "grok-code-fast-1", name: "Grok Code Fast 1", reasoning: false, contextWindow: 128_000, maxTokens: 64_000 },
-];
+export class CursorModelDiscoveryError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = "CursorModelDiscoveryError";
+    }
+}
 async function fetchCursorUsableModels(apiKey) {
     try {
         const requestPayload = create(GetUsableModelsRequestSchema, {});
@@ -48,18 +33,51 @@ async function fetchCursorUsableModels(apiKey) {
             accessToken: apiKey,
             rpcPath: GET_USABLE_MODELS_PATH,
             requestBody,
+            timeoutMs: MODEL_DISCOVERY_TIMEOUT_MS,
         });
-        if (response.timedOut || response.exitCode !== 0 || response.body.length === 0) {
-            return null;
+        if (response.timedOut) {
+            logPluginError("Cursor model discovery timed out", {
+                rpcPath: GET_USABLE_MODELS_PATH,
+                timeoutMs: MODEL_DISCOVERY_TIMEOUT_MS,
+            });
+            throw new CursorModelDiscoveryError(`Cursor model discovery timed out after ${MODEL_DISCOVERY_TIMEOUT_MS}ms.`);
+        }
+        if (response.exitCode !== 0) {
+            logPluginError("Cursor model discovery HTTP failure", {
+                rpcPath: GET_USABLE_MODELS_PATH,
+                exitCode: response.exitCode,
+                responseBody: response.body,
+            });
+            throw new CursorModelDiscoveryError(buildDiscoveryHttpError(response.exitCode, response.body));
+        }
+        if (response.body.length === 0) {
+            logPluginWarn("Cursor model discovery returned an empty response", {
+                rpcPath: GET_USABLE_MODELS_PATH,
+            });
+            throw new CursorModelDiscoveryError("Cursor model discovery returned an empty response.");
         }
         const decoded = decodeGetUsableModelsResponse(response.body);
-        if (!decoded)
-            return null;
+        if (!decoded) {
+            logPluginError("Cursor model discovery returned an unreadable response", {
+                rpcPath: GET_USABLE_MODELS_PATH,
+                responseBody: response.body,
+            });
+            throw new CursorModelDiscoveryError("Cursor model discovery returned an unreadable response.");
+        }
         const models = normalizeCursorModels(decoded.models);
-        return models.length > 0 ? models : null;
+        if (models.length === 0) {
+            throw new CursorModelDiscoveryError("Cursor model discovery returned no usable models.");
+        }
+        return models;
     }
-    catch {
-        return null;
+    catch (error) {
+        if (error instanceof CursorModelDiscoveryError)
+            throw error;
+        logPluginError("Cursor model discovery crashed", {
+            rpcPath: GET_USABLE_MODELS_PATH,
+            ...errorDetails(error),
+        });
+        throw new CursorModelDiscoveryError("Cursor model discovery failed.");
     }
 }
 let cachedModels = null;
@@ -67,13 +85,43 @@ export async function getCursorModels(apiKey) {
     if (cachedModels)
         return cachedModels;
     const discovered = await fetchCursorUsableModels(apiKey);
-    cachedModels = discovered && discovered.length > 0 ? discovered : FALLBACK_MODELS;
+    cachedModels = discovered;
     return cachedModels;
 }
 /** @internal Test-only. */
 export function clearModelCache() {
     cachedModels = null;
 }
+function buildDiscoveryHttpError(exitCode, body) {
+    const detail = extractDiscoveryErrorDetail(body);
+    const protocolHint = exitCode === 464
+        ? " Likely protocol mismatch: Cursor appears to expect an HTTP/2 Connect unary request."
+        : "";
+    if (!detail) {
+        return `Cursor model discovery failed with HTTP ${exitCode}.${protocolHint}`;
+    }
+    return `Cursor model discovery failed with HTTP ${exitCode}: ${detail}.${protocolHint}`;
+}
+function extractDiscoveryErrorDetail(body) {
+    if (body.length === 0)
+        return null;
+    const text = new TextDecoder().decode(body).trim();
+    if (!text)
+        return null;
+    try {
+        const parsed = JSON.parse(text);
+        const code = typeof parsed.code === "string" ? parsed.code : undefined;
+        const message = typeof parsed.message === "string" ? parsed.message : undefined;
+        if (message && code)
+            return `${message} (${code})`;
+        if (message)
+            return message;
+        if (code)
+            return code;
+    }
+    catch { }
+    return text.length > 200 ? `${text.slice(0, 197)}...` : text;
+}
 function decodeGetUsableModelsResponse(payload) {
     try {
         return fromBinary(GetUsableModelsResponseSchema, payload);

package/dist/proxy.d.ts

@@ -4,6 +4,7 @@ interface CursorUnaryRpcOptions {
     requestBody: Uint8Array;
     url?: string;
     timeoutMs?: number;
+    transport?: "auto" | "fetch" | "http2";
 }
 export declare function callCursorUnaryRpc(options: CursorUnaryRpcOptions): Promise<{
     body: Uint8Array;

package/dist/proxy.js

@@ -16,8 +16,11 @@ import { create, fromBinary, fromJson, toBinary, toJson } from "@bufbuild/protob
 import { ValueSchema } from "@bufbuild/protobuf/wkt";
 import { AgentClientMessageSchema, AgentRunRequestSchema, AgentServerMessageSchema, BidiRequestIdSchema, ClientHeartbeatSchema, ConversationActionSchema, ConversationStateStructureSchema, ConversationStepSchema, AgentConversationTurnStructureSchema, ConversationTurnStructureSchema, AssistantMessageSchema, BackgroundShellSpawnResultSchema, DeleteResultSchema, DeleteRejectedSchema, DiagnosticsResultSchema, ExecClientMessageSchema, FetchErrorSchema, FetchResultSchema, GetBlobResultSchema, GrepErrorSchema, GrepResultSchema, KvClientMessageSchema, LsRejectedSchema, LsResultSchema, McpErrorSchema, McpResultSchema, McpSuccessSchema, McpTextContentSchema, McpToolDefinitionSchema, McpToolResultContentItemSchema, ModelDetailsSchema, ReadRejectedSchema, ReadResultSchema, RequestContextResultSchema, RequestContextSchema, RequestContextSuccessSchema, SetBlobResultSchema, ShellRejectedSchema, ShellResultSchema, UserMessageActionSchema, UserMessageSchema, WriteRejectedSchema, WriteResultSchema, WriteShellStdinErrorSchema, WriteShellStdinResultSchema, } from "./proto/agent_pb";
 import { createHash } from "node:crypto";
+import { connect as connectHttp2 } from "node:http2";
+import { errorDetails, logPluginError, logPluginWarn } from "./logger";
 const CURSOR_API_URL = process.env.CURSOR_API_URL ?? "https://api2.cursor.sh";
 const CURSOR_CLIENT_VERSION = "cli-2026.01.09-231024f";
+const CURSOR_CONNECT_PROTOCOL_VERSION = "1";
 const CONNECT_END_STREAM_FLAG = 0b00000010;
 const SSE_HEADERS = {
     "Content-Type": "text/event-stream",
@@ -47,18 +50,19 @@ function frameConnectMessage(data, flags = 0) {
     return frame;
 }
 function buildCursorHeaders(options, contentType, extra = {}) {
-    const headers = new Headers({
+    const headers = new Headers(buildCursorHeaderValues(options, contentType, extra));
+    return headers;
+}
+function buildCursorHeaderValues(options, contentType, extra = {}) {
+    return {
         authorization: `Bearer ${options.accessToken}`,
         "content-type": contentType,
         "x-ghost-mode": "true",
         "x-cursor-client-version": CURSOR_CLIENT_VERSION,
         "x-cursor-client-type": "cli",
         "x-request-id": crypto.randomUUID(),
-    });
-    for (const [key, value] of Object.entries(extra)) {
-        headers.set(key, value);
-    }
-    return headers;
+        ...extra,
+    };
 }
 function encodeVarint(value) {
     if (!Number.isSafeInteger(value) || value < 0) {
@@ -130,6 +134,11 @@ async function createCursorSession(options) {
     });
     if (!response.ok || !response.body) {
         const errorBody = await response.text().catch(() => "");
+        logPluginError("Cursor RunSSE request failed", {
+            requestId: options.requestId,
+            status: response.status,
+            responseBody: errorBody,
+        });
         throw new Error(`RunSSE failed: ${response.status}${errorBody ? ` ${errorBody}` : ""}`);
     }
     const cbs = {
@@ -160,6 +169,12 @@ async function createCursorSession(options) {
         });
         if (!appendResponse.ok) {
             const errorBody = await appendResponse.text().catch(() => "");
+            logPluginError("Cursor BidiAppend request failed", {
+                requestId: options.requestId,
+                appendSeqno: appendSeqno - 1,
+                status: appendResponse.status,
+                responseBody: errorBody,
+            });
             throw new Error(`BidiAppend failed: ${appendResponse.status}${errorBody ? ` ${errorBody}` : ""}`);
         }
         await appendResponse.arrayBuffer().catch(() => undefined);
@@ -183,7 +198,11 @@ async function createCursorSession(options) {
                 }
             }
         }
-        catch {
+        catch (error) {
+            logPluginWarn("Cursor stream reader closed with error", {
+                requestId: options.requestId,
+                ...errorDetails(error),
+            });
             finish(alive ? 1 : closeCode);
         }
     })();
@@ -196,7 +215,11 @@ async function createCursorSession(options) {
                 return;
             writeChain = writeChain
                 .then(() => append(data))
-                .catch(() => {
+                .catch((error) => {
+                logPluginError("Cursor stream append failed", {
+                    requestId: options.requestId,
+                    ...errorDetails(error),
+                });
                 try {
                     abortController.abort();
                 }
@@ -236,6 +259,17 @@ async function createCursorSession(options) {
     };
 }
 export async function callCursorUnaryRpc(options) {
+    const target = new URL(options.rpcPath, options.url ?? CURSOR_API_URL);
+    const transport = options.transport ?? "auto";
+    if (transport === "http2" || (transport === "auto" && target.protocol === "https:")) {
+        const http2Result = await callCursorUnaryRpcOverHttp2(options, target);
+        if (transport === "http2" || http2Result.timedOut || http2Result.exitCode !== 1) {
+            return http2Result;
+        }
+    }
+    return callCursorUnaryRpcOverFetch(options, target);
+}
+async function callCursorUnaryRpcOverFetch(options, target) {
     let timedOut = false;
     const timeoutMs = options.timeoutMs ?? 5_000;
     const controller = new AbortController();
@@ -246,9 +280,13 @@ export async function callCursorUnaryRpc(options) {
         }, timeoutMs)
         : undefined;
     try {
-        const response = await fetch(new URL(options.rpcPath, options.url ?? CURSOR_API_URL), {
+        const response = await fetch(target, {
             method: "POST",
-            headers: buildCursorHeaders(options, "application/proto"),
+            headers: buildCursorHeaders(options, "application/proto", {
+                accept: "application/proto, application/json",
+                "connect-protocol-version": CURSOR_CONNECT_PROTOCOL_VERSION,
+                "connect-timeout-ms": String(timeoutMs),
+            }),
             body: toFetchBody(options.requestBody),
             signal: controller.signal,
         });
@@ -260,6 +298,12 @@ export async function callCursorUnaryRpc(options) {
         };
     }
     catch {
+        logPluginError("Cursor unary fetch transport failed", {
+            rpcPath: options.rpcPath,
+            url: target.toString(),
+            timeoutMs,
+            timedOut,
+        });
         return {
             body: new Uint8Array(),
             exitCode: timedOut ? 124 : 1,
@@ -271,6 +315,114 @@ export async function callCursorUnaryRpc(options) {
             clearTimeout(timeout);
     }
 }
+async function callCursorUnaryRpcOverHttp2(options, target) {
+    const timeoutMs = options.timeoutMs ?? 5_000;
+    const authority = `${target.protocol}//${target.host}`;
+    return new Promise((resolve) => {
+        let settled = false;
+        let timedOut = false;
+        let session;
+        let stream;
+        const finish = (result) => {
+            if (settled)
+                return;
+            settled = true;
+            if (timeout)
+                clearTimeout(timeout);
+            try {
+                stream?.close();
+            }
+            catch { }
+            try {
+                session?.close();
+            }
+            catch { }
+            resolve(result);
+        };
+        const timeout = timeoutMs > 0
+            ? setTimeout(() => {
+                timedOut = true;
+                finish({
+                    body: new Uint8Array(),
+                    exitCode: 124,
+                    timedOut: true,
+                });
+            }, timeoutMs)
+            : undefined;
+        try {
+            session = connectHttp2(authority);
+            session.once("error", (error) => {
+                logPluginError("Cursor unary HTTP/2 session failed", {
+                    rpcPath: options.rpcPath,
+                    url: target.toString(),
+                    timedOut,
+                    ...errorDetails(error),
+                });
+                finish({
+                    body: new Uint8Array(),
+                    exitCode: timedOut ? 124 : 1,
+                    timedOut,
+                });
+            });
+            const headers = {
+                ":method": "POST",
+                ":path": `${target.pathname}${target.search}`,
+                ...buildCursorHeaderValues(options, "application/proto", {
+                    accept: "application/proto, application/json",
+                    "connect-protocol-version": CURSOR_CONNECT_PROTOCOL_VERSION,
+                    "connect-timeout-ms": String(timeoutMs),
+                }),
+            };
+            stream = session.request(headers);
+            let statusCode = 0;
+            const chunks = [];
+            stream.once("response", (responseHeaders) => {
+                const statusHeader = responseHeaders[":status"];
+                statusCode = typeof statusHeader === "number"
+                    ? statusHeader
+                    : Number(statusHeader ?? 0);
+            });
+            stream.on("data", (chunk) => {
+                chunks.push(Buffer.from(chunk));
+            });
+            stream.once("end", () => {
+                const body = new Uint8Array(Buffer.concat(chunks));
+                finish({
+                    body,
+                    exitCode: statusCode >= 200 && statusCode < 300 ? 0 : (statusCode || 1),
+                    timedOut,
+                });
+            });
+            stream.once("error", (error) => {
+                logPluginError("Cursor unary HTTP/2 stream failed", {
+                    rpcPath: options.rpcPath,
+                    url: target.toString(),
+                    timedOut,
+                    ...errorDetails(error),
+                });
+                finish({
+                    body: new Uint8Array(),
+                    exitCode: timedOut ? 124 : 1,
+                    timedOut,
+                });
+            });
+            stream.end(Buffer.from(options.requestBody));
+        }
+        catch (error) {
+            logPluginError("Cursor unary HTTP/2 setup failed", {
+                rpcPath: options.rpcPath,
+                url: target.toString(),
+                timedOut,
+                ...errorDetails(error),
+            });
+            finish({
+                body: new Uint8Array(),
+                exitCode: timedOut ? 124 : 1,
+                timedOut,
+            });
+        }
+    });
+}
 let proxyServer;
 let proxyPort;
 let proxyAccessTokenProvider;
@@ -316,6 +468,11 @@ export async function startProxy(getAccessToken, models = []) {
                 }
                 catch (err) {
                     const message = err instanceof Error ? err.message : String(err);
+                    logPluginError("Cursor proxy request failed", {
+                        path: url.pathname,
+                        method: req.method,
+                        ...errorDetails(err),
+                    });
                     return new Response(JSON.stringify({
                         error: { message, type: "server_error", code: "internal_error" },
                     }), { status: 500, headers: { "Content-Type": "application/json" } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@playwo/opencode-cursor-oauth",
-  "version": "0.0.0-dev.c80ebcb27754",
+  "version": "0.0.0-dev.f7099c3761b9",
   "description": "OpenCode plugin that connects Cursor's API to OpenCode via OAuth, model discovery, and a local OpenAI-compatible proxy.",
   "license": "MIT",
   "type": "module",