@jhzhu89/m2r 0.1.5 → 0.1.6

package/dist/index.js

@@ -16160,16 +16160,22 @@ function fromRequest(body) {
     for (const block of blocks) {
       if (block.type === "text") {
         content2.push({ type: "text", text: block.text });
-      } else if (block.type === "image") {
+        continue;
+      }
+      if (block.type === "image") {
         content2.push(parseImageBlock(block));
-      } else if (block.type === "tool_use") {
+        continue;
+      }
+      if (block.type === "tool_use") {
         content2.push({
           type: "tool_call",
           id: block.id,
           name: block.name,
           arguments: block.input
         });
-      } else if (block.type === "tool_result") {
+        continue;
+      }
+      if (block.type === "tool_result") {
         content2.push({
           type: "tool_result",
           id: block.tool_use_id,
@@ -16207,13 +16213,6 @@ function fromRequest(body) {
 function generateId(prefix = "msg") {
   return `${prefix}_${Date.now().toString(36)}${Math.random().toString(36).slice(2, 8)}`;
 }
-function mapStopReason(status, hasToolCall) {
-  if (hasToolCall)
-    return "tool_use";
-  if (status === "incomplete")
-    return "max_tokens";
-  return "end_turn";
-}
 
 // src/anthropic/to-response.ts
 function toContentBlock(c) {
@@ -26803,14 +26802,16 @@ function extractUpstreamRequestId(error49) {
   }
   return null;
 }
-function handleError(c, error49, ctx) {
+function handleError(errorOrUnused, maybeError, ctx) {
+  const error49 = maybeError ?? errorOrUnused;
+  const context = ctx ?? { reqId: "unknown" };
   const status = extractStatus(error49);
   const message2 = extractMessage(error49);
   const errorType = mapStatusToErrorType(status);
   const httpCode = mapStatusToHttpCode(status);
   logger.error({
-    reqId: ctx.reqId,
-    model: ctx.model,
+    reqId: context.reqId,
+    model: context.model,
     status,
     errorType,
     message: message2,
@@ -26846,61 +26847,12 @@ var init_error_mapper = __esm(() => {
   init_logger();
 });
 
-// src/config/index.ts
-var exports_config = {};
-__export(exports_config, {
-  resolveModel: () => resolveModel,
-  config: () => config2
-});
-function parseModelMap(env2) {
-  if (!env2)
-    return {};
-  const parsed = JSON.parse(env2);
-  if (typeof parsed !== "object" || parsed === null)
-    return {};
-  const result = {};
-  for (const [key, value] of Object.entries(parsed)) {
-    if (typeof value === "string") {
-      result[key] = value;
-    }
-  }
-  return result;
-}
-function resolveModel(alias) {
-  if (config2.modelMap[alias]) {
-    return config2.modelMap[alias];
-  }
-  const lower = alias.toLowerCase();
-  for (const [tier, model] of Object.entries(config2.tiers)) {
-    if (lower.includes(tier)) {
-      return model;
-    }
-  }
-  return alias;
-}
-var config2;
-var init_config = __esm(() => {
-  config2 = {
-    port: parseInt(process.env.PROXY_PORT || "8000"),
-    azure: {
-      endpoint: process.env.AZURE_OPENAI_ENDPOINT || "",
-      apiVersion: process.env.AZURE_OPENAI_API_VERSION || "2025-04-01-preview"
-    },
-    modelMap: parseModelMap(process.env.MODEL_MAP),
-    tiers: {
-      haiku: process.env.TIER_HAIKU || "gpt-5-mini",
-      sonnet: process.env.TIER_SONNET || "gpt-5.2",
-      opus: process.env.TIER_OPUS || "gpt-5.1-codex-max"
-    }
-  };
-});
-
 // src/config/model-config.ts
 function getModelConfig(slug) {
   const lower = slug.toLowerCase();
-  for (const { prefix, config: config3 } of MODEL_FAMILIES) {
+  for (const { prefix, config: config2 } of MODEL_FAMILIES) {
     if (lower.startsWith(prefix)) {
-      return config3;
+      return config2;
     }
   }
   return DEFAULT_CONFIG;
@@ -26983,6 +26935,74 @@ var init_model_config = __esm(() => {
   };
 });
 
+// src/config/routing.ts
+function resolveModel(config2, alias) {
+  if (config2.modelMap[alias]) {
+    return config2.modelMap[alias];
+  }
+  const lower = alias.toLowerCase();
+  for (const [tier, model] of Object.entries(config2.tiers)) {
+    if (lower.includes(tier)) {
+      return model;
+    }
+  }
+  return alias;
+}
+function resolveModelConfig(config2, model) {
+  const resolvedModel = resolveModel(config2, model);
+  const configSnapshot = getModelConfig(resolvedModel);
+  return { model: resolvedModel, config: configSnapshot };
+}
+var init_routing = __esm(() => {
+  init_model_config();
+});
+
+// src/config/index.ts
+var exports_config = {};
+__export(exports_config, {
+  resolveModelConfig: () => resolveModelConfig2,
+  resolveModel: () => resolveModel2,
+  config: () => config2
+});
+function parseModelMap(env2) {
+  if (!env2)
+    return {};
+  const parsed = JSON.parse(env2);
+  if (typeof parsed !== "object" || parsed === null)
+    return {};
+  const result = {};
+  for (const [key, value] of Object.entries(parsed)) {
+    if (typeof value === "string") {
+      result[key] = value;
+    }
+  }
+  return result;
+}
+var configSnapshot, config2, resolveModel2, resolveModelConfig2;
+var init_config = __esm(() => {
+  init_routing();
+  configSnapshot = {
+    port: parseInt(process.env.PROXY_PORT || "8000"),
+    azure: {
+      endpoint: process.env.AZURE_OPENAI_ENDPOINT || "",
+      apiVersion: process.env.AZURE_OPENAI_API_VERSION || "2025-04-01-preview"
+    },
+    modelMap: parseModelMap(process.env.MODEL_MAP),
+    tiers: {
+      haiku: process.env.TIER_HAIKU || "gpt-5-mini",
+      sonnet: process.env.TIER_SONNET || "gpt-5.2",
+      opus: process.env.TIER_OPUS || "gpt-5.1-codex-max"
+    }
+  };
+  config2 = {
+    ...configSnapshot,
+    resolveModel: (alias) => resolveModel(configSnapshot, alias),
+    resolveModelConfig: (model) => resolveModelConfig(configSnapshot, model)
+  };
+  resolveModel2 = config2.resolveModel;
+  resolveModelConfig2 = config2.resolveModelConfig;
+});
+
 // src/openai/to-request.ts
 function mapToolChoice(tc) {
   if (!tc || tc.type === "auto")
@@ -26991,7 +27011,7 @@ function mapToolChoice(tc) {
     return "required";
   return { type: "function", name: tc.name };
 }
-function toResponsesRequest(ir) {
+function buildInput(ir) {
   const input = [];
   for (const msg of ir.messages) {
     if (msg.role === "system") {
@@ -26999,14 +27019,20 @@ function toResponsesRequest(ir) {
         role: "system",
         content: msg.content.map((c) => c.type === "text" ? c.text : "").join("")
       });
-    } else if (msg.role === "user") {
+      continue;
+    }
+    if (msg.role === "user") {
       const parts = [];
       for (const c of msg.content) {
         if (c.type === "text") {
           parts.push({ type: "input_text", text: c.text });
-        } else if (c.type === "image") {
+          continue;
+        }
+        if (c.type === "image") {
           parts.push({ type: "input_image", image_url: c.url, detail: "auto" });
-        } else if (c.type === "tool_result") {
+          continue;
+        }
+        if (c.type === "tool_result") {
           input.push({
             type: "function_call_output",
             call_id: c.id,
@@ -27017,22 +27043,24 @@ function toResponsesRequest(ir) {
       if (parts.length > 0) {
         input.push({ type: "message", role: "user", content: parts });
       }
-    } else {
-      for (const c of msg.content) {
-        if (c.type === "text") {
-          input.push({
-            type: "message",
-            role: "assistant",
-            content: c.text
-          });
-        } else if (c.type === "tool_call") {
-          input.push({
-            type: "function_call",
-            call_id: c.id,
-            name: c.name,
-            arguments: JSON.stringify(c.arguments)
-          });
-        }
+      continue;
+    }
+    for (const c of msg.content) {
+      if (c.type === "text") {
+        input.push({
+          type: "message",
+          role: "assistant",
+          content: c.text
+        });
+        continue;
+      }
+      if (c.type === "tool_call") {
+        input.push({
+          type: "function_call",
+          call_id: c.id,
+          name: c.name,
+          arguments: JSON.stringify(c.arguments)
+        });
       }
     }
   }
@@ -27043,13 +27071,15 @@ function toResponsesRequest(ir) {
     parameters: { type: "object", ...t.inputSchema },
     strict: null
   }));
-  const model = resolveModel(ir.model);
-  const modelConfig = getModelConfig(model);
+  const toolChoice2 = mapToolChoice(ir.toolChoice);
+  return { input, tools, toolChoice: toolChoice2 };
+}
+function buildOpenAIRequest(ir, model, modelConfig) {
+  const { input, tools, toolChoice: toolChoice2 } = buildInput(ir);
   const reasoning = modelConfig.supportsReasoningSummaries ? {
     effort: ir.thinking?.effort ?? modelConfig.defaultReasoningEffort ?? "medium",
     summary: "auto"
   } : undefined;
-  const toolChoice2 = mapToolChoice(ir.toolChoice);
   return {
     model,
     input,
@@ -27063,11 +27093,23 @@ function toResponsesRequest(ir) {
     ...ir.topP !== undefined && { top_p: ir.topP }
   };
 }
+function toResponsesRequest(ir, resolved) {
+  const resolution = resolved ?? config2.resolveModelConfig(ir.model);
+  return buildOpenAIRequest(ir, resolution.model, resolution.config);
+}
 var init_to_request = __esm(() => {
   init_config();
-  init_model_config();
 });
 
+// src/openai/stop-reason.ts
+function mapOpenAIStopReason(status, hasToolCall) {
+  if (hasToolCall)
+    return "tool_use";
+  if (status === "incomplete")
+    return "max_tokens";
+  return "end_turn";
+}
+
 // src/openai/from-response.ts
 function isOutputText(c) {
   return c.type === "output_text";
@@ -27096,7 +27138,7 @@ function fromResponse(response) {
   const hasToolCall = content2.some((c) => c.type === "tool_call");
   return {
     content: content2,
-    stopReason: mapStopReason(response.status, hasToolCall),
+    stopReason: mapOpenAIStopReason(response.status, hasToolCall),
     usage: {
       inputTokens: response.usage?.input_tokens ?? 0,
       outputTokens: response.usage?.output_tokens ?? 0
@@ -27183,7 +27225,7 @@ function* fromStreamEvent(event) {
     const hasToolCall = event.response.output.some((item) => item.type === "function_call");
     yield {
       type: "done",
-      stopReason: mapStopReason(event.response.status, hasToolCall),
+      stopReason: mapOpenAIStopReason(event.response.status, hasToolCall),
       usage: {
         inputTokens: event.response.usage?.input_tokens ?? 0,
         outputTokens: event.response.usage?.output_tokens ?? 0
@@ -31769,19 +31811,19 @@ function createApp(client) {
     }
     const ir = fromRequest(validation.data);
     const reqId = generateId("req");
-    const resolvedModel = resolveModel(ir.model);
+    const resolved = resolveModelConfig2(ir.model);
     c.header("x-request-id", reqId);
     logger.info({
       reqId,
       model: ir.model,
-      resolvedModel,
+      resolvedModel: resolved.model,
       stream: ir.stream,
       maxTokens: ir.maxTokens,
       tools: ir.tools?.length ?? 0,
       thinking: ir.thinking?.type === "enabled"
     }, "request received");
     if (!ir.stream) {
-      const openaiReq = toResponsesRequest(ir);
+      const openaiReq = toResponsesRequest(ir, resolved);
       try {
         const openaiRes = await client.responses.create(openaiReq);
         const irRes = fromResponse(openaiRes);
@@ -31794,14 +31836,14 @@ function createApp(client) {
         }, "non-streaming response complete");
         return c.json(anthropicRes);
       } catch (error49) {
-        return handleError(c, error49, { reqId, model: resolvedModel });
+        return handleError(error49, { reqId, model: resolved.model });
       }
     }
     c.header("Content-Type", "text/event-stream");
     c.header("Cache-Control", "no-cache");
     c.header("Connection", "keep-alive");
     return stream(c, async (s) => {
-      const openaiReq = toResponsesRequest(ir);
+      const openaiReq = toResponsesRequest(ir, resolved);
       try {
         const openaiStream = await client.responses.create({
           ...openaiReq,
@@ -31817,7 +31859,10 @@ function createApp(client) {
         }
         logger.info({ reqId }, "streaming response complete");
       } catch (error49) {
-        for (const sse of streamError(error49, { reqId, model: resolvedModel })) {
+        for (const sse of streamError(error49, {
+          reqId,
+          model: resolved.model
+        })) {
           await s.write(sse);
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jhzhu89/m2r",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "Anthropic Messages API to Azure OpenAI Responses API proxy",
   "type": "module",
   "license": "MIT",
@@ -36,7 +36,6 @@
     "test:watch": "bun test --watch ./test/unit"
   },
   "dependencies": {
-    "@anthropic-ai/sdk": "^0.71.2",
     "@azure/identity": "^4.13.0",
     "dotenv": "^17.2.3",
     "gpt-tokenizer": "^3.4.0",
@@ -46,6 +45,7 @@
     "zod": "^4.3.4"
   },
   "devDependencies": {
+    "@anthropic-ai/sdk": "^0.71.2",
     "@eslint/js": "^9.39.2",
     "@types/bun": "latest",
     "eslint": "^9.39.2",