@narumitw/pi-btw 0.49.3 → 0.49.6

package/README.md

@@ -34,7 +34,7 @@ pi -e npm:@narumitw/pi-btw
 Try this package locally from the repository root:
 
 ```bash
-pi -e ./extensions/pi-btw
+pi -e ./packages/pi-btw
 ```
 
 ## 🚀 Usage
@@ -154,7 +154,7 @@ Normal assistant messages become part of the main Pi conversation and can distra
 ## 🗂️ Package layout
 
 ```txt
-extensions/pi-btw/
+packages/pi-btw/
 ├── src/
 │   ├── index.ts
 │   ├── btw.ts

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@narumitw/pi-btw",
-	"version": "0.49.3",
+	"version": "0.49.6",
 	"description": "Pi extension that adds a /btw side-question command.",
 	"type": "module",
 	"license": "MIT",
@@ -22,6 +22,9 @@
 			"./src/index.ts"
 		]
 	},
+	"piExtension": {
+		"lifecycle": "stable"
+	},
 	"scripts": {
 		"check": "biome check . && npm run typecheck",
 		"format": "biome check --write .",
@@ -29,15 +32,15 @@
 	},
 	"devDependencies": {
 		"@biomejs/biome": "2.5.7",
-		"@earendil-works/pi-ai": "0.83.0",
-		"@earendil-works/pi-coding-agent": "0.83.0",
-		"@earendil-works/pi-tui": "0.83.0",
+		"@earendil-works/pi-ai": "0.84.0",
+		"@earendil-works/pi-coding-agent": "0.84.0",
+		"@earendil-works/pi-tui": "0.84.0",
 		"typescript": "7.0.2"
 	},
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/narumiruna/pi-extensions",
-		"directory": "extensions/pi-btw"
+		"directory": "packages/pi-btw"
 	},
 	"dependencies": {
 		"@narumitw/pi-tui-kit": "^0.49.1"

package/src/btw.ts

@@ -3,6 +3,7 @@ import {
 	clampThinkingLevel,
 	getSupportedThinkingLevels,
 	type Model,
+	type ProviderHeaders,
 } from "@earendil-works/pi-ai";
 import {
 	BorderedLoader,
@@ -39,6 +40,7 @@ import {
 import {
 	BTW_THINKING_LEVELS,
 	type BtwThinkingLevel,
+	type CompleteSimpleFunction,
 	completeSideThreadTurn,
 	createSideThread,
 	type SideQuestionAuth,
@@ -65,7 +67,6 @@ export {
 	type BtwThinkingLevel,
 	buildUserPrompt,
 	completeSideQuestion,
-	loadCompleteSimple,
 } from "./side-thread.js";
 export { sanitizeSingleLine } from "./text.js";
 
@@ -76,14 +77,21 @@ interface LoadBtwThinkingLevelOptions {
 	warn?: (message: string) => void;
 }
 
-interface BtwModelRegistry {
-	find(provider: string, modelId: string): Model<Api> | undefined;
-	getApiKeyAndHeaders(
-		model: Model<Api>,
-	): Promise<
-		| { ok: true; apiKey?: string; headers?: Record<string, string>; env?: Record<string, string> }
-		| { ok: false; error: string }
-	>;
+type BtwModelRegistry = Pick<
+	ExtensionCommandContext["modelRegistry"],
+	"find" | "getApiKeyAndHeaders"
+>;
+
+type BtwProviderRegistry = Pick<ExtensionCommandContext["modelRegistry"], "getProvider">;
+
+export function createModelRegistryCompleteSimple(
+	modelRegistry: BtwProviderRegistry,
+): CompleteSimpleFunction {
+	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();
+	};
 }
 
 interface ResolveBtwModelOptions {
@@ -154,11 +162,15 @@ export async function resolveBtwModel({
 function hasRequestAuth(auth: SideQuestionAuth): boolean {
 	return Boolean(
 		auth.apiKey ||
-			(auth.headers && Object.keys(auth.headers).length > 0) ||
+			providerHeadersHaveValue(auth.headers) ||
 			(auth.env && Object.keys(auth.env).length > 0),
 	);
 }
 
+function providerHeadersHaveValue(headers: ProviderHeaders | undefined): boolean {
+	return headers !== undefined && Object.values(headers).some((value) => value !== null);
+}
+
 export async function loadBtwThinkingLevel(
 	currentThinkingLevel: BtwThinkingLevel,
 	options: LoadBtwThinkingLevelOptions = {},
@@ -777,6 +789,7 @@ async function askThreadQuestion(
 				thinkingLevel,
 				auth: selected.auth,
 				signal: view.signal,
+				completeSimple: createModelRegistryCompleteSimple(ctx.modelRegistry),
 			}).then((result) => {
 				if (settled) return;
 				settled = true;

package/src/side-thread.ts

@@ -4,6 +4,7 @@ import type {
 	Context,
 	Message,
 	Model,
+	ProviderHeaders,
 	SimpleStreamOptions,
 	UserMessage,
 } from "@earendil-works/pi-ai";
@@ -22,7 +23,7 @@ export type BtwThinkingLevel = (typeof BTW_THINKING_LEVELS)[number];
 
 export interface SideQuestionAuth {
 	apiKey?: string;
-	headers?: Record<string, string>;
+	headers?: ProviderHeaders;
 	env?: Record<string, string>;
 }
 
@@ -32,36 +33,6 @@ export type CompleteSimpleFunction = <TApi extends Api>(
 	options?: SimpleStreamOptions,
 ) => Promise<AssistantMessage>;
 
-type ModuleImporter = (moduleId: string) => Promise<unknown>;
-
-function hasCompleteSimple(value: unknown): value is { completeSimple: CompleteSimpleFunction } {
-	return (
-		typeof value === "object" &&
-		value !== null &&
-		typeof Reflect.get(value, "completeSimple") === "function"
-	);
-}
-
-export async function loadCompleteSimple(
-	importModule: ModuleImporter = (moduleId) => import(moduleId),
-): Promise<CompleteSimpleFunction> {
-	let importError: unknown;
-	for (const moduleId of ["@earendil-works/pi-ai/compat", "@earendil-works/pi-ai"]) {
-		try {
-			const module = await importModule(moduleId);
-			if (hasCompleteSimple(module)) return module.completeSimple;
-		} catch (error: unknown) {
-			importError = error;
-		}
-	}
-
-	throw new Error("@earendil-works/pi-ai does not export completeSimple", {
-		cause: importError,
-	});
-}
-
-const defaultCompleteSimple = await loadCompleteSimple();
-
 export type SideThreadTurn =
 	| {
 			kind: "answered";
@@ -114,7 +85,7 @@ export interface CompleteSideThreadTurnOptions {
 	thinkingLevel: BtwThinkingLevel;
 	auth: SideQuestionAuth;
 	signal?: AbortSignal;
-	completeSimple?: CompleteSimpleFunction;
+	completeSimple: CompleteSimpleFunction;
 }
 
 export type CompleteSideThreadTurnResult =
@@ -129,7 +100,7 @@ export async function completeSideThreadTurn({
 	thinkingLevel,
 	auth,
 	signal,
-	completeSimple = defaultCompleteSimple,
+	completeSimple,
 }: CompleteSideThreadTurnOptions): Promise<CompleteSideThreadTurnResult> {
 	if (signal?.aborted) return { kind: "aborted" };
 	let response: AssistantMessage;
@@ -161,7 +132,7 @@ export interface CompleteSideQuestionOptions {
 	thinkingLevel: BtwThinkingLevel;
 	auth: SideQuestionAuth;
 	signal?: AbortSignal;
-	completeSimple?: CompleteSimpleFunction;
+	completeSimple: CompleteSimpleFunction;
 }
 
 export async function completeSideQuestion({
@@ -171,7 +142,7 @@ export async function completeSideQuestion({
 	thinkingLevel,
 	auth,
 	signal,
-	completeSimple = defaultCompleteSimple,
+	completeSimple,
 }: CompleteSideQuestionOptions): Promise<AssistantMessage> {
 	return completeSimple(
 		model,