pi-nvidia-nim 1.1.21 → 1.1.22

package/index.ts

@@ -498,10 +498,29 @@ function getNimApiKey(): string | undefined {
 	return apiKey?.trim() || undefined;
 }
 
+function getNimProviderApiKeyConfig(): string {
+	return `$${getNimApiKeyEnv() ?? NVIDIA_NIM_API_KEY_ENV}`;
+}
+
 function isNimApiKeyEnvName(value: string): value is NimApiKeyEnvName {
 	return NVIDIA_API_KEY_ENV_NAMES.includes(value as NimApiKeyEnvName);
 }
 
+function isNimApiKeyEnvReference(value: string): boolean {
+	return value.startsWith("$") && isNimApiKeyEnvName(value.slice(1));
+}
+
+function isNimApiKeyEnvPlaceholder(value: string): boolean {
+	return isNimApiKeyEnvName(value) || isNimApiKeyEnvReference(value);
+}
+
+function resolveNimApiKeyEnvReference(value: string): string | undefined {
+	if (!isNimApiKeyEnvReference(value)) return undefined;
+
+	const envValue = process.env[value.slice(1)]?.trim();
+	return envValue || undefined;
+}
+
 function isNimApiKeyEnvValue(value: string): boolean {
 	return NVIDIA_API_KEY_ENV_NAMES.some((envName) => process.env[envName]?.trim() === value);
 }
@@ -570,15 +589,19 @@ function resolveNimApiKey(apiKey: string | undefined, authStorage?: AuthStorageL
 
 	if (
 		hasStoredCommandCredential &&
-		(!resolvedApiKey || isNimApiKeyEnvName(resolvedApiKey) || isNimApiKeyEnvValue(resolvedApiKey))
+		(!resolvedApiKey || isNimApiKeyEnvPlaceholder(resolvedApiKey) || isNimApiKeyEnvValue(resolvedApiKey))
 	) {
 		throw new Error("NVIDIA NIM API key command resolved to an empty value.");
 	}
 
 	const storedApiKey = getStoredResolvedNimApiKey(authStorage);
-	if (storedApiKey && (!resolvedApiKey || isNimApiKeyEnvName(resolvedApiKey))) return storedApiKey;
+	if (storedApiKey && (!resolvedApiKey || isNimApiKeyEnvPlaceholder(resolvedApiKey))) return storedApiKey;
 
-	if (resolvedApiKey && !isNimApiKeyEnvName(resolvedApiKey)) return resolvedApiKey;
+	if (resolvedApiKey) {
+		const envReferenceApiKey = resolveNimApiKeyEnvReference(resolvedApiKey);
+		if (envReferenceApiKey) return envReferenceApiKey;
+		if (!isNimApiKeyEnvPlaceholder(resolvedApiKey)) return resolvedApiKey;
+	}
 
 	return getNimApiKey();
 }
@@ -615,6 +638,20 @@ function buildThinkingKwargs(
 	return kwargs;
 }
 
+function buildNimRequestHeaders(headers: SimpleStreamOptions["headers"], apiKey: string): Record<string, string> {
+	const resolvedHeaders: Record<string, string> = {};
+
+	for (const [key, value] of Object.entries(headers ?? {})) {
+		if (key.toLowerCase() === "authorization") continue;
+		resolvedHeaders[key] = value;
+	}
+
+	return {
+		...resolvedHeaders,
+		Authorization: `Bearer ${apiKey}`,
+	};
+}
+
 function nimStreamSimple(
 	model: Model<Api>,
 	context: Context,
@@ -654,6 +691,7 @@ function nimStreamSimple(
 		...options,
 		reasoning: effectiveReasoning,
 		apiKey: nimApiKey,
+		headers: buildNimRequestHeaders(options?.headers, nimApiKey),
 		onPayload: (params: unknown) => {
 			const p = params as Record<string, unknown>;
 
@@ -834,7 +872,7 @@ async function fetchNimModels(apiKey: string): Promise<NimModelFetchResult> {
 // =============================================================================
 
 export default function (pi: ExtensionAPI) {
-	const providerApiKeyConfig = getNimApiKeyEnv() ?? NVIDIA_NIM_API_KEY_ENV;
+	const providerApiKeyConfig = getNimProviderApiKeyConfig();
 
 	// Always register the curated model list. The request path resolves credentials
 	// through pi first (CLI override, auth.json, shell command), then falls back to
@@ -897,7 +935,7 @@ export default function (pi: ExtensionAPI) {
 			const allModels = Array.from(modelMap.values());
 			ctx.modelRegistry.registerProvider(PROVIDER_NAME, {
 				baseUrl: NVIDIA_NIM_BASE_URL,
-				apiKey: getNimApiKeyEnv() ?? NVIDIA_NIM_API_KEY_ENV,
+				apiKey: getNimProviderApiKeyConfig(),
 				api: "openai-completions",
 				authHeader: true,
 				models: allModels,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-nvidia-nim",
-  "version": "1.1.21",
+  "version": "1.1.22",
   "description": "NVIDIA NIM API provider extension for pi coding agent — access 100+ models from build.nvidia.com",
   "type": "module",
   "files": [
@@ -25,7 +25,8 @@
   "devDependencies": {
     "@earendil-works/pi-ai": "^0.74.0",
     "@earendil-works/pi-coding-agent": "^0.74.0",
-    "@types/node": "^22.0.0"
+    "@types/node": "^22.0.0",
+    "typescript": "^6.0.3"
   },
   "repository": {
     "type": "git",