@rama_nigg/open-cursor 2.1.2 → 2.1.4

package/README.md

@@ -15,6 +15,8 @@ No prompt limits. No broken streams. Full thinking + tool support in Opencode. Y
 curl -fsSL https://raw.githubusercontent.com/Nomadcxx/opencode-cursor/main/install.sh | bash
 ```
 
+Note: if `npm` is available, `install.sh` installs/upgrades `@rama_nigg/open-cursor` and runs `open-cursor install`. Otherwise it falls back to building from source.
+
 **Option B: npm Package (Use when published)**
 
 Check whether the package is available on npm first:

package/dist/index.js

@@ -17478,6 +17478,31 @@ async function ensurePluginDirectory() {
 function getGlobalKey() {
   return "__opencode_cursor_proxy_server__";
 }
+function resolveWorkspaceDirectory(worktree, directory) {
+  const envWorkspace = process.env.CURSOR_ACP_WORKSPACE?.trim();
+  if (envWorkspace) {
+    return resolve(envWorkspace);
+  }
+  const envProjectDir = process.env.OPENCODE_CURSOR_PROJECT_DIR?.trim();
+  if (envProjectDir) {
+    return resolve(envProjectDir);
+  }
+  const configHome = process.env.XDG_CONFIG_HOME ? resolve(process.env.XDG_CONFIG_HOME) : join2(homedir2(), ".config");
+  const configPrefix = join2(configHome, "opencode");
+  const worktreeCandidate = worktree ? resolve(worktree) : "";
+  if (worktreeCandidate && !worktreeCandidate.startsWith(configPrefix)) {
+    return worktreeCandidate;
+  }
+  const dirCandidate = directory ? resolve(directory) : "";
+  if (dirCandidate && !dirCandidate.startsWith(configPrefix)) {
+    return dirCandidate;
+  }
+  const cwd = process.cwd();
+  if (cwd && !cwd.startsWith(configPrefix)) {
+    return cwd;
+  }
+  return dirCandidate || cwd || configPrefix;
+}
 function parseToolLoopMode(value) {
   const normalized = (value ?? "opencode").trim().toLowerCase();
   if (normalized === "opencode" || normalized === "proxy-exec" || normalized === "off") {
@@ -18559,14 +18584,19 @@ function jsonSchemaToZod(jsonSchema) {
   }
   return zodShape;
 }
-function resolveToolContextBaseDir(context) {
-  const candidates = [context?.worktree, context?.directory];
-  for (const candidate of candidates) {
-    if (typeof candidate === "string" && candidate.trim().length > 0) {
-      return candidate;
-    }
-  }
-  return null;
+function resolveToolContextBaseDir(context, fallbackBaseDir) {
+  const configHome = process.env.XDG_CONFIG_HOME ? resolve(process.env.XDG_CONFIG_HOME) : join2(homedir2(), ".config");
+  const configPrefix = join2(configHome, "opencode");
+  const worktree = typeof context?.worktree === "string" ? context.worktree.trim() : "";
+  if (worktree)
+    return worktree;
+  const directory = typeof context?.directory === "string" ? context.directory.trim() : "";
+  if (directory && !resolve(directory).startsWith(configPrefix))
+    return directory;
+  const fallback = typeof fallbackBaseDir === "string" ? fallbackBaseDir.trim() : "";
+  if (fallback)
+    return fallback;
+  return directory || null;
 }
 function toAbsoluteWithBase(value, baseDir) {
   if (typeof value !== "string") {
@@ -18578,8 +18608,8 @@ function toAbsoluteWithBase(value, baseDir) {
   }
   return resolve(baseDir, trimmed);
 }
-function applyToolContextDefaults(toolName, rawArgs, context) {
-  const baseDir = resolveToolContextBaseDir(context);
+function applyToolContextDefaults(toolName, rawArgs, context, fallbackBaseDir) {
+  const baseDir = resolveToolContextBaseDir(context, fallbackBaseDir);
   if (!baseDir) {
     return rawArgs;
   }
@@ -18606,7 +18636,7 @@ function applyToolContextDefaults(toolName, rawArgs, context) {
   }
   return args;
 }
-function buildToolHookEntries(registry2) {
+function buildToolHookEntries(registry2, fallbackBaseDir) {
   const entries = {};
   const tools = registry2.list();
   for (const t of tools) {
@@ -18619,7 +18649,7 @@ function buildToolHookEntries(registry2) {
       args: zodArgs,
       async execute(args, context) {
         try {
-          const normalizedArgs = applyToolContextDefaults(toolName, args, context);
+          const normalizedArgs = applyToolContextDefaults(toolName, args, context, fallbackBaseDir);
           return await handler(normalizedArgs);
         } catch (error45) {
           log13.warn("Tool hook execution failed", { tool: toolName, error: String(error45?.message || error45) });
@@ -18634,8 +18664,15 @@ function buildToolHookEntries(registry2) {
   }
   return entries;
 }
-var log13, CURSOR_PROVIDER_ID = "cursor-acp", CURSOR_PROXY_HOST = "127.0.0.1", CURSOR_PROXY_DEFAULT_PORT = 32124, CURSOR_PROXY_DEFAULT_BASE_URL, REUSE_EXISTING_PROXY, 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, client: client3, serverUrl }) => {
-  log13.debug("Plugin initializing", { directory, serverUrl: serverUrl?.toString() });
+var log13, CURSOR_PROVIDER_ID = "cursor-acp", CURSOR_PROXY_HOST = "127.0.0.1", CURSOR_PROXY_DEFAULT_PORT = 32124, CURSOR_PROXY_DEFAULT_BASE_URL, REUSE_EXISTING_PROXY, 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);
+  log13.debug("Plugin initializing", {
+    directory,
+    worktree,
+    workspaceDirectory,
+    cwd: process.cwd(),
+    serverUrl: serverUrl?.toString()
+  });
   if (!TOOL_LOOP_MODE_VALID) {
     log13.warn("Invalid CURSOR_ACP_TOOL_LOOP_MODE; defaulting to opencode", { value: TOOL_LOOP_MODE_RAW });
   }
@@ -18667,7 +18704,7 @@ var log13, CURSOR_PROVIDER_ID = "cursor-acp", CURSOR_PROXY_HOST = "127.0.0.1", C
   } else if (toolsEnabled && TOOL_LOOP_MODE === "off") {
     log13.debug("Tool loop mode off; proxy-side tool execution disabled");
   }
-  const serverClient = legacyProxyToolPathsEnabled ? createOpencodeClient({ baseUrl: serverUrl.toString(), directory }) : null;
+  const serverClient = legacyProxyToolPathsEnabled ? createOpencodeClient({ baseUrl: serverUrl.toString(), directory: workspaceDirectory }) : null;
   const discovery = legacyProxyToolPathsEnabled ? new OpenCodeToolDiscovery(serverClient ?? client3) : null;
   const localRegistry = new ToolRegistry;
   registerDefaultTools(localRegistry);
@@ -18750,9 +18787,9 @@ var log13, CURSOR_PROVIDER_ID = "cursor-acp", CURSOR_PROXY_HOST = "127.0.0.1", C
     log13.debug("Tools refreshed", { local: localTools.length, discovered: discoveredList.length, total: toolEntries.length });
     return toolEntries;
   }
-  const proxyBaseURL = await ensureCursorProxyServer(directory, router);
+  const proxyBaseURL = await ensureCursorProxyServer(workspaceDirectory, router);
   log13.debug("Proxy server started", { baseURL: proxyBaseURL });
-  const toolHookEntries = buildToolHookEntries(localRegistry);
+  const toolHookEntries = buildToolHookEntries(localRegistry, workspaceDirectory);
   return {
     tool: toolHookEntries,
     auth: {

package/dist/plugin-entry.js

@@ -17478,6 +17478,31 @@ async function ensurePluginDirectory() {
 function getGlobalKey() {
   return "__opencode_cursor_proxy_server__";
 }
+function resolveWorkspaceDirectory(worktree, directory) {
+  const envWorkspace = process.env.CURSOR_ACP_WORKSPACE?.trim();
+  if (envWorkspace) {
+    return resolve2(envWorkspace);
+  }
+  const envProjectDir = process.env.OPENCODE_CURSOR_PROJECT_DIR?.trim();
+  if (envProjectDir) {
+    return resolve2(envProjectDir);
+  }
+  const configHome = process.env.XDG_CONFIG_HOME ? resolve2(process.env.XDG_CONFIG_HOME) : join3(homedir3(), ".config");
+  const configPrefix = join3(configHome, "opencode");
+  const worktreeCandidate = worktree ? resolve2(worktree) : "";
+  if (worktreeCandidate && !worktreeCandidate.startsWith(configPrefix)) {
+    return worktreeCandidate;
+  }
+  const dirCandidate = directory ? resolve2(directory) : "";
+  if (dirCandidate && !dirCandidate.startsWith(configPrefix)) {
+    return dirCandidate;
+  }
+  const cwd = process.cwd();
+  if (cwd && !cwd.startsWith(configPrefix)) {
+    return cwd;
+  }
+  return dirCandidate || cwd || configPrefix;
+}
 function parseToolLoopMode(value) {
   const normalized = (value ?? "opencode").trim().toLowerCase();
   if (normalized === "opencode" || normalized === "proxy-exec" || normalized === "off") {
@@ -18559,14 +18584,19 @@ function jsonSchemaToZod(jsonSchema) {
   }
   return zodShape;
 }
-function resolveToolContextBaseDir(context) {
-  const candidates = [context?.worktree, context?.directory];
-  for (const candidate of candidates) {
-    if (typeof candidate === "string" && candidate.trim().length > 0) {
-      return candidate;
-    }
-  }
-  return null;
+function resolveToolContextBaseDir(context, fallbackBaseDir) {
+  const configHome = process.env.XDG_CONFIG_HOME ? resolve2(process.env.XDG_CONFIG_HOME) : join3(homedir3(), ".config");
+  const configPrefix = join3(configHome, "opencode");
+  const worktree = typeof context?.worktree === "string" ? context.worktree.trim() : "";
+  if (worktree)
+    return worktree;
+  const directory = typeof context?.directory === "string" ? context.directory.trim() : "";
+  if (directory && !resolve2(directory).startsWith(configPrefix))
+    return directory;
+  const fallback = typeof fallbackBaseDir === "string" ? fallbackBaseDir.trim() : "";
+  if (fallback)
+    return fallback;
+  return directory || null;
 }
 function toAbsoluteWithBase(value, baseDir) {
   if (typeof value !== "string") {
@@ -18578,8 +18608,8 @@ function toAbsoluteWithBase(value, baseDir) {
   }
   return resolve2(baseDir, trimmed);
 }
-function applyToolContextDefaults(toolName, rawArgs, context) {
-  const baseDir = resolveToolContextBaseDir(context);
+function applyToolContextDefaults(toolName, rawArgs, context, fallbackBaseDir) {
+  const baseDir = resolveToolContextBaseDir(context, fallbackBaseDir);
   if (!baseDir) {
     return rawArgs;
   }
@@ -18606,7 +18636,7 @@ function applyToolContextDefaults(toolName, rawArgs, context) {
   }
   return args;
 }
-function buildToolHookEntries(registry2) {
+function buildToolHookEntries(registry2, fallbackBaseDir) {
   const entries = {};
   const tools = registry2.list();
   for (const t of tools) {
@@ -18619,7 +18649,7 @@ function buildToolHookEntries(registry2) {
       args: zodArgs,
       async execute(args, context) {
         try {
-          const normalizedArgs = applyToolContextDefaults(toolName, args, context);
+          const normalizedArgs = applyToolContextDefaults(toolName, args, context, fallbackBaseDir);
           return await handler(normalizedArgs);
         } catch (error45) {
           log13.warn("Tool hook execution failed", { tool: toolName, error: String(error45?.message || error45) });
@@ -18634,8 +18664,15 @@ function buildToolHookEntries(registry2) {
   }
   return entries;
 }
-var log13, CURSOR_PROVIDER_ID2 = "cursor-acp", CURSOR_PROXY_HOST = "127.0.0.1", CURSOR_PROXY_DEFAULT_PORT = 32124, CURSOR_PROXY_DEFAULT_BASE_URL, REUSE_EXISTING_PROXY, 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, client: client3, serverUrl }) => {
-  log13.debug("Plugin initializing", { directory, serverUrl: serverUrl?.toString() });
+var log13, CURSOR_PROVIDER_ID2 = "cursor-acp", CURSOR_PROXY_HOST = "127.0.0.1", CURSOR_PROXY_DEFAULT_PORT = 32124, CURSOR_PROXY_DEFAULT_BASE_URL, REUSE_EXISTING_PROXY, 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);
+  log13.debug("Plugin initializing", {
+    directory,
+    worktree,
+    workspaceDirectory,
+    cwd: process.cwd(),
+    serverUrl: serverUrl?.toString()
+  });
   if (!TOOL_LOOP_MODE_VALID) {
     log13.warn("Invalid CURSOR_ACP_TOOL_LOOP_MODE; defaulting to opencode", { value: TOOL_LOOP_MODE_RAW });
   }
@@ -18667,7 +18704,7 @@ var log13, CURSOR_PROVIDER_ID2 = "cursor-acp", CURSOR_PROXY_HOST = "127.0.0.1",
   } else if (toolsEnabled && TOOL_LOOP_MODE === "off") {
     log13.debug("Tool loop mode off; proxy-side tool execution disabled");
   }
-  const serverClient = legacyProxyToolPathsEnabled ? createOpencodeClient({ baseUrl: serverUrl.toString(), directory }) : null;
+  const serverClient = legacyProxyToolPathsEnabled ? createOpencodeClient({ baseUrl: serverUrl.toString(), directory: workspaceDirectory }) : null;
   const discovery = legacyProxyToolPathsEnabled ? new OpenCodeToolDiscovery(serverClient ?? client3) : null;
   const localRegistry = new ToolRegistry;
   registerDefaultTools(localRegistry);
@@ -18750,9 +18787,9 @@ var log13, CURSOR_PROVIDER_ID2 = "cursor-acp", CURSOR_PROXY_HOST = "127.0.0.1",
     log13.debug("Tools refreshed", { local: localTools.length, discovered: discoveredList.length, total: toolEntries.length });
     return toolEntries;
   }
-  const proxyBaseURL = await ensureCursorProxyServer(directory, router);
+  const proxyBaseURL = await ensureCursorProxyServer(workspaceDirectory, router);
   log13.debug("Proxy server started", { baseURL: proxyBaseURL });
-  const toolHookEntries = buildToolHookEntries(localRegistry);
+  const toolHookEntries = buildToolHookEntries(localRegistry, workspaceDirectory);
   return {
     tool: toolHookEntries,
     auth: {

package/package.json

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