pi-free 2.0.2 → 2.0.5

package/providers/qwen/qwen-models.ts

@@ -1,101 +1,101 @@
-/**
- * Qwen OAuth model definitions.
- *
- * @deprecated The 1,000 req/day free tier is no longer available. Auth is broken.
- * This provider remains for backward compatibility but should not be used.
- */
-
-import type { ProviderModelConfig } from "@mariozechner/pi-coding-agent";
-import { createLogger } from "../../lib/logger.ts";
-
-const _logger = createLogger("qwen-models");
-
-/**
- * portal.qwen.ai compatibility settings.
- *
- * portal.qwen.ai's OpenAI-compatible API does not support several parameters
- * that the pi framework sends by default.
- */
-export const PORTAL_COMPAT: NonNullable<ProviderModelConfig["compat"]> = {
-	supportsStore: false,
-	supportsDeveloperRole: false,
-	supportsReasoningEffort: false,
-	supportsUsageInStreaming: false,
-	supportsStrictMode: false,
-	maxTokensField: "max_tokens",
-};
-
-/**
- * Fallback model used before OAuth completes or if model discovery fails.
- * The real model ID is resolved dynamically via fetchQwenLiveModels() after auth.
- */
-export const QWEN_FREE_MODELS: ProviderModelConfig[] = [
-	{
-		id: "coder-model",
-		name: "Qwen Coder — DEPRECATED (free tier discontinued)",
-		reasoning: false,
-		input: ["text"],
-		cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-		contextWindow: 131_072,
-		maxTokens: 16_384,
-		compat: PORTAL_COMPAT,
-	},
-];
-
-/**
- * Fetch Qwen models. Returns static model list for backward compatibility.
- * @deprecated Qwen free tier is discontinued.
- */
-export async function fetchQwenModels(): Promise<ProviderModelConfig[]> {
-	_logger.info("Qwen provider is deprecated, returning placeholder models");
-	return QWEN_FREE_MODELS;
-}
-
-/**
- * Fetch live model list from the Qwen API using the OAuth access token.
- * Returns updated models with real IDs from the server, or the original
- * models unchanged if the request fails.
- */
-export async function fetchQwenLiveModels(
-	baseUrl: string,
-	accessToken: string,
-	templateModels: ProviderModelConfig[],
-): Promise<ProviderModelConfig[]> {
-	try {
-		const response = await fetch(`${baseUrl}/models`, {
-			headers: {
-				Authorization: `Bearer ${accessToken}`,
-				Accept: "application/json",
-			},
-		});
-
-		if (!response.ok) {
-			_logger.info("Qwen /v1/models fetch failed, keeping current model IDs", {
-				status: response.status,
-			});
-			return templateModels;
-		}
-
-		interface ModelEntry {
-			id: string;
-		}
-		const data = (await response.json()) as { data?: ModelEntry[] };
-		const ids: string[] = (data.data ?? [])
-			.map((m: ModelEntry) => m.id)
-			.filter(Boolean);
-
-		_logger.info("Qwen live models discovered", { ids });
-
-		if (ids.length === 0) return templateModels;
-
-		// Prefer a coder model if available, otherwise use the first model
-		const preferred = ids.find((id) => /coder/i.test(id)) ?? ids[0];
-
-		return templateModels.map((m) => ({ ...m, id: preferred }));
-	} catch (err) {
-		_logger.info("Qwen live model fetch error, keeping current model IDs", {
-			error: String(err),
-		});
-		return templateModels;
-	}
-}
+/**
+ * Qwen OAuth model definitions.
+ *
+ * @deprecated The 1,000 req/day free tier is no longer available. Auth is broken.
+ * This provider remains for backward compatibility but should not be used.
+ */
+
+import type { ProviderModelConfig } from "@mariozechner/pi-coding-agent";
+import { createLogger } from "../../lib/logger.ts";
+
+const _logger = createLogger("qwen-models");
+
+/**
+ * portal.qwen.ai compatibility settings.
+ *
+ * portal.qwen.ai's OpenAI-compatible API does not support several parameters
+ * that the pi framework sends by default.
+ */
+export const PORTAL_COMPAT: NonNullable<ProviderModelConfig["compat"]> = {
+	supportsStore: false,
+	supportsDeveloperRole: false,
+	supportsReasoningEffort: false,
+	supportsUsageInStreaming: false,
+	supportsStrictMode: false,
+	maxTokensField: "max_tokens",
+};
+
+/**
+ * Fallback model used before OAuth completes or if model discovery fails.
+ * The real model ID is resolved dynamically via fetchQwenLiveModels() after auth.
+ */
+export const QWEN_FREE_MODELS: ProviderModelConfig[] = [
+	{
+		id: "coder-model",
+		name: "Qwen Coder — DEPRECATED (free tier discontinued)",
+		reasoning: false,
+		input: ["text"],
+		cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
+		contextWindow: 131_072,
+		maxTokens: 16_384,
+		compat: PORTAL_COMPAT,
+	},
+];
+
+/**
+ * Fetch Qwen models. Returns static model list for backward compatibility.
+ * @deprecated Qwen free tier is discontinued.
+ */
+export async function fetchQwenModels(): Promise<ProviderModelConfig[]> {
+	_logger.info("Qwen provider is deprecated, returning placeholder models");
+	return QWEN_FREE_MODELS;
+}
+
+/**
+ * Fetch live model list from the Qwen API using the OAuth access token.
+ * Returns updated models with real IDs from the server, or the original
+ * models unchanged if the request fails.
+ */
+export async function fetchQwenLiveModels(
+	baseUrl: string,
+	accessToken: string,
+	templateModels: ProviderModelConfig[],
+): Promise<ProviderModelConfig[]> {
+	try {
+		const response = await fetch(`${baseUrl}/models`, {
+			headers: {
+				Authorization: `Bearer ${accessToken}`,
+				Accept: "application/json",
+			},
+		});
+
+		if (!response.ok) {
+			_logger.info("Qwen /v1/models fetch failed, keeping current model IDs", {
+				status: response.status,
+			});
+			return templateModels;
+		}
+
+		interface ModelEntry {
+			id: string;
+		}
+		const data = (await response.json()) as { data?: ModelEntry[] };
+		const ids: string[] = (data.data ?? [])
+			.map((m: ModelEntry) => m.id)
+			.filter(Boolean);
+
+		_logger.info("Qwen live models discovered", { ids });
+
+		if (ids.length === 0) return templateModels;
+
+		// Prefer a coder model if available, otherwise use the first model
+		const preferred = ids.find((id) => /coder/i.test(id)) ?? ids[0];
+
+		return templateModels.map((m) => ({ ...m, id: preferred }));
+	} catch (err) {
+		_logger.info("Qwen live model fetch error, keeping current model IDs", {
+			error: String(err),
+		});
+		return templateModels;
+	}
+}

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/providers/zenmux/zenmux.ts

