skydive-cli 0.1.0-beta.239 → 0.1.0-beta.276

package/dist/js/{boot-CIdJ5Als.mjs → boot-FPpnUcyM.mjs}

@@ -1,21 +1,23 @@
 #!/usr/bin/env node
-import { A as getSavedTheme, C as themesForMode, D as DEFAULT_API_URL, E as setActiveWorkspace, M as saveTheme, O as DEFAULT_APP_URL, S as themeVersion, T as listWorkspaces, _ as noColorRequested, a as parseOauthConnectParams, b as themeMode, c as parseConnectCard, d as HttpError, f as createRestClient, g as monoTheme, h as findTheme, i as parseExternalOauthConnectParams, j as resolveWebUrl, k as getConfigPath, l as errorMessage, m as applyTheme, n as MASK_CHAR, o as reconcileMaskedInput, p as DEFAULT_THEME_ID, r as cardActionErrorMessage, s as resolveConnectUrl, t as resolveAgent, u as isRecord, v as theme, w as getActiveWorkspaceId, x as themeModeFromColorFgBg, y as themeForMode } from "./bin.mjs";
+import { A as themesForMode, C as monoTheme, D as themeMode, E as themeForMode, F as DEFAULT_APP_URL, I as getConfigPath, L as getSavedTheme, M as listWorkspaces, N as setActiveWorkspace, O as themeModeFromColorFgBg, P as DEFAULT_API_URL, R as resolveWebUrl, S as findTheme, T as theme, _ as isRecord, b as DEFAULT_THEME_ID, c as resolveAgent, d as parseExternalOauthConnectParams, f as parseOauthConnectParams, g as errorMessage, h as parseConnectCard, j as getActiveWorkspaceId, k as themeVersion, l as MASK_CHAR, m as resolveConnectUrl, p as reconcileMaskedInput, u as cardActionErrorMessage, v as HttpError, w as noColorRequested, x as applyTheme, y as createRestClient, z as saveTheme } from "./bin.mjs";
+import { t as PortalClient } from "./client-_OL8-XGH.mjs";
 import path, { basename, isAbsolute, join, win32 } from "node:path";
 import { z } from "zod";
 import open from "open";
 import { execFile, spawn } from "node:child_process";
 import { createHash } from "node:crypto";
 import { constants } from "node:fs";
+import * as os$1 from "node:os";
+import { homedir, platform, release, tmpdir } from "node:os";
 import { MarkdownRenderable, RenderableEvents, SyntaxStyle, createCliRenderer, decodePasteBytes, detectLinks } from "@opentui/core";
 import { createRoot, extend, useKeyboard, usePaste, useRenderer, useTerminalDimensions } from "@opentui/react";
 import { createContext, useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
 import { create } from "zustand";
 import { WebSocket } from "ws";
-import * as os$1 from "node:os";
-import os, { homedir, platform, release, tmpdir } from "node:os";
 import { createConnection } from "node:net";
 import { access, appendFile, mkdir, mkdtemp, readFile, rm, stat, writeFile } from "node:fs/promises";
 import { Fragment, jsx, jsxs } from "@opentui/react/jsx-runtime";
+import fuzzysort from "fuzzysort";
 import { fileURLToPath } from "node:url";
 import { fileTypeFromBuffer } from "file-type";
 import { structuredPatch } from "diff";
@@ -157,448 +159,6 @@ async function resolveInitialScreen({ rest, agentSelector }) {
 	};
 }
 
