@x-otto/cli 0.0.1-alpha.53 → 0.0.1-alpha.55

package/dist/bundled-extensions/plugin-otto-wire-protocols/plugin-dist/plugin.cjs

@@ -16126,7 +16126,7 @@ function splitLines(chunk) {
 
 // ../shared/dist/index.js
 var import_undici = __toESM(require_undici(), 1);
-var y = class extends Error {
+var b = class extends Error {
   code;
   cause;
   status;
@@ -16138,25 +16138,25 @@ var y = class extends Error {
     super(e8, { cause: t6.cause }), this.name = new.target.name, this.code = t6.code, this.cause = t6.cause, this.status = t6.status, this.headers = t6.headers, this.errorType = t6.errorType, this.pluginSource = t6.pluginSource, this.abortKind = t6.abortKind;
   }
 };
-var b = class extends y {
+var x = class extends b {
 };
-var we = class extends y {
+var Ce = class extends b {
 };
-var { setPrototypeOf: De = function(e8, t6) {
+var { setPrototypeOf: Ee = function(e8, t6) {
   return e8.__proto__ = t6, e8;
 } } = Object;
-var Oe = class e3 extends Error {
+var De = class e3 extends Error {
   framesToPop = 1;
   name = `Invariant Violation`;
   constructor(t6 = `Invariant Violation`) {
-    super(typeof t6 == `number` ? `Invariant Violation: ${t6}` : t6), De(this, e3.prototype);
+    super(typeof t6 == `number` ? `Invariant Violation: ${t6}` : t6), Ee(this, e3.prototype);
   }
 };
-function S(e8, t6) {
-  if (typeof e8 == `function`) S(e8(), t6);
-  else if (!e8) throw new Oe(t6);
+function C(e8, t6) {
+  if (typeof e8 == `function`) C(e8(), t6);
+  else if (!e8) throw new De(t6);
 }
-var ke = class {
+var Oe = class {
   listeners = {};
   on(e8, t6) {
     let n5 = this.listeners[e8];
@@ -16183,7 +16183,7 @@ var ke = class {
     return this.listeners[e8]?.size ?? 0;
   }
 };
-var Ae = class extends ke {
+var ke = class extends Oe {
   publish(e8) {
     let t6 = (e9, ...t7) => this.emit(e9, ...t7);
     for (let [n5, r4] of Object.entries(e8)) {
@@ -16198,97 +16198,97 @@ var Ae = class extends ke {
     return this.subscribe(`*`, e8);
   }
 };
-var je = /* @__PURE__ */ new Set([`trace`, `debug`, `info`, `warn`, `error`, `fatal`]);
-function C(e8) {
-  return je.has(e8) ? e8 : `info`;
+var Ae = /* @__PURE__ */ new Set([`trace`, `debug`, `info`, `warn`, `error`, `fatal`]);
+function w2(e8) {
+  return Ae.has(e8) ? e8 : `info`;
 }
-var Me = (() => {
+var je = (() => {
   try {
     return (0, import_node_module.createRequire)(__otto_plugin_import_meta_url);
   } catch {
     return;
   }
 })();
-function Ne() {
-  if (!Me) return false;
+function Me() {
+  if (!je) return false;
   try {
-    return Me.resolve(`pino-pretty`), true;
+    return je.resolve(`pino-pretty`), true;
   } catch {
     return false;
   }
 }
-function Pe(e8) {
+function Ne(e8) {
   return e8 === `stdout` ? 1 : e8 === `stderr` ? 2 : e8;
 }
-function Fe() {
+function Pe() {
   return process.env.OTTO_LOG_STDERR === `0`;
 }
-function Ie() {
+function Fe() {
   return process.env.OTTO_LOG_FILE || `${process.env.HOME || process.env.USERPROFILE || `.`}/.otto/logs/otto.log`;
 }
-function Le(e8, t6) {
-  let n5 = Ne(), r4 = Fe(), i3 = { target: n5 ? `pino-pretty` : `pino/file`, options: n5 ? { colorize: true, destination: 2 } : { destination: 2 }, level: t6 };
-  if (!e8 || e8 === `stdout` || e8 === `stderr`) return r4 ? [{ target: `pino/file`, options: { destination: Ie(), mkdir: true }, level: t6 }] : [i3];
-  let a3 = { target: `pino/file`, options: { destination: Pe(e8), mkdir: true }, level: t6 };
+function Ie(e8, t6) {
+  let n5 = Me(), r4 = Pe(), i3 = { target: n5 ? `pino-pretty` : `pino/file`, options: n5 ? { colorize: true, destination: 2 } : { destination: 2 }, level: t6 };
+  if (!e8 || e8 === `stdout` || e8 === `stderr`) return r4 ? [{ target: `pino/file`, options: { destination: Fe(), mkdir: true }, level: t6 }] : [i3];
+  let a3 = { target: `pino/file`, options: { destination: Ne(e8), mkdir: true }, level: t6 };
   return r4 ? [a3] : [a3, i3];
 }
-var w2 = new import_node_stream.PassThrough();
-var Re = new Ae();
-w2.on(`data`, (e8) => {
+var T = new import_node_stream.PassThrough();
+var Le = new ke();
+T.on(`data`, (e8) => {
   try {
-    Re.publish({ log: [JSON.parse(e8.toString())] });
+    Le.publish({ log: [JSON.parse(e8.toString())] });
   } catch (t6) {
     console.warn(`Failed to parse log chunk for listener:`, e8.toString(), t6);
   }
 });
-var T = null;
-var E2 = C(Z);
-var D = /* @__PURE__ */ new Set();
-var O = null;
-function He(e8, n5) {
+var E2 = null;
+var D = w2(Z);
+var ze = /* @__PURE__ */ new Set();
+var k2 = null;
+function Ve(e8, n5) {
   return globalThis.__miniv8_wasm === void 0 ? { write(r4) {
-    O ??= import_pino.default.transport({ targets: Le(e8, n5) }), O.write(r4);
+    k2 ??= import_pino.default.transport({ targets: Ie(e8, n5) }), k2.write(r4);
   } } : { write: (e9) => {
-    w2.write(e9);
+    T.write(e9);
   } };
 }
-function k2(e8, n5) {
-  return T ??= (0, import_pino.default)({ level: e8 }, import_pino.default.multistream([{ level: e8, stream: w2 }, { level: e8, stream: He(n5, e8) }])), E2 = C(T.level), T;
+function He(e8, n5) {
+  return E2 ??= (0, import_pino.default)({ level: e8 }, import_pino.default.multistream([{ level: e8, stream: T }, { level: e8, stream: Ve(n5, e8) }])), D = w2(E2.level), E2;
 }
 function A2(e8, t6) {
-  k2(t6?.level ?? C(Z), t6?.destination ?? K), S(T, `Root logger is not initialized`);
-  let i3 = T.child({ name: e8 }, { level: t6?.level ?? E2 });
-  return D.add(i3), i3;
+  He(t6?.level ?? w2(Z), t6?.destination ?? K), C(E2, `Root logger is not initialized`);
+  let i3 = E2.child({ name: e8 }, { level: t6?.level ?? D });
+  return ze.add(i3), i3;
 }
-var We = 10 * 1024 * 1024;
-var F2;
-function L2(e8) {
-  let t6 = e8 || F2;
+var j2 = 10 * 1024 * 1024;
+var I2;
+function R2(e8) {
+  let t6 = e8 || I2;
   if (t6) try {
     return new import_undici.ProxyAgent({ uri: t6 });
   } catch {
     return;
   }
 }
-var gt = { kind: `idle` };
-var _t = { kind: `wallclock` };
-function vt(e8, t6) {
+var ht = { kind: `idle` };
+var gt = { kind: `wallclock` };
+function _t(e8, t6) {
   return e8 ? t6.idleTimeout : t6.firstTokenIdleTimeout;
 }
-function yt(e8) {
+function vt(e8) {
   let t6 = e8.idleTimeout ?? 12e4, n5 = e8.firstTokenIdleTimeout ?? Math.max(t6, 9e5), r4 = e8.timeout ?? 3e5;
   return { timeout: Math.max(r4, n5 + 6e4), idleTimeout: t6, firstTokenIdleTimeout: n5 };
 }
-function bt(e8) {
+function yt(e8) {
   let t6 = e8.signal.reason;
   return typeof t6 == `object` && t6 && `kind` in t6 ? t6.kind : `external`;
 }
-async function* xt(e8) {
-  let { url: t6, method: n5 = `POST`, headers: r4 = {}, body: i3, signal: a3 } = e8, { timeout: o3, idleTimeout: s3, firstTokenIdleTimeout: c3 } = yt(e8), l2 = new AbortController(), u = a3 ? AbortSignal.any([a3, l2.signal]) : l2.signal, d = setTimeout(() => l2.abort(_t), o3), f, p = false, m = () => {
-    f && clearTimeout(f), f = setTimeout(() => l2.abort(gt), vt(p, { idleTimeout: s3, firstTokenIdleTimeout: c3 }));
+async function* bt(e8) {
+  let { url: t6, method: n5 = `POST`, headers: r4 = {}, body: i3, signal: a3 } = e8, { timeout: o3, idleTimeout: s3, firstTokenIdleTimeout: c3 } = vt(e8), l2 = new AbortController(), u = a3 ? AbortSignal.any([a3, l2.signal]) : l2.signal, d = setTimeout(() => l2.abort(gt), o3), f, p = false, m = () => {
+    f && clearTimeout(f), f = setTimeout(() => l2.abort(ht), _t(p, { idleTimeout: s3, firstTokenIdleTimeout: c3 }));
   }, h;
   try {
-    let a4 = L2(e8.proxy), o4 = { method: n5, headers: { "content-type": `application/json`, accept: `text/event-stream`, ...r4 }, body: i3 ? typeof i3 == `string` ? i3 : JSON.stringify(i3) : void 0, signal: u }, s4 = await fetch(t6, a4 ? { ...o4, dispatcher: a4 } : o4);
+    let a4 = R2(e8.proxy), o4 = { method: n5, headers: { "content-type": `application/json`, accept: `text/event-stream`, ...r4 }, body: i3 ? typeof i3 == `string` ? i3 : JSON.stringify(i3) : void 0, signal: u }, s4 = await fetch(t6, a4 ? { ...o4, dispatcher: a4 } : o4);
     if (!s4.ok) {
       let e9 = await s4.text(), t7 = `BAD_RESPONSE`;
       s4.status === 429 ? t7 = `RATE_LIMIT` : s4.status === 529 ? t7 = `OVERLOADED` : s4.status >= 500 ? t7 = `SERVER_ERROR` : s4.status >= 400 && (t7 = `REQUEST_ERROR`);
@@ -16298,9 +16298,9 @@ async function* xt(e8) {
         n6 = t8?.code ?? t8?.type;
       } catch {
       }
-      throw new b(`Http request failed ${s4.status}: ${e9}`, { code: t7, status: s4.status, headers: s4.headers, errorType: n6 });
+      throw new x(`Http request failed ${s4.status}: ${e9}`, { code: t7, status: s4.status, headers: s4.headers, errorType: n6 });
     }
-    if (e8.onResponse?.(s4.headers), !s4.body) throw new b(`Response body is empty`, { code: `BAD_RESPONSE` });
+    if (e8.onResponse?.(s4.headers), !s4.body) throw new x(`Response body is empty`, { code: `BAD_RESPONSE` });
     h = s4.body.getReader();
     let c4 = new TextDecoder(), l3 = [], d2 = createParser({ onEvent(e9) {
       l3.push({ event: e9.event || void 0, data: e9.data, id: e9.id || void 0 });
@@ -16318,13 +16318,13 @@ async function* xt(e8) {
       e9 && (p || (p = true, m()), yield e9);
     }
   } catch (e9) {
-    throw e9 instanceof b ? e9 : l2.signal.aborted || e9 instanceof DOMException && e9.name === `AbortError` ? new b(`Stream aborted or timed out`, { code: `TIMEOUT`, cause: e9 instanceof Error ? e9 : Error(String(e9)), abortKind: bt(l2) }) : new b(`Stream request failed`, { code: `NETWORK_ERROR`, cause: e9 instanceof Error ? e9 : Error(String(e9)) });
+    throw e9 instanceof x ? e9 : l2.signal.aborted || e9 instanceof DOMException && e9.name === `AbortError` ? new x(`Stream aborted or timed out`, { code: `TIMEOUT`, cause: e9 instanceof Error ? e9 : Error(String(e9)), abortKind: yt(l2) }) : new x(`Stream request failed`, { code: `NETWORK_ERROR`, cause: e9 instanceof Error ? e9 : Error(String(e9)) });
   } finally {
     clearTimeout(d), f && clearTimeout(f), h && h.cancel().catch(() => {
     });
   }
 }
-function wt(e8, t6) {
+function Ct(e8, t6) {
   if (e8 == null) return;
   if (typeof e8.get == `function`) return e8.get(t6) ?? void 0;
   let n5 = e8;
@@ -16333,8 +16333,8 @@ function wt(e8, t6) {
     return typeof t7 == `string` ? t7 : void 0;
   }
 }
-var B2 = { Bash: `bash`, Read: `read`, Write: `write`, Edit: `edit`, MultiEdit: `edit`, Grep: `grep`, Glob: `find`, WebFetch: `web_fetch`, WebSearch: `web_search`, Task: `task_delegate`, TodoWrite: `write_todos` };
-var kt = Object.fromEntries(Object.entries(B2).reverse().map(([e8, t6]) => [t6, e8]));
+var V2 = { Bash: `bash`, Read: `read`, Write: `write`, Edit: `edit`, MultiEdit: `edit`, Grep: `grep`, Glob: `find`, WebFetch: `web_fetch`, WebSearch: `web_search`, Task: `task_delegate`, TodoWrite: `write_todos` };
+var Ot = Object.fromEntries(Object.entries(V2).reverse().map(([e8, t6]) => [t6, e8]));
 var Kt = 5 * 1024 * 1024;
 var qt = Buffer.from([137, 80, 78, 71, 13, 10, 26, 10]);
 var Jt = Buffer.from(`GIF8`, `ascii`);
@@ -16371,7 +16371,7 @@ function i2(e8) {
 }
 
 // ../interchange/dist/index.js
-var _ = { toolGuidance: { name: `tool-guidance-injection`, priority: 20, lane: `stable`, budgetBytes: 2e4 }, skillLoopGuidance: { name: `skill-loop-guidance-injection`, priority: 21, lane: `stable`, budgetBytes: 2e3 }, environment: { name: `runtime:environment`, priority: 25, lane: `stable`, budgetBytes: 8e3 }, agentKnowledge: { name: `agent-knowledge-injection`, priority: 35, lane: `stable`, budgetBytes: 28e3 }, skillCatalog: { name: `skill-catalog-injection`, priority: 38, lane: `stable`, budgetBytes: 12e3 }, lessonRelevantHints: { name: `lesson-relevant-hints`, priority: 41, lane: `volatile`, budgetBytes: 4e3 }, internalize: { name: `internalize-skill-injection`, priority: 42, lane: `volatile`, budgetBytes: 4e3 }, memoryDelta: { name: `memory-delta-injection`, priority: 60, lane: `volatile`, budgetBytes: 8e3 }, todoReminder: { name: `todo-reminder-injection`, priority: 62, lane: `volatile`, budgetBytes: 4e3 }, docSyncReminder: { name: `doc-sync-reminder-injection`, priority: 64, lane: `volatile`, budgetBytes: 4e3 } };
+var _ = { toolGuidance: { name: `tool-guidance-injection`, priority: 20, lane: `stable`, budgetBytes: 2e4 }, skillLoopGuidance: { name: `skill-loop-guidance-injection`, priority: 21, lane: `stable`, budgetBytes: 2e3 }, environment: { name: `runtime:environment`, priority: 25, lane: `stable`, budgetBytes: 8e3 }, agentKnowledge: { name: `agent-knowledge-injection`, priority: 35, lane: `stable`, budgetBytes: 28e3 }, skillCatalog: { name: `skill-catalog-injection`, priority: 38, lane: `stable`, budgetBytes: 12e3 }, lessonRelevantHints: { name: `lesson-relevant-hints`, priority: 41, lane: `volatile`, budgetBytes: 4e3 }, internalize: { name: `internalize-skill-injection`, priority: 42, lane: `volatile`, budgetBytes: 4e3 }, pluginFailures: { name: `plugin-failures-injection`, priority: 55, lane: `volatile`, budgetBytes: 4e3 }, memoryDelta: { name: `memory-delta-injection`, priority: 60, lane: `volatile`, budgetBytes: 8e3 }, todoReminder: { name: `todo-reminder-injection`, priority: 62, lane: `volatile`, budgetBytes: 4e3 }, docSyncReminder: { name: `doc-sync-reminder-injection`, priority: 64, lane: `volatile`, budgetBytes: 4e3 } };
 var v = Object.values(_);
 
 // ../provider/dist/index.js
@@ -16380,9 +16380,13 @@ var _2 = { debug: () => {
 }, warn: () => {
 }, error: () => {
 } };
-async function v2(e8, t6, n5) {
-  let r4 = process.env[e8];
-  if (r4) return r4;
+async function v2(e8, t6, n5, r4 = false) {
+  if (r4 && t6) {
+    let e9 = await t6();
+    if (e9) return e9;
+  }
+  let i3 = process.env[e8];
+  if (i3) return i3;
   if (t6) {
     let e9 = await t6();
     if (e9) return e9;
@@ -16452,26 +16456,29 @@ function D2(e8, t6) {
   else break;
   return i3 ?? r4[0];
 }
+function O(e8, t6) {
+  return e8.reasoning === true && !!t6;
+}
 function te2(e8) {
   for (let t6 of e8) if (t6.role === `tool_result` || t6.role === `assistant` && t6.content.some((e9) => e9.type === `tool_call`)) return true;
   return false;
 }
-function O2(t6) {
-  let n5 = [];
+function k3(t6) {
+  let n5 = [], r4 = O(t6.model, t6.thinkingLevel);
   t6.systemPrompt && n5.push({ role: `system`, content: w3(t6.systemPrompt) });
-  for (let r4 of b2(t6.messages)) if (r4.role === `user`) typeof r4.content == `string` ? n5.push({ role: `user`, content: w3(r4.content) }) : n5.push({ role: `user`, content: r4.content.map((t7) => {
+  for (let i3 of b2(t6.messages)) if (i3.role === `user`) typeof i3.content == `string` ? n5.push({ role: `user`, content: w3(i3.content) }) : n5.push({ role: `user`, content: i3.content.map((t7) => {
     if (t7.type === `text`) return { type: `text`, text: w3(t7.text) };
     if (t7.type === `image`) {
-      let { base64: n6, mediaType: r5, valid: i3 } = t3(t7.source, t7.mime);
-      return i3 ? { type: `image_url`, image_url: { url: `data:${r5 || `image/png`};base64,${n6}` } } : { type: `text`, text: `[image omitted: corrupted or empty data]` };
+      let { base64: n6, mediaType: r5, valid: i4 } = t3(t7.source, t7.mime);
+      return i4 ? { type: `image_url`, image_url: { url: `data:${r5 || `image/png`};base64,${n6}` } } : { type: `text`, text: `[image omitted: corrupted or empty data]` };
     }
     return { type: `text`, text: `[unsupported]` };
   }) });
-  else if (r4.role === `assistant`) {
-    let e8 = r4.content.filter((e9) => e9.type === `tool_call`).map((e9) => ({ id: e9.id, type: `function`, function: { name: e9.name, arguments: JSON.stringify(e9.arguments) } })), t7 = r4.content.filter((e9) => e9.type === `text`).filter((e9) => e9.text.trim().length > 0).map((e9) => w3(e9.text)).join(``);
-    if (!t7 && e8.length === 0) continue;
-    n5.push({ role: `assistant`, content: t7 || null, ...e8.length > 0 ? { tool_calls: e8 } : {} });
-  } else r4.role === `tool_result` ? n5.push({ role: `tool`, tool_call_id: r4.toolCallId, content: w3(r4.content.map((e8) => e8.type === `text` ? e8.text : ``).join(``)) }) : r4.role === `system_notification` && n5.push({ role: `user`, content: w3(S2(r4.content)) });
+  else if (i3.role === `assistant`) {
+    let e8 = i3.content.filter((e9) => e9.type === `tool_call`).map((e9) => ({ id: e9.id, type: `function`, function: { name: e9.name, arguments: JSON.stringify(e9.arguments) } })), t7 = i3.content.filter((e9) => e9.type === `text`).filter((e9) => e9.text.trim().length > 0).map((e9) => w3(e9.text)).join(``), a3 = i3.content.filter((e9) => e9.type === `thinking`).map((e9) => w3(e9.text)).join(``).trim();
+    if (!t7 && e8.length === 0 && !a3) continue;
+    n5.push({ role: `assistant`, content: t7 || null, ...e8.length > 0 ? { tool_calls: e8 } : {}, ...a3 ? { reasoning_content: a3 } : e8.length > 0 && r4 ? { reasoning_content: null } : {} });
+  } else i3.role === `tool_result` ? n5.push({ role: `tool`, tool_call_id: i3.toolCallId, content: w3(i3.content.map((e8) => e8.type === `text` ? e8.text : ``).join(``)) }) : i3.role === `system_notification` && n5.push({ role: `user`, content: w3(S2(i3.content)) });
   return n5;
 }
 function ne2(e8) {
@@ -16488,8 +16495,8 @@ function ne2(e8) {
   }
 }
 function re(e8, t6, n5 = {}) {
-  let r4 = { model: n5.modelName ?? e8.name, messages: O2(t6), max_tokens: t6.maxTokens ?? e8.maxOutputTokens, stream: true, stream_options: { include_usage: true } };
-  return t6.temperature !== void 0 && !e8.reasoning && (r4.temperature = t6.temperature), e8.reasoning && t6.thinkingLevel && (r4.reasoning_effort = ne2(D2(t6.thinkingLevel, e8.thinkingLevels))), t6.tools && t6.tools.length > 0 ? r4.tools = t6.tools.map((e9) => ({ type: `function`, function: { name: e9.name, description: e9.description, parameters: T2(e9.parameters) } })) : te2(t6.messages) && (r4.tools = []), r4;
+  let r4 = { model: n5.modelName ?? e8.name, messages: k3(t6), max_tokens: t6.maxTokens ?? e8.maxOutputTokens, stream: true, stream_options: { include_usage: true } };
+  return t6.temperature !== void 0 && !e8.reasoning && (r4.temperature = t6.temperature), O(e8, t6.thinkingLevel) && t6.thinkingLevel !== void 0 && (r4.reasoning_effort = ne2(D2(t6.thinkingLevel, e8.thinkingLevels))), t6.tools && t6.tools.length > 0 ? r4.tools = t6.tools.map((e9) => ({ type: `function`, function: { name: e9.name, description: e9.description, parameters: T2(e9.parameters) } })) : te2(t6.messages) && (r4.tools = []), r4;
 }
 var ie = A2(`@x-otto/provider:openai-usage`);
 function ae2(e8) {
@@ -16510,7 +16517,7 @@ function ae2(e8) {
   }, r4 = { remainingRequests: t6(`x-ratelimit-remaining-requests`), remainingTokens: t6(`x-ratelimit-remaining-tokens`), limitRequests: t6(`x-ratelimit-limit-requests`), limitTokens: t6(`x-ratelimit-limit-tokens`), resetRequestsMs: n5(`x-ratelimit-reset-requests`), resetTokensMs: n5(`x-ratelimit-reset-tokens`) };
   if (!Object.values(r4).every((e9) => e9 === void 0)) return r4;
 }
-function oe2(e8) {
+function A3(e8) {
   if (!e8) return null;
   let t6 = ae2(e8);
   if (ie.isLevelEnabled(`trace`)) {
@@ -16524,62 +16531,62 @@ function oe2(e8) {
   }
   return t6 ? { status: `unknown`, standardLimits: t6 } : null;
 }
-var se = A2(`@x-otto/provider:stream-state`);
-function k3() {
+var oe2 = A2(`@x-otto/provider:stream-state`);
+function j3() {
   return { inputTokens: 0, outputTokens: 0, cacheReadTokens: 0, cacheWriteTokens: 0 };
 }
-function A3(e8, t6) {
+function M2(e8, t6) {
   try {
     return { args: JSON.parse(e8), parseFailed: false };
   } catch {
-    return se.debug({ toolName: t6 }, `Failed to parse tool arguments JSON`), { args: {}, parseFailed: true };
+    return oe2.debug({ toolName: t6 }, `Failed to parse tool arguments JSON`), { args: {}, parseFailed: true };
   }
 }
-function le2(e8) {
+function ce(e8) {
   return new Set(e8?.map((e9) => e9.name) ?? []);
 }
-function j2(e8, t6, n5) {
-  let { args: r4, parseFailed: i3 } = A3(n5, t6);
+function N2(e8, t6, n5) {
+  let { args: r4, parseFailed: i3 } = M2(n5, t6);
   return { type: `tool_call`, id: e8, name: t6, arguments: r4, ...i3 ? { argumentsParseFailed: true } : {} };
 }
-function M2(e8, t6) {
+function P2(e8, t6) {
   if (e8.content.some((e9) => e9.type === `tool_call`)) return e8;
   let n5 = e8.content.findLastIndex((e9) => e9.type === `text`);
   if (n5 < 0) return e8;
-  let r4 = e8.content[n5], i3 = P2(r4.text, t6);
+  let r4 = e8.content[n5], i3 = I3(r4.text, t6);
   if (!i3) return e8;
   let a3 = [...e8.content], o3 = r4.text.slice(0, i3.matchStart).trimEnd();
-  return o3.length > 0 ? a3[n5] = { ...r4, text: o3 } : a3.splice(n5, 1), a3.push(j2(`recovered_${n5}`, i3.name, i3.argumentsJson)), { ...e8, content: a3 };
+  return o3.length > 0 ? a3[n5] = { ...r4, text: o3 } : a3.splice(n5, 1), a3.push(N2(`recovered_${n5}`, i3.name, i3.argumentsJson)), { ...e8, content: a3 };
 }
-var ue2 = /<invoke name="([^"]+)">((?:(?!<invoke name=")[\s\S])*?)<\/invoke>\s*$/;
-var N2 = /<parameter name="([^"]+)">([\s\S]*?)<\/parameter>/g;
-function P2(e8, t6) {
-  let n5 = e8.trimEnd(), r4 = ue2.exec(n5);
+var le2 = /<invoke name="([^"]+)">((?:(?!<invoke name=")[\s\S])*?)<\/invoke>\s*$/;
+var F2 = /<parameter name="([^"]+)">([\s\S]*?)<\/parameter>/g;
+function I3(e8, t6) {
+  let n5 = e8.trimEnd(), r4 = le2.exec(n5);
   if (!r4) return null;
   let i3 = r4[1];
   if (!t6.has(i3)) return null;
   let a3 = {}, o3 = r4[2], s3;
-  for (N2.lastIndex = 0; (s3 = N2.exec(o3)) !== null; ) a3[s3[1]] = s3[2];
+  for (F2.lastIndex = 0; (s3 = F2.exec(o3)) !== null; ) a3[s3[1]] = s3[2];
   return { name: i3, argumentsJson: JSON.stringify(a3), matchStart: r4.index };
 }
-function F3() {
-  return { ...k3(), textContent: ``, thinkingText: ``, toolCalls: /* @__PURE__ */ new Map(), stopReason: `end_turn` };
+function L2() {
+  return { ...j3(), textContent: ``, thinkingText: ``, toolCalls: /* @__PURE__ */ new Map(), stopReason: `end_turn` };
 }
-function I2(e8, t6 = true) {
+function R3(e8, t6 = true) {
   let n5 = [];
-  if (e8.thinkingText && n5.push({ type: `thinking`, text: e8.thinkingText }), e8.textContent && n5.push({ type: `text`, text: e8.textContent }), t6) for (let [, t7] of e8.toolCalls) n5.push(j2(t7.id, t7.name, t7.argumentsJson));
+  if (e8.thinkingText && n5.push({ type: `thinking`, text: e8.thinkingText }), e8.textContent && n5.push({ type: `text`, text: e8.textContent }), t6) for (let [, t7] of e8.toolCalls) n5.push(N2(t7.id, t7.name, t7.argumentsJson));
   return n5;
 }
-function fe2(e8, t6 = true) {
+function de2(e8, t6 = true) {
   let n5 = [], r4 = [...e8.entries()].sort(([e9], [t7]) => e9 - t7);
-  for (let [, e9] of r4) e9.kind === `thinking` ? e9.text && n5.push({ type: `thinking`, text: e9.text, ...e9.signature === void 0 ? {} : { signature: e9.signature } }) : e9.kind === `text` ? e9.text && n5.push({ type: `text`, text: e9.text }) : t6 && n5.push(j2(e9.id, e9.name, e9.argumentsJson));
+  for (let [, e9] of r4) e9.kind === `thinking` ? e9.text && n5.push({ type: `thinking`, text: e9.text, ...e9.signature === void 0 ? {} : { signature: e9.signature } }) : e9.kind === `text` ? e9.text && n5.push({ type: `text`, text: e9.text }) : t6 && n5.push(N2(e9.id, e9.name, e9.argumentsJson));
   return n5;
 }
-function L3(e8, t6, n5, r4) {
+function z2(e8, t6, n5, r4) {
   return { role: `assistant`, content: t6, api: e8.api, provider: e8.provider, model: e8.model, usage: { inputTokens: n5.inputTokens, outputTokens: n5.outputTokens, cacheReadTokens: n5.cacheReadTokens, cacheWriteTokens: n5.cacheWriteTokens }, stopReason: r4 };
 }
-var pe = A2(`@x-otto/provider:chat-completions-stream`);
-function R2(e8) {
+var fe = A2(`@x-otto/provider:chat-completions-stream`);
+function B2(e8) {
   switch (e8) {
     case `stop`:
       return `end_turn`;
@@ -16590,11 +16597,11 @@ function R2(e8) {
     case `content_filter`:
       return `refusal`;
     default:
-      return pe.warn(`Unknown chat-completions finish_reason: ${e8}`), `end_turn`;
+      return fe.warn(`Unknown chat-completions finish_reason: ${e8}`), `end_turn`;
   }
 }
-async function* me(e8) {
-  let { url: t6, headers: r4, body: i3, identity: a3, signal: o3, timeout: s3, idleTimeout: c3, onResponse: l2, registeredToolNames: u } = e8, d = F3(), p = (e9 = false) => L3(a3, I2(d, e9), d, d.stopReason), m = false, h = false, g = false, _3, v3 = xt({ url: t6, body: i3, headers: r4, signal: o3, timeout: s3, idleTimeout: c3, onResponse: (e9) => {
+async function* pe(e8) {
+  let { url: t6, headers: r4, body: i3, identity: a3, signal: o3, timeout: s3, idleTimeout: c3, onResponse: l2, registeredToolNames: u } = e8, d = L2(), p = (e9 = false) => z2(a3, R3(d, e9), d, d.stopReason), m = false, h = false, g = false, _3, v3 = bt({ url: t6, body: i3, headers: r4, signal: o3, timeout: s3, idleTimeout: c3, onResponse: (e9) => {
     _3 = e9, l2?.(e9);
   } });
   try {
@@ -16608,7 +16615,7 @@ async function* me(e8) {
       }
       if (t7.error) {
         let e10 = t7.error, r6 = typeof e10.message == `string` ? e10.message : JSON.stringify(e10), i5 = e10.code, a5 = typeof i5 == `number` ? i5 : typeof i5 == `string` && /^\d+/.test(i5) ? Number(i5.match(/^\d+/)?.[0]) : void 0;
-        throw new we(`Chat Completions stream error: ${r6}`, { code: `PROVIDER_API_ERROR`, status: a5 });
+        throw new Ce(`Chat Completions stream error: ${r6}`, { code: `PROVIDER_API_ERROR`, status: a5 });
       }
       if (t7.usage) {
         let e10 = t7.usage, n5 = e10.prompt_tokens ?? 0, r6 = e10.completion_tokens ?? 0, i5 = e10.prompt_tokens_details?.cached_tokens ?? e10.prompt_cache_hit_tokens ?? 0;
@@ -16617,7 +16624,7 @@ async function* me(e8) {
       let r5 = t7.choices?.[0];
       if (!r5) continue;
       let i4 = r5.delta;
-      if (m || (m = true, yield { type: `start`, partial: p() }), r5.finish_reason && (d.stopReason = R2(r5.finish_reason)), !i4) continue;
+      if (m || (m = true, yield { type: `start`, partial: p() }), r5.finish_reason && (d.stopReason = B2(r5.finish_reason)), !i4) continue;
       if (i4.content) {
         let e10 = i4.content;
         h || (h = true, yield { type: `text_start`, index: 0, partial: p() }), d.textContent += e10, yield { type: `text_delta`, index: 0, delta: e10, partial: p() };
@@ -16634,13 +16641,13 @@ async function* me(e8) {
       }
     }
     g && (yield { type: `thinking_end`, index: 0, content: d.thinkingText, partial: p() }), h && (yield { type: `text_end`, index: 0, content: d.textContent, partial: p() });
-    for (let [e9, t7] of d.toolCalls) yield { type: `tool_call_end`, index: e9, toolCall: j2(t7.id, t7.name, t7.argumentsJson), partial: p() };
-    yield { type: `done`, reason: d.stopReason, message: M2(p(true), u ?? /* @__PURE__ */ new Set()), providerUsage: oe2(_3) };
+    for (let [e9, t7] of d.toolCalls) yield { type: `tool_call_end`, index: e9, toolCall: N2(t7.id, t7.name, t7.argumentsJson), partial: p() };
+    yield { type: `done`, reason: d.stopReason, message: P2(p(true), u ?? /* @__PURE__ */ new Set()), providerUsage: A3(_3) };
   } catch (e9) {
-    yield { type: `error`, error: e9 instanceof Error ? e9 : new we(`Unknown Chat Completions stream error`, { code: `PROVIDER_STREAM_ERROR` }) };
+    yield { type: `error`, error: e9 instanceof Error ? e9 : new Ce(`Unknown Chat Completions stream error`, { code: `PROVIDER_STREAM_ERROR` }) };
   }
 }
-function z2(e8, t6, n5) {
+function V3(e8, t6, n5) {
   for (let r4 of e8) {
     if (!r4) continue;
     let e9 = r4.split(`.`)[1];
@@ -16657,45 +16664,45 @@ function z2(e8, t6, n5) {
     }
   }
 }
-var he = /* @__PURE__ */ new Set([`authorization`, `x-api-key`]);
-var ge = /^[!#$%&'*+\-.^_`|~0-9A-Za-z]+$/;
-var _e = /[\u0000-\u001f\u007f]/g;
-function B3(e8, t6, n5, r4) {
+var me = /* @__PURE__ */ new Set([`authorization`, `x-api-key`]);
+var he = /^[!#$%&'*+\-.^_`|~0-9A-Za-z]+$/;
+var ge = /[\u0000-\u001f\u007f]/g;
+function H2(e8, t6, n5, r4) {
   let i3 = /* @__PURE__ */ new Map();
   if (!e8) return i3;
   for (let [a3, o3] of Object.entries(e8)) {
     let e9 = a3.trim();
-    if (!ge.test(e9)) {
+    if (!he.test(e9)) {
       n5?.warn({ provider: r4, source: t6, header: a3 }, `dropped request header with invalid name (RFC 7230 token expected)`);
       continue;
     }
     if (typeof o3 != `string`) continue;
-    let s3 = o3.replace(_e, ``).trim();
+    let s3 = o3.replace(ge, ``).trim();
     s3 && i3.set(e9.toLowerCase(), { name: e9, value: s3 });
   }
   return i3;
 }
-function ve(e8) {
+function _e(e8) {
   if (!e8?.headers.length) return;
   let t6 = {};
   for (let n5 of e8.headers) {
     if (n5.source.kind !== `jwt-claim`) continue;
-    let r4 = z2(n5.source.tokenSources?.length ? n5.source.tokenSources.map((t7) => t7 === `access_token` ? e8.token : void 0) : [e8.token], n5.source.claim, n5.source.namespace);
+    let r4 = V3(n5.source.tokenSources?.length ? n5.source.tokenSources.map((t7) => t7 === `access_token` ? e8.token : void 0) : [e8.token], n5.source.claim, n5.source.namespace);
     r4 && (t6[n5.header] = r4);
   }
   return Object.keys(t6).length > 0 ? t6 : void 0;
 }
-function ye(e8) {
-  let { logger: t6, diagnosticLabel: n5, allowAuthHeaderOverride: r4 } = e8, i3 = [{ label: `protocolDefaults`, entries: B3(e8.protocolDefaults, `protocolDefaults`, t6, n5) }, { label: `staticHeaders`, entries: B3(e8.staticHeaders, `staticHeaders`, t6, n5) }, { label: `tokenDerived`, entries: B3(ve(e8.tokenDerived), `tokenDerived`, t6, n5) }, { label: `customized`, entries: B3(e8.customized, `customized`, t6, n5) }], a3 = /* @__PURE__ */ new Set([`staticHeaders`, `tokenDerived`, `customized`]), o3 = /* @__PURE__ */ new Map();
+function ve(e8) {
+  let { logger: t6, diagnosticLabel: n5, allowAuthHeaderOverride: r4 } = e8, i3 = [{ label: `protocolDefaults`, entries: H2(e8.protocolDefaults, `protocolDefaults`, t6, n5) }, { label: `staticHeaders`, entries: H2(e8.staticHeaders, `staticHeaders`, t6, n5) }, { label: `tokenDerived`, entries: H2(_e(e8.tokenDerived), `tokenDerived`, t6, n5) }, { label: `customized`, entries: H2(e8.customized, `customized`, t6, n5) }], a3 = /* @__PURE__ */ new Set([`staticHeaders`, `tokenDerived`, `customized`]), o3 = /* @__PURE__ */ new Map();
   for (let { label: e9, entries: s4 } of i3) for (let [i4, c3] of s4) {
-    if (!r4 && a3.has(e9) && he.has(i4)) {
+    if (!r4 && a3.has(e9) && me.has(i4)) {
       t6?.warn({ provider: n5, source: e9, header: c3.name }, `dropped attempt to override auth header (declare allowAuthHeaderOverride to permit)`);
       continue;
     }
     let s5 = o3.get(i4);
     s5 && e9 === `customized` && s5.value !== c3.value && t6?.debug({ provider: n5, header: c3.name }, `customizeRequest overrode a previously declared request header`), o3.set(i4, c3);
   }
-  for (let [i4, a4] of B3(e8.auth, `auth`, t6, n5)) {
+  for (let [i4, a4] of H2(e8.auth, `auth`, t6, n5)) {
     if (r4 && o3.has(i4)) {
       t6?.debug({ provider: n5, header: a4.name }, `provider-declared auth header kept (allowAuthHeaderOverride); otto-resolved credential not applied`);
       continue;
@@ -16706,7 +16713,7 @@ function ye(e8) {
   for (let { name: e9, value: t7 } of o3.values()) s3[e9] = t7;
   return s3;
 }
-var V2 = A2(`@x-otto/provider:oauth:templates`);
+var U = A2(`@x-otto/provider:oauth:templates`);
 
 // ../../extensions/plugin-otto-wire-protocols/src/anthropic-usage.ts
 var LIMIT_TYPE_ABBREVIATION = {
@@ -16720,7 +16727,7 @@ function readBucketUtilization(headers, limitType) {
   if (!limitType) return void 0;
   const abbr = LIMIT_TYPE_ABBREVIATION[limitType];
   if (!abbr) return void 0;
-  const raw = wt(headers, `anthropic-ratelimit-unified-${abbr}-utilization`);
+  const raw = Ct(headers, `anthropic-ratelimit-unified-${abbr}-utilization`);
   if (raw === void 0) return void 0;
   const n5 = Number(raw);
   if (!Number.isFinite(n5)) return void 0;
@@ -16728,13 +16735,13 @@ function readBucketUtilization(headers, limitType) {
 }
 function extractProviderUsageFromHeaders(headers) {
   if (!headers) return null;
-  const status = wt(headers, "anthropic-ratelimit-unified-status");
+  const status = Ct(headers, "anthropic-ratelimit-unified-status");
   if (status !== "allowed" && status !== "allowed_warning" && status !== "rejected") return null;
-  const limitType = wt(headers, "anthropic-ratelimit-unified-representative-claim");
-  const resetRaw = wt(headers, "anthropic-ratelimit-unified-reset");
-  const overageStatus = wt(headers, "anthropic-ratelimit-unified-overage-status");
-  const overageResetRaw = wt(headers, "anthropic-ratelimit-unified-overage-reset");
-  const overageDisabledReason = wt(
+  const limitType = Ct(headers, "anthropic-ratelimit-unified-representative-claim");
+  const resetRaw = Ct(headers, "anthropic-ratelimit-unified-reset");
+  const overageStatus = Ct(headers, "anthropic-ratelimit-unified-overage-status");
+  const overageResetRaw = Ct(headers, "anthropic-ratelimit-unified-overage-reset");
+  const overageDisabledReason = Ct(
     headers,
     "anthropic-ratelimit-unified-overage-disabled-reason"
   );
@@ -16988,16 +16995,16 @@ function mapStopReason(reason) {
 }
 function initStreamState(modelId) {
   return {
-    ...k3(),
+    ...j3(),
     model: modelId,
     blocks: /* @__PURE__ */ new Map(),
     stopReason: "end_turn"
   };
 }
 function buildAssistantMessage(state, final = false) {
-  return L3(
+  return z2(
     { api: "anthropic-messages", provider: "anthropic", model: state.model },
-    fe2(state.blocks, final),
+    de2(state.blocks, final),
     state,
     state.stopReason
   );
@@ -17091,7 +17098,7 @@ function dispatchStreamEvent(event, state) {
         return [{
           type: "tool_call_end",
           index,
-          toolCall: j2(block.id, block.name, block.argumentsJson),
+          toolCall: N2(block.id, block.name, block.argumentsJson),
           partial: buildAssistantMessage(state)
         }];
       }
@@ -17116,9 +17123,10 @@ function dispatchStreamEvent(event, state) {
   }
 }
 var AnthropicStream = class {
-  constructor(resolveCredential, baseUrlResolver, authResolver, customizeRequest, logger = _2, staticHeaders, tokenDerivedHeaders, allowAuthHeaderOverride) {
+  constructor(resolveCredential, baseUrlResolver, preferResolvedBaseUrl = false, authResolver, customizeRequest, logger = _2, staticHeaders, tokenDerivedHeaders, allowAuthHeaderOverride) {
     this.resolveCredential = resolveCredential;
     this.baseUrlResolver = baseUrlResolver;
+    this.preferResolvedBaseUrl = preferResolvedBaseUrl;
     this.authResolver = authResolver;
     this.customizeRequest = customizeRequest;
     this.logger = logger;
@@ -17128,6 +17136,7 @@ var AnthropicStream = class {
   }
   resolveCredential;
   baseUrlResolver;
+  preferResolvedBaseUrl;
   authResolver;
   customizeRequest;
   logger;
@@ -17162,15 +17171,20 @@ var AnthropicStream = class {
     if (envKey) {
       return { token: envKey, mode: "api_key" };
     }
-    throw new we(
+    throw new Ce(
       "Missing Anthropic API key. Set ANTHROPIC_API_KEY or configure via auth file.",
       { code: "PROVIDER_AUTH_MISSING" }
     );
   }
   async buildRequestParams(model, context, auth) {
-    const baseURL = await v2("ANTHROPIC_BASE_URL", this.baseUrlResolver, model.baseUrl);
+    const baseURL = await v2(
+      "ANTHROPIC_BASE_URL",
+      this.baseUrlResolver,
+      model.baseUrl,
+      this.preferResolvedBaseUrl
+    );
     const customization = this.customizeRequest?.({ auth, sessionId: this.requestSessionId });
-    const defaultHeaders = ye({
+    const defaultHeaders = ve({
       staticHeaders: this.staticHeaders,
       tokenDerived: this.tokenDerivedHeaders?.length ? { headers: this.tokenDerivedHeaders, token: auth.token } : void 0,
       customized: customization?.defaultHeaders,
@@ -17257,14 +17271,14 @@ var AnthropicStream = class {
         // RFC-232（终局修正）：跨 wire 协议救回"模型把工具调用写成字面文本 XML"违约响应
         // （见 stream-state.ts recoverLiteralInvokeToolCalls 头注释）。判据内部短路，
         // 无违约态时零开销（引用相等，不构造新对象）。
-        message: M2(doneMessage, le2(context.tools)),
+        message: P2(doneMessage, ce(context.tools)),
         providerUsage
       };
     } catch (error) {
       if (error instanceof Anthropic.APIError) {
         yield {
           type: "error",
-          error: new we(`Anthropic API error ${error.status}: ${error.message}`, {
+          error: new Ce(`Anthropic API error ${error.status}: ${error.message}`, {
             code: "PROVIDER_API_ERROR",
             cause: error,
             // 把 SDK 的 HTTP status/headers 转成 ProviderError 的 typed 字段
@@ -17282,7 +17296,7 @@ var AnthropicStream = class {
       } else {
         yield {
           type: "error",
-          error: new we("Unknown Anthropic stream error", {
+          error: new Ce("Unknown Anthropic stream error", {
             code: "PROVIDER_STREAM_ERROR"
           })
         };
@@ -17294,6 +17308,7 @@ function createAnthropicProvider(options = {}) {
   return new AnthropicStream(
     options.resolveKey,
     options.resolveBaseUrl,
+    options.preferResolvedBaseUrl,
     options.resolveAuth,
     options.customizeRequest,
     options.logger,
@@ -17429,16 +17444,16 @@ function ensureBlock(blocks, index, kind) {
 }
 function initStreamState2(model) {
   return {
-    ...k3(),
+    ...j3(),
     model,
     blocks: /* @__PURE__ */ new Map(),
     stopReason: "end_turn"
   };
 }
 function buildAssistantMessage2(state, final = false) {
-  return L3(
+  return z2(
     { api: state.model.api, provider: state.model.provider, model: state.model.id },
-    fe2(state.blocks, final),
+    de2(state.blocks, final),
     state,
     state.stopReason
   );
@@ -17526,7 +17541,7 @@ function dispatchResponsesSSEEvent(type, data, state) {
       return {
         events: [{
           type: "error",
-          error: new we(`OpenAI Responses API error: ${message}`, {
+          error: new Ce(`OpenAI Responses API error: ${message}`, {
             code: "PROVIDER_API_ERROR",
             errorType
           })
@@ -17539,9 +17554,10 @@ function dispatchResponsesSSEEvent(type, data, state) {
   }
 }
 var OpenAIResponsesStream = class {
-  constructor(resolveCredential, baseUrlResolver, tokenDerivedHeaders, staticHeaders, logger = _2, customizeRequest, allowAuthHeaderOverride) {
+  constructor(resolveCredential, baseUrlResolver, preferResolvedBaseUrl = false, tokenDerivedHeaders, staticHeaders, logger = _2, customizeRequest, allowAuthHeaderOverride) {
     this.resolveCredential = resolveCredential;
     this.baseUrlResolver = baseUrlResolver;
+    this.preferResolvedBaseUrl = preferResolvedBaseUrl;
     this.tokenDerivedHeaders = tokenDerivedHeaders;
     this.staticHeaders = staticHeaders;
     this.logger = logger;
@@ -17550,6 +17566,7 @@ var OpenAIResponsesStream = class {
   }
   resolveCredential;
   baseUrlResolver;
+  preferResolvedBaseUrl;
   tokenDerivedHeaders;
   staticHeaders;
   logger;
@@ -17574,12 +17591,17 @@ var OpenAIResponsesStream = class {
     if (envKey) {
       return { token: envKey, mode: "api_key" };
     }
-    throw new we("Missing OpenAI credential. Set OPENAI_API_KEY or login via OAuth.", {
+    throw new Ce("Missing OpenAI credential. Set OPENAI_API_KEY or login via OAuth.", {
       code: "PROVIDER_AUTH_MISSING"
     });
   }
   async resolveBaseUrl(model) {
-    return v2("OPENAI_BASE_URL", this.baseUrlResolver, model.baseUrl);
+    return v2(
+      "OPENAI_BASE_URL",
+      this.baseUrlResolver,
+      model.baseUrl,
+      this.preferResolvedBaseUrl
+    );
   }
   /**
    * RFC-270 D1：头组装收敛到 @x-otto/provider 的统一管线（此前本方法自行合并，且注释声称
@@ -17591,7 +17613,7 @@ var OpenAIResponsesStream = class {
       auth: { mode: auth.mode, beta: auth.beta },
       sessionId: this.requestSessionId
     });
-    return ye({
+    return ve({
       staticHeaders: this.staticHeaders,
       tokenDerived: this.tokenDerivedHeaders?.length ? { headers: this.tokenDerivedHeaders, token: auth.token } : void 0,
       customized: customization?.defaultHeaders,
@@ -17611,7 +17633,7 @@ var OpenAIResponsesStream = class {
     let started = false;
     try {
       let responseHeaders;
-      const sse = xt({
+      const sse = bt({
         url,
         body,
         headers: this.buildHeaders(auth, model.provider),
@@ -17650,7 +17672,7 @@ var OpenAIResponsesStream = class {
           yield {
             type: "tool_call_end",
             index,
-            toolCall: j2(block.id, block.name, block.argumentsJson),
+            toolCall: N2(block.id, block.name, block.argumentsJson),
             partial: buildAssistantMessage2(state)
           };
         } else if (block.kind === "text") {
@@ -17668,8 +17690,8 @@ var OpenAIResponsesStream = class {
         type: "done",
         reason: state.stopReason,
         // RFC-232（终局修正）：跨 wire 协议救回违约响应，见 @x-otto/provider stream-state.ts。
-        message: M2(buildAssistantMessage2(state, true), le2(context.tools)),
-        providerUsage: oe2(responseHeaders)
+        message: P2(buildAssistantMessage2(state, true), ce(context.tools)),
+        providerUsage: A3(responseHeaders)
       };
     } catch (error) {
       if (error instanceof Error) {
@@ -17677,7 +17699,7 @@ var OpenAIResponsesStream = class {
       } else {
         yield {
           type: "error",
-          error: new we("Unknown OpenAI Responses stream error", {
+          error: new Ce("Unknown OpenAI Responses stream error", {
             code: "PROVIDER_STREAM_ERROR"
           })
         };
@@ -17689,6 +17711,7 @@ function createOpenAIResponsesProvider(options = {}) {
   return new OpenAIResponsesStream(
     options.resolveKey,
     options.resolveBaseUrl,
+    options.preferResolvedBaseUrl,
     options.tokenDerivedHeaders,
     options.headers,
     options.logger,
@@ -17700,8 +17723,10 @@ function createOpenAIResponsesProvider(options = {}) {
 // ../../extensions/plugin-otto-wire-protocols/src/openai-completions.ts
 var import_node_crypto3 = require("node:crypto");
 var OpenAICompletionsStream = class {
-  constructor(resolveCredential, extraHeaders, tokenDerivedHeaders, logger = _2, customizeRequest, allowAuthHeaderOverride) {
+  constructor(resolveCredential, baseUrlResolver, preferResolvedBaseUrl = false, extraHeaders, tokenDerivedHeaders, logger = _2, customizeRequest, allowAuthHeaderOverride) {
     this.resolveCredential = resolveCredential;
+    this.baseUrlResolver = baseUrlResolver;
+    this.preferResolvedBaseUrl = preferResolvedBaseUrl;
     this.extraHeaders = extraHeaders;
     this.tokenDerivedHeaders = tokenDerivedHeaders;
     this.logger = logger;
@@ -17709,6 +17734,8 @@ var OpenAICompletionsStream = class {
     this.allowAuthHeaderOverride = allowAuthHeaderOverride;
   }
   resolveCredential;
+  baseUrlResolver;
+  preferResolvedBaseUrl;
   extraHeaders;
   tokenDerivedHeaders;
   logger;
@@ -17729,7 +17756,7 @@ var OpenAICompletionsStream = class {
         return { token: key, mode: "api_key" };
       }
     }
-    throw new we(
+    throw new Ce(
       `Missing credential for provider '${model.provider}' (openai-completions).`,
       { code: "PROVIDER_AUTH_MISSING" }
     );
@@ -17742,7 +17769,7 @@ var OpenAICompletionsStream = class {
       auth: { mode: auth.mode, beta: auth.beta },
       sessionId: this.requestSessionId
     });
-    const headers = ye({
+    const headers = ve({
       staticHeaders: this.extraHeaders,
       tokenDerived: this.tokenDerivedHeaders?.length ? { headers: this.tokenDerivedHeaders, token: key } : void 0,
       customized: customization?.defaultHeaders,
@@ -17751,11 +17778,12 @@ var OpenAICompletionsStream = class {
       logger: this.logger,
       diagnosticLabel: `openai-completions:${model.provider}`
     });
-    yield* me({
+    yield* pe({
       url: `${await v2(
         model.provider === "deepseek" ? "DEEPSEEK_BASE_URL" : "OPENAI_BASE_URL",
-        void 0,
-        model.baseUrl
+        this.baseUrlResolver,
+        model.baseUrl,
+        this.preferResolvedBaseUrl
       )}/chat/completions`,
       headers,
       body: re(model, context),
@@ -17775,13 +17803,15 @@ var OpenAICompletionsStream = class {
       // 区分——分段判据比"模型是否声明 reasoning"更准（同一个 reasoning 模型的不同 turn，
       // 思考时长差异极大，用模型属性预测本就是弱相关变量）。
       // RFC-232（终局修正）：跨 wire 协议救回违约响应，见 @x-otto/provider stream-state.ts。
-      registeredToolNames: le2(context.tools)
+      registeredToolNames: ce(context.tools)
     });
   }
 };
 function createOpenAICompletionsProvider(options = {}) {
   return new OpenAICompletionsStream(
     options.resolveKey,
+    options.resolveBaseUrl,
+    options.preferResolvedBaseUrl,
     options.headers,
     options.tokenDerivedHeaders,
     options.logger,
@@ -17794,6 +17824,8 @@ function createOpenAICompletionsProvider(options = {}) {
 function adaptToOpenAICompletions(input) {
   return createOpenAICompletionsProvider({
     resolveKey: () => input.resolveAuth().then((a3) => a3?.token),
+    resolveBaseUrl: input.resolveBaseUrl,
+    preferResolvedBaseUrl: input.preferResolvedBaseUrl,
     headers: input.headers,
     tokenDerivedHeaders: input.tokenDerivedHeaders,
     logger: input.logger,
@@ -17806,6 +17838,7 @@ function adaptToOpenAIResponses(input) {
   return createOpenAIResponsesProvider({
     resolveKey: () => input.resolveAuth().then((a3) => a3?.token),
     resolveBaseUrl: input.resolveBaseUrl,
+    preferResolvedBaseUrl: input.preferResolvedBaseUrl,
     tokenDerivedHeaders: input.tokenDerivedHeaders,
     headers: input.headers,
     logger: input.logger,
@@ -17818,6 +17851,7 @@ function adaptToAnthropicMessages(input) {
   return createAnthropicProvider({
     resolveAuth: () => input.resolveAuth(),
     resolveBaseUrl: input.resolveBaseUrl,
+    preferResolvedBaseUrl: input.preferResolvedBaseUrl,
     customizeRequest: input.customizeRequest,
     logger: input.logger,
     // RFC-270 缺陷 1（P0）：此前这两行缺失——另两个 adapter 都透传了 headers，唯独本