@@ -0,0 +1,176 @@
+/**
+ * ZenMux Provider Extension
+ *
+ * Provides access to ZenMux AI gateway - unified API for 200+ models from
+ * OpenAI, Anthropic, Google, and other providers.
+ *
+ * Setup:
+ *   1. Get API key from https://zenmux.ai
+ *   2. Set ZENMUX_API_KEY env var or add to ~/.pi/free.json
+ *
+ * Responds to global free-only filter.
+ *
+ * Usage:
+ *   pi install git:github.com/apmantza/pi-free
+ *   # Set ZENMUX_API_KEY env var
+ *   # Models appear in /model selector
+ */
+
+import type {
+	ExtensionAPI,
+	ProviderModelConfig,
+} from "@mariozechner/pi-coding-agent";
+import { getZenmuxApiKey, getZenmuxShowPaid } from "../../config.ts";
+import {
+	BASE_URL_ZENMUX,
+	DEFAULT_FETCH_TIMEOUT_MS,
+	PROVIDER_ZENMUX,
+} from "../../constants.ts";
+import { createLogger } from "../../lib/logger.ts";
+import {
+	getProxyModelCompat,
+	isLikelyReasoningModel,
+} from "../../lib/provider-compat.ts";
+import { isFreeModel, registerWithGlobalToggle } from "../../lib/registry.ts";
+import { fetchWithRetry } from "../../lib/util.ts";
+import { createReRegister, setupProvider } from "../../provider-helper.ts";
+
+const _logger = createLogger("zenmux");
+
+// =============================================================================
+// Fetch ZenMux models
+// =============================================================================
+
+interface ZenMuxModel {
+	id: string;
+	name?: string;
+	context_length?: number;
+	pricing?: {
+		prompt?: number;
+		completion?: number;
+	};
+}
+
+function isZenmuxReasoningModel(model: Pick<ZenMuxModel, "id" | "name">) {
+	const haystack = `${model.id} ${model.name ?? ""}`.toLowerCase();
+	return isLikelyReasoningModel(model) || haystack.includes("claude");
+}
+
+async function fetchZenmuxModels(
+	apiKey: string,
+): Promise<ProviderModelConfig[]> {
+	_logger.info("[zenmux] Fetching models from ZenMux API...");
+
+	try {
+		const response = await fetchWithRetry(
+			`${BASE_URL_ZENMUX}/models`,
+			{
+				headers: {
+					Authorization: `Bearer ${apiKey}`,
+					"Content-Type": "application/json",
+				},
+			},
+			3,
+			1000,
+			DEFAULT_FETCH_TIMEOUT_MS,
+		);
+
+		if (!response.ok) {
+			throw new Error(`ZenMux API error: ${response.status}`);
+		}
+
+		const data = (await response.json()) as { data?: ZenMuxModel[] };
+		const models = data.data ?? [];
+
+		_logger.info(`[zenmux] Fetched ${models.length} models`);
+
+		return models.map(
+			(m): ProviderModelConfig => ({
+				id: m.id,
+				name: m.name || m.id,
+				reasoning: isZenmuxReasoningModel(m),
+				input: ["text"],
+				cost: {
+					input: m.pricing?.prompt || 0,
+					output: m.pricing?.completion || 0,
+					cacheRead: 0,
+					cacheWrite: 0,
+				},
+				contextWindow: m.context_length || 128000,
+				maxTokens: m.context_length ? Math.floor(m.context_length / 2) : 4096,
+				compat: getProxyModelCompat(m),
+			}),
+		);
+	} catch (error) {
+		_logger.error("[zenmux] Failed to fetch models:", {
+			error: error instanceof Error ? error.message : String(error),
+		});
+		return [];
+	}
+}
+
+// =============================================================================
+// Extension Entry Point
+// =============================================================================
+
+export default async function zenmuxProvider(pi: ExtensionAPI) {
+	const apiKey = getZenmuxApiKey();
+
+	if (!apiKey) {
+		_logger.info(
+			"[zenmux] Skipping - ZENMUX_API_KEY not set (env var or ~/.pi/free.json)",
+		);
+		return;
+	}
+
+	// Fetch models
+	const allModels = await fetchZenmuxModels(apiKey);
+
+	if (allModels.length === 0) {
+		_logger.warn("[zenmux] No models available");
+		return;
+	}
+
+	// Use isFreeModel with allModels for proper detection
+	// ZenMux exposes pricing, so Route A (OR logic) will be used:
+	// FREE if cost=0 OR "free" in name
+	const freeModels = allModels.filter((m) =>
+		isFreeModel({ ...m, provider: PROVIDER_ZENMUX }, allModels),
+	);
+
+	const stored = { free: freeModels, all: allModels };
+
+	_logger.info(
+		`[zenmux] Registered ${allModels.length} models (${freeModels.length} free)`,
+	);
+
+	// Create re-register function
+	const reRegister = createReRegister(pi, {
+		providerId: PROVIDER_ZENMUX,
+		baseUrl: BASE_URL_ZENMUX,
+		apiKey,
+	});
+
+	// Register with global toggle
+	registerWithGlobalToggle(PROVIDER_ZENMUX, stored, reRegister, true);
+
+	// Setup provider with toggle command
+	setupProvider(
+		pi,
+		{
+			providerId: PROVIDER_ZENMUX,
+			initialShowPaid: getZenmuxShowPaid(),
+			reRegister: (models, _stored) => {
+				if (_stored) {
+					stored.free = _stored.free;
+					stored.all = _stored.all;
+				}
+				reRegister(models);
+			},
+		},
+		stored,
+	);
+
+	// Initial registration
+	reRegister(freeModels);
+}

