@2kw/ai-mcp-server 6.4.0-dev.7 → 6.4.0-dev.8

package/dist/lib/agent-run.js

@@ -81,9 +81,25 @@ function parseArguments(raw) {
         return raw;
     }
 }
+/**
+ * A connector tool's open approval, decoded from the standard `mcp_approval_request` item (#949). The item
+ * is the MCP twin of `backbone:approval_request` (#805): it names the server and the tool, carries no call
+ * id, policy class or status, and exists only while the decision is open, so its id doubles as the call id
+ * and the tool is named as the approval row stores it, `mcp__<server_label>__<tool>`.
+ */
+function connectorApproval(i) {
+    return {
+        approvalId: String(i.id),
+        callId: String(i.id),
+        tool: `mcp__${String(i.server_label)}__${String(i.name)}`,
+        arguments: parseArguments(i.arguments),
+        policyClass: "unknown",
+        reason: null,
+    };
+}
 /**
  * Output item types the envelope decodes, or that never hold a run: text, reasoning and finished
- * connector calls. A pause on anything else (a connector approval's `mcp_approval_request`) is named.
+ * connector calls. A pause on anything else is named.
  * `backbone:tool_image` is an image a finished `ViewImage` call attached (#1244): it never holds a run.
  */
 const DECODED_ITEM_TYPES = new Set([
@@ -94,6 +110,7 @@ const DECODED_ITEM_TYPES = new Set([
     "backbone:approval_request",
     "backbone:connector_auth_request",
     "backbone:tool_image",
+    "mcp_approval_request",
     "mcp_call",
     "mcp_list_tools",
 ]);
@@ -135,17 +152,20 @@ export function buildRunEnvelope(result, agentRef, chatUrl = DEFAULT_CHAT_URL) {
         String(i.call_id),
         i.status === "incomplete" ? "incomplete" : "completed",
     ]));