-//#endregion
-//#region ../portal-protocol/src/index.ts
-const MAX_WS_FRAME_BYTES = 16 * 1024 * 1024;
-const T_DATA = 1;
-const T_CTRL = 2;
-const STREAM = {
-	stdout: 0,
-	stderr: 1,
-	stdin: 2
-};
-const uuidToBytes = (id) => Buffer.from(id.replace(/-/g, ""), "hex");
-const bytesToUuid = (b) => {
-	const h = b.toString("hex");
-	return `${h.slice(0, 8)}-${h.slice(8, 12)}-${h.slice(12, 16)}-${h.slice(16, 20)}-${h.slice(20, 32)}`;
-};
-function encodeData(id, stream, seq, payload) {
-	const head = Buffer.allocUnsafe(22);
-	head[0] = T_DATA;
-	uuidToBytes(id).copy(head, 1);
-	head[17] = stream;
-	head.writeUInt32BE(seq >>> 0, 18);
-	return Buffer.concat([head, payload]);
-}
-const ctrlMessageSchema = z.discriminatedUnion("t", [
-	z.object({
-		t: z.literal("open"),
-		argv: z.array(z.string()),
-		env: z.record(z.string()).nullable()
-	}),
-	z.object({ t: z.literal("stdin_eof") }),
-	z.object({ t: z.literal("pause") }),
-	z.object({ t: z.literal("resume") }),
-	z.object({ t: z.literal("cancel") }),
-	z.object({
-		t: z.literal("close"),
-		exitCode: z.number()
-	}),
-	z.object({
-		t: z.literal("error"),
-		message: z.string()
-	})
-]);
-function encodeCtrl(id, obj) {
-	const head = Buffer.allocUnsafe(17);
-	head[0] = T_CTRL;
-	uuidToBytes(id).copy(head, 1);
-	return Buffer.concat([head, Buffer.from(JSON.stringify(obj), "utf8")]);
-}
-function decodeFrame(frame) {
-	const id = bytesToUuid(frame.subarray(1, 17));
-	if (frame[0] === T_DATA) return {
-		kind: "data",
-		id,
-		stream: frame[17] ?? 0,
-		seq: frame.readUInt32BE(18),
-		payload: frame.subarray(22)
-	};
-	return {
-		kind: "ctrl",
-		id,
-		obj: ctrlMessageSchema.parse(JSON.parse(frame.subarray(17).toString("utf8")))
-	};
-}
-
-//#endregion
-//#region src/chat/portal/machine.ts
-/**
-* Identity this machine registers under when the CLI shares it via the portal.
-*
-* The `-cli` suffix / `(CLI)` label keep a CLI-shared machine a DISTINCT portal
-* device from the same host's Skydive Desktop app. `portal_device` is unique on
-* (org, user, machineName), and directives route to whichever socket holds the
-* device — if the CLI and desktop registered the same name they'd share a
-* device row and both execute every directive. Distinct names also make the
-* grant UI unambiguous about which surface is being authorized.
-*/
-function machineIdentity() {
-	const host = (os.hostname() || "machine").trim().replace(/\.local$/i, "") || "machine";
-	return {
-		machineName: `${host}-cli`,
-		friendlyName: `${host} (CLI)`
-	};
-}
-const INHERITED_ENV = [
-	"HOME",
-	"USER",
-	"LOGNAME",
-	"SHELL",
-	"LANG",
-	"LC_ALL",
-	"TMPDIR",
-	"TERM",
-	"PATH"
-];
-function buildEnv(extra) {
-	const env = {};
-	for (const key of INHERITED_ENV) {
-		const value = process.env[key];
-		if (value !== void 0) env[key] = value;
-	}
-	if (extra) for (const [key, value] of Object.entries(extra)) env[key] = value;
-	return env;
-}
-/**
-* Build the desktop-portal WebSocket URL from the chat origin. Mirrors the Rust
-* desktop client: http→ws, https→wss, scheme-less defaults to wss, and the
-* machine/label ride as query pairs (percent-encoded by URL).
-*/
-function portalWsUrl(appUrl, machine, label) {
-	const base = appUrl.replace(/\/+$/, "");
-	let wsBase;
-	if (base.startsWith("https://")) wsBase = `wss://${base.slice(8)}`;
-	else if (base.startsWith("http://")) wsBase = `ws://${base.slice(7)}`;
-	else wsBase = `wss://${base}`;
-	const url = new URL(`${wsBase}/api/v1/portal/desktop`);
-	url.searchParams.set("machine", machine);
-	url.searchParams.set("label", label);
-	return url.toString();
-}
-
-//#endregion
-//#region src/chat/portal/exec.ts
-/**
-* Runs portal `exec` directives locally. Each `open` spawns a child process
-* whose stdout/stderr stream back as data frames and whose stdin is fed by
-* inbound data frames, with pause/resume backpressure and cancel/teardown that
-* kill the child. This is the TypeScript counterpart of the desktop's Rust
-* `portal/mod.rs` job machinery, minus the connection supervision (which lives
-* in the client).
-*/
-var JobManager = class {
-	jobs = /* @__PURE__ */ new Map();
-	constructor(opts) {
-		this.opts = opts;
-	}
-	handleFrame(raw) {
-		let decoded;
-		try {
-			decoded = decodeFrame(raw);
-		} catch (_error) {
-			return;
-		}
-		if (decoded.kind === "ctrl") this.handleCtrl(decoded.id, decoded.obj);
-		else if (decoded.stream === STREAM.stdin) this.jobs.get(decoded.id)?.child.stdin.write(decoded.payload);
-	}
-	killAll() {
-		for (const job of this.jobs.values()) {
-			job.settled = true;
-			job.child.kill("SIGKILL");
-		}
-		this.jobs.clear();
-	}
-	handleCtrl(id, msg) {
-		switch (msg.t) {
-			case "open":
-				this.startJob(id, msg.argv, msg.env);
-				return;
-			case "stdin_eof":
-				this.jobs.get(id)?.child.stdin.end();
-				return;
-			case "pause":
-				this.setPaused(id, true);
-				return;
-			case "resume":
-				this.setPaused(id, false);
-				return;
-			case "cancel":
-				this.jobs.get(id)?.child.kill("SIGKILL");
-				return;
-			case "close":
-			case "error": return;
-			default: return msg;
-		}
-	}
-	setPaused(id, paused) {
-		const job = this.jobs.get(id);
-		if (!job) return;
-		if (paused) {
-			job.child.stdout.pause();
-			job.child.stderr.pause();
-		} else {
-			job.child.stdout.resume();
-			job.child.stderr.resume();
-		}
-	}
-	startJob(id, argv, env) {
-		const [program, ...args] = argv;
-		if (!program) {
-			this.opts.send(encodeCtrl(id, {
-				t: "error",
-				message: "empty argv"
-			}));
-			return;
-		}
-		let child;
-		try {
-			child = spawn(program, args, {
-				cwd: this.opts.cwd,
-				env: buildEnv(env),
-				stdio: [
-					"pipe",
-					"pipe",
-					"pipe"
-				]
-			});
-		} catch (err) {
-			this.opts.send(encodeCtrl(id, {
-				t: "error",
-				message: `spawn failed: ${errorMessage(err)}`
-			}));
-			return;
-		}
-		const job = {
-			child,
-			seq: 0,
-			settled: false
-		};
-		this.jobs.set(id, job);
-		child.on("error", (err) => {
-			if (job.settled) return;
-			job.settled = true;
-			this.jobs.delete(id);
-			this.opts.send(encodeCtrl(id, {
-				t: "error",
-				message: `spawn failed: ${errorMessage(err)}`
-			}));
-		});
-		child.stdout.on("data", (chunk) => this.sendData(job, id, STREAM.stdout, chunk));
-		child.stderr.on("data", (chunk) => this.sendData(job, id, STREAM.stderr, chunk));
-		child.on("close", (code) => {
-			if (job.settled) return;
-			job.settled = true;
-			this.jobs.delete(id);
-			this.opts.send(encodeCtrl(id, {
-				t: "close",
-				exitCode: code ?? -1
-			}));
-		});
-	}
-	sendData(job, id, stream, chunk) {
-		if (job.settled) return;
-		this.opts.send(encodeData(id, stream, job.seq, chunk));
-		job.seq = job.seq + 1 >>> 0;
-	}
-};
-
-//#endregion
-//#region src/chat/portal/client.ts
-const deviceTokenSchema = z.object({ token: z.string().min(1) });
-const devicesSchema = z.object({ devices: z.array(z.object({
-	id: z.string(),
-	machineName: z.string(),
-	grantedAgentIds: z.array(z.string())
-})) });
-const INITIAL_BACKOFF_MS = 500;
-const MAX_BACKOFF_MS = 1e4;
-/**
-* Shares the local machine with agents over the portal: dials OUT to the api's
-* desktop-portal WebSocket (authenticating with a short-lived device token
-* minted from the CLI session), then runs inbound `exec` directives via a
-* `JobManager`. Reconnects with backoff while enabled; disabling drops presence
-* and kills any in-flight children. No inbound port is ever opened.
-*
-* Access stays default-deny: connecting only makes the machine reachable — an
-* agent can't run anything until the user grants it (`grantAgent`).
-*/
-var PortalClient = class {
-	enabled = false;
-	disposed = false;
-	ws = null;
-	jobs = null;
-	status = "off";
-	error = null;
-	deviceId = null;
-	granted = /* @__PURE__ */ new Set();
-	machineName;
-	friendlyName;
-	constructor(opts) {
-		this.opts = opts;
-		const identity = machineIdentity();
-		this.machineName = identity.machineName;
-		this.friendlyName = identity.friendlyName;
-	}
-	isEnabled() {
-		return this.enabled;
-	}
-	isGranted(agentId) {
-		return this.granted.has(agentId);
-	}
-	enable() {
-		if (this.enabled || this.disposed) return;
-		this.enabled = true;
-		this.error = null;
-		this.connectLoop();
-	}
-	disable() {
-		if (!this.enabled) return;
-		this.enabled = false;
-		this.jobs?.killAll();
-		this.ws?.close();
-		this.ws = null;
-		this.deviceId = null;
-		this.granted = /* @__PURE__ */ new Set();
-		this.setStatus("off");
-	}
-	/**
-	* Tear down for good (app quit). Kills children synchronously and closes the
-	* socket so it stops holding the event loop open — otherwise the process
-	* would hang after the TUI is destroyed.
-	*/
-	dispose() {
-		this.disposed = true;
-		this.enabled = false;
-		this.jobs?.killAll();
-		this.jobs = null;
-		this.ws?.close();
-		this.ws = null;
-	}
-	/** Grant one agent access to this machine (default-deny; user-initiated). */
-	async grantAgent(agentId) {
-		const deviceId = await this.ensureDeviceId();
-		const res = await this.fetchJson(`/api/v1/portal/devices/${encodeURIComponent(deviceId)}/grants`, {
-			method: "POST",
-			body: JSON.stringify({ agentId })
-		});
-		if (!res.ok) throw new Error(`grant failed (${res.status}): ${await shortBody(res)}`);
-		this.granted.add(agentId);
-		this.emit();
-	}
-	setStatus(status, error = null) {
-		this.status = status;
-		this.error = error;
-		this.emit();
-	}
-	emit() {
-		this.opts.onState({
-			status: this.status,
-			machineName: this.machineName,
-			friendlyName: this.friendlyName,
-			error: this.error,
-			grantedAgentIds: [...this.granted]
-		});
-	}
-	async connectLoop() {
-		let backoff = INITIAL_BACKOFF_MS;
-		while (this.enabled && !this.disposed) {
-			this.setStatus("connecting");
-			try {
-				const token = await this.mintDeviceToken();
-				await this.runConnection(token);
-				backoff = INITIAL_BACKOFF_MS;
-			} catch (err) {
-				if (!this.enabled || this.disposed) break;
-				this.setStatus("error", errorMessage(err));
-			}
-			if (!this.enabled || this.disposed) break;
-			await sleep(backoff);
-			backoff = Math.min(backoff * 2, MAX_BACKOFF_MS);
-		}
-	}
-	runConnection(token) {
-		return new Promise((resolve) => {
-			const ws = new WebSocket(portalWsUrl(this.opts.appUrl, this.machineName, this.friendlyName), {
-				headers: { authorization: `Bearer ${token}` },
-				maxPayload: MAX_WS_FRAME_BYTES
-			});
-			this.ws = ws;
-			const jobs = new JobManager({
-				cwd: this.opts.cwd,
-				send: (frame) => {
-					if (ws.readyState === WebSocket.OPEN) ws.send(frame);
-				}
-			});
-			this.jobs = jobs;
-			ws.on("open", () => {
-				this.setStatus("connected");
-				this.refreshDevice();
-			});
-			ws.on("message", (data, isBinary) => {
-				if (isBinary) jobs.handleFrame(toBuffer$1(data));
-			});
-			ws.on("error", (err) => {
-				this.error = errorMessage(err);
-			});
-			ws.on("close", () => {
-				jobs.killAll();
-				if (this.jobs === jobs) this.jobs = null;
-				if (this.ws === ws) this.ws = null;
-				resolve();
-			});
-		});
-	}
-	async mintDeviceToken() {
-		const res = await this.fetchJson("/api/v1/portal/device-token", { method: "POST" });
-		if (!res.ok) throw new Error(`device-token failed (${res.status}): ${await shortBody(res)}`);
-		return deviceTokenSchema.parse(await res.json()).token;
-	}
-	async ensureDeviceId() {
-		if (this.deviceId) return this.deviceId;
-		for (let attempt = 0; attempt < 10; attempt += 1) {
-			await this.refreshDevice();
-			if (this.deviceId) return this.deviceId;
-			await sleep(300);
-		}
-		throw new Error("this machine is not connected yet");
-	}
-	async refreshDevice() {
-		try {
-			const res = await this.fetchJson("/api/v1/portal/devices", { method: "GET" });
-			if (!res.ok) return;
-			const { devices } = devicesSchema.parse(await res.json());
-			const mine = devices.find((device) => device.machineName === this.machineName);
-			if (!mine) return;
-			this.deviceId = mine.id;
-			this.granted = new Set(mine.grantedAgentIds);
-			this.emit();
-		} catch (_error) {}
-	}
-	fetchJson(path, init) {
-		return fetch(`${this.opts.appUrl}${path}`, {
-			method: init.method,
-			headers: {
-				authorization: `Bearer ${this.opts.sessionToken}`,
-				accept: "application/json",
-				...init.body ? { "content-type": "application/json" } : {}
-			},
-			...init.body ? { body: init.body } : {}
-		});
-	}
-};
-function toBuffer$1(data) {
-	if (Buffer.isBuffer(data)) return data;
-	if (Array.isArray(data)) return Buffer.concat(data);
-	return Buffer.from(data);
-}
-function shortBody(res) {
-	return res.text().then((text) => text.slice(0, 120)).catch(() => "");
-}
-function sleep(ms) {
-	return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
 //#endregion
 //#region src/chat/portal/use-portal.ts
 /**
@@ -1240,6 +800,68 @@ function windowStart(highlight, total, visible) {
 	return Math.max(0, Math.min(desired, total - visible));
 }
 
+//#endregion
+//#region src/chat/tui/fuzzy.ts
+/**
+* Rank `items` against `query` across multiple keys with fuzzysort — the
+* OpenCode pattern. An empty/whitespace query returns everything in the
+* caller's original order (fuzzysort has nothing to rank); otherwise items
+* where no key matches are dropped and the rest come back best-first.
+*/
+function fuzzyFilter(query, items, keys) {
+	const needle = query.trim();
+	if (!needle) return items.map((item) => ({
+		item,
+		highlights: keys.map(() => null)
+	}));
+	return fuzzysort.go(needle, items, { keys: [...keys] }).map((result) => ({
+		item: result.obj,
+		highlights: keys.map((_key, i) => {
+			const indexes = result[i]?.indexes;
+			return indexes !== void 0 && indexes.length > 0 ? indexes : null;
+		})
+	}));
+}
+/**
+* Split `text` into contiguous segments for rendering, marking the ones
+* covered by `indexes` (matched characters) so the view can color them.
+* Null/absent indexes yield a single unmatched segment.
+*/
+function highlightSegments(text, indexes) {
+	if (!text) return [];
+	if (!indexes || indexes.length === 0) return [{
+		text,
+		matched: false
+	}];
+	const matched = new Set(indexes);
+	const segments = [];
+	for (let i = 0; i < text.length; i++) {
+		const isMatch = matched.has(i);
+		const last = segments.at(-1);
+		if (last && last.matched === isMatch) last.text += text[i];
+		else segments.push({
+			text: text[i] ?? "",
+			matched: isMatch
+		});
+	}
+	return segments;
+}
+
+//#endregion
+//#region src/chat/tui/fuzzy-text.tsx
+/**
+* Inline text with fuzzy-matched characters colored. Renders as spans, so it
+* must sit inside a <text>. `fg` styles the unmatched characters (defaults to
+* inheriting from the enclosing <text>); matches are always warning-colored,
+* which reads on both the plain and the selected (accent) row.
+*/
+function FuzzyText({ text, indexes, fg }) {
+	return /* @__PURE__ */ jsx(Fragment, { children: highlightSegments(text, indexes).map((segment, i) => /* @__PURE__ */ jsx("span", {
+		fg: segment.matched ? theme.warning : fg,
+		children: segment.text
+	}, i)) });
+}
+
 //#endregion
 //#region src/chat/tui/screens/agent-picker.tsx
 function AgentPickerScreen() {
@@ -1332,12 +954,12 @@ function FilterableAgentList({ agents, scope, onPick }) {
 	useEffect(() => {
 		setHighlight(0);
 	}, [scope]);
-	const q = query.trim().toLowerCase();
-	const filtered = q ? agents.filter((a) => agentHaystack(a).includes(q)) : agents;
+	const hits = fuzzyFilter(query, agents, agentKeys);
+	const filtered = hits.map((h) => h.item);
 	const clamped = Math.min(highlight, Math.max(0, filtered.length - 1));
 	const visibleRows = Math.max(3, height - 6);
 	const start = windowStart(clamped, filtered.length, visibleRows);
-	const windowed = filtered.slice(start, start + visibleRows);
+	const windowed = hits.slice(start, start + visibleRows);
 	useKeyboard((key) => {
 		if (key.name === "up") setHighlight(Math.max(0, clamped - 1));
 		else if (key.name === "down") setHighlight(Math.min(Math.max(0, filtered.length - 1), clamped + 1));
@@ -1399,28 +1021,33 @@ function FilterableAgentList({ agents, scope, onPick }) {
 						query,
 						"”"
 					]
-				}) : windowed.map((a, i) => {
+				}) : windowed.map((hit, i) => {
+					const a = hit.item;
 					const selected = start + i === clamped;
 					return /* @__PURE__ */ jsxs("text", {
 						fg: selected ? theme.accent : theme.fg,
-						children: [selected ? "› " : "  ", agentLabel(a)]
+						children: [
+							selected ? "› " : "  ",
+							/* @__PURE__ */ jsx(FuzzyText, {
+								text: a.name,
+								indexes: hit.highlights[0]
+							}),
+							a.slug ? /* @__PURE__ */ jsxs(Fragment, { children: ["  @", /* @__PURE__ */ jsx(FuzzyText, {
+								text: a.slug,
+								indexes: hit.highlights[1]
+							})] }) : null
+						]
 					}, a.id);
 				})
 			})
 		]
 	});
 }
