magic-builder 1.3.1 → 1.3.3

package/README.md

@@ -103,6 +103,17 @@ Deploy a FaaS function:
 magic-builder faas publish handler.js --name report-api
 ```
 
+Publish a Tools-only MCP service (ordinary HTTP `handler` may coexist):
+
+```bash
+magic-builder faas publish server.js --name weather-mcp --mcp --auth key,oauth --oauth-policy all
+magic-builder faas mcp key create --id <id> --name production
+magic-builder faas mcp key list --id <id>
+magic-builder faas mcp key revoke --id <id> --key-id <key_id>
+magic-builder faas mcp auth get --id <id>
+magic-builder faas mcp auth update --id <id> --oauth-policy whitelist --oauth-user ou_xxx
+```
+
 List or delete FaaS functions:
 
 ```bash

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "magic-builder",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "description": "CLI for Magic Builder — publish pages, functions, files, and performance reviews",
   "bin": {
     "magic-builder": "bin/magic-builder.js",

package/src/commands/auth.js

@@ -29,6 +29,7 @@ async function login(opts) {
   const requestId = String(data.request_id || '');
   const pollToken = String(data.poll_token || '');
   const authUrl = String(data.auth_url || '');
+  const pollUrl = String(data.poll_url || '').trim() || `${baseUrl}/api/dev-token/auth/token`;
   if (!requestId || !pollToken || !authUrl) {
     fail(`Invalid auth start response: ${JSON.stringify(start)}`, 'E_AUTH_FAILED', 2);
   }
@@ -45,7 +46,7 @@ async function login(opts) {
 
   const deadline = Date.now() + timeoutSeconds * 1000;
   while (Date.now() < deadline) {
-    const tokenJson = await request(`${baseUrl}/api/dev-token/auth/token`, {
+    const tokenJson = await request(pollUrl, {
       method: 'POST',
       body: {
         request_id: requestId,

package/src/commands/faas.js

@@ -12,7 +12,8 @@ async function run(args, opts) {
   if (sub === 'publish') return publish(args.slice(1), opts);
   if (sub === 'list') return list(opts);
   if (sub === 'delete') return deleteFaas(opts);
-  fail('Usage: magic-builder faas <publish|list|delete>', 'E_INVALID_ARGS');
+  if (sub === 'mcp') return mcp(args.slice(1), opts);
+  fail('Usage: magic-builder faas <publish|list|delete|mcp>', 'E_INVALID_ARGS');
 }
 
 async function publish(args, opts) {
@@ -36,6 +37,15 @@ async function publish(args, opts) {
 
   const body = { code, name };
   if (opts.id) body.id = opts.id;
+  if (opts.mcp) {
+    body.mcp = true;
+    body.auth = String(opts.auth || 'key').split(',').map((item) => item.trim()).filter(Boolean);
+    if (opts.oauthUser !== undefined) {
+      body.oauth_users = String(opts.oauthUser || '').split(',').map((item) => item.trim()).filter(Boolean);
+    }
+    if (opts.oauthPolicy !== undefined) body.oauth_policy = String(opts.oauthPolicy).trim().toLowerCase();
+    else if (body.oauth_users?.length) body.oauth_policy = 'whitelist';
+  }
 
   if (!opts.quiet) process.stderr.write(`Deploying FaaS${opts.name ? ` "${opts.name}"` : ''}... `);
 
@@ -53,6 +63,7 @@ async function publish(args, opts) {
   const data = res.data || res;
   const id = data.id || data.record_id;
   const faasUrl = data.faas_url || `/api/faas/${id}`;
+  const mcpUrl = data.mcp_url || `/api/faas/${id}/mcp`;
 
   if (!opts.quiet) process.stderr.write('done\n');
 
@@ -63,9 +74,63 @@ async function publish(args, opts) {
     faas_url: `${baseUrl}${faasUrl}`,
     preview_url: `${baseUrl}/r?fid=${id}`,
     wss_url: `${wsBaseUrl}${faasUrl}`,
+    ...(opts.mcp ? { mcp_url: `${baseUrl}${mcpUrl}`, mcp_auth: data.mcp_auth || body.auth } : {}),
   }, opts);
 }
 
+async function mcp(args, opts) {
+  const area = args[0];
+  const action = args[1];
+  if (area === 'key' && action === 'create') return mcpKeyCreate(opts);
+  if (area === 'key' && action === 'list') return mcpKeyList(opts);
+  if (area === 'key' && action === 'revoke') return mcpKeyRevoke(opts);
+  if (area === 'auth' && action === 'get') return mcpAuthGet(opts);
+  if (area === 'auth' && action === 'update') return mcpAuthUpdate(opts);
+  fail('Usage: magic-builder faas mcp <key create|key list|key revoke|auth get|auth update>', 'E_INVALID_ARGS');
+}
+
+async function mcpRequest(opts, path, init = {}) {
+  if (!opts.id) fail('Missing --id', 'E_INVALID_ARGS');
+  let token;
+  try { token = await getToken(opts); } catch (e) { fail(e.message, 'E_NO_TOKEN', 2); }
+  const baseUrl = getBaseUrl(opts);
+  try {
+    const result = await request(`${baseUrl}/api/faas/${encodeURIComponent(opts.id)}/mcp/${path}`, { token, ...init });
+    if (result.code !== 0) fail(result.msg || 'MCP operation failed', 'E_MCP_FAILED');
+    return result.data || result;
+  } catch (e) { failFromHttpError(e); }
+}
+
+async function mcpKeyCreate(opts) {
+  success(await mcpRequest(opts, 'keys', { method: 'POST', body: { name: opts.name || 'default' } }), opts);
+}
+
+async function mcpKeyList(opts) {
+  success(await mcpRequest(opts, 'keys'), opts);
+}
+
+async function mcpKeyRevoke(opts) {
+  if (!opts.keyId) fail('Missing --key-id', 'E_INVALID_ARGS');
+  success(await mcpRequest(opts, `keys?key_id=${encodeURIComponent(opts.keyId)}`, { method: 'DELETE' }), opts);
+}
+
+async function mcpAuthGet(opts) {
+  success(await mcpRequest(opts, 'auth'), opts);
+}
+
+async function mcpAuthUpdate(opts) {
+  const body = {};
+  if (opts.enabled !== undefined) body.enabled = String(opts.enabled).toLowerCase() !== 'false';
+  if (opts.auth !== undefined) body.auth = String(opts.auth).split(',').map((item) => item.trim()).filter(Boolean);
+  if (opts.oauthUser !== undefined) {
+    body.oauth_users = String(opts.oauthUser || '').split(',').map((item) => item.trim()).filter(Boolean);
+  }
+  if (opts.oauthPolicy !== undefined) body.oauth_policy = String(opts.oauthPolicy).trim().toLowerCase();
+  else if (body.oauth_users?.length) body.oauth_policy = 'whitelist';
+  if (!Object.keys(body).length) fail('No MCP auth changes supplied. Use auth get to inspect the current config.', 'E_INVALID_ARGS');
+  success(await mcpRequest(opts, 'auth', { method: 'PUT', body }), opts);
+}
+
 async function list(opts) {
   let token;
   try { token = await getToken(opts); } catch (e) { fail(e.message, 'E_NO_TOKEN', 2); }

package/src/lib/help.js

@@ -16,7 +16,7 @@ SYNTAX:
 COMMANDS:
   auth       Login and manage Magic developer tokens
   page       Publish and manage Magic pages, collaborators, and access
-  faas       Publish, list, and delete Magic FaaS functions
+  faas       Publish and manage Magic FaaS HTTP/WSS/MCP functions
   file       Upload, list, and delete TOS files
   link       Generate Magic share links
   doc        Create or append Feishu Doc HTML Box apps
@@ -42,6 +42,7 @@ EXAMPLES:
   magic-builder page collaborators add --id recxxx --open-ids ou_xxx,ou_yyy
   magic-builder page access groups add --id recxxx --chat-ids oc_xxx
   magic-builder faas publish handler.js --name report-api
+  magic-builder faas publish server.js --name weather-mcp --mcp --auth key,oauth
   magic-builder faas list
   magic-builder faas delete --id recxxx
   magic-builder file upload logo.png
@@ -101,10 +102,15 @@ COMMANDS:
   page access groups add|remove|set --id <id> --chat-ids <oc_a,oc_b>
   page access set --id <id> --file <access.json>
 
-  faas publish <file.js> --name <name> [--id <id>]
+  faas publish <file.js> --name <name> [--id <id>] [--mcp --auth key,oauth --oauth-policy all|whitelist --oauth-user ou_xxx]
   faas publish --code <code> --name <name> [--id <id>]
   faas list [--title <keyword>]
   faas delete --id <id>
+  faas mcp key create --id <id> --name <name>
+  faas mcp key list --id <id>
+  faas mcp key revoke --id <id> --key-id <key_id>
+  faas mcp auth get --id <id>
+  faas mcp auth update --id <id> [--auth key,oauth] [--oauth-policy all|whitelist] [--oauth-user ou_xxx]
 
   file upload <file> [--key <key>] [--content-type <mime>]
   file list [--title <keyword>]
@@ -194,10 +200,15 @@ SYNTAX:
   faas: `@HELP magic-builder/faas
 
 SYNTAX:
-  magic-builder faas publish <file.js> --name <name> [--id <id>]
+  magic-builder faas publish <file.js> --name <name> [--id <id>] [--mcp --auth key,oauth --oauth-policy all|whitelist --oauth-user ou_xxx]
   magic-builder faas publish --code <code> --name <name> [--id <id>]
   magic-builder faas list [--title <keyword>]
   magic-builder faas delete --id <id>
+  magic-builder faas mcp key create --id <id> --name production
+  magic-builder faas mcp key list --id <id>
+  magic-builder faas mcp key revoke --id <id> --key-id <key_id>
+  magic-builder faas mcp auth get --id <id>
+  magic-builder faas mcp auth update --id <id> --oauth-policy whitelist --oauth-user ou_xxx
 `,
   file: `@HELP magic-builder/file