@0xmaxma/claude-gateway 1.4.1 → 1.4.2

package/mcp/tools/image/module.ts

@@ -1,4 +1,5 @@
 import * as fs from 'node:fs';
+import * as os from 'node:os';
 import * as path from 'node:path';
 import * as dns from 'node:dns';
 import * as net from 'node:net';
@@ -60,8 +61,12 @@ export class ImageModule implements ToolModule {
   toolVisibility: ToolVisibility = 'all-configured';
 
   isEnabled(): boolean {
-    // Enabled when the image service endpoint is configured (env-driven, like browser).
-    if (!this.baseUrl() || process.env.IMAGE_DISABLED === 'true') return false;
+    // Enabled when BOTH the endpoint and an auth token resolve (from env or the CLI config
+    // at ~/.claude/settings.json; see baseUrl()/authToken()) and the tool isn't explicitly
+    // turned off. Requiring the token here means a config that resolves a URL but no token
+    // disables the tool cleanly, instead of advertising it and then failing every call with a
+    // 401 on an empty Bearer.
+    if (!this.baseUrl() || !this.authToken() || process.env.IMAGE_DISABLED === 'true') return false;
     // The Bearer proxy_secret rides every call — refuse a cleartext http URL to a
     // PUBLIC host (that would leak the secret). http to a local/internal host is a
     // trusted hop (e.g. host.docker.internal in dev) and stays allowed.
@@ -106,18 +111,53 @@ export class ImageModule implements ToolModule {
   // ── config ────────────────────────────────────────────────────────────────
 
   private baseUrl(): string {
-    // Image generation can target any provider — not necessarily the same host as
-    // the LLM. IMAGE_BASE_URL overrides so an operator can point image at a separate
-    // endpoint; it falls back to ANTHROPIC_BASE_URL when they share one provider that
-    // fronts /v1/images/{generations,jobs} alongside /v1/messages.
-    const raw = process.env.IMAGE_BASE_URL || process.env.ANTHROPIC_BASE_URL || '';
+    // Image generation may target a provider separate from the LLM: IMAGE_BASE_URL
+    // (or ANTHROPIC_BASE_URL when they share a provider that fronts /v1/images
+    // alongside /v1/messages) overrides. When neither env var is set, fall back to
+    // the Claude Code CLI config at ~/.claude/settings.json — its `env` block carries
+    // ANTHROPIC_BASE_URL, and the CLI applies that block internally (not to the OS
+    // environment), so an MCP subprocess can't inherit it and reads the file instead.
+    const raw =
+      process.env.IMAGE_BASE_URL ||
+      process.env.ANTHROPIC_BASE_URL ||
+      this.settingsEnv('ANTHROPIC_BASE_URL');
     return raw.replace(/\/+$/, '');
   }
 
   private authToken(): string {
-    // Image API key overrides so a separate image endpoint can carry its own secret;
-    // falls back to ANTHROPIC_AUTH_TOKEN (the M2M proxy secret) when they share one.
-    return process.env.IMAGE_API_KEY || process.env.ANTHROPIC_AUTH_TOKEN || '';
+    // IMAGE_API_KEY overrides so a separate image endpoint can carry its own secret;
+    // falls back to ANTHROPIC_AUTH_TOKEN, then to the CLI config's `env` block in
+    // ~/.claude/settings.json. Check BOTH token keys there: a proxy deployment may store the
+    // M2M secret under ANTHROPIC_AUTH_TOKEN (the same key the env path uses) or under
+    // CLAUDE_CODE_OAUTH_TOKEN — mirror the env precedence and accept either.
+    return (
+      process.env.IMAGE_API_KEY ||
+      process.env.ANTHROPIC_AUTH_TOKEN ||
+      this.settingsEnv('ANTHROPIC_AUTH_TOKEN') ||
+      this.settingsEnv('CLAUDE_CODE_OAUTH_TOKEN')
+    );
+  }
+
+  // Parsed `env` block of the CLI config, read once per instance (settings don't
+  // change within a session). undefined = not read yet; null = unreadable.
+  private settingsEnvCache?: Record<string, unknown> | null;
+
+  // settingsEnv reads a single key out of ~/.claude/settings.json's `env` block.
+  // CLAUDE_CONFIG_DIR overrides the ~/.claude location, matching Claude Code. Returns
+  // '' on any error (missing file, bad JSON, absent/non-string key) so callers degrade
+  // to "not configured" rather than throwing.
+  private settingsEnv(key: string): string {
+    if (this.settingsEnvCache === undefined) {
+      try {
+        const dir = process.env.CLAUDE_CONFIG_DIR || path.join(os.homedir(), '.claude');
+        this.settingsEnvCache =
+          JSON.parse(fs.readFileSync(path.join(dir, 'settings.json'), 'utf8'))?.env ?? null;
+      } catch {
+        this.settingsEnvCache = null;
+      }
+    }
+    const v = this.settingsEnvCache?.[key];
+    return typeof v === 'string' ? v : '';
   }
 
   private headers(): Record<string, string> {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xmaxma/claude-gateway",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "Multi-agent gateway for Claude",
   "repository": {
     "type": "git",