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

package/dist/commands/convert.js

@@ -1,9 +1,8 @@
 import { Command } from "commander";
 import { readFileSync, writeFileSync } from "node:fs";
 import chalk from "chalk";
-import { getClient, resolveAuthHeader, runAction } from "../lib/client.js";
-import { resolveConfig, isJsonOutput } from "../lib/config.js";
-import { BackboneApiError } from "../lib/errors.js";
+import { getClient, runAction } from "../lib/client.js";
+import { isJsonOutput } from "../lib/config.js";
 import { formatDetail, withSpinner } from "../lib/output.js";
 import { fileToBlob, getMimeType } from "../lib/multipart.js";
 function mapFormat(format) {
@@ -136,34 +135,19 @@ function buildFormData(paths, opts) {
     formData.append("options", new Blob([JSON.stringify(pipelineOptions)], { type: "application/json" }));
     return formData;
 }
+/**
+ * POST the multipart body through the typed client. The generated type describes `files` as string[],
+ * which FormData cannot match, so the placeholder body satisfies the type and bodySerializer sends the
+ * real parts; the client's auth and error middleware apply.
+ */
 async function multipartConvert(command, formData, endpoint, pipeline) {
-    const config = resolveConfig(command);
-    const authHeader = await resolveAuthHeader(config);
-    const baseUrl = config.baseUrl.replace(/\/+$/, "");
-    const url = pipeline
-        ? `${baseUrl}${endpoint}?pipeline=${encodeURIComponent(pipeline)}`
-        : `${baseUrl}${endpoint}`;
-    const res = await fetch(url, {
-        method: "POST",
-        headers: { Authorization: authHeader },
-        body: formData,
+    const client = getClient(command);
+    const { data } = await client.POST(endpoint, {
+        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);
-    }
-    return (await res.json());
+    return data;
 }
 export function makeConvertCommand() {
     const cmd = new Command("convert").description("Convert documents");

package/dist/commands/skills.js

@@ -149,18 +149,16 @@ export function makeSkillsCommand() {
                 }
                 ({ blob, filename } = fileToBlob(path));
             }
-            const config = resolveConfig(command);
-            const authHeader = await resolveAuthHeader(config);
             const formData = new FormData();
             formData.append("file", blob, filename);
+            const client = getClient(command);
             const data = await withSpinner("Importing skill...", async () => {
-                const res = await fetch(`${config.baseUrl.replace(/\/+$/, "")}/v1/skills/import`, {
-                    method: "POST",
-                    headers: { Authorization: authHeader },
-                    body: formData,
+                // Placeholder body for the generated type; bodySerializer sends the real part.
+                const result = await client.POST("/v1/skills/import", {
+                    body: { file: "" },
+                    bodySerializer: () => formData,
                 });
-                await checkResponse(res);
-                return res.json();
+                return result.data;
             });
             formatDetail(data, command);
         });

package/dist/commands/transcribe.js

@@ -1,10 +1,9 @@
 import { Command } from "commander";
-import { resolveAuthHeader } from "../lib/client.js";
-import { resolveConfig, isJsonOutput } from "../lib/config.js";
+import { getClient } from "../lib/client.js";
+import { isJsonOutput } from "../lib/config.js";
 import { handleError } from "../lib/errors.js";
 import { formatDetail, withSpinner } from "../lib/output.js";
 import { fileToBlob } from "../lib/multipart.js";
-import { BackboneApiError } from "../lib/errors.js";
 export function makeTranscribeCommand() {
     const cmd = new Command("transcribe")
         .description("Transcribe an audio file")
@@ -17,8 +16,6 @@ export function makeTranscribeCommand() {
         .action(async (file, opts, command) => {
         const json = isJsonOutput(command);
         try {
-            const config = resolveConfig(command);
-            const authHeader = await resolveAuthHeader(config);
             const { blob, filename } = fileToBlob(file);
             const formData = new FormData();
             formData.append("file", blob, filename);
@@ -31,30 +28,15 @@ export function makeTranscribeCommand() {
                 formData.append("response_format", opts.format);
             if (opts.temperature)
                 formData.append("temperature", opts.temperature);
-            const baseUrl = config.baseUrl.replace(/\/+$/, "");
-            const url = `${baseUrl}/v1/audio/transcriptions`;
+            const client = getClient(command);
             const data = await withSpinner("Transcribing...", async () => {
-                const res = await fetch(url, {
-                    method: "POST",
-                    headers: { Authorization: authHeader },
-                    body: formData,
+                // The generated type describes "file" as a binary string, which FormData cannot match;
+                // the placeholder satisfies it and bodySerializer sends the real parts.
+                const result = await client.POST("/v1/audio/transcriptions", {
+                    body: { file: "", model: opts.model },
+                    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);
-                }
-                return res.json();
+                return result.data;
             });
             formatDetail(data, command);
         }

package/dist/lib/agent-run.js

@@ -2,6 +2,7 @@ import chalk from "chalk";
 import { DEFAULT_CHAT_URL } from "./config.js";
 import { connectCallIds, connectionsPhrase, pendingConnectionsOf } from "./connect-pause.js";
 import { CliUsageError } from "./errors.js";
+import { previewIsIncomplete, previewLines } from "./skills-apply-preview.js";
 export const CONVERSATION_MODES = ["plan", "ask", "auto"];
 /** `--mode` help text, in the words of the embedded chat's mode chip (#655). */
 export const MODE_OPTION_HELP = "Conversation mode: plan (read-only), ask (no automatic approver; calls that need approval wait for you), " +
@@ -119,9 +120,26 @@ function relayDecideCommand(ref, responseId, calls, withApprovals) {
     return (`2kw agents decide ${shellQuote(ref)} --response ${shellQuote(responseId)}${outputs.join("")}` +
         (withApprovals ? " --approve-all" : ""));
 }
+/**
+ * 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,
+        preview: 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([
@@ -132,6 +150,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",
 ]);
@@ -155,18 +174,21 @@ 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,
-        preview: i.preview && typeof i.preview === "object" && !Array.isArray(i.preview) ? i.preview : 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,
+            preview: i.preview && typeof i.preview === "object" && !Array.isArray(i.preview) ? i.preview : 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 }) => ({
@@ -223,6 +245,13 @@ export function buildRunEnvelope(result, agentRef, chatUrl = DEFAULT_CHAT_URL) {
                 : decide;
         }
     }
+    else if (status === "requires_tool_output" && pendingConnections.length > 0 && pendingApprovals.length > 0 && ref && responseId) {
+        // A continuation must decide every pending approval (400 incomplete_tool_outputs otherwise), so
+        // `--continue` would fail; decide answers them and the engine re-checks access itself (#949 review).
+        next =
+            `${connectionsSentence(pendingConnections)} in ${chatUrl}/connectors${THEN_RUN}` +
+                `2kw agents decide ${shellQuote(ref)} --response ${shellQuote(responseId)} --approve-all`;
+    }
     else if (status === "requires_tool_output" && pendingConnections.length > 0 && responseId) {
         // `agents run --continue` needs no input: the continuation re-checks access itself.
         const resume = ref
@@ -271,8 +300,15 @@ export function printRunText(env) {
         console.log(chalk.dim(`   tools: ${env.toolCalls.map((c) => `${s(c.tool)} ${c.status === "incomplete" ? "✗" : "✓"}`).join("  ")}`));
     const printApprovals = () => env.pendingApprovals.forEach((a, i) => {
         console.log(`  ${i + 1}. ${s(a.tool)} [${s(a.policyClass)}] ${s(a.approvalId)}`);
-        // JSON.stringify escapes C0 controls but leaves DEL and C1 raw.
-        console.log(chalk.dim(`     ${s(JSON.stringify(a.arguments))}`));
+        // A SkillsApply change reads as its diff (#1028), like the interactive prompt; an incomplete
+        // preview keeps the arguments, the one place a member can read what would persist.
+        if (a.preview)
+            for (const line of previewLines(a.preview))
+                console.log(chalk.dim(`     ${s(line)}`));
+        if (!a.preview || previewIsIncomplete(a.preview)) {
+            // JSON.stringify escapes C0 controls but leaves DEL and C1 raw.
+            console.log(chalk.dim(`     ${s(JSON.stringify(a.arguments))}`));
+        }
         if (a.reason)
             console.log(chalk.dim(`     reason: ${s(a.reason)}`));
     });

package/dist/lib/approval-prompt.js

@@ -52,7 +52,9 @@ export async function promptApprovals(pending, ask, write = (line) => console.er
     const answers = new Map();
     const s = stripControl;
     for (const [index, a] of pending.entries()) {
-        const destructive = a.policyClass.toLowerCase() === "destructive";
+        // A connector approval carries no policy class (#949): "unknown" may be destructive, so it is never
+        // offered a standing grant here; the server drops one for a destructive row anyway.
+        const destructive = ["destructive", "unknown"].includes(a.policyClass.toLowerCase());
         write(chalk.yellow(`\nApproval ${index + 1}/${pending.length}: ${s(a.tool)} [${s(a.policyClass)}]`));
         // JSON.stringify escapes C0 controls but leaves DEL and C1 raw.
         const request = () => write(chalk.dim(s(JSON.stringify(a.arguments, null, 2))));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@2kw/ai",
-  "version": "6.4.0-dev.7",
+  "version": "6.4.0-dev.8",
   "description": "CLI for 2kw.ai — schema-driven document extraction, an OpenAI-compatible EU LLM gateway, transcription, prompts, datasets, and experiments from your terminal or agentic workflows. Ships as 2kw, backbone, and bb.",
   "keywords": [
     "cli",