@kylindc/ccxray 1.2.0 → 1.2.2

package/server/forward.js

@@ -36,7 +36,16 @@ function forwardBedrockRequest(ctx) {
   const { id, ts, startTime, parsedBody, rawBody, clientReq, clientRes, reqSessionId } = ctx;
 
   const statsStripped = stripInjectedStats(parsedBody);
-  const bodyToSend = (ctx.bodyModified || statsStripped) ? Buffer.from(JSON.stringify(parsedBody)) : rawBody;
+
+  // Translate the Anthropic API body to Bedrock native format:
+  //   - add anthropic_version (Bedrock requires it in the body; Claude Code sends it as a header)
+  //   - strip `model` (encoded in the URL) and `stream` (indicated by the endpoint path)
+  const baseBody = parsedBody || JSON.parse(rawBody.toString());
+  const { model: _model, stream: _stream, ...bedrockFields } = baseBody;
+  const bodyToSend = Buffer.from(JSON.stringify({
+    anthropic_version: 'bedrock-2023-05-31',
+    ...bedrockFields,
+  }));
 
   // Resolve Bedrock model ID
   let bedrockModelId;
@@ -49,6 +58,26 @@ function forwardBedrockRequest(ctx) {
     }
     clientRes.writeHead(400, { 'Content-Type': 'application/json' });
     clientRes.end(JSON.stringify({ error: 'bedrock_model_unknown', message: err.message }));
+    const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
+    const errEvent = [{ type: 'error', error: 'bedrock_model_unknown', message: err.message }];
+    const resWritePromise = config.storage.write(id, '_res.json', JSON.stringify(errEvent))
+      .catch(e => console.error('Write res.json failed:', e.message));
+    const entry = {
+      id, ts, sessionId: reqSessionId, method: clientReq.method, url: clientReq.url,
+      req: parsedBody, res: errEvent, elapsed, status: 400, isSSE: false,
+      tokens: helpers.tokenizeRequest(parsedBody),
+      usage: null, cost: null, maxContext: null,
+      cwd: store.sessionMeta[reqSessionId]?.cwd || null,
+      receivedAt: startTime, model: parsedBody?.model || null,
+      msgCount: parsedBody?.messages?.length || 0, toolCount: parsedBody?.tools?.length || 0,
+      stopReason: 'error', title: null,
+      sysHash: ctx.sysHash || null, toolsHash: ctx.toolsHash || null,
+    };
+    entry._writePromise = Promise.all([ctx.reqWritePromise, resWritePromise].filter(Boolean));
+    store.entries.push(entry);
+    store.trimEntries();
+    broadcast(entry);
+    console.error(`\x1b[31m❌ BEDROCK MODEL UNKNOWN: ${err.message}\x1b[0m`);
     return;
   }
 
