@carlesandres/house 0.4.4 → 0.4.6

package/src/PromptRow.tsx

@@ -3,9 +3,9 @@
  * the command palette query input.
  *
  * Render-only: the parent owns query state and the focus/editing flag.
- * The `> ` prefix always renders in `textStrong` regardless of state so it
+ * The `> ` prefix renders in `primary` or `secondary` so it
  * reads as chrome, not placeholder text — only the body span shifts color
- * (textStrong while editing, text when applied, textMuted as placeholder).
+ * (primary while editing, text when applied, textMuted as placeholder).
  *
  * Overflow: when editing, an overflowing body anchors its right edge with a
  * leading `…` so the cursor stays on screen; otherwise it anchors the left
@@ -16,7 +16,7 @@ import { colors } from "./theme/colors.ts"
 
 export interface PromptRowProps {
 	readonly query: string
-	/** True while the input is focused — shows a cursor and uses textStrong fg. */
+	/** True while the input is focused — shows a cursor and uses primary fg. */
 	readonly editing: boolean
 	/** Body fallback when !editing && query === "". Pass without the `> ` prefix. */
 	readonly placeholder?: string
@@ -31,7 +31,7 @@ export const PromptRow = ({ query, editing, placeholder = "", width }: PromptRow
 	const bodyBudget = Math.max(1, width - PREFIX.length)
 
 	const rawBody = editing ? `${query}${CURSOR}` : query.length > 0 ? query : placeholder
-	const bodyFg = editing ? colors.textStrong : query.length > 0 ? colors.text : colors.textMuted
+	const bodyFg = editing ? colors.primary : query.length > 0 ? colors.text : colors.textMuted
 
 	const body =
 		rawBody.length <= bodyBudget
@@ -40,9 +40,11 @@ export const PromptRow = ({ query, editing, placeholder = "", width }: PromptRow
 				? "…" + rawBody.slice(rawBody.length - bodyBudget + 1)
 				: rawBody.slice(0, bodyBudget - 1) + "…"
 
+	const prefixFg = editing ? colors.secondary : colors.primary
+
 	return (
 		<text wrapMode="none">
-			<span style={{ fg: colors.textStrong }}>{PREFIX}</span>
+			<span style={{ fg: prefixFg }}>{PREFIX}</span>
 			<span style={{ fg: bodyFg }}>{body}</span>
 		</text>
 	)

package/src/cli/argv.ts

@@ -1,3 +1,4 @@
+import { Command } from "commander"
 import { themeDefinitions } from "../theme/registry.ts"
 
 export interface ParsedArgs {
@@ -29,9 +30,9 @@ export interface ParsedArgs {
 	readonly noUpdateCheck: boolean
 	/** True when `--no-mdx` was passed: exclude `.mdx` files from discovery. */
 	readonly noMdx: boolean
-	/** True when `--start-in-filter` was passed: open the sidebar filter
-	 *  prompt on launch (one-way override; default is off). */
-	readonly startInFilter: boolean
+	/** Value of `--focus <mode>` (`sidebar`, `reader`, `filter`), or null.
+	 *  Validated by the boot layer. */
+	readonly focus: string | null
 	/** Raw value of `--show <list>`, or null if the flag wasn't passed.
 	 *  Comma-separated list of category names; the boot layer validates
 	 *  tokens against the known vocabulary (see `discovery/show.ts`).
@@ -39,6 +40,65 @@ export interface ParsedArgs {
 	readonly show: string | null
 }
 
+const createProgram = () =>
+	new Command()
+		.allowUnknownOption(true)
+		.allowExcessArguments(true)
+		.exitOverride()
+		.helpOption(false)
+		.option("--theme [id]")
+		.option("--tone [mode]")
+		.option("--width [N]")
+		.option("--sort [mode]")
+		.option("--serve")
+		.option("--port [N]")
+		.option("--config-path")
+		.option("--sidebar [mode]")
+		.option("--no-update-check")
+		.option("--no-mdx")
+		.option("--focus [mode]")
+		.option("--show [list]")
+		.option("-h, --help")
+		.option("-v, --version")
+		.argument("[path]")
+
+const VALUE_FLAGS: ReadonlySet<string> = new Set([
+	"--theme",
+	"--tone",
+	"--width",
+	"--sort",
+	"--port",
+	"--sidebar",
+	"--focus",
+	"--show",
+])
+
+const BOOLEAN_FLAGS: ReadonlySet<string> = new Set([
+	"--serve",
+	"--config-path",
+	"--no-update-check",
+	"--no-mdx",
+	"--help",
+	"-h",
+	"--version",
+	"-v",
+])
+
+const findPathArg = (argv: readonly string[]): string | null => {
+	for (let i = 0; i < argv.length; i++) {
+		const arg = argv[i]!
+		if (VALUE_FLAGS.has(arg)) {
+			const next = argv[i + 1]
+			if (next !== undefined && !next.startsWith("-")) i++
+			continue
+		}
+		if (BOOLEAN_FLAGS.has(arg)) continue
+		if (arg.startsWith("-")) continue
+		return arg
+	}
+	return null
+}
+
 /**
  * Minimal argv parser.
  *
@@ -47,110 +107,28 @@ export interface ParsedArgs {
  * without coupling the parser to it.
  */
 export const parseArgv = (argv: readonly string[]): ParsedArgs => {
-	let path: string | null = null
-	let theme: string | null = null
-	let tone: string | null = null
-	let width: string | null = null
-	let sort: string | null = null
-	let serve = false
-	let port: string | null = null
-	let help = false
-	let version = false
-	let configPath = false
-	let sidebar: string | null = null
-	let noUpdateCheck = false
-	let noMdx = false
-	let show: string | null = null
-	let startInFilter = false
-
-	for (let i = 0; i < argv.length; i++) {
-		const arg = argv[i]!
-		switch (arg) {
-			case "--theme":
-				theme = argv[i + 1] ?? null
-				i++
-				continue
-			case "--tone":
-				tone = argv[i + 1] ?? null
-				i++
-				continue
-			case "--width":
-				width = argv[i + 1] ?? null
-				i++
-				continue
-			case "--sort":
-				sort = argv[i + 1] ?? null
-				i++
-				continue
-			case "--serve":
-				serve = true
-				continue
-			case "--port":
-				port = argv[i + 1] ?? null
-				i++
-				continue
-			case "--help":
-			case "-h":
-				help = true
-				continue
-			case "--version":
-			case "-v":
-				version = true
-				continue
-			case "--config-path":
-				configPath = true
-				continue
-			case "--sidebar": {
-				// Don't swallow the following flag as the sidebar value.
-				// `--sidebar --width 80` should leave sidebar=null (the boot
-				// layer reports a missing value) without losing --width.
-				const next = argv[i + 1]
-				if (next !== undefined && !next.startsWith("-")) {
-					sidebar = next
-					i++
-				}
-				continue
-			}
-			case "--no-update-check":
-				noUpdateCheck = true
-				continue
-			case "--no-mdx":
-				noMdx = true
-				continue
-			case "--start-in-filter":
-				startInFilter = true
-				continue
-			case "--show":
-				// Always consume the following arg, even when it looks like
-				// a flag — `--show ""` is meaningful (explicit empty set),
-				// and the empty-string regression matters more than the
-				// near-miss case of someone forgetting the value. Boot
-				// validates tokens.
-				show = argv[i + 1] ?? null
-				i++
-				continue
-		}
-		if (path === null && !arg.startsWith("-")) {
-			path = arg
-		}
-	}
+	const program = createProgram()
+	program.parse([...argv], { from: "user" })
+	const opts = program.opts<Record<string, unknown>>()
+	const pathArg = findPathArg(argv)
+	const stringOrNull = (value: unknown): string | null => (typeof value === "string" ? value : null)
 
 	return {
-		path,
-		theme,
-		tone,
-		width,
-		sort,
-		serve,
-		port,
-		help,
-		version,
-		configPath,
-		sidebar,
-		noUpdateCheck,
-		noMdx,
-		show,
-		startInFilter,
+		path: typeof pathArg === "string" ? pathArg : null,
+		theme: stringOrNull(opts["theme"]),
+		tone: stringOrNull(opts["tone"]),
+		width: stringOrNull(opts["width"]),
+		sort: stringOrNull(opts["sort"]),
+		serve: opts["serve"] === true,
+		port: stringOrNull(opts["port"]),
+		help: opts["help"] === true,
+		version: opts["version"] === true,
+		configPath: opts["configPath"] === true,
+		sidebar: stringOrNull(opts["sidebar"]),
+		noUpdateCheck: opts["noUpdateCheck"] === true,
+		noMdx: opts["mdx"] === false,
+		show: stringOrNull(opts["show"]),
+		focus: stringOrNull(opts["focus"]),
 	}
 }
 
@@ -168,6 +146,7 @@ options:
                    hidden, gitignored. Use --show "" to clear.
   --sort <mode>  sidebar order: dirs-first (default) or files-first
   --sidebar <m>  initial sidebar visibility: auto (default), on, or off
+  --focus <m>    startup focus: sidebar, reader, or filter (default: filter)
   --serve        serve the given file as HTML in the browser (skips TUI)
   --port <N>     port for --serve (default: OS-assigned)
   -h, --help     show this help and exit
@@ -175,10 +154,9 @@ options:
   --config-path  print path to the config file and exit
   --no-update-check  suppress the "newer version available" check (also via NO_UPDATE_NOTIFIER=1)
   --no-mdx       exclude .mdx files from discovery (default: included)
-  --start-in-filter  open the sidebar filter prompt on launch
 
 configuration:
   file: $XDG_CONFIG_HOME/house/config.toml  (default ~/.config/house/config.toml)
-  keys: theme, tone, mdx, show, start_in_filter
-  env:  HOUSE_THEME, HOUSE_TONE, HOUSE_MDX, HOUSE_SHOW, HOUSE_START_IN_FILTER
+  keys: theme, tone, mdx, show, focus
+  env:  HOUSE_THEME, HOUSE_TONE, HOUSE_MDX, HOUSE_SHOW, HOUSE_FOCUS
   precedence (high → low): flags → env → file → defaults`

package/src/config/load.ts

@@ -24,10 +24,9 @@ export interface HouseConfig {
 	 *  `src/discovery/show.ts` for the vocabulary. Empty array (the
 	 *  default) yields the conservative discovery set. */
 	readonly show: readonly ShowCategory[]
-	/** Open the sidebar filter prompt on launch so the user can type
-	 *  immediately. Esc returns to normal focus (no special behavior).
-	 *  Default false. */
-	readonly startInFilter: boolean
+	/** Startup pane/input target. `filter` opens the sidebar filter prompt and
+	 *  focuses it immediately. */
+	readonly focus: "sidebar" | "reader" | "filter"
 }
 
 export interface CliOverrides {
@@ -38,14 +37,14 @@ export interface CliOverrides {
 	 *  (no per-category merging — sets compose by replacement, like every
 	 *  other CLI override here). `--show ""` sets the empty set. */
 	readonly show: readonly ShowCategory[] | null
-	readonly startInFilter: boolean | null
+	readonly focus: "sidebar" | "reader" | "filter" | null
 }
 
 const DEFAULT_THEME = "opencode"
 const DEFAULT_TONE: "dark" | "light" = "dark"
 const DEFAULT_MDX = true
 const DEFAULT_SHOW = ""
-const DEFAULT_START_IN_FILTER = false
+const DEFAULT_FOCUS: "sidebar" | "reader" | "filter" = "filter"
 
 const themeIds = themeDefinitions.map((t) => t.id)
 
@@ -55,13 +54,7 @@ const themeIds = themeDefinitions.map((t) => t.id)
  * Used by `fileProvider` to warn about unrecognized keys (with a
  * did-you-mean hint when one is close) while still loading the rest.
  */
-const KNOWN_FILE_KEYS: ReadonlySet<string> = new Set([
-	"theme",
-	"tone",
-	"mdx",
-	"show",
-	"start_in_filter",
-])
+const KNOWN_FILE_KEYS: ReadonlySet<string> = new Set(["theme", "tone", "mdx", "show", "focus"])
 
 const schema = Config.all({
 	theme: Config.schema(Schema.Literals(themeIds), "theme"),
@@ -75,7 +68,7 @@ const schema = Config.all({
 	// `"hidden,gitignored"`). Token-level validation happens in `loadConfig`
 	// so the error message can list valid categories at the field's path.
 	show: Config.schema(Schema.String, "show"),
-	start_in_filter: Config.schema(Schema.Literals(["true", "false"] as const), "start_in_filter"),
+	focus: Config.schema(Schema.Literals(["sidebar", "reader", "filter"] as const), "focus"),
 })
 
 const defaultsProvider = (): ConfigProvider.ConfigProvider =>
@@ -84,7 +77,7 @@ const defaultsProvider = (): ConfigProvider.ConfigProvider =>
 		tone: DEFAULT_TONE,
 		mdx: String(DEFAULT_MDX),
 		show: DEFAULT_SHOW,
-		start_in_filter: String(DEFAULT_START_IN_FILTER),
+		focus: DEFAULT_FOCUS,
 	})
 
 /**
@@ -201,12 +194,12 @@ const envProvider = (env: Record<string, string | undefined>): ConfigProvider.Co
 	const tone = env["HOUSE_TONE"]
 	const mdx = env["HOUSE_MDX"]
 	const show = env["HOUSE_SHOW"]
-	const startInFilter = env["HOUSE_START_IN_FILTER"]
+	const focus = env["HOUSE_FOCUS"]
 	if (theme !== undefined) entries.push(["theme", theme])
 	if (tone !== undefined) entries.push(["tone", tone])
 	if (mdx !== undefined) entries.push(["mdx", mdx])
 	if (show !== undefined) entries.push(["show", show])
-	if (startInFilter !== undefined) entries.push(["start_in_filter", startInFilter])
+	if (focus !== undefined) entries.push(["focus", focus])
 	return ConfigProvider.fromUnknown(Object.fromEntries(entries))
 }
 
@@ -216,8 +209,7 @@ const cliProvider = (overrides: CliOverrides): ConfigProvider.ConfigProvider =>
 	if (overrides.tone !== null) entries.push(["tone", overrides.tone])
 	if (overrides.mdx !== null) entries.push(["mdx", String(overrides.mdx)])
 	if (overrides.show !== null) entries.push(["show", overrides.show.join(",")])
-	if (overrides.startInFilter !== null)
-		entries.push(["start_in_filter", String(overrides.startInFilter)])
+	if (overrides.focus !== null) entries.push(["focus", overrides.focus])
 	return ConfigProvider.fromUnknown(Object.fromEntries(entries))
 }
 
@@ -260,7 +252,7 @@ export const loadConfig = (
 		tone: null,
 		mdx: null,
 		show: null,
-		startInFilter: null,
+		focus: null,
 	}
 	const onWarning = options.onWarning ?? ((msg) => process.stderr.write(`${msg}\n`))
 	const provider = cliProvider(cli).pipe(
@@ -288,7 +280,7 @@ export const loadConfig = (
 				tone: raw.tone,
 				mdx: raw.mdx === "true",
 				show: parsed.value,
-				startInFilter: raw.start_in_filter === "true",
+				focus: raw.focus,
 			})
 		}),
 	)

package/src/discovery/filter.ts

@@ -1,18 +1,14 @@
 /**
  * Fuzzy filter for the sidebar.
  *
- * Matching: case-insensitive subsequence on `relativePath`. A query "drm"
- * matches "docs/readme.md". Scoring (higher is better):
- *   - +10 for a match at the start of the string or right after `/`
- *     (word boundary — what the user typed lines up with a path segment)
- *   - +5 when the current match is adjacent to the previous one
- *     (consecutive runs read as "drm" matching the literal substring)
- *   - +1 otherwise
+ * Matching stays intentionally small and pure: case-insensitive subsequence on
+ * the filename and full relative path. Ranking prefers what users usually mean
+ * in a sidebar:
+ *   - filename matches above folder-only matches
+ *   - files in the current folder above equally good nested matches
+ *   - shallower paths above deeper ones as a soft tie-break
  *
- * The scorer is intentionally tiny — the only goal is to surface the
- * "obvious" match for short queries against a few hundred paths. A full
- * fzf-style scorer (with bonuses for camelCase, separators, etc.) is
- * deferred until the simple version proves insufficient.
+ * Empty query preserves discovery/tree order.
  */
 
 import type { FileEntry } from "./walk.ts"
@@ -36,6 +32,42 @@ export const fuzzyScore = (query: string, target: string): number | null => {
 	return score
 }
 
+const splitPath = (relativePath: string): { fileName: string; depth: number } => {
+	const slash = relativePath.lastIndexOf("/")
+	return {
+		fileName: slash >= 0 ? relativePath.slice(slash + 1) : relativePath,
+		depth: slash >= 0 ? relativePath.split("/").length - 1 : 0,
+	}
+}
+
+const fileStem = (fileName: string): string => {
+	const dot = fileName.lastIndexOf(".")
+	return dot > 0 ? fileName.slice(0, dot) : fileName
+}
+
+const rankFile = (query: string, file: FileEntry): number | null => {
+	const pathScore = fuzzyScore(query, file.relativePath)
+	if (pathScore === null) return null
+
+	const { fileName, depth } = splitPath(file.relativePath)
+	const q = query.toLowerCase()
+	const name = fileName.toLowerCase()
+	const stem = fileStem(fileName).toLowerCase()
+	const nameScore = fuzzyScore(query, fileName) ?? 0
+
+	let score = pathScore * 10
+	score += nameScore * 100
+
+	if (name === q || stem === q) score += 5_000
+	else if (name.startsWith(q) || stem.startsWith(q)) score += 2_000
+	else if (name.includes(q)) score += 1_000
+
+	if (depth === 0) score += 300
+	score -= depth * 10
+
+	return score
+}
+
 /**
  * Filter and re-rank a file list by a query. Empty query returns the input
  * unchanged (preserves the discovery sort order). Non-empty query keeps
@@ -47,7 +79,7 @@ export const filterFiles = (files: readonly FileEntry[], query: string): readonl
 	const scored: { file: FileEntry; score: number; index: number }[] = []
 	for (let i = 0; i < files.length; i++) {
 		const file = files[i]!
-		const score = fuzzyScore(query, file.relativePath)
+		const score = rankFile(query, file)
 		if (score === null) continue
 		scored.push({ file, score, index: i })
 	}

package/src/index.tsx

@@ -16,7 +16,7 @@ import { RegistryProvider, useAtomSet, useAtomValue } from "@effect/atom-react"
 import { Cause, Duration, Effect, Fiber, Stream } from "effect"
 import { useEffect, useMemo, useRef, useState } from "react"
 import pkg from "../package.json" with { type: "json" }
-import { Browser } from "./Browser.tsx"
+import { Browser, type StartupFocus } from "./Browser.tsx"
 import { parseArgv, usage } from "./cli/argv.ts"
 import { defaultConfigPath, formatConfigError, loadConfig } from "./config/load.ts"
 import { parseShowList, SHOW_CATEGORIES, type ShowCategory } from "./discovery/show.ts"
@@ -69,7 +69,7 @@ interface DiscoverShellProps {
 	readonly mdx: boolean
 	readonly maxWidth: number | null
 	readonly sidebarMode: SidebarMode
-	readonly startInFilter: boolean
+	readonly startupFocus: StartupFocus
 }
 
 const DiscoverShell = ({
@@ -79,7 +79,7 @@ const DiscoverShell = ({
 	mdx,
 	maxWidth,
 	sidebarMode,
-	startInFilter,
+	startupFocus,
 }: DiscoverShellProps) => {
 	const updateNotice = useUpdateNotice()
 	const [show, setShow] = useState<readonly ShowCategory[]>(initialShow)
@@ -134,7 +134,7 @@ const DiscoverShell = ({
 			maxWidth={maxWidth}
 			discoveryStatus={discoveryStatus}
 			sidebarMode={sidebarMode}
-			startInFilter={startInFilter}
+			startupFocus={startupFocus}
 			updateNotice={updateNotice}
 			onToggleAll={() => {
 				// shift+a is the only place the categories are treated as a
@@ -267,15 +267,17 @@ if (import.meta.main) {
 				// `--show` replaces env/file when present (set semantics —
 				// no per-category merge across sources). `null` falls through.
 				show: cliShow,
-				// One-way override: present means "on". Absent → env/file/default.
-				startInFilter: args.startInFilter ? true : null,
+				focus:
+					args.focus === "sidebar" || args.focus === "reader" || args.focus === "filter"
+						? args.focus
+						: null,
 			},
 		}),
 	).catch((err: unknown) => {
 		console.error(`house: ${formatConfigError(err)}`)
 		process.exit(2)
 	})
-	const { theme: themeId, tone, mdx, show, startInFilter } = config
+	const { theme: themeId, tone, mdx, show, focus: startupFocus } = config
 	const themeDef = getThemeDefinition(themeId)
 	if (themeDef === undefined) {
 		// Unreachable: Config.schema validated themeId against themeDefinitions.
@@ -345,6 +347,14 @@ if (import.meta.main) {
 			}
 			sidebarMode = args.sidebar
 		}
+		if (args.focus !== null) {
+			if (args.focus !== "sidebar" && args.focus !== "reader" && args.focus !== "filter") {
+				console.error(
+					`house: --focus must be "sidebar", "reader", or "filter", got "${args.focus}"`,
+				)
+				process.exit(2)
+			}
+		}
 		await runTui({
 			target,
 			themeId,
@@ -354,7 +364,7 @@ if (import.meta.main) {
 			sort,
 			mdx,
 			sidebarMode,
-			startInFilter,
+			startupFocus,
 			updateCheck: !args.noUpdateCheck,
 		})
 	}
@@ -369,7 +379,7 @@ interface TuiBootOptions {
 	readonly sort: SortOrder
 	readonly mdx: boolean
 	readonly sidebarMode: SidebarMode
-	readonly startInFilter: boolean
+	readonly startupFocus: StartupFocus
 	/** Run the npm-registry probe and surface the "update available" notice.
 	 *  False suppresses both the toast and the quit-time print. */
 	readonly updateCheck: boolean
@@ -384,7 +394,7 @@ async function runTui({
 	sort,
 	mdx,
 	sidebarMode,
-	startInFilter,
+	startupFocus,
 	updateCheck,
 }: TuiBootOptions): Promise<void> {
 	let stats: Awaited<ReturnType<typeof stat>>
@@ -426,7 +436,7 @@ async function runTui({
 					mdx={mdx}
 					maxWidth={maxWidth}
 					sidebarMode={sidebarMode}
-					startInFilter={startInFilter}
+					startupFocus={startupFocus}
 				/>
 			</RegistryProvider>,
 		)

package/src/keymap/browser.ts

@@ -20,6 +20,7 @@ export interface BrowserCtx {
 	readonly sidebarShown: boolean
 	readonly helpVisible: boolean
 	readonly filterOpen: boolean
+	readonly restoreFilterOnSidebarFocus: boolean
 	/** Current applied/edited filter query. Used by `filter.clearOrOpen`'s
 	 *  hint gate so the hint only appears when there is something to clear. */
 	readonly filterQuery: string
@@ -87,7 +88,13 @@ export const browserBindings: readonly KeyBinding<BrowserCtx>[] = [
 		description: "Toggle focus (sidebar ↔ reader)",
 		hint: "focus",
 		keys: ["tab"],
-		run: (c) => c.setFocus((f) => (f === "sidebar" ? "reader" : "sidebar")),
+		run: (c) => {
+			if (c.focus === "reader" && c.restoreFilterOnSidebarFocus) {
+				c.openFilter()
+			} else {
+				c.setFocus((f) => (f === "sidebar" ? "reader" : "sidebar"))
+			}
+		},
 	},
 	{
 		id: "sidebar.toggle",

package/src/keymap/displayKey.ts

@@ -0,0 +1,17 @@
+/** Terminal-friendly display form for a binding's first key chord. */
+export const displayKey = (raw: string): string => {
+	switch (raw) {
+		case "return":
+			return "↵"
+		case "escape":
+			return "esc"
+		case "space":
+			return "␣"
+		case "pageup":
+			return "pgup"
+		case "pagedown":
+			return "pgdn"
+		default:
+			return raw
+	}
+}

package/src/keymap/keymap.ts

@@ -62,6 +62,9 @@ const parseChord = (raw: string): ParsedChord => {
 }
 
 const chordMatches = (chord: ParsedChord, key: KeyMatch): boolean => {
+	if (chord.key === "tab" && key.name === "i" && key.ctrl && !key.shift && !key.meta) {
+		return true
+	}
 	if (chord.key !== key.name) return false
 	if (chord.shift !== Boolean(key.shift)) return false
 	if (chord.ctrl !== Boolean(key.ctrl)) return false

package/src/theme/colors.ts

@@ -6,52 +6,20 @@ import type { ColorPalette, ResolvedTheme, ThemeDefinition, Tone } from "./types
  * Adapt a resolved theme (opencode-shaped flat tokens) to the
  * {@link ColorPalette} shape consumed by Browser / HelpOverlay / index.
  *
- * - UI tokens map name-for-name where they overlap.
- * - `surface` ← `backgroundPanel`, `selectedBg` ← `backgroundElement`,
- *   `selectedBgInactive` ← `borderSubtle`.
- * - `textStrong` ← `primary` (opencode's convention for emphasized brand
- *   text in UI chrome). Markdown rendering still reads `markdownStrong`
- *   directly via the syntax map.
+ * - UI tokens map name-for-name with OpenCode's TUI theme semantics.
  * - `syntax` is a fully populated opentui tree-sitter scope map built from
  *   `markdown*` and `syntax*` tokens.
  */
-/** Relative luminance of a `#rrggbb` color (0..1). Sufficient for ordering
- *  two near-neutral chrome colors — not a full WCAG contrast calculation.
- *  Non-hex inputs fall back to 0.5 so the caller's ordering is a no-op. */
-const luminance = (hex: string): number => {
-	const m = /^#([0-9a-fA-F]{6})$/.exec(hex)
-	if (!m) return 0.5
-	const h = m[1]!
-	const r = parseInt(h.slice(0, 2), 16)
-	const g = parseInt(h.slice(2, 4), 16)
-	const b = parseInt(h.slice(4, 6), 16)
-	// Rec. 601 weighting — perceptual ordering, not the linearized WCAG variant.
-	return (0.299 * r + 0.587 * g + 0.114 * b) / 255
-}
-
-/** Pane chrome assumes the active/raised pane sits on the darker of the two
- *  background tokens and the dim chrome on the lighter one. Most themes
- *  define `background` darker than `backgroundPanel` and this is a no-op;
- *  some (e.g. cursor) flip the polarity, in which case we swap so the
- *  active-pane convention stays consistent across themes. */
-const orientChrome = (r: ResolvedTheme): { raised: string; dim: string } => {
-	const bg = r.background
-	const panel = r.backgroundPanel
-	return luminance(bg) <= luminance(panel) ? { raised: bg, dim: panel } : { raised: panel, dim: bg }
-}
-
 const buildPalette = (r: ResolvedTheme): ColorPalette => {
-	const { raised, dim } = orientChrome(r)
 	return {
-		background: raised,
-		surface: dim,
+		background: r.background,
+		backgroundPanel: r.backgroundPanel,
+		backgroundElement: r.backgroundElement,
 		text: r.text,
-		textStrong: r.primary,
 		textMuted: r.textMuted,
 		border: r.border,
 		borderActive: r.borderActive,
-		selectedBg: r.backgroundElement,
-		selectedBgInactive: r.borderSubtle,
+		borderSubtle: r.borderSubtle,
 		selectedListItemText: r.selectedListItemText,
 		primary: r.primary,
 		secondary: r.secondary,