@carlesandres/house 0.4.12 → 0.4.14

package/CHANGELOG.md

@@ -6,6 +6,28 @@ The publish workflow (`.github/workflows/publish.yml`) runs on the `release: pub
 
 ## [Unreleased]
 
+## [0.4.14] — 2026-06-15
+
+### Added
+
+- Browser header now shows the active discovery root, and empty states reuse the same canonical root label for consistent launch context.
+
+## [0.4.13] — 2026-06-15
+
+### Added
+
+- Command palette now includes a `Copy file contents` action for the selected markdown file, copying the exact on-disk text to the system clipboard on macOS and Linux.
+
+### Changed
+
+- Reader wrapping is now a session mode toggled with `w`: `width` / `--width` defines the fixed wrap width, while `wrap` / `--wrap` / `--no-wrap` controls startup mode. The footer now keeps a persistent `W` indicator for wrap state.
+- The built-in startup focus now defaults to `sidebar` instead of opening the filter prompt immediately; use `--focus filter`, `HOUSE_FOCUS=filter`, or `focus = "filter"` to keep the previous behavior.
+- Removed `--sidebar` as a startup mode; the sidebar now starts visible and remains controlled interactively with `s`, `tab`, and `/` during the session.
+
+### Fixed
+
+- Footer status chrome, palette sizing, and reader wrap width calculations now stay within the visible pane.
+
 ## [0.4.12] — 2026-06-14
 
 ### Fixed
@@ -317,7 +339,9 @@ The v1 MVP, published as `@carlesandres/openmdr` on npm.
 
 Search, stdin, URL fetching, cross-file link following, `$EDITOR` hand-off, syntax highlighting, persistent config, OS-appearance auto-detect, single-binary distribution (issue [#2](https://github.com/carlesandres/openmdr/issues/2)), Homebrew tap. All tracked.
 
-[Unreleased]: https://github.com/carlesandres/house/compare/v0.4.12...HEAD
+[Unreleased]: https://github.com/carlesandres/house/compare/v0.4.14...HEAD
+[0.4.14]: https://github.com/carlesandres/house/compare/v0.4.13...v0.4.14
+[0.4.13]: https://github.com/carlesandres/house/compare/v0.4.12...v0.4.13
 [0.4.12]: https://github.com/carlesandres/house/compare/v0.4.11...v0.4.12
 [0.4.11]: https://github.com/carlesandres/house/compare/v0.4.10...v0.4.11
 [0.4.10]: https://github.com/carlesandres/house/compare/v0.4.9...v0.4.10

package/README.md

@@ -64,11 +64,12 @@ house --serve README.md
 | -------------------- | ----------------- | ------------------------------------------------------------------------------------------------------------ |
 | `--theme <name>`     | `opencode`        | Starting theme (see list below)                                                                              |
 | `--tone dark\|light` | `dark`            | Starting tone                                                                                                |
-| `--width <N>`        | —                 | Cap rendered markdown width at N columns                                                                     |
+| `--width <N>`        | `80`              | Reader wrap width used when wrapping is enabled                                                              |
+| `--wrap`             | off               | Start with reader wrapping enabled                                                                           |
+| `--no-wrap`          | off               | Start with reader wrapping disabled                                                                          |
 | `--show <list>`      | `""`              | Reveal normally-skipped entries; comma-separated subset of `hidden`, `gitignored`. Use `--show ""` to clear. |
 | `--root <dir>`       | current directory | Discovery root to walk; overrides `defaultRoot` config/env                                                   |
-| `--sidebar <mode>`   | `auto`            | Initial sidebar visibility: `auto`, `on`, or `off`                                                           |
-| `--focus <mode>`     | `filter`          | Startup focus: `sidebar`, `reader`, or `filter`. `filter` opens the sidebar filter prompt immediately.       |
+| `--focus <mode>`     | `sidebar`         | Startup focus: `sidebar`, `reader`, or `filter`. `filter` opens the sidebar filter prompt immediately.       |
 | `--serve`            | off               | Serve the positional path as HTML in the browser (skips TUI)                                                 |
 | `--port <N>`         | OS-assigned       | Port for `--serve`                                                                                           |
 | `--ext <list>`       | none              | Include extra file extensions (comma-separated)                                                               |
@@ -92,24 +93,28 @@ Run `house --config-path` to print the exact location.
 theme = "tokyonight"
 tone  = "dark"
 extensions = []
+width = 80
+wrap = false
 show  = ["hidden", "gitignored"]
-focus = "filter"
+focus = "sidebar"
 defaultRoot = "cwd" # or "git"
 ```
 
