@xtremestuff/dsh-plugin-resolve 0.1.1 → 0.1.2

package/lib/index.js

@@ -96,11 +96,15 @@ function isExecutable(path) {
 }
 
 /**
- * Rewrite an MCP input schema into DSH's supported JSON-Schema subset.
- * DSH rejects `type` arrays (e.g. `["integer","string"]` on the native
- * server's thumbnail frame-offset/timecode params). A single-type array
- * collapses to that type; a true union drops `type` so the parameter is
- * left unconstrained for DSH while the MCP server validates it.
+ * Rewrite an MCP input schema into DSH's supported JSON-Schema subset
+ * (type/oneOf/properties/required/additionalProperties/items/enum/const +
+ * annotations).
+ *  - `type` arrays (native server's `["integer","string"]` offset/timecode
+ *    params): a single-type array collapses to that type; a true union drops
+ *    `type` so the parameter is unconstrained for DSH while the MCP server
+ *    validates it.
+ *  - `anyOf` (pydantic emits it for `Optional[...]` params in the community
+ *    server): renamed to the supported `oneOf`; branches are sanitized too.
  * @param {unknown} node
  * @returns {unknown} a sanitized copy of the schema node.
  */
@@ -112,6 +116,13 @@ function sanitizeSchema(node) {
     if (supported.length === 1) out.type = supported[0]
     else delete out.type
   }
+  if (Array.isArray(out.anyOf)) {
+    if (!Array.isArray(out.oneOf)) out.oneOf = out.anyOf
+    delete out.anyOf
+  }
+  if (Array.isArray(out.oneOf)) {
+    out.oneOf = out.oneOf.map((branch) => sanitizeSchema(branch))
+  }
   if (out.properties && typeof out.properties === 'object' && !Array.isArray(out.properties)) {
     out.properties = Object.fromEntries(
       Object.entries(out.properties).map(([key, value]) => [key, sanitizeSchema(value)]),
@@ -270,6 +281,26 @@ class StdioJsonRpc {
     }
   }
 
+  /**
+   * Call one tool over this transport (same surface as LazyStdioServer).
+   * @param {string} toolName
+   * @param {object} [args]
+   * @param {number} [timeoutMs]
+   * @param {AbortSignal} [signal]
+   */
+  callTool(toolName, args, timeoutMs = DEFAULT_TOOL_CALL_TIMEOUT_MS, signal) {
+    if (signal?.aborted) return Promise.reject(new Error('aborted'))
+    const promise = this.request('tools/call', { name: toolName, arguments: args ?? {} }, timeoutMs)
+    if (signal) signal.addEventListener('abort', () => {
+      // JSON-RPC has no cancel; drop the waiters so the caller's signal wins.
+      for (const [id, waiter] of [...this.pending]) {
+        this.pending.delete(id)
+        waiter.reject(new Error('aborted'))
+      }
+    }, { once: true })
+    return promise
+  }
+
   /** Kill the child process and settle every pending request. */
   dispose() {
     this.closed = true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xtremestuff/dsh-plugin-resolve",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "DSH bundle that bridges DaVinci Resolve into DSH: registers Resolve 21.1+ native ResolveMCP (stdio) or the davinci-resolve-mcp community server with DSH's mcp-client bridge, exposing Resolve's tools as first-class agent tools.",
   "type": "module",
   "main": "lib/index.js",