@phi-code-admin/phi-code 0.75.4 → 0.75.6

package/extensions/phi/setup.ts

@@ -40,6 +40,7 @@ import {
 	pingOpenCodeGo,
 	validateOpenCodeGoApiKey,
 } from "./providers/opencode-go.js";
+import { fetchLiveModels, pingProvider, toPersistedModel } from "./providers/live-models.js";
 
 // ─── Types ───────────────────────────────────────────────────────────────
 
@@ -176,22 +177,9 @@ function getProviderCatalog(): ProviderEntry[] {
 // ─── Helpers ─────────────────────────────────────────────────────────────
 
 async function probeLocalProvider(provider: ProviderEntry): Promise<string[]> {
-	if (!provider.probeUrl) return [];
-	const controller = new AbortController();
-	const timeout = setTimeout(() => controller.abort(), 2_500);
-	try {
-		const res = await fetch(provider.probeUrl, {
-			signal: controller.signal,
-			headers: { Authorization: `Bearer ${provider.id === "ollama" ? "ollama" : "lm-studio"}` },
-		});
-		clearTimeout(timeout);
-		if (!res.ok) return [];
-		const data = (await res.json()) as { data?: Array<{ id?: string; name?: string }> };
-		return (data.data ?? []).map((m) => m.id ?? m.name ?? "").filter(Boolean);
-	} catch {
-		clearTimeout(timeout);
-		return [];
-	}
+	if (!provider.local) return [];
+	const result = await fetchLiveModels(provider.id, { forceRefresh: true, timeoutMs: 2_500 });
+	return result.source === "live" ? result.models.map((m) => m.id) : [];
 }
 
 function buildStatusWidget(
@@ -211,8 +199,7 @@ function buildStatusWidget(
 		lines.push(`  ${icon} ${p.displayName}${note}`);
 	}
 	lines.push("");
-	lines.push("Assignments:");
-	lines.push(`  Default chat   : ${assignments.default ?? "(not set)"}`);
+	lines.push("Orchestration roles (used by /plan — NOT chat):");
 	for (const role of ORCHESTRATION_ROLES) {
 		const a = assignments.orchestration[role.key];
 		const preferred = a?.preferred ?? "(not set)";
@@ -220,6 +207,7 @@ function buildStatusWidget(
 		lines.push(`  ${role.label.padEnd(8)} : ${preferred} / ${fallback}`);
 	}
 	lines.push("");
+	lines.push("Chat default model     : controlled via `/model` (this wizard never overrides it)");
 	lines.push(`Keys file : ${store.configPath} (chmod 0600 on Unix)`);
 	return lines;
 }
@@ -442,21 +430,53 @@ async function configureGenericCloud(
 		if (!proceed) return undefined;
 	}
 
+	// Persist the key immediately so a downstream fetch failure cannot lose user input.
 	store.setKey(provider.id, trimmed, {
 		baseUrl: provider.baseUrl,
 		api: provider.api,
-		models: provider.staticModels.map((id) => ({
-			id,
-			name: id,
-			reasoning: true,
-			input: ["text"] as const,
-		})),
 	});
+
+	// Optional ping for early auth diagnostics.
+	ui.setStatus("setup-ping", `Pinging ${provider.displayName}...`);
+	const ping = await pingProvider(provider.id, trimmed, 5_000).catch((err) => ({
+		ok: false,
+		error: err instanceof Error ? err.message : String(err),
+	}));
+	ui.setStatus("setup-ping", undefined);
+	if (ping.ok) {
+		ui.notify(`${provider.displayName} ping OK (200).`, "info");
+	} else {
+		ui.notify(
+			`${provider.displayName} ping failed: ${ping.error ?? "unknown"}. Key saved; you can retry with \`/keys test ${provider.id}\`.`,
+			"warning",
+		);
+	}
+
+	// Live-fetch the model catalog (falls back to the static list when offline).
+	ui.setStatus("setup-fetch", `Fetching ${provider.displayName} model list...`);
+	const live = await fetchLiveModels(provider.id, {
+		apiKey: trimmed,
+		forceRefresh: true,
+		timeoutMs: 6_000,
+	});
+	ui.setStatus("setup-fetch", undefined);
+
+	const models = (live.models.length > 0
+		? live.models
+		: provider.staticModels.map((id) => ({ id, name: id, reasoning: true }))
+	).map(toPersistedModel);
+
+	store.setKey(provider.id, trimmed, {
+		baseUrl: provider.baseUrl,
+		api: provider.api,
+		models,
+	});
+
 	ui.notify(
-		`${provider.displayName} configured: \`${maskKeyForDisplay(trimmed)}\` (${provider.staticModels.length} models)`,
+		`${provider.displayName} configured: \`${maskKeyForDisplay(trimmed)}\` (${models.length} models, source: ${live.source}${live.error ? `, ${live.error}` : ""})`,
 		"info",
 	);
-	return { providerId: provider.id, modelCount: provider.staticModels.length };
+	return { providerId: provider.id, modelCount: models.length };
 }
 
 async function configureLocal(
@@ -517,15 +537,22 @@ async function configureAssignments(
 		return { defaultModel: "default", orchestration: {} };
 	}
 
-	const defaultModel =
-		(await pickModelFromCatalog(ui, "Default chat model (used when no orchestration is active)", allModelIds)) ??
-		allModelIds[0];
+	ui.notify(
+		"Assigning orchestration role models. The chat default is controlled via `/model` — " +
+			"this wizard does NOT change it.",
+		"info",
+	);
+
+	// Sentinel: the orchestrator falls back to the current chat model when a
+	// route doesn't pin a specific one. We never ask the user for a "default"
+	// chat model here — `/model` owns that.
+	const defaultModel = "default";
 
 	const orchestration: Record<string, RouteAssignment> = {};
 	for (const role of ORCHESTRATION_ROLES) {
 		const preferred =
 			(await pickModelFromCatalog(ui, `${role.label} - preferred model (${role.desc})`, allModelIds)) ??
-			defaultModel;
+			allModelIds[0];
 		const fallbackOptions = allModelIds.filter((m) => m !== preferred);
 		const fallback = fallbackOptions.length > 0
 			? (await pickModelFromCatalog(ui, `${role.label} - fallback model`, fallbackOptions)) ?? preferred
@@ -539,7 +566,23 @@ async function configureAssignments(
 
 // ─── Extension ───────────────────────────────────────────────────────────
 
+// One-time global guard so a stray async rejection inside the wizard never kills the TUI.
+let setupUnhandledGuard = false;
+function installSetupUnhandledRejectionGuard(): void {
+	if (setupUnhandledGuard) return;
+	setupUnhandledGuard = true;
+	process.on("unhandledRejection", (reason) => {
+		const message = reason instanceof Error ? reason.message : String(reason);
+		try {
+			process.stderr.write(`[phi-setup] swallowed unhandledRejection: ${message}\n`);
+		} catch {
+			// no-op
+		}
+	});
+}
+
 export default function setupExtension(pi: ExtensionAPI) {
+	installSetupUnhandledRejectionGuard();
 	pi.registerCommand("setup", {
 		description: "Phi Code setup wizard (refonte UX, replaces /phi-init)",
 		handler: async (_args, ctx) => {
@@ -551,10 +594,14 @@ export default function setupExtension(pi: ExtensionAPI) {
 				// empty file or missing, fine
 			}
 
+			try {
 			ui.notify(
 				"**φ Phi Code Setup Wizard**\n\n" +
-					"This wizard configures providers and assigns models to agent roles.\n" +
-					"Keys are stored in `~/.phi/agent/models.json` (chmod 0600 on Unix).\n" +
+					"This wizard configures providers and assigns models to **orchestration roles** " +
+					"(used by `/plan`).\n" +
+					"The **chat default model is controlled via `/model`** and stays sticky across " +
+					"prompts — this wizard will never change it.\n\n" +
+					"Keys are stored in `~/.phi/agent/models.json` (chmod 0600 on Unix). " +
 					"Edit that file directly later to hot-reload (no restart needed).",
 				"info",
 			);
@@ -652,14 +699,21 @@ export default function setupExtension(pi: ExtensionAPI) {
 				const provider = catalog[providerIndex];
 
 				let result: { providerId: string; modelCount: number } | undefined;
-				if (provider.id === "alibaba-codingplan") {
-					result = await configureAlibaba(ui, store);
-				} else if (provider.id === "opencode-go") {
-					result = await configureOpenCodeGo(ui, store);
-				} else if (provider.local) {
-					result = await configureLocal(ui, store, provider);
-				} else {
-					result = await configureGenericCloud(ui, store, provider);
+				try {
+					if (provider.id === "alibaba-codingplan") {
+						result = await configureAlibaba(ui, store);
+					} else if (provider.id === "opencode-go") {
+						result = await configureOpenCodeGo(ui, store);
+					} else if (provider.local) {
+						result = await configureLocal(ui, store, provider);
+					} else {
+						result = await configureGenericCloud(ui, store, provider);
+					}
+				} catch (err) {
+					ui.notify(
+						`Provider configuration failed: ${err instanceof Error ? err.message : String(err)}`,
+						"error",
+					);
 				}
 
 				if (result) refreshAvailable();
@@ -681,12 +735,20 @@ export default function setupExtension(pi: ExtensionAPI) {
 				"**Setup complete.**\n\n" +
 					"Next steps:\n" +
 					"  - `/keys` to list/manage saved keys\n" +
+					"  - `/models refresh` to re-fetch the catalog from each provider's API\n" +
 					"  - `/routing` to inspect routing\n" +
 					"  - `/agents` to list sub-agents\n" +
 					"  - `/skills` to list skills\n" +
 					"  - Edit `~/.phi/agent/models.json` or `routing.json` directly: hot-reload kicks in",
 				"info",
 			);
+			} catch (err) {
+				ui.setWidget("setup-status", undefined);
+				ui.notify(
+					`Setup wizard error: ${err instanceof Error ? err.message : String(err)}`,
+					"error",
+				);
+			}
 		},
 	});
 }

package/extensions/phi/smart-router.ts

@@ -19,6 +19,17 @@ import { homedir } from "node:os";
 
 interface ExtensionConfig {
 	enabled: boolean;
+	/**
+	 * When false (default), the smart router never changes the chat model — it
+	 * only emits an informational notification per prompt. Use `/model` to
+	 * choose the chat model; that choice is now the single source of truth
+	 * and is persisted across sessions via the settings manager.
+	 *
+	 * When true (opt-in via `/routing autoswitch on`), the router switches
+	 * the chat model to the preferred route per prompt, matching the
+	 * pre-0.75.6 behavior.
+	 */
+	autoSwitch: boolean;
 	notifyOnRecommendation: boolean;
 }
 
@@ -31,7 +42,8 @@ export default function smartRouterExtension(pi: ExtensionAPI) {
 	let router = new SmartRouter(SmartRouter.defaultConfig());
 	let extConfig: ExtensionConfig = {
 		enabled: true,
-		notifyOnRecommendation: true,
+		autoSwitch: false,
+		notifyOnRecommendation: false,
 	};
 
 	/**
@@ -95,20 +107,30 @@ export default function smartRouterExtension(pi: ExtensionAPI) {
 
 			const modelToUse = targetModel || fallbackModel;
 
-			if (modelToUse && modelToUse.id !== ctx.model?.id) {
-				// Actually switch the model
+			if (!modelToUse) {
+				if (extConfig.notifyOnRecommendation) {
+					ctx.ui.notify(
+						`Routing suggestion: ${recommendation.category} → \`${recommendation.model}\` (not in registry).`,
+						"info",
+					);
+				}
+			} else if (modelToUse.id === ctx.model?.id) {
+				// Already on the recommended model — nothing to do.
+			} else if (extConfig.autoSwitch) {
+				// Legacy opt-in behavior: actually swap the chat model.
 				const switched = await pi.setModel(modelToUse);
 				if (switched && extConfig.notifyOnRecommendation) {
 					ctx.ui.notify(
-						`🔀 ${recommendation.category} → \`${modelToUse.id}\`${modelToUse.id !== recommendation.model ? ` (fallback)` : ""}`,
-						"info"
+						`Auto-switched (${recommendation.category}) → \`${modelToUse.id}\`${modelToUse.id !== recommendation.model ? " (fallback)" : ""}`,
+						"info",
 					);
 				}
-			} else if (extConfig.notifyOnRecommendation && !modelToUse) {
-				// Model not available — just notify
+			} else if (extConfig.notifyOnRecommendation) {
+				// Default behavior: never override the user's `/model` choice. Just
+				// advertise the suggestion — the chat model stays sticky.
 				ctx.ui.notify(
-					`🔀 ${recommendation.category} → \`${recommendation.model}\` (not available, keeping current)`,
-					"info"
+					`Routing suggestion: ${recommendation.category} → \`${modelToUse.id}\`. Stay on \`${ctx.model?.id}\` (use \`/routing autoswitch on\` to auto-apply, or \`/model\` to change manually).`,
+					"info",
 				);
 			}
 		}
@@ -125,44 +147,66 @@ export default function smartRouterExtension(pi: ExtensionAPI) {
 
 			if (!arg) {
 				const routingConfig = (router as any).config as RoutingConfig;
-				let output = `**🔀 Smart Router** (powered by sigma-agents)\n\n`;
-				output += `Status: ${extConfig.enabled ? "✅ Enabled" : "❌ Disabled"}\n`;
-				output += `Notifications: ${extConfig.notifyOnRecommendation ? "On" : "Off"}\n\n`;
+				let output = `**Smart Router** (powered by sigma-agents)\n\n`;
+				output += `Status:        ${extConfig.enabled ? "enabled" : "disabled"}\n`;
+				output += `Auto-switch:   ${extConfig.autoSwitch ? "on (overrides /model per prompt)" : "off (suggestions only — /model is sticky)"}\n`;
+				output += `Notifications: ${extConfig.notifyOnRecommendation ? "on" : "off"}\n\n`;
 
 				output += `**Routes:**\n`;
 				for (const [cat, route] of Object.entries(routingConfig.routes)) {
 					output += `  **${cat}** → \`${route.preferredModel}\` (fallback: \`${route.fallback}\`) [agent: ${route.agent || "none"}]\n`;
 					output += `    Keywords: ${route.keywords.slice(0, 6).join(", ")}${route.keywords.length > 6 ? "..." : ""}\n`;
 				}
-				output += `\n  **default** → \`${routingConfig.default.model}\`\n`;
+				output += `\n  **default** → \`${routingConfig.default.model}\` (orchestrator fallback only; chat default comes from \`/model\`)\n`;
 
 				output += `\nConfig: \`${configPath}\``;
-				output += `\nCommands: \`/routing enable|disable|notify-on|notify-off|reload|test\``;
+				output += `\nCommands: \`/routing [enable|disable|autoswitch on|autoswitch off|notify-on|notify-off|reload|test]\``;
 
 				ctx.ui.notify(output, "info");
 				return;
 			}
 
+			const tokens = arg.split(/\s+/);
+			const head = tokens[0];
+
+			if (head === "autoswitch") {
+				const flag = tokens[1];
+				if (flag === "on") {
+					extConfig.autoSwitch = true;
+					ctx.ui.notify(
+						"Auto-switch enabled: the smart router will override the chat model per prompt. " +
+							"Disable with `/routing autoswitch off` if it gets in your way.",
+						"info",
+					);
+				} else if (flag === "off") {
+					extConfig.autoSwitch = false;
+					ctx.ui.notify("Auto-switch disabled. The model selected via `/model` is now sticky.", "info");
+				} else {
+					ctx.ui.notify("Usage: `/routing autoswitch on|off`", "warning");
+				}
+				return;
+			}
+
 			switch (arg) {
 				case "enable":
 					extConfig.enabled = true;
-					ctx.ui.notify("✅ Smart routing enabled.", "info");
+					ctx.ui.notify("Smart routing enabled.", "info");
 					break;
 				case "disable":
 					extConfig.enabled = false;
-					ctx.ui.notify("❌ Smart routing disabled.", "info");
+					ctx.ui.notify("Smart routing disabled.", "info");
 					break;
 				case "notify-on":
 					extConfig.notifyOnRecommendation = true;
-					ctx.ui.notify("🔔 Routing notifications enabled.", "info");
+					ctx.ui.notify("Routing notifications enabled.", "info");
 					break;
 				case "notify-off":
 					extConfig.notifyOnRecommendation = false;
-					ctx.ui.notify("🔕 Routing notifications disabled.", "info");
+					ctx.ui.notify("Routing notifications disabled.", "info");
 					break;
 				case "reload":
 					await loadConfig();
-					ctx.ui.notify("🔄 Routing config reloaded from disk.", "info");
+					ctx.ui.notify("Routing config reloaded from disk.", "info");
 					break;
 				case "test": {
 					const tests = [

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@phi-code-admin/phi-code",
-	"version": "0.75.4",
+	"version": "0.75.6",
 	"description": "Coding agent CLI with persistent memory, sub-agents, intelligent routing, and orchestration",
 	"type": "module",
 	"piConfig": {