@herbertgao/pi-extensions 2026.9.10 → 2026.9.11

package/README.md

@@ -28,6 +28,7 @@ The package bundles 6 active `@herbertgao/*` child packages—`pi-bark`, `pi-cc-
 - `@tifan/pi-rename@0.6.0`
 - `pi-mcp-adapter@2.31.0`
 - `pi-typesafe@0.5.0`
+- `pi-multi-account@1.22.0`
 - `pi-footer@0.5.1`
 - `pi-jev-auto-mode@0.4.1`
 - `pi-lens@4.2.1`

package/THIRD_PARTY_NOTICES.md

@@ -160,3 +160,29 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
+
+## `pi-multi-account`
+
+The aggregate bundles the MIT-licensed [`pi-multi-account`](https://github.com/Sarrius/pi-multi-account) package version 1.22.0 under its original attribution:
+
+MIT License
+
+Copyright (c) 2026 pi-multi-account contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

package/node_modules/@herbertgao/pi-bark/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@herbertgao/pi-bark",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Send Bark notifications when Pi finishes or needs user input.",
   "keywords": [
     "bark",
@@ -42,7 +42,7 @@
     "@earendil-works/pi-coding-agent": "^0.84.0 || ^0.85.0"
   },
   "engines": {
-    "node": ">=22.19.0"
+    "node": ">=24"
   },
   "pi": {
     "extensions": [

package/node_modules/@herbertgao/pi-cc-extensions/README.en.md

@@ -5,7 +5,7 @@
 <p align="center">
   <a href="https://pi.dev/packages?name=%40herbertgao%2Fpi-cc-extensions"><img alt="Pi package catalog" src="https://img.shields.io/badge/Pi-package-58B7FF?style=flat-square"></a>
   <a href="https://www.npmjs.com/package/@herbertgao/pi-cc-extensions"><img alt="npm version" src="https://img.shields.io/npm/v/%40herbertgao%2Fpi-cc-extensions?style=flat-square&color=66E3C4"></a>
-  <a href="#compatibility"><img alt="Node.js 22.19 or newer" src="https://img.shields.io/badge/Node.js-%E2%89%A522.19-66E3C4?style=flat-square"></a>
+  <a href="#compatibility"><img alt="Node.js 24 or newer" src="https://img.shields.io/badge/Node.js-%E2%89%A524-66E3C4?style=flat-square"></a>
   <a href="./extensions"><img alt="TypeScript extensions" src="https://img.shields.io/badge/TypeScript-extensions-3178C6?style=flat-square"></a>
 </p>
 
@@ -85,7 +85,7 @@ bun run typecheck
 
 ## Compatibility
 
-- Node.js `>=22.19.0`, Pi `^0.84.0 || ^0.85.0` (loaded through `pi.extensions` and `pi.themes` in the root `package.json`)
+- Node.js `>=24`, Pi `^0.84.0 || ^0.85.0` (loaded through `pi.extensions` and `pi.themes` in the root `package.json`)
 
 ## Recommended companions
 

package/node_modules/@herbertgao/pi-cc-extensions/README.md

@@ -5,7 +5,7 @@
 <p align="center">
   <a href="https://pi.dev/packages?name=%40herbertgao%2Fpi-cc-extensions"><img alt="Pi package catalog" src="https://img.shields.io/badge/Pi-package-58B7FF?style=flat-square"></a>
   <a href="https://www.npmjs.com/package/@herbertgao/pi-cc-extensions"><img alt="npm version" src="https://img.shields.io/npm/v/%40herbertgao%2Fpi-cc-extensions?style=flat-square&color=66E3C4"></a>
-  <a href="#兼容性"><img alt="Node.js 22.19 or newer" src="https://img.shields.io/badge/Node.js-%E2%89%A522.19-66E3C4?style=flat-square"></a>
+  <a href="#兼容性"><img alt="Node.js 24 or newer" src="https://img.shields.io/badge/Node.js-%E2%89%A524-66E3C4?style=flat-square"></a>
   <a href="./extensions"><img alt="TypeScript extensions" src="https://img.shields.io/badge/TypeScript-extensions-3178C6?style=flat-square"></a>
 </p>
 
@@ -85,7 +85,7 @@ bun run typecheck
 
 ## 兼容性
 
-- Node.js `>=22.19.0`，Pi `^0.84.0 || ^0.85.0`（通过根目录 `package.json` 的 `pi.extensions` 和 `pi.themes` 加载）
+- Node.js `>=24`，Pi `^0.84.0 || ^0.85.0`（通过根目录 `package.json` 的 `pi.extensions` 和 `pi.themes` 加载）
 
 ## 推荐搭配
 

package/node_modules/@herbertgao/pi-cc-extensions/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@herbertgao/pi-cc-extensions",
-	"version": "0.9.3",
+	"version": "0.9.4",
 	"license": "MIT",
 	"description": "A Pi productivity suite with Claude Code-style UI, context inspection, and agent/session references",
 	"type": "module",
@@ -56,7 +56,7 @@
 		"@earendil-works/pi-tui": "^0.84.0 || ^0.85.0"
 	},
 	"engines": {
-		"node": ">=22.19.0"
+		"node": ">=24"
 	},
 	"publishConfig": {
 		"access": "public",
@@ -70,6 +70,7 @@
 	"x-upstream": {
 		"package": "pi-cc-extensions",
 		"version": "0.8.71",
+		"reviewedVersion": "0.9.1",
 		"repository": "https://github.com/minuque/pi-cc-extensions",
 		"commit": "e43e0041b59f5d7f03be9b9d103a5f9e954e4c11"
 	}

package/node_modules/@herbertgao/pi-subagents/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.18.1
+
+### Patch Changes
+
+- [#219](https://github.com/HerbertGao/pi-extensions/pull/219) [`6525a59`](https://github.com/HerbertGao/pi-extensions/commit/6525a5995b8bb815517e326f1eef78d25c0a3c5e) Thanks [@HerbertGao](https://github.com/HerbertGao)! - Bundle `pi-multi-account@1.22.0` for automatic multi-account failover and rotation across supported Pi providers. Update the aggregate host to Pi 0.85.1 and widen the maintained child package compatibility ranges.
+
 ## 0.18.0
 
 ### Minor Changes

package/node_modules/@herbertgao/pi-subagents/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@herbertgao/pi-subagents",
-  "version": "0.18.0",
+  "version": "0.18.1",
   "description": "Claude Code-style autonomous subagents and workflow orchestration for Pi, with HerbertGao-maintained UI extensions.",
   "keywords": [
     "agent",
@@ -59,7 +59,7 @@
     "@earendil-works/pi-tui": ">=0.84.0"
   },
   "engines": {
-    "node": ">=22.19.0"
+    "node": ">=24"
   },
   "pi": {
     "extensions": [

package/node_modules/@herbertgao/resume-from/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@herbertgao/resume-from",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Continue a coding session in a different agent, or a different profile.",
   "keywords": [
     "pi-package",

package/node_modules/@herbertgao/sol-pi/README.md

@@ -56,16 +56,16 @@ Read the [SoL-Pi blog](https://nvlabs.github.io/SoL-Pi/) for a deeper look at th
 
 ### Requirements
 
-- Node.js 22.19 or newer
+- Node.js 24 or newer
 - npm
-- `@earendil-works/pi-coding-agent` 0.84.2
+- `@earendil-works/pi-coding-agent` 0.85.1
 
 ### Install
 
 Install the tested Pi release:
 
 ```bash
