@narumitw/pi-btw 0.60.1 → 0.60.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.ts CHANGED
@@ -2,11 +2,7 @@
2
2
  // @ts-nocheck -- generated JavaScript uses a .ts extension for Pi's Jiti loader.
3
3
 
4
4
  // src/btw.ts
5
- import {
6
- clampThinkingLevel,
7
- getSupportedThinkingLevels as getSupportedThinkingLevels2
8
- } from "@earendil-works/pi-ai";
9
- import { BorderedLoader as BorderedLoader2 } from "@earendil-works/pi-coding-agent";
5
+ import { clampThinkingLevel, getSupportedThinkingLevels as getSupportedThinkingLevels2 } from "@earendil-works/pi-ai";
10
6
 
11
7
  // src/bring-to-main.ts
12
8
  import { Key, matchesKey, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
@@ -1352,7 +1348,11 @@ async function completeSideThreadTurn({
1352
1348
  const response = await completeSimple(
1353
1349
  model,
1354
1350
  { systemPrompt: SYSTEM_PROMPT, messages: buildSideThreadMessages(thread, question) },
1355
- buildStreamOptions(auth, { thinkingLevel, signal, model, sessionId })
1351
+ buildStreamOptions(
1352
+ auth,
1353
+ { thinkingLevel, signal, model, sessionId },
1354
+ completeSimple.appliesRequestHeaderTransforms === true
1355
+ )
1356
1356
  );
1357
1357
  if (signal?.aborted || response?.stopReason === "aborted") return { kind: "aborted" };
1358
1358
  if (!isAssistantMessage(response)) {
@@ -1405,34 +1405,25 @@ function createUserMessage(text) {
1405
1405
  timestamp: Date.now()
1406
1406
  };
1407
1407
  }
1408
- var OPENCODE_HOST = "opencode.ai";
1409
- function matchesOpencodeHost(baseUrl) {
1410
- if (!baseUrl) return false;
1411
- try {
1412
- return new URL(baseUrl).hostname === OPENCODE_HOST;
1413
- } catch {
1414
- return false;
1415
- }
1416
- }
1417
1408
  function getOpencodeSessionHeaders(model, sessionId) {
1418
- if (!sessionId) return void 0;
1419
- if (model.provider !== "opencode" && model.provider !== "opencode-go" && !matchesOpencodeHost(model.baseUrl)) {
1420
- return void 0;
1421
- }
1409
+ if (!sessionId || model.provider !== "opencode" && model.provider !== "opencode-go") return void 0;
1422
1410
  return { "x-opencode-session": sessionId, "x-opencode-client": "pi" };
1423
1411
  }
1424
1412
  function mergeSessionHeaders(authHeaders, sessionHeaders) {
1425
1413
  if (!sessionHeaders && !authHeaders) return void 0;
1426
1414
  return { ...sessionHeaders, ...authHeaders };
1427
1415
  }
1428
- function buildStreamOptions(auth, { thinkingLevel, signal, model, sessionId }) {
1416
+ function buildStreamOptions(auth, { thinkingLevel, signal, model, sessionId }, applyRequestHeaderTransforms) {
1429
1417
  const sessionHeaders = model ? getOpencodeSessionHeaders(model, sessionId) : void 0;
1430
1418
  const options = {
1431
- apiKey: auth.apiKey,
1432
- headers: mergeSessionHeaders(auth.headers, sessionHeaders),
1433
- env: auth.env,
1419
+ apiKey: auth?.apiKey,
1420
+ headers: applyRequestHeaderTransforms ? auth?.headers : mergeSessionHeaders(auth?.headers, sessionHeaders),
1421
+ env: auth?.env,
1434
1422
  signal
1435
1423
  };
1424
+ if (applyRequestHeaderTransforms && sessionHeaders) {
1425
+ options.transformHeaders = (headers) => mergeSessionHeaders(headers, sessionHeaders) ?? {};
1426
+ }
1436
1427
  if (thinkingLevel !== "off") options.reasoning = thinkingLevel;
1437
1428
  return options;
1438
1429
  }
@@ -3115,7 +3106,9 @@ function escapeTerminalControls2(text) {
3115
3106
  // src/btw.ts
3116
3107
  var MAX_CONTEXT_CHARS = 4e4;
3117
3108
  function createModelRegistryCompleteSimple(modelRegistry) {
3118
- return async (model, context, options) => modelRegistry.streamSimple(model, context, options).result();
3109
+ const completeSimple = async (model, context, options) => modelRegistry.streamSimple(model, context, options).result();
3110
+ completeSimple.appliesRequestHeaderTransforms = true;
3111
+ return completeSimple;
3119
3112
  }
3120
3113
  async function resolveBtwModel({
3121
3114
  settings,
@@ -3124,6 +3117,8 @@ async function resolveBtwModel({
3124
3117
  warn
3125
3118
  }) {
3126
3119
  const reportWarning = (message) => warn?.(sanitizeSingleLine(message));
3120
+ const availableModels = modelRegistry.getAvailable();
3121
+ const isAvailable = (model) => availableModels.some((candidate) => candidate.provider === model.provider && candidate.id === model.id);
3127
3122
  if (settings.model) {
3128
3123
  const fallback = currentModel ? `${currentModel.provider}/${currentModel.id}` : "the current model";
3129
3124
  const reference = parseBtwModelReference(settings.model);
@@ -3134,45 +3129,16 @@ async function resolveBtwModel({
3134
3129
  const configuredModel = modelRegistry.find(reference.provider, reference.modelId);
3135
3130
  if (!configuredModel) {
3136
3131
  reportWarning(`pi-btw model ${settings.model} was not found; falling back to ${fallback}.`);
3132
+ } else if (isAvailable(configuredModel)) {
3133
+ return { model: configuredModel };
3137
3134
  } else {
3138
3135
  const sameAsCurrent = configuredModel === currentModel || configuredModel.provider === currentModel?.provider && configuredModel.id === currentModel.id;
3139
3136
  const fallbackAction = sameAsCurrent ? "no distinct current model is available" : `falling back to ${fallback}`;
3140
- try {
3141
- const auth = await modelRegistry.getApiKeyAndHeaders(configuredModel);
3142
- if (auth.ok && hasRequestAuth(auth)) {
3143
- return {
3144
- model: auth.baseUrl ? { ...configuredModel, baseUrl: auth.baseUrl } : configuredModel,
3145
- auth
3146
- };
3147
- }
3148
- const reason = auth.ok ? "has no request credentials" : auth.error;
3149
- reportWarning(`pi-btw model ${settings.model} is unavailable (${reason}); ${fallbackAction}.`);
3150
- } catch (error) {
3151
- reportWarning(`pi-btw model ${settings.model} credentials failed (${formatError5(error)}); ${fallbackAction}.`);
3152
- }
3137
+ reportWarning(`pi-btw model ${settings.model} is unavailable; ${fallbackAction}.`);
3153
3138
  if (sameAsCurrent) return void 0;
3154
3139
  }
3155
3140
  }
3156
- if (!currentModel) return void 0;
3157
- try {
3158
- const auth = await modelRegistry.getApiKeyAndHeaders(currentModel);
3159
- if (auth.ok && hasRequestAuth(auth)) {
3160
- return {
3161
- model: auth.baseUrl ? { ...currentModel, baseUrl: auth.baseUrl } : currentModel,
3162
- auth
3163
- };
3164
- }
3165
- } catch {
3166
- }
3167
- return void 0;
3168
- }
3169
- function hasRequestAuth(auth) {
3170
- return Boolean(
3171
- auth.apiKey || providerHeadersHaveValue(auth.headers) || auth.env && Object.keys(auth.env).length > 0
3172
- );
3173
- }
3174
- function providerHeadersHaveValue(headers) {
3175
- return headers !== void 0 && Object.values(headers).some((value) => value !== null);
3141
+ return currentModel && isAvailable(currentModel) ? { model: currentModel } : void 0;
3176
3142
  }
3177
3143
  function formatError5(error) {
3178
3144
  return error instanceof Error ? error.message : String(error);
@@ -3193,7 +3159,7 @@ function btw(pi, dependencies = {}) {
3193
3159
  const showCommandMenu = dependencies.showCommandMenu ?? showCommandMenuForBtw;
3194
3160
  const pickEntry = dependencies.pickMainEntry ?? pickMainEntry;
3195
3161
  const loadSettings = dependencies.loadSettings ?? loadSettingsForCommand;
3196
- const resolveModel = dependencies.resolveModel ?? resolveBtwModelWithLoader;
3162
+ const resolveModel = dependencies.resolveModel ?? resolveBtwModelForCommand;
3197
3163
  const runThread = dependencies.runThread ?? runBtwThread;
3198
3164
  const runFullscreen = dependencies.runFullscreen ?? runBtwFullscreen;
3199
3165
  const resumableThreads = /* @__PURE__ */ new Map();
@@ -3312,33 +3278,14 @@ async function loadSettingsForCommand(ctx) {
3312
3278
  }
3313
3279
  return {};
3314
3280
  }
3315
- async function resolveBtwModelWithLoader(settings, ctx) {
3316
- return ctx.ui.custom((tui, theme, _keybindings, done) => {
3317
- const loader = new BorderedLoader2(tui, theme, "Resolving /btw model credentials...");
3318
- let settled = false;
3319
- loader.onAbort = () => {
3320
- if (settled) return;
3321
- settled = true;
3322
- done({ kind: "cancelled" });
3323
- };
3324
- resolveBtwModel({
3325
- settings,
3326
- currentModel: ctx.model,
3327
- modelRegistry: ctx.modelRegistry,
3328
- warn: (message) => {
3329
- if (!settled) notifySafely3(ctx, message, "warning");
3330
- }
3331
- }).then((selected) => {
3332
- if (settled) return;
3333
- settled = true;
3334
- done(selected ? { kind: "selected", selected } : { kind: "unavailable" });
3335
- }).catch(() => {
3336
- if (settled) return;
3337
- settled = true;
3338
- done({ kind: "unavailable" });
3339
- });
3340
- return loader;
3281
+ async function resolveBtwModelForCommand(settings, ctx) {
3282
+ const selected = await resolveBtwModel({
3283
+ settings,
3284
+ currentModel: ctx.model,
3285
+ modelRegistry: ctx.modelRegistry,
3286
+ warn: (message) => notifySafely3(ctx, message, "warning")
3341
3287
  });
3288
+ return selected ? { kind: "selected", selected } : { kind: "unavailable" };
3342
3289
  }
3343
3290
  async function runBtwThread({
3344
3291
  initialQuestion,
@@ -3688,7 +3635,6 @@ async function askThreadQuestion(thread, question, selected, thinkingLevel, ctx,
3688
3635
  question,
3689
3636
  model: selected.model,
3690
3637
  thinkingLevel,
3691
- auth: selected.auth,
3692
3638
  signal: view.signal,
3693
3639
  completeSimple: createModelRegistryCompleteSimple(ctx.modelRegistry),
3694
3640
  sessionId: readBtwSessionId(ctx)