@magnetoagents/mcp 0.2.0 → 0.3.0

package/dist/tool-http.d.ts

@@ -1,12 +1,3 @@
-export type ApiFn = (method: string, pathSuffix: string, body?: unknown) => Promise<{
-    ok: boolean;
-    status: number;
-    data: unknown;
-}>;
-export declare function callToolHttp(api: ApiFn, name: string, args: Record<string, unknown>): Promise<{
-    content: Array<{
-        type: 'text';
-        text: string;
-    }>;
-    isError?: boolean;
-}>;
+import { type ApiFn, type McpToolCallResult } from './payment-bridge.js';
+export type { ApiFn };
+export declare function callToolHttp(api: ApiFn, name: string, args: Record<string, unknown>, meta?: Record<string, unknown>): Promise<McpToolCallResult>;

package/dist/tool-http.js

@@ -1,23 +1,47 @@
 // Stdio MCP HTTP map (#439). Speaks /api/v1 only — no Worker imports.
-import { findToolDef, missingScopePayload } from './tool-catalog.js';
+import { findToolDef } from './tool-catalog.js';
+import { attachPaymentMeta, wrapApiForPayment, } from './payment-bridge.js';
+import { projectToOutputSchema } from './project-output.js';
 function toolText(payload, isError = false) {
     const text = typeof payload === 'string' ? payload : JSON.stringify(payload, null, 2);
     return { content: [{ type: 'text', text }], isError };
 }
+function toolStructured(payload, schema) {
+    const projected = projectToOutputSchema(payload, schema);
+    return {
+        content: [{ type: 'text', text: JSON.stringify(projected, null, 2) }],
+        structuredContent: projected,
+    };
+}
+function asObject(data) {
+    return data && typeof data === 'object' && !Array.isArray(data)
+        ? data
+        : {};
+}
+function asItems(data) {
+    return Array.isArray(data) ? data : [];
+}
+function structuredOrMissing(schema, payload) {
+    if (!schema)
+        return toolText({ detail: 'outputSchema missing' }, true);
+    return toolStructured(payload, schema);
+}
 function kindOf(data) {
     return String(data?.kind ?? 'agent').toLowerCase();
 }
 function enc(value) {
     return encodeURIComponent(value);
 }