-Supported keys: `theme`, `tone`, `extensions`, `show`, `focus`, `defaultRoot`.
+Supported keys: `theme`, `tone`, `extensions`, `width`, `wrap`, `show`, `focus`, `defaultRoot`.
 
 `show` is a list of normally-skipped categories to opt into. Known categories: `hidden` (dot-prefixed entries), `gitignored` (entries matched by a `.gitignore`). Default is the empty list. Hard skips (`node_modules`, `.git`, `.venv`) always apply.
 
 Precedence, highest to lowest:
 
-1. CLI flags (`--theme`, `--tone`, `--ext`, `--show`, `--focus`, `--root`)
-2. Env vars (`HOUSE_THEME`, `HOUSE_TONE`, `HOUSE_EXTENSIONS`, `HOUSE_SHOW`, `HOUSE_FOCUS`, `HOUSE_DEFAULT_ROOT`)
+1. CLI flags (`--theme`, `--tone`, `--ext`, `--width`, `--wrap`, `--no-wrap`, `--show`, `--focus`, `--root`)
+2. Env vars (`HOUSE_THEME`, `HOUSE_TONE`, `HOUSE_EXTENSIONS`, `HOUSE_WIDTH`, `HOUSE_WRAP`, `HOUSE_SHOW`, `HOUSE_FOCUS`, `HOUSE_DEFAULT_ROOT`)
 3. Config file
-4. Built-in defaults (`opencode` / `dark` / `extensions = []` / `show = []` / `focus = "filter"` / `defaultRoot = "cwd"`)
+4. Built-in defaults (`opencode` / `dark` / `extensions = []` / `width = 80` / `wrap = false` / `show = []` / `focus = "sidebar"` / `defaultRoot = "cwd"`)
 
 `HOUSE_SHOW` takes a comma-separated list (`HOUSE_SHOW=hidden,gitignored`). For `show` specifically, each source completely replaces the next — categories don't merge across layers. Press `shift+a` in the TUI to round-trip between the configured set and the full vocabulary without editing config.
 
+`width` is the fixed reader width used when wrapping is enabled. `wrap` controls startup mode; press `w` in the TUI to toggle reader wrapping for the current session without editing config.
+
 The file is optional — a missing file is fine. Invalid keys, unknown themes, or malformed TOML fail loudly with a one-line error. Per-project config (`.house/config.toml`) and additional keys are deferred.
 
 ## Keys
@@ -122,6 +127,7 @@ The file is optional — a missing file is fine. Invalid keys, unknown themes, o
 | `tab`          | Toggle focus (sidebar ↔ reader)                             |
 | `s`            | Toggle sidebar visibility                                   |
 | `ctrl+p`       | Command palette                                             |
+| `w`            | Toggle reader wrap                                          |
 | `O`            | Open current file in browser as HTML                        |
 | `E`            | Open current file in `$EDITOR` (`$VISUAL` takes precedence) |
 | `t`            | Next theme                                                  |

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@carlesandres/house",
-	"version": "0.4.12",
+	"version": "0.4.14",
 	"description": "TUI-first markdown reader on opentui",
 	"type": "module",
 	"license": "MIT",

package/src/Browser.tsx

@@ -25,16 +25,12 @@ import { parseFrontmatter } from "./markdown/frontmatter.ts"
 import { BRAND, BRAND_NAME } from "./brand.ts"
 import { Footer, FOOTER_HEIGHT, type FooterProps } from "./Footer.tsx"
 import { Header, HEADER_HEIGHT } from "./Header.tsx"
+import { copyTextToClipboard } from "./io/clipboard.ts"
 import { openInEditor, resolveEditor } from "./io/editor.ts"
 import { readFileText } from "./io/readFile.ts"
 import { browserBindings, type BrowserCtx } from "./keymap/browser.ts"
 import { dispatch } from "./keymap/keymap.ts"
-import {
-	canFitInline,
-	defaultPreferredWidth,
-	initialShownForAuto,
-	resolveSidebarWidth,
-} from "./layout/resolve.ts"
+import { canFitInline, defaultPreferredWidth, resolveSidebarWidth } from "./layout/resolve.ts"
 import { fitSidebarEmptyValue } from "./layout/sidebarEmptyState.ts"
 import { formatSidebarRow } from "./layout/sidebarRow.ts"
 import { PromptRow } from "./PromptRow.tsx"
