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

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;