package/scripts/check-extensions.mjs

@@ -7,48 +7,58 @@
  *   node scripts/check-extensions.mjs <dir>     # from installed location
  */
 
-import { readFileSync, readdirSync, statSync } from "node:fs";
-import { join, resolve, dirname } from "node:path";
 import { execSync } from "node:child_process";
+import { 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;
 
 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" });
-    return out
-      .split("\n")
-      .map(l => l.match(/npm notice [\d.]+\w+\s+(.+)/)?.[1]?.trim())
-      .filter(f => f && (f.endsWith(".ts") || f.endsWith(".mjs")))
-      .map(f => join(installDir, f));
-  }
-  // Installed location: walk all .ts/.mjs files
-  const files = [];
-  function walk(dir) {
-    for (const entry of readdirSync(dir)) {
-      const full = join(dir, entry);
-      if (entry === "node_modules") continue;
-      if (statSync(full).isDirectory()) walk(full);
-      else if (entry.endsWith(".ts") || entry.endsWith(".mjs")) files.push(full);
-    }
-  }
-  walk(installDir);
-  return files;
+	if (fromSource) {
+		// Use npm pack --dry-run to get exactly the files that would be published
+		const execOptions = { encoding: "utf8" };
+		if (process.platform !== "win32") {
+			execOptions.env = {
+				...process.env,
+				PATH: "/usr/local/bin:/usr/bin:/bin",
+			};
+		}
+		const out = execSync("npm pack --dry-run 2>&1", execOptions);
+		return out
+			.split("\n")
+			.map((l) => l.match(/npm notice \S+\s+(.+)/)?.[1]?.trim())
+			.filter((f) => f && (f.endsWith(".ts") || f.endsWith(".mjs")))
+			.map((f) => join(installDir, f));
+	}
+	// Installed location: walk all .ts/.mjs files
+	const files = [];
+	function walk(dir) {
+		for (const entry of readdirSync(dir)) {
+			const full = join(dir, entry);
+			if (entry === "node_modules") continue;
+			if (statSync(full).isDirectory()) walk(full);
+			else if (entry.endsWith(".ts") || entry.endsWith(".mjs"))
+				files.push(full);
+		}
+	}
+	walk(installDir);
+	return files;
 }
 
 function resolveImport(fromFile, importPath) {
-  const base = join(dirname(fromFile), importPath);
-  for (const candidate of [
-    base,
-    base.replace(/\.js$/, ".ts"),   // .js → .ts (TypeScript ESM convention)
-    base + ".ts",
-    join(base, "index.ts"),
-  ]) {
-    try { if (statSync(candidate).isFile()) return candidate; } catch {}
-  }
-  return null;
+	const base = join(dirname(fromFile), importPath);
+	for (const candidate of [
+		base,
+		base.replace(/\.js$/, ".ts"), // .js → .ts (TypeScript ESM convention)
+		base + ".ts",
+		join(base, "index.ts"),
+	]) {
+		try {
+			if (statSync(candidate).isFile()) return candidate;
+		} catch {}
+	}
+	return null;
 }
 
 const files = getFiles();