-function agentHaystack(a) {
-	return [
-		a.name,
-		a.slug ?? "",
-		a.title ?? ""
-	].join(" ").toLowerCase();
-}
-function agentLabel(a) {
-	if (a.slug) return `${a.name}  @${a.slug}`;
-	return a.name;
-}
+const agentKeys = [
+	(a) => a.name,
+	(a) => a.slug ?? "",
+	(a) => a.title ?? ""
+];
 
 //#endregion
 //#region src/chat/tui/agent-name.ts
@@ -1755,11 +1382,10 @@ function ConversationList({ agent, conversations, onPick }) {
 	const [list, setList] = useState(conversations);
 	const [confirmId, setConfirmId] = useState(null);
 	const [error, setError] = useState(null);
-	const q = query.trim().toLowerCase();
-	const filtered = q ? list.filter((c) => conversationHaystack(c).includes(q)) : list;
-	const rows = [{ kind: "new" }, ...filtered.map((conv) => ({
+	const hits = fuzzyFilter(query, list, conversationKeys);
+	const rows = [{ kind: "new" }, ...hits.map((hit) => ({
 		kind: "conv",
-		conv
+		hit
 	}))];
 	const clamped = Math.min(highlight, Math.max(0, rows.length - 1));
 	const visibleRows = Math.max(3, height - 6);
@@ -1777,7 +1403,7 @@ function ConversationList({ agent, conversations, onPick }) {
 		else onPick({
 			kind: "chat",
 			agent,
-			conversation: row.conv
+			conversation: row.hit.item
 		});
 	};
 	const deleteConversation = (id) => {
@@ -1804,7 +1430,7 @@ function ConversationList({ agent, conversations, onPick }) {
 			const row = rows[clamped];
 			if (row?.kind === "conv") {
 				setError(null);
-				setConfirmId(row.conv.id);
+				setConfirmId(row.hit.item.id);
 			}
 		} else if (key.name === "return") {
 			const row = rows[clamped];
@@ -1849,7 +1475,7 @@ function ConversationList({ agent, conversations, onPick }) {
 			}) : /* @__PURE__ */ jsxs("text", {
 				fg: theme.dim,
 				children: [
-					filtered.length,
+					hits.length,
 					"/",
 					list.length,
 					" · ↑/↓ move · ↵ open · ctrl+d delete · esc back"
@@ -1871,21 +1497,22 @@ function ConversationList({ agent, conversations, onPick }) {
 						fg,
 						children: [
 							selected ? "› " : "  ",
-							row.conv.title ?? "(untitled)",
+							/* @__PURE__ */ jsx(FuzzyText, {
+								text: row.hit.item.title ?? "(untitled)",
+								indexes: row.hit.item.title ? row.hit.highlights[0] : null
+							}),
 							/* @__PURE__ */ jsxs("span", {
 								fg: theme.dim,
-								children: [" ", previewLine(row.conv)]
+								children: [" ", previewLine(row.hit.item)]
 							})
 						]
-					}, row.conv.id);
+					}, row.hit.item.id);
 				})
 			})
 		]
 	});
 }