-export async function callToolHttp(api, name, args) {
+async function dispatchToolHttp(api, name, args) {
     const def = findToolDef(name);
     if (!def)
         return toolText({ detail: `Unknown tool: ${name}` }, true);
     switch (name) {
         case 'list': {
             const r = await api('GET', '/computers');
-            return toolText(r.data, !r.ok);
+            if (!r.ok)
+                return toolText(r.data, true);
+            return structuredOrMissing(def.outputSchema, { items: asItems(r.data) });
         }
         case 'create': {
             const body = {};
@@ -40,7 +64,9 @@ export async function callToolHttp(api, name, args) {
         }
         case 'get': {
             const r = await api('GET', `/computers/${enc(String(args.computer_id ?? ''))}`);
-            return toolText(r.data, !r.ok);
+            if (!r.ok)
+                return toolText(r.data, true);
+            return structuredOrMissing(def.outputSchema, asObject(r.data));
         }
         case 'start': {
             const r = await api('POST', `/computers/${enc(String(args.computer_id ?? ''))}/start`);
@@ -172,11 +198,15 @@ export async function callToolHttp(api, name, args) {
                 params.set('offset', String(args.offset));
             const qs = params.toString() ? `?${params.toString()}` : '';
             const r = await api('GET', `/computers/${enc(String(args.computer_id ?? ''))}/runs${qs}`);
-            return toolText(r.data, !r.ok);
+            if (!r.ok)
+                return toolText(r.data, true);
+            return structuredOrMissing(def.outputSchema, asObject(r.data));
         }
         case 'get_run': {
             const r = await api('GET', `/computers/${enc(String(args.computer_id ?? ''))}/runs/${enc(String(args.run_id ?? ''))}`);
-            return toolText(r.data, !r.ok);
+            if (!r.ok)
+                return toolText(r.data, true);
+            return structuredOrMissing(def.outputSchema, asObject(r.data));
         }
         case 'install_skill': {
             const r = await api('POST', `/computers/${enc(String(args.computer_id ?? ''))}/skills`, {
@@ -196,7 +226,9 @@ export async function callToolHttp(api, name, args) {
                 params.set('limit', String(args.limit));
             const qs = params.toString() ? `?${params.toString()}` : '';
             const r = await api('GET', `/skills${qs}`);
-            return toolText(r.data, !r.ok);
+            if (!r.ok)
+                return toolText(r.data, true);
+            return structuredOrMissing(def.outputSchema, { items: asItems(r.data) });
         }
         case 'search_marketplace': {
             const params = new URLSearchParams();
@@ -225,9 +257,12 @@ export async function callToolHttp(api, name, args) {
             const numeric = Number(query);
             if (query !== '' && Number.isFinite(numeric) && Number.isInteger(numeric)) {
                 const exact = await api('GET', `/skills/${enc(String(numeric))}`);
-                return toolText({ items, exact: exact.ok ? exact.data : null });
+                return structuredOrMissing(def.outputSchema, {
+                    items,
+                    exact: exact.ok ? exact.data : null,
+                });
             }
-            return toolText({ items });
+            return structuredOrMissing(def.outputSchema, { items });
         }
         case 'list_templates': {
             const params = new URLSearchParams();
@@ -241,15 +276,21 @@ export async function callToolHttp(api, name, args) {
                 params.set('featured', String(args.featured));
             const qs = params.toString() ? `?${params.toString()}` : '';
             const r = await api('GET', `/templates${qs}`);
-            return toolText(r.data, !r.ok);
+            if (!r.ok)
+                return toolText(r.data, true);
+            return structuredOrMissing(def.outputSchema, { items: asItems(r.data) });
         }
         case 'list_files': {
             const r = await api('GET', '/files');
-            return toolText(r.data, !r.ok);
+            if (!r.ok)
+                return toolText(r.data, true);
+            return structuredOrMissing(def.outputSchema, { items: asItems(r.data) });
         }
         case 'account': {
             const r = await api('GET', '/account');
-            return toolText(r.data, !r.ok);
+            if (!r.ok)
+                return toolText(r.data, true);
+            return structuredOrMissing(def.outputSchema, asObject(r.data));
         }
         case 'chat': {
             const id = String(args.computer_id ?? '');
@@ -277,6 +318,11 @@ export async function callToolHttp(api, name, args) {
             return toolText(r.data, !r.ok);
         }
         default:
-            return toolText(missingScopePayload(def.requiredScope), true);
+            return toolText({ detail: `Unknown or unimplemented tool: ${name}` }, true);
     }
 }
+export async function callToolHttp(api, name, args, meta) {
+    const wrapped = wrapApiForPayment(api, meta);
+    const result = await dispatchToolHttp(wrapped.api, name, args);
+    return attachPaymentMeta(result, wrapped.lastHeaders());
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magnetoagents/mcp",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Magneto MCP stdio server — drive computers via sk_live_* against /api/v1 (or remote /mcp)",
   "type": "module",
   "bin": {
@@ -13,6 +13,7 @@
   ],
   "scripts": {
     "build": "tsc -p tsconfig.json",
+    "pretest": "npm run build",
     "test": "vitest run",
     "typecheck": "tsc -p tsconfig.json --noEmit"
   },
@@ -25,7 +26,6 @@
     "url": "https://github.com/vargasjons/magneto-app.git",
     "directory": "packages/mcp"
   },
-  "dependencies": {},
   "devDependencies": {
     "@types/node": "^20.17.0",
     "typescript": "^5.8.2",