@stage-labs/metro 0.1.0-beta.29 → 0.1.0-beta.30

package/dist/bedrock-proxy.js

@@ -1,5 +1,6 @@
 import { createServer, } from 'node:http';
 import { EventStreamDecoder } from './bedrock-eventstream.js';
+import { callBedrock, freshAdaptations, invoke, invokeUrl, upstreamMessage, } from './bedrock-upstream.js';
 export class BedrockConfigError extends Error {
 }
 export class ProxyError extends Error {
@@ -108,45 +109,6 @@ async function readBody(req) {
         throw new ProxyError(400, 'invalid_request_error', 'body must be JSON');
     }
 }
-function invokeUrl(up, modelId, action) {
-    return `${up.base}/model/${encodeURIComponent(modelId)}/${action}`;
-}
-function callBedrock(up, url, body, accept, signal) {
-    return fetch(url, {
-        method: 'POST',
-        headers: {
-            authorization: `Bearer ${up.cfg.bearerToken}`,
-            'content-type': 'application/json',
-            accept,
-        },
-        body: JSON.stringify(body),
-        signal,
-    });
-}
-async function invoke(up, req, signal) {
-    const action = req.stream ? 'invoke-with-response-stream' : 'invoke';
-    const accept = req.stream ? 'application/vnd.amazon.eventstream' : 'application/json';
-    const url = invokeUrl(up, req.modelId, action);
-    const first = await callBedrock(up, url, req.body, accept, signal);
-    if (first.status !== 400 || req.betas.length === 0)
-        return first;
-    await first.text();
-    process.stderr.write(`metro bedrock: retrying without anthropic_beta [${req.betas.join(', ')}]\n`);
-    const stripped = Object.fromEntries(Object.entries(req.body).filter(([key]) => key !== 'anthropic_beta'));
-    return callBedrock(up, url, stripped, accept, signal);
-}
-function upstreamMessage(text) {
-    try {
-        const parsed = JSON.parse(text);
-        const message = parsed.message ?? parsed.Message;
-        if (typeof message === 'string' && message !== '')
-            return message;
-    }
-    catch {
-        return text === '' ? 'Bedrock returned no body' : text;
-    }
-    return text === '' ? 'Bedrock returned no body' : text;
-}
 async function relayError(upstream, res) {
     const text = await upstream.text();
     const kind = errorKind(upstream.status, upstream.headers.get('x-amzn-errortype'));
@@ -248,11 +210,11 @@ function presentedToken(req) {
     const key = req.headers['x-api-key'];
     return Array.isArray(key) ? (key[0] ?? '') : (key ?? '');
 }
-async function route(req, res, cfg, opts) {
+async function route(req, res, cfg, opts, learned) {
     if (presentedToken(req) !== opts.token)
         throw new ProxyError(401, 'authentication_error', 'unauthorized');
     const path = (req.url ?? '').split('?')[0] ?? '';
-    const up = { cfg, base: upstreamBase(cfg, opts.upstream) };
+    const up = { cfg, base: upstreamBase(cfg, opts.upstream), learned };
     if (req.method === 'POST' && path === MESSAGES_PATH)
         return handleMessages(req, res, up);
     if (req.method === 'POST' && path === COUNT_PATH)
@@ -272,8 +234,9 @@ function failed(res, err) {
     sendError(res, 502, 'api_error', `metro bedrock proxy: ${message}`);
 }
 export function startBedrockProxy(cfg, opts) {
+    const learned = freshAdaptations();
     const server = createServer((req, res) => {
-        route(req, res, cfg, opts).catch((err) => {
+        route(req, res, cfg, opts, learned).catch((err) => {
             failed(res, err);
         });
     });
@@ -285,6 +248,7 @@ export function startBedrockProxy(cfg, opts) {
             resolve({
                 port,
                 server,
+                learned,
                 close: () => new Promise((done) => {
                     server.close(() => {
                         done();

package/dist/bedrock-upstream.js

@@ -0,0 +1,72 @@
+export const freshAdaptations = () => ({
+    fields: new Set(),
+    dropBetas: false,
+});
+const EXTRA_INPUT_RE = /^([A-Za-z0-9_]+)(?:\.[^:]*)?: Extra inputs are not permitted/;
+const MAX_REPAIRS = 4;
+export function invokeUrl(up, modelId, action) {
+    return `${up.base}/model/${encodeURIComponent(modelId)}/${action}`;
+}
+export function callBedrock(up, url, body, accept, signal) {
+    return fetch(url, {
+        method: 'POST',
+        headers: {
+            authorization: `Bearer ${up.cfg.bearerToken}`,
+            'content-type': 'application/json',
+            accept,
+        },
+        body: JSON.stringify(body),
+        signal,
+    });
+}
+export function upstreamMessage(text) {
+    const fallback = text === '' ? 'Bedrock returned no body' : text;
+    try {
+        const parsed = JSON.parse(text);
+        const message = parsed.message ?? parsed.Message;
+        return typeof message === 'string' && message !== '' ? message : fallback;
+    }
+    catch {
+        return fallback;
+    }
+}
+const without = (body, keys) => Object.fromEntries(Object.entries(body).filter(([key]) => !keys.has(key)));
+function applyLearned(req, learned) {
+    const dropped = new Set(learned.fields);
+    if (learned.dropBetas)
+        dropped.add('anthropic_beta');
+    return {
+        body: without(req.body, dropped),
+        betas: learned.dropBetas ? [] : req.betas,
+    };
+}
+function repair(attempt, learned, message) {
+    const named = EXTRA_INPUT_RE.exec(message)?.[1];
+    if (named !== undefined && named in attempt.body) {
+        learned.fields.add(named);
+        process.stderr.write(`metro bedrock: Bedrock refused "${named}" (extra input); dropping it from every request\n`);
+        return { body: without(attempt.body, new Set([named])), betas: attempt.betas };
+    }
+    if (attempt.betas.length > 0) {
+        learned.dropBetas = true;
+        process.stderr.write(`metro bedrock: retrying without anthropic_beta [${attempt.betas.join(', ')}]\n`);
+        return { body: without(attempt.body, new Set(['anthropic_beta'])), betas: [] };
+    }
+    return null;
+}
+export async function invoke(up, req, signal) {
+    const action = req.stream ? 'invoke-with-response-stream' : 'invoke';
+    const accept = req.stream ? 'application/vnd.amazon.eventstream' : 'application/json';
+    const url = invokeUrl(up, req.modelId, action);
+    let attempt = applyLearned(req, up.learned);
+    for (let repairs = 0;; repairs += 1) {
+        const res = await callBedrock(up, url, attempt.body, accept, signal);
+        if (res.status !== 400 || repairs >= MAX_REPAIRS)
+            return res;
+        const text = await res.text();
+        const next = repair(attempt, up.learned, upstreamMessage(text));
+        if (next === null)
+            return new Response(text, { status: 400, headers: res.headers });
+        attempt = next;
+    }
+}

package/dist/bedrock.js

@@ -56,10 +56,15 @@ export function settingsConflicts(files) {
     }
     return out;
 }
-export function claudeEnv(base, port, token) {
+export function firstPartyModelId(bedrockId) {
+    return bedrockId.replace(/^(?:[a-z-]+\.)?anthropic\./, '').replace(/-v\d+:\d+$/, '');
+}
+export function claudeEnv(base, port, token, pinned = null) {
     const kept = Object.entries(base).filter(([key]) => !SCRUBBED.includes(key));
+    const model = (base.ANTHROPIC_MODEL ?? '').trim();
     return {
         ...Object.fromEntries(kept),
+        ...(pinned !== null && model === '' && { ANTHROPIC_MODEL: firstPartyModelId(pinned) }),
         ANTHROPIC_BASE_URL: `http://127.0.0.1:${String(port)}`,
         ANTHROPIC_AUTH_TOKEN: token,
     };
@@ -91,7 +96,7 @@ export async function bedrock(argv) {
     const pinned = cfg.model === null ? '' : ` (${cfg.model})`;
     process.stderr.write(`metro bedrock: Claude Code → http://127.0.0.1:${String(proxy.port)} → Bedrock ${cfg.region}${pinned}\n`);
     try {
-        return await runClaude(claudeArgs(argv), claudeEnv(process.env, proxy.port, token));
+        return await runClaude(claudeArgs(argv), claudeEnv(process.env, proxy.port, token, cfg.model));
     }
     finally {
         await proxy.close();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stage-labs/metro",
-  "version": "0.1.0-beta.29",
+  "version": "0.1.0-beta.30",
   "description": "The metro command line. Sign in once per machine, then hand your MCP connector list to Claude Code without the credentials touching disk, argv or shell history.",
   "license": "MIT",
   "repository": {

package/runtime/runtime.json

@@ -1,3 +1,3 @@
 {
-  "version": "0.1.0-beta.29"
+  "version": "0.1.0-beta.30"
 }