@rama_nigg/open-cursor 2.3.13 → 2.3.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rama_nigg/open-cursor",
-  "version": "2.3.13",
+  "version": "2.3.15",
   "description": "No prompt limits. No broken streams. Full thinking + tool support. Your Cursor subscription, properly integrated.",
   "type": "module",
   "main": "dist/plugin-entry.js",

package/src/cli/model-discovery.ts

@@ -1,6 +1,8 @@
 import { execFileSync } from "child_process";
 import { stripAnsi } from "../utils/errors.js";
 
+const MODEL_DISCOVERY_TIMEOUT_MS = 5000;
+
 export type DiscoveredModel = {
   id: string;
   name: string;
@@ -31,7 +33,9 @@ export function parseCursorModelsOutput(output: string): DiscoveredModel[] {
 export function discoverModelsFromCursorAgent(): DiscoveredModel[] {
   const raw = execFileSync("cursor-agent", ["models"], {
     encoding: "utf8",
+    killSignal: "SIGTERM",
     stdio: ["ignore", "pipe", "pipe"],
+    timeout: MODEL_DISCOVERY_TIMEOUT_MS,
   });
   const models = parseCursorModelsOutput(raw);
   if (models.length === 0) {
@@ -43,8 +47,24 @@ export function discoverModelsFromCursorAgent(): DiscoveredModel[] {
 export function fallbackModels(): DiscoveredModel[] {
   return [
     { id: "auto", name: "Auto" },
-    { id: "sonnet-4.5", name: "Claude 4.5 Sonnet" },
+    { id: "composer-1.5", name: "Composer 1.5" },
+    { id: "composer-1", name: "Composer 1" },
+    { id: "opus-4.6-thinking", name: "Claude 4.6 Opus (Thinking)" },
     { id: "opus-4.6", name: "Claude 4.6 Opus" },
+    { id: "sonnet-4.6", name: "Claude 4.6 Sonnet" },
+    { id: "sonnet-4.6-thinking", name: "Claude 4.6 Sonnet (Thinking)" },
+    { id: "opus-4.5", name: "Claude 4.5 Opus" },
+    { id: "opus-4.5-thinking", name: "Claude 4.5 Opus (Thinking)" },
+    { id: "sonnet-4.5", name: "Claude 4.5 Sonnet" },
+    { id: "sonnet-4.5-thinking", name: "Claude 4.5 Sonnet (Thinking)" },
+    { id: "gpt-5.4-high", name: "GPT-5.4 High" },
+    { id: "gpt-5.4-medium", name: "GPT-5.4" },
+    { id: "gpt-5.3-codex", name: "GPT-5.3 Codex" },
     { id: "gpt-5.2", name: "GPT-5.2" },
+    { id: "gemini-3.1-pro", name: "Gemini 3.1 Pro" },
+    { id: "gemini-3-pro", name: "Gemini 3 Pro" },
+    { id: "gemini-3-flash", name: "Gemini 3 Flash" },
+    { id: "grok", name: "Grok" },
+    { id: "kimi-k2.5", name: "Kimi K2.5" },
   ];
 }

package/src/client/simple.ts

@@ -253,11 +253,24 @@ export class SimpleCursorClient {
   async getAvailableModels(): Promise<Array<{ id: string; name: string }>> {
     return [
       { id: 'auto', name: 'Cursor Agent Auto' },
+      { id: 'composer-1.5', name: 'Composer 1.5' },
+      { id: 'opus-4.6-thinking', name: 'Claude 4.6 Opus (Thinking)' },
+      { id: 'opus-4.6', name: 'Claude 4.6 Opus' },
+      { id: 'sonnet-4.6', name: 'Claude 4.6 Sonnet' },
+      { id: 'sonnet-4.6-thinking', name: 'Claude 4.6 Sonnet (Thinking)' },
+      { id: 'opus-4.5', name: 'Claude 4.5 Opus' },
+      { id: 'opus-4.5-thinking', name: 'Claude 4.5 Opus (Thinking)' },
+      { id: 'sonnet-4.5', name: 'Claude 4.5 Sonnet' },
+      { id: 'sonnet-4.5-thinking', name: 'Claude 4.5 Sonnet (Thinking)' },
+      { id: 'gpt-5.4-high', name: 'GPT-5.4 High' },
+      { id: 'gpt-5.4-medium', name: 'GPT-5.4' },
+      { id: 'gpt-5.3-codex', name: 'GPT-5.3 Codex' },
       { id: 'gpt-5.2', name: 'GPT-5.2' },
+      { id: 'gemini-3.1-pro', name: 'Gemini 3.1 Pro' },
       { id: 'gemini-3-pro', name: 'Gemini 3 Pro' },
-      { id: 'opus-4.5-thinking', name: 'Claude 4.5 Opus Thinking' },
-      { id: 'sonnet-4.5', name: 'Claude 4.5 Sonnet' },
-      { id: 'deepseek-v3.2', name: 'DeepSeek V3.2' }
+      { id: 'gemini-3-flash', name: 'Gemini 3 Flash' },
+      { id: 'grok', name: 'Grok' },
+      { id: 'kimi-k2.5', name: 'Kimi K2.5' },
     ];
   }
 

package/src/models/discovery.ts

@@ -119,10 +119,20 @@ export class ModelDiscoveryService {
   private getDefaultModels(): ModelInfo[] {
     return [
       { id: "auto", name: "Auto", description: "Auto-select best model" },
+      { id: "composer-1.5", name: "Composer 1.5" },
+      { id: "opus-4.6-thinking", name: "Claude 4.6 Opus (Thinking)" },
+      { id: "opus-4.6", name: "Claude 4.6 Opus" },
+      { id: "sonnet-4.6", name: "Claude 4.6 Sonnet" },
+      { id: "sonnet-4.6-thinking", name: "Claude 4.6 Sonnet (Thinking)" },
+      { id: "opus-4.5", name: "Claude 4.5 Opus" },
+      { id: "sonnet-4.5", name: "Claude 4.5 Sonnet" },
+      { id: "gpt-5.4-high", name: "GPT-5.4 High" },
+      { id: "gpt-5.3-codex", name: "GPT-5.3 Codex" },
       { id: "gpt-5.2", name: "GPT-5.2" },
-      { id: "sonnet-4.5", name: "Sonnet 4.5" },
-      { id: "opus-4.5", name: "Opus 4.5" },
-      { id: "gemini-3-pro", name: "Gemini 3 Pro" }
+      { id: "gemini-3.1-pro", name: "Gemini 3.1 Pro" },
+      { id: "gemini-3-pro", name: "Gemini 3 Pro" },
+      { id: "grok", name: "Grok" },
+      { id: "kimi-k2.5", name: "Kimi K2.5" },
     ];
   }
 

package/src/models/sync.ts

@@ -0,0 +1,153 @@
+/**
+ * Non-blocking model auto-refresh for plugin startup.
+ *
+ * Discovers currently available models from cursor-agent and merges them
+ * into the opencode.json config. Only adds new models — never removes
+ * user-configured ones. Safe to call fire-and-forget; all errors are
+ * caught and logged silently.
+ */
+import {
+  existsSync as nodeExistsSync,
+  readFileSync as nodeReadFileSync,
+  writeFileSync as nodeWriteFileSync,
+} from "node:fs";
+import { discoverModelsFromCursorAgent, type DiscoveredModel } from "../cli/model-discovery.js";
+import { resolveOpenCodeConfigPath } from "../plugin-toggle.js";
+import { createLogger, type Logger } from "../utils/logger.js";
+
+const log = createLogger("model-sync");
+const PROVIDER_ID = "cursor-acp";
+
+type ModelConfigEntry = { name: string };
+type ProviderConfig = { models?: Record<string, unknown> } & Record<string, unknown>;
+type OpenCodeConfig = {
+  provider?: Record<string, ProviderConfig | undefined>;
+} & Record<string, unknown>;
+type AutoRefreshModelsDeps = {
+  defer: () => Promise<void>;
+  discoverModels: () => DiscoveredModel[];
+  env: NodeJS.ProcessEnv;
+  existsSync: (path: string) => boolean;
+  log: Logger;
+  readFileSync: (path: string, encoding: BufferEncoding) => string;
+  writeFileSync: (path: string, data: string, encoding: BufferEncoding) => void;
+};
+
+const defaultDeps: AutoRefreshModelsDeps = {
+  defer: () => Promise.resolve(),
+  discoverModels: discoverModelsFromCursorAgent,
+  env: process.env,
+  existsSync: nodeExistsSync,
+  log,
+  readFileSync: nodeReadFileSync,
+  writeFileSync: nodeWriteFileSync,
+};
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+function parseConfig(raw: string): OpenCodeConfig | null {
+  try {
+    const parsed = JSON.parse(raw);
+    return isRecord(parsed) ? (parsed as OpenCodeConfig) : null;
+  } catch {
+    return null;
+  }
+}
+
+function getProviderConfig(config: OpenCodeConfig): ProviderConfig | null {
+  if (!isRecord(config.provider)) {
+    return null;
+  }
+
+  const provider = config.provider[PROVIDER_ID];
+  return isRecord(provider) ? (provider as ProviderConfig) : null;
+}
+
+function getExistingModels(provider: ProviderConfig): Record<string, unknown> {
+  return isRecord(provider.models) ? { ...provider.models } : {};
+}
+
+function yieldForFireAndForget(): Promise<void> {
+  return Promise.resolve();
+}
+
+/**
+ * Auto-refresh models at plugin startup.
+ *
+ * - Reads the current opencode.json config
+ * - Queries cursor-agent for available models
+ * - Merges discovered models into the provider config (additive only)
+ * - Writes back if any new models were added
+ *
+ * This function never throws. All failures are logged at debug level
+ * and silently ignored so plugin startup is never blocked.
+ */
+export async function autoRefreshModels(
+  deps: Partial<AutoRefreshModelsDeps> = {},
+): Promise<void> {
+  const resolvedDeps: AutoRefreshModelsDeps = {
+    ...defaultDeps,
+    defer: yieldForFireAndForget,
+    ...deps,
+  };
+
+  await resolvedDeps.defer();
+
+  try {
+    const configPath = resolveOpenCodeConfigPath(resolvedDeps.env);
+    if (!resolvedDeps.existsSync(configPath)) {
+      resolvedDeps.log.debug("Config file not found, skipping model auto-refresh", { configPath });
+      return;
+    }
+
+    const raw = resolvedDeps.readFileSync(configPath, "utf8");
+    const config = parseConfig(raw);
+    if (!config) {
+      resolvedDeps.log.debug("Config file is not valid JSON, skipping model auto-refresh");
+      return;
+    }
+
+    const provider = getProviderConfig(config);
+    if (!provider) {
+      resolvedDeps.log.debug("Provider section not found in config, skipping model auto-refresh");
+      return;
+    }
+
+    const existingModels = getExistingModels(provider);
+    let discovered: DiscoveredModel[];
+    try {
+      discovered = resolvedDeps.discoverModels();
+    } catch (err) {
+      resolvedDeps.log.debug("cursor-agent model discovery failed, skipping auto-refresh", {
+        error: String(err),
+      });
+      return;
+    }
+
+    let addedCount = 0;
+    for (const model of discovered) {
+      if (Object.prototype.hasOwnProperty.call(existingModels, model.id)) continue;
+      existingModels[model.id] = { name: model.name } satisfies ModelConfigEntry;
+      addedCount++;
+    }
+
+    if (addedCount === 0) {
+      resolvedDeps.log.debug("Model auto-refresh: no new models found", {
+        existing: Object.keys(existingModels).length,
+        discovered: discovered.length,
+      });
+      return;
+    }
+
+    provider.models = existingModels;
+    resolvedDeps.writeFileSync(configPath, `${JSON.stringify(config, null, 2)}\n`, "utf8");
+    resolvedDeps.log.info("Model auto-refresh: added new models", {
+      added: addedCount,
+      total: Object.keys(existingModels).length,
+    });
+  } catch (err) {
+    resolvedDeps.log.debug("Model auto-refresh failed", { error: String(err) });
+  }
+}

package/src/plugin.ts

@@ -24,6 +24,7 @@ import { toOpenAiParameters, describeTool } from "./tools/schema.js";
 import { ToolRouter } from "./tools/router.js";
 import { SkillLoader } from "./tools/skills/loader.js";
 import { SkillResolver } from "./tools/skills/resolver.js";
+import { autoRefreshModels } from "./models/sync.js";
 import { createOpencodeClient } from "@opencode-ai/sdk";
 import { ToolRegistry as CoreRegistry } from "./tools/core/registry.js";
 import { LocalExecutor } from "./tools/executors/local.js";
@@ -1735,8 +1736,8 @@ export const CursorPlugin: Plugin = async ({ $, directory, worktree, client, ser
   });
   await ensurePluginDirectory();
 
-  // Initialize toast service for MCP pass-through notifications
-  toastService.setClient(client);
+  // Auto-refresh model list from cursor-agent (non-blocking, fire-and-forget)
+  autoRefreshModels().catch(() => {});
 
   // Initialize toast service for MCP pass-through notifications
   toastService.setClient(client);

package/src/streaming/ai-sdk-parts.ts

@@ -44,9 +44,12 @@ export class StreamToAiSdkParts {
     if (isAssistantText(event)) {
       const isPartial = typeof event.timestamp_ms === "number";
       if (isPartial) {
-        this.sawAssistantPartials = true;
         const text = extractText(event);
-        return text ? [{ type: "text-delta", textDelta: text }] : [];
+        if (text) {
+          this.sawAssistantPartials = true;
+          return [{ type: "text-delta", textDelta: text }];
+        }
+        return [];
       }
       if (this.sawAssistantPartials) {
         return [];
@@ -58,9 +61,12 @@ export class StreamToAiSdkParts {
     if (isThinking(event)) {
       const isPartial = typeof event.timestamp_ms === "number";
       if (isPartial) {
-        this.sawThinkingPartials = true;
         const text = extractThinking(event);
-        return text ? [{ type: "text-delta", textDelta: text }] : [];
+        if (text) {
+          this.sawThinkingPartials = true;
+          return [{ type: "text-delta", textDelta: text }];
+        }
+        return [];
       }
       if (this.sawThinkingPartials) {
         return [];

package/src/streaming/openai-sse.ts

@@ -77,9 +77,12 @@ export class StreamToSseConverter {
     if (isAssistantText(event)) {
       const isPartial = typeof event.timestamp_ms === "number";
       if (isPartial) {
-        this.sawAssistantPartials = true;
         const text = extractText(event);
-        return text ? [this.chunkWith({ content: text })] : [];
+        if (text) {
+          this.sawAssistantPartials = true;
+          return [this.chunkWith({ content: text })];
+        }
+        return [];
       }
       if (this.sawAssistantPartials) {
         return [];
@@ -91,9 +94,12 @@ export class StreamToSseConverter {
     if (isThinking(event)) {
       const isPartial = typeof event.timestamp_ms === "number";
       if (isPartial) {
-        this.sawThinkingPartials = true;
         const text = extractThinking(event);
-        return text ? [this.chunkWith({ reasoning_content: text })] : [];
+        if (text) {
+          this.sawThinkingPartials = true;
+          return [this.chunkWith({ reasoning_content: text })];
+        }
+        return [];
       }
       if (this.sawThinkingPartials) {
         return [];