@rynfar/meridian 1.42.1 → 1.44.0

package/dist/{cli-8xzxm1cq.js → cli-fc6mt326.js}

@@ -31,10 +31,10 @@ import {
   resolveClaudeExecutableAsync,
   resolveSdkModelDefaults,
   stripExtendedContext
-} from "./cli-3jqvrake.js";
+} 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"]);
@@ -3889,7 +3892,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
@@ -9193,7 +9196,7 @@ function isRateLimitError(errMsg) {
 }
 function isExtraUsageRequiredError(errMsg) {
   const lower = errMsg.toLowerCase();
-  return lower.includes("extra usage") && lower.includes("1m");
+  return lower.includes("extra usage") && lower.includes("1m") || lower.includes("out of extra usage");
 }
 var STDERR_TAIL_MAX = 500;
 var RAW_TAIL_MAX = 300;
@@ -9479,6 +9482,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) {
@@ -9653,6 +9660,14 @@ function buildModelList(isMaxSubscription, now = Math.floor(Date.now() / 1000))
       display_name: "Claude Opus 4.7",
       context_window: isMaxSubscription ? 1e6 : 200000
     },
+    {
+      id: "claude-opus-4-8",
+      object: "model",
+      created: now,
+      owned_by: "anthropic",
+      display_name: "Claude Opus 4.8",
+      context_window: isMaxSubscription ? 1e6 : 200000
+    },
     {
       id: "claude-haiku-4-5",
       object: "model",
@@ -10732,6 +10747,12 @@ var claudeCodeAdapter = {
   }
 };
 
+// src/proxy/adapters/openai.ts
+var openAiAdapter = {
+  ...openCodeAdapter,
+  name: "openai"
+};
+
 // src/proxy/adapters/detect.ts
 var ADAPTER_MAP = {
   opencode: openCodeAdapter,
@@ -10741,7 +10762,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]) {
@@ -16597,7 +16619,8 @@ function buildQueryOptions(ctx) {
         ...sharedMemory ? stripConfigDir(cleanEnv) : cleanEnv,
         ENABLE_TOOL_SEARCH: hasDeferredTools ? "true" : "false",
         ...passthrough ? { ENABLE_CLAUDEAI_MCP_SERVERS: "false" } : {},
-        ...process.getuid?.() === 0 ? { IS_SANDBOX: "1" } : {}
+        ...process.getuid?.() === 0 ? { IS_SANDBOX: "1" } : {},
+        ...ctx.envOverrides
       },
       ...Object.keys(sdkAgents).length > 0 ? { agents: sdkAgents } : {},
       ...resumeSessionId ? { resume: resumeSessionId } : {},
@@ -16616,6 +16639,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,
@@ -16623,7 +16652,8 @@ var ADAPTER_TRANSFORMS = {
   droid: droidTransforms,
   pi: piTransforms,
   forgecode: forgeCodeTransforms,
-  passthrough: passthroughTransforms
+  passthrough: passthroughTransforms,
+  openai: openCodeTransforms
 };
 function getAdapterTransforms(adapterName) {
   return ADAPTER_TRANSFORMS[adapterName] ?? [];
@@ -17495,6 +17525,22 @@ function storeSession(sessionId, messages, claudeSessionId, workingDirectory, sd
 // src/proxy/server.ts
 var exec2 = promisify2(execCallback);
 var claudeExecutable = "";
+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))
@@ -17618,8 +17664,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)
@@ -17652,7 +17703,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({
@@ -17666,6 +17717,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;
@@ -17747,7 +17799,9 @@ function createProxyServer(config = {}) {
         const authStatus = await getClaudeAuthStatusAsync(profile.id !== "default" ? profile.id : undefined, Object.keys(profile.env).length > 0 ? profile.env : undefined);
         const agentMode = c.req.header("x-opencode-agent-mode") ?? null;
         const requestSource = c.req.header("x-meridian-source")?.slice(0, 64) || undefined;
-        let model = mapModelToClaudeModel(body.model || "sonnet", authStatus?.subscriptionType, agentMode);
+        const requestedModel = typeof body.model === "string" ? body.model : "sonnet";
+        let model = mapModelToClaudeModel(requestedModel, authStatus?.subscriptionType, agentMode);
+        const envOverrides = requestedModel.startsWith("claude-opus-") ? { ANTHROPIC_DEFAULT_OPUS_MODEL: requestedModel } : undefined;
         const cwdResolution = resolveSdkWorkingDirectory({
           envOverride: process.env.MERIDIAN_WORKDIR ?? process.env.CLAUDE_PROXY_WORKDIR,
           adapterCwd: adapter.extractWorkingDirectory(body),
@@ -17771,6 +17825,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") {
@@ -17800,15 +17855,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));
@@ -17823,7 +17878,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;
@@ -17850,14 +17905,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);
           }
         }