-function conversationHaystack(c) {
-	return [c.title ?? "", c.preview ?? ""].join(" ").toLowerCase();
-}
+const conversationKeys = [(c) => c.title ?? "", (c) => c.preview ?? ""];
 function previewLine(c) {
 	const when = relativeTime(c.updatedAt);
 	const prefix = c.preview ? c.preview.replace(/\s+/g, " ").trim() : "";
@@ -4311,12 +3938,12 @@ function FilterableModelList({ models, currentModel, modelLocked, agentId, onSel
 	const [saving, setSaving] = useState(false);
 	const [saveError, setSaveError] = useState(null);
 	const rest = useStore((s) => s.rest);
-	const q = query.trim().toLowerCase();
-	const filtered = q ? models.filter((m) => modelHaystack(m).includes(q)) : models;
+	const hits = fuzzyFilter(query, models, modelKeys);
+	const filtered = hits.map((h) => h.item);
 	const clamped = Math.min(highlight, Math.max(0, filtered.length - 1));
 	const visibleRows = Math.max(3, height - 8);
 	const start = windowStart(clamped, filtered.length, visibleRows);
-	const windowed = filtered.slice(start, start + visibleRows);
+	const windowed = hits.slice(start, start + visibleRows);
 	async function select(model) {
 		if (!rest || saving) return;
 		if (model.id === currentModel) {
@@ -4395,7 +4022,8 @@ function FilterableModelList({ models, currentModel, modelLocked, agentId, onSel
 						query,
 						"”"
 					]
-				}) : windowed.map((m, i) => {
+				}) : windowed.map((hit, i) => {
+					const m = hit.item;
 					const selected = start + i === clamped;
 					const isCurrent = m.id === currentModel;
 					return /* @__PURE__ */ jsxs("text", {
@@ -4403,7 +4031,19 @@ function FilterableModelList({ models, currentModel, modelLocked, agentId, onSel
 						children: [
 							selected ? "› " : "  ",
 							isCurrent ? "● " : "  ",
-							modelLabel(m)
+							m.providerDisplay ? /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx(FuzzyText, {
+								text: m.providerDisplay,
+								indexes: hit.highlights[1]
+							}), " · "] }) : null,
+							/* @__PURE__ */ jsx(FuzzyText, {
+								text: m.displayName,
+								indexes: hit.highlights[0]
+							}),
+							"  ",
+							/* @__PURE__ */ jsx(FuzzyText, {
+								text: m.id,
+								indexes: hit.highlights[2]
+							})
 						]
 					}, m.id);
 				})
@@ -4415,16 +4055,11 @@ function FilterableModelList({ models, currentModel, modelLocked, agentId, onSel
 		]
 	});
 }
-function modelHaystack(m) {
-	return [
-		m.displayName,
-		m.providerDisplay ?? "",
-		m.id
-	].join(" ").toLowerCase();
-}
-function modelLabel(m) {
-	return `${m.providerDisplay ? `${m.providerDisplay} · ` : ""}${m.displayName}  ${m.id}`;
-}
+const modelKeys = [
+	(m) => m.displayName,
+	(m) => m.providerDisplay ?? "",
+	(m) => m.id
+];
 /**
 * The REST error routes return `{ "error": "message" }`. Pull that out for a
 * human-readable status line; fall back to the raw body on anything else.