@mcpmake/core 0.3.3 → 0.3.5

package/dist/emitter/templates/server-main-http.ts.hbs

@@ -174,6 +174,39 @@ if (transportMode === 'http') {
   }
   const allowedOrigin = process.env.ALLOWED_ORIGIN;
   const authToken = process.env.MCP_AUTH_TOKEN;
+{{#if hasOAuth}}
+  /* ── OAuth issuer resolution inputs ──────────────────────────────────────
+   * The unauthenticated /.well-known/oauth-authorization-server endpoint must
+   * not reflect an arbitrary client-controlled Host header into the issuer
+   * (host-header spoofing). Operators pin the issuer with one of:
+   *   - ALLOWED_ORIGIN   (existing; takes precedence)
+   *   - MCP_PUBLIC_URL   (absolute http(s) URL; its origin is used)
+   *   - MCP_ALLOWED_HOSTS (comma/space-separated Host allowlist)
+   * With none set we fall back to the request Host for backward-compat (dev),
+   * after warning once that the issuer is Host-derived. */
+  const mcpPublicOrigin = (() => {
+    const raw = process.env.MCP_PUBLIC_URL;
+    if (!raw) return undefined;
+    try {
+      const u = new URL(raw);
+      if (u.protocol !== 'http:' && u.protocol !== 'https:') {
+        log('error', 'MCP_PUBLIC_URL must be an http(s) URL — ignoring', { MCP_PUBLIC_URL: raw });
+        return undefined;
+      }
+      return u.origin;
+    } catch {
+      log('error', 'MCP_PUBLIC_URL is not a valid absolute URL — ignoring', { MCP_PUBLIC_URL: raw });
+      return undefined;
+    }
+  })();
+  const allowedHosts = new Set(
+    (process.env.MCP_ALLOWED_HOSTS ?? '')
+      .split(/[\s,]+/)
+      .map((h) => h.trim().toLowerCase())
+      .filter((h) => h.length > 0),
+  );
+  let warnedHostDerivedIssuer = false;
+{{/if}}
   /* Fail closed: with no MCP_AUTH_TOKEN the server denies every authenticated
    * route (401) unless the operator opted in via MCP_ALLOW_UNAUTHENTICATED=true.
    * Warn loudly, once, when running wide open so it is never a silent default. */
@@ -321,157 +354,209 @@ if (transportMode === 'http') {
   }
 
   const httpServer = http.createServer(async (req, res) => {
-    const url = new URL(req.url ?? '/', `http://localhost:${port}`);
-    const method = req.method ?? 'GET';
-
-    /* ── Authentication ─────────────────────────────────────────────
-     * Every endpoint except /health, /ready{{#if hasOAuth}}, and the public
-     * OAuth metadata{{/if}} requires a valid bearer token. With MCP_AUTH_TOKEN
-     * unset the server fails closed (401) unless MCP_ALLOW_UNAUTHENTICATED=true.
-     * This is the in-container line of defense; the hosting backend also
-     * validates before proxying. */
-    const isPublicPath =
-      url.pathname === '/health' ||
-      url.pathname === '/ready'{{#if hasOAuth}} ||
-      url.pathname === '/.well-known/oauth-authorization-server'{{/if}};
-    if (!isPublicPath && !isAuthorized(req, authToken)) {
-      log('error', 'Unauthorized request rejected', { path: url.pathname });
-      res.writeHead(401, {
-        'Content-Type': 'application/json',
-        'WWW-Authenticate': 'Bearer',
-      });
-      res.end(JSON.stringify({ error: 'Unauthorized: missing or invalid bearer token' }));
-      return;
-    }
+    try {
+      const url = new URL(req.url ?? '/', `http://localhost:${port}`);
+      const method = req.method ?? 'GET';
+
+      /* ── Authentication ─────────────────────────────────────────────
+       * Every endpoint except /health, /ready{{#if hasOAuth}}, and the public
+       * OAuth metadata{{/if}} requires a valid bearer token. With MCP_AUTH_TOKEN
+       * unset the server fails closed (401) unless MCP_ALLOW_UNAUTHENTICATED=true.
+       * This is the in-container line of defense; the hosting backend also
+       * validates before proxying. */
+      const isPublicPath =
+        url.pathname === '/health' ||
+        url.pathname === '/ready'{{#if hasOAuth}} ||
+        url.pathname === '/.well-known/oauth-authorization-server'{{/if}};
+      if (!isPublicPath && !isAuthorized(req, authToken)) {
+        log('error', 'Unauthorized request rejected', { path: url.pathname });
+        res.writeHead(401, {
+          'Content-Type': 'application/json',
+          'WWW-Authenticate': 'Bearer',
+        });
+        res.end(JSON.stringify({ error: 'Unauthorized: missing or invalid bearer token' }));
+        return;
+      }
 
-    /* ── Routing-header observability (SEP-2243, additive) ─────────── */
-    const mcpMethod = req.headers['mcp-method'];
-    const mcpName = req.headers['mcp-name'];
-    if (mcpMethod || mcpName) {
-      log('info', 'mcp-meta-headers', { mcpMethod, mcpName, path: url.pathname });
-    }
+      /* ── Routing-header observability (SEP-2243, additive) ─────────── */
+      const mcpMethod = req.headers['mcp-method'];
+      const mcpName = req.headers['mcp-name'];
+      if (mcpMethod || mcpName) {
+        log('info', 'mcp-meta-headers', { mcpMethod, mcpName, path: url.pathname });
+      }
 
 {{#if hasOAuth}}
-    /* ── OAuth Authorization Server Metadata (RFC 8414) ─────────────
-     * Public discovery endpoint (the 2026-07-28 auth changes clarify
-     * .well-known discovery; DCR is retained, not replaced). */
-    if (url.pathname === '/.well-known/oauth-authorization-server') {
-      if (method !== 'GET') {
-        res.writeHead(405, { Allow: 'GET' });
-        res.end();
-        return;
-      }
-      const authorizationUrl = config.oauth2AuthorizationUrl;
-      const tokenUrl = config.oauth2TokenUrl;
-      if (!authorizationUrl || !tokenUrl) {
-        sendJson(res, 503, { error: 'OAuth is not configured' });
+      /* ── OAuth Authorization Server Metadata (RFC 8414) ─────────────
+       * Public discovery endpoint (the 2026-07-28 auth changes clarify
+       * .well-known discovery; DCR is retained, not replaced). */
+      if (url.pathname === '/.well-known/oauth-authorization-server') {
+        if (method !== 'GET') {
+          res.writeHead(405, { Allow: 'GET' });
+          res.end();
+          return;
+        }
+        const authorizationUrl = config.oauth2AuthorizationUrl;
+        const tokenUrl = config.oauth2TokenUrl;
+        if (!authorizationUrl || !tokenUrl) {
+          sendJson(res, 503, { error: 'OAuth is not configured' });
+          return;
+        }
+        const proto = req.headers['x-forwarded-proto'] === 'https' ? 'https' : 'http';
+        /* Resolve the OAuth issuer without trusting an arbitrary Host header.
+         * Precedence: ALLOWED_ORIGIN → MCP_PUBLIC_URL → MCP_ALLOWED_HOSTS →
+         * (dev fallback) the request Host, but only when no allowlist/public
+         * URL pins it. When MCP_ALLOWED_HOSTS is configured, a Host outside it
+         * is rejected rather than reflected. */
+        const rawHost = req.headers.host;
+        const host = typeof rawHost === 'string' ? rawHost.toLowerCase() : undefined;
+        // Parse the Host once. `hostname` (no port, no userinfo) drives the
+        // allowlist so a bare-hostname allowlist (MCP_ALLOWED_HOSTS=example.com)
+        // matches `Host: example.com:3000`; `hostPort` (hostname:port, userinfo
+        // STRIPPED) builds the issuer so a `Host: evil@example.com` cannot inject
+        // a userinfo segment into the issued metadata. URL parsing also handles
+        // IPv6 brackets. Falls back to undefined when the Host is malformed.
+        const parsedHost = (() => {
+          if (typeof rawHost !== 'string') return undefined;
+          try {
+            const u = new URL(`http://${rawHost}`);
+            return { hostname: u.hostname.toLowerCase(), hostPort: u.host };
+          } catch {
+            return undefined;
+          }
+        })();
+        const hostNoPort = parsedHost?.hostname ?? host;
+        let issuer: string;
+        if (allowedOrigin) {
+          issuer = allowedOrigin;
+        } else if (mcpPublicOrigin) {
+          issuer = mcpPublicOrigin;
+        } else if (allowedHosts.size > 0) {
+          if (!host || (!allowedHosts.has(host) && !(hostNoPort && allowedHosts.has(hostNoPort)))) {
+            log('error', 'Invalid Host header for OAuth metadata', { host: rawHost });
+            sendJson(res, 400, { error: 'Invalid Host header for OAuth metadata' });
+            return;
+          }
+          // Build from the parsed host:port (userinfo stripped), never raw.
+          issuer = `${proto}://${parsedHost?.hostPort ?? rawHost}`;
+        } else {
+          /* No issuer pinned: reflect the request Host for backward-compat with
+           * proxy deployments that set neither var. Warn once so operators know
+           * to lock it down via MCP_PUBLIC_URL or MCP_ALLOWED_HOSTS. */
+          if (!warnedHostDerivedIssuer) {
+            warnedHostDerivedIssuer = true;
+            log('info', 'OAuth issuer derived from the Host header — set MCP_PUBLIC_URL or MCP_ALLOWED_HOSTS to pin it', { host: rawHost });
+          }
+          issuer = `${proto}://${rawHost ?? 'localhost'}`;
+        }
+        sendJson(
+          res,
+          200,
+          getAuthServerMetadata(
+            {
+              clientId: config.oauth2ClientId ?? '',
+              clientSecret: config.oauth2ClientSecret,
+              authorizationUrl,
+              tokenUrl,
+              scopes: config.oauth2Scopes,
+              redirectUri: config.oauth2RedirectUri ?? '',
+            },
+            issuer,
+          ),
+        );
         return;
       }
-      const proto = req.headers['x-forwarded-proto'] === 'https' ? 'https' : 'http';
-      const issuer = allowedOrigin ?? `${proto}://${req.headers.host ?? 'localhost'}`;
-      sendJson(
-        res,
-        200,
-        getAuthServerMetadata(
-          {
-            clientId: config.oauth2ClientId ?? '',
-            clientSecret: config.oauth2ClientSecret,
-            authorizationUrl,
-            tokenUrl,
-            scopes: config.oauth2Scopes,
-            redirectUri: config.oauth2RedirectUri ?? '',
-          },
-          issuer,
-        ),
-      );
-      return;
-    }
 
 {{/if}}
 {{#if hasAsyncTools}}
-    /* ── Task management REST routes (retained during the grace period) ── */
-    if (handleTaskSse(req, res, url)) return;
-    if (handleTaskRoutes(req, res, url)) return;
+      /* ── Task management REST routes (retained during the grace period) ── */
+      if (handleTaskSse(req, res, url)) return;
+      if (handleTaskRoutes(req, res, url)) return;
 
 {{/if}}
-    if (url.pathname === '/mcp') {
-      /* Origin validation (DNS-rebinding protection per MCP spec) */
-      const origin = req.headers.origin;
-      if (allowedOrigin) {
-        if (origin && origin !== allowedOrigin) {
-          log('error', 'Origin rejected', { origin, allowedOrigin });
+      if (url.pathname === '/mcp') {
+        /* Origin validation (DNS-rebinding protection per MCP spec) */
+        const origin = req.headers.origin;
+        if (allowedOrigin) {
+          if (origin && origin !== allowedOrigin) {
+            log('error', 'Origin rejected', { origin, allowedOrigin });
+            res.writeHead(403, { 'Content-Type': 'application/json' });
+            res.end(JSON.stringify({ error: 'Forbidden: invalid origin' }));
+            return;
+          }
+        } else if (origin) {
+          /* No allowlist configured but Origin header present — reject cross-origin requests */
+          log('error', 'Cross-origin request rejected (ALLOWED_ORIGIN not set)', { origin });
           res.writeHead(403, { 'Content-Type': 'application/json' });
-          res.end(JSON.stringify({ error: 'Forbidden: invalid origin' }));
-          return;
-        }
-      } else if (origin) {
-        /* No allowlist configured but Origin header present — reject cross-origin requests */
-        log('error', 'Cross-origin request rejected (ALLOWED_ORIGIN not set)', { origin });
-        res.writeHead(403, { 'Content-Type': 'application/json' });
-        res.end(JSON.stringify({ error: 'Forbidden: ALLOWED_ORIGIN not configured' }));
-        return;
-      }
-
-      /* POST carries a JSON-RPC body: peek for server/discover + tasks/* and
-       * forward the parsed body to the transport. GET/DELETE (SSE stream /
-       * session teardown) pass straight through. */
-      if (method === 'POST') {
-        const raw = await readBody(req);
-        if (raw === null) {
-          rpcError(res, null, -32600, 'Request body too large');
-          return;
-        }
-        if (raw.length === 0) {
-          rpcError(res, null, -32600, 'Empty request body');
-          return;
-        }
-        let parsed: unknown;
-        try {
-          parsed = JSON.parse(raw.toString('utf-8'));
-        } catch {
-          rpcError(res, null, -32700, 'Parse error');
+          res.end(JSON.stringify({ error: 'Forbidden: ALLOWED_ORIGIN not configured' }));
           return;
         }
 
-        /* Intercept single-object JSON-RPC extension methods the SDK doesn't
-         * dispatch yet. Batches are forwarded untouched. */
-        if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
-          const rpcMethod = (parsed as { method?: unknown }).method;
-          const rpcId = (parsed as { id?: unknown }).id;
-          if (rpcMethod === 'server/discover') {
-            sendJson(res, 200, buildDiscoverResult(rpcId));
+        /* POST carries a JSON-RPC body: peek for server/discover + tasks/* and
+         * forward the parsed body to the transport. GET/DELETE (SSE stream /
+         * session teardown) pass straight through. */
+        if (method === 'POST') {
+          const raw = await readBody(req);
+          if (raw === null) {
+            rpcError(res, null, -32600, 'Request body too large');
             return;
           }
-{{#if hasAsyncTools}}
-          if (typeof rpcMethod === 'string' && rpcMethod.startsWith('tasks/')) {
-            const handled = handleTaskRpc(rpcMethod, (parsed as { params?: unknown }).params, rpcId);
-            if (handled) {
-              sendJson(res, 200, handled);
+          if (raw.length === 0) {
+            rpcError(res, null, -32600, 'Empty request body');
+            return;
+          }
+          let parsed: unknown;
+          try {
+            parsed = JSON.parse(raw.toString('utf-8'));
+          } catch {
+            rpcError(res, null, -32700, 'Parse error');
+            return;
+          }
+
+          /* Intercept single-object JSON-RPC extension methods the SDK doesn't
+           * dispatch yet. Batches are forwarded untouched. */
+          if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
+            const rpcMethod = (parsed as { method?: unknown }).method;
+            const rpcId = (parsed as { id?: unknown }).id;
+            if (rpcMethod === 'server/discover') {
+              sendJson(res, 200, buildDiscoverResult(rpcId));
               return;
             }
-          }
+{{#if hasAsyncTools}}
+            if (typeof rpcMethod === 'string' && rpcMethod.startsWith('tasks/')) {
+              const handled = handleTaskRpc(rpcMethod, (parsed as { params?: unknown }).params, rpcId);
+              if (handled) {
+                sendJson(res, 200, handled);
+                return;
+              }
+            }
 {{/if}}
-        }
+          }
 
-        await dispatchToTransport(req, res, parsed);
-        return;
-      }
+          await dispatchToTransport(req, res, parsed);
+          return;
+        }
 
-      await dispatchToTransport(req, res);
-    } else if (url.pathname === '/health') {
-      res.writeHead(200, { 'Content-Type': 'application/json' });
-      res.end(JSON.stringify({ status: 'ok' }));
-    } else if (url.pathname === '/ready') {
-      if (isReady) {
+        await dispatchToTransport(req, res);
+      } else if (url.pathname === '/health') {
         res.writeHead(200, { 'Content-Type': 'application/json' });
-        res.end(JSON.stringify({ status: 'ready' }));
+        res.end(JSON.stringify({ status: 'ok' }));
+      } else if (url.pathname === '/ready') {
+        if (isReady) {
+          res.writeHead(200, { 'Content-Type': 'application/json' });
+          res.end(JSON.stringify({ status: 'ready' }));
+        } else {
+          res.writeHead(503, { 'Content-Type': 'application/json' });
+          res.end(JSON.stringify({ status: 'not ready' }));
+        }
       } else {
-        res.writeHead(503, { 'Content-Type': 'application/json' });
-        res.end(JSON.stringify({ status: 'not ready' }));
+        res.writeHead(404);
+        res.end('Not found');
+      }
+    } catch (e) {
+      log('error', 'Unhandled error in request handler', { err: String(e) });
+      if (!res.headersSent) {
+        sendJson(res, 500, { error: 'Internal server error' });
       }
-    } else {
-      res.writeHead(404);
-      res.end('Not found');
     }
   });
 
@@ -489,8 +574,8 @@ if (transportMode === 'http') {
 
   /* ── Graceful shutdown ─────────────────────────────────────────────── */
 
-  process.on('SIGTERM', () => {
-    log('info', 'SIGTERM received, shutting down');
+  const shutdown = (signal: string) => {
+    log('info', `${signal} received, shutting down`);
     isReady = false;
     clearInterval(reaper);
 
@@ -514,7 +599,10 @@ if (transportMode === 'http') {
       log('error', 'Shutdown timed out after 5 s, forcing exit');
       process.exit(1);
     }, 5000).unref();
-  });
+  };
+
+  process.on('SIGTERM', () => shutdown('SIGTERM'));
+  process.on('SIGINT', () => shutdown('SIGINT'));
 } else {
   const server = createMcpServer(config);
   const transport = new StdioServerTransport();

package/dist/emitter/templates/task-handlers.ts.hbs

@@ -131,7 +131,8 @@ export function handleTaskRoutes(
 
     const statusParam = url.searchParams.get('status') ?? undefined;
     const limitParam = url.searchParams.get('limit');
-    const limit = limitParam ? parseInt(limitParam, 10) : 50;
+    const rawLimit = parseInt(limitParam ?? '', 10);
+    const limit = Number.isInteger(rawLimit) && rawLimit > 0 && rawLimit <= 1000 ? rawLimit : 50;
 
     if (statusParam && !VALID_STATUSES.has(statusParam)) {
       sendJson(res, 400, { error: `Invalid status filter: ${statusParam}` });

package/dist/emitter/templates/task-manager.ts.hbs

@@ -35,10 +35,12 @@ const MAX_TASKS = 1000;
 export const taskEvents = new EventEmitter();
 
 export function createTask(toolName: string): Task {
-  // Evict oldest if at capacity
+  // Evict a terminal task first; only fall back to the oldest (by insertion order) if none exist.
   if (tasks.size >= MAX_TASKS) {
-    const oldest = tasks.keys().next().value;
-    if (oldest) tasks.delete(oldest);
+    const terminalKey = [...tasks.entries()].find(
+      ([, t]) => t.status === 'completed' || t.status === 'failed' || t.status === 'cancelled',
+    )?.[0] ?? tasks.keys().next().value;
+    if (terminalKey !== undefined) tasks.delete(terminalKey);
   }
 
   const task: Task = {

package/dist/emitter/templates/task-sse.ts.hbs

@@ -37,7 +37,7 @@ function stopHeartbeatIfEmpty(): void {
 function broadcast(eventName: string, data: unknown, taskId: string): void {
   const payload = `event: ${eventName}\ndata: ${JSON.stringify(data)}\n\n`;
   for (const conn of connections) {
-    if (conn.res.writableEnded) continue;
+    if (conn.res.writableEnded) { connections.delete(conn); continue; }
     if (conn.taskIdFilter && conn.taskIdFilter !== taskId) continue;
     conn.res.write(payload);
   }
@@ -83,6 +83,14 @@ export function handleTaskSse(
 
   const taskIdFilter = url.searchParams.get('taskId') ?? null;
 
+  const rawMax = parseInt(process.env.MCP_MAX_SSE_CONNECTIONS ?? '', 10);
+  const maxConnections = Number.isInteger(rawMax) && rawMax > 0 ? rawMax : 500;
+  if (connections.size >= maxConnections) {
+    res.writeHead(503, { 'Content-Type': 'application/json' });
+    res.end(JSON.stringify({ error: 'SSE connection limit reached' }));
+    return true;
+  }
+
   res.writeHead(200, {
     'Content-Type': 'text/event-stream',
     'Cache-Control': 'no-cache',

package/dist/emitter/templates/tool-handler.ts.hbs

@@ -31,9 +31,9 @@ const controlSchema = {
 };
 
 const inputSchema = ({{{inputSchemaCode}}}).extend(controlSchema);
-{{#if outputSchemaCode}}
+{{#if outputSchemaCode}}{{#unless isAsync}}
 const outputSchema = {{{outputSchemaCode}}};
-{{/if}}
+{{/unless}}{{/if}}
 
 /** Execute the HTTP request for this tool and return the (optionally filtered) data. */
 async function runRequest(rawInput: Record<string, unknown>, config: AppConfig): Promise<unknown> {
@@ -86,9 +86,9 @@ export function register(server: McpServer, config: AppConfig): void {
       title: '{{title}}',
       description: `{{{description}}}`,
       inputSchema,
-{{#if outputSchemaCode}}
+{{#if outputSchemaCode}}{{#unless isAsync}}
       outputSchema,
-{{/if}}
+{{/unless}}{{/if}}
 {{#if annotations}}
       annotations: {
 {{#if annotations.readOnlyHint}}
@@ -136,6 +136,19 @@ export function register(server: McpServer, config: AppConfig): void {
               text: JSON.stringify(result, null, 2),
             },
           ],
+{{#if outputSchemaCode}}{{#unless isAsync}}
+          // MCP SDK validates structuredContent against outputSchema when set.
+          // wrapArrayRoot (schema-converter.ts) wraps ONLY type:array schemas as
+          // { type:object, properties:{ items }, required:[items] } and passes
+          // objects AND scalars through bare.  Mirror that exactly at runtime:
+          //   - array  → { items: result }  (matches the wrapped object schema)
+          //   - object → result as-is        (bare object, no wrap)
+          //   - scalar → result as-is        (bare scalar; cast required for TS)
+          structuredContent:
+            Array.isArray(result)
+              ? { items: result }
+              : (result as unknown as Record<string, unknown>),
+{{/unless}}{{/if}}
         };
       } catch (error) {
         const message = error instanceof Error ? error.message : String(error);

package/dist/emitter/worker-templates/config.ts.hbs

@@ -7,18 +7,26 @@ export interface AppConfig {
   baseUrl: string;
 {{#each authSchemes}}
 {{#if (eq type "apiKey")}}
+{{#unless (eq emitApiKeyValue false)}}
   apiKey?: string;
+{{/unless}}
 {{#if (eq in "query")}}
+{{#unless (eq emitApiKeyQueryName false)}}
   /** Query-parameter name the API key is appended under (apiKey-in-query auth). */
   apiKeyQueryName?: string;
+{{/unless}}
 {{/if}}
 {{/if}}
 {{#if (eq type "http-bearer")}}
+{{#unless (eq emitBearer false)}}
   bearerToken?: string;
+{{/unless}}
 {{/if}}
 {{#if (eq type "http-basic")}}
+{{#unless (eq emitBasic false)}}
   basicUsername?: string;
   basicPassword?: string;
+{{/unless}}
 {{/if}}
 {{/each}}
   maxRetries: number;
@@ -29,6 +37,17 @@ export interface AppConfig {
 
 type EnvLike = Record<string, string | undefined>;
 
+const posInt = (v: string | undefined, d: number): number => {
+  const n = parseInt(v ?? '', 10);
+  return Number.isInteger(n) && n > 0 ? n : d;
+};
+
+/** Like posInt but accepts 0 — useful where 0 is a meaningful "disable" value. */
+const nonNegInt = (v: string | undefined, d: number): number => {
+  const n = parseInt(v ?? '', 10);
+  return Number.isInteger(n) && n >= 0 ? n : d;
+};
+
 /**
  * Resolve the upstream base URL with optional named environments.
  * `MCP_ENVIRONMENTS` is a JSON object mapping name → base URL; `API_ENVIRONMENT`
@@ -72,9 +91,13 @@ export function loadConfig(env: EnvLike): AppConfig {
     baseUrl: resolveBaseUrl(env),
 {{#each authSchemes}}
 {{#if (eq type "apiKey")}}
+{{#unless (eq emitApiKeyValue false)}}
     apiKey: env.{{envVarName}},
+{{/unless}}
 {{#if (eq in "query")}}
+{{#unless (eq emitApiKeyQueryName false)}}
     apiKeyQueryName: {{{json headerName}}},
+{{/unless}}
 {{/if}}
 {{/if}}
 {{#if (eq type "http-bearer")}}
@@ -85,8 +108,8 @@ export function loadConfig(env: EnvLike): AppConfig {
     basicPassword: env.BASIC_PASSWORD,
 {{/if}}
 {{/each}}
-    maxRetries: parseInt(env.MAX_RETRIES ?? '3', 10),
-    requestIntervalMs: parseInt(env.REQUEST_INTERVAL_MS ?? '100', 10),
+    maxRetries: nonNegInt(env.MAX_RETRIES, 3),
+    requestIntervalMs: nonNegInt(env.REQUEST_INTERVAL_MS, 100),
     defaultHeaders: loadDefaultHeaders(env),
   };
 }

package/dist/emitter/worker-templates/worker.ts.hbs

@@ -216,8 +216,12 @@ async function handleToolCall(
   if (!parsed.success) {
     return err(id, -32602, `Invalid arguments for ${name}: ${parsed.error.message}`);
   }
-  const result = await entry.handler(parsed.data as Record<string, unknown>, config);
-  return ok(id, result);
+  try {
+    const result = await entry.handler(parsed.data as Record<string, unknown>, config);
+    return ok(id, result);
+  } catch {
+    return err(id, -32000, 'Tool execution error');
+  }
 }
 
 /* Map `items` through `fn` with at most `limit` in flight at once, preserving

package/dist/emitter/worker-templates/wrangler.toml.hbs

@@ -7,7 +7,11 @@ compatibility_flags = ["nodejs_compat"]
 
 # Non-secret configuration. Override per-environment as needed.
 [vars]
-BASE_URL = "{{baseUrl}}"
+# {{{json}}} emits a JSON string literal, which is a valid TOML basic string with
+# identical escape semantics. Unlike a raw "{{baseUrl}}" interpolation, this fully
+# escapes backslashes/quotes/newlines so an attacker-controlled URL cannot inject a
+# spurious key or [section] header into the generated wrangler.toml (A4-15).
+BASE_URL = {{{json baseUrl}}}
 MAX_RETRIES = "3"
 REQUEST_INTERVAL_MS = "100"
 # ALLOWED_ORIGIN = "https://your-client.example.com"

package/dist/index.d.ts

@@ -74,6 +74,7 @@ export { fail } from './utils/fail.js';
 export { pathExists } from './utils/fs.js';
 export { confirmOperations } from './utils/interactive.js';
 export { watchFile } from './utils/watcher.js';
+export { loadChromium } from './utils/playwright-loader.js';
 export { FAMILY_A_PRICING, DEFAULT_PRICING_SERVER, fetchPricing, formatPrice } from './pricing.js';
 export type { BillingPeriod, PricePoint } from './pricing.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,OAAO,EACL,WAAW,EACX,iBAAiB,EACjB,iBAAiB,EACjB,eAAe,GAChB,MAAM,oBAAoB,CAAC;AAC5B,YAAY,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAKxE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,YAAY,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AACpG,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,YAAY,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,MAAM,8BAA8B,CAAC;AAC9F,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,YAAY,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,YAAY,EAAE,eAAe,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACzF,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAKnE,OAAO,EACL,UAAU,EACV,WAAW,EACX,UAAU,EACV,cAAc,EACd,kBAAkB,GACnB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnF,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACjF,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,YAAY,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,YAAY,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,YAAY,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC1E,YAAY,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAC5F,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EACL,eAAe,EACf,mBAAmB,EACnB,sBAAsB,GACvB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAC1F,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAK3E,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AACpF,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,YAAY,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,YAAY,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAKnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AACjF,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAK3E,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAK5E,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACpF,YAAY,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAK3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAKtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC/E,YAAY,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAClF,OAAO,EAAE,6BAA6B,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC3F,YAAY,EAAE,qBAAqB,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAKpG,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAK7E,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAChF,YAAY,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAK3D,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAKhC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAK/C,OAAO,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AACnG,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -97,6 +97,7 @@ export { fail } from './utils/fail.js';
 export { pathExists } from './utils/fs.js';
 export { confirmOperations } from './utils/interactive.js';
 export { watchFile } from './utils/watcher.js';
+export { loadChromium } from './utils/playwright-loader.js';
 // ---------------------------------------------------------------------------
 // Pricing
 // ---------------------------------------------------------------------------