@@ -17953,7 +18008,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) {
@@ -17966,7 +18021,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)`);
               }
             }
           }
@@ -17978,7 +18033,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;
@@ -18039,8 +18094,11 @@ 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) {
                 let didYieldContent = false;
                 try {
@@ -18056,6 +18114,7 @@ function createProxyServer(config = {}) {
                     sdkAgents,
                     passthroughMcp,
                     cleanEnv: profileEnv,
+                    envOverrides,
                     hasDeferredTools,
                     resumeSessionId,
                     isUndo,
@@ -18101,7 +18160,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++)
@@ -18118,6 +18177,7 @@ function createProxyServer(config = {}) {
                       sdkAgents,
                       passthroughMcp,
                       cleanEnv: profileEnv,
+                      envOverrides,
                       hasDeferredTools,
                       resumeSessionId: undefined,
                       isUndo: false,
@@ -18156,15 +18216,68 @@ 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) {
+                    didFreshBaseRetry = true;
+                    claudeLog("upstream.session_fallback", {
+                      mode: "non_stream",
+                      model,
+                      reason: "extra_usage_required_resume"
+                    });
+                    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++)
+                      sdkUuidMap.push(null);
+                    yield* query(buildQueryOptions({
+                      prompt: buildFreshPrompt(allMessages, sanitizeOpts),
+                      model,
+                      workingDirectory,
+                      clientWorkingDirectory,
+                      systemContext,
+                      claudeExecutable,
+                      passthrough,
+                      stream: false,
+                      sdkAgents,
+                      passthroughMcp,
+                      cleanEnv: profileEnv,
+                      envOverrides,
+                      hasDeferredTools,
+                      resumeSessionId: undefined,
+                      isUndo: false,
+                      undoRollbackUuid: undefined,
+                      sdkHooks,
+                      blockedTools: pipelineCtx.blockedTools,
+                      incompatibleTools: pipelineCtx.incompatibleTools,
+                      mcpServerName: adapter.getMcpServerName(),
+                      allowedMcpTools: pipelineCtx.allowedMcpTools,
+                      onStderr,
+                      effort,
+                      thinking,
+                      taskBudget,
+                      betas,
+                      settingSources,
+                      codeSystemPrompt: sdkFeatures.codeSystemPrompt,
+                      clientSystemPrompt: sdkFeatures.clientSystemPrompt === false ? false : undefined,
+                      memory: sdkFeatures.memory,
+                      dreaming: sdkFeatures.dreaming,
+                      sharedMemory: sdkFeatures.sharedMemory,
+                      maxBudgetUsd: sdkFeatures.maxBudgetUsd,
+                      fallbackModel: sdkFeatures.fallbackModel,
+                      sdkDebug: sdkFeatures.sdkDebug,
+                      additionalDirectories: sdkFeatures.additionalDirectories ? sdkFeatures.additionalDirectories.split(",").map((d) => d.trim()).filter(Boolean) : undefined,
+                      advisorModel
+                    }));
+                    return;
+                  }
                   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;
                     }
                   }
@@ -18178,7 +18291,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) {
@@ -18191,7 +18304,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;
                     }
@@ -18267,7 +18380,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(`
@@ -18441,8 +18554,11 @@ 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) {
                   let didYieldClientEvent = false;
                   try {
@@ -18458,6 +18574,7 @@ Subprocess stderr: ${stderrOutput}`;
                       sdkAgents,
                       passthroughMcp,
                       cleanEnv: profileEnv,
+                      envOverrides,
                       hasDeferredTools,
                       resumeSessionId,
                       isUndo,
@@ -18503,7 +18620,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++)
@@ -18520,6 +18637,7 @@ Subprocess stderr: ${stderrOutput}`;
                         sdkAgents,
                         passthroughMcp,
                         cleanEnv: profileEnv,
+                        envOverrides,
                         hasDeferredTools,
                         resumeSessionId: undefined,
                         isUndo: false,
@@ -18558,15 +18676,68 @@ 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) {
+                      didFreshBaseRetry = true;
+                      claudeLog("upstream.session_fallback", {
+                        mode: "stream",
+                        model,
+                        reason: "extra_usage_required_resume"
+                      });
+                      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++)
+                        sdkUuidMap.push(null);
+                      yield* query(buildQueryOptions({
+                        prompt: buildFreshPrompt(allMessages, sanitizeOpts),
+                        model,
+                        workingDirectory,
+                        clientWorkingDirectory,
+                        systemContext,
+                        claudeExecutable,
+                        passthrough,
+                        stream: true,
+                        sdkAgents,
+                        passthroughMcp,
+                        cleanEnv: profileEnv,
+                        envOverrides,
+                        hasDeferredTools,
+                        resumeSessionId: undefined,
+                        isUndo: false,
+                        undoRollbackUuid: undefined,
+                        sdkHooks,
+                        blockedTools: pipelineCtx.blockedTools,
+                        incompatibleTools: pipelineCtx.incompatibleTools,
+                        mcpServerName: adapter.getMcpServerName(),
+                        allowedMcpTools: pipelineCtx.allowedMcpTools,
+                        onStderr,
+                        effort,
+                        thinking,
+                        taskBudget,
+                        betas,
+                        settingSources,
+                        codeSystemPrompt: sdkFeatures.codeSystemPrompt,
+                        clientSystemPrompt: sdkFeatures.clientSystemPrompt === false ? false : undefined,
+                        memory: sdkFeatures.memory,
+                        dreaming: sdkFeatures.dreaming,
+                        sharedMemory: sdkFeatures.sharedMemory,
+                        maxBudgetUsd: sdkFeatures.maxBudgetUsd,
+                        fallbackModel: sdkFeatures.fallbackModel,
+                        sdkDebug: sdkFeatures.sdkDebug,
+                        additionalDirectories: sdkFeatures.additionalDirectories ? sdkFeatures.additionalDirectories.split(",").map((d) => d.trim()).filter(Boolean) : undefined,
+                        advisorModel
+                      }));
+                      return;
+                    }
                     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;
                       }
                     }
@@ -18580,7 +18751,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) {
@@ -18593,7 +18764,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;
                       }
@@ -18807,7 +18978,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);
@@ -19326,7 +19497,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) => {
@@ -19350,7 +19521,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) => ({
@@ -19369,10 +19540,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);
   });
@@ -19382,7 +19555,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;
@@ -19403,8 +19579,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, {
@@ -19635,7 +19810,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() {
@@ -19646,19 +19821,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,
@@ -19696,6 +19886,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) {
@@ -19717,6 +19914,7 @@ Or use a different port:`);
     server,
     config: finalConfig,
     async close() {
+      clearInterval(profileTokenRefreshInterval);
       if (authKeepaliveInterval)
         clearInterval(authKeepaliveInterval);
       stopBackgroundRefresh();
@@ -19727,4 +19925,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 };