@rynfar/meridian 1.43.0 → 1.44.1

package/dist/{cli-1x5gqsqc.js → cli-6rezv582.js}

@@ -34,7 +34,7 @@ import {
 } from "./cli-yeazzt32.js";
 import {
   checkPluginConfigured
-} from "./cli-rtab0qa6.js";
+} from "./cli-je60fevk.js";
 import {
   claudeLog,
   createPlatformCredentialStore,
@@ -43,7 +43,7 @@ import {
   startBackgroundRefresh,
   stopBackgroundRefresh,
   withClaudeLogContext
-} from "./cli-7k1fcprd.js";
+} from "./cli-1kbcm3yn.js";
 import {
   __commonJS,
   __esm,
@@ -1242,7 +1242,7 @@ function getFeaturesForAdapter(adapterName) {
   };
 }
 function getAllFeatureConfigs() {
-  const adapters = ["opencode", "crush", "forgecode", "pi", "droid", "passthrough"];
+  const adapters = ["opencode", "crush", "forgecode", "pi", "droid", "passthrough", "openai"];
   const result = {};
   for (const name of adapters) {
     result[name] = getFeaturesForAdapter(name);
@@ -1314,6 +1314,9 @@ var init_sdkFeatures = __esm(() => {
   ADAPTER_DEFAULTS = {
     passthrough: {
       codeSystemPrompt: false
+    },
+    openai: {
+      codeSystemPrompt: false
     }
   };
   VALID_CLAUDE_MD_VALUES = new Set(["off", "project", "full"]);
@@ -3750,6 +3753,57 @@ class RateLimitStore {
 }
 var rateLimitStore = new RateLimitStore;
 
+// src/proxy/streamIdleGuard.ts
+class UpstreamIdleError extends Error {
+  idleMs;
+  sinceLastMs;
+  constructor(idleMs, sinceLastMs) {
+    super(`upstream idle for ${sinceLastMs}ms (limit ${idleMs}ms)`);
+    this.name = "UpstreamIdleError";
+    this.idleMs = idleMs;
+    this.sinceLastMs = sinceLastMs;
+  }
+}
+async function* guardUpstreamIdle(source, idleMs, onStall) {
+  if (idleMs <= 0) {
+    yield* source;
+    return;
+  }
+  const it = source[Symbol.asyncIterator]();
+  let lastAt = Date.now();
+  try {
+    while (true) {
+      const nextP = it.next();
+      nextP.catch(() => {});
+      let timer;
+      const idle = new Promise((_, reject) => {
+        const remaining = Math.max(0, idleMs - (Date.now() - lastAt));
+        timer = setTimeout(() => {
+          const sinceLastMs = Date.now() - lastAt;
+          try {
+            onStall?.(sinceLastMs);
+          } catch {}
+          reject(new UpstreamIdleError(idleMs, sinceLastMs));
+        }, remaining);
+      });
+      let res;
+      try {
+        res = await Promise.race([nextP, idle]);
+      } finally {
+        if (timer)
+          clearTimeout(timer);
+      }
+      if (res.done)
+        return;
+      lastAt = Date.now();
+      yield res.value;
+    }
+  } finally {
+    const returnP = it.return?.(undefined);
+    returnP?.catch(() => {});
+  }
+}
+
 // src/proxy/oauthUsage.ts
 var OAUTH_USAGE_URL = "https://api.anthropic.com/api/oauth/usage";
 var OAUTH_BETA_HEADER = "oauth-2025-04-20";
@@ -3889,7 +3943,7 @@ var DEFAULT_PROXY_CONFIG = {
   host: "127.0.0.1",
   debug: (process.env.MERIDIAN_DEBUG ?? process.env.CLAUDE_PROXY_DEBUG) === "1",
   idleTimeoutSeconds: 120,
-  silent: false,
+  silent: (process.env.MERIDIAN_SILENT ?? process.env.CLAUDE_PROXY_SILENT) === "1",
   profiles: undefined,
   defaultProfile: undefined,
   version: undefined
@@ -3903,6 +3957,14 @@ function envBool(suffix) {
   const val = env(suffix);
   return val === "1" || val === "true" || val === "yes";
 }
+function resolvePassthrough(defaultValue) {
+  const val = env("PASSTHROUGH");
+  if (val === "1" || val === "true" || val === "yes")
+    return true;
+  if (val === "0" || val === "false" || val === "no")
+    return false;
+  return defaultValue;
+}
 function envInt(suffix, defaultValue) {
   const val = env(suffix);
   if (!val)
@@ -9479,6 +9541,10 @@ ${historyBlock}` : historyBlock;
     result.temperature = body.temperature;
   if (body.top_p !== undefined)
     result.top_p = body.top_p;
+  if (body.reasoning_effort !== undefined)
+    result.reasoning_effort = body.reasoning_effort;
+  if (body.output_config?.effort !== undefined)
+    result.output_config = { effort: body.output_config.effort };
   return result;
 }
 function toFinishReason(stopReason) {
@@ -9974,8 +10040,7 @@ var openCodeTransforms = [
       const incompatibleTools = CLAUDE_CODE_ONLY_TOOLS;
       const allowedMcpTools = ALLOWED_MCP_TOOLS;
       const coreToolNames = ["read", "write", "edit", "bash", "glob", "grep"];
-      const envVal = process.env.MERIDIAN_PASSTHROUGH ?? process.env.CLAUDE_PROXY_PASSTHROUGH;
-      const passthrough = !(envVal === "0" || envVal === "false" || envVal === "no");
+      const passthrough = resolvePassthrough(true);
       let sdkAgents = {};
       if (Array.isArray(body.tools)) {
         const taskTool = body.tools.find((t) => t.name === "task" || t.name === "Task");
@@ -10070,11 +10135,7 @@ var openCodeAdapter = {
     return ["read", "write", "edit", "bash", "glob", "grep"];
   },
   usesPassthrough() {
-    const envVal = process.env.MERIDIAN_PASSTHROUGH ?? process.env.CLAUDE_PROXY_PASSTHROUGH;
-    if (envVal === "0" || envVal === "false" || envVal === "no") {
-      return false;
-    }
-    return true;
+    return resolvePassthrough(true);
   },
   supportsThinking() {
     return true;
@@ -10145,8 +10206,7 @@ var DROID_ALLOWED_MCP_TOOLS = [
   `mcp__${DROID_MCP_SERVER_NAME}__grep`
 ];
 function resolveDroidPassthrough() {
-  const envVal = process.env.MERIDIAN_PASSTHROUGH ?? process.env.CLAUDE_PROXY_PASSTHROUGH;
-  return envVal === "1" || envVal === "true" || envVal === "yes";
+  return resolvePassthrough(false);
 }
 var droidTransforms = [
   {
@@ -10230,8 +10290,7 @@ var droidAdapter = {
     return "";
   },
   usesPassthrough() {
-    const envVal = process.env.MERIDIAN_PASSTHROUGH ?? process.env.CLAUDE_PROXY_PASSTHROUGH;
-    return envVal === "1" || envVal === "true" || envVal === "yes";
+    return resolvePassthrough(false);
   }
 };
 
@@ -10452,6 +10511,9 @@ var PI_ALLOWED_MCP_TOOLS = [
   `mcp__${PI_MCP_SERVER_NAME}__glob`,
   `mcp__${PI_MCP_SERVER_NAME}__grep`
 ];
+function resolvePiPassthrough() {
+  return resolvePassthrough(true);
+}
 var piTransforms = [
   {
     name: "pi-core",
@@ -10474,6 +10536,7 @@ var piTransforms = [
         incompatibleTools: CLAUDE_CODE_ONLY_TOOLS,
         allowedMcpTools: PI_ALLOWED_MCP_TOOLS,
         sdkAgents: {},
+        passthrough: resolvePiPassthrough(),
         supportsThinking: true,
         extractFileChangesFromToolUse
       };
@@ -10542,6 +10605,9 @@ var piAdapter = {
   buildSystemContextAddendum(_body, _sdkAgents) {
     return "";
   },
+  usesPassthrough() {
+    return resolvePassthrough(true);
+  },
   extractFileChangesFromToolUse(toolName, toolInput) {
     const input = toolInput;
     const filePath = input?.filePath ?? input?.file_path ?? input?.path;
@@ -10711,11 +10777,7 @@ var claudeCodeAdapter = {
     return ["Read", "Write", "Edit", "Bash", "Glob", "Grep"];
   },
   usesPassthrough() {
-    const envVal = process.env.MERIDIAN_PASSTHROUGH ?? process.env.CLAUDE_PROXY_PASSTHROUGH;
-    if (envVal === "0" || envVal === "false" || envVal === "no") {
-      return false;
-    }
-    return true;
+    return resolvePassthrough(true);
   },
   supportsThinking() {
     return true;
@@ -10740,6 +10802,12 @@ var claudeCodeAdapter = {
   }
 };
 
+// src/proxy/adapters/openai.ts
+var openAiAdapter = {
+  ...openCodeAdapter,
+  name: "openai"
+};
+
 // src/proxy/adapters/detect.ts
 var ADAPTER_MAP = {
   opencode: openCodeAdapter,
@@ -10749,7 +10817,8 @@ var ADAPTER_MAP = {
   pi: piAdapter,
   forgecode: forgeCodeAdapter,
   "claude-code": claudeCodeAdapter,
-  claudecode: claudeCodeAdapter
+  claudecode: claudeCodeAdapter,
+  openai: openAiAdapter
 };
 var envDefault = process.env.MERIDIAN_DEFAULT_AGENT || "";
 if (envDefault && !ADAPTER_MAP[envDefault]) {
@@ -16625,6 +16694,12 @@ function buildQueryOptions(ctx) {
   };
 }
 
+// src/proxy/effort.ts
+var VALID_EFFORTS = ["low", "medium", "high", "xhigh", "max"];
+function normalizeEffort(value) {
+  return typeof value === "string" && VALID_EFFORTS.includes(value) ? value : undefined;
+}
+
 // src/proxy/transforms/registry.ts
 var ADAPTER_TRANSFORMS = {
   opencode: openCodeTransforms,
@@ -16632,7 +16707,8 @@ var ADAPTER_TRANSFORMS = {
   droid: droidTransforms,
   pi: piTransforms,
   forgecode: forgeCodeTransforms,
-  passthrough: passthroughTransforms
+  passthrough: passthroughTransforms,
+  openai: openCodeTransforms
 };
 function getAdapterTransforms(adapterName) {
   return ADAPTER_TRANSFORMS[adapterName] ?? [];
@@ -17504,6 +17580,23 @@ function storeSession(sessionId, messages, claudeSessionId, workingDirectory, sd
 // src/proxy/server.ts
 var exec2 = promisify2(execCallback);
 var claudeExecutable = "";
+var UPSTREAM_IDLE_MS = 90000;
+function credentialStoreForProfile(profile) {
+  if (profile.type !== "claude-max")
+    return;
+  return createPlatformCredentialStore(profile.env.CLAUDE_CONFIG_DIR ? { claudeConfigDir: profile.env.CLAUDE_CONFIG_DIR } : undefined);
+}
+async function ensureFreshTokenForProfiles(config) {
+  const profiles = getEffectiveProfiles(config.profiles);
+  if (profiles.length === 0)
+    return;
+  for (const profile of profiles) {
+    const resolved = resolveProfile(config.profiles, config.defaultProfile, profile.id);
+    const store = credentialStoreForProfile(resolved);
+    if (store)
+      await ensureFreshToken(store).catch(() => {});
+  }
+}
 var MULTIMODAL_TYPES = new Set(["image", "document", "file"]);
 function hasMultimodalContent(content) {
   if (!Array.isArray(content))
@@ -17627,8 +17720,13 @@ function buildFreshPrompt(messages, sanitizeOpts = {}) {
 
 `) || "";
 }
+var proxyLogSilent = false;
+function plog(message) {
+  if (!proxyLogSilent)
+    console.error(message);
+}
 function logUsage(requestId, usage) {
-  console.error(`[PROXY] ${requestId} usage: ${formatUsageSummary(usage)}`);
+  plog(`[PROXY] ${requestId} usage: ${formatUsageSummary(usage)}`);
 }
 function checkTokenHealth(requestId, sdkSessionId, usage, turnNumber, isResume, isPassthrough) {
   if (!usage || !sdkSessionId)
@@ -17661,7 +17759,7 @@ function checkTokenHealth(requestId, sdkSessionId, usage, turnNumber, isResume,
   if (anomalies.length > 0) {
     const alerts = formatAnomalyAlerts(requestId, anomalies);
     for (const line of alerts) {
-      console.error(line);
+      plog(line);
     }
     for (const a of anomalies) {
       diagnosticLog2.log({
@@ -17675,6 +17773,7 @@ function checkTokenHealth(requestId, sdkSessionId, usage, turnNumber, isResume,
 }
 function createProxyServer(config = {}) {
   const finalConfig = { ...DEFAULT_PROXY_CONFIG, ...config };
+  proxyLogSilent = finalConfig.silent;
   const serverVersion = finalConfig.version ?? "unknown";
   restoreActiveProfile(finalConfig.profiles);
   const sessionDiscoveredTools = new Map;
@@ -17782,6 +17881,7 @@ function createProxyServer(config = {}) {
         } = process.env;
         const sdkModelDefaults = resolveSdkModelDefaults();
         const profileEnv = { ...sdkModelDefaults, ...cleanEnv, ...profile.env };
+        const profileCredentialStore = credentialStoreForProfile(profile);
         let systemContext = "";
         if (body.system) {
           if (typeof body.system === "string") {
@@ -17811,15 +17911,15 @@ function createProxyServer(config = {}) {
         const rawBetaHeader = c.req.header("anthropic-beta");
         const betaFilter = filterBetasForProfile(rawBetaHeader, profile.type, getBetaPolicyFromEnv());
         if (betaFilter.stripped.length > 0) {
-          console.error(`[PROXY] ${requestMeta.requestId} stripped anthropic-beta(s) for Max profile: ${betaFilter.stripped.join(", ")}`);
+          plog(`[PROXY] ${requestMeta.requestId} stripped anthropic-beta(s) for Max profile: ${betaFilter.stripped.join(", ")}`);
         }
-        const effort = effortHeader || body.effort || undefined;
+        const effort = normalizeEffort(effortHeader || body.effort || body.reasoning_effort || body.output_config?.effort);
         let thinking = body.thinking || undefined;
         if (thinkingHeader !== undefined) {
           try {
             thinking = JSON.parse(thinkingHeader);
           } catch (e) {
-            console.error(`[PROXY] ${requestMeta.requestId} ignoring malformed x-opencode-thinking header: ${e instanceof Error ? e.message : String(e)}`);
+            plog(`[PROXY] ${requestMeta.requestId} ignoring malformed x-opencode-thinking header: ${e instanceof Error ? e.message : String(e)}`);
           }
         }
         const { getFeaturesForAdapter: getFeaturesForAdapter2 } = (init_sdkFeatures(), __toCommonJS(exports_sdkFeatures));
@@ -17834,7 +17934,7 @@ function createProxyServer(config = {}) {
         if (thinkingBetaStripped) {
           thinking = { type: "disabled" };
           if (betaFilter.stripped.length > 0) {
-            console.error(`[PROXY] ${requestMeta.requestId} thinking disabled (thinking beta stripped by ${getBetaPolicyFromEnv()} policy)`);
+            plog(`[PROXY] ${requestMeta.requestId} thinking disabled (thinking beta stripped by ${getBetaPolicyFromEnv()} policy)`);
           }
         }
         const parsedBudget = taskBudgetHeader ? Number.parseInt(taskBudgetHeader, 10) : NaN;
@@ -17861,14 +17961,14 @@ function createProxyServer(config = {}) {
         const msgCount = Array.isArray(body.messages) ? body.messages.length : 0;
         const toolCount = body.tools?.length ?? 0;
         const requestLogLine = `${requestMeta.requestId} adapter=${adapter.name}${requestSource ? ` source=${requestSource}` : ""} model=${model} stream=${stream2} tools=${toolCount} lineage=${lineageType} session=${resumeSessionId?.slice(0, 8) || "new"}${isUndo && undoRollbackUuid ? ` rollback=${undoRollbackUuid.slice(0, 8)}` : ""}${agentMode ? ` agent=${agentMode}` : ""} active=${activeSessions}/${MAX_CONCURRENT_SESSIONS} msgCount=${msgCount}`;
-        console.error(`[PROXY] ${requestLogLine} msgs=${msgSummary}`);
+        plog(`[PROXY] ${requestLogLine} msgs=${msgSummary}`);
         diagnosticLog2.session(`${requestLogLine}`, requestMeta.requestId);
         if (lineageResult.type === "diverged" && profileSessionId && !isIndependentSession) {
           const recovery = lookupSessionRecovery(profileSessionId);
           if (recovery) {
             const prevId = recovery.previousClaudeSessionId || recovery.claudeSessionId;
             const recoveryMsg = `${requestMeta.requestId} SESSION RECOVERY: previous conversation available. Run: claude --resume ${prevId}`;
-            console.error(`[PROXY] ${recoveryMsg}`);
+            plog(`[PROXY] ${recoveryMsg}`);
             diagnosticLog2.session(recoveryMsg, requestMeta.requestId);
           }
         }
@@ -17964,7 +18064,7 @@ function createProxyServer(config = {}) {
           const cached = sessionToolCache.get(profileSessionId);
           if (cached && cached.length > 0) {
             requestTools = cached;
-            console.error(`[PROXY] ${requestMeta.requestId} tools_restored: client sent 0 tools but session had ${cached.length} — reusing cached tools to preserve prompt cache`);
+            plog(`[PROXY] ${requestMeta.requestId} tools_restored: client sent 0 tools but session had ${cached.length} — reusing cached tools to preserve prompt cache`);
           }
         }
         if (passthrough && requestTools.length > 0) {
@@ -17977,7 +18077,7 @@ function createProxyServer(config = {}) {
             if (profileSessionId) {
               sessionMcpCache.set(profileSessionId, { key: toolSetKey, mcp: passthroughMcp });
               if (cachedMcp) {
-                console.error(`[PROXY] ${requestMeta.requestId} tools_changed: MCP server recreated (prompt cache likely invalidates)`);
+                plog(`[PROXY] ${requestMeta.requestId} tools_changed: MCP server recreated (prompt cache likely invalidates)`);
               }
             }
           }
@@ -17989,7 +18089,7 @@ function createProxyServer(config = {}) {
         const coreSet = coreNames ? new Set(coreNames.map((n) => n.toLowerCase())) : undefined;
         const deferredToolCount = hasDeferredTools && requestTools.length > 0 ? requestTools.filter((t) => t.defer_loading === true || coreSet && !coreSet.has(String(t.name).toLowerCase())).length : 0;
         if (hasDeferredTools) {
-          console.error(`[PROXY] ${requestMeta.requestId} deferred=${deferredToolCount}/${toolCount} tools (core: ${coreNames?.join(",") ?? "none"})`);
+          plog(`[PROXY] ${requestMeta.requestId} deferred=${deferredToolCount}/${toolCount} tools (core: ${coreNames?.join(",") ?? "none"})`);
         }
         const mcpPrefix = `mcp__${adapter.getMcpServerName()}__`;
         const trackFileChanges = !(process.env.MERIDIAN_NO_FILE_CHANGES ?? process.env.CLAUDE_PROXY_NO_FILE_CHANGES) && pipelineCtx.shouldTrackFileChanges;
@@ -18050,7 +18150,9 @@ function createProxyServer(config = {}) {
             const RATE_LIMIT_BASE_DELAY_MS = 1000;
             const response = async function* () {
               let rateLimitRetries = 0;
-              await ensureFreshToken().catch(() => {});
+              if (profileCredentialStore) {
+                await ensureFreshToken(profileCredentialStore).catch(() => {});
+              }
               let tokenRefreshed = false;
               let didFreshBaseRetry = false;
               while (true) {
@@ -18114,7 +18216,7 @@ function createProxyServer(config = {}) {
                       rollbackUuid: undoRollbackUuid,
                       resumeSessionId
                     });
-                    console.error(`[PROXY] Stale session UUID, evicting and retrying as fresh session`);
+                    plog(`[PROXY] Stale session UUID, evicting and retrying as fresh session`);
                     evictSession(profileSessionId, profileScopedCwd, allMessages);
                     sdkUuidMap.length = 0;
                     for (let i = 0;i < allMessages.length; i++)
@@ -18170,7 +18272,7 @@ function createProxyServer(config = {}) {
                       to: model,
                       reason: "extra_usage_required"
                     });
-                    console.error(`[PROXY] ${requestMeta.requestId} extra usage required for [1m], falling back to ${model} (skipping [1m] for 1h)`);
+                    plog(`[PROXY] ${requestMeta.requestId} extra usage required for [1m], falling back to ${model} (skipping [1m] for 1h)`);
                     continue;
                   }
                   if (isExtraUsageRequiredError(errMsg) && resumeSessionId && !didFreshBaseRetry) {
@@ -18180,7 +18282,7 @@ function createProxyServer(config = {}) {
                       model,
                       reason: "extra_usage_required_resume"
                     });
-                    console.error(`[PROXY] ${requestMeta.requestId} extra usage persisted on resumed ${model}, retrying as fresh session`);
+                    plog(`[PROXY] ${requestMeta.requestId} extra usage persisted on resumed ${model}, retrying as fresh session`);
                     evictSession(profileSessionId, profileScopedCwd, allMessages);
                     sdkUuidMap.length = 0;
                     for (let i = 0;i < allMessages.length; i++)
@@ -18228,10 +18330,10 @@ function createProxyServer(config = {}) {
                   }
                   if (isExpiredTokenError(errMsg) && !tokenRefreshed) {
                     tokenRefreshed = true;
-                    const refreshed = await refreshOAuthToken();
+                    const refreshed = profileCredentialStore ? await refreshOAuthToken(profileCredentialStore) : false;
                     if (refreshed) {
                       claudeLog("token_refresh.retrying", { mode: "non_stream" });
-                      console.error(`[PROXY] ${requestMeta.requestId} OAuth token expired — refreshed, retrying`);
+                      plog(`[PROXY] ${requestMeta.requestId} OAuth token expired — refreshed, retrying`);
                       continue;
                     }
                   }
@@ -18245,7 +18347,7 @@ function createProxyServer(config = {}) {
                         to: model,
                         reason: "rate_limit"
                       });
-                      console.error(`[PROXY] ${requestMeta.requestId} rate-limited on [1m], retrying with ${model}`);
+                      plog(`[PROXY] ${requestMeta.requestId} rate-limited on [1m], retrying with ${model}`);
                       continue;
                     }
                     if (rateLimitRetries < MAX_RATE_LIMIT_RETRIES) {
@@ -18258,7 +18360,7 @@ function createProxyServer(config = {}) {
                         maxAttempts: MAX_RATE_LIMIT_RETRIES,
                         delayMs: delay
                       });
-                      console.error(`[PROXY] ${requestMeta.requestId} rate-limited on ${model}, retry ${rateLimitRetries}/${MAX_RATE_LIMIT_RETRIES} in ${delay}ms`);
+                      plog(`[PROXY] ${requestMeta.requestId} rate-limited on ${model}, retry ${rateLimitRetries}/${MAX_RATE_LIMIT_RETRIES} in ${delay}ms`);
                       await new Promise((r) => setTimeout(r, delay));
                       continue;
                     }
@@ -18334,7 +18436,7 @@ function createProxyServer(config = {}) {
                 sessionDiscoveredTools.get(sessId).add(t);
               const newNames = [...discoveredTools].join(", ");
               const allNames = [...sessionDiscoveredTools.get(sessId)];
-              console.error(`[PROXY] ${requestMeta.requestId} discovered=${discoveredTools.size} (${newNames}) session_total=${allNames.length}`);
+              plog(`[PROXY] ${requestMeta.requestId} discovered=${discoveredTools.size} (${newNames}) session_total=${allNames.length}`);
             }
           } catch (error) {
             const stderrOutput = stderrLines.join(`
@@ -18508,7 +18610,9 @@ Subprocess stderr: ${stderrOutput}`;
               const RATE_LIMIT_BASE_DELAY_MS = 1000;
               const response = async function* () {
                 let rateLimitRetries = 0;
-                await ensureFreshToken().catch(() => {});
+                if (profileCredentialStore) {
+                  await ensureFreshToken(profileCredentialStore).catch(() => {});
+                }
                 let tokenRefreshed = false;
                 let didFreshBaseRetry = false;
                 while (true) {
@@ -18572,7 +18676,7 @@ Subprocess stderr: ${stderrOutput}`;
                         rollbackUuid: undoRollbackUuid,
                         resumeSessionId
                       });
-                      console.error(`[PROXY] Stale session UUID, evicting and retrying as fresh session`);
+                      plog(`[PROXY] Stale session UUID, evicting and retrying as fresh session`);
                       evictSession(profileSessionId, profileScopedCwd, allMessages);
                       sdkUuidMap.length = 0;
                       for (let i = 0;i < allMessages.length; i++)
@@ -18628,7 +18732,7 @@ Subprocess stderr: ${stderrOutput}`;
                         to: model,
                         reason: "extra_usage_required"
                       });
-                      console.error(`[PROXY] ${requestMeta.requestId} extra usage required for [1m], falling back to ${model} (skipping [1m] for 1h)`);
+                      plog(`[PROXY] ${requestMeta.requestId} extra usage required for [1m], falling back to ${model} (skipping [1m] for 1h)`);
                       continue;
                     }
                     if (isExtraUsageRequiredError(errMsg) && resumeSessionId && !didFreshBaseRetry) {
@@ -18638,7 +18742,7 @@ Subprocess stderr: ${stderrOutput}`;
                         model,
                         reason: "extra_usage_required_resume"
                       });
-                      console.error(`[PROXY] ${requestMeta.requestId} extra usage persisted on resumed ${model}, retrying as fresh session`);
+                      plog(`[PROXY] ${requestMeta.requestId} extra usage persisted on resumed ${model}, retrying as fresh session`);
                       evictSession(profileSessionId, profileScopedCwd, allMessages);
                       sdkUuidMap.length = 0;
                       for (let i = 0;i < allMessages.length; i++)
@@ -18686,10 +18790,10 @@ Subprocess stderr: ${stderrOutput}`;
                     }
                     if (isExpiredTokenError(errMsg) && !tokenRefreshed) {
                       tokenRefreshed = true;
-                      const refreshed = await refreshOAuthToken();
+                      const refreshed = profileCredentialStore ? await refreshOAuthToken(profileCredentialStore) : false;
                       if (refreshed) {
                         claudeLog("token_refresh.retrying", { mode: "stream" });
-                        console.error(`[PROXY] ${requestMeta.requestId} OAuth token expired — refreshed, retrying`);
+                        plog(`[PROXY] ${requestMeta.requestId} OAuth token expired — refreshed, retrying`);
                         continue;
                       }
                     }
@@ -18703,7 +18807,7 @@ Subprocess stderr: ${stderrOutput}`;
                           to: model,
                           reason: "rate_limit"
                         });
-                        console.error(`[PROXY] ${requestMeta.requestId} rate-limited on [1m], retrying with ${model}`);
+                        plog(`[PROXY] ${requestMeta.requestId} rate-limited on [1m], retrying with ${model}`);
                         continue;
                       }
                       if (rateLimitRetries < MAX_RATE_LIMIT_RETRIES) {
@@ -18716,7 +18820,7 @@ Subprocess stderr: ${stderrOutput}`;
                           maxAttempts: MAX_RATE_LIMIT_RETRIES,
                           delayMs: delay
                         });
-                        console.error(`[PROXY] ${requestMeta.requestId} rate-limited on ${model}, retry ${rateLimitRetries}/${MAX_RATE_LIMIT_RETRIES} in ${delay}ms`);
+                        plog(`[PROXY] ${requestMeta.requestId} rate-limited on ${model}, retry ${rateLimitRetries}/${MAX_RATE_LIMIT_RETRIES} in ${delay}ms`);
                         await new Promise((r) => setTimeout(r, delay));
                         continue;
                       }
@@ -18751,8 +18855,15 @@ Subprocess stderr: ${stderrOutput}`;
               const taskToolJsonBuffer = new Map;
               let nextClientBlockIndex = 0;
               const sdkToClientIndex = new Map;
+              const guardedResponse = guardUpstreamIdle(response, UPSTREAM_IDLE_MS, (sinceLastMs) => claudeLog("upstream.stalled", {
+                mode: "stream",
+                model,
+                sinceLastMs,
+                streamEventsSeen,
+                firstChunkAt: firstChunkAt ?? null
+              }));
               try {
-                for await (const message of response) {
+                for await (const message of guardedResponse) {
                   if (streamClosed) {
                     break;
                   }
@@ -18930,7 +19041,7 @@ data: ${JSON.stringify({ type: "message_stop" })}
                   sessionDiscoveredTools.get(sessId).add(t);
                 const newNames = [...discoveredTools].join(", ");
                 const allNames = [...sessionDiscoveredTools.get(sessId)];
-                console.error(`[PROXY] ${requestMeta.requestId} discovered=${discoveredTools.size} (${newNames}) session_total=${allNames.length}`);
+                plog(`[PROXY] ${requestMeta.requestId} discovered=${discoveredTools.size} (${newNames}) session_total=${allNames.length}`);
               }
               if (currentSessionId && !isIndependentSession) {
                 storeSession(profileSessionId, body.messages || [], currentSessionId, profileScopedCwd, sdkUuidMap, lastUsage);
@@ -19109,7 +19220,11 @@ Subprocess stderr: ${stderrOutput}`;
                 error: errMsg,
                 ...stderrOutput ? { stderr: stderrOutput } : {}
               });
-              const streamErr = classifyError(errMsg);
+              const streamErr = error instanceof UpstreamIdleError ? {
+                status: 504,
+                type: "upstream_timeout",
+                message: `Upstream stalled: no data for ${error.sinceLastMs}ms`
+              } : classifyError(errMsg);
               claudeLog("proxy.anthropic.error", { error: errMsg, classified: streamErr.type });
               const sdkTerm = extractSdkTermination(errMsg);
               const canRecoverAsToolUse = sdkTerm.reason === "max_turns" && passthrough && capturedToolUses.length > 0 && messageStartEmitted;
@@ -19449,7 +19564,7 @@ data: ${JSON.stringify({
     setActiveProfile(body.profile);
     clearSessionCache();
     rateLimitStore.clear();
-    console.error(`[PROXY] Active profile switched to: ${body.profile} (session + rate-limit caches cleared)`);
+    plog(`[PROXY] Active profile switched to: ${body.profile} (session + rate-limit caches cleared)`);
     return c.json({ success: true, activeProfile: body.profile });
   });
   app.get("/plugins/list", async (c) => {
@@ -19473,7 +19588,7 @@ data: ${JSON.stringify({
       loadedPlugins = await loadPlugins(pluginDir, pluginConfigPath);
       pluginTransforms = getActiveTransforms(loadedPlugins);
       const active = loadedPlugins.filter((p) => p.status === "active").length;
-      console.error(`[PROXY] Plugins reloaded: ${active} active`);
+      plog(`[PROXY] Plugins reloaded: ${active} active`);
       return c.json({
         success: true,
         plugins: loadedPlugins.map((p) => ({
@@ -19492,10 +19607,12 @@ data: ${JSON.stringify({
     return c.html(pluginPageHtml);
   });
   app.post("/auth/refresh", async (c) => {
-    const success = await refreshOAuthToken();
+    const profile = resolveProfile(finalConfig.profiles, finalConfig.defaultProfile, c.req.header("x-meridian-profile") || undefined);
+    const store = credentialStoreForProfile(profile);
+    const success = store ? await refreshOAuthToken(store) : false;
     if (success) {
       rateLimitStore.clear();
-      return c.json({ success: true, message: "OAuth token refreshed successfully" });
+      return c.json({ success: true, message: "OAuth token refreshed successfully", profile: profile.id });
     }
     return c.json({ success: false, message: "Token refresh failed. If the problem persists, run 'claude login'." }, 500);
   });
@@ -19505,7 +19622,10 @@ data: ${JSON.stringify({
     if (!anthropicBody) {
       return c.json({ type: "error", error: { type: "invalid_request_error", message: "messages: Field required" } }, 400);
     }
-    const internalHeaders = { "Content-Type": "application/json" };
+    const internalHeaders = {
+      "Content-Type": "application/json",
+      "x-meridian-agent": "openai"
+    };
     const xApiKey = c.req.header("x-api-key");
     if (xApiKey)
       internalHeaders["x-api-key"] = xApiKey;
@@ -19526,8 +19646,7 @@ data: ${JSON.stringify({
     const created = Math.floor(Date.now() / 1000);
     const model = typeof rawBody.model === "string" && rawBody.model ? rawBody.model : "claude-sonnet-4-6";
     const { getFeaturesForAdapter: getFeaturesForAdapter2 } = (init_sdkFeatures(), __toCommonJS(exports_sdkFeatures));
-    const adapter = detectAdapter(c);
-    const sdkFeatures = getFeaturesForAdapter2(adapter.name);
+    const sdkFeatures = getFeaturesForAdapter2("openai");
     if (!anthropicBody.stream) {
       const anthropicRes = await internalRes.json();
       return c.json(translateAnthropicToOpenAi(anthropicRes, completionId, model, created, {
@@ -19758,7 +19877,7 @@ data: ${JSON.stringify({
     });
   });
   app.all("*", (c) => {
-    console.error(`[PROXY] UNHANDLED ${c.req.method} ${c.req.url}`);
+    plog(`[PROXY] UNHANDLED ${c.req.method} ${c.req.url}`);
     return c.json({ error: { type: "not_found", message: `Endpoint not supported: ${c.req.method} ${new URL(c.req.url).pathname}` } }, 404);
   });
   async function initPluginsAsync() {
@@ -19769,19 +19888,34 @@ data: ${JSON.stringify({
         const active = loadedPlugins.filter((p) => p.status === "active").length;
         const disabled = loadedPlugins.filter((p) => p.status === "disabled").length;
         const errored = loadedPlugins.filter((p) => p.status === "error").length;
-        console.error(`[PROXY] Plugins loaded: ${active} active, ${disabled} disabled, ${errored} errors`);
+        plog(`[PROXY] Plugins loaded: ${active} active, ${disabled} disabled, ${errored} errors`);
       }
     } catch (err) {
-      console.error(`[PROXY] Plugin loading failed: ${err instanceof Error ? err.message : String(err)}`);
+      plog(`[PROXY] Plugin loading failed: ${err instanceof Error ? err.message : String(err)}`);
     }
   }
   return { app, config: finalConfig, initPlugins: initPluginsAsync };
 }
+var processErrorHandlersInstalled = false;
+function installProxyProcessErrorHandlers() {
+  if (processErrorHandlersInstalled)
+    return;
+  processErrorHandlersInstalled = true;
+  process.on("uncaughtException", (err) => {
+    console.error(`[PROXY] Uncaught exception (recovered): ${err.message}`);
+  });
+  process.on("unhandledRejection", (reason) => {
+    console.error(`[PROXY] Unhandled rejection (recovered): ${reason instanceof Error ? reason.message : reason}`);
+  });
+}
 async function startProxyServer(config = {}) {
   claudeExecutable = await resolveClaudeExecutableAsync();
   const { app, config: finalConfig, initPlugins } = createProxyServer(config);
   if (initPlugins)
     await initPlugins();
+  if (finalConfig.installProcessErrorHandlers) {
+    installProxyProcessErrorHandlers();
+  }
   const server = serve({
     fetch: app.fetch,
     port: finalConfig.port,
@@ -19819,6 +19953,13 @@ Or use a different port:`);
     }
   });
   startBackgroundRefresh();
+  const PROFILE_TOKEN_REFRESH_MS = 45000;
+  ensureFreshTokenForProfiles(finalConfig);
+  const profileTokenRefreshInterval = setInterval(() => {
+    ensureFreshTokenForProfiles(finalConfig);
+  }, PROFILE_TOKEN_REFRESH_MS);
+  if (profileTokenRefreshInterval.unref)
+    profileTokenRefreshInterval.unref();
   let authKeepaliveInterval;
   const effectiveProfiles = getEffectiveProfiles(finalConfig.profiles);
   if (effectiveProfiles.length > 0) {
@@ -19840,6 +19981,7 @@ Or use a different port:`);
     server,
     config: finalConfig,
     async close() {
+      clearInterval(profileTokenRefreshInterval);
       if (authKeepaliveInterval)
         clearInterval(authKeepaliveInterval);
       stopBackgroundRefresh();
@@ -19850,4 +19992,4 @@ Or use a different port:`);
   };
 }
 
-export { runTransformHook, runObserveHook, buildPipeline, createRequestContext, computeLineageHash, hashMessage, computeMessageHashes, getMaxSessionsLimit, clearSessionCache, createProxyServer, startProxyServer };
+export { runTransformHook, runObserveHook, buildPipeline, createRequestContext, computeLineageHash, hashMessage, computeMessageHashes, getMaxSessionsLimit, clearSessionCache, createProxyServer, installProxyProcessErrorHandlers, startProxyServer };