-npm install --global @earendil-works/pi-coding-agent@0.84.2
+npm install --global @earendil-works/pi-coding-agent@0.85.1
 ```
 
 Then install SoL-Pi directly from [NVlabs/SoL-Pi](https://github.com/NVlabs/SoL-Pi):

package/node_modules/@herbertgao/sol-pi/THIRD_PARTY_NOTICES.md

@@ -8,10 +8,10 @@ The following packages are supplied by the user's Pi installation and retain the
 
 | Package | Development-tested version | License | Source |
 | --- | ---: | --- | --- |
-| `@earendil-works/pi-agent-core` | 0.84.2 | MIT | <https://github.com/earendil-works/pi> |
-| `@earendil-works/pi-ai` | 0.84.2 | MIT | <https://github.com/earendil-works/pi> |
-| `@earendil-works/pi-coding-agent` | 0.84.2 | MIT | <https://github.com/earendil-works/pi> |
-| `@earendil-works/pi-tui` | 0.84.2 | MIT | <https://github.com/earendil-works/pi> |
+| `@earendil-works/pi-agent-core` | 0.85.1 | MIT | <https://github.com/earendil-works/pi> |
+| `@earendil-works/pi-ai` | 0.85.1 | MIT | <https://github.com/earendil-works/pi> |
+| `@earendil-works/pi-coding-agent` | 0.85.1 | MIT | <https://github.com/earendil-works/pi> |
+| `@earendil-works/pi-tui` | 0.85.1 | MIT | <https://github.com/earendil-works/pi> |
 | `typebox` | 1.3.7 | MIT | <https://github.com/sinclairzx81/typebox> |
 
 ## Development-only dependencies

package/node_modules/@herbertgao/sol-pi/agents-install.md

@@ -7,7 +7,7 @@ Installation and configuration are complete only when Pi remains unmodified, the
 ## Rules
 
 - Do not modify, patch, fork, or vendor upstream Pi. SoL-Pi must load as a standalone extension through Pi's public package interface.
-- Use Node.js 22.19 or newer and the tested Pi release `@earendil-works/pi-coding-agent@0.84.2`. Treat a different Pi version as a compatibility change and rerun the full suite before using it.
+- Use Node.js 24 or newer and the tested Pi release `@earendil-works/pi-coding-agent@0.85.1`. Treat a different Pi version as a compatibility change and rerun the full suite before using it.
 - Do not clean, reset, switch, or overwrite unrelated repository changes.
 - Do not print, log, commit, upload, or include any secret in a command line. Check only whether a credential is present.
 - Keep SoL-Pi settings in `sol-pi.json`. The Evidence-Preserving Reducer provider/model route is a SoL-Pi setting; provider URLs, credentials, the main agent model, and shell behavior remain Pi settings.
@@ -35,7 +35,7 @@ node --version
 npm --version
 ```
 
