@jhzhu89/m2r 0.1.6 → 0.1.8

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 Jiahao Zhu <jiahzhu@outlook.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,7 +1,6 @@
 # m2r
 
-Anthropic Messages API to Azure OpenAI Responses API proxy.
-
+Anthropic Messages API → Azure OpenAI Responses API proxy.
 Enables Claude Code CLI and other Anthropic-compatible clients to use Azure OpenAI as the backend.
 
 ## Installation
@@ -12,16 +11,28 @@ npm install -g @jhzhu89/m2r
 
 ## Configuration
 
-Create `~/.m2rrc` with your Azure OpenAI credentials:
+Create `~/.m2rrc` with your Azure OpenAI settings (Entra ID only; API keys are not used):
 
 ```bash
+# Required
 AZURE_OPENAI_ENDPOINT=https://your-resource.openai.azure.com
-AZURE_OPENAI_API_KEY=your-api-key
-AZURE_OPENAI_DEPLOYMENT=your-deployment-name
-PROXY_PORT=8001
+
+# Optional
+AZURE_OPENAI_API_VERSION=2025-04-01-preview
+PROXY_PORT=8000
 LOG_LEVEL=info
+
+# Model routing (optional)
+MODEL_MAP={"claude-3-5-sonnet":"gpt-5.2"}
+TIER_HAIKU=gpt-5-mini
+TIER_SONNET=gpt-5.2
+TIER_OPUS=gpt-5.1-codex-max
 ```
 
+Auth uses `DefaultAzureCredential`, so ensure your environment is logged in (e.g., `az login`) or set the usual `AZURE_CLIENT_ID` / `AZURE_TENANT_ID` / `AZURE_CLIENT_SECRET`.
+
+Routing: `MODEL_MAP` overrides exact model aliases; otherwise `haiku`/`sonnet`/`opus` substrings map to the configured tier models.
+
 ## Usage
 
 Start the proxy server:
@@ -30,19 +41,42 @@ Start the proxy server:
 m2r
 ```
 
-Then point your Anthropic client to `http://localhost:8001`.
+Then point your Anthropic client to `http://localhost:8000`.
+
+## Linux (systemd user service)
+
+Install and start:
+
+```bash
+./scripts/m2r-service.sh install
+```
+
+Status and logs:
+
+```bash
+systemctl --user status m2r.service
+journalctl --user -u m2r.service -f
+```
+
+Enable start on boot without login:
 
-## Shell Integration
+```bash
+loginctl enable-linger $USER
+```
 
-These shell functions automatically start `m2r` when you run `claude` and configure the necessary environment variables.
+Uninstall:
+
+```bash
+./scripts/m2r-service.sh uninstall
+```
 
-### Zsh / Bash
+### Zsh / Bash (optional helpers)
 
 Add to `~/.zshrc` or `~/.bashrc`:
 
 ```bash
 claude() {
-    local proxy_port=8001
+    local proxy_port=8000
     local m2rrc="$HOME/.m2rrc"
 
     if [[ -f "$m2rrc" ]]; then
@@ -65,34 +99,39 @@ claude() {
     command claude "$@"
 }
 
-m2r-log() {
-    local log="$HOME/.local/log/m2r.log"
-    local follow=false tail=50
-    while [[ $# -gt 0 ]]; do
-        case "$1" in
-            -f|--follow) follow=true; shift ;;
-            -n|--tail) tail="$2"; shift 2 ;;
-            *) shift ;;
-        esac
-    done
-    [[ ! -f "$log" ]] && echo "Log not found: $log" && return 1
-    $follow && tail -n "$tail" -f "$log" || tail -n "$tail" "$log"
-}
-
-m2r-restart() {
-    local proxy_port=8001 m2rrc="$HOME/.m2rrc"
-    if [[ -f "$m2rrc" ]]; then
-        local port_line=$(grep '^PROXY_PORT=' "$m2rrc")
-        [[ -n "$port_line" ]] && proxy_port="${port_line#PROXY_PORT=}"
-    fi
-    pkill -f "node.*m2r" 2>/dev/null && echo "Stopped m2r" || echo "m2r not running"
-    mkdir -p "$HOME/.local/log"
-    nohup m2r >> "$HOME/.local/log/m2r.log" 2>&1 &
-    for i in {1..10}; do
-        sleep 0.3
-        nc -z localhost "$proxy_port" 2>/dev/null && echo "m2r started on port $proxy_port" && return 0
-    done
-    echo "Failed to start m2r"; return 1
+m2r-config() {
+    local m2rrc="$HOME/.m2rrc"
+    local action="$1"
+    local key="$2"
+    local value="$3"
+
+    mkdir -p "$(dirname "$m2rrc")"
+
+    case "$action" in
+        get)
+            [[ -z "$key" ]] && echo "Usage: m2r-config get KEY" && return 1
+            [[ -f "$m2rrc" ]] && grep -E "^${key}=" "$m2rrc" | tail -n 1 | cut -d= -f2-
+            ;;
+        set)
+            [[ -z "$key" || -z "$value" ]] && echo "Usage: m2r-config set KEY VALUE" && return 1
+            if [[ -f "$m2rrc" ]] && grep -q "^${key}=" "$m2rrc"; then
+                if sed --version >/dev/null 2>&1; then
+                    sed -i "s|^${key}=.*|${key}=${value}|" "$m2rrc"
+                else
+                    sed -i '' "s|^${key}=.*|${key}=${value}|" "$m2rrc"
+                fi
+            else
+                echo "${key}=${value}" >> "$m2rrc"
+            fi
+            ;;
+        list|"")
+            [[ -f "$m2rrc" ]] && cat "$m2rrc" || true
+            ;;
+        *)
+            echo "Usage: m2r-config [list|get KEY|set KEY VALUE]"
+            return 1
+            ;;
+    esac
 }
 ```
 