@@ -67,8 +96,8 @@ function forwardBedrockRequest(ctx) {
   fwdHeaders['host'] = url.hostname;
 
   // Auth: bearer token takes precedence over SigV4
-  if (config.BEDROCK_BEARER_TOKEN) {
-    fwdHeaders['authorization'] = `Bearer ${config.BEDROCK_BEARER_TOKEN}`;
+  if (config.AWS_BEARER_TOKEN_BEDROCK) {
+    fwdHeaders['authorization'] = `Bearer ${config.AWS_BEARER_TOKEN_BEDROCK}`;
   } else {
     const creds = config.BEDROCK_CREDENTIALS;
     const signed = sigv4.sign('POST', bedrockUrl, fwdHeaders, bodyToSend, creds, config.BEDROCK_RESOLVED_REGION, 'bedrock');
@@ -109,6 +138,26 @@ function forwardBedrockRequest(ctx) {
       clientRes.writeHead(502, { 'Content-Type': 'application/json' });
     }
     clientRes.end(JSON.stringify({ error: 'proxy_error', message: err.message }));
+
+    const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
+    const errEvent = [{ type: 'error', error: 'proxy_error', message: err.message }];
+    const resWritePromise = config.storage.write(id, '_res.json', JSON.stringify(errEvent))
+      .catch(e => console.error('Write res.json failed:', e.message));
+    const entry = {
+      id, ts, sessionId: reqSessionId, method: clientReq.method, url: clientReq.url,
+      req: parsedBody, res: errEvent, elapsed, status: 502, isSSE: false,
+      tokens: helpers.tokenizeRequest(parsedBody),
+      usage: null, cost: null, maxContext: null,
+      cwd: store.sessionMeta[reqSessionId]?.cwd || null,
+      receivedAt: startTime, model: parsedBody?.model || null,
+      msgCount: parsedBody?.messages?.length || 0, toolCount: parsedBody?.tools?.length || 0,
+      stopReason: 'error', title: null,
+      sysHash: ctx.sysHash || null, toolsHash: ctx.toolsHash || null,
+    };
+    entry._writePromise = Promise.all([ctx.reqWritePromise, resWritePromise].filter(Boolean));
+    store.entries.push(entry);
+    store.trimEntries();
+    broadcast(entry);
   });
 
   proxyReq.end(bodyToSend);
@@ -166,7 +215,32 @@ function handleBedrockSSEResponse(ctx, proxyRes, clientRes, bedrockModelId) {
   });
 
   proxyRes.on('end', () => {
-    if (streamErrored) return;
+    if (streamErrored) {
+      const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
+      const errEvent = [{ type: 'error', error: 'modelStreamErrorException' }];
+      const resWritePromise = config.storage.write(id, '_res.json', JSON.stringify(errEvent))
+        .catch(e => console.error('Write res.json failed:', e.message));
+      if (reqSessionId) {
+        store.activeRequests[reqSessionId] = Math.max(0, (store.activeRequests[reqSessionId] || 1) - 1);
+        broadcastSessionStatus(reqSessionId);
+      }
+      const entry = {
+        id, ts: ctx.ts, sessionId: reqSessionId, method: ctx.clientReq.method, url: ctx.clientReq.url,
+        req: parsedBody, res: errEvent, elapsed, status: 500, isSSE: true,
+        tokens: helpers.tokenizeRequest(parsedBody),
+        usage: null, cost: null, maxContext: null,
+        cwd: store.sessionMeta[reqSessionId]?.cwd || null,
+        receivedAt: startTime, model: parsedBody?.model || null,
+        msgCount: parsedBody?.messages?.length || 0, toolCount: parsedBody?.tools?.length || 0,
+        stopReason: 'error', title: null,
+        sysHash: ctx.sysHash || null, toolsHash: ctx.toolsHash || null,
+      };
+      entry._writePromise = Promise.all([ctx.reqWritePromise, resWritePromise].filter(Boolean));
+      store.entries.push(entry);
+      store.trimEntries();
+      broadcast(entry);
+      return;
+    }
 
     if (ctx.skipEntry) {
       for (const held of heldEventStrs) clientRes.write(held);

package/server/index.js

@@ -291,6 +291,12 @@ function spawnClaude(port, args) {
         delete childEnv[key];
       }
     }
+    // Bedrock users typically have no ANTHROPIC_API_KEY. Without it, Claude Code
+    // refuses to start ("Not logged in"). Set a placeholder — ccxray strips the
+    // x-api-key header before forwarding to Bedrock, so it never reaches AWS.
+    if (!childEnv.ANTHROPIC_API_KEY) {
+      childEnv.ANTHROPIC_API_KEY = 'bedrock-via-ccxray';
+    }
   }
   const child = spawn('claude', args, {
     stdio: 'inherit',
@@ -405,9 +411,18 @@ async function startClientMode(lock) {
 
   // Spawn claude pointing to hub
   const { spawn } = require('child_process');
+  let hubClientEnv = { ...process.env, ANTHROPIC_BASE_URL: `http://localhost:${lock.port}` };
+  if (config.IS_BEDROCK_MODE) {
+    for (const key of Object.keys(hubClientEnv)) {
+      if (key.startsWith('AWS_') || key === 'CLAUDE_CODE_USE_BEDROCK') delete hubClientEnv[key];
+    }
+    if (!hubClientEnv.ANTHROPIC_API_KEY) {
+      hubClientEnv.ANTHROPIC_API_KEY = 'bedrock-via-ccxray';
+    }
+  }
   const child = spawn('claude', claudeArgs, {
     stdio: 'inherit',
-    env: { ...process.env, ANTHROPIC_BASE_URL: `http://localhost:${lock.port}` },
+    env: hubClientEnv,
   });
   child.on('error', (err) => {
     if (err.code === 'ENOENT') {
@@ -435,13 +450,13 @@ async function startServer() {
   if (config.IS_BEDROCK_MODE) {
     const activationSource = config.BEDROCK_ACTIVATION_SOURCE
       || (process.argv.includes('--bedrock') ? '--bedrock flag' : 'unknown');
-    if (config.BEDROCK_BEARER_TOKEN) {
+    if (config.AWS_BEARER_TOKEN_BEDROCK) {
       _origLog(`\x1b[36mBedrock mode: ${config.BEDROCK_RESOLVED_REGION} (bearer token auth, via ${activationSource})\x1b[0m`);
     } else {
       const { resolveCredentials } = require('./bedrock-credentials');
       const creds = await resolveCredentials();
       if (!creds) {
-        console.error('\x1b[31mBedrock mode requires auth. Set BEDROCK_BEARER_TOKEN, AWS_ACCESS_KEY_ID/AWS_SECRET_ACCESS_KEY, or configure ~/.aws/credentials\x1b[0m');
+        console.error('\x1b[31mBedrock mode requires auth. Set AWS_BEARER_TOKEN_BEDROCK, AWS_ACCESS_KEY_ID/AWS_SECRET_ACCESS_KEY, or configure ~/.aws/credentials\x1b[0m');
         process.exit(1);
       }
       config.BEDROCK_CREDENTIALS = creds;