-Require Node.js 22.19 or newer. Install from the lockfile and run the source checks:
+Require Node.js 24 or newer. Install from the lockfile and run the source checks:
 
 ```bash
 npm ci --ignore-scripts
@@ -54,11 +54,11 @@ Stop if any command fails. Do not hide a failure with `|| true` or replace `npm
 Install the tested Pi release without changing its source:
 
 ```bash
-npm install --global --ignore-scripts @earendil-works/pi-coding-agent@0.84.2
+npm install --global --ignore-scripts @earendil-works/pi-coding-agent@0.85.1
 pi --version
 ```
 
-Require `pi --version` to report `0.84.2`.
+Require `pi --version` to report `0.85.1`.
 
 For a project-local registration, run this from `target_project` and substitute the resolved absolute `sol_pi_root`:
 

package/node_modules/@herbertgao/sol-pi/docs/compatibility.md

@@ -1,6 +1,6 @@
 # Pi Compatibility
 
-SoL-Pi is developed and tested against `@earendil-works/pi-coding-agent` 0.84.2. Its public API surface is also type-checked and exercised against Pi 0.81.1, the base used by the original Pi fork. The runtime range is deliberately expressed as a peer dependency because Pi owns installation and upgrade of its packages.
+SoL-Pi is developed and tested against `@earendil-works/pi-coding-agent` 0.85.1. Its public API surface is also type-checked and exercised against Pi 0.81.1, the base used by the original Pi fork. The runtime range is deliberately expressed as a peer dependency because Pi owns installation and upgrade of its packages.
 
 SoL-Pi imports only public package exports:
 
@@ -31,7 +31,7 @@ ObservationPack changes only the messages projected through the public `context`
 
 The reducer handles public `tool_result` events and resolves the configured reducer provider/model through Pi's model registry before calling `ExtensionContext.modelRegistry.complete()` when available. For the Pi 0.81.1 fork, which exposes no registry `complete()` method, it resolves authentication for that reducer model through `getApiKeyAndHeaders()` and calls the shared `@earendil-works/pi-ai/compat` completion API. The reducer preserves the original result whenever the configured reducer model is unavailable or eligibility, model-call, schema, source-hash, exact-quote, size, or likely-secret checks fail.
 
-All persistent paths use `SessionManager.getSessionDir()` and `getSessionId()`, which are present in both the fork and Pi 0.84.2. SoL-Pi creates no configurable storage-path surface.
+All persistent paths use `SessionManager.getSessionDir()` and `getSessionId()`, which are present in both the fork and Pi 0.85.1. SoL-Pi creates no configurable storage-path surface.
 
 The unpublished shared artifact layout is not read or migrated. Each session starts from its own `<sessionDir>/sol-pi/<sessionId>/` directory.
 
