cursor-opencode-provider 0.7.4 → 0.7.6

package/dist/protocol/tools.js

@@ -16,10 +16,12 @@ export const REQUEST_CONTEXT_RESULT_FIELD = 10;
 export const OPENCODE_1_TOOL_DIALECT = {
     filePathKey: "filePath",
     shellTool: "bash",
+    skillArgKey: "name",
 };
 export const OPENCODE_2_TOOL_DIALECT = {
     filePathKey: "path",
     shellTool: "shell",
+    skillArgKey: "id",
 };
 function jsonSchemaProperties(schema) {
     if (!schema || typeof schema !== "object" || Array.isArray(schema))
@@ -46,6 +48,7 @@ export function opencodePathArg(args) {
 /**
  * Infer the host tool dialect from advertised AI SDK schemas.
  * OpenCode 2.0 read/edit/write require `path` and rename bash → `shell`.
+ * Skill: OpenCode 1.x requires `name`; OpenCode 2.0 requires `id`.
  */
 export function hostToolDialectFromTools(tools, defaultDialect = OPENCODE_1_TOOL_DIALECT) {
     let filePathKey;
@@ -71,7 +74,21 @@ export function hostToolDialectFromTools(tools, defaultDialect = OPENCODE_1_TOOL
         // OpenCode 2 hosts advertise `shell` and `path` together; use that when schemas are opaque.
         filePathKey = shellTool === "shell" ? "path" : defaultDialect.filePathKey;
     }
-    return { filePathKey, shellTool };
+    const skillProps = jsonSchemaProperties(tools.find((tool) => tool.name === "skill")?.inputSchema);
+    let skillArgKey;
+    if (skillProps) {
+        if ("id" in skillProps && !("name" in skillProps))
+            skillArgKey = "id";
+        else if ("name" in skillProps)
+            skillArgKey = "name";
+    }
+    if (!skillArgKey) {
+        // Opaque skill schema: OpenCode 2 pairs `shell`+`path` with skill `id`.
+        skillArgKey = shellTool === "shell" && filePathKey === "path"
+            ? "id"
+            : defaultDialect.skillArgKey;
+    }
+    return { filePathKey, shellTool, skillArgKey };
 }
 function assignHostFilePath(args, filePath, dialect) {
     delete args.filePath;
@@ -1257,6 +1274,18 @@ export function mapCursorArgsToOpencode(toolName, raw, execVariant, dialect = OP
                 args.path = path;
             return { toolName: "glob", args };
         }
+        case "skill": {
+            // OpenCode 1.x skill requires `name`; OpenCode 2.0 requires `id`. Both
+            // reject the other key (`additionalProperties: false`). Accept either
+            // model/Cursor shape and emit only the dialect key.
+            const value = str(cleaned[dialect.skillArgKey]) ?? str(cleaned.id) ?? str(cleaned.name);
+            const args = { ...cleaned };
+            delete args.id;
+            delete args.name;
+            if (value)
+                args[dialect.skillArgKey] = value;
+            return { toolName: "skill", args };
+        }
         default:
             return { toolName, args: cleaned };
     }

package/dist/session-directory.d.ts

@@ -7,9 +7,12 @@
  * time is wrong for any session but the one open when the daemon started.
  *
  * The 2.0 runtime names a session directory in two places:
- * - request header `x-opencode-directory` (per-request; preferred in the LM)
- * - `ctx.session.get()` → flat `info.directory`, or legacy
- *   `info.location.directory`, reachable from `session.hook("context")`
+ * - request header `x-opencode-directory` (per-request; preferred in the LM).
+ *   The host does not set it on model requests; the opencode2 plugin adds it
+ *   from `session.hook("model.request")`, so it travels with the request
+ *   instead of depending on this module's in-memory state.
+ * - `ctx.session.get()` → `info.location.directory`, reachable from session
+ *   hooks
  *
  * This module records the session-get value by id so the language model can
  * fall back when the header is absent, same mechanism as `compaction-marker.ts`.

package/dist/session-directory.js

@@ -7,9 +7,12 @@
  * time is wrong for any session but the one open when the daemon started.
  *
  * The 2.0 runtime names a session directory in two places:
- * - request header `x-opencode-directory` (per-request; preferred in the LM)
- * - `ctx.session.get()` → flat `info.directory`, or legacy
- *   `info.location.directory`, reachable from `session.hook("context")`
+ * - request header `x-opencode-directory` (per-request; preferred in the LM).
+ *   The host does not set it on model requests; the opencode2 plugin adds it
+ *   from `session.hook("model.request")`, so it travels with the request
+ *   instead of depending on this module's in-memory state.
+ * - `ctx.session.get()` → `info.location.directory`, reachable from session
+ *   hooks
  *
  * This module records the session-get value by id so the language model can
  * fall back when the header is absent, same mechanism as `compaction-marker.ts`.
@@ -17,6 +20,7 @@
  * Bounded so a long-lived server cannot accumulate ids for dead sessions.
  */
 import path from "node:path";
+import { trace } from "./debug.js";
 const MAX_TRACKED_SESSIONS = 256;
 const sessionDirectories = new Map();
 export function markSessionDirectory(sessionID, directory) {
@@ -61,7 +65,10 @@ export function opencodeDirectoryHeader(headers) {
  * Prefer the per-request header, then the session mark, then static options/cwd.
  */
 export function resolveSessionWorkspaceRoot(input) {
-    return path.resolve(opencodeDirectoryHeader(input.headers) ??
-        getSessionDirectory(input.sessionKey) ??
-        (input.workspaceRoot || input.cwd || process.cwd()));
+    const resolved = opencodeDirectoryHeader(input.headers) ?? getSessionDirectory(input.sessionKey);
+    if (resolved)
+        return path.resolve(resolved);
+    const fallback = input.workspaceRoot || input.cwd || process.cwd();
+    trace(`session directory: no header or session mark sessionKey=${input.sessionKey ?? "-"}; fallback=${fallback}`);
+    return path.resolve(fallback);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cursor-opencode-provider",
-  "version": "0.7.4",
+  "version": "0.7.6",
   "description": "Use Cursor subscription models from OpenCode via Cursor's Connect-RPC agent protocol",
   "type": "module",
   "license": "MIT",