-    const pendingApprovals = output
-        // Only an open request is pending; judge- or grant-decided requests (#634, #629) carry another status.
-        .filter((i) => i.type === "backbone:approval_request" && (i.status === undefined || i.status === "in_progress"))
-        .map((i) => ({
-        approvalId: String(i.id),
-        callId: String(i.call_id),
-        tool: String(i.tool),
-        arguments: parseArguments(i.arguments),
-        policyClass: String(i.policy_class),
-        reason: typeof i.reason === "string" && i.reason ? i.reason : null,
-    }));
+    const pendingApprovals = [
+        ...output
+            // Only an open request is pending; judge- or grant-decided requests (#634, #629) carry another status.
+            .filter((i) => i.type === "backbone:approval_request" && (i.status === undefined || i.status === "in_progress"))
+            .map((i) => ({
+            approvalId: String(i.id),
+            callId: String(i.call_id),
+            tool: String(i.tool),
+            arguments: parseArguments(i.arguments),
+            policyClass: String(i.policy_class),
+            reason: typeof i.reason === "string" && i.reason ? i.reason : null,
+        })),
+        ...output.filter((i) => i.type === "mcp_approval_request").map(connectorApproval),
+    ];
     // The one decoding rule (#1086): only an open request with its id, call id, label and host.
     const connectRequests = pendingConnectionsOf(output);
     const pendingConnections = connectRequests.map(({ serverLabel, host, reason, destinations }) => ({
@@ -209,8 +229,8 @@ export function buildRunEnvelope(result, agentRef, chatUrl = DEFAULT_CHAT_URL) {
         const approvalsSuffix = pendingApprovals.length > 0
             ? " Show the pending approvals to the user and pass their decisions in the same call, within the same window."
             : "";
-        // A connector-tool approval (mcp_approval_request) never decodes into pendingApprovals, so this
-        // envelope can under-report what is actually pending; say so rather than sound falsely complete
+        // An item type this server does not decode (a connector approval is decoded since #949) can leave
+        // the envelope under-reporting what is actually pending; say so rather than sound falsely complete
         // (#1254 review). The continuation itself still refuses an incomplete answer (400
         // incomplete_tool_outputs, decideErrorText's hint), this only tells the assistant to expect that.
         const undecodedTypes = extraUndecodedTypes(output);
@@ -221,6 +241,14 @@ export function buildRunEnvelope(result, agentRef, chatUrl = DEFAULT_CHAT_URL) {
             : "";
         next = `${connectPrefix}${relay}${approvalsSuffix}${undecodedSuffix}`;
     }
+    else if (status === "requires_tool_output" && pendingConnections.length > 0 && pendingApprovals.length > 0 && pendingToolCalls.length === 0 && ref && responseId) {
+        // A continuation must decide every pending approval (400 incomplete_tool_outputs otherwise), so a
+        // fresh request is no way on; decide answers them and the engine re-checks access itself (#949 review).
+        next =
+            `Tell the user to ${connectionsPhrase(pendingConnections)} in ${chatUrl}/connectors. ` +
+                "Show the pending approvals to the user; after they decide each one, call 2kw_decide_agent_approvals with agent " +
+                `${JSON.stringify(ref)} and responseId ${JSON.stringify(responseId)}.`;
+    }
     else if (status === "requires_tool_output" && pendingConnections.length > 0 && pendingToolCalls.length === 0 && responseId) {
         // A connector-only pause (no relayed call, so 2kw_decide_agent_approvals has nothing to decide,
         // spec M11) has no tool here to continue it by id, and a connect pause cannot be continued by

package/dist/tools/conversion.js

@@ -1,7 +1,7 @@
 import { z } from "zod";
 import { readFile } from "node:fs/promises";
 import { basename } from "node:path";
-import { BackboneApiError, formatErrorForMcp } from "../errors.js";
+import { formatErrorForMcp } from "../errors.js";
 import { getMimeType } from "../mime.js";
 /**
  * Map user-friendly format names to backend OutputFormat enum values.
@@ -167,27 +167,13 @@ export function register(server, client) {
                 if (Object.keys(nestedOpts).length > 0) {
                     formData.append("options", new Blob([JSON.stringify(nestedOpts)], { type: "application/json" }));
                 }
-                const { baseUrl, apiKey } = client._config;
-                const endpoint = isAsync ? "/v1/convert/file/async" : "/v1/convert/file";
-                const url = pipeline
-                    ? `${baseUrl}${endpoint}?pipeline=${encodeURIComponent(pipeline)}`
-                    : `${baseUrl}${endpoint}`;
-                const res = await fetch(url, {
-                    method: "POST",
-                    headers: { Authorization: `Bearer ${apiKey}` },
-                    body: formData,
+                // Placeholder body for the generated type; bodySerializer sends the real parts.
+                const result = await client.POST(isAsync ? "/v1/convert/file/async" : "/v1/convert/file", {
+                    params: { query: { pipeline } },
+                    body: { files: [] },
+                    bodySerializer: () => formData,
                 });
-                if (!res.ok) {
-                    let body;
-                    try {
-                        body = await res.json();
-                    }
-                    catch {
-                        body = { error: res.statusText, message: `HTTP ${res.status}: ${res.statusText}`, status: res.status, timestamp: new Date().toISOString() };
-                    }
-                    throw new BackboneApiError(body);
-                }
-                const data = await res.json();
+                const data = result.data;
                 if (isAsync) {
                     const taskId = data?.taskId;
                     if (waitForCompletion && taskId) {

package/dist/tools/skills.js

@@ -1,7 +1,7 @@
 import { z } from "zod";
 import { readFile, stat } from "node:fs/promises";
 import { basename, extname } from "node:path";
-import { BackboneApiError, formatErrorForMcp } from "../errors.js";
+import { formatErrorForMcp } from "../errors.js";
 // Spring accepts flat pagination parameters despite the generated pageable wrapper.
 function paginationParams(params) {
     return {
@@ -160,22 +160,11 @@ export function register(server, client) {
             formData.append("file", new Blob([buffer], {
                 type: isZip ? "application/zip" : "text/markdown",
             }), filename);
-            const { baseUrl, apiKey } = client._config;
-            const res = await fetch(`${baseUrl.replace(/\/+$/, "")}/v1/skills/import`, {
-                method: "POST",
-                headers: { Authorization: `Bearer ${apiKey}` },
-                body: formData,
+            // Placeholder body for the generated type; bodySerializer sends the real part.
+            const { data } = await client.POST("/v1/skills/import", {
+                body: { file: "" },
+                bodySerializer: () => formData,
             });
-            if (!res.ok) {
-                const body = await res.json().catch(() => ({}));
-                throw new BackboneApiError({
-                    status: body.status ?? res.status,
-                    error: body.title ?? body.error ?? res.statusText,
-                    message: body.detail ?? body.message ?? `HTTP ${res.status}: ${res.statusText}`,
-                    timestamp: body.timestamp ?? new Date().toISOString(),
-                });
-            }
-            const data = await res.json();
             return {
                 content: [{ type: "text", text: JSON.stringify(data, null, 2) }],
             };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@2kw/ai-mcp-server",
-  "version": "6.4.0-dev.7",
+  "version": "6.4.0-dev.8",
   "description": "MCP server for 2kw.ai — EU-hosted AI platform: OpenAI-compatible LLM gateway, schema-driven document extraction, transcription, agents with a knowledge base, and cost observability. 158 tools for Claude Code, Cursor, and Windsurf.",
   "mcpName": "ai.2kw/mcp-server",
   "keywords": [