@@ -41,13 +41,13 @@ Online Context Compact uses ordinary public `context` and `before_provider_reque
 
 Before selecting or executing a boundary compaction, it also checks the optional `Symbol.for("pi-subagents:manager")` registry exposed by `pi-subagents`. A running top-level subagent, or an unreadable registry, suppresses that compaction rather than risking a context rewrite during delegated work. When the registry is absent, the check is a no-op.
 
-Pi does not expose its active retained-tail compaction setting through the public extension context. The standalone extension therefore uses the documented Pi 0.84.2 default of 20,000 tokens for its economic estimate. Its programmatic factory accepts an explicit matching value for a non-default Pi setting.
+Pi does not expose its active retained-tail compaction setting through the public extension context. The standalone extension therefore uses the documented Pi 0.85.1 default of 20,000 tokens for its economic estimate. Its programmatic factory accepts an explicit matching value for a non-default Pi setting.
 
-Pi 0.84.2's `ExtensionContext.compact()` aborts the active agent before it summarizes, and `agent_settled` fires only once a whole run has drained every turn, retry, auto-compaction, and queued continuation. A plan boundary that selects compaction therefore saves its plan and progress state, calls `ExtensionContext.abort()` to stop the run, and runs compaction from the `agent_settled` that stop produces. The handler awaits the compaction's own `onComplete`/`onError` callbacks. On success, the extension sends a hidden reminder through public `ExtensionAPI.sendMessage()` with `triggerTurn: true`, so Pi starts a new turn against the compacted context and rebuilds the plan even when the native summary omits that instruction.
+Pi 0.85.1's `ExtensionContext.compact()` aborts the active agent before it summarizes, and `agent_settled` fires only once a whole run has drained every turn, retry, auto-compaction, and queued continuation. A plan boundary that selects compaction therefore saves its plan and progress state, calls `ExtensionContext.abort()` to stop the run, and runs compaction from the `agent_settled` that stop produces. The handler awaits the compaction's own `onComplete`/`onError` callbacks. On success, the extension sends a hidden reminder through public `ExtensionAPI.sendMessage()` with `triggerTurn: true`, so Pi starts a new turn against the compacted context and rebuilds the plan even when the native summary omits that instruction.
 
 A settlement barrier keeps the original `agent_settled` dispatch open until the triggered continuation settles. Print- and JSON-mode processes therefore complete the compact-and-continue sequence within the same Pi invocation; an outer driver does not need to resume the session or send `Continue working`. This continuation is armed only by a successful boundary compaction. Cancelling or exiting does not schedule one. A Pi build that never emits `agent_settled` starts no boundary compaction.
 
-Pi 0.84.2 does not return a promise from `ExtensionAPI.sendMessage()`. The barrier is therefore verified for standalone SoL-Pi and depends on Pi starting the requested turn synchronously. A later-loaded third-party extension that performs long asynchronous work in its own `agent_settled` handler is outside this guarantee and needs an integration test with that extension set.
+Pi 0.85.1 does not return a promise from `ExtensionAPI.sendMessage()`. The barrier is therefore verified for standalone SoL-Pi and depends on Pi starting the requested turn synchronously. A later-loaded third-party extension that performs long asynchronous work in its own `agent_settled` handler is outside this guarantee and needs an integration test with that extension set.
 
 Pi reports the session as idle while an extension-requested manual compaction is running. SoL-Pi cancels `session_before_tree` during that interval to prevent tree navigation from moving the active leaf underneath the compaction. Navigation works normally after the compaction callback settles.
 
@@ -57,7 +57,7 @@ The standalone entry passes `cacheWriteReadRatio` from `sol-pi.json` directly in
 
 ## Interactive TUI
 
-The lightning savings treatment uses Pi 0.84.2's public `renderCall`,
+The lightning savings treatment uses Pi 0.85.1's public `renderCall`,
 `renderResult`, `ctx.ui.notify()`, and keyed `ctx.ui.setStatus()` APIs. It checks
 `ctx.mode === "tui"` rather than `ctx.hasUI`, because RPC mode also reports UI
 support. The renderer therefore changes only the interactive terminal display;

package/node_modules/@herbertgao/sol-pi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@herbertgao/sol-pi",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Token-efficient context and tool extensions for Pi, maintained from NVlabs/SoL-Pi.",
   "keywords": [
     "pi-package",
@@ -59,7 +59,7 @@
     "vitest": "^4.0.18"
   },
   "engines": {
-    "node": ">=22.19.0"
+    "node": ">=24"
   },
   "pi": {
     "extensions": [

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)