pi-free 2.0.4 → 2.0.6

package/providers/cline/cline.ts

@@ -138,19 +138,24 @@ function extractTaskBody(content: unknown): string {
 	return "";
 }
 
-function shapeMessagesForCline(messages: any[]): any[] {
-	let lastWrappedIdx = -1;
-	let baseTranscript = "";
+function findLastClineWrappedMessage(messages: any[]): {
+	index: number;
+	transcript: string;
+} {
 	for (let i = messages.length - 1; i >= 0; i--) {
 		if (messages[i]?.role !== "user") continue;
 		if (!isClineWrapped(messages[i]?.content)) continue;
-		lastWrappedIdx = i;
-		baseTranscript = extractTaskBody(messages[i].content);
-		break;
+		return { index: i, transcript: extractTaskBody(messages[i].content) };
 	}
+	return { index: -1, transcript: "" };
+}
 
+function buildTranscriptParts(
+	messages: any[],
+	startIdx: number,
+	baseTranscript: string,
+): string[] {
 	const parts: string[] = baseTranscript ? [baseTranscript] : [];
-	const startIdx = lastWrappedIdx >= 0 ? lastWrappedIdx + 1 : 0;
 
 	for (let i = startIdx; i < messages.length; i++) {
 		const msg = messages[i];
@@ -167,9 +172,10 @@ function shapeMessagesForCline(messages: any[]): any[] {
 		}
 	}
 
-	const transcript = parts.join("\n\n").trim() || "(no conversation yet)";
-	const envDetails = buildEnvironmentDetails();
+	return parts;
+}
 
+function buildCollapsedMessage(messages: any[], transcript: string): any[] {
 	const collapsed: any[] = [];
 	const systemMsg = messages.find((m: any) => m?.role === "system");
 	if (systemMsg) {
@@ -182,13 +188,24 @@ function shapeMessagesForCline(messages: any[]): any[] {
 		content: [
 			{ type: "text", text: `<task>\n${transcript}\n</task>` },
 			{ type: "text", text: TASK_PROGRESS_BLOCK },
-			{ type: "text", text: envDetails },
+			{ type: "text", text: buildEnvironmentDetails() },
 		],
 	});
 
 	return collapsed;
 }
 
+function shapeMessagesForCline(messages: any[]): any[] {
+	const { index: lastWrappedIdx, transcript: baseTranscript } =
+		findLastClineWrappedMessage(messages);
+
+	const startIdx = lastWrappedIdx >= 0 ? lastWrappedIdx + 1 : 0;
+	const parts = buildTranscriptParts(messages, startIdx, baseTranscript);
+	const transcript = parts.join("\n\n").trim() || "(no conversation yet)";
+
+	return buildCollapsedMessage(messages, transcript);
+}
+
 // =============================================================================
 // Extension entry point
 // =============================================================================

package/providers/dynamic-built-in/index.ts

@@ -58,7 +58,9 @@ interface FetchModelsOptions {
 async function fetchModelsFromEndpoint(
 	opts: FetchModelsOptions,
 ): Promise<ProviderModelConfig[]> {
-	const url = `${opts.baseUrl.replace(/\/+$/, "")}/models`;
+	let cleanBase = opts.baseUrl;
+	while (cleanBase.endsWith("/")) cleanBase = cleanBase.slice(0, -1);
+	const url = `${cleanBase}/models`;
 	const headers: Record<string, string> = {
 		Accept: "application/json",
 		Authorization: `Bearer ${opts.apiKey}`,

package/providers/nvidia/nvidia.ts

@@ -170,39 +170,35 @@ function inferModelFromId(id: string): ModelsDevModel | null {
 // Fetch + map
 // =============================================================================
 
-async function fetchNvidiaModels(
-	apiKey?: string,
-): Promise<ProviderModelConfig[]> {
-	// ── 1. Query NVIDIA's actual API (source of truth) ─────────────────
-	let apiModelIds = new Set<string>();
-	if (apiKey) {
-		try {
-			const response = await fetchWithRetry(
-				`${BASE_URL_NVIDIA}/models`,
-				{
-					headers: {
-						Authorization: `Bearer ${apiKey}`,
-						"User-Agent": "pi-free-providers",
-					},
+async function fetchNvidiaApiModelIds(apiKey: string): Promise<Set<string>> {
+	try {
+		const response = await fetchWithRetry(
+			`${BASE_URL_NVIDIA}/models`,
+			{
+				headers: {
+					Authorization: `Bearer ${apiKey}`,
+					"User-Agent": "pi-free-providers",
 				},
-				3,
-				1000,
-				DEFAULT_FETCH_TIMEOUT_MS,
-			);
-			if (response.ok) {
-				const json = (await response.json()) as {
-					data?: Array<{ id: string }>;
-				};
-				if (json.data) {
-					apiModelIds = new Set(json.data.map((m) => m.id));
-				}
+			},
+			3,
+			1000,
+			DEFAULT_FETCH_TIMEOUT_MS,
+		);
+		if (response.ok) {
+			const json = (await response.json()) as {
+				data?: Array<{ id: string }>;
+			};
+			if (json.data) {
+				return new Set(json.data.map((m) => m.id));
 			}
-		} catch (error) {
-			console.error("[nvidia] Failed to fetch models from NVIDIA API", error);
 		}
+	} catch (error) {
+		console.error("[nvidia] Failed to fetch models from NVIDIA API", error);
 	}
+	return new Set();
+}
 
-	// ── 2. Fetch models.dev for rich metadata (cost, limits, etc.) ─────
+async function fetchModelsDevMetadata(): Promise<Map<string, ModelsDevModel>> {
 	const devModels = new Map<string, ModelsDevModel>();
 	try {
 		const response = await fetchWithRetry(
@@ -226,6 +222,27 @@ async function fetchNvidiaModels(
 	} catch (error) {
 		console.error("[nvidia] Failed to fetch models.dev", error);
 	}
+	return devModels;
+}
+
+function isChatModel(m: ModelsDevModel): boolean {
+	const modalities = m.modalities;
+	if (!modalities) return true;
+	const output = modalities.output ?? [];
+	const input = modalities.input ?? [];
+	return output.includes("text") && input.includes("text");
+}
+
+async function fetchNvidiaModels(
+	apiKey?: string,
+): Promise<ProviderModelConfig[]> {
+	// ── 1. Query NVIDIA's actual API (source of truth) ─────────────────
+	const apiModelIds = apiKey
+		? await fetchNvidiaApiModelIds(apiKey)
+		: new Set<string>();
+
+	// ── 2. Fetch models.dev for rich metadata (cost, limits, etc.) ─────
+	const devModels = await fetchModelsDevMetadata();
 
 	// ── 3. Build unified list (NVIDIA API wins; fallback to models.dev) ─
 	const modelIds =
@@ -233,30 +250,11 @@ async function fetchNvidiaModels(
 
 	const result = applyHidden(
 		modelIds
-			.map((id) => {
-				const dev = devModels.get(id);
-				if (dev) return dev;
-				return inferModelFromId(id);
-			})
+			.map((id) => devModels.get(id) ?? inferModelFromId(id))
 			.filter((m): m is ModelsDevModel => m !== null)
 			.filter((m) => isUsableModel(m.id, NVIDIA_MIN_SIZE_B))
-			.filter((m) => {
-				const modalities = m.modalities;
-				if (modalities) {
-					const output = modalities.output ?? [];
-					const input = modalities.input ?? [];
-					if (!output.includes("text")) return false;
-					if (!input.includes("text")) return false;
-				}
-				return true;
-			})
-			// Filter out known 404 models (listed but not provisioned for chat)
-			.filter((m) => {
-				if (NVIDIA_KNOWN_404_MODELS.has(m.id)) {
-					return false;
-				}
-				return true;
-			})
+			.filter(isChatModel)
+			.filter((m) => !NVIDIA_KNOWN_404_MODELS.has(m.id))
 			// NVIDIA is freemium — all models are usable with free credits.
 			// No cost filtering applied.
 			.map(

package/providers/qwen/qwen.ts

@@ -10,18 +10,18 @@
  * 1,000 free API calls/day — run /login qwen to authenticate.~~
  */
 
-import type { OAuthCredentials, Model, Api } from "@mariozechner/pi-ai";
+import type { Api, Model, OAuthCredentials } from "@mariozechner/pi-ai";
 import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
 import { PROVIDER_QWEN, URL_QWEN_TOS } from "../../constants.ts";
+import { createLogger } from "../../lib/logger.ts";
+import { logWarning } from "../../lib/util.ts";
 import {
+	createReRegister,
 	enhanceWithCI,
 	type StoredModels,
 	setupProvider,
-	createReRegister,
 } from "../../provider-helper.ts";
-import { logWarning } from "../../lib/util.ts";
-import { createLogger } from "../../lib/logger.ts";
-import { loginQwen, refreshQwenToken, getQwenBaseUrl } from "./qwen-auth.ts";
+import { getQwenBaseUrl, loginQwen, refreshQwenToken } from "./qwen-auth.ts";
 import { fetchQwenModels } from "./qwen-models.ts";
 
 // =============================================================================
@@ -61,10 +61,12 @@ const DASHSCOPE_HEADERS = {
 
 export default async function (pi: ExtensionAPI) {
 	// DEPRECATION WARNING
-	_logger.warn("Qwen provider is deprecated. The 1,000 req/day free tier is no longer available.");
+	_logger.warn(
+		"Qwen provider is deprecated. The 1,000 req/day free tier is no longer available.",
+	);
 
 	// Fetch static free-tier models
-	let models = await fetchQwenModels().catch((err) => {
+	const models = await fetchQwenModels().catch((err) => {
 		logWarning("qwen", "Failed to load models at startup", err);
 		return [];
 	});
@@ -148,55 +150,51 @@ export default async function (pi: ExtensionAPI) {
 	// getApiKey() call will trigger a token refresh via refreshToken().
 	// This mirrors qwen-code's executeWithCredentialManagement() retry logic.
 	//
+	function isQwenAuthError(msg: {
+		role?: string;
+		errorMessage?: string;
+	}): boolean {
+		if (msg.role !== "assistant" || !msg.errorMessage) return false;
+		const errLower = msg.errorMessage.toLowerCase();
+		return AUTH_ERROR_PATTERNS.some((p) => errLower.includes(p));
+	}
+
+	function forceExpireQwenToken(
+		ctx: any,
+		msg: { errorMessage?: string },
+	): void {
+		_logger.warn("Qwen auth error detected, force-expiring token for refresh", {
+			error: (msg.errorMessage ?? "").slice(0, 100),
+		});
+
+		try {
+			const authStorage = (ctx as any).modelRegistry?.authStorage;
+			if (authStorage) {
+				const cred = authStorage.get(PROVIDER_QWEN);
+				if (cred?.type === "oauth" && cred.expires > Date.now()) {
+					authStorage.set(PROVIDER_QWEN, { ...cred, expires: 0 });
+					_logger.info(
+						"Qwen token force-expired; will refresh on next request",
+					);
+				}
+			}
+			ctx.ui.notify("Qwen: auth error detected, refreshing token…", "warning");
+		} catch (e) {
+			_logger.warn("Failed to force-expire Qwen token", {
+				error: e instanceof Error ? e.message : String(e),
+			});
+		}
+	}
+
 	pi.on("turn_end", async (event, ctx) => {
 		if (ctx.model?.provider !== PROVIDER_QWEN) return;
-		// NOTE: Request counting removed - usage tracking was deleted in refactor
 
 		const msg = (
 			event as { message?: { role?: string; errorMessage?: string } }
 		).message;
 
-		if (msg?.role === "assistant" && msg.errorMessage) {
-			const errLower = msg.errorMessage.toLowerCase();
-			const isAuthError = AUTH_ERROR_PATTERNS.some((p) =>
-				errLower.includes(p),
-			);
-
-			if (isAuthError) {
-				_logger.warn(
-					"Qwen auth error detected, force-expiring token for refresh",
-					{ error: msg.errorMessage.slice(0, 100) },
-				);
-
-				// Force-expire the stored credential so the next getApiKey() call
-				// triggers refreshQwenToken(). The credential object in auth.json
-				// is updated with expires = 0 (already past).
-				try {
-					const authStorage =
-						(ctx as any).modelRegistry?.authStorage;
-					if (authStorage) {
-						const cred = authStorage.get(PROVIDER_QWEN);
-						if (cred?.type === "oauth" && cred.expires > Date.now()) {
-							// Set expiry to 0 to force refresh on next request
-							authStorage.set(PROVIDER_QWEN, {
-								...cred,
-								expires: 0,
-							});
-							_logger.info(
-								"Qwen token force-expired; will refresh on next request",
-							);
-						}
-					}
-					ctx.ui.notify(
-						"Qwen: auth error detected, refreshing token…",
-						"warning",
-					);
-				} catch (e) {
-					_logger.warn("Failed to force-expire Qwen token", {
-						error: e instanceof Error ? e.message : String(e),
-					});
-				}
-			}
+		if (msg && isQwenAuthError(msg)) {
+			forceExpireQwenToken(ctx, msg);
 		}
 	});
 }

package/scripts/check-extensions.mjs

@@ -7,17 +7,31 @@
  *   node scripts/check-extensions.mjs <dir>     # from installed location
  */
 
-import { execSync } from "node:child_process";
-import { readdirSync, readFileSync, statSync } from "node:fs";
+import { execFileSync } from "node:child_process";
+import { existsSync, readdirSync, readFileSync, statSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";
 
 const installDir = resolve(process.argv[2] ?? ".");
 const fromSource = process.argv[2] == null;
 
+/** Resolve npm to an absolute path to avoid S4036 PATH-lookup flags. */
+function resolveNpm() {
+	for (const p of [
+		"/usr/bin/npm",
+		"/usr/local/bin/npm",
+		process.platform === "win32" ? "C:\\Program Files\\nodejs\\npm.cmd" : "",
+	]) {
+		if (p && existsSync(p)) return p;
+	}
+	return "npm"; // fallback
+}
+
 function getFiles() {
 	if (fromSource) {
-		// Use npm pack --dry-run to get exactly the files that would be published
-		const out = execSync("npm pack --dry-run 2>&1", { encoding: "utf8" });
+		// Use npm pack --dry-run with an absolute executable path.
+		const out = execFileSync(resolveNpm(), ["pack", "--dry-run"], {
+			encoding: "utf8",
+		});
 		return out
 			.split("\n")
 			.map((l) => l.match(/npm notice \S+\s+(.+)/)?.[1]?.trim())