@carlesandres/house 0.4.6 → 0.4.8

package/src/commands/buildCommands.ts

@@ -2,9 +2,8 @@
  * Derive palette commands from `browserBindings` plus the annotation map.
  *
  * The annotation map is the *only* hand-written list keyed by binding id:
- * it carries (a) hide flags for bindings that are pure keystroke nav, and
- * (b) title rewrites for bindings whose `description` reads as a help-row
- * entry rather than a palette command. Every other binding is exposed
+ * it carries title rewrites and metadata for bindings whose raw
+ * `description` reads awkwardly as a palette command. Every enabled binding is exposed
  * verbatim — its `description` becomes the palette `title`, its first key
  * becomes the `shortcut`.
  *
@@ -30,49 +29,40 @@ interface Annotation {
 }
 
 /**
- * Pure-keystroke nav (j/k/space/b/[/]…) is intentionally hidden — those
- * bindings have no command-shaped meaning. Reader prev/next file (`[`/`]`)
- * and sidebar `open` (Return/l) are the borderline cases from #70 Q6a;
- * hidden in v1, reconsider if users ask. Title rewrites convert
- * help-overlay phrasing ("Toggle sidebar visibility") into imperative
- * palette phrasing ("Toggle sidebar"). See #70 design log §6.
+ * Title rewrites convert keymap phrasing into imperative palette phrasing.
+ * With the help overlay removed (#139), the palette is the only in-app full
+ * action index, so all currently-enabled actions stay discoverable here.
  */
 const annotations: Record<string, Annotation> = {
 	// --- Keep, with title rewrites where the binding description reads awkwardly as a command ---
 	quit: { category: "App" },
 	"focus.toggle": { title: "Toggle focus", category: "View" },
 	"sidebar.toggle": { title: "Toggle sidebar", category: "View" },
-	"help.toggle": { title: "Show help", category: "App" },
+	"sidebar.down": { category: "Navigation" },
+	"sidebar.up": { category: "Navigation" },
+	"sidebar.jumpDown": { category: "Navigation" },
+	"sidebar.jumpUp": { category: "Navigation" },
+	"sidebar.pageDown": { category: "Navigation" },
+	"sidebar.pageUp": { category: "Navigation" },
+	"sidebar.top": { category: "Navigation" },
+	"sidebar.bottom": { category: "Navigation" },
+	"sidebar.open": { title: "Open file", category: "Navigation" },
 	"filter.open": { title: "Filter files…", category: "Navigation" },
+	"filter.clearOrOpen": { category: "Navigation" },
 	"discovery.toggleAll": {
 		title: "Toggle hidden / gitignored files",
 		category: "Navigation",
 		keywords: ["hidden", "gitignore", "dotfiles", "all"],
 	},
+	"reader.back": { title: "Back to sidebar", category: "Navigation" },
+	"reader.prevFile": { title: "Previous file", category: "Navigation" },
+	"reader.nextFile": { title: "Next file", category: "Navigation" },
 	"serve.current": { title: "Open in browser", category: "File" },
 	"file.edit": { title: "Open in editor", category: "File", keywords: ["editor", "vim", "vscode"] },
 	"theme.next": { category: "Appearance" },
 	"theme.prev": { category: "Appearance" },
 	"theme.toneToggle": { title: "Toggle dark/light tone", category: "Appearance" },
 
-	// --- Hide: pure keystroke navigation (j/k/space/b/g/G…) ---
-	"sidebar.down": { hidden: true },
-	"sidebar.up": { hidden: true },
-	"sidebar.jumpDown": { hidden: true },
-	"sidebar.jumpUp": { hidden: true },
-	"sidebar.pageDown": { hidden: true },
-	"sidebar.pageUp": { hidden: true },
-	"sidebar.top": { hidden: true },
-	"sidebar.bottom": { hidden: true },
-
-	// --- Hide: borderline reader nav. `[`/`]` and Return-to-open feel command-shaped
-	//     but are pure keystroke navigation under the hood. #70 Q6a — reconsider
-	//     if user feedback expects them in the palette.
-	"sidebar.open": { hidden: true },
-	"reader.back": { hidden: true },
-	"reader.prevFile": { hidden: true },
-	"reader.nextFile": { hidden: true },
-
 	// --- Hide: the palette opener itself shouldn't appear in the palette ---
 	"palette.open": { hidden: true },
 }