@@ -48,7 +44,6 @@ import { themeDefinitions, getThemeDefinition } from "./theme/registry.ts"
 import { saveThemePreference } from "./config/save.ts"
 import { middleTruncate } from "./ui/middleTruncate.ts"
 
-export type SidebarMode = "auto" | "on" | "off"
 export type StartupFocus = "sidebar" | "reader" | "filter"
 
 export interface BrowserProps {
@@ -56,10 +51,12 @@ export interface BrowserProps {
 	readonly initialIndex?: number
 	/** Initial applied filter query seeded from the CLI positional. */
 	readonly initialQuery?: string
-	/** Cap the rendered markdown's width at N columns. Null = fill the pane. */
-	readonly maxWidth?: number | null
-	/** Discovery root label used in the post-discovery empty-vault sidebar row. */
-	readonly emptyRootLabel?: string
+	/** Reader wrap width used when wrapping is enabled. */
+	readonly wrapWidth?: number
+	/** Initial reader wrap mode. Runtime toggles are session-only. */
+	readonly initialWrap?: boolean
+	/** Canonical discovery root label used anywhere the UI names the scan scope. */
+	readonly rootLabel?: string
 	/** Persistent footer indicator (e.g. "indexing… 42"). Pass null/undefined
 	 *  when discovery has finished; the indicator clears. */
 	readonly discoveryStatus?: string | null
@@ -74,12 +71,11 @@ export interface BrowserProps {
 	readonly renderedPathDebounceMs?: number
 	/** Test seam: disable reader-empty-state tip rotation effect. */
 	readonly disableReaderEmptyStateRotation?: boolean
-	/** Initial sidebar visibility (`--sidebar` flag). `auto` consults the
-	 *  launch viewport bucket once; subsequent visibility goes through `s`. */
-	readonly sidebarMode?: SidebarMode
 	readonly onQuit?: () => void
 	/** Test seam: replaces the file reader. */
 	readonly readFile?: (path: string) => Promise<string>
+	/** Test seam: replaces the system clipboard writer. */
+	readonly copyToClipboard?: (text: string) => Promise<void>
 	/** Optional one-shot footer toast surfaced on first appearance (e.g. the
 	 *  "update available" nudge). Shown with an extended TTL so the user has
 	 *  time to read it; subsequent transient toasts (theme cycle, etc.)
@@ -189,8 +185,9 @@ export const Browser = ({
 	files,
 	initialIndex = 0,
 	initialQuery = "",
-	maxWidth = null,
-	emptyRootLabel = "current root",
+	wrapWidth = 80,
+	initialWrap = false,
+	rootLabel = "current root",
 	discoveryStatus = null,
 	discoverySpinnerIntervalMs,
 	discoverySpinnerInitialFrameIndex,
@@ -198,9 +195,9 @@ export const Browser = ({
 	filterDebounceMs = FILTER_DEBOUNCE_MS,
 	renderedPathDebounceMs = RENDERED_PATH_DEBOUNCE_MS,
 	disableReaderEmptyStateRotation = false,
-	sidebarMode = "auto",
 	onQuit,
 	readFile = defaultReadFile,
+	copyToClipboard = copyTextToClipboard,
 	updateNotice = null,
 	updateNoticeTtlMs = 10000,
 	disableFooterNoticeAutoClear = false,
@@ -216,24 +213,13 @@ export const Browser = ({
 	const [selectedIndex, setSelectedIndex] = useState(() =>
 		clamp(initialIndex, 0, Math.max(0, files.length - 1)),
 	)
+	const [wrapEnabled, setWrapEnabled] = useState(initialWrap)
 	const [loaded, setLoaded] = useState<{ path: string; content: string } | null>(null)
 	const [error, setError] = useState<string | null>(null)
-	// `shown` is the user's sticky preference. Visibility is derived:
-	// `visible = shown || focus === "sidebar"`. See DESIGN.md §7.1.
-	//
-	// Launch consults the viewport bucket once for `--sidebar=auto`. The
-	// useState initializer pins this to the first render — buckets are
-	// launch-only by design, so resize must NOT re-evaluate.
-	const [shown, setShown] = useState<boolean>(() => {
-		switch (sidebarMode) {
-			case "on":
-				return true
-			case "off":
-				return false
-			case "auto":
-				return initialShownForAuto(width)
-		}
-	})
+	// `shown` is the user's sticky interactive preference. The sidebar starts
+	// visible; after launch, `s`/`tab`/`/` may hide or reveal it. Visibility is
+	// derived: `visible = shown || focus === "sidebar"`. See DESIGN.md §7.1.
+	const [shown, setShown] = useState<boolean>(true)
 	const startInFilter = startupFocus === "filter"
 	const initialFocus: "sidebar" | "reader" =
 		startupFocus === null
@@ -245,13 +231,12 @@ export const Browser = ({
 				: "sidebar"
 	// `filter` mirrors `openFilter`'s focus rule: the filter input lives in
 	// the sidebar, so opening it on mount also forces sidebar focus regardless
-	// of `--sidebar=off` (§7.1's visibility derivation surfaces the sidebar via
-	// focus even when `shown` is false). Plain `sidebar` startup shares the
-	// same pane focus without opening the prompt. When omitted, preserve the
-	// legacy Browser behavior: initial focus follows visibility.
-	const [focus, setFocus] = useState<"sidebar" | "reader">(() =>
-		shown || initialFocus === "sidebar" ? "sidebar" : "reader",
-	)
+	// of the current interactive visibility state (§7.1's visibility derivation
+	// surfaces the sidebar via focus even when `shown` is false). Plain
+	// `sidebar` startup shares the same pane focus without opening the prompt.
+	// When omitted, preserve the legacy Browser behavior: initial focus follows
+	// visibility.
+	const [focus, setFocus] = useState<"sidebar" | "reader">(() => initialFocus)
 	const [sidebarScroll, setSidebarScroll] = useState<number>(0)
 	const [filterOpen, setFilterOpen] = useState<boolean>(startInFilter)
 	const [filterInput, setFilterInput] = useState<string>(initialQuery)
@@ -492,6 +477,7 @@ export const Browser = ({
 		restoreFilterOnSidebarFocus: restoreFilterOnSidebarFocusRef.current,
 		filterQuery: filterInput,
 		paletteOpen,
+		wrapEnabled,
 		setFocus,
 		// Wrapped so any keymap-driven selection move (j/k/g/G/[/], reader
 		// prev/next) clears the pending-restore ref from #145. Internal
@@ -565,6 +551,7 @@ export const Browser = ({
 			setPaletteIndex(0)
 			dispatchFloatingOverlay({ type: "open-command-palette" })
 		},
+		toggleWrap: () => setWrapEnabled((prev) => !prev),
 		cycleTheme,
 		toggleTone,
 		toggleAll: () => {
@@ -674,6 +661,26 @@ export const Browser = ({
 				}
 			})()
 		},
+		copyCurrentContents: () => {
+			const file = displayedFiles[selectedIndex]
+			if (!file) return
+			void (async () => {
+				let text: string
+				try {
+					text = await readFile(file.path)
+				} catch {
+					pushFooterNotice(`copy failed: cannot read ${file.relativePath}`)
+					return
+				}
+				try {
+					await copyToClipboard(text)
+					pushFooterNotice(`copied ${file.relativePath}`)
+				} catch (err) {
+					const message = err instanceof Error ? err.message : String(err)
+					pushFooterNotice(`copy failed: ${message}`)
+				}
+			})()
+		},
 	}
 
 	useKeyboard((key) => {
@@ -860,6 +867,12 @@ export const Browser = ({
 	const isNarrow = !canFitInline(width)
 	const sidebarInline = isNarrow ? sidebarActive : shown || sidebarActive
 	const readerVisible = isNarrow ? readerActive : true
+	// When fixed-width wrapping is enabled, never size markdown wider than the
+	// visible reader body. The scrollbox deliberately disables horizontal
+	// scrolling, so an over-wide markdown node clips instead of wrapping.
+	const readerPaneWidth = isNarrow || !sidebarInline ? width : Math.max(1, width - sidebarWidth)
+	const readerBodyWidth = Math.max(1, readerPaneWidth - 2) // reader padding: 1 left + 1 right
+	const markdownWidth = wrapEnabled ? Math.min(wrapWidth, readerBodyWidth) : "100%"
 	// Currently-selected file shown in the Header (which replaced the
 	// per-pane border title that used to carry this information).
 	const currentFile = selected?.relativePath ?? null
@@ -924,6 +937,15 @@ export const Browser = ({
 		width,
 		notice: footerNotice?.text ?? null,
 		discoveryStatus,
+		indicators: [
+			{
+				id: "wrap",
+				icon: "W",
+				variant: "info",
+				active: wrapEnabled,
+				onMouseUp: () => setWrapEnabled((prev) => !prev),
+			},
+		],
 		...(discoverySpinnerIntervalMs === undefined ? {} : { discoverySpinnerIntervalMs }),
 		...(discoverySpinnerInitialFrameIndex === undefined
 			? {}
@@ -968,7 +990,7 @@ export const Browser = ({
 								: "No markdown files in"
 							: "No files match"
 					}
-					value={files.length === 0 ? (discoveryActive ? "…" : emptyRootLabel) : filterApplied}
+					value={files.length === 0 ? (discoveryActive ? "…" : rootLabel) : filterApplied}
 				/>
 			) : (
 				visibleFiles.map((file, idx) => {
@@ -1022,7 +1044,7 @@ export const Browser = ({
 		<box
 			style={{ width, height, flexDirection: "column", backgroundColor: colors.backgroundPanel }}
 		>
-			<Header width={width} currentFile={currentFile} />
+			<Header width={width} currentFile={currentFile} rootLabel={rootLabel} />
 			<box
 				style={{
 					flexDirection: "row",
@@ -1162,7 +1184,7 @@ export const Browser = ({
 										fg={colors.text}
 										bg={readerActive ? colors.background : colors.backgroundPanel}
 										conceal
-										style={{ width: maxWidth ?? "100%" }}
+										style={{ width: markdownWidth }}
 									/>
 								</scrollbox>
 							)}

package/src/CommandPalette.tsx

@@ -88,9 +88,12 @@ export const CommandPalette = ({
 	const overlayWidth = Math.min(viewportWidth - 4, 64)
 	const rows = buildRows(commands)
 	// Reserve: 2 for border (top+bottom), 1 query row, 1 spacer below query,
-	// 1 spacer above footer, 1 footer row. Body gets the rest.
+	// 1 spacer above footer, 1 footer row. Body gets the rest. Keep a one-row
+	// viewport margin above and below when possible; the modal itself already
+	// owns a border and clips its body, so a larger fixed margin needlessly hides
+	// the final command on medium-height terminals.
 	const chrome = 2 + 1 + 1 + 1 + 1
-	const maxBody = Math.max(1, viewportHeight - 4 - chrome)
+	const maxBody = Math.max(1, viewportHeight - 2 - chrome)
 	const desiredBody = Math.max(1, rows.length || 1)
 	const bodyHeight = Math.min(desiredBody, maxBody)
 	const overlayHeight = chrome + bodyHeight

package/src/Footer.tsx

@@ -24,6 +24,7 @@ import type React from "react"
 import type { KeyBinding } from "./keymap/keymap.ts"
 import { displayKey } from "./keymap/displayKey.ts"
 import { Spinner } from "./Spinner.tsx"
+import { StatusIndicator, type StatusIndicatorProps } from "./StatusIndicator.tsx"
 import { colors } from "./theme/colors.ts"
 
 /** Rows the Footer occupies. Importers use it for layout math so a future
@@ -39,6 +40,8 @@ export interface FooterProps<C> {
 	 *  no TTL, cleared by the caller when the underlying activity finishes.
 	 *  Loses to `notice` when both are set so transient toasts still surface. */
 	readonly discoveryStatus?: string | null
+	/** Persistent compact state/status indicators, rendered after built-in warning indicators. */
+	readonly indicators?: readonly (StatusIndicatorProps & { readonly id: string })[]
 	/** Test seam: override spinner tick speed so tests don't sleep on the full
 	 *  production interval. Ignored when discoveryStatus is null. */
 	readonly discoverySpinnerIntervalMs?: number
@@ -86,6 +89,7 @@ const fitHints = (hints: readonly Hint[], width: number): Hint[] => {
 }
 
 const STATUS_SEPARATOR = " · "
+const NON_WARNING_STATUS_PREFIX_WIDTH = 2 // 1-cell spinner + 1-cell spacer
 
 const isPartialDiscoveryWarning = (status: string | null): boolean =>
 	status?.startsWith("scan incomplete:") ?? false
@@ -96,6 +100,7 @@ export const Footer = <C,>({
 	width,
 	notice,
 	discoveryStatus,
+	indicators = [],
 	discoverySpinnerIntervalMs,
 	discoverySpinnerInitialFrameIndex,
 	discoverySpinnerRegisterTick,
@@ -130,19 +135,48 @@ export const Footer = <C,>({
 	const status =
 		discoveryStatus && discoveryStatus.length > 0 ? normalizeStatusLine(discoveryStatus) : null
 	const isPartialWarning = isPartialDiscoveryWarning(status)
+	const renderedIndicators = [
+		...(isPartialWarning
+			? [
+					{
+						id: "discovery-warning",
+						icon: "!",
+						variant: "warning" as const,
+						active: true,
+						...(onDiscoveryWarningToggle === undefined
+							? {}
+							: { onMouseUp: onDiscoveryWarningToggle }),
+					},
+				]
+			: []),
+		...indicators,
+	]
+	const indicatorBudget = Math.min(usableWidth, renderedIndicators.length * 3)
+	const contentBudget = Math.max(0, usableWidth - indicatorBudget)
+	const statusChromeWidth = status
+		? (isPartialWarning ? 0 : NON_WARNING_STATUS_PREFIX_WIDTH) + STATUS_SEPARATOR.length
+		: 0
 	const statusBudget = status
-		? Math.min((isPartialWarning ? 1 : status.length) + STATUS_SEPARATOR.length, usableWidth)
+		? Math.min((isPartialWarning ? 0 : status.length) + statusChromeWidth, contentBudget)
 		: 0
-	const hintsWidth = Math.max(0, usableWidth - statusBudget)
+	const hintsWidth = Math.max(0, contentBudget - statusBudget)
 	const visibleHints = fitHints(hints, hintsWidth)
-	const statusContent = status
-		? status.slice(0, Math.max(0, statusBudget - STATUS_SEPARATOR.length))
+	const nonWarningStatusPrefixBudget =
+		status && !isPartialWarning ? Math.min(NON_WARNING_STATUS_PREFIX_WIDTH, statusBudget) : 0
+	const statusContent = status ? status.slice(0, Math.max(0, statusBudget - statusChromeWidth)) : ""
+	const statusSeparatorContent = status
+		? STATUS_SEPARATOR.slice(
+				0,
+				Math.max(0, statusBudget - nonWarningStatusPrefixBudget - statusContent.length),
+			)
 		: ""
 	const noticeContent = notice
-		? notice.length > usableWidth
-			? notice.slice(0, usableWidth)
+		? notice.length > contentBudget
+			? notice.slice(0, contentBudget)
 			: notice
 		: null
+	const renderIndicators = () =>
+		renderedIndicators.map(({ id, ...props }) => <StatusIndicator key={id} {...props} />)
 
 	// Two-tone hint row: keys render in `text` (foreground-strength), the
 	// `:label` portion in `textMuted`. Matches ghui's footer treatment so
@@ -177,25 +211,12 @@ export const Footer = <C,>({
 	if (noticeContent !== null) {
 		return (
 			<box style={rowStyle}>
+				{renderIndicators()}
 				<text content={noticeContent} wrapMode="none" style={{ fg: colors.primary }} />
 			</box>
 		)
 	}
 
-	const warningTrigger = isPartialWarning ? (
-		<box
-			{...(onDiscoveryWarningToggle === undefined ? {} : { onMouseUp: onDiscoveryWarningToggle })}
-			style={{
-				width: 1,
-				height: 1,
-				flexDirection: "row",
-				backgroundColor: colors.backgroundElement,
-			}}
-		>
-			<text content="!" wrapMode="none" style={{ fg: colors.warning, attributes: 1 }} />
-		</box>
-	) : null
-
 	if (status !== null) {
 		const spinnerProps = {
 			fg: colors.secondary,
@@ -212,20 +233,26 @@ export const Footer = <C,>({
 
 		return (
 			<box style={rowStyle}>
-				{isPartialWarning ? null : <Spinner {...spinnerProps} />}
-				{isPartialWarning ? null : (
+				{renderIndicators()}
+				{nonWarningStatusPrefixBudget >= 1 ? <Spinner {...spinnerProps} /> : null}
+				{nonWarningStatusPrefixBudget >= 2 ? (
 					<text content=" " wrapMode="none" style={{ fg: colors.textMuted }} />
-				)}
-				{isPartialWarning ? (
-					warningTrigger
-				) : (
+				) : null}
+				{isPartialWarning ? null : (
 					<text content={statusContent} wrapMode="none" style={{ fg: colors.secondary }} />
 				)}
-				<text content={STATUS_SEPARATOR} wrapMode="none" style={{ fg: colors.textMuted }} />
+				{statusSeparatorContent.length > 0 && (
+					<text content={statusSeparatorContent} wrapMode="none" style={{ fg: colors.textMuted }} />
+				)}
 				{renderHints()}
 			</box>
 		)
 	}
 
-	return <box style={rowStyle}>{renderHints()}</box>
+	return (
+		<box style={rowStyle}>
+			{renderIndicators()}
+			{renderHints()}
+		</box>
+	)
 }