@nijaru/pi-search 0.0.1 → 0.0.2

package/package.json

@@ -1,11 +1,10 @@
 {
   "name": "@nijaru/pi-search",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Provider-neutral web search and fetching tools for Pi",
   "type": "module",
   "license": "MIT",
   "author": "Nick Naru <nick@nijaru.com>",
-
   "publishConfig": {
     "access": "public"
   },
@@ -42,16 +41,16 @@
     "live:smoke": "bun scripts/live-smoke.ts"
   },
   "devDependencies": {
-    "@earendil-works/pi-ai": "0.85.1",
-    "@earendil-works/pi-coding-agent": "0.85.1",
-    "@earendil-works/pi-tui": "0.85.1",
+    "@earendil-works/pi-ai": "0.87.0",
+    "@earendil-works/pi-coding-agent": "0.87.0",
+    "@earendil-works/pi-tui": "0.87.0",
     "@types/bun": "1.3.14",
     "@types/turndown": "^5.0.6",
     "typebox": "1.3.10",
     "typescript": "7.0.2"
   },
   "peerDependencies": {
-    "@earendil-works/pi-ai": "^0.85.0",
+    "@earendil-works/pi-ai": "*",
     "@earendil-works/pi-coding-agent": "*",
     "@earendil-works/pi-tui": "*",
     "typebox": "*"

package/src/anthropic.ts

@@ -18,7 +18,7 @@ import {
 	tokenUsage,
 	type GroundingPlan,
 } from "./grounding";
-import { modelAuthHeaders, type ModelExecution } from "./model-selection";
+import { hasExplicitHeader, modelAuthHeaders, type ModelExecution } from "./model-selection";
 import { httpSource, objectValue, optionalString, type SearchHttpFetch } from "./provider-http";
 import { validateSearchRequest } from "./search";
 
@@ -125,10 +125,17 @@ function endpointFor(model: ProviderModel, override?: string): string {
 function anthropicHeaders(execution: ModelExecution): Readonly<Record<string, string>> {
 	const headers = modelAuthHeaders(execution, { bearerApiKey: false });
 	const apiKey = execution.auth.apiKey;
-	if (apiKey === undefined || apiKey.trim().length === 0) {
+	// An explicit x-api-key (value or null deletion) wins over a derived key.
+	if (
+		apiKey !== undefined &&
+		apiKey.trim().length > 0 &&
+		!hasExplicitHeader([execution.model.headers, execution.auth.headers], "x-api-key")
+	) {
+		headers.set("x-api-key", apiKey);
+	}
+	if (!headers.has("x-api-key")) {
 		throw createProviderError({ provider: "anthropic", kind: "auth", message: "Anthropic authentication returned no API key", retryable: false });
 	}
-	headers.set("x-api-key", apiKey);
 	headers.set("anthropic-version", ANTHROPIC_VERSION);
 	return Object.fromEntries(headers.entries());
 }

package/src/contracts.ts

@@ -55,6 +55,10 @@ export type ProviderAuthResult =
 			readonly ok: true;
 			readonly apiKey?: string;
 			readonly headers?: ProviderHeaders;
+			/** Provider-resolved endpoint override; wins over the catalog `baseUrl`. */
+			readonly baseUrl?: string;
+			/** Provider-scoped environment credentials resolved with the request. */
+			readonly env?: Readonly<Record<string, string>>;
 		}
 	| {
 			readonly ok: false;

package/src/gemini.ts

@@ -14,7 +14,7 @@ import { createProviderError } from "./errors";
 import { cancelResponseBody } from "./http";
 import { executeGroundedSearch } from "./grounding";
 import { httpSource, objectValue, optionalString, type SearchHttpFetch } from "./provider-http";
-import { modelAuthHeaders, type ModelExecution } from "./model-selection";
+import { hasExplicitHeader, modelAuthHeaders, type ModelExecution } from "./model-selection";
 import { validateSearchRequest } from "./search";
 
 export const GEMINI_GENERATE_CONTENT_ENDPOINT = "https://generativelanguage.googleapis.com/v1beta";
@@ -88,7 +88,14 @@ function endpointFor(model: ProviderModel, override?: string): string {
 
 function authHeaders(execution: ModelExecution): Readonly<Record<string, string>> {
 	const headers = modelAuthHeaders(execution, { bearerApiKey: false });
-	if (execution.auth.apiKey !== undefined && execution.auth.apiKey.trim().length > 0) headers.set("x-goog-api-key", execution.auth.apiKey);
+	// An explicit x-goog-api-key (value or null deletion) wins over a derived key.
+	if (
+		execution.auth.apiKey !== undefined &&
+		execution.auth.apiKey.trim().length > 0 &&
+		!hasExplicitHeader([execution.model.headers, execution.auth.headers], "x-goog-api-key")
+	) {
+		headers.set("x-goog-api-key", execution.auth.apiKey);
+	}
 	if (!headers.has("x-goog-api-key")) {
 		throw createProviderError({ provider: "gemini", kind: "auth", message: "Gemini authentication returned no API key", retryable: false });
 	}

package/src/model-selection.ts

@@ -109,7 +109,9 @@ async function authenticate(model: ProviderModel, registry: NonNullable<Provider
 	if (!auth.ok) {
 		throw createProviderError({ provider: options.searchProvider, kind: "auth", message: `Pi model authentication is not configured for ${model.id}`, retryable: false });
 	}
-	return { model, auth };
+	// A provider-resolved endpoint wins over the catalog base URL, matching
+	// `ModelRegistry.stream()`; adapters build their request URL from this model.
+	return { model: auth.baseUrl ? { ...model, baseUrl: auth.baseUrl } : model, auth };
 }
 
 export interface ModelAuthHeaderOptions {
@@ -125,10 +127,26 @@ export function applyProviderHeaders(headers: Headers, source: ProviderHeaders |
 	}
 }
 
+/**
+ * Whether any source declares a header, including a `null` deletion. An explicit
+ * `authorization` entry must win over a bearer synthesized from the API key.
+ */
+export function hasExplicitHeader(sources: readonly (ProviderHeaders | undefined)[], name: string): boolean {
+	const lower = name.toLowerCase();
+	return sources.some((source) => source !== undefined && Object.keys(source).some((key) => key.toLowerCase() === lower));
+}
+
 export function modelAuthHeaders(execution: ModelExecution, options: ModelAuthHeaderOptions = {}): Headers {
 	const headers = new Headers();
 	applyProviderHeaders(headers, execution.model.headers);
 	applyProviderHeaders(headers, execution.auth.headers);
-	if (options.bearerApiKey !== false && execution.auth.apiKey !== undefined && execution.auth.apiKey.trim().length > 0) headers.set("authorization", `Bearer ${execution.auth.apiKey}`);
+	if (
+		options.bearerApiKey !== false &&
+		execution.auth.apiKey !== undefined &&
+		execution.auth.apiKey.trim().length > 0 &&
+		!hasExplicitHeader([execution.model.headers, execution.auth.headers], "authorization")
+	) {
+		headers.set("authorization", `Bearer ${execution.auth.apiKey}`);
+	}
 	return headers;
 }

package/src/openai.ts

@@ -14,7 +14,7 @@ import type {
 	SearchWarning,
 } from "./contracts";
 import { createProviderError, isProviderError } from "./errors";
-import { applyProviderHeaders } from "./model-selection";
+import { applyProviderHeaders, hasExplicitHeader } from "./model-selection";
 import { cancelResponseBody, readBoundedResponseText } from "./http";
 import { parseProviderRateLimits } from "./provider-http";
 import { validateSearchRequest } from "./search";
@@ -444,7 +444,9 @@ async function selectSearchExecution(active: ProviderModel | undefined, registry
 		} catch (error) {
 			throw createProviderError({ provider, kind: "auth", message: "Pi model authentication could not be resolved", retryable: false, cause: error });
 		}
-		if (auth.ok) return { model: selected, auth };
+		// A provider-resolved endpoint wins over the catalog base URL; the adapter
+		// builds its request URL from this model. Mirrors selectModelExecution().
+		if (auth.ok) return { model: auth.baseUrl ? { ...selected, baseUrl: auth.baseUrl } : selected, auth };
 		if (request.executionModel !== undefined) {
 			throw createProviderError({ provider, kind: "auth", message: `Pi model authentication is not configured for ${selected.id}`, retryable: false });
 		}
@@ -776,7 +778,11 @@ export class OpenAIProvider implements Provider {
 		const headers = new Headers();
 		applyProviderHeaders(headers, execution.model.headers);
 		applyProviderHeaders(headers, execution.auth.headers);
-		if (execution.auth.apiKey !== undefined && execution.auth.apiKey.trim().length > 0) {
+		if (
+			execution.auth.apiKey !== undefined &&
+			execution.auth.apiKey.trim().length > 0 &&
+			!hasExplicitHeader([execution.model.headers, execution.auth.headers], "authorization")
+		) {
 			headers.set("Authorization", `Bearer ${execution.auth.apiKey}`);
 		}
 		if (!headers.has("authorization")) {

package/src/search-tool.ts

@@ -174,7 +174,13 @@ export function providerContextFromPi(context: ExtensionContext): ProviderContex
 				if (selected === undefined) return { ok: false, error: `Pi model ${requested.provider}/${requested.id} is not available` };
 				const resolved = await context.modelRegistry.getApiKeyAndHeaders(selected);
 				return resolved.ok
-					? { ok: true, ...(resolved.apiKey === undefined ? {} : { apiKey: resolved.apiKey }), ...(resolved.headers === undefined ? {} : { headers: resolved.headers }) }
+					? {
+						ok: true,
+						...(resolved.apiKey === undefined ? {} : { apiKey: resolved.apiKey }),
+						...(resolved.headers === undefined ? {} : { headers: resolved.headers }),
+						...(resolved.baseUrl === undefined ? {} : { baseUrl: resolved.baseUrl }),
+						...(resolved.env === undefined ? {} : { env: resolved.env }),
+					}
 					: { ok: false, error: resolved.error };
 			},
 		},