@@ -59,29 +69,35 @@ let failed = 0;
 const seen = new Set();
 
 for (const file of files) {
-  const src = readFileSync(file, "utf8");
-  const relFile = file.slice(installDir.length + 1).replace(/\\/g, "/");
-  // Strip comments before matching imports
-  const stripped = src.replace(/\/\/[^\n]*/g, "").replace(/\/\*[\s\S]*?\*\//g, "");
-  const importRe = /from\s+['"](\.[^'"]+)['"]/g;
-  let match;
-  while ((match = importRe.exec(stripped)) !== null) {
-    const importPath = match[1];
-    const key = `${relFile}:${importPath}`;
-    if (seen.has(key)) continue;
-    seen.add(key);
-    totalImports++;
-    if (!resolveImport(file, importPath)) {
-      console.error(`  ✗ ${relFile}`);
-      console.error(`      imports '${importPath}' → NOT FOUND`);
-      failed++;
-    }
-  }
+	const src = readFileSync(file, "utf8");
+	const relFile = file.slice(installDir.length + 1).replace(/\\/g, "/");
+	// Strip comments before matching imports
+	const stripped = src
+		.replace(/\/\/[^\n]*/g, "")
+		.replace(/\/\*[\s\S]*?\*\//g, "");
+	const importRe = /from\s+['"](\.[^'"]+)['"]/g;
+	let match;
+	while ((match = importRe.exec(stripped)) !== null) {
+		const importPath = match[1];
+		const key = `${relFile}:${importPath}`;
+		if (seen.has(key)) continue;
+		seen.add(key);
+		totalImports++;
+		if (!resolveImport(file, importPath)) {
+			console.error(`  ✗ ${relFile}`);
+			console.error(`      imports '${importPath}' → NOT FOUND`);
+			failed++;
+		}
+	}
 }
 
-console.log(`Checked ${totalImports} relative import(s) across ${files.length} file(s).`);
-console.log(failed === 0
-  ? `\nAll imports resolve OK ✓`
-  : `\n${failed} import(s) could not be resolved ✗`);
+console.log(
+	`Checked ${totalImports} relative import(s) across ${files.length} file(s).`,
+);
+console.log(
+	failed === 0
+		? `\nAll imports resolve OK ✓`
+		: `\n${failed} import(s) could not be resolved ✗`,
+);
 
 process.exit(failed > 0 ? 1 : 0);