@herbertgao/pi-extensions 2026.9.9 → 2026.9.11

package/node_modules/@narumitw/pi-btw/dist/index.ts

@@ -2,11 +2,7 @@
 // @ts-nocheck -- generated JavaScript uses a .ts extension for Pi's Jiti loader.
 
 // src/btw.ts
-import {
-  clampThinkingLevel,
-  getSupportedThinkingLevels as getSupportedThinkingLevels2
-} from "@earendil-works/pi-ai";
-import { BorderedLoader as BorderedLoader2 } from "@earendil-works/pi-coding-agent";
+import { clampThinkingLevel, getSupportedThinkingLevels as getSupportedThinkingLevels2 } from "@earendil-works/pi-ai";
 
 // src/bring-to-main.ts
 import { Key, matchesKey, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
@@ -1352,7 +1348,11 @@ async function completeSideThreadTurn({
     const response = await completeSimple(
       model,
       { systemPrompt: SYSTEM_PROMPT, messages: buildSideThreadMessages(thread, question) },
-      buildStreamOptions(auth, { thinkingLevel, signal, model, sessionId })
+      buildStreamOptions(
+        auth,
+        { thinkingLevel, signal, model, sessionId },
+        completeSimple.appliesRequestHeaderTransforms === true
+      )
     );
     if (signal?.aborted || response?.stopReason === "aborted") return { kind: "aborted" };
     if (!isAssistantMessage(response)) {
@@ -1405,34 +1405,25 @@ function createUserMessage(text) {
     timestamp: Date.now()
   };
 }
-var OPENCODE_HOST = "opencode.ai";
-function matchesOpencodeHost(baseUrl) {
-  if (!baseUrl) return false;
-  try {
-    return new URL(baseUrl).hostname === OPENCODE_HOST;
-  } catch {
-    return false;
-  }
-}
 function getOpencodeSessionHeaders(model, sessionId) {
-  if (!sessionId) return void 0;
-  if (model.provider !== "opencode" && model.provider !== "opencode-go" && !matchesOpencodeHost(model.baseUrl)) {
-    return void 0;
-  }
+  if (!sessionId || model.provider !== "opencode" && model.provider !== "opencode-go") return void 0;
   return { "x-opencode-session": sessionId, "x-opencode-client": "pi" };
 }
 function mergeSessionHeaders(authHeaders, sessionHeaders) {
   if (!sessionHeaders && !authHeaders) return void 0;
   return { ...sessionHeaders, ...authHeaders };
 }
-function buildStreamOptions(auth, { thinkingLevel, signal, model, sessionId }) {
+function buildStreamOptions(auth, { thinkingLevel, signal, model, sessionId }, applyRequestHeaderTransforms) {
   const sessionHeaders = model ? getOpencodeSessionHeaders(model, sessionId) : void 0;
   const options = {
-    apiKey: auth.apiKey,
-    headers: mergeSessionHeaders(auth.headers, sessionHeaders),
-    env: auth.env,
+    apiKey: auth?.apiKey,
+    headers: applyRequestHeaderTransforms ? auth?.headers : mergeSessionHeaders(auth?.headers, sessionHeaders),
+    env: auth?.env,
     signal
   };
+  if (applyRequestHeaderTransforms && sessionHeaders) {
+    options.transformHeaders = (headers) => mergeSessionHeaders(headers, sessionHeaders) ?? {};
+  }
   if (thinkingLevel !== "off") options.reasoning = thinkingLevel;
   return options;
 }
@@ -2413,6 +2404,14 @@ function sanitizeEntryForDisplay(entry) {
         ...entry,
         name: entry.name === void 0 ? void 0 : sanitizeSingleLine(entry.name)
       };
+    case "usage":
+      return {
+        ...entry,
+        kind: sanitizeSingleLine(entry.kind),
+        provider: sanitizeSingleLine(entry.provider),
+        model: sanitizeSingleLine(entry.model),
+        note: entry.note === void 0 ? void 0 : sanitizeSingleLine(entry.note)
+      };
   }
 }
 function sanitizeDisplayContent(content) {
@@ -3107,11 +3106,9 @@ function escapeTerminalControls2(text) {
 // src/btw.ts
 var MAX_CONTEXT_CHARS = 4e4;
 function createModelRegistryCompleteSimple(modelRegistry) {
-  return async (model, context, options) => {
-    const provider = modelRegistry.getProvider(model.provider);
-    if (!provider) throw new Error(`No provider registered for model provider: ${model.provider}`);
-    return provider.streamSimple(model, context, options).result();
-  };
+  const completeSimple = async (model, context, options) => modelRegistry.streamSimple(model, context, options).result();
+  completeSimple.appliesRequestHeaderTransforms = true;
+  return completeSimple;
 }
 async function resolveBtwModel({
   settings,
@@ -3120,6 +3117,8 @@ async function resolveBtwModel({
   warn
 }) {
   const reportWarning = (message) => warn?.(sanitizeSingleLine(message));
+  const availableModels = modelRegistry.getAvailable();
+  const isAvailable = (model) => availableModels.some((candidate) => candidate.provider === model.provider && candidate.id === model.id);
   if (settings.model) {
     const fallback = currentModel ? `${currentModel.provider}/${currentModel.id}` : "the current model";
     const reference = parseBtwModelReference(settings.model);
@@ -3130,45 +3129,16 @@ async function resolveBtwModel({
     const configuredModel = modelRegistry.find(reference.provider, reference.modelId);
     if (!configuredModel) {
       reportWarning(`pi-btw model ${settings.model} was not found; falling back to ${fallback}.`);
+    } else if (isAvailable(configuredModel)) {
+      return { model: configuredModel };
     } else {
       const sameAsCurrent = configuredModel === currentModel || configuredModel.provider === currentModel?.provider && configuredModel.id === currentModel.id;
       const fallbackAction = sameAsCurrent ? "no distinct current model is available" : `falling back to ${fallback}`;
-      try {
-        const auth = await modelRegistry.getApiKeyAndHeaders(configuredModel);
-        if (auth.ok && hasRequestAuth(auth)) {
-          return {
-            model: auth.baseUrl ? { ...configuredModel, baseUrl: auth.baseUrl } : configuredModel,
-            auth
-          };
-        }
-        const reason = auth.ok ? "has no request credentials" : auth.error;
-        reportWarning(`pi-btw model ${settings.model} is unavailable (${reason}); ${fallbackAction}.`);
-      } catch (error) {
-        reportWarning(`pi-btw model ${settings.model} credentials failed (${formatError5(error)}); ${fallbackAction}.`);
-      }
+      reportWarning(`pi-btw model ${settings.model} is unavailable; ${fallbackAction}.`);
       if (sameAsCurrent) return void 0;
     }
   }
-  if (!currentModel) return void 0;
-  try {
-    const auth = await modelRegistry.getApiKeyAndHeaders(currentModel);
-    if (auth.ok && hasRequestAuth(auth)) {
-      return {
-        model: auth.baseUrl ? { ...currentModel, baseUrl: auth.baseUrl } : currentModel,
-        auth
-      };
-    }
-  } catch {
-  }
-  return void 0;
-}
-function hasRequestAuth(auth) {
-  return Boolean(
-    auth.apiKey || providerHeadersHaveValue(auth.headers) || auth.env && Object.keys(auth.env).length > 0
-  );
-}
-function providerHeadersHaveValue(headers) {
-  return headers !== void 0 && Object.values(headers).some((value) => value !== null);
+  return currentModel && isAvailable(currentModel) ? { model: currentModel } : void 0;
 }
 function formatError5(error) {
   return error instanceof Error ? error.message : String(error);
@@ -3189,7 +3159,7 @@ function btw(pi, dependencies = {}) {
   const showCommandMenu = dependencies.showCommandMenu ?? showCommandMenuForBtw;
   const pickEntry = dependencies.pickMainEntry ?? pickMainEntry;
   const loadSettings = dependencies.loadSettings ?? loadSettingsForCommand;
-  const resolveModel = dependencies.resolveModel ?? resolveBtwModelWithLoader;
+  const resolveModel = dependencies.resolveModel ?? resolveBtwModelForCommand;
   const runThread = dependencies.runThread ?? runBtwThread;
   const runFullscreen = dependencies.runFullscreen ?? runBtwFullscreen;
   const resumableThreads = /* @__PURE__ */ new Map();
@@ -3308,33 +3278,14 @@ async function loadSettingsForCommand(ctx) {
   }
   return {};
 }
-async function resolveBtwModelWithLoader(settings, ctx) {
-  return ctx.ui.custom((tui, theme, _keybindings, done) => {
-    const loader = new BorderedLoader2(tui, theme, "Resolving /btw model credentials...");
-    let settled = false;
-    loader.onAbort = () => {
-      if (settled) return;
-      settled = true;
-      done({ kind: "cancelled" });
-    };
-    resolveBtwModel({
-      settings,
-      currentModel: ctx.model,
-      modelRegistry: ctx.modelRegistry,
-      warn: (message) => {
-        if (!settled) notifySafely3(ctx, message, "warning");
-      }
-    }).then((selected) => {
-      if (settled) return;
-      settled = true;
-      done(selected ? { kind: "selected", selected } : { kind: "unavailable" });
-    }).catch(() => {
-      if (settled) return;
-      settled = true;
-      done({ kind: "unavailable" });
-    });
-    return loader;
+async function resolveBtwModelForCommand(settings, ctx) {
+  const selected = await resolveBtwModel({
+    settings,
+    currentModel: ctx.model,
+    modelRegistry: ctx.modelRegistry,
+    warn: (message) => notifySafely3(ctx, message, "warning")
   });
+  return selected ? { kind: "selected", selected } : { kind: "unavailable" };
 }
 async function runBtwThread({
   initialQuestion,
@@ -3684,7 +3635,6 @@ async function askThreadQuestion(thread, question, selected, thinkingLevel, ctx,
       question,
       model: selected.model,
       thinkingLevel,
-      auth: selected.auth,
       signal: view.signal,
       completeSimple: createModelRegistryCompleteSimple(ctx.modelRegistry),
       sessionId: readBtwSessionId(ctx)