@@ -80,8 +70,8 @@ const annotations: Record<string, Annotation> = {
 /**
  * Build the AppCommand list for a given render. Iterates `browserBindings`
  * in array order (the empty-query palette renders in this order, by design
- * — see #70 design log §empty-state ordering), drops hidden entries and
- * those whose `when` predicate currently returns false, and resolves
+ * — see #70 design log §empty-state ordering), drops explicitly-hidden entries
+ * and those whose `when` predicate currently returns false, and resolves
  * annotations to populate title / category / keywords.
  */
 export const buildCommands = (ctx: BrowserCtx): readonly AppCommand[] => {
@@ -89,9 +79,8 @@ export const buildCommands = (ctx: BrowserCtx): readonly AppCommand[] => {
 	for (const binding of browserBindings) {
 		const ann = annotations[binding.id]
 		if (ann?.hidden) continue
-		// Same gating the keymap dispatcher uses. Disabled bindings get
-		// hidden from the palette (per #70 Q5b — see #96 for the show-with-
-		// reason follow-up after the atom-driven migration).
+		// Same gating the keymap dispatcher uses. Disabled bindings stay out of
+		// the palette; #96 tracks a future show-with-reason mode.
 		if (binding.when && !binding.when(ctx)) continue
 		const cmd: AppCommand = {
 			id: binding.id,

package/src/commands/score.ts

@@ -34,7 +34,7 @@ const fuzzyIncludes = (text: string, query: string): boolean => {
 
 const searchText = (command: AppCommand): string =>
 	normalize(
-		[command.title, command.category, command.shortcut, ...(command.keywords ?? [])]
+		[command.title, command.category, ...(command.keywords ?? [])]
 			.filter((s): s is string => Boolean(s))
 			.join(" "),
 	)

package/src/config/load.ts

@@ -20,6 +20,8 @@ export interface HouseConfig {
 	readonly theme: string
 	readonly tone: "dark" | "light"
 	readonly mdx: boolean
+	/** Default discovery-root strategy when no explicit `--root` flag is passed. */
+	readonly defaultRoot: "cwd" | "git"
 	/** Categories of normally-skipped entries to opt into. See
 	 *  `src/discovery/show.ts` for the vocabulary. Empty array (the
 	 *  default) yields the conservative discovery set. */
@@ -43,6 +45,7 @@ export interface CliOverrides {
 const DEFAULT_THEME = "opencode"
 const DEFAULT_TONE: "dark" | "light" = "dark"
 const DEFAULT_MDX = true
+const DEFAULT_ROOT: "cwd" | "git" = "cwd"
 const DEFAULT_SHOW = ""
 const DEFAULT_FOCUS: "sidebar" | "reader" | "filter" = "filter"
 
@@ -54,11 +57,19 @@ 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", "focus"])
+const KNOWN_FILE_KEYS: ReadonlySet<string> = new Set([
+	"theme",
+	"tone",
+	"mdx",
+	"show",
+	"focus",
+	"defaultRoot",
+])
 
 const schema = Config.all({
 	theme: Config.schema(Schema.Literals(themeIds), "theme"),
 	tone: Config.schema(Schema.Literals(["dark", "light"] as const), "tone"),
+	defaultRoot: Config.schema(Schema.String, "defaultRoot"),
 	// Boolean stored as string literal because providers stringify values
 	// (TOML bools, env vars, CLI flags all flow through as text). Mapped to
 	// a real boolean in `loadConfig` below.
@@ -75,6 +86,7 @@ const defaultsProvider = (): ConfigProvider.ConfigProvider =>
 	ConfigProvider.fromUnknown({
 		theme: DEFAULT_THEME,
 		tone: DEFAULT_TONE,
+		defaultRoot: DEFAULT_ROOT,
 		mdx: String(DEFAULT_MDX),
 		show: DEFAULT_SHOW,
 		focus: DEFAULT_FOCUS,
@@ -192,11 +204,13 @@ const envProvider = (env: Record<string, string | undefined>): ConfigProvider.Co
 	const entries: Array<[string, string]> = []
 	const theme = env["HOUSE_THEME"]
 	const tone = env["HOUSE_TONE"]
+	const defaultRoot = env["HOUSE_DEFAULT_ROOT"]
 	const mdx = env["HOUSE_MDX"]
 	const show = env["HOUSE_SHOW"]
 	const focus = env["HOUSE_FOCUS"]
 	if (theme !== undefined) entries.push(["theme", theme])
 	if (tone !== undefined) entries.push(["tone", tone])
+	if (defaultRoot !== undefined) entries.push(["defaultRoot", defaultRoot])
 	if (mdx !== undefined) entries.push(["mdx", mdx])
 	if (show !== undefined) entries.push(["show", show])
 	if (focus !== undefined) entries.push(["focus", focus])
@@ -262,6 +276,13 @@ export const loadConfig = (
 	)
 	return schema.parse(provider).pipe(
 		Effect.flatMap((raw) => {
+			const defaultRoot =
+				raw.defaultRoot === "cwd" || raw.defaultRoot === "git" ? raw.defaultRoot : DEFAULT_ROOT
+			if (raw.defaultRoot !== defaultRoot) {
+				onWarning(
+					`house: ignoring invalid value ${JSON.stringify(raw.defaultRoot)} for defaultRoot in config/env; using "${DEFAULT_ROOT}"`,
+				)
+			}
 			const parsed = parseShowList(raw.show)
 			if (!parsed.ok) {
 				// Effect's `Config.ConfigError` requires a `SchemaError` or
@@ -278,6 +299,7 @@ export const loadConfig = (
 			return Effect.succeed({
 				theme: raw.theme,
 				tone: raw.tone,
+				defaultRoot,
 				mdx: raw.mdx === "true",
 				show: parsed.value,
 				focus: raw.focus,

package/src/discovery/walk.ts

@@ -13,6 +13,11 @@ export interface FileEntry {
 	readonly name: string
 }
 
+export interface DiscoveryWarning {
+	readonly path: string
+	readonly cause: unknown
+}
+
 export type SortOrder = "dirs-first" | "files-first"
 
 export interface WalkOptions {
@@ -25,6 +30,8 @@ export interface WalkOptions {
 	readonly sort?: SortOrder
 	/** Include `.mdx` files alongside `.md`/`.markdown`. Default `true`. */
 	readonly mdx?: boolean
+	/** Non-fatal subtree read errors. Root-level failures still error the walk. */
+	readonly onWarning?: ((warning: DiscoveryWarning) => void) | null
 }
 
 export class DiscoveryError extends Data.TaggedError("DiscoveryError")<{
@@ -93,9 +100,11 @@ async function* walkDirGen(
 	rootPath: string,
 	parentLevels: readonly IgnoreLevel[],
 	opts: { showHidden: boolean; showGitignored: boolean; sort: SortOrder; mdx: boolean },
+	onWarning: ((warning: DiscoveryWarning) => void) | null,
 	signal: AbortSignal,
 ): AsyncGenerator<FileEntry, void, void> {
 	if (signal.aborted) return
+	const isRoot = dirPath === rootPath
 
 	let levels = parentLevels
 	if (!opts.showGitignored) {
@@ -104,7 +113,14 @@ async function* walkDirGen(
 		if (ig) levels = [...parentLevels, { dir: dirPath, ig }]
 	}
 
-	const raw = await readdir(dirPath, { withFileTypes: true })
+	let raw
+	try {
+		raw = await readdir(dirPath, { withFileTypes: true })
+	} catch (error) {
+		if (isRoot) throw error
+		onWarning?.({ path: dirPath, cause: error })
+		return
+	}
 	if (signal.aborted) return
 
 	for (const entry of sortEntries(raw, opts.sort)) {
@@ -120,7 +136,7 @@ async function* walkDirGen(
 			if (HARD_SKIP_DIRS.has(entry.name)) continue
 			if (!opts.showHidden && entry.name.startsWith(".")) continue
 			if (!opts.showGitignored && isIgnored(entryPath, true, levels)) continue
-			yield* walkDirGen(entryPath, rootPath, levels, opts, signal)
+			yield* walkDirGen(entryPath, rootPath, levels, opts, onWarning, signal)
 			continue
 		}
 
@@ -165,10 +181,11 @@ export const walk = (
 		sort: options.sort ?? ("dirs-first" as SortOrder),
 		mdx: options.mdx ?? true,
 	}
+	const onWarning = options.onWarning ?? null
 	const controller = new AbortController()
 	const iterable: AsyncIterable<FileEntry> = {
 		[Symbol.asyncIterator]() {
-			const gen = walkDirGen(absRoot, absRoot, [], opts, controller.signal)
+			const gen = walkDirGen(absRoot, absRoot, [], opts, onWarning, controller.signal)
 			return {
 				next: () => gen.next(),
 				return: async (value?: void) => {