@rama_nigg/open-cursor 2.3.20 → 2.4.1

package/dist/plugin-entry.js

@@ -71,6 +71,11 @@ function isCursorPluginEnabledInConfig(config) {
     return true;
   }
   const configObject = config;
+  if (configObject.provider && typeof configObject.provider === "object") {
+    if (CURSOR_PROVIDER_ID in configObject.provider) {
+      return true;
+    }
+  }
   if (Array.isArray(configObject.plugin)) {
     return configObject.plugin.some((entry) => matchesPlugin(entry));
   }
@@ -92,7 +97,7 @@ function shouldEnableCursorPlugin(env = process.env) {
     return {
       enabled,
       configPath,
-      reason: enabled ? "enabled_in_plugin_array_or_legacy" : "disabled_in_plugin_array"
+      reason: enabled ? "enabled" : "disabled_in_plugin_array"
     };
   } catch {
     return {
@@ -480,11 +485,52 @@ function formatErrorForUser(error) {
   return output;
 }
 
+// src/utils/binary.ts
+import { existsSync as fsExistsSync } from "fs";
+import * as pathModule from "path";
+import { homedir as osHomedir } from "os";
+function resolveCursorAgentBinary(deps = {}) {
+  const platform = deps.platform ?? process.platform;
+  const env = deps.env ?? process.env;
+  const checkExists = deps.existsSync ?? fsExistsSync;
+  const home = (deps.homedir ?? osHomedir)();
+  const envOverride = env.CURSOR_AGENT_EXECUTABLE;
+  if (envOverride && envOverride.length > 0) {
+    return envOverride;
+  }
+  if (platform === "win32") {
+    const pathJoin = pathModule.win32.join;
+    const localAppData = env.LOCALAPPDATA ?? pathJoin(home, "AppData", "Local");
+    const knownPath = pathJoin(localAppData, "cursor-agent", "cursor-agent.cmd");
+    if (checkExists(knownPath)) {
+      return knownPath;
+    }
+    log.warn("cursor-agent not found at known Windows path, falling back to PATH", { checkedPath: knownPath });
+    return "cursor-agent.cmd";
+  }
+  const knownPaths = [
+    pathModule.join(home, ".cursor-agent", "cursor-agent"),
+    "/usr/local/bin/cursor-agent"
+  ];
+  for (const p of knownPaths) {
+    if (checkExists(p)) {
+      return p;
+    }
+  }
+  log.warn("cursor-agent not found at known paths, falling back to PATH", { checkedPaths: knownPaths });
+  return "cursor-agent";
+}
+var log;
+var init_binary = __esm(() => {
+  init_logger();
+  log = createLogger("binary");
+});
+
 // src/auth.ts
 import { spawn } from "child_process";
 import { existsSync as existsSync3 } from "fs";
 import { homedir as homedir3, platform } from "os";
-import { join as join3 } from "path";
+import { join as join4 } from "path";
 function getHomeDir() {
   const override = process.env.CURSOR_ACP_HOME_DIR;
   if (override && override.length > 0) {
@@ -500,18 +546,18 @@ async function pollForAuthFile(timeoutMs = AUTH_POLL_TIMEOUT, intervalMs = AUTH_
       const elapsed = Date.now() - startTime;
       for (const authPath of possiblePaths) {
         if (existsSync3(authPath)) {
-          log.debug("Auth file detected", { path: authPath });
+          log2.debug("Auth file detected", { path: authPath });
           resolve2(true);
           return;
         }
       }
-      log.debug("Polling for auth file", {
+      log2.debug("Polling for auth file", {
         checkedPaths: possiblePaths,
         elapsed: `${elapsed}ms`,
         timeout: `${timeoutMs}ms`
       });
       if (elapsed >= timeoutMs) {
-        log.debug("Auth file polling timed out");
+        log2.debug("Auth file polling timed out");
         resolve2(false);
         return;
       }
@@ -522,9 +568,10 @@ async function pollForAuthFile(timeoutMs = AUTH_POLL_TIMEOUT, intervalMs = AUTH_
 }
 async function startCursorOAuth() {
   return new Promise((resolve2, reject) => {
-    log.info("Starting cursor-cli login process");
-    const proc = spawn("cursor-agent", ["login"], {
-      stdio: ["pipe", "pipe", "pipe"]
+    log2.info("Starting cursor-cli login process");
+    const proc = spawn(resolveCursorAgentBinary(), ["login"], {
+      stdio: ["pipe", "pipe", "pipe"],
+      shell: process.platform === "win32"
     });
     let stdout = "";
     let stderr = "";
@@ -548,9 +595,9 @@ async function startCursorOAuth() {
       const url = extractUrl();
       if (url && !urlExtracted) {
         urlExtracted = true;
-        log.debug("Captured stdout", { length: stdout.length });
-        log.debug("Extracted URL", { url: url.substring(0, 50) + "..." });
-        log.info("Got login URL, waiting for browser auth");
+        log2.debug("Captured stdout", { length: stdout.length });
+        log2.debug("Extracted URL", { url: url.substring(0, 50) + "..." });
+        log2.info("Got login URL, waiting for browser auth");
         resolve2({
           url,
           instructions: "Click 'Continue with Cursor' in your browser to authenticate",
@@ -564,26 +611,26 @@ async function startCursorOAuth() {
                 }
               };
               proc.on("close", async (code) => {
-                log.debug("Login process closed", { code });
+                log2.debug("Login process closed", { code });
                 if (code === 0) {
-                  log.info("Process exited successfully, polling for auth file...");
+                  log2.info("Process exited successfully, polling for auth file...");
                   const isAuthenticated = await pollForAuthFile();
                   if (isAuthenticated) {
-                    log.info("Authentication successful");
+                    log2.info("Authentication successful");
                     resolveOnce({
                       type: "success",
                       provider: "cursor-acp",
                       key: "cursor-auth"
                     });
                   } else {
-                    log.warn("Auth file not found after polling");
+                    log2.warn("Auth file not found after polling");
                     resolveOnce({
                       type: "failed",
                       error: "Authentication was not completed. Please try again."
                     });
                   }
                 } else {
-                  log.warn("Login process failed", { code });
+                  log2.warn("Login process failed", { code });
                   resolveOnce({
                     type: "failed",
                     error: stderr ? stripAnsi(stderr) : `Authentication failed with code ${code}`
@@ -591,7 +638,7 @@ async function startCursorOAuth() {
                 }
               });
               setTimeout(() => {
-                log.warn("Authentication timed out after 5 minutes");
+                log2.warn("Authentication timed out after 5 minutes");
                 proc.kill();
                 resolveOnce({
                   type: "failed",
@@ -611,7 +658,7 @@ async function startCursorOAuth() {
       if (elapsed >= URL_EXTRACTION_TIMEOUT) {
         proc.kill();
         const errorMsg = stderr ? stripAnsi(stderr) : "No login URL received within timeout";
-        log.error("Failed to extract login URL", { error: errorMsg, elapsed: `${elapsed}ms` });
+        log2.error("Failed to extract login URL", { error: errorMsg, elapsed: `${elapsed}ms` });
         reject(new Error(`Failed to get login URL: ${errorMsg}`));
         return;
       }
@@ -627,11 +674,11 @@ function verifyCursorAuth() {
   const possiblePaths = getPossibleAuthPaths();
   for (const authPath of possiblePaths) {
     if (existsSync3(authPath)) {
-      log.debug("Auth file found", { path: authPath });
+      log2.debug("Auth file found", { path: authPath });
       return true;
     }
   }
-  log.debug("No auth file found", { checkedPaths: possiblePaths });
+  log2.debug("No auth file found", { checkedPaths: possiblePaths });
   return false;
 }
 function getPossibleAuthPaths() {
@@ -641,23 +688,23 @@ function getPossibleAuthPaths() {
   const authFiles = ["cli-config.json", "auth.json"];
   if (isDarwin) {
     for (const file of authFiles) {
-      paths.push(join3(home, ".cursor", file));
+      paths.push(join4(home, ".cursor", file));
     }
     for (const file of authFiles) {
-      paths.push(join3(home, ".config", "cursor", file));
+      paths.push(join4(home, ".config", "cursor", file));
     }
   } else {
     for (const file of authFiles) {
-      paths.push(join3(home, ".config", "cursor", file));
+      paths.push(join4(home, ".config", "cursor", file));
     }
     const xdgConfig = process.env.XDG_CONFIG_HOME;
-    if (xdgConfig && xdgConfig !== join3(home, ".config")) {
+    if (xdgConfig && xdgConfig !== join4(home, ".config")) {
       for (const file of authFiles) {
-        paths.push(join3(xdgConfig, "cursor", file));
+        paths.push(join4(xdgConfig, "cursor", file));
       }
     }
     for (const file of authFiles) {
-      paths.push(join3(home, ".cursor", file));
+      paths.push(join4(home, ".cursor", file));
     }
   }
   return paths;
@@ -671,10 +718,11 @@ function getAuthFilePath() {
   }
   return possiblePaths[0];
 }
-var log, AUTH_POLL_INTERVAL = 2000, AUTH_POLL_TIMEOUT, URL_EXTRACTION_TIMEOUT = 1e4;
+var log2, AUTH_POLL_INTERVAL = 2000, AUTH_POLL_TIMEOUT, URL_EXTRACTION_TIMEOUT = 1e4;
 var init_auth = __esm(() => {
   init_logger();
-  log = createLogger("auth");
+  init_binary();
+  log2 = createLogger("auth");
   AUTH_POLL_TIMEOUT = 5 * 60 * 1000;
 });
 
@@ -721,7 +769,7 @@ var hasTextContent = (event) => event.message.content.some((content) => content.
     return true;
   }
   return event.type === "assistant" && hasThinkingContent(event);
-}, isToolCall = (event) => event.type === "tool_call", extractText = (event) => event.message.content.filter((content) => content.type === "text").map((content) => content.text).join(""), extractThinking = (event) => {
+}, isToolCall = (event) => event.type === "tool_call", isResult = (event) => event.type === "result", extractText = (event) => event.message.content.filter((content) => content.type === "text").map((content) => content.text).join(""), extractThinking = (event) => {
   if (event.type === "thinking") {
     return event.text ?? "";
   }
@@ -870,7 +918,7 @@ var createChunk = (id, created, model, delta) => ({
 var init_openai_sse = () => {};
 
 // src/streaming/parser.ts
-var log2, parseStreamJsonLine = (line) => {
+var log3, parseStreamJsonLine = (line) => {
   const trimmed = line.trim();
   if (!trimmed) {
     return null;
@@ -882,15 +930,82 @@ var log2, parseStreamJsonLine = (line) => {
     }
     return parsed;
   } catch {
-    log2.debug("Failed to parse NDJSON line", { line: trimmed.substring(0, 100) });
+    log3.debug("Failed to parse NDJSON line", { line: trimmed.substring(0, 100) });
     return null;
   }
 };
 var init_parser = __esm(() => {
   init_logger();
-  log2 = createLogger("streaming:parser");
+  log3 = createLogger("streaming:parser");
 });
 
+// src/usage.ts
+function readTokenCount(value) {
+  if (typeof value !== "number" || !Number.isFinite(value) || value < 0) {
+    return 0;
+  }
+  return Math.floor(value);
+}
+function readOptionalCost(value) {
+  if (typeof value !== "number" || !Number.isFinite(value) || value < 0) {
+    return;
+  }
+  return value;
+}
+function normalizeCursorUsage(value) {
+  if (!value || typeof value !== "object") {
+    return;
+  }
+  const usage = value;
+  const metrics = {
+    inputTokens: readTokenCount(usage.inputTokens ?? usage.input_tokens ?? usage.prompt_tokens),
+    outputTokens: readTokenCount(usage.outputTokens ?? usage.output_tokens ?? usage.completion_tokens),
+    reasoningTokens: readTokenCount(usage.reasoningTokens ?? usage.reasoning_tokens),
+    cacheReadTokens: readTokenCount(usage.cacheReadTokens ?? usage.cache_read_tokens),
+    cacheWriteTokens: readTokenCount(usage.cacheWriteTokens ?? usage.cache_write_tokens)
+  };
+  const cost = readOptionalCost(usage.cost ?? usage.totalCost ?? usage.total_cost);
+  if (cost !== undefined) {
+    metrics.cost = cost;
+  }
+  const hasUsage = metrics.inputTokens > 0 || metrics.outputTokens > 0 || metrics.reasoningTokens > 0 || metrics.cacheReadTokens > 0 || metrics.cacheWriteTokens > 0 || cost !== undefined;
+  return hasUsage ? metrics : undefined;
+}
+function createOpenAiUsage(metrics) {
+  const promptTokens = metrics.inputTokens + metrics.cacheReadTokens + metrics.cacheWriteTokens;
+  const totalTokens = promptTokens + metrics.outputTokens + metrics.reasoningTokens;
+  const usage = {
+    prompt_tokens: promptTokens,
+    completion_tokens: metrics.outputTokens,
+    total_tokens: totalTokens,
+    prompt_tokens_details: {
+      cached_tokens: metrics.cacheReadTokens,
+      cache_write_tokens: metrics.cacheWriteTokens
+    },
+    completion_tokens_details: {
+      reasoning_tokens: metrics.reasoningTokens
+    }
+  };
+  if (metrics.cost !== undefined) {
+    usage.cost = metrics.cost;
+  }
+  return usage;
+}
+function extractOpenAiUsageFromResult(event) {
+  const metrics = normalizeCursorUsage(event.usage);
+  return metrics ? createOpenAiUsage(metrics) : undefined;
+}
+function createChatCompletionUsageChunk(id, created, model, usage) {
+  return {
+    id,
+    object: "chat.completion.chunk",
+    created,
+    model,
+    choices: [],
+    usage
+  };
+}
+
 // src/utils/perf.ts
 class RequestPerf {
   markers = [];
@@ -911,7 +1026,7 @@ class RequestPerf {
       phases[this.markers[i].name] = this.markers[i].ts - this.markers[i - 1].ts;
     }
     const total = this.markers[this.markers.length - 1].ts - start;
-    log3.debug("Request timing", { requestId: this.requestId, total, phases });
+    log4.debug("Request timing", { requestId: this.requestId, total, phases });
   }
   elapsed() {
     return this.markers.length > 0 ? Date.now() - this.markers[0].ts : 0;
@@ -920,16 +1035,16 @@ class RequestPerf {
     return this.markers;
   }
 }
-var log3;
+var log4;
 var init_perf = __esm(() => {
   init_logger();
-  log3 = createLogger("perf");
+  log4 = createLogger("perf");
 });
 
 // src/proxy/prompt-builder.ts
 import { appendFileSync as appendFileSync2, existsSync as existsSync4, mkdirSync as mkdirSync2 } from "node:fs";
 import { homedir as homedir4 } from "node:os";
-import { join as join4 } from "node:path";
+import { join as join5 } from "node:path";
 function ensureLogDir2() {
   try {
     if (!existsSync4(DEBUG_LOG_DIR)) {
@@ -945,7 +1060,7 @@ function debugLogToFile(message, data) {
 `;
     appendFileSync2(DEBUG_LOG_FILE, logLine);
   } catch (err) {
-    log4.debug(message, data);
+    log5.debug(message, data);
   }
 }
 function buildPromptFromMessages(messages, tools, subagentNames = []) {
@@ -1066,12 +1181,12 @@ ${toolDescs}`);
   });
   return finalPrompt;
 }
-var log4, DEBUG_LOG_DIR, DEBUG_LOG_FILE;
+var log5, DEBUG_LOG_DIR, DEBUG_LOG_FILE;
 var init_prompt_builder = __esm(() => {
   init_logger();
-  log4 = createLogger("proxy:prompt-builder");
-  DEBUG_LOG_DIR = join4(homedir4(), ".config", "opencode", "logs");
-  DEBUG_LOG_FILE = join4(DEBUG_LOG_DIR, "tool-loop-debug.log");
+  log5 = createLogger("proxy:prompt-builder");
+  DEBUG_LOG_DIR = join5(homedir4(), ".config", "opencode", "logs");
+  DEBUG_LOG_FILE = join5(DEBUG_LOG_DIR, "tool-loop-debug.log");
 });
 
 // src/proxy/tool-loop.ts
@@ -1099,7 +1214,7 @@ function extractOpenAiToolCall(event, allowedToolNames) {
   const resolvedName = resolveAllowedToolName(name, allowedToolNames);
   if (resolvedName) {
     if (args === undefined && event.subtype === "started") {
-      log5.debug("Tool call args extraction returned undefined", {
+      log6.debug("Tool call args extraction returned undefined", {
         toolName: name,
         subtype: event.subtype ?? "none",
         payloadKeys: Object.entries(event.tool_call || {}).map(([k, v]) => `${k}:[${isRecord(v) ? Object.keys(v).join(",") : typeof v}]`),
@@ -1119,7 +1234,7 @@ function extractOpenAiToolCall(event, allowedToolNames) {
       }
     };
   }
-  log5.debug("Tool call not in allowlist; passing through to cursor-agent", {
+  log6.debug("Tool call not in allowlist; passing through to cursor-agent", {
     name,
     normalized: normalizeAliasKey(name),
     allowedToolCount: allowedToolNames.size
@@ -1268,10 +1383,10 @@ function toOpenAiArguments(args) {
 function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-var log5, TOOL_NAME_ALIASES;
+var log6, TOOL_NAME_ALIASES;
 var init_tool_loop = __esm(() => {
   init_logger();
-  log5 = createLogger("proxy:tool-loop");
+  log6 = createLogger("proxy:tool-loop");
   TOOL_NAME_ALIASES = new Map([
     ["runcommand", "bash"],
     ["executecommand", "bash"],
@@ -1385,7 +1500,7 @@ class OpenCodeToolDiscovery {
         const mcpTools = await this.tryListMcpTools();
         tools = tools.concat(mcpTools);
       } catch (err) {
-        log6.debug("SDK tool.list failed, will try CLI", { error: String(err) });
+        log7.debug("SDK tool.list failed, will try CLI", { error: String(err) });
       }
     }
     if (tools.length === 0 && this.executorPref !== "sdk") {
@@ -1397,10 +1512,10 @@ class OpenCodeToolDiscovery {
         if (parsed?.data?.tools?.length) {
           tools = parsed.data.tools.map((t) => this.normalize(t, "cli"));
         } else {
-          log6.debug("CLI tool list failed", { status: res.status, stderr: res.stderr });
+          log7.debug("CLI tool list failed", { status: res.status, stderr: res.stderr });
         }
       } catch (err) {
-        log6.debug("CLI tool list error", { error: String(err) });
+        log7.debug("CLI tool list error", { error: String(err) });
       }
     }
     const map = new Map;
@@ -1436,7 +1551,7 @@ class OpenCodeToolDiscovery {
         return [];
       return mcpList.data.tools.map((t) => this.normalize(t, "mcp"));
     } catch (err) {
-      log6.debug("MCP tool discovery skipped", { error: String(err) });
+      log7.debug("MCP tool discovery skipped", { error: String(err) });
       return [];
     }
   }
@@ -1457,11 +1572,11 @@ class OpenCodeToolDiscovery {
     return null;
   }
 }
-var log6;
+var log7;
 var init_discovery = __esm(() => {
   init_logger();
   init_strip_ansi();
-  log6 = createLogger("tools:discovery");
+  log7 = createLogger("tools:discovery");
 });
 
 // src/tools/schema.ts
@@ -1518,10 +1633,10 @@ function describeTool(t) {
   const base = t.description || "OpenCode tool";
   return base.length > 400 ? base.slice(0, 400) : base;
 }
-var log7;
+var log8;
 var init_schema = __esm(() => {
   init_logger();
-  log7 = createLogger("tools:schema");
+  log8 = createLogger("tools:schema");
 });
 
 // src/tools/router.ts
@@ -1546,18 +1661,18 @@ class ToolRouter {
     }
     const tool = this.ctx.toolsByName.get(name);
     if (!tool) {
-      log8.warn("Unknown tool call", { name });
+      log9.warn("Unknown tool call", { name });
       return this.buildResult(meta, callId, name, { status: "error", error: `Unknown tool ${name}` });
     }
     const args = this.extractArgs(event);
-    log8.debug("Executing tool", { name, toolId: tool.id });
+    log9.debug("Executing tool", { name, toolId: tool.id });
     const t0 = Date.now();
     const result = await this.ctx.execute(tool.id, args);
     const elapsed = Date.now() - t0;
     if (result.status === "error") {
-      log8.warn("Tool execution returned error", { name, error: result.error, elapsed });
+      log9.warn("Tool execution returned error", { name, error: result.error, elapsed });
     } else {
-      log8.debug("Tool execution completed", { name, toolId: tool.id, elapsed });
+      log9.debug("Tool execution completed", { name, toolId: tool.id, elapsed });
     }
     return this.buildResult(meta, callId, name, result);
   }
@@ -1606,10 +1721,10 @@ class ToolRouter {
     };
   }
 }
-var log8;
+var log9;
 var init_router = __esm(() => {
   init_logger();
-  log8 = createLogger("tools:router");
+  log9 = createLogger("tools:router");
 });
 
 // src/tools/skills/loader.ts
@@ -1710,9 +1825,9 @@ function parseCursorModelsOutput(output) {
   return models;
 }
 function discoverModelsFromCursorAgent() {
-  const raw = execFileSync("cursor-agent", ["models"], {
+  const raw = execFileSync(resolveCursorAgentBinary(), ["models"], {
     encoding: "utf8",
-    killSignal: "SIGTERM",
+    ...process.platform !== "win32" && { killSignal: "SIGTERM" },
     stdio: ["ignore", "pipe", "pipe"],
     timeout: MODEL_DISCOVERY_TIMEOUT_MS
   });
@@ -1747,7 +1862,9 @@ function fallbackModels() {
   ];
 }
 var MODEL_DISCOVERY_TIMEOUT_MS = 5000;
-var init_model_discovery = () => {};
+var init_model_discovery = __esm(() => {
+  init_binary();
+});
 
 // src/models/sync.ts
 import {
@@ -1838,18 +1955,18 @@ async function autoRefreshModels(deps = {}) {
     resolvedDeps.log.debug("Model auto-refresh failed", { error: String(err) });
   }
 }
-var log9, PROVIDER_ID = "cursor-acp", defaultDeps;
+var log10, PROVIDER_ID = "cursor-acp", defaultDeps;
 var init_sync = __esm(() => {
   init_model_discovery();
   init_plugin_toggle();
   init_logger();
-  log9 = createLogger("model-sync");
+  log10 = createLogger("model-sync");
   defaultDeps = {
     defer: () => Promise.resolve(),
     discoverModels: discoverModelsFromCursorAgent,
     env: process.env,
     existsSync: nodeExistsSync,
-    log: log9,
+    log: log10,
     readFileSync: nodeReadFileSync,
     writeFileSync: nodeWriteFileSync
   };
@@ -1910,7 +2027,7 @@ function readMcpConfigs(deps = {}) {
         timeout: typeof e.timeout === "number" ? e.timeout : undefined
       });
     } else {
-      log10.debug("Skipping unrecognised MCP config entry", { name, type: e.type });
+      log11.debug("Skipping unrecognised MCP config entry", { name, type: e.type });
     }
   }
   return configs;
@@ -1954,11 +2071,11 @@ function readSubagentNames(deps = {}) {
 function isStringRecord(v) {
   return typeof v === "object" && v !== null && !Array.isArray(v);
 }
-var log10;
+var log11;
 var init_config = __esm(() => {
   init_plugin_toggle();
   init_logger();
-  log10 = createLogger("mcp:config");
+  log11 = createLogger("mcp:config");
 });
 
 // node_modules/@modelcontextprotocol/sdk/dist/esm/server/zod-compat.js
@@ -8095,11 +8212,11 @@ var require_core = __commonJS((exports) => {
   Ajv.ValidationError = validation_error_1.default;
   Ajv.MissingRefError = ref_error_1.default;
   exports.default = Ajv;
-  function checkOptions(checkOpts, options, msg, log11 = "error") {
+  function checkOptions(checkOpts, options, msg, log12 = "error") {
     for (const key in checkOpts) {
       const opt = key;
       if (opt in options)
-        this.logger[log11](`${msg}: option ${key}. ${checkOpts[opt]}`);
+        this.logger[log12](`${msg}: option ${key}. ${checkOpts[opt]}`);
     }
   }
   function getSchEnv(keyRef) {
@@ -11716,14 +11833,14 @@ class McpClientManager {
   }
   async connectServer(config) {
     if (this.connections.has(config.name)) {
-      log11.debug("Server already connected, skipping", { server: config.name });
+      log12.debug("Server already connected, skipping", { server: config.name });
       return;
     }
     if (!this.deps) {
       try {
         this.deps = await loadDefaultDeps();
       } catch (err) {
-        log11.warn("Failed to load MCP SDK", { error: String(err) });
+        log12.warn("Failed to load MCP SDK", { error: String(err) });
         return;
       }
     }
@@ -11734,7 +11851,7 @@ class McpClientManager {
       const transport = deps.createTransport(config);
       await client.connect(transport);
     } catch (err) {
-      log11.warn("MCP server connection failed", {
+      log12.warn("MCP server connection failed", {
         server: config.name,
         error: String(err)
       });
@@ -11744,12 +11861,12 @@ class McpClientManager {
     try {
       const result = await client.listTools();
       tools = result?.tools ?? [];
-      log11.info("MCP server connected", {
+      log12.info("MCP server connected", {
         server: config.name,
         tools: tools.length
       });
     } catch (err) {
-      log11.warn("MCP tool discovery failed", {
+      log12.warn("MCP tool discovery failed", {
         server: config.name,
         error: String(err)
       });
@@ -11781,7 +11898,7 @@ class McpClientManager {
       }
       return typeof result === "string" ? result : JSON.stringify(result);
     } catch (err) {
-      log11.warn("MCP tool call failed", {
+      log12.warn("MCP tool call failed", {
         server: serverName,
         tool: toolName,
         error: String(err?.message || err)
@@ -11793,9 +11910,9 @@ class McpClientManager {
     for (const [name, conn] of this.connections) {
       try {
         await conn.client.close();
-        log11.debug("MCP server disconnected", { server: name });
+        log12.debug("MCP server disconnected", { server: name });
       } catch (err) {
-        log11.debug("MCP server disconnect failed", { server: name, error: String(err) });
+        log12.debug("MCP server disconnect failed", { server: name, error: String(err) });
       }
     }
     this.connections.clear();
@@ -11804,10 +11921,10 @@ class McpClientManager {
     return Array.from(this.connections.keys());
   }
 }
-var log11, defaultDeps2 = null;
+var log12, defaultDeps2 = null;
 var init_client_manager = __esm(() => {
   init_logger();
-  log11 = createLogger("mcp:client-manager");
+  log12 = createLogger("mcp:client-manager");
 });
 
 // src/mcp/tool-bridge.ts
@@ -11818,7 +11935,7 @@ function buildMcpToolHookEntries(tools, manager) {
   for (const t of tools) {
     const hookName = namespaceMcpTool(t.serverName, t.name);
     if (entries[hookName]) {
-      log12.debug("Duplicate MCP tool name, skipping", { hookName });
+      log13.debug("Duplicate MCP tool name, skipping", { hookName });
       continue;
     }
     const zodArgs = mcpSchemaToZod(t.inputSchema, z2);
@@ -11828,7 +11945,7 @@ function buildMcpToolHookEntries(tools, manager) {
       description: t.description || `MCP tool: ${t.name} (server: ${t.serverName})`,
       args: zodArgs,
       async execute(args) {
-        log12.debug("Executing MCP tool", { server: serverName, tool: toolName });
+        log13.debug("Executing MCP tool", { server: serverName, tool: toolName });
         const result = await manager.callTool(serverName, toolName, args ?? {});
         if (result.startsWith("Error:")) {
           throw new Error(result);
@@ -11837,7 +11954,7 @@ function buildMcpToolHookEntries(tools, manager) {
       }
     });
   }
-  log12.debug("Built MCP tool hook entries", { count: Object.keys(entries).length });
+  log13.debug("Built MCP tool hook entries", { count: Object.keys(entries).length });
   return entries;
 }
 function buildMcpToolDefinitions(tools) {
@@ -11884,7 +12001,7 @@ function mcpSchemaToZod(inputSchema, z2) {
         zodType = z2.array(z2.any());
         break;
       case "object":
-        zodType = z2.record(z2.any());
+        zodType = z2.record(z2.string(), z2.any());
         break;
       default:
         zodType = z2.any();
@@ -11900,10 +12017,10 @@ function mcpSchemaToZod(inputSchema, z2) {
   }
   return shape;
 }
-var log12;
+var log13;
 var init_tool_bridge = __esm(() => {
   init_logger();
-  log12 = createLogger("mcp:tool-bridge");
+  log13 = createLogger("mcp:tool-bridge");
 });
 
 // node_modules/@opencode-ai/sdk/dist/gen/types.gen.js
@@ -13314,15 +13431,15 @@ class LocalExecutor {
       const out = await handler(args);
       return { status: "success", output: out };
     } catch (err) {
-      log13.warn("Local tool execution failed", { toolId, error: String(err?.message || err) });
+      log14.warn("Local tool execution failed", { toolId, error: String(err?.message || err) });
       return { status: "error", error: String(err?.message || err) };
     }
   }
 }
-var log13;
+var log14;
 var init_local = __esm(() => {
   init_logger();
-  log13 = createLogger("tools:executor:local");
+  log14 = createLogger("tools:executor:local");
 });
 
 // src/tools/executors/sdk.ts
@@ -13349,7 +13466,7 @@ class SdkExecutor {
       const out = typeof res === "string" ? res : JSON.stringify(res);
       return { status: "success", output: out };
     } catch (err) {
-      log14.warn("SDK tool execution failed", { toolId, error: String(err?.message || err) });
+      log15.warn("SDK tool execution failed", { toolId, error: String(err?.message || err) });
       return { status: "error", error: String(err?.message || err) };
     }
   }
@@ -13362,10 +13479,10 @@ class SdkExecutor {
     ]);
   }
 }
-var log14;
+var log15;
 var init_sdk = __esm(() => {
   init_logger();
-  log14 = createLogger("tools:executor:sdk");
+  log15 = createLogger("tools:executor:sdk");
 });
 
 // src/tools/executors/mcp.ts
@@ -13392,7 +13509,7 @@ class McpExecutor {
       const out = typeof res === "string" ? res : JSON.stringify(res);
       return { status: "success", output: out };
     } catch (err) {
-      log15.warn("MCP tool execution failed", { toolId, error: String(err?.message || err) });
+      log16.warn("MCP tool execution failed", { toolId, error: String(err?.message || err) });
       return { status: "error", error: String(err?.message || err) };
     }
   }
@@ -13405,10 +13522,10 @@ class McpExecutor {
     ]);
   }
 }
-var log15;
+var log16;
 var init_mcp = __esm(() => {
   init_logger();
-  log15 = createLogger("tools:executor:mcp");
+  log16 = createLogger("tools:executor:mcp");
 });
 
 // src/tools/core/executor.ts
@@ -13418,17 +13535,17 @@ async function executeWithChain(executors, toolId, args) {
       try {
         return await ex.execute(toolId, args);
       } catch (err) {
-        log16.warn("Executor threw unexpected error", { toolId, error: String(err?.message || err) });
+        log17.warn("Executor threw unexpected error", { toolId, error: String(err?.message || err) });
         return { status: "error", error: String(err?.message || err) };
       }
     }
   }
   return { status: "error", error: `No executor available for ${toolId}` };
 }
-var log16;
+var log17;
 var init_executor = __esm(() => {
   init_logger();
-  log16 = createLogger("tools:executor:chain");
+  log17 = createLogger("tools:executor:chain");
 });
 
 // src/tools/defaults.ts
@@ -13466,7 +13583,7 @@ function registerDefaultTools(registry) {
     const cwd = resolveWorkingDirectory(args);
     return new Promise((resolve2, reject) => {
       const proc = spawn3(command, {
-        shell: process.env.SHELL || "/bin/bash",
+        shell: resolveShellOption(),
         cwd
       });
       const stdoutChunks = [];
@@ -13672,6 +13789,9 @@ ${output}`);
     const pattern = args.pattern;
     const path2 = args.path;
     const include = args.include;
+    if (process.platform === "win32") {
+      return nodeFallbackGrep(pattern, path2, include);
+    }
     const grepArgs = ["-r", "-n"];
     if (include) {
       grepArgs.push(`--include=${include}`);
@@ -13764,6 +13884,9 @@ ${output}`);
     const path2 = resolvePathArg(args, "glob");
     const cwd = path2 || ".";
     const normalizedPattern = pattern.replace(/\\/g, "/");
+    if (process.platform === "win32") {
+      return nodeFallbackGlob(normalizedPattern, cwd);
+    }
     const isPathPattern = normalizedPattern.includes("/");
     const findArgs = [cwd, "-type", "f"];
     if (isPathPattern) {
@@ -13975,6 +14098,14 @@ function resolveTimeoutMs(value) {
     return 30000;
   return raw <= 600 ? raw * 1000 : raw;
 }
+function resolveShellOption(deps = {}) {
+  const platform2 = deps.platform ?? process.platform;
+  const env = deps.env ?? process.env;
+  if (platform2 === "win32") {
+    return env.ComSpec || env.COMSPEC || true;
+  }
+  return env.SHELL || "/bin/bash";
+}
 function resolveBoolean(value, defaultValue) {
   if (typeof value === "boolean") {
     return value;
@@ -14040,6 +14171,146 @@ function coerceToString(value) {
   }
   return null;
 }
+async function nodeFallbackGrep(pattern, searchPath, include) {
+  const fs2 = await import("fs/promises");
+  const path2 = await import("path");
+  let regex2;
+  try {
+    regex2 = new RegExp(pattern);
+  } catch {
+    return "Invalid regex pattern";
+  }
+  let includeRegex;
+  if (include) {
+    const incPattern = include.replace(/\./g, "\\.").replace(/\?/g, ".").replace(/\*/g, ".*");
+    includeRegex = new RegExp(`^${incPattern}$`);
+  }
+  const results = [];
+  async function walk(dir) {
+    if (results.length >= 100)
+      return;
+    let entries;
+    try {
+      entries = await fs2.readdir(dir, { withFileTypes: true });
+    } catch (err) {
+      if (err?.code !== "ENOENT" && err?.code !== "EACCES") {
+        fallbackLog.error("Unexpected error reading directory", { dir, code: err?.code, message: err?.message });
+      }
+      return;
+    }
+    for (const entry of entries) {
+      if (results.length >= 100)
+        return;
+      const fullPath = path2.join(dir, entry.name);
+      if (entry.isDirectory()) {
+        if (!FALLBACK_SKIP_DIRS.has(entry.name)) {
+          await walk(fullPath);
+        }
+      } else if (entry.isFile()) {
+        if (includeRegex && !includeRegex.test(entry.name))
+          continue;
+        let content;
+        try {
+          content = await fs2.readFile(fullPath, "utf-8");
+        } catch (err) {
+          if (err?.code !== "ENOENT" && err?.code !== "EACCES") {
+            fallbackLog.error("Unexpected error reading file", { path: fullPath, code: err?.code, message: err?.message });
+          }
+          continue;
+        }
+        const lines = content.split(`
+`);
+        for (let i = 0;i < lines.length; i++) {
+          if (regex2.test(lines[i])) {
+            results.push(`${fullPath}:${i + 1}:${lines[i]}`);
+            if (results.length >= 100)
+              break;
+          }
+        }
+      }
+    }
+  }
+  let stat;
+  try {
+    stat = await fs2.stat(searchPath);
+  } catch {
+    return "Path not found";
+  }
+  if (stat.isFile()) {
+    let content;
+    try {
+      content = await fs2.readFile(searchPath, "utf-8");
+    } catch (err) {
+      if (err?.code !== "ENOENT" && err?.code !== "EACCES") {
+        fallbackLog.error("Unexpected error reading file", { path: searchPath, code: err?.code, message: err?.message });
+      }
+      return "Path not found";
+    }
+    const lines = content.split(`
+`);
+    for (let i = 0;i < lines.length; i++) {
+      if (regex2.test(lines[i])) {
+        results.push(`${searchPath}:${i + 1}:${lines[i]}`);
+        if (results.length >= 100)
+          break;
+      }
+    }
+  } else {
+    await walk(searchPath);
+  }
+  return results.join(`
+`) || "No matches found";
+}
+async function nodeFallbackGlob(pattern, searchPath) {
+  const fs2 = await import("fs/promises");
+  const path2 = await import("path");
+  const results = [];
+  const isPathPattern = pattern.includes("/");
+  let regexPattern = pattern.replace(/\./g, "\\.").replace(/\*\*/g, "\x00").replace(/\*/g, "[^/]*").replace(/\x00/g, ".*");
+  let regex2;
+  try {
+    regex2 = isPathPattern ? new RegExp(`${regexPattern}$`) : new RegExp(`^${regexPattern}$`);
+  } catch {
+    return "No files found";
+  }
+  async function walk(dir) {
+    if (results.length >= 50)
+      return;
+    let entries;
+    try {
+      entries = await fs2.readdir(dir, { withFileTypes: true });
+    } catch (err) {
+      if (err?.code !== "ENOENT" && err?.code !== "EACCES") {
+        fallbackLog.error("Unexpected error reading directory", { dir, code: err?.code, message: err?.message });
+      }
+      return;
+    }
+    for (const entry of entries) {
+      if (results.length >= 50)
+        return;
+      const fullPath = path2.join(dir, entry.name);
+      if (entry.isDirectory()) {
+        if (!FALLBACK_SKIP_DIRS.has(entry.name)) {
+          await walk(fullPath);
+        }
+      } else if (entry.isFile()) {
+        const matchTarget = isPathPattern ? fullPath.replace(/\\/g, "/") : entry.name;
+        if (regex2.test(matchTarget)) {
+          results.push(fullPath);
+        }
+      }
+    }
+  }
+  await walk(searchPath);
+  return results.join(`
+`) || "No files found";
+}
+var FALLBACK_SKIP_DIRS, fallbackLog;
+var init_defaults = __esm(() => {
+  init_logger();
+  FALLBACK_SKIP_DIRS = new Set(["node_modules", ".git", "dist", "build"]);
+  fallbackLog = createLogger("tools:fallback");
+});
 
 // src/provider/boundary.ts
 function parseProviderBoundaryMode(value) {
@@ -14104,6 +14375,13 @@ function createSharedBoundary(providerId) {
       }
       return raw;
     },
+    resolveRuntimeModel(model, cursorModel) {
+      const rawCursorModel = typeof cursorModel === "string" ? cursorModel.trim() : "";
+      if (rawCursorModel.length > 0) {
+        return this.normalizeRuntimeModel(rawCursorModel);
+      }
+      return this.normalizeRuntimeModel(model);
+    },
     applyChatParamDefaults(output, proxyBaseURL, defaultBaseURL, defaultApiKey) {
       output.options = output.options || {};
       output.options.baseURL = proxyBaseURL || defaultBaseURL;
@@ -14544,7 +14822,7 @@ async function handleToolLoopEventLegacy(options) {
   const extraction = toolLoopMode === "opencode" ? extractOpenAiToolCall(event, allowedToolNames) : { action: "skip", skipReason: "tool_loop_mode_not_opencode" };
   if (extraction.action === "passthrough") {
     passThroughTracker?.trackTool(extraction.passthroughName);
-    log17.debug("MCP tool passed through to cursor-agent (legacy)", {
+    log18.debug("MCP tool passed through to cursor-agent (legacy)", {
       tool: extraction.passthroughName
     });
     return { intercepted: false, skipConverter: false };
@@ -14568,7 +14846,7 @@ async function handleToolLoopEventLegacy(options) {
   if (interceptedToolCall) {
     const compat = applyToolSchemaCompat(interceptedToolCall, toolSchemaMap);
     let normalizedToolCall = compat.toolCall;
-    log17.debug("Applied tool schema compatibility (legacy)", {
+    log18.debug("Applied tool schema compatibility (legacy)", {
       tool: normalizedToolCall.function.name,
       originalArgKeys: compat.originalArgKeys,
       normalizedArgKeys: compat.normalizedArgKeys,
@@ -14580,7 +14858,7 @@ async function handleToolLoopEventLegacy(options) {
       if (validationTermination) {
         if (validationTermination.soft) {
           const hintChunk = createLoopGuardHintChunk(responseMeta, normalizedToolCall, validationTermination);
-          log17.debug("Soft-blocking schema validation loop guard in legacy (emitting hint)", {
+          log18.debug("Soft-blocking schema validation loop guard in legacy (emitting hint)", {
             tool: normalizedToolCall.function.name,
             fingerprint: validationTermination.fingerprint
           });
@@ -14591,7 +14869,7 @@ async function handleToolLoopEventLegacy(options) {
       }
       const reroutedWrite = tryRerouteEditToWrite(normalizedToolCall, compat.normalizedArgs, allowedToolNames, toolSchemaMap);
       if (reroutedWrite) {
-        log17.debug("Rerouting malformed edit call to write (legacy)", {
+        log18.debug("Rerouting malformed edit call to write (legacy)", {
           path: reroutedWrite.path,
           missing: compat.validation.missing,
           typeErrors: compat.validation.typeErrors
@@ -14599,7 +14877,7 @@ async function handleToolLoopEventLegacy(options) {
         normalizedToolCall = reroutedWrite.toolCall;
       } else if (shouldEmitNonFatalSchemaValidationHint(normalizedToolCall, compat.validation)) {
         const hintChunk = createNonFatalSchemaValidationHintChunk(responseMeta, normalizedToolCall, compat.validation);
-        log17.debug("Emitting non-fatal schema validation hint in legacy and skipping malformed tool execution", {
+        log18.debug("Emitting non-fatal schema validation hint in legacy and skipping malformed tool execution", {
           tool: normalizedToolCall.function.name,
           missing: compat.validation.missing,
           typeErrors: compat.validation.typeErrors
@@ -14612,7 +14890,7 @@ async function handleToolLoopEventLegacy(options) {
     if (termination) {
       if (termination.soft) {
         const hintChunk = createLoopGuardHintChunk(responseMeta, normalizedToolCall, termination);
-        log17.debug("Soft-blocking tool loop guard in legacy (emitting hint)", {
+        log18.debug("Soft-blocking tool loop guard in legacy (emitting hint)", {
           tool: normalizedToolCall.function.name,
           fingerprint: termination.fingerprint
         });
@@ -14670,7 +14948,7 @@ async function handleToolLoopEventV1(options) {
   }
   if (extraction.action === "passthrough") {
     passThroughTracker?.trackTool(extraction.passthroughName);
-    log17.debug("MCP tool passed through to cursor-agent (v1)", {
+    log18.debug("MCP tool passed through to cursor-agent (v1)", {
       tool: extraction.passthroughName
     });
     return { intercepted: false, skipConverter: false };
@@ -14697,7 +14975,7 @@ async function handleToolLoopEventV1(options) {
     rawArgs: safeArgTypeSummary(event),
     normalizedArgs: compat.normalizedArgs
   } : undefined;
-  log17.debug("Applied tool schema compatibility", {
+  log18.debug("Applied tool schema compatibility", {
     tool: normalizedToolCall.function.name,
     originalArgKeys: compat.originalArgKeys,
     normalizedArgKeys: compat.normalizedArgKeys,
@@ -14706,7 +14984,7 @@ async function handleToolLoopEventV1(options) {
     ...editDiag ? { editDiag } : {}
   });
   if (compat.validation.hasSchema && !compat.validation.ok) {
-    log17.debug("Tool schema compatibility validation failed", {
+    log18.debug("Tool schema compatibility validation failed", {
       tool: normalizedToolCall.function.name,
       missing: compat.validation.missing,
       unexpected: compat.validation.unexpected,
@@ -14717,7 +14995,7 @@ async function handleToolLoopEventV1(options) {
     if (validationTermination) {
       if (validationTermination.soft) {
         const hintChunk = createLoopGuardHintChunk(responseMeta, normalizedToolCall, validationTermination);
-        log17.debug("Soft-blocking schema validation loop guard (emitting hint)", {
+        log18.debug("Soft-blocking schema validation loop guard (emitting hint)", {
           tool: normalizedToolCall.function.name,
           fingerprint: validationTermination.fingerprint,
           repeatCount: validationTermination.repeatCount
@@ -14731,7 +15009,7 @@ async function handleToolLoopEventV1(options) {
     if (termination2) {
       if (termination2.soft) {
         const hintChunk = createLoopGuardHintChunk(responseMeta, normalizedToolCall, termination2);
-        log17.debug("Soft-blocking tool loop guard in validation path (emitting hint)", {
+        log18.debug("Soft-blocking tool loop guard in validation path (emitting hint)", {
           tool: normalizedToolCall.function.name,
           fingerprint: termination2.fingerprint,
           repeatCount: termination2.repeatCount
@@ -14743,7 +15021,7 @@ async function handleToolLoopEventV1(options) {
     }
     const reroutedWrite = tryRerouteEditToWrite(normalizedToolCall, compat.normalizedArgs, allowedToolNames, toolSchemaMap);
     if (reroutedWrite) {
-      log17.debug("Rerouting malformed edit call to write", {
+      log18.debug("Rerouting malformed edit call to write", {
         path: reroutedWrite.path,
         missing: compat.validation.missing,
         typeErrors: compat.validation.typeErrors
@@ -14763,7 +15041,7 @@ async function handleToolLoopEventV1(options) {
     }
     if (schemaValidationFailureMode === "pass_through" && shouldEmitNonFatalSchemaValidationHint(normalizedToolCall, compat.validation)) {
       const hintChunk = createNonFatalSchemaValidationHintChunk(responseMeta, normalizedToolCall, compat.validation);
-      log17.debug("Emitting non-fatal schema validation hint and skipping malformed tool execution", {
+      log18.debug("Emitting non-fatal schema validation hint and skipping malformed tool execution", {
         tool: normalizedToolCall.function.name,
         missing: compat.validation.missing,
         typeErrors: compat.validation.typeErrors
@@ -14781,7 +15059,7 @@ async function handleToolLoopEventV1(options) {
         terminate: createSchemaValidationTermination(normalizedToolCall, compat.validation)
       };
     }
-    log17.debug("Forwarding schema-invalid tool call to OpenCode loop", {
+    log18.debug("Forwarding schema-invalid tool call to OpenCode loop", {
       tool: normalizedToolCall.function.name,
       repairHint: compat.validation.repairHint
     });
@@ -14795,7 +15073,7 @@ async function handleToolLoopEventV1(options) {
   if (termination) {
     if (termination.soft) {
       const hintChunk = createLoopGuardHintChunk(responseMeta, normalizedToolCall, termination);
-      log17.debug("Soft-blocking tool loop guard (emitting hint)", {
+      log18.debug("Soft-blocking tool loop guard (emitting hint)", {
         tool: normalizedToolCall.function.name,
         fingerprint: termination.fingerprint,
         repeatCount: termination.repeatCount
@@ -14854,7 +15132,7 @@ function evaluateToolLoopGuard(toolLoopGuard, toolCall) {
   if (!decision.triggered) {
     return null;
   }
-  log17.debug("Tool loop guard triggered", {
+  log18.debug("Tool loop guard triggered", {
     tool: toolCall.function.name,
     fingerprint: decision.fingerprint,
     repeatCount: decision.repeatCount,
@@ -14916,7 +15194,7 @@ function evaluateSchemaValidationLoopGuard(toolLoopGuard, toolCall, validation)
     return null;
   }
   const isFirstTrigger = decision.repeatCount === decision.maxRepeat + 1;
-  log17.debug("Tool loop guard triggered on schema validation", {
+  log18.debug("Tool loop guard triggered on schema validation", {
     tool: toolCall.function.name,
     fingerprint: decision.fingerprint,
     repeatCount: decision.repeatCount,
@@ -15096,12 +15374,12 @@ function tryRerouteEditToWrite(toolCall, normalizedArgs, allowedToolNames, toolS
 function isRecord4(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-var log17, ToolBoundaryExtractionError;
+var log18, ToolBoundaryExtractionError;
 var init_runtime_interception = __esm(() => {
   init_tool_loop();
   init_logger();
   init_tool_schema_compat();
-  log17 = createLogger("provider:runtime-interception");
+  log18 = createLogger("provider:runtime-interception");
   ToolBoundaryExtractionError = class ToolBoundaryExtractionError extends Error {
     cause;
     constructor(message, cause) {
@@ -15143,7 +15421,7 @@ class ToastService {
   }
   async show(options) {
     if (!this.client?.tui?.showToast) {
-      log18.debug("Toast not available; client.tui.showToast missing", { message: options.message });
+      log19.debug("Toast not available; client.tui.showToast missing", { message: options.message });
       return;
     }
     try {
@@ -15155,7 +15433,7 @@ class ToastService {
         }
       });
     } catch (error) {
-      log18.debug("Toast failed", { error, message: options.message });
+      log19.debug("Toast failed", { error, message: options.message });
     }
   }
   async showPassThroughSummary(tools) {
@@ -15179,10 +15457,10 @@ class ToastService {
     });
   }
 }
-var log18, toastService;
+var log19, toastService;
 var init_toast_service = __esm(() => {
   init_logger();
-  log18 = createLogger("services:toast");
+  log19 = createLogger("services:toast");
   toastService = new ToastService;
 });
 
@@ -15631,9 +15909,12 @@ var init_tool_loop_guard = __esm(() => {
 var exports_plugin = {};
 __export(exports_plugin, {
   shouldProcessModel: () => shouldProcessModel,
+  resolveWorkspaceDirectory: () => resolveWorkspaceDirectory,
   resolveChatParamTools: () => resolveChatParamTools,
   normalizeWorkspaceForCompare: () => normalizeWorkspaceForCompare,
+  isRootPath: () => isRootPath,
   isReusableProxyHealthPayload: () => isReusableProxyHealthPayload,
+  extractCompletionFromStream: () => extractCompletionFromStream,
   ensurePluginDirectory: () => ensurePluginDirectory,
   default: () => plugin_default,
   buildAvailableToolsSystemMessage: () => buildAvailableToolsSystemMessage,
@@ -15643,7 +15924,7 @@ import { tool as tool2 } from "@opencode-ai/plugin";
 import { appendFileSync as appendFileSync3, existsSync as existsSync5, realpathSync } from "fs";
 import { mkdir } from "fs/promises";
 import { homedir as homedir5 } from "os";
-import { isAbsolute, join as join5, relative, resolve as resolve2 } from "path";
+import { isAbsolute, join as join6, relative, resolve as resolve2 } from "path";
 function ensureDebugLogDir() {
   try {
     if (!existsSync5(DEBUG_LOG_DIR2)) {
@@ -15703,13 +15984,13 @@ function buildAvailableToolsSystemMessage(lastToolNames, lastToolMap, mcpToolDef
 `) : null;
 }
 async function ensurePluginDirectory() {
-  const configHome = process.env.XDG_CONFIG_HOME ? resolve2(process.env.XDG_CONFIG_HOME) : join5(homedir5(), ".config");
-  const pluginDir = join5(configHome, "opencode", "plugin");
+  const configHome = process.env.XDG_CONFIG_HOME ? resolve2(process.env.XDG_CONFIG_HOME) : join6(homedir5(), ".config");
+  const pluginDir = join6(configHome, "opencode", "plugin");
   try {
     await mkdir(pluginDir, { recursive: true });
-    log19.debug("Plugin directory ensured", { path: pluginDir });
+    log20.debug("Plugin directory ensured", { path: pluginDir });
   } catch (error) {
-    log19.warn("Failed to create plugin directory", { error: String(error) });
+    log20.warn("Failed to create plugin directory", { error: String(error) });
   }
 }
 function shouldProcessModel(model) {
@@ -15721,8 +16002,8 @@ function getGlobalKey() {
   return "__opencode_cursor_proxy_server__";
 }
 function getOpenCodeConfigPrefix() {
-  const configHome = process.env.XDG_CONFIG_HOME ? resolve2(process.env.XDG_CONFIG_HOME) : join5(homedir5(), ".config");
-  return join5(configHome, "opencode");
+  const configHome = process.env.XDG_CONFIG_HOME ? resolve2(process.env.XDG_CONFIG_HOME) : join6(homedir5(), ".config");
+  return join6(configHome, "opencode");
 }
 function canonicalizePathForCompare(pathValue) {
   const resolvedPath = resolve2(pathValue);
@@ -15732,7 +16013,7 @@ function canonicalizePathForCompare(pathValue) {
   } catch {
     normalizedPath = resolvedPath;
   }
-  if (process.platform === "darwin") {
+  if (process.platform === "darwin" || process.platform === "win32") {
     return normalizedPath.toLowerCase();
   }
   return normalizedPath;
@@ -15755,32 +16036,62 @@ function isNonConfigPath(pathValue) {
   }
   return !isWithinPath(getOpenCodeConfigPrefix(), pathValue);
 }
-function resolveWorkspaceDirectory(worktree, directory) {
-  const envWorkspace = process.env.CURSOR_ACP_WORKSPACE?.trim();
-  if (envWorkspace) {
-    return resolve2(envWorkspace);
+function isRootPath(pathValue) {
+  if (!pathValue) {
+    return false;
   }
-  const envProjectDir = process.env.OPENCODE_CURSOR_PROJECT_DIR?.trim();
-  if (envProjectDir) {
-    return resolve2(envProjectDir);
+  const resolved = resolve2(pathValue);
+  if (resolved === "/") {
+    return true;
   }
+  return /^[A-Za-z]:[\\/]?$/.test(resolved);
+}
+function isAcceptableWorkspace(pathValue, configPrefix) {
+  if (!pathValue) {
+    return false;
+  }
+  if (isRootPath(pathValue)) {
+    return false;
+  }
+  if (isWithinPath(configPrefix, pathValue)) {
+    return false;
+  }
+  return true;
+}
+function resolveWorkspaceDirectory(worktree, directory) {
   const configPrefix = getOpenCodeConfigPrefix();
+  const envWorkspace = resolveCandidate(process.env.CURSOR_ACP_WORKSPACE);
+  if (envWorkspace && !isRootPath(envWorkspace)) {
+    return envWorkspace;
+  }
+  const envProjectDir = resolveCandidate(process.env.OPENCODE_CURSOR_PROJECT_DIR);
+  if (envProjectDir && !isRootPath(envProjectDir)) {
+    return envProjectDir;
+  }
   const worktreeCandidate = resolveCandidate(worktree);
-  if (worktreeCandidate && !isWithinPath(configPrefix, worktreeCandidate)) {
+  if (isAcceptableWorkspace(worktreeCandidate, configPrefix)) {
     return worktreeCandidate;
   }
   const dirCandidate = resolveCandidate(directory);
-  if (dirCandidate && !isWithinPath(configPrefix, dirCandidate)) {
+  if (isAcceptableWorkspace(dirCandidate, configPrefix)) {
     return dirCandidate;
   }
   const cwd = resolve2(process.cwd());
-  if (cwd && !isWithinPath(configPrefix, cwd)) {
+  if (isAcceptableWorkspace(cwd, configPrefix)) {
     return cwd;
   }
-  return dirCandidate || cwd || configPrefix;
+  const home = resolveCandidate(homedir5());
+  if (home && !isRootPath(home)) {
+    return home;
+  }
+  return configPrefix;
 }
 function normalizeWorkspaceForCompare(pathValue) {
-  return resolve2(pathValue);
+  const resolved = resolve2(pathValue);
+  if (process.platform === "darwin" || process.platform === "win32") {
+    return resolved.toLowerCase();
+  }
+  return resolved;
 }
 function isReusableProxyHealthPayload(payload, workspaceDirectory) {
   if (!payload || payload.ok !== true) {
@@ -15801,7 +16112,7 @@ function parseToolLoopMode(value) {
 function resolveChatParamTools(mode, existingTools, refreshedTools) {
   return PROVIDER_BOUNDARY.resolveChatParamTools(mode, existingTools, refreshedTools);
 }
-function createChatCompletionResponse(model, content, reasoningContent) {
+function createChatCompletionResponse(model, content, reasoningContent, usage) {
   const message = {
     role: "assistant",
     content
@@ -15809,7 +16120,7 @@ function createChatCompletionResponse(model, content, reasoningContent) {
   if (reasoningContent && reasoningContent.length > 0) {
     message.reasoning_content = reasoningContent;
   }
-  return {
+  const response = {
     id: `cursor-acp-${Date.now()}`,
     object: "chat.completion",
     created: Math.floor(Date.now() / 1000),
@@ -15822,6 +16133,10 @@ function createChatCompletionResponse(model, content, reasoningContent) {
       }
     ]
   };
+  if (usage) {
+    response.usage = usage;
+  }
+  return response;
 }
 function createChatCompletionChunk(id, created, model, deltaContent, done = false) {
   return {
@@ -15843,7 +16158,9 @@ function extractCompletionFromStream(output) {
 `);
   let assistantText = "";
   let reasoningText = "";
+  let usage;
   let sawAssistantPartials = false;
+  let sawThinkingPartials = false;
   for (const line of lines) {
     const event = parseStreamJsonLine(line);
     if (!event) {
@@ -15864,11 +16181,20 @@ function extractCompletionFromStream(output) {
     if (isThinking(event)) {
       const thinking = extractThinking(event);
       if (thinking) {
-        reasoningText += thinking;
+        const isPartial = typeof event.timestamp_ms === "number";
+        if (isPartial) {
+          reasoningText += thinking;
+          sawThinkingPartials = true;
+        } else if (!sawThinkingPartials) {
+          reasoningText = thinking;
+        }
       }
     }
+    if (isResult(event)) {
+      usage = extractOpenAiUsageFromResult(event) ?? usage;
+    }
   }
-  return { assistantText, reasoningText };
+  return { assistantText, reasoningText, usage };
 }
 function formatToolUpdateEvent(update) {
   return `event: tool_update
@@ -15897,9 +16223,9 @@ function createBoundaryRuntimeContext(scope) {
       error: toErrorMessage(error)
     };
     if (!fallbackActive) {
-      log19.warn("Provider boundary v1 failed; switching to legacy for this request", details);
+      log20.warn("Provider boundary v1 failed; switching to legacy for this request", details);
     } else {
-      log19.debug("Provider boundary fallback already active", details);
+      log20.debug("Provider boundary fallback already active", details);
     }
     fallbackActive = true;
     return true;
@@ -16012,7 +16338,7 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
       if (url.pathname === "/v1/models" || url.pathname === "/models") {
         try {
           const bunAny2 = globalThis;
-          const proc = bunAny2.Bun.spawn(["cursor-agent", "models"], {
+          const proc = bunAny2.Bun.spawn([resolveCursorAgentBinary(), "models"], {
             stdout: "pipe",
             stderr: "pipe"
           });
@@ -16037,7 +16363,7 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
             headers: { "Content-Type": "application/json" }
           });
         } catch (err) {
-          log19.error("Failed to list models", { error: String(err) });
+          log20.error("Failed to list models", { error: String(err) });
           return new Response(JSON.stringify({ error: "Failed to fetch models from cursor-agent" }), {
             status: 500,
             headers: { "Content-Type": "application/json" }
@@ -16050,13 +16376,14 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
           headers: { "Content-Type": "application/json" }
         });
       }
-      log19.debug("Proxy request (bun)", { method: req.method, path: url.pathname });
+      log20.debug("Proxy request (bun)", { method: req.method, path: url.pathname });
       const body = await req.json().catch(() => ({}));
       const messages = Array.isArray(body?.messages) ? body.messages : [];
       const stream = body?.stream === true;
       const tools = Array.isArray(body?.tools) ? body.tools : [];
       debugLogToFile2("raw_request_body", {
         model: body?.model,
+        cursorModel: body?.cursorModel,
         stream,
         toolCount: tools.length,
         toolNames: tools.map((t) => t?.function?.name ?? t?.name ?? "unknown"),
@@ -16071,14 +16398,14 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
       const boundaryContext = createBoundaryRuntimeContext("bun-handler");
       const subagentNames = readSubagentNames();
       const prompt = buildPromptFromMessages(messages, tools, subagentNames);
-      const model = boundaryContext.run("normalizeRuntimeModel", (boundary) => boundary.normalizeRuntimeModel(body?.model));
+      const model = boundaryContext.run("resolveRuntimeModel", (boundary) => boundary.resolveRuntimeModel(body?.model, body?.cursorModel));
       const msgSummaryBun = messages.map((m, i) => {
         const role = m?.role ?? "?";
         const hasTc = Array.isArray(m?.tool_calls) ? m.tool_calls.length : 0;
         const clen = typeof m?.content === "string" ? m.content.length : Array.isArray(m?.content) ? `arr${m.content.length}` : typeof m?.content;
         return `${i}:${role}${hasTc ? `(tc:${hasTc})` : ""}(clen:${clen})`;
       });
-      log19.debug("Proxy chat request (bun)", {
+      log20.debug("Proxy chat request (bun)", {
         stream,
         model,
         messages: messages.length,
@@ -16094,7 +16421,7 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
         });
       }
       const cmd = [
-        "cursor-agent",
+        resolveCursorAgentBinary(),
         "--print",
         "--output-format",
         "stream-json",
@@ -16124,7 +16451,7 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
         const stdout = (stdoutText || "").trim();
         const stderr = (stderrText || "").trim();
         const exitCode = await child.exited;
-        log19.debug("cursor-agent completed (bun non-stream)", {
+        log20.debug("cursor-agent completed (bun non-stream)", {
           exitCode,
           stdoutChars: stdout.length,
           stderrChars: stderr.length
@@ -16150,7 +16477,7 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
           });
         }
         if (intercepted.toolCall) {
-          log19.debug("Intercepted OpenCode tool call (non-stream)", {
+          log20.debug("Intercepted OpenCode tool call (non-stream)", {
             name: intercepted.toolCall.function.name,
             callId: intercepted.toolCall.id
           });
@@ -16164,7 +16491,7 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
           const errSource = stderr || stdout || `cursor-agent exited with code ${String(exitCode ?? "unknown")} and no output`;
           const parsed = parseAgentError(errSource);
           const userError = formatErrorForUser(parsed);
-          log19.error("cursor-cli failed", {
+          log20.error("cursor-cli failed", {
             type: parsed.type,
             message: parsed.message,
             code: exitCode
@@ -16176,7 +16503,7 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
           });
         }
         const completion = extractCompletionFromStream(stdout);
-        const payload = createChatCompletionResponse(model, completion.assistantText || stdout || stderr, completion.reasoningText || undefined);
+        const payload = createChatCompletionResponse(model, completion.assistantText || stdout || stderr, completion.reasoningText || undefined, completion.usage);
         return new Response(JSON.stringify(payload), {
           status: 200,
           headers: { "Content-Type": "application/json" }
@@ -16194,12 +16521,13 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
         async start(controller) {
           let streamTerminated = false;
           let firstTokenReceived = false;
+          let usage;
           try {
             const reader = child.stdout.getReader();
             const converter = new StreamToSseConverter(model, { id, created });
             const lineBuffer = new LineBuffer;
             const emitToolCallAndTerminate = (toolCall) => {
-              log19.debug("Intercepted OpenCode tool call (stream)", {
+              log20.debug("Intercepted OpenCode tool call (stream)", {
                 name: toolCall.function.name,
                 callId: toolCall.id
               });
@@ -16248,6 +16576,9 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
                 if (!event) {
                   continue;
                 }
+                if (isResult(event)) {
+                  usage = extractOpenAiUsageFromResult(event) ?? usage;
+                }
                 if (event.type === "tool_call") {
                   perf.mark("tool-call");
                   const result = await handleToolLoopEventWithFallback({
@@ -16316,6 +16647,9 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
               if (!event) {
                 continue;
               }
+              if (isResult(event)) {
+                usage = extractOpenAiUsageFromResult(event) ?? usage;
+              }
               if (event.type === "tool_call") {
                 const result = await handleToolLoopEventWithFallback({
                   event,
@@ -16381,7 +16715,7 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
               const errSource = (stderrText || "").trim() || `cursor-agent exited with code ${String(exitCode ?? "unknown")} and no output`;
               const parsed = parseAgentError(errSource);
               const msg = formatErrorForUser(parsed);
-              log19.error("cursor-cli streaming failed", {
+              log20.error("cursor-cli streaming failed", {
                 type: parsed.type,
                 code: exitCode
               });
@@ -16392,7 +16726,7 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
               controller.enqueue(encoder.encode(formatSseDone()));
               return;
             }
-            log19.debug("cursor-agent completed (bun stream)", {
+            log20.debug("cursor-agent completed (bun stream)", {
               exitCode
             });
             const passThroughSummary = passThroughTracker.getSummary();
@@ -16406,6 +16740,12 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
             controller.enqueue(encoder.encode(`data: ${JSON.stringify(doneChunk)}
 
 `));
+            if (usage) {
+              const usageChunk = createChatCompletionUsageChunk(id, created, model, usage);
+              controller.enqueue(encoder.encode(`data: ${JSON.stringify(usageChunk)}
+
+`));
+            }
             controller.enqueue(encoder.encode(formatSseDone()));
           } finally {
             perf.mark("request:done");
@@ -16455,8 +16795,8 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
       }
       if (url.pathname === "/v1/models" || url.pathname === "/models") {
         try {
-          const { execSync } = await import("child_process");
-          const output = execSync("cursor-agent models", { encoding: "utf-8", timeout: 30000 });
+          const { execFileSync: execFileSync2 } = await import("child_process");
+          const output = execFileSync2(resolveCursorAgentBinary(), ["models"], { encoding: "utf-8", timeout: 30000 });
           const clean = stripAnsi(output);
           const models = [];
           for (const line of clean.split(`
@@ -16474,7 +16814,7 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
           res.writeHead(200, { "Content-Type": "application/json" });
           res.end(JSON.stringify({ object: "list", data: models }));
         } catch (err) {
-          log19.error("Failed to list models", { error: String(err) });
+          log20.error("Failed to list models", { error: String(err) });
           res.writeHead(500, { "Content-Type": "application/json" });
           res.end(JSON.stringify({ error: "Failed to fetch models" }));
         }
@@ -16485,7 +16825,7 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
         res.end(JSON.stringify({ error: `Unsupported path: ${url.pathname}` }));
         return;
       }
-      log19.debug("Proxy request (node)", { method: req.method, path: url.pathname });
+      log20.debug("Proxy request (node)", { method: req.method, path: url.pathname });
       let body = "";
       for await (const chunk of req) {
         body += chunk;
@@ -16500,7 +16840,7 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
       const boundaryContext = createBoundaryRuntimeContext("node-handler");
       const subagentNames = readSubagentNames();
       const prompt = buildPromptFromMessages(messages, tools, subagentNames);
-      const model = boundaryContext.run("normalizeRuntimeModel", (boundary) => boundary.normalizeRuntimeModel(bodyData?.model));
+      const model = boundaryContext.run("resolveRuntimeModel", (boundary) => boundary.resolveRuntimeModel(bodyData?.model, bodyData?.cursorModel));
       const msgSummary = messages.map((m, i) => {
         const role = m?.role ?? "?";
         const hasTc = Array.isArray(m?.tool_calls) ? m.tool_calls.length : 0;
@@ -16509,7 +16849,7 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
         const contentLen = typeof m?.content === "string" ? m.content.length : Array.isArray(m?.content) ? `arr${m.content.length}` : typeof m?.content;
         return `${i}:${role}${hasTc ? `(tc:${hasTc})` : ""}${role === "tool" ? `(tcid:${tcId},name:${tcName},clen:${contentLen})` : `(clen:${contentLen})`}`;
       });
-      log19.debug("Proxy chat request (node)", {
+      log20.debug("Proxy chat request (node)", {
         stream,
         model,
         messages: messages.length,
@@ -16518,7 +16858,7 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
         msgRoles: msgSummary.join(",")
       });
       const cmd = [
-        "cursor-agent",
+        resolveCursorAgentBinary(),
         "--print",
         "--output-format",
         "stream-json",
@@ -16531,7 +16871,10 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
       if (FORCE_TOOL_MODE) {
         cmd.push("--force");
       }
-      const child = spawn3(cmd[0], cmd.slice(1), { stdio: ["pipe", "pipe", "pipe"] });
+      const child = spawn3(cmd[0], cmd.slice(1), {
+        stdio: ["pipe", "pipe", "pipe"],
+        shell: process.platform === "win32"
+      });
       child.stdin.write(prompt);
       child.stdin.end();
       if (!stream) {
@@ -16540,14 +16883,14 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
         let spawnErrorText = null;
         child.on("error", (error) => {
           spawnErrorText = String(error?.message || error);
-          log19.error("Failed to spawn cursor-agent", { error: spawnErrorText, model });
+          log20.error("Failed to spawn cursor-agent", { error: spawnErrorText, model });
         });
         child.stdout.on("data", (chunk) => stdoutChunks.push(chunk));
         child.stderr.on("data", (chunk) => stderrChunks.push(chunk));
         child.on("close", async (code) => {
           const stdout = Buffer.concat(stdoutChunks).toString().trim();
           const stderr = Buffer.concat(stderrChunks).toString().trim();
-          log19.debug("cursor-agent completed (node non-stream)", {
+          log20.debug("cursor-agent completed (node non-stream)", {
             code,
             stdoutChars: stdout.length,
             stderrChars: stderr.length,
@@ -16573,7 +16916,7 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
             return;
           }
           if (intercepted.toolCall) {
-            log19.debug("Intercepted OpenCode tool call (non-stream)", {
+            log20.debug("Intercepted OpenCode tool call (non-stream)", {
               name: intercepted.toolCall.function.name,
               callId: intercepted.toolCall.id
             });
@@ -16587,7 +16930,7 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
             const errSource = stderr || stdout || spawnErrorText || `cursor-agent exited with code ${String(code ?? "unknown")} and no output`;
             const parsed = parseAgentError(errSource);
             const userError = formatErrorForUser(parsed);
-            log19.error("cursor-cli failed", {
+            log20.error("cursor-cli failed", {
               type: parsed.type,
               message: parsed.message,
               code
@@ -16597,7 +16940,7 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
             res.end(JSON.stringify(errorResponse));
             return;
           }
-          const response = createChatCompletionResponse(model, completion.assistantText || stdout || stderr, completion.reasoningText || undefined);
+          const response = createChatCompletionResponse(model, completion.assistantText || stdout || stderr, completion.reasoningText || undefined, completion.usage);
           res.writeHead(200, { "Content-Type": "application/json" });
           res.end(JSON.stringify(response));
         });
@@ -16619,6 +16962,7 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
         const stderrChunks = [];
         let streamTerminated = false;
         let firstTokenReceived = false;
+        let usage;
         child.stderr.on("data", (chunk) => {
           stderrChunks.push(Buffer.from(chunk));
         });
@@ -16627,7 +16971,7 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
             return;
           }
           const errSource = String(error?.message || error);
-          log19.error("Failed to spawn cursor-agent (stream)", { error: errSource, model });
+          log20.error("Failed to spawn cursor-agent (stream)", { error: errSource, model });
           const parsed = parseAgentError(errSource);
           const msg = formatErrorForUser(parsed);
           const errChunk = createChatCompletionChunk(id, created, model, msg, true);
@@ -16642,7 +16986,7 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
           if (streamTerminated || res.writableEnded) {
             return;
           }
-          log19.debug("Intercepted OpenCode tool call (stream)", {
+          log20.debug("Intercepted OpenCode tool call (stream)", {
             name: toolCall.function.name,
             callId: toolCall.id
           });
@@ -16690,6 +17034,9 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
             if (!event) {
               continue;
             }
+            if (isResult(event)) {
+              usage = extractOpenAiUsageFromResult(event) ?? usage;
+            }
             if (event.type === "tool_call") {
               perf.mark("tool-call");
               const result = await handleToolLoopEventWithFallback({
@@ -16762,6 +17109,9 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
             if (!event) {
               continue;
             }
+            if (isResult(event)) {
+              usage = extractOpenAiUsageFromResult(event) ?? usage;
+            }
             if (event.type === "tool_call") {
               const result = await handleToolLoopEventWithFallback({
                 event,
@@ -16826,7 +17176,7 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
           perf.mark("request:done");
           perf.summarize();
           const stderrText = Buffer.concat(stderrChunks).toString().trim();
-          log19.debug("cursor-agent completed (node stream)", {
+          log20.debug("cursor-agent completed (node stream)", {
             code,
             stderrChars: stderrText.length
           });
@@ -16866,6 +17216,12 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
           res.write(`data: ${JSON.stringify(doneChunk)}
 
 `);
+          if (usage) {
+            const usageChunk = createChatCompletionUsageChunk(id, created, model, usage);
+            res.write(`data: ${JSON.stringify(usageChunk)}
+
+`);
+          }
           res.write(formatSseDone());
           res.end();
         });
@@ -16943,7 +17299,7 @@ function jsonSchemaToZod(jsonSchema) {
         }
         break;
       case "object":
-        zodType = z2.record(z2.any());
+        zodType = z2.record(z2.string(), z2.any());
         if (p.description) {
           zodType = zodType.describe(p.description);
         }
@@ -17054,7 +17410,7 @@ function buildToolHookEntries(registry, fallbackBaseDir) {
           const normalizedArgs = applyToolContextDefaults(toolName, args, context, fallbackBaseDir, sessionWorkspaceBySession);
           return await handler(normalizedArgs);
         } catch (error) {
-          log19.debug("Tool hook execution failed", { tool: toolName, error: String(error?.message || error) });
+          log20.debug("Tool hook execution failed", { tool: toolName, error: String(error?.message || error) });
           throw error;
         }
       }
@@ -17066,9 +17422,9 @@ function buildToolHookEntries(registry, fallbackBaseDir) {
   }
   return entries;
 }
-var log19, DEBUG_LOG_DIR2, DEBUG_LOG_FILE2, CURSOR_PROVIDER_ID2 = "cursor-acp", CURSOR_PROVIDER_PREFIX, CURSOR_PROXY_HOST = "127.0.0.1", CURSOR_PROXY_DEFAULT_PORT = 32124, CURSOR_PROXY_DEFAULT_BASE_URL, REUSE_EXISTING_PROXY, SESSION_WORKSPACE_CACHE_LIMIT = 200, FORCE_TOOL_MODE, EMIT_TOOL_UPDATES, FORWARD_TOOL_CALLS, TOOL_LOOP_MODE_RAW, TOOL_LOOP_MODE, TOOL_LOOP_MODE_VALID, PROVIDER_BOUNDARY_MODE_RAW, PROVIDER_BOUNDARY_MODE, PROVIDER_BOUNDARY_MODE_VALID, LEGACY_PROVIDER_BOUNDARY, PROVIDER_BOUNDARY, ENABLE_PROVIDER_BOUNDARY_AUTOFALLBACK, TOOL_LOOP_MAX_REPEAT_RAW, TOOL_LOOP_MAX_REPEAT, TOOL_LOOP_MAX_REPEAT_VALID, PROXY_EXECUTE_TOOL_CALLS, SUPPRESS_CONVERTER_TOOL_EVENTS, SHOULD_EMIT_TOOL_UPDATES, CursorPlugin = async ({ $, directory, worktree, client: client3, serverUrl }) => {
+var log20, DEBUG_LOG_DIR2, DEBUG_LOG_FILE2, CURSOR_PROVIDER_ID2 = "cursor-acp", CURSOR_PROVIDER_PREFIX, CURSOR_PROXY_HOST = "127.0.0.1", CURSOR_PROXY_DEFAULT_PORT = 32124, CURSOR_PROXY_DEFAULT_BASE_URL, REUSE_EXISTING_PROXY, SESSION_WORKSPACE_CACHE_LIMIT = 200, FORCE_TOOL_MODE, EMIT_TOOL_UPDATES, FORWARD_TOOL_CALLS, TOOL_LOOP_MODE_RAW, TOOL_LOOP_MODE, TOOL_LOOP_MODE_VALID, PROVIDER_BOUNDARY_MODE_RAW, PROVIDER_BOUNDARY_MODE, PROVIDER_BOUNDARY_MODE_VALID, LEGACY_PROVIDER_BOUNDARY, PROVIDER_BOUNDARY, ENABLE_PROVIDER_BOUNDARY_AUTOFALLBACK, TOOL_LOOP_MAX_REPEAT_RAW, TOOL_LOOP_MAX_REPEAT, TOOL_LOOP_MAX_REPEAT_VALID, PROXY_EXECUTE_TOOL_CALLS, SUPPRESS_CONVERTER_TOOL_EVENTS, SHOULD_EMIT_TOOL_UPDATES, CursorPlugin = async ({ $, directory, worktree, client: client3, serverUrl }) => {
   const workspaceDirectory = resolveWorkspaceDirectory(worktree, directory);
-  log19.debug("Plugin initializing", {
+  log20.debug("Plugin initializing", {
     directory,
     worktree,
     workspaceDirectory,
@@ -17076,22 +17432,22 @@ var log19, DEBUG_LOG_DIR2, DEBUG_LOG_FILE2, CURSOR_PROVIDER_ID2 = "cursor-acp",
     serverUrl: serverUrl?.toString()
   });
   if (!TOOL_LOOP_MODE_VALID) {
-    log19.warn("Invalid CURSOR_ACP_TOOL_LOOP_MODE; defaulting to opencode", { value: TOOL_LOOP_MODE_RAW });
+    log20.warn("Invalid CURSOR_ACP_TOOL_LOOP_MODE; defaulting to opencode", { value: TOOL_LOOP_MODE_RAW });
   }
   if (!PROVIDER_BOUNDARY_MODE_VALID) {
-    log19.warn("Invalid CURSOR_ACP_PROVIDER_BOUNDARY; defaulting to v1", {
+    log20.warn("Invalid CURSOR_ACP_PROVIDER_BOUNDARY; defaulting to v1", {
       value: PROVIDER_BOUNDARY_MODE_RAW
     });
   }
   if (!TOOL_LOOP_MAX_REPEAT_VALID) {
-    log19.warn("Invalid CURSOR_ACP_TOOL_LOOP_MAX_REPEAT; defaulting to 3", {
+    log20.warn("Invalid CURSOR_ACP_TOOL_LOOP_MAX_REPEAT; defaulting to 3", {
       value: TOOL_LOOP_MAX_REPEAT_RAW
     });
   }
   if (ENABLE_PROVIDER_BOUNDARY_AUTOFALLBACK && PROVIDER_BOUNDARY.mode !== "v1") {
-    log19.debug("Provider boundary auto-fallback is enabled but inactive unless mode=v1");
+    log20.debug("Provider boundary auto-fallback is enabled but inactive unless mode=v1");
   }
-  log19.info("Tool loop mode configured", {
+  log20.info("Tool loop mode configured", {
     mode: TOOL_LOOP_MODE,
     providerBoundary: PROVIDER_BOUNDARY.mode,
     proxyExecToolCalls: PROXY_EXECUTE_TOOL_CALLS,
@@ -17109,13 +17465,13 @@ var log19, DEBUG_LOG_DIR2, DEBUG_LOG_FILE2, CURSOR_PROVIDER_ID2 = "cursor-acp",
     try {
       const configs = readMcpConfigs();
       if (configs.length === 0) {
-        log19.debug("No MCP servers configured, skipping MCP bridge");
+        log20.debug("No MCP servers configured, skipping MCP bridge");
       } else {
-        log19.debug("MCP bridge: connecting to servers", { count: configs.length });
+        log20.debug("MCP bridge: connecting to servers", { count: configs.length });
         await Promise.allSettled(configs.map((c) => mcpManager.connectServer(c)));
         const tools = mcpManager.listTools();
         if (tools.length === 0) {
-          log19.debug("MCP bridge: no tools discovered");
+          log20.debug("MCP bridge: no tools discovered");
         } else {
           mcpToolEntries = buildMcpToolHookEntries(tools, mcpManager);
           mcpToolDefs = buildMcpToolDefinitions(tools);
@@ -17125,23 +17481,23 @@ var log19, DEBUG_LOG_DIR2, DEBUG_LOG_FILE2, CURSOR_PROVIDER_ID2 = "cursor-acp",
             description: t.description,
             params: t.inputSchema ? Object.keys(t.inputSchema.properties ?? {}) : undefined
           }));
-          log19.info("MCP bridge: registered tools", {
+          log20.info("MCP bridge: registered tools", {
             servers: mcpManager.connectedServers.length,
             tools: Object.keys(mcpToolEntries).length
           });
         }
       }
     } catch (err) {
-      log19.debug("MCP bridge init failed", { error: String(err) });
+      log20.debug("MCP bridge init failed", { error: String(err) });
     }
   }
   toastService.setClient(client3);
   const toolsEnabled = process.env.CURSOR_ACP_ENABLE_OPENCODE_TOOLS !== "false";
   const legacyProxyToolPathsEnabled = toolsEnabled && TOOL_LOOP_MODE === "proxy-exec";
   if (toolsEnabled && TOOL_LOOP_MODE === "opencode") {
-    log19.debug("OpenCode mode active; skipping legacy SDK/MCP discovery and proxy-side tool execution");
+    log20.debug("OpenCode mode active; skipping legacy SDK/MCP discovery and proxy-side tool execution");
   } else if (toolsEnabled && TOOL_LOOP_MODE === "off") {
-    log19.debug("Tool loop mode off; proxy-side tool execution disabled");
+    log20.debug("Tool loop mode off; proxy-side tool execution disabled");
   }
   const serverClient = legacyProxyToolPathsEnabled ? createOpencodeClient({ baseUrl: serverUrl.toString(), directory: workspaceDirectory }) : null;
   const discovery = legacyProxyToolPathsEnabled ? new OpenCodeToolDiscovery(serverClient ?? client3) : null;
@@ -17193,7 +17549,7 @@ var log19, DEBUG_LOG_DIR2, DEBUG_LOG_FILE2, CURSOR_PROVIDER_ID2 = "cursor-acp",
         discoveredList = await discovery.listTools();
         discoveredList.forEach((t) => toolsByName.set(t.name, t));
       } catch (err) {
-        log19.debug("Tool discovery failed, using local tools only", { error: String(err) });
+        log20.debug("Tool discovery failed, using local tools only", { error: String(err) });
       }
     }
     const allTools = [...localTools, ...discoveredList];
@@ -17223,11 +17579,11 @@ var log19, DEBUG_LOG_DIR2, DEBUG_LOG_FILE2, CURSOR_PROVIDER_ID2 = "cursor-acp",
     }
     lastToolNames = toolEntries.map((e) => e.function.name);
     lastToolMap = allTools.map((t) => ({ id: t.id, name: t.name }));
-    log19.debug("Tools refreshed", { local: localTools.length, discovered: discoveredList.length, total: toolEntries.length });
+    log20.debug("Tools refreshed", { local: localTools.length, discovered: discoveredList.length, total: toolEntries.length });
     return toolEntries;
   }
   const proxyBaseURL = await ensureCursorProxyServer(workspaceDirectory, router);
-  log19.debug("Proxy server started", { baseURL: proxyBaseURL });
+  log20.debug("Proxy server started", { baseURL: proxyBaseURL });
   const toolHookEntries = buildToolHookEntries(localRegistry, workspaceDirectory);
   return {
     tool: { ...toolHookEntries, ...mcpToolEntries },
@@ -17242,9 +17598,9 @@ var log19, DEBUG_LOG_DIR2, DEBUG_LOG_FILE2, CURSOR_PROVIDER_ID2 = "cursor-acp",
           type: "oauth",
           async authorize() {
             try {
-              log19.info("Starting OAuth flow");
+              log20.info("Starting OAuth flow");
               const { url, instructions, callback } = await startCursorOAuth();
-              log19.debug("Got OAuth URL", { url: url.substring(0, 50) + "..." });
+              log20.debug("Got OAuth URL", { url: url.substring(0, 50) + "..." });
               return {
                 url,
                 instructions,
@@ -17252,7 +17608,7 @@ var log19, DEBUG_LOG_DIR2, DEBUG_LOG_FILE2, CURSOR_PROVIDER_ID2 = "cursor-acp",
                 callback
               };
             } catch (error) {
-              log19.error("OAuth error", { error });
+              log20.error("OAuth error", { error });
               throw error;
             }
           }
@@ -17276,10 +17632,10 @@ var log19, DEBUG_LOG_DIR2, DEBUG_LOG_FILE2, CURSOR_PROVIDER_ID2 = "cursor-acp",
             output.options.tools = resolved.tools;
           } else if (resolved.action === "preserve") {
             const count = Array.isArray(existingTools) ? existingTools.length : 0;
-            log19.debug("Using OpenCode-provided tools from chat.params", { count });
+            log20.debug("Using OpenCode-provided tools from chat.params", { count });
           }
         } catch (err) {
-          log19.debug("Failed to refresh tools", { error: String(err) });
+          log20.debug("Failed to refresh tools", { error: String(err) });
         }
       }
       if (mcpToolDefs.length > 0) {
@@ -17290,7 +17646,7 @@ var log19, DEBUG_LOG_DIR2, DEBUG_LOG_FILE2, CURSOR_PROVIDER_ID2 = "cursor-acp",
           output.options.tools = mcpToolDefs;
         }
         const afterTools = Array.isArray(output.options.tools) ? output.options.tools : [];
-        log19.debug("Injected MCP tool definitions into chat.params", {
+        log20.debug("Injected MCP tool definitions into chat.params", {
           injectedCount: mcpToolDefs.length,
           beforeCount: beforeTools.length,
           afterCount: afterTools.length,
@@ -17331,14 +17687,16 @@ var init_plugin = __esm(() => {
   init_sdk();
   init_mcp();
   init_executor();
+  init_defaults();
   init_boundary();
   init_runtime_interception();
   init_toast_service();
   init_tool_schema_compat();
   init_tool_loop_guard();
-  log19 = createLogger("plugin");
-  DEBUG_LOG_DIR2 = join5(homedir5(), ".config", "opencode", "logs");
-  DEBUG_LOG_FILE2 = join5(DEBUG_LOG_DIR2, "tool-loop-debug.log");
+  init_binary();
+  log20 = createLogger("plugin");
+  DEBUG_LOG_DIR2 = join6(homedir5(), ".config", "opencode", "logs");
+  DEBUG_LOG_FILE2 = join6(DEBUG_LOG_DIR2, "tool-loop-debug.log");
   CURSOR_PROVIDER_PREFIX = `${CURSOR_PROVIDER_ID2}/`;
   CURSOR_PROXY_DEFAULT_BASE_URL = `http://${CURSOR_PROXY_HOST}:${CURSOR_PROXY_DEFAULT_PORT}/v1`;
   REUSE_EXISTING_PROXY = process.env.CURSOR_ACP_REUSE_EXISTING_PROXY !== "false";
@@ -17371,11 +17729,11 @@ var init_plugin = __esm(() => {
 // src/plugin-entry.ts
 init_plugin_toggle();
 init_logger();
-var log20 = createLogger("plugin-entry");
+var log21 = createLogger("plugin-entry");
 var CursorPluginEntry = async (input) => {
   const state = shouldEnableCursorPlugin();
   if (!state.enabled) {
-    log20.info("Plugin disabled in OpenCode config; skipping initialization", {
+    log21.info("Plugin disabled in OpenCode config; skipping initialization", {
       configPath: state.configPath,
       reason: state.reason
     });