@@ -106,7 +145,7 @@ function Get-M2rPort {
     if (Test-Path $m2rrc) {
         switch -Regex -File $m2rrc { '^PROXY_PORT=(\d+)' { return [int]$Matches[1] } }
     }
-    return 8001
+    return 8000
 }
 
 function Test-M2rRunning($port) {

package/dist/index.js

@@ -26850,16 +26850,16 @@ var init_error_mapper = __esm(() => {
 // src/config/model-config.ts
 function getModelConfig(slug) {
   const lower = slug.toLowerCase();
-  for (const { prefix, config: config2 } of MODEL_FAMILIES) {
+  for (const { prefix, config: config2 } of modelFamilies) {
     if (lower.startsWith(prefix)) {
       return config2;
     }
   }
-  return DEFAULT_CONFIG;
+  return defaultConfig;
 }
-var MODEL_FAMILIES, DEFAULT_CONFIG;
+var modelFamilies, defaultConfig;
 var init_model_config = __esm(() => {
-  MODEL_FAMILIES = [
+  modelFamilies = [
     {
       prefix: "gpt-5.2-codex",
       config: {
@@ -26928,79 +26928,69 @@ var init_model_config = __esm(() => {
       }
     }
   ];
-  DEFAULT_CONFIG = {
+  defaultConfig = {
     supportsParallelToolCalls: false,
     supportsReasoningSummaries: false,
     contextWindow: 128000
   };
 });
 
-// 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,
+  resolveModelConfig: () => resolveModelConfig,
+  resolveModel: () => resolveModel,
+  getModelConfig: () => getModelConfig,
   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;
+  try {
+    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;
+  } catch {
+    return {};
   }
-  return result;
 }
-var configSnapshot, config2, resolveModel2, resolveModelConfig2;
+function resolveModel(alias) {
+  if (modelMap[alias])
+    return modelMap[alias];
+  const lower = alias.toLowerCase();
+  for (const [tier, model] of Object.entries(tiers)) {
+    if (lower.includes(tier))
+      return model;
+  }
+  return alias;
+}
+function resolveModelConfig(model) {
+  const resolved = resolveModel(model);
+  return { model: resolved, config: getModelConfig(resolved) };
+}
+var modelMap, tiers, config2;
 var init_config = __esm(() => {
-  init_routing();
-  configSnapshot = {
+  init_model_config();
+  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 = {
     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)
+    tiers
   };
-  resolveModel2 = config2.resolveModel;
-  resolveModelConfig2 = config2.resolveModelConfig;
 });
 
 // src/openai/to-request.ts
@@ -27094,7 +27084,7 @@ function buildOpenAIRequest(ir, model, modelConfig) {
   };
 }
 function toResponsesRequest(ir, resolved) {
-  const resolution = resolved ?? config2.resolveModelConfig(ir.model);
+  const resolution = resolved ?? resolveModelConfig(ir.model);
   return buildOpenAIRequest(ir, resolution.model, resolution.config);
 }
 var init_to_request = __esm(() => {
@@ -31737,9 +31727,9 @@ var init_main = __esm(() => {
 
 // src/tokenizer/index.ts
 function countMessageTokens2(messages) {
-  let total = BASE_TOKENS;
+  let total = baseTokens;
   for (const msg of messages) {
-    total += TOKENS_PER_MESSAGE;
+    total += tokensPerMessage;
     total += encode4(msg.role).length;
     for (const c of msg.content) {
       switch (c.type) {
@@ -31771,7 +31761,7 @@ function countToolTokens(tools) {
   }
   return total;
 }
-var TOKENS_PER_MESSAGE = 3, BASE_TOKENS = 3;
+var tokensPerMessage = 3, baseTokens = 3;
 var init_tokenizer = __esm(() => {
   init_main();
 });
@@ -31811,7 +31801,7 @@ function createApp(client) {
     }
     const ir = fromRequest(validation.data);
     const reqId = generateId("req");
-    const resolved = resolveModelConfig2(ir.model);
+    const resolved = resolveModelConfig(ir.model);
     c.header("x-request-id", reqId);
     logger.info({
       reqId,
@@ -54069,6 +54059,7 @@ var { createApp: createApp2 } = await Promise.resolve().then(() => (init_server(
 var { createClient: createClient2 } = await Promise.resolve().then(() => (init_client2(), exports_client));
 var { config: config3 } = await Promise.resolve().then(() => (init_config(), exports_config));
 var { logger: logger23 } = await Promise.resolve().then(() => (init_logger(), exports_logger));
+logger23.info({ config: config3 }, "server config");
 var app = createApp2(createClient2());
 var server = Bun.serve({
   fetch: app.fetch,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jhzhu89/m2r",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "Anthropic Messages API to Azure OpenAI Responses API proxy",
   "type": "module",
   "license": "MIT",
@@ -33,7 +33,10 @@
     "test": "bun test ./test/unit",
     "test:integration": "bun test ./test/integration",
     "test:all": "bun test ./test",
-    "test:watch": "bun test --watch ./test/unit"
+    "test:watch": "bun test --watch ./test/unit",
+    "release:patch": "npm version patch && git push && git push --tags",
+    "release:minor": "npm version minor && git push && git push --tags",
+    "release:major": "npm version major && git push && git push --tags"
   },
   "dependencies": {
     "@azure/identity": "^4.13.0",