fix(test): use mockRejectedValue for IPC error in ExportPdfDialog test

Adds the actual right-alignment heuristic to toAsciiTable (was missing
from initial implementation). When any column header starts with a digit,
all columns are right-padded instead of left-padded. Matches the test
added in 53870d5 which exercises the right-alignment path with header
['Item', '7'].

All 6 ascii-table tests pass.

docs/superpowers/specs/2026-06-05-phase-7-modals-design.md

@@ -0,0 +1,399 @@
+# Phase 7 — Modals Design
+
+> Companion to the parent plan: `docs/superpowers/plans/2026-06-05-react-ui-redesign.md` (Phases 7+8+9+10 are sketched there at high level; this spec locks Phase 7's architecture, file map, and contracts so it can be planned task-by-task.)
+
+**Date:** 2026-06-05
+**Phase:** 7 of 10 (React + shadcn/ui UI redesign)
+**Tag (on completion):** `phase-7-modals`
+
+---
+
+## 1. Goal & Non-Goals
+
+**Goal:** Add a layered modal system to the React renderer. Wire 7 modal types (SettingsSheet + 4 Export dialogs + About + Welcome + Confirm) to a single `<ModalLayer />`. Add a persisted `useSettingsStore` for user preferences. The modals are opened via the command store (Phase 6 pattern), and the modals themselves read/write settings via the new store.
+
+**Non-goals (Phase 7):**
+- Implement the actual export pipelines (PDF/DOCX/HTML/PNG generation) — those are main-process concerns, already implemented. Phase 7 only adds the renderer-side dialog UI.
+- Real plugin system — the Plugins tab is a placeholder ("Coming soon").
+- Toast notifications — Phase 8.
+- Advanced tools (Zen mode, REPL, ASCII/Table generators, Print preview) — Phase 9.
+
+---
+
+## 2. Architecture
+
+### 2.1 Modal state lives in `useAppStore` (extended, not new store)
+
+`useAppStore` is already the "global UI" store (sidebar, preview, zen, paneSizes). It's the right home for modal state because:
+- It's already mounted.
+- It's already persisted (via `zustand persist` with `partialize` for pane sizes).
+- A separate `useUIStore` would be YAGNI.
+
+**Add to `AppState`:**
+- `modal: ModalState` (discriminated union — see §2.2)
+- `openModal: <K extends ModalKind>(kind: K, props?: ModalPropsFor<K>) => void`
+- `closeModal: () => void`
+
+**Persistence:** `modal` is **runtime-only**, like `userBindings` in `useCommandStore`. We add it to the `partialize` function so only the persisted fields (`sidebarVisible`, `previewVisible`, `zenMode`, `paneSizes`) are saved. The modal kind never needs to survive a reload.
+
+### 2.2 Discriminated-union modal shape
+
+```ts
+export type ModalState =
+  | { kind: null }
+  | { kind: 'export-pdf';     props: { sourcePath: string } }
+  | { kind: 'export-docx';    props: { sourcePath: string } }
+  | { kind: 'export-html';    props: { sourcePath: string } }
+  | { kind: 'export-batch';   props: { sourcePaths: string[] } }
+  | { kind: 'settings' }
+  | { kind: 'about' }
+  | { kind: 'welcome' }
+  | { kind: 'confirm';        props: ConfirmProps };
+
+export interface ConfirmProps {
+  title: string;
+  body: string;
+  confirmLabel?: string;       // default "Confirm"
+  cancelLabel?: string;        // default "Cancel"
+  destructive?: boolean;       // switches confirm button to red variant
+  onConfirm: () => void | Promise<void>;
+  onCancel?: () => void;
+}
+```
+
+**Why a discriminated union:** every component that opens a modal must pass the right `props` shape for the `kind` — TypeScript catches mismatches at compile time. A generic `{ open: boolean, type: string }` shape would defer the error to runtime.
+
+### 2.3 Single `<ModalLayer />`
+
+Mounted at the bottom of `App.tsx`. Reads `modal.kind` from `useAppStore`, renders the matching component (or `null`). Each child modal calls `closeModal()` on dismiss.
+
+```tsx
+// src/renderer/components/modals/ModalLayer.tsx (sketch)
+export function ModalLayer() {
+  const modal = useAppStore((s) => s.modal);
+  switch (modal.kind) {
+    case null: return null;
+    case 'export-pdf':   return <ExportPdfDialog {...modal.props} />;
+    // ... etc
+  }
+}
+```
+
+`<ModalLayer />` ensures only one modal is visible at a time (the store only holds one). This is correct for v1 — no need for stacking/replacement transitions in Phase 7.
+
+### 2.4 Settings store (new, separate)
+
+A new `useSettingsStore` for user preferences. **Why separate from `useAppStore`:** settings is a different lifecycle. `useAppStore` is "current view configuration"; `useSettingsStore` is "user preferences that survive across sessions and are read by many features". Same precedent as `useFileStore` (file tree state) being separate from `useAppStore` (UI chrome state).
+
+**Persistence:** `zustand persist` with `partialize` to serialize only the leaf settings (matching the pattern in `useFileStore` and `useCommandStore`).
+
+```ts
+interface SettingsState {
+  // Editor
+  fontSize: number;            // 12-20, default 14
+  tabSize: number;             // 2 | 4 | 8, default 4
+  lineNumbers: boolean;        // default true
+  wordWrap: boolean;           // default true
+  minimap: boolean;            // default true
+  // Theme
+  theme: 'light' | 'dark' | 'auto';  // default 'auto'
+  accentColor: 'brand' | 'blue' | 'green' | 'purple' | 'orange';  // default 'brand'
+  fontFamily: 'system' | 'jetbrains' | 'fira';  // default 'system'
+  // Export
+  pdfFormat: 'letter' | 'a4' | 'legal';  // default 'a4'
+  pdfMargins: 'normal' | 'narrow' | 'wide';  // default 'normal'
+  pdfEmbedFonts: boolean;       // default true
+  docxTemplate: 'standard' | 'minimal' | 'modern';  // default 'standard'
+  htmlHighlightStyle: 'github' | 'monokai' | 'nord' | 'none';  // default 'github'
+  // ASCII table formatting — applies to all 3 single-file export formats
+  renderTablesAsAscii: boolean;  // default false
+  // First-launch / Welcome
+  welcomeDismissed: boolean;    // default false
+  // Actions
+  setSetting: <K extends keyof Omit<SettingsState, ...>>(...);
+  resetToDefaults: () => void;
+}
+```
+
+**Template-based exports** (per user request): `docxTemplate` is one of `'standard' | 'minimal' | 'modern'`. The export dialog shows a Select with the available templates. The IPC layer (`ipc.export.docx`) already accepts a `template` field; Phase 7 just exposes it. The main process maps these template names to actual `.docx` template files bundled with the app.
+
+**ASCII table formatting** (per user request): `renderTablesAsAscii` is a toggle in the Settings sheet (Export tab) and in each of the 3 single-file export dialogs as an inline checkbox override. When true, the markdown AST's table nodes are converted to fixed-width monospace text (using a small `lib/ascii-table.ts` helper) *before* the export pipeline sees them. The preview pane is unaffected — this is export-time only.
+
+### 2.5 WelcomeDialog trigger logic
+
+A small `useEffect` in `App.tsx`:
+```ts
+useEffect(() => {
+  if (!useSettingsStore.getState().welcomeDismissed) {
+    useAppStore.getState().openModal('welcome');
+  }
+}, []);  // run once on mount
+```
+
+The Help menu registers a `help.welcome` command that simply calls `openModal('welcome')` — does NOT reset the `welcomeDismissed` flag. (Decision in §2.4 of the brainstorming.)
+
+### 2.6 Commands trigger modals
+
+The command store (Phase 6) gets new commands. Registered in `src/renderer/lib/commands/register-menu-commands.ts`:
+
+| Command ID       | Handler                                              |
+|------------------|------------------------------------------------------|
+| `file.exportPdf`     | `openModal('export-pdf', { sourcePath: activePath })`  |
+| `file.exportDocx`    | `openModal('export-docx', { sourcePath: activePath })` |
+| `file.exportHtml`    | `openModal('export-html', { sourcePath: activePath })` |
+| `file.exportBatch`   | `openModal('export-batch', { sourcePaths: openFiles })` |
+| `settings.open`      | `openModal('settings')`                                  |
+| `help.welcome`       | `openModal('welcome')`                                   |
+| `help.about`         | `openModal('about')`                                     |
+| `file.confirmClose`  | opens confirm dialog before closing a dirty tab        |
+| `app.quit`           | opens confirm if dirty tabs exist, else quits          |
+
+`settings.open` and `help.about` also get buttons in `AppHeader` (already partly done in Phase 6 — we just add new icons and wire to the new commands).
+
+---
+
+## 3. File Map
+
+### 3.1 shadcn primitives (manually created, per the shadcn-CLI-blocked memory)
+
+Created in `src/renderer/components/ui/`:
+- `dialog.tsx`         — Radix Dialog wrapper with motion preset
+- `sheet.tsx`          — Radix Dialog (side variant) for SettingsSheet
+- `tabs.tsx`           — Radix Tabs for the 5-tab SettingsSheet
+- `input.tsx`          — text input
+- `textarea.tsx`       — multi-line input (for confirm body, welcome copy)
+- `select.tsx`         — Radix Select for theme/font/template pickers
+- `switch.tsx`         — Radix Switch for boolean settings
+- `checkbox.tsx`       — Radix Checkbox for "don't show again" toggles
+- `slider.tsx`         — Radix Slider for fontSize
+- `label.tsx`          — Radix Label (always pair with form fields)
+- `form.tsx`           — react-hook-form glue components (FormField, FormItem, FormLabel, FormControl, FormDescription, FormMessage)
+- `radio-group.tsx`    — Radix RadioGroup for accent color / template
+
+### 3.2 Modals (`src/renderer/components/modals/`)
+
+- `ModalLayer.tsx`               — root, mounted by `App.tsx`
+- `ExportPdfDialog.tsx`          — PDF options (format, margins, embed fonts, ascii tables)
+- `ExportDocxDialog.tsx`         — DOCX options (template picker: standard/minimal/modern, ascii tables)
+- `ExportHtmlDialog.tsx`         — HTML options (standalone, highlight style, ascii tables)
+- `ExportBatchDialog.tsx`        — batch queue (format, concurrency, file list)
+- `SettingsSheet.tsx`            — 5-tab sheet (side="right", 480px wide)
+  - `EditorSettings.tsx`         — font size, tab size, line numbers, word wrap, minimap
+  - `ThemeSettings.tsx`          — light/dark/auto, accent color, font family
+  - `ExportSettings.tsx`         — pdf format, margins, embed fonts, docx template, html highlight, ascii tables
+  - `PluginsSettings.tsx`        — "Coming soon" placeholder
+  - `AboutSettings.tsx`          — app version, links, acknowledgements
+- `AboutDialog.tsx`              — simple read-only dialog with version + GitHub link
+- `WelcomeDialog.tsx`            — first-launch dialog with quick-start cards
+- `ConfirmDialog.tsx`            — generic confirmation (title, body, destructive, onConfirm)
+- `ExportDialogFooter.tsx`       — shared Cancel / Export button row used by the 4 export dialogs
+- `useExportSource.ts`           — shared hook: reads active buffer, validates, returns source string + path
+
+### 3.3 Stores
+
+- **Modify** `src/renderer/stores/app-store.ts` — add `modal` + `openModal` + `closeModal`; update `partialize` to exclude `modal`
+- **Create** `src/renderer/stores/settings-store.ts` — new
+
+### 3.4 Lib
+
+- **Create** `src/renderer/lib/validators.ts` — zod schemas:
+  - `settingsSchema` (whole settings object)
+  - `exportPdfSchema` (format, margins, embedFonts, renderTablesAsAscii)
+  - `exportDocxSchema` (template, renderTablesAsAscii)
+  - `exportHtmlSchema` (standalone, highlightStyle, renderTablesAsAscii)
+  - `exportBatchSchema` (format, concurrency, file list)
+  - `confirmPropsSchema` (for the confirm dialog)
+- **Create** `src/renderer/lib/ascii-table.ts` — `toAsciiTable(rows: string[][]): string` (the small helper that converts a 2D string array to a fixed-width ASCII table)
+- **Create** `src/renderer/lib/modal-triggers.ts` — small helpers: `useWelcomeTrigger()`, `useQuitGuard()`
+
+### 3.5 Modified files
+
+- **Modify** `src/renderer/App.tsx` — mount `<ModalLayer />` at the bottom; add the `useWelcomeTrigger` `useEffect` for first-launch
+- **Modify** `src/renderer/lib/commands/register-menu-commands.ts` — add the 9 new commands (4 export + settings + welcome + about + confirmClose + quit)
+- **Modify** `src/renderer/components/layout/AppHeader.tsx` — add Settings (gear) and About (info) icon buttons that dispatch the new commands
+- **Modify** `src/main.js` (verify) — no changes expected; menu items already wire to `menu:action` channels that flow through `useBridgeNativeMenu`. If any new menu items need IPC channels, add them in the main process mirror.
+
+### 3.6 Tests
+
+**Unit (`tests/unit/`):**
+- `stores/settings-store.test.ts` (5-6 tests: defaults, setSetting, resetToDefaults, persistence/partialize)
+- `stores/app-store.test.ts` extended (3 tests: openModal sets state, closeModal clears, only one modal at a time)
+- `lib/validators.test.ts` (3 tests: each schema rejects bad input)
+- `lib/ascii-table.test.ts` (3 tests: simple table, alignment, empty input)
+
+**Component (`tests/component/modals/`):**
+- `ExportPdfDialog.test.tsx` (4 tests: renders with default settings, submit calls ipc.export.pdf with merged opts, error renders inline, ascii-table toggle flows through)
+- `ExportDocxDialog.test.tsx` (3 tests: renders, submit includes template, ascii-table toggle)
+- `ExportHtmlDialog.test.tsx` (3 tests: renders, highlight style select, ascii-table toggle)
+- `ExportBatchDialog.test.tsx` (3 tests: renders file list, format selector, concurrency)
+- `SettingsSheet.test.tsx` (6 tests: renders 5 tabs, each tab shows correct fields, settings change persists)
+- `AboutDialog.test.tsx` (2 tests: renders version, links open external)
+- `WelcomeDialog.test.tsx` (3 tests: renders, dismiss sets welcomeDismissed, "don't show again" checked)
+- `ConfirmDialog.test.tsx` (3 tests: confirm calls onConfirm and closes, cancel calls closeModal, destructive variant)
+- `ModalLayer.test.tsx` (3 integration tests: null kind renders nothing, switching kinds replaces modal, modal unmounts on close)
+
+**Integration (`tests/integration/`):**
+- `phase7-modals-smoke.test.tsx` (4 tests: dispatch command opens modal, command store + settings store + IPC all wired, app.tsx mount triggers welcome on first launch, modal layer end-to-end)
+
+---
+
+## 4. Data Flow
+
+### 4.1 Open a modal
+```ts
+// From any command handler in register-menu-commands.ts:
+useAppStore.getState().openModal('export-pdf', { sourcePath: activePath });
+```
+
+### 4.2 The dialog reads source
+```ts
+// ExportPdfDialog.tsx
+const { source, path } = useExportSource();
+if (!source) return <EmptySourceFallback />;
+```
+
+`useExportSource` is a small hook that:
+1. Reads `useFileStore.activeTabId` + `useEditorStore.buffers`
+2. If no active buffer, prompts the user to open a file (uses confirm dialog)
+3. Returns `{ source: string, path: string } | null`
+
+### 4.3 Settings change
+```ts
+// EditorSettings.tsx — switches/inputs call setSetting
+const [fontSize, setFontSize] = useSettingsStore(s => [s.fontSize, s.setSetting]);
+// or
+setSetting('fontSize', 16);
+```
+
+Editor and preview subscribe to specific slices. The `useTheme` hook from `next-themes` is augmented to read `theme: 'light' | 'dark' | 'auto'` from `useSettingsStore` (replacing the standalone next-themes default).
+
+### 4.4 Export flow
+```ts
+// ExportPdfDialog on submit:
+const settings = useSettingsStore.getState();
+const result = await ipc.export.pdf({
+  inputPath: path,
+  outputPath: chosenOutputPath,
+  format: dialogFormat ?? settings.pdfFormat,
+  margins: MARGIN_PRESETS[dialogMargins ?? settings.pdfMargins],
+  embedFonts: dialogEmbed ?? settings.pdfEmbedFonts,
+  renderTablesAsAscii: dialogAscii ?? settings.renderTablesAsAscii,
+});
+if (!result.ok) setError(result.error.message);
+else { closeModal(); /* toast in Phase 8 */ }
+```
+
+The dialog-level overrides fall through to settings defaults when not explicitly chosen.
+
+### 4.5 ASCII table transformation
+The transformation happens in the **renderer** (pre-IPC), so the main process doesn't need to know about ASCII mode:
+```ts
+// In ExportPdfDialog before submitting:
+const finalSource = renderTablesAsAscii
+  ? applyAsciiTransform(source)   // walks AST, replaces <table> blocks
+  : source;
+```
+`applyAsciiTransform` is a small function (10-20 lines) that:
+1. Parses markdown source for `|...|` table syntax via a small regex
+2. Replaces each table block with a fenced code block containing the ASCII table
+3. Returns the modified source
+
+(No AST walker needed — markdown tables are line-based and a regex per line + simple width calc is sufficient.)
+
+### 4.6 DOCX template selection
+The dialog shows a Select with 3 options (standard, minimal, modern). The main process maps these names to bundled `.docx` template files. The IPC contract is unchanged — `DocxOptions.template: string` was already defined in `types/ipc.ts` during Phase 1.
+
+### 4.7 Confirm flow
+```ts
+// In a command handler:
+const activeTab = ...;
+if (activeTab?.dirty) {
+  useAppStore.getState().openModal('confirm', {
+    title: 'Discard unsaved changes?',
+    body: `"${activeTab.title}" has unsaved changes. Close without saving?`,
+    confirmLabel: 'Discard',
+    destructive: true,
+    onConfirm: () => doCloseTab(),
+  });
+} else {
+  doCloseTab();
+}
+```
+
+### 4.8 Welcome first-launch
+`useEffect` in `App.tsx` (run once on mount) checks `welcomeDismissed` from `useSettingsStore`. If false, calls `openModal('welcome')`. The Welcome dialog has a "Don't show again" checkbox that sets `welcomeDismissed: true` and closes.
+
+---
+
+## 5. Error Handling
+
+- **IPC errors in export dialogs:** inline error banner below the submit button. `IpcResult<T>` discriminated union makes this easy. Banner shows `result.error.message` and a "Try again" button that re-submits.
+- **Settings validation:** zod schemas in `validators.ts`. Each form field shows `aria-invalid` + red border on error. Form-level errors via react-hook-form's `formState.errors`.
+- **Confirm dialog cancel:** just calls `closeModal()`. No state mutation. Optional `onCancel` callback for "remember my choice" patterns (not used in Phase 7).
+- **Welcome "don't show again":** persists `welcomeDismissed: true`. Help menu can re-open Welcome (without resetting the flag).
+- **Settings corruption on load (bad localStorage data):** `useSettingsStore` is built with a `partialize` that also acts as a whitelist — only known fields are deserialized. Unknown fields are dropped. If a persisted value fails zod validation, fall back to defaults (logged as a warning).
+
+---
+
+## 6. Testing Strategy
+
+TDD per the established pattern (Phases 1-6). Every component test:
+- Renders with empty/default state
+- One happy-path interaction (form submit, button click)
+- One error/edge case (validation fail, IPC error, cancel)
+
+Store tests focus on pure logic (state transitions, persistence, partialize). Settings store test specifically verifies:
+- Defaults match schema
+- `setSetting` works for leaf keys
+- `resetToDefaults` clears to initial state
+- Persisted payload (from `partialize`) contains exactly the leaf fields
+- Hydration from a partial/corrupt payload doesn't throw
+
+Component tests use `render` + `userEvent`, mock `window.electronAPI` for IPC.
+
+ModalLayer integration test verifies:
+1. Mounting with `kind: null` renders nothing (query container, expect empty)
+2. Mounting with `kind: 'about'` renders `<AboutDialog>` (aria-label match)
+3. Switching from `kind: 'about'` to `kind: 'settings'` unmounts About, mounts Settings (verified by role/aria-label transitions)
+4. Confirm dialog calls `onConfirm` and `closeModal` on success
+
+---
+
+## 7. Risks & Open Questions
+
+**Risks:**
+- **Form library complexity.** react-hook-form + zod is powerful but adds learning curve. Mitigation: a single shared `<SettingsForm>` wrapper reduces cognitive load; export dialogs use simple `useState` (no need for the full form infra).
+- **shadcn Dialog animation jank with our motion presets.** Radix Dialog has its own `data-state` attributes for open/closed. We compose with our `modalPop` preset via `forceMount` + Motion. Need to verify no double-animation.
+- **Settings store hydration race.** If a component reads a setting on first render before hydration completes, it gets the default. For Phase 7 this is fine — defaults are sensible.
+
+**Open questions (deferrable):**
+- Should the "ascii table" output include alignment row separators (`+---+---+`) or just be a `| a | b |`-style table? → Decision: use the `|---|` separator form (more compact, common in plain-text email).
+- Should ExportBatchDialog be a Sheet (queue progress) or a Dialog (form)? → Decision: Dialog with a form; progress is shown inline (not a streaming queue). Phase 9 could revisit.
+- Should `welcomeDismissed` be per-user-account or per-install? → Per-install (localStorage). No multi-user concept in v1.
+
+---
+
+## 8. Out of Scope (deferred to later phases)
+
+- Phase 8: Toast notifications on export success/failure (the dialog's inline error is v1; toasts are a follow-up).
+- Phase 9: ASCII art generator (figlet) is separate from ASCII table rendering. This spec is about table formatting.
+- Phase 9: Word export uses a `.docx` template *generation* step (WordExportDialog), not the IPC `ipc.export.docx` path. Distinct.
+- Phase 10: Delete legacy `src/print-preview.js`, `src/wordTemplateExporter.js`, etc.
+
+---
+
+## 9. Success Criteria
+
+Phase 7 is complete when:
+- All listed shadcn primitives exist in `src/renderer/components/ui/` with tests
+- `useSettingsStore` is implemented, tested, and persisted
+- `useAppStore` extended with `modal` discriminated union and tested
+- All 7 modal components implemented, tested, and accessible (aria-labels, keyboard nav)
+- 4 export dialogs (PDF/DOCX/HTML/Batch) all submit through the command store and call IPC correctly
+- `ModalLayer` mounted in `App.tsx` and integrated with command triggers
+- Welcome dialog shows on first launch, dismissible, re-openable from Help menu
+- Confirm dialog used by quit-with-dirty and close-with-dirty flows
+- ASCII table rendering works (toggle in settings, override in export dialogs)
+- DOCX template picker in ExportDocxDialog submits the correct `template` field
+- `npx vite build` succeeds, `npx vitest run` shows **all tests green** (target: +50 new tests, total ~220)
+- Branch tagged `phase-7-modals` and pushed to origin

docs/superpowers/specs/2026-06-05-phase-8-toasts-design.md

@@ -0,0 +1,250 @@
+# Phase 8 — Toasts Design
+
+> Companion to the parent plan: `docs/superpowers/plans/2026-06-05-react-ui-redesign.md` (Phases 8+9+10 are sketched at high level; this spec locks Phase 8's architecture, file map, and contracts so it can be planned task-by-task.)
+
+**Date:** 2026-06-05
+**Phase:** 8 of 10 (React + shadcn/ui UI redesign)
+**Tag (on completion):** `phase-8-toasts`
+
+---
+
+## 1. Goal & Non-Goals
+
+**Goal:** Add a toast notification layer to the React renderer using sonner (already installed). Surface user-initiated async action results (file save, file/folder open, exports) as transient toasts in the bottom-right of the window. The error banner pattern in export dialogs stays — toasts are a complementary global channel.
+
+**Non-goals (Phase 8):**
+- Undo/redo support (Phase 9)
+- Custom toast actions/buttons (Phase 9, if needed)
+- Persistent notification history
+- Toast queueing/throttling for rapid-fire events
+- Replacing inline error banners (they stay as per-dialog context)
+
+**Scope decision:** Toast on user-initiated actions only. Skip silent background operations (loadChildren, etc.) to avoid noise. 4 wire points total: save (success+error), open file/folder (error only), 4 export dialogs (success+error).
+
+---
+
+## 2. Architecture
+
+### 2.1 Toast helpers in `lib/toast.ts`
+
+A thin typed layer over sonner. The helpers exist to:
+- Give us a single import surface (instead of scattering `import { toast } from 'sonner'` across the codebase)
+- Provide a place to add brand colors, formatting, or analytics later without touching call sites
+- Make mocking easier in tests (one module to mock)
+
+```ts
+// src/renderer/lib/toast.ts (sketch)
+import { toast as sonnerToast } from 'sonner';
+
+export const toast = {
+  success: (message: string) => sonnerToast.success(message),
+  error: (message: string) => sonnerToast.error(message),
+  info: (message: string) => sonnerToast.info(message),
+  warning: (message: string) => sonnerToast.warning(message),
+  promise: <T>(
+    promise: Promise<T>,
+    msgs: { loading: string; success: string | ((data: T) => string); error: string | ((err: unknown) => string) }
+  ) => sonnerToast.promise(promise, msgs),
+  dismiss: (id?: string | number) => sonnerToast.dismiss(id),
+};
+```
+
+### 2.2 `<Toaster />` mounted in App.tsx
+
+A canonical shadcn Toaster wrapper (manual paste per memory `shadcn-cli-blocked-manual-primitives`). Mounts alongside `<ModalLayer />`:
+
+```tsx
+// src/renderer/App.tsx (sketch)
+import { Toaster } from '@/components/ui/sonner';
+
+function App() {
+  useWelcomeTrigger();
+  return (
+    <>
+      <AppShell />
+      <ModalLayer />
+      <Toaster />
+    </>
+  );
+}
+```
+
+The Toaster uses sonner's `<Toaster />` component with:
+- `theme={resolvedTheme}` from `useTheme()` (so toasts match the user's light/dark preference)
+- `richColors` for semantic success/error/info/warning colors
+- `position="bottom-right"` (sonner default; explicit for clarity)
+- `closeButton` (so users can dismiss)
+
+### 2.3 Inline wiring at 4 wire points
+
+**Pattern choice — inline in stores/dialogs, NOT middleware.** Matches the Phase 7 precedent of inline error banners in export dialogs. Middleware would be DRY but harder to debug and harder to control granularity (we want errors on save, but NOT on silent loadChildren).
+
+**Wire points:**
+
+1. **`useFileStore.saveActiveBuffer`** — wrap the existing logic:
+   ```ts
+   saveActiveBuffer: async () => {
+     // ... existing logic to get buffer ...
+     const writeResult = await ipc.file.write(activeTabId, buffer.content);
+     if (!writeResult.ok) {
+       toast.error(`Failed to save: ${writeResult.error.message}`);
+       return false;
+     }
+     // ... existing markSaved/markTabClean ...
+     toast.success(`Saved ${title}`);
+     return true;
+   }
+   ```
+
+2. **`useFileStore.openFile`** — error only:
+   ```ts
+   openFile: async (filePath) => {
+     // ... existing logic to check existing tab ...
+     const result = await ipc.file.read(filePath);
+     if (!result.ok) {
+       toast.error(`Failed to open file: ${result.error.message}`);
+       return;
+     }
+     // ... existing logic ...
+   }
+   ```
+
+3. **`useFileStore.openFolder`** — error only:
+   ```ts
+   openFolder: async (path) => {
+     const result = await ipc.file.list(path);
+     if (!result.ok) {
+       toast.error(`Failed to open folder: ${result.error.message}`);
+       return;
+     }
+     // ... existing logic ...
+   }
+   ```
+
+4. **4 export dialogs** — both success and error (error complements the inline banner):
+   ```ts
+   if (!result.ok) {
+     toast.error(`Export failed: ${result.error.message}`);
+     setError(result.error.message);
+     setSubmitting(false);
+   } else {
+     toast.success(`Exported ${source.title} to ${result.data?.outputPath ?? 'file'}`);
+     closeModal();
+   }
+   ```
+
+---
+
+## 3. File Map
+
+### 3.1 Created files
+
+- `src/renderer/lib/toast.ts` — typed wrappers (re-export of sonner with our naming)
+- `src/renderer/components/ui/sonner.tsx` — canonical shadcn Toaster wrapper (manual paste)
+- `tests/unit/lib/toast.test.ts` — ~5 unit tests
+- `tests/component/ui/sonner.test.tsx` — 1 smoke test
+- `tests/integration/phase8-toasts-smoke.test.tsx` — ~4 integration tests
+
+### 3.2 Modified files
+
+- `src/renderer/App.tsx` — mount `<Toaster />` alongside `<ModalLayer />`
+- `src/renderer/stores/file-store.ts` — add 3 toast calls (save, openFile, openFolder)
+- `src/renderer/components/modals/ExportPdfDialog.tsx` — toast on submit result
+- `src/renderer/components/modals/ExportDocxDialog.tsx` — toast on submit result
+- `src/renderer/components/modals/ExportHtmlDialog.tsx` — toast on submit result
+- `src/renderer/components/modals/ExportBatchDialog.tsx` — toast on submit result
+
+---
+
+## 4. Data Flow
+
+User action → store action OR export dialog submit → IPC call → result →
+- if error: `toast.error(message)` → sonner renders in bottom-right portal
+- if success: `toast.success(message)` → sonner renders
+- inline error banner in dialog stays as per-dialog context (NOT removed)
+
+Theme comes from `useTheme()` in the Toaster component, not from individual toasts. The Toaster is mounted once at the app level.
+
+For the 4 export dialogs: the existing inline error banner stays (it's contextual to the dialog), AND a toast is fired. This gives the user both immediate context (in the dialog) and persistent notification (toast in corner).
+
+For file save: ONLY a toast (no inline error UI in the editor pane — keeps the editor clean). Errors still show the toast.
+
+---
+
+## 5. Error Handling
+
+- **Toast helpers never throw.** They are thin re-exports of sonner, which handles its own error cases (e.g., render failures, missing portal target).
+- **In tests**, the `toast` module is mocked so calls don't render real toasts. Mock signature: `vi.mock('@/lib/toast', () => ({ toast: { success: vi.fn(), error: vi.fn(), ... } }))`.
+- **Theme fallback:** If `useTheme()` is loading or `resolvedTheme` is undefined, Toaster uses `'system'` as a fallback (sonner's default behavior).
+- **Sonner missing:** If for some reason sonner fails to load, the toast calls become no-ops. The user still sees inline error banners in the export dialogs.
+- **Inline error banners stay.** They are not replaced by toasts — they complement them.
+
+---
+
+## 6. Testing Strategy
+
+### 6.1 Unit tests (`tests/unit/lib/toast.test.ts`)
+
+5 tests:
+- `toast.success` calls sonner `toast.success` with the message
+- `toast.error` calls sonner `toast.error` with the message
+- `toast.info` calls sonner `toast.info`
+- `toast.warning` calls sonner `toast.warning`
+- `toast.promise` forwards the promise and messages to sonner
+
+All tests mock the sonner module and verify the forwarded call.
+
+### 6.2 Component test (`tests/component/ui/sonner.test.tsx`)
+
+1 smoke test: `<Toaster />` renders without crashing inside a ThemeProvider.
+
+### 6.3 Integration test (`tests/integration/phase8-toasts-smoke.test.tsx`)
+
+~4 tests:
+- Saving a file → `toast.success` called with `"Saved test.md"`
+- Opening a non-existent file (ipc returns error) → `toast.error` called with file path in message
+- Export success (ipc returns ok) → `toast.success` called + dialog closes
+- Export failure (ipc returns error) → `toast.error` called + inline banner shown + dialog stays open
+
+TDD throughout. Mocks for `ipc.*` and `lib/toast`.
+
+### 6.4 Existing tests must still pass
+
+- All 243 tests from Phase 7 must remain green
+- Export dialog tests will need updates to verify the new toast calls (the dialog tests currently check for inline banner; they should ALSO verify the toast call)
+
+---
+
+## 7. Risks & Open Questions
+
+**Risks:**
+- **Sonner theme switching:** If `useTheme()` returns `'system'` and the OS preference changes mid-session, sonner will re-render. This is the correct behavior; just confirm in test.
+- **Toast spam:** If user holds Cmd+S, the save could fire many times. Sonner deduplicates by default for similar messages? → Decision: rely on sonner's default behavior. If spam becomes an issue, add a `toast.dismiss()` debounce in v2.
+
+**Open questions (deferrable):**
+- Should we add a custom toast for "undo last close" (Phase 9's undo feature)? → Decision: out of scope for Phase 8. Phase 9 will handle undo toasts.
+- Should the export dialog inline banner be removed once toasts are wired? → Decision: NO — keep both. The inline banner is contextual to the dialog; the toast is global. They serve different purposes.
+
+---
+
+## 8. Out of Scope (deferred to later phases)
+
+- Phase 9: Undo toasts ("Tab closed — Undo" with action button)
+- Phase 9: Long-running operation progress toasts (e.g., batch export queue)
+- Phase 9: Custom toast variants for advanced tools (ASCII generator, table generator)
+- Phase 10: Cleanup of inline error banners (will evaluate in Phase 10 if redundant)
+
+---
+
+## 9. Success Criteria
+
+Phase 8 is complete when:
+- `lib/toast.ts` exists with typed wrappers
+- `<Toaster />` is mounted in `App.tsx` and renders toasts
+- `useFileStore.saveActiveBuffer` calls `toast.success`/`toast.error` on result
+- `useFileStore.openFile` calls `toast.error` on failure
+- `useFileStore.openFolder` calls `toast.error` on failure
+- 4 export dialogs call `toast.success`/`toast.error` on result
+- All tests pass: ~+10 new tests, total ~253
+- `npx vite build` succeeds
+- Branch tagged `phase-8-toasts` and pushed to origin

package-lock.json

@@ -27,10 +27,18 @@
         "@dnd-kit/sortable": "^10.0.0",
         "@dnd-kit/utilities": "^3.2.2",
         "@hookform/resolvers": "^5.4.0",
+        "@radix-ui/react-checkbox": "^1.3.3",
         "@radix-ui/react-collapsible": "^1.1.12",
         "@radix-ui/react-context-menu": "^2.2.16",
+        "@radix-ui/react-dialog": "^1.1.15",
+        "@radix-ui/react-label": "^2.1.8",
+        "@radix-ui/react-radio-group": "^1.3.8",
         "@radix-ui/react-scroll-area": "^1.2.10",
+        "@radix-ui/react-select": "^2.2.6",
+        "@radix-ui/react-slider": "^1.3.6",
         "@radix-ui/react-slot": "^1.2.4",
+        "@radix-ui/react-switch": "^1.2.6",
+        "@radix-ui/react-tabs": "^1.1.13",
         "@tanstack/react-table": "^8.21.3",
         "codemirror": "^6.0.2",
         "core-util-is": "^1.0.3",
@@ -3881,6 +3889,36 @@
         }
       }
     },
+    "node_modules/@radix-ui/react-checkbox": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-checkbox/-/react-checkbox-1.3.3.tgz",
+      "integrity": "sha512-wBbpv+NQftHDdG86Qc0pIyXk5IR3tM8Vd0nWLKDcX8nNn4nXFOFwsKuqw2okA/1D/mpaAkmuyndrPJTYDNZtFw==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.3",
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-presence": "1.1.5",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-use-controllable-state": "1.2.2",
+        "@radix-ui/react-use-previous": "1.1.1",
+        "@radix-ui/react-use-size": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@radix-ui/react-collapsible": {
       "version": "1.1.12",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-collapsible/-/react-collapsible-1.1.12.tgz",
@@ -4013,6 +4051,60 @@
         }
       }
     },
+    "node_modules/@radix-ui/react-dialog": {
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.15.tgz",
+      "integrity": "sha512-TCglVRtzlffRNxRMEyR36DGBLJpeusFcgMVD9PZEzAKnUs1lKCgX5u9BmC2Yg+LL9MgZDugFFs1Vl+Jp4t/PGw==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.3",
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-dismissable-layer": "1.1.11",
+        "@radix-ui/react-focus-guards": "1.1.3",
+        "@radix-ui/react-focus-scope": "1.1.7",
+        "@radix-ui/react-id": "1.1.1",
+        "@radix-ui/react-portal": "1.1.9",
+        "@radix-ui/react-presence": "1.1.5",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-slot": "1.2.3",
+        "@radix-ui/react-use-controllable-state": "1.2.2",
+        "aria-hidden": "^1.2.4",
+        "react-remove-scroll": "^2.6.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-slot": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz",
+      "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-compose-refs": "1.1.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@radix-ui/react-direction": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.1.1.tgz",
@@ -4113,6 +4205,52 @@
         }
       }
     },
+    "node_modules/@radix-ui/react-label": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-2.1.8.tgz",
+      "integrity": "sha512-FmXs37I6hSBVDlO4y764TNz1rLgKwjJMQ0EGte6F3Cb3f4bIuHB/iLa/8I9VKkmOy+gNHq8rql3j686ACVV21A==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-primitive": "2.1.4"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-label/node_modules/@radix-ui/react-primitive": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.4.tgz",
+      "integrity": "sha512-9hQc4+GNVtJAIEPEqlYqW5RiYdrr8ea5XQ0ZOnD6fgru+83kqT15mq2OCcbe8KnjRZl5vF3ks69AKz3kh1jrhg==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-slot": "1.2.4"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@radix-ui/react-menu": {
       "version": "2.1.16",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.1.16.tgz",
@@ -4292,6 +4430,38 @@
         }
       }
     },
+    "node_modules/@radix-ui/react-radio-group": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-radio-group/-/react-radio-group-1.3.8.tgz",
+      "integrity": "sha512-VBKYIYImA5zsxACdisNQ3BjCBfmbGH3kQlnFVqlWU4tXwjy7cGX8ta80BcrO+WJXIn5iBylEH3K6ZTlee//lgQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.3",
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-direction": "1.1.1",
+        "@radix-ui/react-presence": "1.1.5",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-roving-focus": "1.1.11",
+        "@radix-ui/react-use-controllable-state": "1.2.2",
+        "@radix-ui/react-use-previous": "1.1.1",
+        "@radix-ui/react-use-size": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@radix-ui/react-roving-focus": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.11.tgz",
@@ -4354,6 +4524,100 @@
         }
       }
     },
+    "node_modules/@radix-ui/react-select": {
+      "version": "2.2.6",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-2.2.6.tgz",
+      "integrity": "sha512-I30RydO+bnn2PQztvo25tswPH+wFBjehVGtmagkU78yMdwTwVf12wnAOF+AeP8S2N8xD+5UPbGhkUfPyvT+mwQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/number": "1.1.1",
+        "@radix-ui/primitive": "1.1.3",
+        "@radix-ui/react-collection": "1.1.7",
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-direction": "1.1.1",
+        "@radix-ui/react-dismissable-layer": "1.1.11",
+        "@radix-ui/react-focus-guards": "1.1.3",
+        "@radix-ui/react-focus-scope": "1.1.7",
+        "@radix-ui/react-id": "1.1.1",
+        "@radix-ui/react-popper": "1.2.8",
+        "@radix-ui/react-portal": "1.1.9",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-slot": "1.2.3",
+        "@radix-ui/react-use-callback-ref": "1.1.1",
+        "@radix-ui/react-use-controllable-state": "1.2.2",
+        "@radix-ui/react-use-layout-effect": "1.1.1",
+        "@radix-ui/react-use-previous": "1.1.1",
+        "@radix-ui/react-visually-hidden": "1.2.3",
+        "aria-hidden": "^1.2.4",
+        "react-remove-scroll": "^2.6.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-slot": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz",
+      "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-compose-refs": "1.1.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-slider": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-slider/-/react-slider-1.3.6.tgz",
+      "integrity": "sha512-JPYb1GuM1bxfjMRlNLE+BcmBC8onfCi60Blk7OBqi2MLTFdS+8401U4uFjnwkOr49BLmXxLC6JHkvAsx5OJvHw==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/number": "1.1.1",
+        "@radix-ui/primitive": "1.1.3",
+        "@radix-ui/react-collection": "1.1.7",
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-direction": "1.1.1",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-use-controllable-state": "1.2.2",
+        "@radix-ui/react-use-layout-effect": "1.1.1",
+        "@radix-ui/react-use-previous": "1.1.1",
+        "@radix-ui/react-use-size": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@radix-ui/react-slot": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.4.tgz",
@@ -4372,6 +4636,65 @@
         }
       }
     },
+    "node_modules/@radix-ui/react-switch": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-switch/-/react-switch-1.2.6.tgz",
+      "integrity": "sha512-bByzr1+ep1zk4VubeEVViV592vu2lHE2BZY5OnzehZqOOgogN80+mNtCqPkhn2gklJqOpxWgPoYTSnhBCqpOXQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.3",
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-use-controllable-state": "1.2.2",
+        "@radix-ui/react-use-previous": "1.1.1",
+        "@radix-ui/react-use-size": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-tabs": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-tabs/-/react-tabs-1.1.13.tgz",
+      "integrity": "sha512-7xdcatg7/U+7+Udyoj2zodtI9H/IIopqo+YOIcZOq1nJwXWBZ9p8xiu5llXlekDbZkca79a/fozEYQXIA4sW6A==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.3",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-direction": "1.1.1",
+        "@radix-ui/react-id": "1.1.1",
+        "@radix-ui/react-presence": "1.1.5",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-roving-focus": "1.1.11",
+        "@radix-ui/react-use-controllable-state": "1.2.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@radix-ui/react-use-callback-ref": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.1.tgz",
@@ -4457,6 +4780,21 @@
         }
       }
     },
+    "node_modules/@radix-ui/react-use-previous": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-previous/-/react-use-previous-1.1.1.tgz",
+      "integrity": "sha512-2dHfToCj/pzca2Ck724OZ5L0EVrr3eHRNsG/b3xQJLA2hZpVCS99bLAX+hm1IHXDEnzU6by5z/5MIY794/a8NQ==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@radix-ui/react-use-rect": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-use-rect/-/react-use-rect-1.1.1.tgz",
@@ -4493,6 +4831,29 @@
         }
       }
     },
+    "node_modules/@radix-ui/react-visually-hidden": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.2.3.tgz",
+      "integrity": "sha512-pzJq12tEaaIhqjbzpCuv/OypJY/BPavOofm+dbab+MHLajy277+1lLm6JFcGgF5eskJ6mquGirhXY2GD/8u8Ug==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-primitive": "2.1.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@radix-ui/rect": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.1.1.tgz",

package.json

@@ -98,10 +98,18 @@
     "@dnd-kit/sortable": "^10.0.0",
     "@dnd-kit/utilities": "^3.2.2",
     "@hookform/resolvers": "^5.4.0",
+    "@radix-ui/react-checkbox": "^1.3.3",
     "@radix-ui/react-collapsible": "^1.1.12",
     "@radix-ui/react-context-menu": "^2.2.16",
+    "@radix-ui/react-dialog": "^1.1.15",
+    "@radix-ui/react-label": "^2.1.8",
+    "@radix-ui/react-radio-group": "^1.3.8",
     "@radix-ui/react-scroll-area": "^1.2.10",
+    "@radix-ui/react-select": "^2.2.6",
+    "@radix-ui/react-slider": "^1.3.6",
     "@radix-ui/react-slot": "^1.2.4",
+    "@radix-ui/react-switch": "^1.2.6",
+    "@radix-ui/react-tabs": "^1.1.13",
     "@tanstack/react-table": "^8.21.3",
     "codemirror": "^6.0.2",
     "core-util-is": "^1.0.3",

src/renderer/App.tsx

@@ -1,7 +1,16 @@
 import { AppShell } from './components/layout/AppShell';
+import { ModalLayer } from './components/modals/ModalLayer';
+import { Toaster } from './components/ui/sonner';
+import { useWelcomeTrigger } from './hooks/use-welcome-trigger';
 
 function App() {
-  return <AppShell />;
+  useWelcomeTrigger();
+  return (
+    <>
+      <AppShell />
+      <ModalLayer />
+      <Toaster />
+    </>
+  );
 }
-
 export default App;

src/renderer/components/layout/AppHeader.tsx

@@ -1,10 +1,12 @@
-import { PanelLeft, PanelRight } from 'lucide-react';
+import { PanelLeft, PanelRight, Keyboard, Settings, Info } from 'lucide-react';
 import { Button } from '@/components/ui/button';
 import { ThemeToggle } from '@/components/theme-toggle';
 import { useAppStore } from '@/stores/app-store';
+import { useCommandStore } from '@/stores/command-store';
 
 export function AppHeader() {
-  const { sidebarVisible, previewVisible, toggleSidebar, togglePreview } = useAppStore();
+  const { sidebarVisible, previewVisible } = useAppStore();
+  const dispatch = useCommandStore((s) => s.dispatch);
 
   return (
     <header className="flex h-14 items-center justify-between border-b border-border bg-card/40 px-4 backdrop-blur">
@@ -21,7 +23,8 @@ export function AppHeader() {
           size="icon"
           aria-label="Toggle sidebar"
           aria-pressed={sidebarVisible}
-          onClick={toggleSidebar}
+          data-testid="header-toggle-sidebar"
+          onClick={() => dispatch('view.toggleSidebar')}
         >
           <PanelLeft className="h-4 w-4" />
         </Button>
@@ -30,10 +33,36 @@ export function AppHeader() {
           size="icon"
           aria-label="Toggle preview"
           aria-pressed={previewVisible}
-          onClick={togglePreview}
+          data-testid="header-toggle-preview"
+          onClick={() => dispatch('view.togglePreview')}
         >
           <PanelRight className="h-4 w-4" />
         </Button>
+        <Button
+          variant="ghost"
+          size="icon"
+          aria-label="Keyboard shortcuts"
+          data-testid="header-shortcuts"
+          onClick={() => dispatch('shortcuts.show')}
+        >
+          <Keyboard className="h-4 w-4" />
+        </Button>
+        <Button
+          variant="ghost"
+          size="icon"
+          aria-label="Settings"
+          onClick={() => dispatch('settings.open')}
+        >
+          <Settings className="h-4 w-4" />
+        </Button>
+        <Button
+          variant="ghost"
+          size="icon"
+          aria-label="About"
+          onClick={() => dispatch('help.about')}
+        >
+          <Info className="h-4 w-4" />
+        </Button>
         <ThemeToggle />
       </div>
     </header>

src/renderer/components/layout/AppShell.tsx

@@ -10,10 +10,13 @@ import { useAppStore } from '@/stores/app-store';
 import { ResizablePanelGroup, ResizablePanel, ResizableHandle } from '@/components/ui/resizable';
 import { useFileShortcuts } from '@/hooks/use-file-shortcuts';
 import { useRestoreLastFolder } from '@/hooks/use-restore-last-folder';
+import { useRegisterMenuCommands, useBridgeNativeMenu } from '@/lib/commands/register-menu-commands';
 
 export function AppShell() {
   useFileShortcuts();
   useRestoreLastFolder();
+  useRegisterMenuCommands();
+  useBridgeNativeMenu();
   const { sidebarVisible, previewVisible, paneSizes, setPaneSizes } = useAppStore();
 
   return (

src/renderer/components/layout/Toolbar.tsx

@@ -1,15 +1,77 @@
-import { Bold, Italic, List, ListOrdered, Code, Link as LinkIcon } from 'lucide-react';
+import { Bold, Italic, List, ListOrdered, Code, Link as LinkIcon, PanelLeft, PanelRight, Save, FolderOpen, FileText } from 'lucide-react';
 import { Button } from '@/components/ui/button';
+import { useCommandStore } from '@/stores/command-store';
+import { useAppStore } from '@/stores/app-store';
 
 export function Toolbar() {
+  const dispatch = useCommandStore((s) => s.dispatch);
+  const { sidebarVisible, previewVisible } = useAppStore();
+
   return (
-    <div className="flex h-10 items-center gap-1 border-b border-border bg-card/10 px-3">
+    <div
-      <Button variant="ghost" size="icon" aria-label="Bold"><Bold className="h-4 w-4" /></Button>
+      role="toolbar"
-      <Button variant="ghost" size="icon" aria-label="Italic"><Italic className="h-4 w-4" /></Button>
+      aria-label="Main toolbar"
-      <Button variant="ghost" size="icon" aria-label="Unordered list"><List className="h-4 w-4" /></Button>
+      className="flex h-10 items-center gap-1 border-b border-border bg-card/10 px-3"
-      <Button variant="ghost" size="icon" aria-label="Ordered list"><ListOrdered className="h-4 w-4" /></Button>
+    >
-      <Button variant="ghost" size="icon" aria-label="Code"><Code className="h-4 w-4" /></Button>
+      <Button
-      <Button variant="ghost" size="icon" aria-label="Link"><LinkIcon className="h-4 w-4" /></Button>
+        variant="ghost"
+        size="icon"
+        aria-label="Open file"
+        data-testid="toolbar-open-file"
+        onClick={() => dispatch('file.open')}
+      >
+        <FileText className="h-4 w-4" />
+      </Button>
+      <Button
+        variant="ghost"
+        size="icon"
+        aria-label="Open folder"
+        data-testid="toolbar-open-folder"
+        onClick={() => dispatch('file.openFolder')}
+      >
+        <FolderOpen className="h-4 w-4" />
+      </Button>
+      <Button
+        variant="ghost"
+        size="icon"
+        aria-label="Save"
+        data-testid="toolbar-save"
+        onClick={() => dispatch('file.save')}
+      >
+        <Save className="h-4 w-4" />
+      </Button>
+
+      <div className="mx-1 h-5 w-px bg-border" aria-hidden="true" />
+
+      <Button
+        variant="ghost"
+        size="icon"
+        aria-label="Toggle sidebar"
+        aria-pressed={sidebarVisible}
+        data-testid="toolbar-toggle-sidebar"
+        onClick={() => dispatch('view.toggleSidebar')}
+      >
+        <PanelLeft className="h-4 w-4" />
+      </Button>
+      <Button
+        variant="ghost"
+        size="icon"
+        aria-label="Toggle preview"
+        aria-pressed={previewVisible}
+        data-testid="toolbar-toggle-preview"
+        onClick={() => dispatch('view.togglePreview')}
+      >
+        <PanelRight className="h-4 w-4" />
+      </Button>
+
+      <div className="mx-1 h-5 w-px bg-border" aria-hidden="true" />
+
+      <Button variant="ghost" size="icon" aria-label="Bold" disabled><Bold className="h-4 w-4" /></Button>
+      <Button variant="ghost" size="icon" aria-label="Italic" disabled><Italic className="h-4 w-4" /></Button>
+      <Button variant="ghost" size="icon" aria-label="Unordered list" disabled><List className="h-4 w-4" /></Button>
+      <Button variant="ghost" size="icon" aria-label="Ordered list" disabled><ListOrdered className="h-4 w-4" /></Button>
+      <Button variant="ghost" size="icon" aria-label="Code" disabled><Code className="h-4 w-4" /></Button>
+      <Button variant="ghost" size="icon" aria-label="Link" disabled><LinkIcon className="h-4 w-4" /></Button>
     </div>
   );
 }

src/renderer/components/modals/AboutDialog.tsx

@@ -0,0 +1,49 @@
+import { useEffect, useState } from 'react';
+import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from '@/components/ui/dialog';
+import { Button } from '@/components/ui/button';
+import { ipc } from '@/lib/ipc';
+import { useAppStore } from '@/stores/app-store';
+
+export function AboutDialog() {
+  const closeModal = useAppStore((s) => s.closeModal);
+  const isOpen = useAppStore((s) => s.modal.kind) === 'about';
+  const [version, setVersion] = useState<string>('…');
+
+  useEffect(() => {
+    ipc.app.getVersion().then((r) => {
+      if (r.ok && typeof r.data === 'string') setVersion(r.data);
+    });
+  }, []);
+
+  return (
+    <Dialog open={isOpen} onOpenChange={(o) => !o && closeModal()}>
+      <DialogContent aria-describedby="about-desc">
+        <DialogHeader>
+          <DialogTitle>About MarkdownConverter</DialogTitle>
+          <DialogDescription id="about-desc">
+            Professional Markdown editor and universal file converter.
+          </DialogDescription>
+        </DialogHeader>
+        <div className="space-y-2 text-sm text-muted-foreground">
+          <p>Version: {version}</p>
+          <p>
+            <a
+              href="https://github.com/amitwh/markdown-converter"
+              className="text-brand hover:underline"
+              onClick={(e) => {
+                e.preventDefault();
+                ipc.app.openExternal('https://github.com/amitwh/markdown-converter');
+              }}
+            >
+              GitHub repository
+            </a>
+          </p>
+          <p className="text-xs">© ConcreteInfo. Licensed under MIT.</p>
+        </div>
+        <DialogFooter>
+          <Button onClick={closeModal}>Close</Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+}

src/renderer/components/modals/AboutSettings.tsx

@@ -0,0 +1,38 @@
+import { useEffect, useState } from 'react';
+import { ipc } from '@/lib/ipc';
+
+export function AboutSettings() {
+  const [version, setVersion] = useState('…');
+
+  useEffect(() => {
+    ipc.app.getVersion().then((r) => {
+      if (r.ok && typeof r.data === 'string') setVersion(r.data);
+    });
+  }, []);
+
+  return (
+    <div className="space-y-3 text-sm">
+      <h3 className="text-base font-semibold">MarkdownConverter</h3>
+      <p className="text-muted-foreground">Version {version}</p>
+      <p>
+        <a
+          href="https://github.com/amitwh/markdown-converter"
+          className="text-brand hover:underline"
+          onClick={(e) => { e.preventDefault(); ipc.app.openExternal('https://github.com/amitwh/markdown-converter'); }}
+        >
+          GitHub repository
+        </a>
+      </p>
+      <p>
+        <a
+          href="https://concreteinfo.co.in"
+          className="text-brand hover:underline"
+          onClick={(e) => { e.preventDefault(); ipc.app.openExternal('https://concreteinfo.co.in'); }}
+        >
+          ConcreteInfo
+        </a>
+      </p>
+      <p className="text-xs text-muted-foreground">© ConcreteInfo. Licensed under MIT.</p>
+    </div>
+  );
+}

src/renderer/components/modals/ConfirmDialog.tsx

@@ -0,0 +1,36 @@
+import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from '@/components/ui/dialog';
+import { Button } from '@/components/ui/button';
+import { useAppStore, type ConfirmProps } from '@/stores/app-store';
+
+export function ConfirmDialog(props: ConfirmProps) {
+  const closeModal = useAppStore((s) => s.closeModal);
+  const { title, body, confirmLabel = 'Confirm', cancelLabel = 'Cancel', destructive, onConfirm, onCancel } = props;
+
+  const handleConfirm = async () => {
+    await onConfirm();
+    closeModal();
+  };
+  const handleCancel = () => {
+    onCancel?.();
+    closeModal();
+  };
+
+  return (
+    <Dialog open onOpenChange={(o) => !o && handleCancel()}>
+      <DialogContent aria-describedby="confirm-body">
+        <DialogHeader>
+          <DialogTitle>{title}</DialogTitle>
+          <DialogDescription id="confirm-body">{body}</DialogDescription>
+        </DialogHeader>
+        <DialogFooter>
+          <Button variant="ghost" onClick={handleCancel}>
+            {cancelLabel}
+          </Button>
+          <Button variant={destructive ? 'destructive' : 'default'} onClick={handleConfirm}>
+            {confirmLabel}
+          </Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+}

src/renderer/components/modals/EditorSettings.tsx

@@ -0,0 +1,41 @@
+import { useSettingsStore } from '@/stores/settings-store';
+import { Label } from '@/components/ui/label';
+import { Slider } from '@/components/ui/slider';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
+import { Switch } from '@/components/ui/switch';
+
+export function EditorSettings() {
+  const { fontSize, tabSize, lineNumbers, wordWrap, minimap, setSetting } = useSettingsStore();
+
+  return (
+    <div className="space-y-5 text-sm">
+      <div>
+        <Label htmlFor="editor-font-size">Font size: {fontSize}px</Label>
+        <Slider id="editor-font-size" min={10} max={24} step={1} value={[fontSize]} onValueChange={([v]) => setSetting('fontSize', v)} />
+      </div>
+      <div>
+        <Label htmlFor="editor-tab-size">Tab size</Label>
+        <Select value={String(tabSize)} onValueChange={(v) => setSetting('tabSize', Number(v) as 2 | 4 | 8)}>
+          <SelectTrigger id="editor-tab-size" aria-label="Tab size"><SelectValue /></SelectTrigger>
+          <SelectContent>
+            <SelectItem value="2">2 spaces</SelectItem>
+            <SelectItem value="4">4 spaces</SelectItem>
+            <SelectItem value="8">8 spaces</SelectItem>
+          </SelectContent>
+        </Select>
+      </div>
+      <label className="flex items-center justify-between">
+        <span>Line numbers</span>
+        <Switch checked={lineNumbers} onCheckedChange={(c) => setSetting('lineNumbers', c)} aria-label="Line numbers" />
+      </label>
+      <label className="flex items-center justify-between">
+        <span>Word wrap</span>
+        <Switch checked={wordWrap} onCheckedChange={(c) => setSetting('wordWrap', c)} aria-label="Word wrap" />
+      </label>
+      <label className="flex items-center justify-between">
+        <span>Minimap</span>
+        <Switch checked={minimap} onCheckedChange={(c) => setSetting('minimap', c)} aria-label="Minimap" />
+      </label>
+    </div>
+  );
+}

src/renderer/components/modals/ExportBatchDialog.tsx

@@ -0,0 +1,82 @@
+import { useState } from 'react';
+import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from '@/components/ui/dialog';
+import { Label } from '@/components/ui/label';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
+import { useAppStore } from '@/stores/app-store';
+import { ipc } from '@/lib/ipc';
+import { toast } from '@/lib/toast';
+import { ExportDialogFooter } from './ExportDialogFooter';
+
+const extFor = (format: 'pdf' | 'docx' | 'html' | 'png') =>
+  format === 'pdf' ? '.pdf' : format === 'docx' ? '.docx' : format === 'png' ? '.png' : '.html';
+
+export function ExportBatchDialog({ sourcePaths }: { sourcePaths: string[] }) {
+  const closeModal = useAppStore((s) => s.closeModal);
+  const [format, setFormat] = useState<'pdf' | 'docx' | 'html' | 'png'>('pdf');
+  const [concurrency, setConcurrency] = useState(4);
+  const [submitting, setSubmitting] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+
+  const handleSubmit = async () => {
+    setSubmitting(true);
+    setError(null);
+    const items = sourcePaths.map((p) => ({
+      inputPath: p,
+      outputPath: p.replace(/\.md$/, extFor(format)),
+    }));
+    const result = await ipc.export.batch(items, { format, concurrency });
+    if (!result.ok) {
+      toast.error(`Export failed: ${result.error.message}`);
+      setError(result.error.message);
+      setSubmitting(false);
+    } else {
+      toast.success(`Exported ${sourcePaths.length} files`);
+      closeModal();
+    }
+  };
+
+  return (
+    <Dialog open onOpenChange={(o) => !o && closeModal()}>
+      <DialogContent aria-describedby="batch-desc">
+        <DialogHeader>
+          <DialogTitle>Batch export</DialogTitle>
+          <DialogDescription id="batch-desc">{sourcePaths.length} files</DialogDescription>
+        </DialogHeader>
+        <div className="space-y-3 text-sm">
+          <div>
+            <Label htmlFor="batch-format">Format</Label>
+            <Select value={format} onValueChange={(v) => setFormat(v as any)}>
+              <SelectTrigger id="batch-format" aria-label="Format"><SelectValue /></SelectTrigger>
+              <SelectContent>
+                <SelectItem value="pdf">PDF</SelectItem>
+                <SelectItem value="docx">DOCX</SelectItem>
+                <SelectItem value="html">HTML</SelectItem>
+                <SelectItem value="png">PNG</SelectItem>
+              </SelectContent>
+            </Select>
+          </div>
+          <div>
+            <Label htmlFor="batch-concurrency">Concurrency</Label>
+            <Select value={String(concurrency)} onValueChange={(v) => setConcurrency(Number(v))}>
+              <SelectTrigger id="batch-concurrency" aria-label="Concurrency"><SelectValue /></SelectTrigger>
+              <SelectContent>
+                {[1, 2, 4, 8, 16].map((n) => (
+                  <SelectItem key={n} value={String(n)}>{n}</SelectItem>
+                ))}
+              </SelectContent>
+            </Select>
+          </div>
+          <div className="max-h-40 overflow-auto rounded border border-border bg-card/20 p-2 text-xs">
+            {sourcePaths.map((p) => <div key={p} className="truncate">{p}</div>)}
+          </div>
+          {error && (
+            <div role="alert" className="rounded border border-destructive/40 bg-destructive/5 p-2 text-xs text-destructive">
+              {error}
+            </div>
+          )}
+        </div>
+        <ExportDialogFooter onCancel={closeModal} onSubmit={handleSubmit} submitting={submitting} submitLabel="Export" />
+      </DialogContent>
+    </Dialog>
+  );
+}

src/renderer/components/modals/ExportDialogFooter.tsx

@@ -0,0 +1,23 @@
+import { Button } from '@/components/ui/button';
+import { DialogFooter } from '@/components/ui/dialog';
+
+interface Props {
+  onCancel: () => void;
+  onSubmit: () => void;
+  submitting: boolean;
+  submitLabel: string;
+  submitDisabled?: boolean;
+}
+
+export function ExportDialogFooter({ onCancel, onSubmit, submitting, submitLabel, submitDisabled }: Props) {
+  return (
+    <DialogFooter>
+      <Button variant="ghost" onClick={onCancel} disabled={submitting}>
+        Cancel
+      </Button>
+      <Button onClick={onSubmit} disabled={submitting || submitDisabled}>
+        {submitting ? 'Exporting…' : submitLabel}
+      </Button>
+    </DialogFooter>
+  );
+}

src/renderer/components/modals/ExportDocxDialog.tsx

@@ -0,0 +1,78 @@
+import { useState } from 'react';
+import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from '@/components/ui/dialog';
+import { Checkbox } from '@/components/ui/checkbox';
+import { Label } from '@/components/ui/label';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
+import { useAppStore } from '@/stores/app-store';
+import { useSettingsStore } from '@/stores/settings-store';
+import { useExportSource } from '@/hooks/use-export-source';
+import { ipc } from '@/lib/ipc';
+import { toast } from '@/lib/toast';
+import { ExportDialogFooter } from './ExportDialogFooter';
+
+export function ExportDocxDialog({ sourcePath }: { sourcePath: string }) {
+  const closeModal = useAppStore((s) => s.closeModal);
+  const { docxTemplate, renderTablesAsAscii } = useSettingsStore();
+  const source = useExportSource();
+  const [template, setTemplate] = useState<'standard' | 'minimal' | 'modern'>(docxTemplate);
+  const [ascii, setAscii] = useState(renderTablesAsAscii);
+  const [submitting, setSubmitting] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+
+  const handleSubmit = async () => {
+    if (!source) { setError('No file open.'); return; }
+    setSubmitting(true);
+    setError(null);
+    const result = await ipc.export.docx({
+      inputPath: source.path,
+      outputPath: source.path.replace(/\.md$/, '.docx'),
+      template,
+      renderTablesAsAscii: ascii,
+    } as any);
+    if (!result.ok) {
+      toast.error(`Export failed: ${result.error.message}`);
+      setError(result.error.message);
+      setSubmitting(false);
+    } else {
+      toast.success(`Exported ${source.title} to ${result.data?.outputPath ?? 'file'}`);
+      closeModal();
+    }
+  };
+
+  return (
+    <Dialog open onOpenChange={(o) => !o && closeModal()}>
+      <DialogContent aria-describedby="docx-desc">
+        <DialogHeader>
+          <DialogTitle>Export to DOCX</DialogTitle>
+          <DialogDescription id="docx-desc">{sourcePath}</DialogDescription>
+        </DialogHeader>
+        <div className="space-y-3 text-sm">
+          <div>
+            <Label htmlFor="docx-template">Template</Label>
+            <Select value={template} onValueChange={(v) => setTemplate(v as any)}>
+              <SelectTrigger id="docx-template" aria-label="Template"><SelectValue /></SelectTrigger>
+              <SelectContent>
+                <SelectItem value="standard">Standard</SelectItem>
+                <SelectItem value="minimal">Minimal</SelectItem>
+                <SelectItem value="modern">Modern</SelectItem>
+              </SelectContent>
+            </Select>
+            <p className="mt-1 text-xs text-muted-foreground">
+              Bundled with the app. Standard is the default; Modern adds a colored cover page.
+            </p>
+          </div>
+          <label className="flex items-center gap-2">
+            <Checkbox checked={ascii} onCheckedChange={(c) => setAscii(!!c)} aria-label="ASCII tables" />
+            Render tables as ASCII
+          </label>
+          {error && (
+            <div role="alert" className="rounded border border-destructive/40 bg-destructive/5 p-2 text-xs text-destructive">
+              {error}
+            </div>
+          )}
+        </div>
+        <ExportDialogFooter onCancel={closeModal} onSubmit={handleSubmit} submitting={submitting} submitLabel="Export" />
+      </DialogContent>
+    </Dialog>
+  );
+}

src/renderer/components/modals/ExportHtmlDialog.tsx

@@ -0,0 +1,82 @@
+import { useState } from 'react';
+import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from '@/components/ui/dialog';
+import { Checkbox } from '@/components/ui/checkbox';
+import { Label } from '@/components/ui/label';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
+import { useAppStore } from '@/stores/app-store';
+import { useSettingsStore } from '@/stores/settings-store';
+import { useExportSource } from '@/hooks/use-export-source';
+import { ipc } from '@/lib/ipc';
+import { toast } from '@/lib/toast';
+import { ExportDialogFooter } from './ExportDialogFooter';
+
+export function ExportHtmlDialog({ sourcePath }: { sourcePath: string }) {
+  const closeModal = useAppStore((s) => s.closeModal);
+  const { htmlHighlightStyle, renderTablesAsAscii } = useSettingsStore();
+  const source = useExportSource();
+  const [standalone, setStandalone] = useState(true);
+  const [highlight, setHighlight] = useState(htmlHighlightStyle);
+  const [ascii, setAscii] = useState(renderTablesAsAscii);
+  const [submitting, setSubmitting] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+
+  const handleSubmit = async () => {
+    if (!source) { setError('No file open.'); return; }
+    setSubmitting(true);
+    setError(null);
+    const result = await ipc.export.html({
+      inputPath: source.path,
+      outputPath: source.path.replace(/\.md$/, '.html'),
+      standalone,
+      highlightStyle: highlight,
+      renderTablesAsAscii: ascii,
+    } as any);
+    if (!result.ok) {
+      toast.error(`Export failed: ${result.error.message}`);
+      setError(result.error.message);
+      setSubmitting(false);
+    } else {
+      toast.success(`Exported ${source.title} to ${result.data?.outputPath ?? 'file'}`);
+      closeModal();
+    }
+  };
+
+  return (
+    <Dialog open onOpenChange={(o) => !o && closeModal()}>
+      <DialogContent aria-describedby="html-desc">
+        <DialogHeader>
+          <DialogTitle>Export to HTML</DialogTitle>
+          <DialogDescription id="html-desc">{sourcePath}</DialogDescription>
+        </DialogHeader>
+        <div className="space-y-3 text-sm">
+          <label className="flex items-center gap-2">
+            <Checkbox checked={standalone} onCheckedChange={(c) => setStandalone(!!c)} aria-label="Standalone" />
+            Standalone document (with inline CSS)
+          </label>
+          <div>
+            <Label htmlFor="html-highlight">Syntax highlight style</Label>
+            <Select value={highlight} onValueChange={(v) => setHighlight(v as any)}>
+              <SelectTrigger id="html-highlight" aria-label="Highlight style"><SelectValue /></SelectTrigger>
+              <SelectContent>
+                <SelectItem value="github">GitHub</SelectItem>
+                <SelectItem value="monokai">Monokai</SelectItem>
+                <SelectItem value="nord">Nord</SelectItem>
+                <SelectItem value="none">None</SelectItem>
+              </SelectContent>
+            </Select>
+          </div>
+          <label className="flex items-center gap-2">
+            <Checkbox checked={ascii} onCheckedChange={(c) => setAscii(!!c)} aria-label="ASCII tables" />
+            Render tables as ASCII
+          </label>
+          {error && (
+            <div role="alert" className="rounded border border-destructive/40 bg-destructive/5 p-2 text-xs text-destructive">
+              {error}
+            </div>
+          )}
+        </div>
+        <ExportDialogFooter onCancel={closeModal} onSubmit={handleSubmit} submitting={submitting} submitLabel="Export" />
+      </DialogContent>
+    </Dialog>
+  );
+}

src/renderer/components/modals/ExportPdfDialog.tsx

@@ -0,0 +1,105 @@
+import { useState } from 'react';
+import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from '@/components/ui/dialog';
+import { Checkbox } from '@/components/ui/checkbox';
+import { Label } from '@/components/ui/label';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
+import { useAppStore } from '@/stores/app-store';
+import { useSettingsStore } from '@/stores/settings-store';
+import { useExportSource } from '@/hooks/use-export-source';
+import { ipc } from '@/lib/ipc';
+import { toast } from '@/lib/toast';
+import { ExportDialogFooter } from './ExportDialogFooter';
+
+const MARGIN_MAP = {
+  normal: { top: 25, right: 25, bottom: 25, left: 25 },
+  narrow: { top: 15, right: 15, bottom: 15, left: 15 },
+  wide: { top: 35, right: 35, bottom: 35, left: 35 },
+} as const;
+
+export function ExportPdfDialog({ sourcePath }: { sourcePath: string }) {
+  const closeModal = useAppStore((s) => s.closeModal);
+  const { fontSize, pdfFormat, pdfMargins, pdfEmbedFonts, renderTablesAsAscii } = useSettingsStore();
+  const [format, setFormat] = useState<'letter' | 'a4' | 'legal'>(pdfFormat);
+  const [margins, setMargins] = useState<'normal' | 'narrow' | 'wide'>(pdfMargins);
+  const [embed, setEmbed] = useState(pdfEmbedFonts);
+  const [ascii, setAscii] = useState(renderTablesAsAscii);
+  const [submitting, setSubmitting] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+
+  const source = useExportSource();
+
+  const handleSubmit = async () => {
+    if (!source) {
+      setError('No file open.');
+      return;
+    }
+    setSubmitting(true);
+    setError(null);
+    const result = await ipc.export.pdf({
+      inputPath: source.path,
+      outputPath: source.path.replace(/\.md$/, '.pdf'),
+      format,
+      margins: MARGIN_MAP[margins],
+      embedFonts: embed,
+      renderTablesAsAscii: ascii,
+      fontSize,
+    } as any);
+    if (!result.ok) {
+      toast.error(`Export failed: ${result.error?.message ?? 'Export failed'}`);
+      setError(result.error?.message ?? 'Export failed');
+      setSubmitting(false);
+    } else {
+      toast.success(`Exported ${source.title} to ${result.data?.outputPath ?? 'file'}`);
+      closeModal();
+    }
+  };
+
+  return (
+    <Dialog open onOpenChange={(o) => !o && closeModal()}>
+      <DialogContent aria-describedby="pdf-desc">
+        <DialogHeader>
+          <DialogTitle>Export to PDF</DialogTitle>
+          <DialogDescription id="pdf-desc">{sourcePath}</DialogDescription>
+        </DialogHeader>
+        <div className="space-y-3 text-sm">
+          <div>
+            <Label htmlFor="pdf-format">Format</Label>
+            <Select value={format} onValueChange={(v) => setFormat(v as typeof format)}>
+              <SelectTrigger id="pdf-format" aria-label="Format"><SelectValue /></SelectTrigger>
+              <SelectContent>
+                <SelectItem value="letter">Letter</SelectItem>
+                <SelectItem value="a4">A4</SelectItem>
+                <SelectItem value="legal">Legal</SelectItem>
+              </SelectContent>
+            </Select>
+          </div>
+          <div>
+            <Label htmlFor="pdf-margins">Margins</Label>
+            <Select value={margins} onValueChange={(v) => setMargins(v as typeof margins)}>
+              <SelectTrigger id="pdf-margins" aria-label="Margins"><SelectValue /></SelectTrigger>
+              <SelectContent>
+                <SelectItem value="narrow">Narrow</SelectItem>
+                <SelectItem value="normal">Normal</SelectItem>
+                <SelectItem value="wide">Wide</SelectItem>
+              </SelectContent>
+            </Select>
+          </div>
+          <label className="flex items-center gap-2">
+            <Checkbox checked={embed} onCheckedChange={(c) => setEmbed(!!c)} aria-label="Embed fonts" />
+            Embed fonts
+          </label>
+          <label className="flex items-center gap-2">
+            <Checkbox checked={ascii} onCheckedChange={(c) => setAscii(!!c)} aria-label="ASCII tables" />
+            Render tables as ASCII
+          </label>
+          {error && (
+            <div role="alert" className="rounded border border-destructive/40 bg-destructive/5 p-2 text-xs text-destructive">
+              {error}
+            </div>
+          )}
+        </div>
+        <ExportDialogFooter onCancel={closeModal} onSubmit={handleSubmit} submitting={submitting} submitLabel="Export" />
+      </DialogContent>
+    </Dialog>
+  );
+}

src/renderer/components/modals/ExportSettings.tsx

@@ -0,0 +1,66 @@
+import { useSettingsStore } from '@/stores/settings-store';
+import { Label } from '@/components/ui/label';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
+import { Switch } from '@/components/ui/switch';
+
+export function ExportSettings() {
+  const { pdfFormat, pdfMargins, pdfEmbedFonts, docxTemplate, htmlHighlightStyle, renderTablesAsAscii, setSetting } = useSettingsStore();
+
+  return (
+    <div className="space-y-5 text-sm">
+      <div>
+        <Label htmlFor="export-pdf-format">Default PDF format</Label>
+        <Select value={pdfFormat} onValueChange={(v) => setSetting('pdfFormat', v as any)}>
+          <SelectTrigger id="export-pdf-format" aria-label="Default PDF format"><SelectValue /></SelectTrigger>
+          <SelectContent>
+            <SelectItem value="letter">Letter</SelectItem>
+            <SelectItem value="a4">A4</SelectItem>
+            <SelectItem value="legal">Legal</SelectItem>
+          </SelectContent>
+        </Select>
+      </div>
+      <div>
+        <Label htmlFor="export-pdf-margins">Default PDF margins</Label>
+        <Select value={pdfMargins} onValueChange={(v) => setSetting('pdfMargins', v as any)}>
+          <SelectTrigger id="export-pdf-margins" aria-label="Default PDF margins"><SelectValue /></SelectTrigger>
+          <SelectContent>
+            <SelectItem value="narrow">Narrow</SelectItem>
+            <SelectItem value="normal">Normal</SelectItem>
+            <SelectItem value="wide">Wide</SelectItem>
+          </SelectContent>
+        </Select>
+      </div>
+      <label className="flex items-center justify-between">
+        <span>Embed fonts in PDFs</span>
+        <Switch checked={pdfEmbedFonts} onCheckedChange={(c) => setSetting('pdfEmbedFonts', c)} aria-label="Embed fonts" />
+      </label>
+      <div>
+        <Label htmlFor="export-docx-template">Default DOCX template</Label>
+        <Select value={docxTemplate} onValueChange={(v) => setSetting('docxTemplate', v as any)}>
+          <SelectTrigger id="export-docx-template" aria-label="Default DOCX template"><SelectValue /></SelectTrigger>
+          <SelectContent>
+            <SelectItem value="standard">Standard</SelectItem>
+            <SelectItem value="minimal">Minimal</SelectItem>
+            <SelectItem value="modern">Modern</SelectItem>
+          </SelectContent>
+        </Select>
+      </div>
+      <div>
+        <Label htmlFor="export-html-highlight">Default HTML highlight</Label>
+        <Select value={htmlHighlightStyle} onValueChange={(v) => setSetting('htmlHighlightStyle', v as any)}>
+          <SelectTrigger id="export-html-highlight" aria-label="Default HTML highlight"><SelectValue /></SelectTrigger>
+          <SelectContent>
+            <SelectItem value="github">GitHub</SelectItem>
+            <SelectItem value="monokai">Monokai</SelectItem>
+            <SelectItem value="nord">Nord</SelectItem>
+            <SelectItem value="none">None</SelectItem>
+          </SelectContent>
+        </Select>
+      </div>
+      <label className="flex items-center justify-between">
+        <span>Render tables as ASCII by default</span>
+        <Switch checked={renderTablesAsAscii} onCheckedChange={(c) => setSetting('renderTablesAsAscii', c)} aria-label="ASCII tables by default" />
+      </label>
+    </div>
+  );
+}

src/renderer/components/modals/ModalLayer.tsx

@@ -0,0 +1,33 @@
+import { useAppStore } from '@/stores/app-store';
+import { AboutDialog } from './AboutDialog';
+import { ConfirmDialog } from './ConfirmDialog';
+import { ExportBatchDialog } from './ExportBatchDialog';
+import { ExportDocxDialog } from './ExportDocxDialog';
+import { ExportHtmlDialog } from './ExportHtmlDialog';
+import { ExportPdfDialog } from './ExportPdfDialog';
+import { SettingsSheet } from './SettingsSheet';
+import { WelcomeDialog } from './WelcomeDialog';
+
+export function ModalLayer() {
+  const modal = useAppStore((s) => s.modal);
+  switch (modal.kind) {
+    case null:
+      return null;
+    case 'export-pdf':
+      return <ExportPdfDialog sourcePath={modal.props.sourcePath} />;
+    case 'export-docx':
+      return <ExportDocxDialog sourcePath={modal.props.sourcePath} />;
+    case 'export-html':
+      return <ExportHtmlDialog sourcePath={modal.props.sourcePath} />;
+    case 'export-batch':
+      return <ExportBatchDialog sourcePaths={modal.props.sourcePaths} />;
+    case 'settings':
+      return <SettingsSheet />;
+    case 'about':
+      return <AboutDialog />;
+    case 'welcome':
+      return <WelcomeDialog />;
+    case 'confirm':
+      return <ConfirmDialog {...modal.props} />;
+  }
+}

src/renderer/components/modals/PluginsSettings.tsx

@@ -0,0 +1,14 @@
+import { Sparkles } from 'lucide-react';
+
+export function PluginsSettings() {
+  return (
+    <div className="flex flex-col items-center justify-center gap-3 py-12 text-center text-muted-foreground">
+      <Sparkles className="h-8 w-8 opacity-50" />
+      <h3 className="text-base font-semibold text-foreground">Coming soon</h3>
+      <p className="max-w-sm text-sm">
+        The plugin system is on the roadmap. You'll be able to extend MarkdownConverter with custom
+        commands, themes, and export formats.
+      </p>
+    </div>
+  );
+}

src/renderer/components/modals/SettingsSheet.tsx

@@ -0,0 +1,45 @@
+import { Sheet, SheetContent, SheetDescription, SheetHeader, SheetTitle } from '@/components/ui/sheet';
+import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs';
+import { Button } from '@/components/ui/button';
+import { useAppStore } from '@/stores/app-store';
+import { useSettingsStore } from '@/stores/settings-store';
+import { EditorSettings } from './EditorSettings';
+import { ThemeSettings } from './ThemeSettings';
+import { ExportSettings } from './ExportSettings';
+import { PluginsSettings } from './PluginsSettings';
+import { AboutSettings } from './AboutSettings';
+
+export function SettingsSheet() {
+  const closeModal = useAppStore((s) => s.closeModal);
+  const resetToDefaults = useSettingsStore((s) => s.resetToDefaults);
+
+  return (
+    <Sheet open onOpenChange={(o) => !o && closeModal()}>
+      <SheetContent aria-describedby="settings-desc" side="right" className="w-full sm:max-w-[480px]">
+        <SheetHeader>
+          <SheetTitle>Settings</SheetTitle>
+          <SheetDescription id="settings-desc">Editor, theme, and export preferences</SheetDescription>
+        </SheetHeader>
+        <Tabs defaultValue="editor" className="mt-4">
+          <TabsList className="grid w-full grid-cols-5">
+            <TabsTrigger value="editor">Editor</TabsTrigger>
+            <TabsTrigger value="theme">Theme</TabsTrigger>
+            <TabsTrigger value="export">Export</TabsTrigger>
+            <TabsTrigger value="plugins">Plugins</TabsTrigger>
+            <TabsTrigger value="about">About</TabsTrigger>
+          </TabsList>
+          <div className="mt-4 max-h-[70vh] overflow-y-auto pr-2">
+            <TabsContent value="editor"><EditorSettings /></TabsContent>
+            <TabsContent value="theme"><ThemeSettings /></TabsContent>
+            <TabsContent value="export"><ExportSettings /></TabsContent>
+            <TabsContent value="plugins"><PluginsSettings /></TabsContent>
+            <TabsContent value="about"><AboutSettings /></TabsContent>
+          </div>
+        </Tabs>
+        <div className="mt-4 flex justify-end border-t border-border pt-4">
+          <Button variant="ghost" onClick={resetToDefaults}>Reset to defaults</Button>
+        </div>
+      </SheetContent>
+    </Sheet>
+  );
+}

src/renderer/components/modals/ThemeSettings.tsx

@@ -0,0 +1,45 @@
+import { useSettingsStore } from '@/stores/settings-store';
+import { Label } from '@/components/ui/label';
+import { RadioGroup, RadioGroupItem } from '@/components/ui/radio-group';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
+
+export function ThemeSettings() {
+  const { theme, accentColor, fontFamily, setSetting } = useSettingsStore();
+
+  return (
+    <div className="space-y-5 text-sm">
+      <div>
+        <Label>Mode</Label>
+        <RadioGroup value={theme} onValueChange={(v) => setSetting('theme', v as 'light' | 'dark' | 'auto')}>
+          <div className="flex items-center gap-2"><RadioGroupItem value="light" id="theme-light" /><Label htmlFor="theme-light">Light</Label></div>
+          <div className="flex items-center gap-2"><RadioGroupItem value="dark" id="theme-dark" /><Label htmlFor="theme-dark">Dark</Label></div>
+          <div className="flex items-center gap-2"><RadioGroupItem value="auto" id="theme-auto" /><Label htmlFor="theme-auto">Auto (system)</Label></div>
+        </RadioGroup>
+      </div>
+      <div>
+        <Label htmlFor="theme-accent">Accent color</Label>
+        <Select value={accentColor} onValueChange={(v) => setSetting('accentColor', v as any)}>
+          <SelectTrigger id="theme-accent" aria-label="Accent color"><SelectValue /></SelectTrigger>
+          <SelectContent>
+            <SelectItem value="brand">Brand (orange)</SelectItem>
+            <SelectItem value="blue">Blue</SelectItem>
+            <SelectItem value="green">Green</SelectItem>
+            <SelectItem value="purple">Purple</SelectItem>
+            <SelectItem value="orange">Orange</SelectItem>
+          </SelectContent>
+        </Select>
+      </div>
+      <div>
+        <Label htmlFor="theme-font-family">Editor font</Label>
+        <Select value={fontFamily} onValueChange={(v) => setSetting('fontFamily', v as any)}>
+          <SelectTrigger id="theme-font-family" aria-label="Editor font"><SelectValue /></SelectTrigger>
+          <SelectContent>
+            <SelectItem value="system">System (Plus Jakarta Sans)</SelectItem>
+            <SelectItem value="jetbrains">JetBrains Mono</SelectItem>
+            <SelectItem value="fira">Fira Code</SelectItem>
+          </SelectContent>
+        </Select>
+      </div>
+    </div>
+  );
+}

src/renderer/components/modals/WelcomeDialog.tsx

@@ -0,0 +1,51 @@
+import { useState } from 'react';
+import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from '@/components/ui/dialog';
+import { Button } from '@/components/ui/button';
+import { Checkbox } from '@/components/ui/checkbox';
+import { useAppStore } from '@/stores/app-store';
+import { useSettingsStore } from '@/stores/settings-store';
+
+export function WelcomeDialog() {
+  const closeModal = useAppStore((s) => s.closeModal);
+  const setSetting = useSettingsStore((s) => s.setSetting);
+  const [dontShow, setDontShow] = useState(false);
+
+  const handleClose = () => {
+    if (dontShow) setSetting('welcomeDismissed', true);
+    closeModal();
+  };
+
+  return (
+    <Dialog open onOpenChange={(o) => !o && handleClose()}>
+      <DialogContent aria-describedby="welcome-desc" className="max-w-xl">
+        <DialogHeader>
+          <DialogTitle>Welcome to MarkdownConverter</DialogTitle>
+          <DialogDescription id="welcome-desc">
+            A polished editor for Markdown, with PDF, DOCX, and HTML export.
+          </DialogDescription>
+        </DialogHeader>
+        <div className="space-y-3 text-sm">
+          <div className="rounded-md border border-border bg-card/30 p-3">
+            <h3 className="font-semibold">1. Open a folder</h3>
+            <p className="text-muted-foreground">File → Open Folder, or ⌘O. Your tree appears on the left.</p>
+          </div>
+          <div className="rounded-md border border-border bg-card/30 p-3">
+            <h3 className="font-semibold">2. Edit & preview</h3>
+            <p className="text-muted-foreground">Type on the left, see the rendered preview on the right. Toggle with ⌘\.</p>
+          </div>
+          <div className="rounded-md border border-border bg-card/30 p-3">
+            <h3 className="font-semibold">3. Export anywhere</h3>
+            <p className="text-muted-foreground">File → Export to PDF / DOCX / HTML, or batch convert a folder.</p>
+          </div>
+        </div>
+        <DialogFooter className="flex-row items-center justify-between sm:justify-between">
+          <label className="flex items-center gap-2 text-xs text-muted-foreground">
+            <Checkbox checked={dontShow} onCheckedChange={(c) => setDontShow(!!c)} aria-label="Don't show again" />
+            Don't show again
+          </label>
+          <Button onClick={handleClose}>Get started</Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+}

src/renderer/components/ui/checkbox.tsx

@@ -0,0 +1,27 @@
+import * as React from "react"
+import * as CheckboxPrimitive from "@radix-ui/react-checkbox"
+import { Check } from "lucide-react"
+import { cn } from "@/lib/utils"
+
+const Checkbox = React.forwardRef<
+  React.ElementRef<typeof CheckboxPrimitive.Root>,
+  React.ComponentPropsWithoutRef<typeof CheckboxPrimitive.Root>
+>(({ className, ...props }, ref) => (
+  <CheckboxPrimitive.Root
+    ref={ref}
+    className={cn(
+      "peer h-4 w-4 shrink-0 rounded-sm border border-primary ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground",
+      className
+    )}
+    {...props}
+  >
+    <CheckboxPrimitive.Indicator
+      className={cn("flex items-center justify-center text-current")}
+    >
+      <Check className="h-4 w-4" />
+    </CheckboxPrimitive.Indicator>
+  </CheckboxPrimitive.Root>
+))
+Checkbox.displayName = CheckboxPrimitive.Root.displayName
+
+export { Checkbox }

src/renderer/components/ui/dialog.tsx

@@ -0,0 +1,158 @@
+"use client"
+
+import * as React from "react"
+import { XIcon } from "lucide-react"
+import * as DialogPrimitive from "@radix-ui/react-dialog"
+
+import { cn } from "@/lib/utils"
+import { Button } from "@/components/ui/button"
+
+function Dialog({
+  ...props
+}: React.ComponentProps<typeof DialogPrimitive.Root>) {
+  return <DialogPrimitive.Root data-slot="dialog" {...props} />
+}
+
+function DialogTrigger({
+  ...props
+}: React.ComponentProps<typeof DialogPrimitive.Trigger>) {
+  return <DialogPrimitive.Trigger data-slot="dialog-trigger" {...props} />
+}
+
+function DialogPortal({
+  ...props
+}: React.ComponentProps<typeof DialogPrimitive.Portal>) {
+  return <DialogPrimitive.Portal data-slot="dialog-portal" {...props} />
+}
+
+function DialogClose({
+  ...props
+}: React.ComponentProps<typeof DialogPrimitive.Close>) {
+  return <DialogPrimitive.Close data-slot="dialog-close" {...props} />
+}
+
+function DialogOverlay({
+  className,
+  ...props
+}: React.ComponentProps<typeof DialogPrimitive.Overlay>) {
+  return (
+    <DialogPrimitive.Overlay
+      data-slot="dialog-overlay"
+      className={cn(
+        "fixed inset-0 z-50 bg-black/50 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:animate-in data-[state=open]:fade-in-0",
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+function DialogContent({
+  className,
+  children,
+  showCloseButton = true,
+  ...props
+}: React.ComponentProps<typeof DialogPrimitive.Content> & {
+  showCloseButton?: boolean
+}) {
+  return (
+    <DialogPortal data-slot="dialog-portal">
+      <DialogOverlay />
+      <DialogPrimitive.Content
+        data-slot="dialog-content"
+        className={cn(
+          "fixed top-[50%] left-[50%] z-50 grid w-full max-w-[calc(100%-2rem)] translate-x-[-50%] translate-y-[-50%] gap-4 rounded-lg border bg-background p-6 shadow-lg duration-200 outline-none data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=open]:zoom-in-95 sm:max-w-lg",
+          className
+        )}
+        {...props}
+      >
+        {children}
+        {showCloseButton && (
+          <DialogPrimitive.Close
+            data-slot="dialog-close"
+            className="absolute top-4 right-4 rounded-xs opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:ring-2 focus:ring-ring focus:ring-offset-2 focus:outline-hidden disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4"
+          >
+            <XIcon />
+            <span className="sr-only">Close</span>
+          </DialogPrimitive.Close>
+        )}
+      </DialogPrimitive.Content>
+    </DialogPortal>
+  )
+}
+
+function DialogHeader({ className, ...props }: React.ComponentProps<"div">) {
+  return (
+    <div
+      data-slot="dialog-header"
+      className={cn("flex flex-col gap-2 text-center sm:text-left", className)}
+      {...props}
+    />
+  )
+}
+
+function DialogFooter({
+  className,
+  showCloseButton = false,
+  children,
+  ...props
+}: React.ComponentProps<"div"> & {
+  showCloseButton?: boolean
+}) {
+  return (
+    <div
+      data-slot="dialog-footer"
+      className={cn(
+        "flex flex-col-reverse gap-2 sm:flex-row sm:justify-end",
+        className
+      )}
+      {...props}
+    >
+      {children}
+      {showCloseButton && (
+        <DialogPrimitive.Close asChild>
+          <Button variant="outline">Close</Button>
+        </DialogPrimitive.Close>
+      )}
+    </div>
+  )
+}
+
+function DialogTitle({
+  className,
+  ...props
+}: React.ComponentProps<typeof DialogPrimitive.Title>) {
+  return (
+    <DialogPrimitive.Title
+      data-slot="dialog-title"
+      className={cn("text-lg leading-none font-semibold", className)}
+      {...props}
+    />
+  )
+}
+
+function DialogDescription({
+  className,
+  ...props
+}: React.ComponentProps<typeof DialogPrimitive.Description>) {
+  return (
+    <DialogPrimitive.Description
+      data-slot="dialog-description"
+      className={cn("text-sm text-muted-foreground", className)}
+      {...props}
+    />
+  )
+}
+
+export {
+  Dialog,
+  DialogClose,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogOverlay,
+  DialogPortal,
+  DialogTitle,
+  DialogTrigger,
+}

src/renderer/components/ui/form.tsx

@@ -0,0 +1,153 @@
+"use client"
+
+import * as React from "react"
+import * as LabelPrimitive from "@radix-ui/react-label"
+import { Slot } from "@radix-ui/react-slot"
+import {
+  Controller,
+  type ControllerProps,
+  type FieldPath,
+  type FieldValues,
+  useFormContext,
+} from "react-hook-form"
+
+import { cn } from "@/lib/utils"
+
+const Form = React.forwardRef<
+  HTMLFormElement,
+  React.ComponentProps<"form">
+>(({ className, ...props }, ref) => {
+  const methods = useFormContext()
+  return (
+    <form ref={ref} className={className} onSubmit={methods.handleSubmit(() => {})} {...props} />
+  )
+})
+Form.displayName = "Form"
+
+// ============================================================
+// FormFieldContext - provides field-level context
+// ============================================================
+
+const FormFieldContext = React.createContext<
+  ControllerProps<FieldValues, string>
+>({} as never)
+
+const FormField = <
+  TFieldValues extends FieldValues = FieldValues,
+  TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>
+>({
+  ...props
+}: ControllerProps<TFieldValues, TName>) => {
+  const { name } = props
+
+  return (
+    <FormFieldContext.Provider value={props as ControllerProps<FieldValues, string>}>
+      <Controller {...props} />
+    </FormFieldContext.Provider>
+  )
+}
+
+// ============================================================
+// useFormField - must be used inside a FormField
+// ============================================================
+
+function useFormField(): ControllerProps<FieldValues, string> {
+  const fieldContext = React.useContext(FormFieldContext)
+  if (!fieldContext) {
+    throw new Error("useFormField must be used within a FormField")
+  }
+  return fieldContext
+}
+
+// ============================================================
+// FormItem - wraps a labeled form control
+// ============================================================
+
+const FormItem = React.forwardRef<
+  HTMLDivElement,
+  React.HTMLAttributes<HTMLDivElement>
+>(({ className, ...props }, ref) => (
+  <div ref={ref} className={cn("space-y-2", className)} {...props} />
+))
+FormItem.displayName = "FormItem"
+
+// ============================================================
+// FormLabel
+// ============================================================
+
+const FormLabel = React.forwardRef<
+  React.ElementRef<typeof LabelPrimitive.Root>,
+  React.ComponentPropsWithoutRef<typeof LabelPrimitive.Root>
+>(({ className, ...props }, ref) => (
+  <LabelPrimitive.Root
+    ref={ref}
+    className={cn(
+      "text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70",
+      className
+    )}
+    {...props}
+  />
+))
+FormLabel.displayName = LabelPrimitive.Root.displayName
+
+// ============================================================
+// FormControl - Slot bridge
+// ============================================================
+
+const FormControl = React.forwardRef<
+  React.ElementRef<typeof Slot>,
+  React.ComponentPropsWithoutRef<typeof Slot>
+>(({ ...props }, ref) => (
+  <Slot ref={ref} {...props} />
+))
+FormControl.displayName = "FormControl"
+
+// ============================================================
+// FormDescription
+// ============================================================
+
+const FormDescription = React.forwardRef<
+  HTMLParagraphElement,
+  React.HTMLAttributes<HTMLParagraphElement>
+>(({ className, ...props }, ref) => (
+  <p
+    ref={ref}
+    className={cn("text-sm text-muted-foreground", className)}
+    {...props}
+  />
+))
+FormDescription.displayName = "FormDescription"
+
+// ============================================================
+// FormMessage
+// ============================================================
+
+const FormMessage = React.forwardRef<
+  HTMLParagraphElement,
+  React.HTMLAttributes<HTMLParagraphElement>
+>(({ className, children, ...props }, ref) => {
+  const { error } = useFormField()
+  const body = error ? String(error.message ?? "") : children
+  if (!body) return null
+  return (
+    <p
+      ref={ref}
+      className={cn("text-sm font-medium text-destructive", className)}
+      {...props}
+    >
+      {body}
+    </p>
+  )
+})
+FormMessage.displayName = "FormMessage"
+
+export {
+  Form,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormControl,
+  FormDescription,
+  FormMessage,
+  useFormField,
+}

src/renderer/components/ui/input.tsx

@@ -0,0 +1,25 @@
+import * as React from "react"
+
+import { cn } from "@/lib/utils"
+
+export interface InputProps
+  extends React.InputHTMLAttributes<HTMLInputElement> {}
+
+const Input = React.forwardRef<HTMLInputElement, InputProps>(
+  ({ className, type, ...props }, ref) => {
+    return (
+      <input
+        type={type}
+        className={cn(
+          "h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50",
+          className
+        )}
+        ref={ref}
+        {...props}
+      />
+    )
+  }
+)
+Input.displayName = "Input"
+
+export { Input }

src/renderer/components/ui/label.tsx

@@ -0,0 +1,20 @@
+import * as React from "react"
+import * as LabelPrimitive from "@radix-ui/react-label"
+import { cn } from "@/lib/utils"
+
+const Label = React.forwardRef<
+  React.ElementRef<typeof LabelPrimitive.Root>,
+  React.ComponentPropsWithoutRef<typeof LabelPrimitive.Root>
+>(({ className, ...props }, ref) => (
+  <LabelPrimitive.Root
+    ref={ref}
+    className={cn(
+      "text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70",
+      className
+    )}
+    {...props}
+  />
+))
+Label.displayName = LabelPrimitive.Root.displayName
+
+export { Label }

src/renderer/components/ui/radio-group.tsx

@@ -0,0 +1,41 @@
+import * as React from "react"
+import * as RadioGroupPrimitive from "@radix-ui/react-radio-group"
+import { Circle } from "lucide-react"
+import { cn } from "@/lib/utils"
+
+const RadioGroup = React.forwardRef<
+  React.ElementRef<typeof RadioGroupPrimitive.Root>,
+  React.ComponentPropsWithoutRef<typeof RadioGroupPrimitive.Root>
+>(({ className, ...props }, ref) => {
+  return (
+    <RadioGroupPrimitive.Root
+      className={cn("grid gap-2", className)}
+      {...props}
+      ref={ref}
+    />
+  )
+})
+RadioGroup.displayName = RadioGroupPrimitive.Root.displayName
+
+const RadioGroupItem = React.forwardRef<
+  React.ElementRef<typeof RadioGroupPrimitive.Item>,
+  React.ComponentPropsWithoutRef<typeof RadioGroupPrimitive.Item>
+>(({ className, ...props }, ref) => {
+  return (
+    <RadioGroupPrimitive.Item
+      ref={ref}
+      className={cn(
+        "aspect-square h-4 w-4 rounded-full border border-primary text-primary ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50",
+        className
+      )}
+      {...props}
+    >
+      <RadioGroupPrimitive.Indicator className="flex items-center justify-center">
+        <Circle className="h-2.5 w-2.5 fill-current text-current" />
+      </RadioGroupPrimitive.Indicator>
+    </RadioGroupPrimitive.Item>
+  )
+})
+RadioGroupItem.displayName = RadioGroupPrimitive.Item.displayName
+
+export { RadioGroup, RadioGroupItem }

src/renderer/components/ui/select.tsx

@@ -0,0 +1,159 @@
+"use client"
+
+import * as React from "react"
+import * as SelectPrimitive from "@radix-ui/react-select"
+import { Check, ChevronDown, ChevronUp } from "lucide-react"
+import { cn } from "@/lib/utils"
+
+const Select = SelectPrimitive.Root
+
+const SelectGroup = SelectPrimitive.Group
+
+const SelectValue = SelectPrimitive.Value
+
+const SelectTrigger = React.forwardRef<
+  React.ElementRef<typeof SelectPrimitive.Trigger>,
+  React.ComponentPropsWithoutRef<typeof SelectPrimitive.Trigger>
+>(({ className, children, ...props }, ref) => (
+  <SelectPrimitive.Trigger
+    ref={ref}
+    className={cn(
+      "flex h-10 w-full items-center justify-between rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 [&>span]:line-clamp-1",
+      className
+    )}
+    {...props}
+  >
+    {children}
+    <SelectPrimitive.Icon asChild>
+      <ChevronDown className="h-4 w-4 opacity-50" />
+    </SelectPrimitive.Icon>
+  </SelectPrimitive.Trigger>
+))
+SelectTrigger.displayName = SelectPrimitive.Trigger.displayName
+
+const SelectScrollUpButton = React.forwardRef<
+  React.ElementRef<typeof SelectPrimitive.ScrollUpButton>,
+  React.ComponentPropsWithoutRef<typeof SelectPrimitive.ScrollUpButton>
+>(({ className, ...props }, ref) => (
+  <SelectPrimitive.ScrollUpButton
+    ref={ref}
+    className={cn(
+      "flex cursor-default items-center justify-center py-1",
+      className
+    )}
+    {...props}
+  >
+    <ChevronUp className="h-4 w-4" />
+  </SelectPrimitive.ScrollUpButton>
+))
+SelectScrollUpButton.displayName = SelectPrimitive.ScrollUpButton.displayName
+
+const SelectScrollDownButton = React.forwardRef<
+  React.ElementRef<typeof SelectPrimitive.ScrollDownButton>,
+  React.ComponentPropsWithoutRef<typeof SelectPrimitive.ScrollDownButton>
+>(({ className, ...props }, ref) => (
+  <SelectPrimitive.ScrollDownButton
+    ref={ref}
+    className={cn(
+      "flex cursor-default items-center justify-center py-1",
+      className
+    )}
+    {...props}
+  >
+    <ChevronDown className="h-4 w-4" />
+  </SelectPrimitive.ScrollDownButton>
+))
+SelectScrollDownButton.displayName =
+  SelectPrimitive.ScrollDownButton.displayName
+
+const SelectContent = React.forwardRef<
+  React.ElementRef<typeof SelectPrimitive.Content>,
+  React.ComponentPropsWithoutRef<typeof SelectPrimitive.Content>
+>(({ className, children, position = "popper", ...props }, ref) => (
+  <SelectPrimitive.Portal>
+    <SelectPrimitive.Content
+      ref={ref}
+      className={cn(
+        "relative z-50 max-h-96 min-w-[8rem] overflow-hidden rounded-md border bg-popover text-popover-foreground shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
+        position === "popper" &&
+          "data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1",
+        className
+      )}
+      position={position}
+      {...props}
+    >
+      <SelectScrollUpButton />
+      <SelectPrimitive.Viewport
+        className={cn(
+          "p-1",
+          position === "popper" &&
+            "h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)]"
+        )}
+      >
+        {children}
+      </SelectPrimitive.Viewport>
+      <SelectScrollDownButton />
+    </SelectPrimitive.Content>
+  </SelectPrimitive.Portal>
+))
+SelectContent.displayName = SelectPrimitive.Content.displayName
+
+const SelectLabel = React.forwardRef<
+  React.ElementRef<typeof SelectPrimitive.Label>,
+  React.ComponentPropsWithoutRef<typeof SelectPrimitive.Label>
+>(({ className, ...props }, ref) => (
+  <SelectPrimitive.Label
+    ref={ref}
+    className={cn("py-1.5 pl-8 pr-2 text-sm font-semibold", className)}
+    {...props}
+  />
+))
+SelectLabel.displayName = SelectPrimitive.Label.displayName
+
+const SelectItem = React.forwardRef<
+  React.ElementRef<typeof SelectPrimitive.Item>,
+  React.ComponentPropsWithoutRef<typeof SelectPrimitive.Item>
+>(({ className, children, ...props }, ref) => (
+  <SelectPrimitive.Item
+    ref={ref}
+    className={cn(
+      "relative flex w-full cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
+      className
+    )}
+    {...props}
+  >
+    <span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
+      <SelectPrimitive.ItemIndicator>
+        <Check className="h-4 w-4" />
+      </SelectPrimitive.ItemIndicator>
+    </span>
+
+    <SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText>
+  </SelectPrimitive.Item>
+))
+SelectItem.displayName = SelectPrimitive.Item.displayName
+
+const SelectSeparator = React.forwardRef<
+  React.ElementRef<typeof SelectPrimitive.Separator>,
+  React.ComponentPropsWithoutRef<typeof SelectPrimitive.Separator>
+>(({ className, ...props }, ref) => (
+  <SelectPrimitive.Separator
+    ref={ref}
+    className={cn("-mx-1 my-1 h-px bg-muted", className)}
+    {...props}
+  />
+))
+SelectSeparator.displayName = SelectPrimitive.Separator.displayName
+
+export {
+  Select,
+  SelectGroup,
+  SelectValue,
+  SelectTrigger,
+  SelectContent,
+  SelectLabel,
+  SelectItem,
+  SelectSeparator,
+  SelectScrollUpButton,
+  SelectScrollDownButton,
+}

src/renderer/components/ui/sheet.tsx

@@ -0,0 +1,146 @@
+"use client"
+
+import * as React from "react"
+import * as SheetPrimitive from "@radix-ui/react-dialog"
+import { cva, type VariantProps } from "class-variance-authority"
+import { X } from "lucide-react"
+
+import { cn } from "@/lib/utils"
+
+const Sheet = SheetPrimitive.Root
+
+const SheetTrigger = SheetPrimitive.Trigger
+
+const SheetClose = SheetPrimitive.Close
+
+const SheetPortal = ({
+  className,
+  ...props
+}: SheetPrimitive.DialogPortalProps) => (
+  <SheetPrimitive.Portal className={cn(className)} {...props} />
+)
+SheetPortal.displayName = SheetPrimitive.Portal.displayName
+
+const SheetOverlay = React.forwardRef<
+  React.ElementRef<typeof SheetPrimitive.Overlay>,
+  React.ComponentPropsWithoutRef<typeof SheetPrimitive.Overlay>
+>(({ className, ...props }, ref) => (
+  <SheetPrimitive.Overlay
+    className={cn(
+      "fixed inset-0 z-50 bg-background/80 backdrop-blur-sm data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:animate-in data-[state=open]:fade-in-0",
+      className
+    )}
+    {...props}
+    ref={ref}
+  />
+))
+SheetOverlay.displayName = SheetPrimitive.Overlay.displayName
+
+const sheetVariants = cva(
+  "fixed z-50 gap-4 bg-background p-6 shadow-lg transition ease-in-out data-[state=closed]:animate-out data-[state=closed]:duration-300 data-[state=open]:animate-in data-[state=open]:duration-500",
+  {
+    variants: {
+      side: {
+        top: "inset-x-0 top-0 border-b data-[state=closed]:slide-out-to-top data-[state=open]:slide-in-from-top",
+        bottom:
+          "inset-x-0 bottom-0 border-t data-[state=closed]:slide-out-to-bottom data-[state=open]:slide-in-from-bottom",
+        left: "inset-y-0 left-0 h-full w-3/4 border-r data-[state=closed]:slide-out-to-left data-[state=open]:slide-in-from-left sm:max-w-sm",
+        right:
+          "inset-y-0 right-0 h-full w-3/4 border-l data-[state=closed]:slide-out-to-right data-[state=open]:slide-in-from-right sm:max-w-sm"
+      }
+    },
+    defaultVariants: {
+      side: "right"
+    }
+  }
+)
+
+interface SheetContentProps
+  extends React.ComponentPropsWithoutRef<typeof SheetPrimitive.Content>,
+    VariantProps<typeof sheetVariants> {}
+
+const SheetContent = React.forwardRef<
+  React.ElementRef<typeof SheetPrimitive.Content>,
+  SheetContentProps
+>(({ side = "right", className, children, ...props }, ref) => (
+  <SheetPortal>
+    <SheetOverlay />
+    <SheetPrimitive.Content
+      ref={ref}
+      className={cn(sheetVariants({ side }), className)}
+      {...props}
+    >
+      {children}
+      <SheetPrimitive.Close className="absolute top-4 right-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:ring-2 focus:ring-ring focus:ring-offset-2 focus:outline-none disabled:pointer-events-none data-[state=open]:bg-secondary">
+        <X className="h-4 w-4" />
+        <span className="sr-only">Close</span>
+      </SheetPrimitive.Close>
+    </SheetPrimitive.Content>
+  </SheetPortal>
+))
+SheetContent.displayName = SheetPrimitive.Content.displayName
+
+const SheetHeader = ({
+  className,
+  ...props
+}: React.HTMLAttributes<HTMLDivElement>) => (
+  <div
+    className={cn(
+      "flex flex-col space-y-2 text-center sm:text-left",
+      className
+    )}
+    {...props}
+  />
+)
+SheetHeader.displayName = "SheetHeader"
+
+const SheetFooter = ({
+  className,
+  ...props
+}: React.HTMLAttributes<HTMLDivElement>) => (
+  <div
+    className={cn(
+      "flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2",
+      className
+    )}
+    {...props}
+  />
+)
+SheetFooter.displayName = "SheetFooter"
+
+const SheetTitle = React.forwardRef<
+  React.ElementRef<typeof SheetPrimitive.Title>,
+  React.ComponentPropsWithoutRef<typeof SheetPrimitive.Title>
+>(({ className, ...props }, ref) => (
+  <SheetPrimitive.Title
+    ref={ref}
+    className={cn("text-lg font-semibold text-foreground", className)}
+    {...props}
+  />
+))
+SheetTitle.displayName = SheetPrimitive.Title.displayName
+
+const SheetDescription = React.forwardRef<
+  React.ElementRef<typeof SheetPrimitive.Description>,
+  React.ComponentPropsWithoutRef<typeof SheetPrimitive.Description>
+>(({ className, ...props }, ref) => (
+  <SheetPrimitive.Description
+    ref={ref}
+    className={cn("text-sm text-muted-foreground", className)}
+    {...props}
+  />
+))
+SheetDescription.displayName = SheetPrimitive.Description.displayName
+
+export {
+  Sheet,
+  SheetPortal,
+  SheetOverlay,
+  SheetTrigger,
+  SheetClose,
+  SheetContent,
+  SheetHeader,
+  SheetFooter,
+  SheetTitle,
+  SheetDescription
+}

src/renderer/components/ui/slider.tsx

@@ -0,0 +1,33 @@
+"use client"
+
+import * as React from "react"
+import * as SliderPrimitive from "@radix-ui/react-slider"
+import { cn } from "@/lib/utils"
+
+const Slider = React.forwardRef<
+  React.ElementRef<typeof SliderPrimitive.Root>,
+  React.ComponentPropsWithoutRef<typeof SliderPrimitive.Root>
+>(({ className, ...props }, ref) => {
+  const { 'aria-label': ariaLabel, ...rest } = props;
+  return (
+    <SliderPrimitive.Root
+      ref={ref}
+      className={cn(
+        "relative flex w-full touch-none select-none items-center",
+        className
+      )}
+      {...rest}
+    >
+      <SliderPrimitive.Track className="relative h-2 w-full grow overflow-hidden rounded-full bg-secondary">
+        <SliderPrimitive.Range className="absolute h-full bg-primary" />
+      </SliderPrimitive.Track>
+      <SliderPrimitive.Thumb
+        aria-label={ariaLabel}
+        className="block h-5 w-5 rounded-full border-2 border-primary bg-background ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50"
+      />
+    </SliderPrimitive.Root>
+  );
+})
+Slider.displayName = SliderPrimitive.Root.displayName
+
+export { Slider }

src/renderer/components/ui/sonner.tsx

@@ -0,0 +1,34 @@
+"use client"
+
+import { useTheme } from "next-themes"
+import { Toaster as Sonner } from "sonner"
+
+type ToasterProps = React.ComponentProps<typeof Sonner>
+
+const Toaster = ({ ...props }: ToasterProps) => {
+  const { theme = "system" } = useTheme()
+
+  return (
+    <Sonner
+      theme={theme as ToasterProps["theme"]}
+      className="toaster group"
+      toastOptions={{
+        classNames: {
+          toast:
+            "group toast group-[.toaster]:bg-background group-[.toaster]:text-foreground group-[.toaster]:border-border group-[.toaster]:shadow-lg",
+          description: "group-[.toast]:text-muted-foreground",
+          actionButton:
+            "group-[.toast]:bg-primary group-[.toast]:text-primary-foreground",
+          cancelButton:
+            "group-[.toast]:bg-muted group-[.toast]:text-muted-foreground",
+        },
+      }}
+      richColors
+      closeButton
+      position="bottom-right"
+      {...props}
+    />
+  )
+}
+
+export { Toaster }

src/renderer/components/ui/switch.tsx

@@ -0,0 +1,26 @@
+import * as React from "react"
+import * as SwitchPrimitive from "@radix-ui/react-switch"
+import { cn } from "@/lib/utils"
+
+const Switch = React.forwardRef<
+  React.ElementRef<typeof SwitchPrimitive.Root>,
+  React.ComponentPropsWithoutRef<typeof SwitchPrimitive.Root>
+>(({ className, ...props }, ref) => (
+  <SwitchPrimitive.Root
+    ref={ref}
+    className={cn(
+      "peer inline-flex h-6 w-11 shrink-0 cursor-pointer items-center rounded-full border-2 border-transparent transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=unchecked]:bg-input",
+      className
+    )}
+    {...props}
+  >
+    <SwitchPrimitive.Thumb
+      className={cn(
+        "pointer-events-none block h-5 w-5 rounded-full bg-background shadow-lg ring-0 transition-transform data-[state=checked]:translate-x-5 data-[state=unchecked]:translate-x-0"
+      )}
+    />
+  </SwitchPrimitive.Root>
+))
+Switch.displayName = SwitchPrimitive.Root.displayName
+
+export { Switch }

src/renderer/components/ui/tabs.tsx

@@ -0,0 +1,91 @@
+"use client"
+
+import * as React from "react"
+import { cva, type VariantProps } from "class-variance-authority"
+import * as TabsPrimitive from "@radix-ui/react-tabs"
+
+import { cn } from "@/lib/utils"
+
+function Tabs({
+  className,
+  orientation = "horizontal",
+  ...props
+}: React.ComponentProps<typeof TabsPrimitive.Root>) {
+  return (
+    <TabsPrimitive.Root
+      data-slot="tabs"
+      data-orientation={orientation}
+      orientation={orientation}
+      className={cn(
+        "group/tabs flex gap-2 data-[orientation=horizontal]:flex-col",
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+const tabsListVariants = cva(
+  "group/tabs-list inline-flex w-fit items-center justify-center rounded-lg p-[3px] text-muted-foreground group-data-[orientation=horizontal]/tabs:h-9 group-data-[orientation=vertical]/tabs:h-fit group-data-[orientation=vertical]/tabs:flex-col data-[variant=line]:rounded-none",
+  {
+    variants: {
+      variant: {
+        default: "bg-muted",
+        line: "gap-1 bg-transparent",
+      },
+    },
+    defaultVariants: {
+      variant: "default",
+    },
+  }
+)
+
+function TabsList({
+  className,
+  variant = "default",
+  ...props
+}: React.ComponentProps<typeof TabsPrimitive.List> &
+  VariantProps<typeof tabsListVariants>) {
+  return (
+    <TabsPrimitive.List
+      data-slot="tabs-list"
+      data-variant={variant}
+      className={cn(tabsListVariants({ variant }), className)}
+      {...props}
+    />
+  )
+}
+
+function TabsTrigger({
+  className,
+  ...props
+}: React.ComponentProps<typeof TabsPrimitive.Trigger>) {
+  return (
+    <TabsPrimitive.Trigger
+      data-slot="tabs-trigger"
+      className={cn(
+        "relative inline-flex h-[calc(100%-1px)] flex-1 items-center justify-center gap-1.5 rounded-md border border-transparent px-2 py-1 text-sm font-medium whitespace-nowrap text-foreground/60 transition-all group-data-[orientation=vertical]/tabs:w-full group-data-[orientation=vertical]/tabs:justify-start hover:text-foreground focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 focus-visible:outline-1 focus-visible:outline-ring disabled:pointer-events-none disabled:opacity-50 group-data-[variant=default]/tabs-list:data-[state=active]:shadow-sm group-data-[variant=line]/tabs-list:data-[state=active]:shadow-none dark:text-muted-foreground dark:hover:text-foreground [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        "group-data-[variant=line]/tabs-list:bg-transparent group-data-[variant=line]/tabs-list:data-[state=active]:bg-transparent dark:group-data-[variant=line]/tabs-list:data-[state=active]:border-transparent dark:group-data-[variant=line]/tabs-list:data-[state=active]:bg-transparent",
+        "data-[state=active]:bg-background data-[state=active]:text-foreground dark:data-[state=active]:border-input dark:data-[state=active]:bg-input/30 dark:data-[state=active]:text-foreground",
+        "after:absolute after:bg-foreground after:opacity-0 after:transition-opacity group-data-[orientation=horizontal]/tabs:after:inset-x-0 group-data-[orientation=horizontal]/tabs:after:bottom-[-5px] group-data-[orientation=horizontal]/tabs:after:h-0.5 group-data-[orientation=vertical]/tabs:after:inset-y-0 group-data-[orientation=vertical]/tabs:after:-right-1 group-data-[orientation=vertical]/tabs:after:w-0.5 group-data-[variant=line]/tabs-list:data-[state=active]:after:opacity-100",
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+function TabsContent({
+  className,
+  ...props
+}: React.ComponentProps<typeof TabsPrimitive.Content>) {
+  return (
+    <TabsPrimitive.Content
+      data-slot="tabs-content"
+      className={cn("flex-1 outline-none", className)}
+      {...props}
+    />
+  )
+}
+
+export { Tabs, TabsList, TabsTrigger, TabsContent, tabsListVariants }

src/renderer/components/ui/textarea.tsx

@@ -0,0 +1,24 @@
+import * as React from "react"
+
+import { cn } from "@/lib/utils"
+
+export interface TextareaProps
+  extends React.TextareaHTMLAttributes<HTMLTextAreaElement> {}
+
+const Textarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
+  ({ className, ...props }, ref) => {
+    return (
+      <textarea
+        className={cn(
+          "flex min-h-[80px] w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50",
+          className
+        )}
+        ref={ref}
+        {...props}
+      />
+    )
+  }
+)
+Textarea.displayName = "Textarea"
+
+export { Textarea }

src/renderer/hooks/use-export-source.ts

@@ -0,0 +1,26 @@
+import { useFileStore } from '@/stores/file-store';
+import { useEditorStore } from '@/stores/editor-store';
+
+export interface ExportSource {
+  source: string;
+  path: string;
+  title: string;
+}
+
+/**
+ * Read the active buffer's content from the editor store. Returns null if
+ * no buffer is open. Components handle the null case (prompt to open a file).
+ */
+export function useExportSource(): ExportSource | null {
+  const activeTabId = useFileStore((s) => s.activeTabId);
+  const openTabs = useFileStore((s) => s.openTabs);
+  const buffer = useEditorStore((s) => (activeTabId ? s.buffers.get(activeTabId) : undefined));
+
+  if (!activeTabId || !buffer) return null;
+  const tab = openTabs.find((t) => t.id === activeTabId);
+  return {
+    source: buffer.content,
+    path: activeTabId,
+    title: tab?.title ?? activeTabId,
+  };
+}

src/renderer/hooks/use-menu-action.ts

@@ -0,0 +1,29 @@
+import { useEffect } from 'react';
+import { ipc } from '@/lib/ipc';
+import { useCommandStore } from '@/stores/command-store';
+import type { CommandId } from '@/stores/command-store';
+
+type Transform<Args = unknown> = (...payload: unknown[]) => Args;
+
+/**
+ * Bridge a native-menu IPC channel to a command-store dispatch.
+ *
+ * When the main process sends `channel` (e.g. `'file-save'`), the optional
+ * `transform` converts the payload to the command's args, then the command
+ * `commandId` is dispatched through the command store.
+ *
+ * The hook cleans up its IPC subscription on unmount.
+ */
+export function useMenuAction<Args = unknown>(
+  channel: string,
+  commandId: CommandId,
+  transform?: Transform<Args>
+): void {
+  useEffect(() => {
+    const unsubscribe = ipc.menu.on(channel, (...payload: unknown[]) => {
+      const args = transform ? transform(...payload) : (payload[0] as Args);
+      useCommandStore.getState().dispatch(commandId, args);
+    });
+    return unsubscribe;
+  }, [channel, commandId, transform]);
+}

src/renderer/hooks/use-shortcut.ts

@@ -0,0 +1,96 @@
+import { useEffect } from 'react';
+
+/**
+ * Bind a keyboard shortcut to a callback.
+ *
+ * Combos use `+` separators. Tokens:
+ *   - `mod`         → meta (Mac) or ctrl (others)
+ *   - `ctrl`        → ctrl only
+ *   - `meta`        → meta only
+ *   - `alt`         → alt / option
+ *   - `shift`       → shift
+ *   - any single char (case-insensitive), e.g. `s`, `S`
+ *   - special names: `Tab`, `Enter`, `Escape`, `Space`, `ArrowUp/Down/Left/Right`
+ *
+ * The hook is suppressed when the keydown target is an `<input>`, `<textarea>`,
+ * or contentEditable element, mirroring the standard browser shortcut pattern.
+ *
+ * On match, `event.preventDefault()` is called.
+ */
+export function useShortcut(combo: string, callback: (e: KeyboardEvent) => void): void {
+  useEffect(() => {
+    const tokens = parseCombo(combo);
+
+    function isTypingTarget(target: EventTarget | null): boolean {
+      if (!(target instanceof HTMLElement)) return false;
+      const tag = target.tagName;
+      if (tag === 'INPUT' || tag === 'TEXTAREA') return true;
+      if (target.isContentEditable) return true;
+      return false;
+    }
+
+    function handle(e: KeyboardEvent): void {
+      if (isTypingTarget(e.target)) return;
+      if (!matchCombo(tokens, e)) return;
+      e.preventDefault();
+      callback(e);
+    }
+
+    window.addEventListener('keydown', handle);
+    return () => window.removeEventListener('keydown', handle);
+  }, [combo, callback]);
+}
+
+interface ComboSpec {
+  mod?: boolean;
+  ctrl?: boolean;
+  meta?: boolean;
+  alt?: boolean;
+  shift?: boolean;
+  key: string; // lowercased
+}
+
+function parseCombo(combo: string): ComboSpec {
+  const parts = combo
+    .split('+')
+    .map((p) => p.trim())
+    .filter(Boolean);
+  const spec: ComboSpec = { key: '' };
+  for (const p of parts) {
+    const lower = p.toLowerCase();
+    if (lower === 'mod') spec.mod = true;
+    else if (lower === 'ctrl' || lower === 'control') spec.ctrl = true;
+    else if (lower === 'meta' || lower === 'cmd' || lower === 'command') spec.meta = true;
+    else if (lower === 'alt' || lower === 'option') spec.alt = true;
+    else if (lower === 'shift') spec.shift = true;
+    else spec.key = lower;
+  }
+  return spec;
+}
+
+function matchCombo(spec: ComboSpec, e: KeyboardEvent): boolean {
+  const key = e.key.toLowerCase();
+  if (key !== spec.key) return false;
+
+  if (spec.mod) {
+    if (!(e.metaKey || e.ctrlKey)) return false;
+  }
+  if (spec.ctrl && !e.ctrlKey) return false;
+  if (spec.meta && !e.metaKey) return false;
+  if (spec.alt && !e.altKey) return false;
+  if (spec.shift && !e.shiftKey) return false;
+
+  // Reject extra modifiers that the spec did not ask for.
+  // (e.g. spec says "mod+s" but user pressed "mod+shift+s" → no match.)
+  if (!spec.shift && e.shiftKey) return false;
+  if (!spec.alt && e.altKey) return false;
+  // ctrl/meta: if spec did not require mod, ctrl or meta must be absent.
+  if (!spec.mod && !spec.ctrl && e.ctrlKey) return false;
+  if (!spec.mod && !spec.meta && e.metaKey) return false;
+  // If spec said "mod" only, ctrl+meta is allowed (mod is either-or).
+  if (spec.mod && !spec.ctrl && !spec.meta) {
+    // ok
+  }
+
+  return true;
+}

src/renderer/hooks/use-welcome-trigger.ts

@@ -0,0 +1,15 @@
+import { useEffect } from 'react';
+import { useAppStore } from '@/stores/app-store';
+import { useSettingsStore } from '@/stores/settings-store';
+
+/**
+ * On first mount, if the user hasn't dismissed the welcome dialog, open it.
+ * Call once at the top of App.tsx.
+ */
+export function useWelcomeTrigger() {
+  useEffect(() => {
+    if (!useSettingsStore.getState().welcomeDismissed) {
+      useAppStore.getState().openModal('welcome');
+    }
+  }, []);
+}

src/renderer/lib/ascii-table.ts

@@ -0,0 +1,44 @@
+/**
+ * Convert a 2D string array to a fixed-width ASCII table with `| ... |` rows
+ * and a `| --- |` separator.
+ */
+export function toAsciiTable(rows: string[][]): string {
+  if (rows.length === 0) return '';
+  const numCols = Math.max(...rows.map((r) => r.length));
+  const widths: number[] = Array.from({ length: numCols }, (_, c) =>
+    Math.max(...rows.map((r) => (r[c] ?? '').length))
+  );
+  // Heuristic: if ANY column header starts with a digit, right-align ALL columns
+  const header = rows[0];
+  const rightAlign = header.some((cell) => /^\d/.test(cell));
+  const pad = rightAlign
+    ? (s: string, w: number) => s.padStart(w)
+    : (s: string, w: number) => s.padEnd(w);
+  const lines = rows.map((row) =>
+    '| ' +
+    Array.from({ length: numCols }, (_, c) => pad(row[c] ?? '', widths[c])).join(' | ') +
+    ' |'
+  );
+  // Insert separator after first row
+  const sep =
+    '| ' + Array.from({ length: numCols }, (_, c) => '-'.repeat(widths[c])).join(' | ') + ' |';
+  return [lines[0], sep, ...lines.slice(1)].join('\n');
+}
+
+// Matches a markdown table block: header row, separator, ≥1 data row.
+const TABLE_RE = /^\|.+\|\n^\|[\s:|-]+\|\n((?:^\|.+\|\n?)+)/gm;
+
+/**
+ * Replace all markdown tables in `source` with fenced code blocks containing
+ * the ASCII-rendered equivalent. Non-table content is preserved verbatim.
+ */
+export function applyAsciiTransform(source: string): string {
+  return source.replace(TABLE_RE, (block) => {
+    const lines = block.trim().split('\n');
+    const header = lines[0].slice(1, -1).split('|').map((s) => s.trim());
+    const body = lines.slice(2).map((l) =>
+      l.slice(1, -1).split('|').map((s) => s.trim())
+    );
+    return '```\n' + toAsciiTable([header, ...body]) + '\n```';
+  });
+}

src/renderer/lib/commands/register-menu-commands.ts

@@ -0,0 +1,112 @@
+import { useEffect } from 'react';
+import { useCommandStore } from '@/stores/command-store';
+import { useFileStore } from '@/stores/file-store';
+import { useAppStore } from '@/stores/app-store';
+import { useMenuAction } from '@/hooks/use-menu-action';
+
+/**
+ * Register all Phase 6 menu commands in the command store, and bridge
+ * the native menu IPC channels to the matching command ids.
+ *
+ * Phase 6 scope: file/view/tab commands with direct store mappings.
+ * Phase 7+ will add the dialog-driven commands (export, settings, etc.)
+ * once the corresponding modals exist.
+ */
+export function registerMenuCommands(): void {
+  const { registerMany } = useCommandStore.getState();
+
+  registerMany({
+    'settings.open': () => useAppStore.getState().openModal('settings'),
+    'help.about': () => useAppStore.getState().openModal('about'),
+    'help.welcome': () => useAppStore.getState().openModal('welcome'),
+    'file.exportPdf': () => {
+      const activeTabId = useFileStore.getState().activeTabId;
+      if (!activeTabId) return;
+      useAppStore.getState().openModal('export-pdf', { sourcePath: activeTabId });
+    },
+    'file.exportDocx': () => {
+      const activeTabId = useFileStore.getState().activeTabId;
+      if (!activeTabId) return;
+      useAppStore.getState().openModal('export-docx', { sourcePath: activeTabId });
+    },
+    'file.exportHtml': () => {
+      const activeTabId = useFileStore.getState().activeTabId;
+      if (!activeTabId) return;
+      useAppStore.getState().openModal('export-html', { sourcePath: activeTabId });
+    },
+    'file.exportBatch': () => {
+      const paths = useFileStore.getState().openTabs.map((t) => t.path);
+      if (paths.length === 0) return;
+      useAppStore.getState().openModal('export-batch', { sourcePaths: paths });
+    },
+    'file.confirmClose': () => {
+      /* stub — wired in later phase */
+    },
+    'app.quit': () => {
+      /* stub — wired in later phase */
+    },
+  });
+
+  const { register } = useCommandStore.getState();
+  register('file.open', () => {
+    void useFileStore.getState().openFileDialog();
+  });
+  register('file.openFolder', () => {
+    void useFileStore.getState().openFolderDialog();
+  });
+  register('file.save', () => {
+    void useFileStore.getState().saveActiveBuffer();
+  });
+  register('file.closeTab', () => {
+    const { activeTabId, closeTab } = useFileStore.getState();
+    if (activeTabId) closeTab(activeTabId);
+  });
+  register('tab.next', () => {
+    const { openTabs, activeTabId, setActiveTab } = useFileStore.getState();
+    if (openTabs.length === 0) return;
+    const idx = activeTabId ? openTabs.findIndex((t) => t.id === activeTabId) : 0;
+    const safeIdx = idx === -1 ? 0 : idx;
+    const nextIdx = safeIdx >= openTabs.length - 1 ? 0 : safeIdx + 1;
+    setActiveTab(openTabs[nextIdx].id);
+  });
+  register('tab.prev', () => {
+    const { openTabs, activeTabId, setActiveTab } = useFileStore.getState();
+    if (openTabs.length === 0) return;
+    const idx = activeTabId ? openTabs.findIndex((t) => t.id === activeTabId) : 0;
+    const safeIdx = idx === -1 ? 0 : idx;
+    const nextIdx = safeIdx <= 0 ? openTabs.length - 1 : safeIdx - 1;
+    setActiveTab(openTabs[nextIdx].id);
+  });
+  register('view.toggleSidebar', () => useAppStore.getState().toggleSidebar());
+  register('view.togglePreview', () => useAppStore.getState().togglePreview());
+}
+
+export function useRegisterMenuCommands(): void {
+  // Register handlers in the command store.
+  useEffect(() => {
+    registerMenuCommands();
+  }, []);
+}
+
+/**
+ * Wire native-menu IPC channels to the command store.
+ * Channel names match what main.js dispatches via webContents.send.
+ */
+export function useBridgeNativeMenu(): void {
+  useMenuAction('file-save', 'file.save');
+  useMenuAction('toggle-preview', 'view.togglePreview');
+  useMenuAction('toggle-command-palette', 'command.palette');
+  useMenuAction('toggle-sidebar-panel', 'view.sidebarPanel', (panel) => panel as string);
+  useMenuAction('toggle-bottom-panel', 'view.bottomPanel');
+  useMenuAction('toggle-find', 'find.toggle');
+  useMenuAction('undo', 'editor.undo');
+  useMenuAction('redo', 'editor.redo');
+  useMenuAction('adjust-font-size', 'font.size', (direction) => direction as string);
+  useMenuAction('load-custom-css', 'theme.loadCustomCss');
+  useMenuAction('clear-custom-css', 'theme.clearCustomCss');
+  useMenuAction('load-template-menu', 'template.load', (name) => name as string);
+  useMenuAction('print-preview', 'print.preview');
+  useMenuAction('print-preview-styled', 'print.previewStyled');
+  useMenuAction('file-opened', 'file.opened', (payload) => payload);
+  useMenuAction('clear-recent-files', 'file.clearRecent');
+}

src/renderer/lib/ipc.ts

@@ -95,4 +95,16 @@ export const ipc = {
     showItemInFolder: (path: string): Promise<IpcResult<void | ChannelMissing>> =>
       safeCall('app', 'showItemInFolder', path),
   },
+  menu: {
+    /**
+     * Subscribe to a native-menu IPC channel. The callback receives the
+     * raw payload(s) from the main process. Returns an unsubscribe fn.
+     */
+    on: (channel: string, callback: (...args: unknown[]) => void): (() => void) => {
+      if (typeof window === 'undefined' || !window.electronAPI?.on) {
+        return () => {};
+      }
+      return window.electronAPI.on(channel, callback as (...a: any[]) => void);
+    },
+  },
 };

src/renderer/lib/toast.ts

@@ -0,0 +1,22 @@
+import { toast as sonnerToast } from 'sonner';
+
+/**
+ * Typed wrappers over sonner's toast API. Centralizing the import gives us
+ * a single surface to evolve (e.g., add brand colors, action buttons,
+ * analytics) without touching every call site.
+ */
+export const toast = {
+  success: (message: string) => sonnerToast.success(message),
+  error: (message: string) => sonnerToast.error(message),
+  info: (message: string) => sonnerToast.info(message),
+  warning: (message: string) => sonnerToast.warning(message),
+  promise: <T>(
+    promise: Promise<T>,
+    msgs: {
+      loading: string;
+      success: string | ((data: T) => string);
+      error: string | ((err: unknown) => string);
+    }
+  ) => sonnerToast.promise(promise, msgs),
+  dismiss: (id?: string | number) => sonnerToast.dismiss(id),
+};

src/renderer/lib/validators.ts

@@ -0,0 +1,48 @@
+import { z } from 'zod';
+
+export const settingsSchema = z.object({
+  fontSize: z.number().min(10).max(24).default(14),
+  tabSize: z.union([z.literal(2), z.literal(4), z.literal(8)]).default(4),
+  lineNumbers: z.boolean().default(true),
+  wordWrap: z.boolean().default(true),
+  minimap: z.boolean().default(true),
+  theme: z.enum(['light', 'dark', 'auto']).default('auto'),
+  accentColor: z.enum(['brand', 'blue', 'green', 'purple', 'orange']).default('brand'),
+  fontFamily: z.enum(['system', 'jetbrains', 'fira']).default('system'),
+  pdfFormat: z.enum(['letter', 'a4', 'legal']).default('a4'),
+  pdfMargins: z.enum(['normal', 'narrow', 'wide']).default('normal'),
+  pdfEmbedFonts: z.boolean().default(true),
+  docxTemplate: z.enum(['standard', 'minimal', 'modern']).default('standard'),
+  htmlHighlightStyle: z.enum(['github', 'monokai', 'nord', 'none']).default('github'),
+  renderTablesAsAscii: z.boolean().default(false),
+  welcomeDismissed: z.boolean().default(false),
+});
+export type Settings = z.infer<typeof settingsSchema>;
+
+export const exportPdfSchema = z.object({
+  format: z.enum(['letter', 'a4', 'legal']),
+  margins: z.enum(['normal', 'narrow', 'wide']),
+  embedFonts: z.boolean(),
+  renderTablesAsAscii: z.boolean().optional(),
+});
+export type ExportPdfOptions = z.infer<typeof exportPdfSchema>;
+
+export const exportDocxSchema = z.object({
+  template: z.enum(['standard', 'minimal', 'modern']),
+  renderTablesAsAscii: z.boolean().optional(),
+});
+export type ExportDocxOptions = z.infer<typeof exportDocxSchema>;
+
+export const exportHtmlSchema = z.object({
+  standalone: z.boolean(),
+  highlightStyle: z.enum(['github', 'monokai', 'nord', 'none']),
+  renderTablesAsAscii: z.boolean().optional(),
+});
+export type ExportHtmlOptions = z.infer<typeof exportHtmlSchema>;
+
+export const exportBatchSchema = z.object({
+  format: z.enum(['pdf', 'docx', 'html', 'png']),
+  concurrency: z.number().int().min(1).max(16),
+  filePaths: z.array(z.string()).min(1),
+});
+export type ExportBatchOptions = z.infer<typeof exportBatchSchema>;

src/renderer/stores/app-store.ts

@@ -7,15 +7,44 @@ export interface PaneSizes {
   preview: number;
 }
 
+export interface ConfirmProps {
+  title: string;
+  body: string;
+  confirmLabel?: string;
+  cancelLabel?: string;
+  destructive?: boolean;
+  onConfirm: () => void | Promise<void>;
+  onCancel?: () => void;
+}
+
+export type ModalState =
+  | { kind: null }
+  | { kind: 'export-pdf'; props: { sourcePath: string } }
+  | { kind: 'export-docx'; props: { sourcePath: string } }
+  | { kind: 'export-html'; props: { sourcePath: string } }
+  | { kind: 'export-batch'; props: { sourcePaths: string[] } }
+  | { kind: 'settings' }
+  | { kind: 'about' }
+  | { kind: 'welcome' }
+  | { kind: 'confirm'; props: ConfirmProps };
+
+export type ModalKind = ModalState['kind'];
+
 interface AppState {
   sidebarVisible: boolean;
   previewVisible: boolean;
   zenMode: boolean;
   paneSizes: PaneSizes;
+  modal: ModalState;
   toggleSidebar: () => void;
   togglePreview: () => void;
   setZenMode: (value: boolean) => void;
   setPaneSizes: (sizes: PaneSizes) => void;
+  openModal: <K extends NonNullable<ModalKind>>(
+    kind: K,
+    ...args: Extract<ModalState, { kind: K }> extends { props: infer P } ? [props?: P] : []
+  ) => void;
+  closeModal: () => void;
 }
 
 export const useAppStore = create<AppState>()(
@@ -25,11 +54,27 @@ export const useAppStore = create<AppState>()(
       previewVisible: true,
       zenMode: false,
       paneSizes: { sidebar: 20, editor: 50, preview: 30 },
+      modal: { kind: null },
       toggleSidebar: () => set((s) => ({ sidebarVisible: !s.sidebarVisible })),
       togglePreview: () => set((s) => ({ previewVisible: !s.previewVisible })),
       setZenMode: (value) => set({ zenMode: value }),
       setPaneSizes: (sizes) => set({ paneSizes: sizes }),
+      openModal: (kind, ...args) =>
+        set(() => {
+          const candidate = { kind, ...(args[0] ? { props: args[0] } : {}) } as ModalState;
+          return { modal: candidate };
+        }),
+      closeModal: () => set({ modal: { kind: null } }),
     }),
-    { name: 'mc-app-store' }
+    {
+      name: 'mc-app-store',
+      partialize: (state) => ({
+        sidebarVisible: state.sidebarVisible,
+        previewVisible: state.previewVisible,
+        zenMode: state.zenMode,
+        paneSizes: state.paneSizes,
+        // modal is intentionally NOT persisted (runtime-only)
+      }),
+    }
   )
 );

src/renderer/stores/command-store.ts

@@ -0,0 +1,66 @@
+import { create } from 'zustand';
+import { persist } from 'zustand/middleware';
+
+export type CommandId = string;
+
+export type CommandHandler = (args?: unknown) => void | Promise<void>;
+
+/**
+ * User-customizable key binding for a command.
+ * Format: same as useShortcut combo ('mod+s', 'mod+shift+s', etc.)
+ * Undefined means "use the default binding" (if any).
+ */
+export type UserBindings = Record<string, string>;
+
+interface CommandState {
+  handlers: Record<string, CommandHandler>;
+  userBindings: UserBindings;
+  register: (id: CommandId, handler: CommandHandler) => void;
+  registerMany: (handlers: Record<string, CommandHandler>) => void;
+  unregister: (id: CommandId) => void;
+  dispatch: (id: CommandId, args?: unknown) => void;
+  get: (id: CommandId) => CommandHandler | undefined;
+  setUserBinding: (id: CommandId, combo: string) => void;
+  clearUserBinding: (id: CommandId) => void;
+  getUserBinding: (id: CommandId) => string | undefined;
+}
+
+export const useCommandStore = create<CommandState>()(
+  persist(
+    (set, get) => ({
+      handlers: {},
+      userBindings: {},
+      register: (id, handler) =>
+        set((s) => ({ handlers: { ...s.handlers, [id]: handler } })),
+      registerMany: (handlers) =>
+        set((s) => ({ handlers: { ...s.handlers, ...handlers } })),
+      unregister: (id) =>
+        set((s) => {
+          const next = { ...s.handlers };
+          delete next[id];
+          return { handlers: next };
+        }),
+      dispatch: (id, args) => {
+        const handler = get().handlers[id];
+        if (handler) {
+          void handler(args);
+        }
+      },
+      get: (id) => get().handlers[id],
+      setUserBinding: (id, combo) =>
+        set((s) => ({ userBindings: { ...s.userBindings, [id]: combo } })),
+      clearUserBinding: (id) =>
+        set((s) => {
+          const next = { ...s.userBindings };
+          delete next[id];
+          return { userBindings: next };
+        }),
+      getUserBinding: (id) => get().userBindings[id],
+    }),
+    {
+      name: 'mc-command-store',
+      // Only persist user-customizable bindings; handlers are runtime-only.
+      partialize: (state) => ({ userBindings: state.userBindings }),
+    }
+  )
+);

src/renderer/stores/file-store.ts

@@ -3,6 +3,7 @@ import { persist, createJSONStorage } from 'zustand/middleware';
 import { immer } from 'zustand/middleware/immer';
 import { enableMapSet } from 'immer';
 import { ipc } from '@/lib/ipc';
+import { toast } from '@/lib/toast';
 import { useEditorStore } from '@/stores/editor-store';
 import type { FileEntry } from '@/types/ipc';
 
@@ -79,7 +80,10 @@ export const useFileStore = create<FileState>()(
 
     openFolder: async (path) => {
       const result = await ipc.file.list(path);
-      if (!result.ok) return;
+      if (!result.ok) {
+        toast.error(`Failed to open folder: ${result.error.message}`);
+        return;
+      }
 
       const children: FileNode[] = result.data!.map(entryToNode);
 
@@ -144,7 +148,10 @@ export const useFileStore = create<FileState>()(
       }
 
       const result = await ipc.file.read(filePath);
-      if (!result.ok) return;
+      if (!result.ok) {
+        toast.error(`Failed to open file: ${result.error.message}`);
+        return;
+      }
 
       const content = result.data!;
       const title = filePath.split('/').pop() ?? filePath;
@@ -217,10 +224,15 @@ export const useFileStore = create<FileState>()(
       if (!buffer) return false;
 
       const writeResult = await ipc.file.write(activeTabId, buffer.content);
-      if (!writeResult.ok) return false;
+      if (!writeResult.ok) {
+        toast.error(`Failed to save: ${writeResult.error.message}`);
+        return false;
+      }
 
       useEditorStore.getState().markSaved(activeTabId);
       useFileStore.getState().markTabClean(activeTabId);
+      const title = useFileStore.getState().openTabs.find(t => t.id === activeTabId)?.title ?? activeTabId.split('/').pop() ?? activeTabId;
+      toast.success(`Saved ${title}`);
       return true;
     },
   })),

src/renderer/stores/settings-store.ts

@@ -0,0 +1,38 @@
+import { create } from 'zustand';
+import { persist, createJSONStorage } from 'zustand/middleware';
+import { settingsSchema, type Settings } from '@/lib/validators';
+
+type SettingsLeaf = keyof Omit<Settings, never>;
+
+interface SettingsState extends Settings {
+  setSetting: <K extends SettingsLeaf>(key: K, value: Settings[K]) => void;
+  resetToDefaults: () => void;
+}
+
+const DEFAULTS = settingsSchema.parse({});
+
+export const useSettingsStore = create<SettingsState>()(
+  persist(
+    (set) => ({
+      ...DEFAULTS,
+      setSetting: (key, value) => set((s) => ({ ...s, [key]: value }) as Partial<SettingsState>),
+      resetToDefaults: () => set(() => ({ ...DEFAULTS })),
+    }),
+    {
+      name: 'mc-settings-store',
+      storage: createJSONStorage(() => localStorage),
+      partialize: (state) => {
+        const { setSetting, resetToDefaults, ...rest } = state;
+        return rest;
+      },
+      onRehydrateStorage: () => (state) => {
+        if (!state) return;
+        const result = settingsSchema.safeParse(state);
+        if (!result.success) {
+          console.warn('[settings-store] invalid persisted state, resetting to defaults', result.error);
+          useSettingsStore.setState({ ...DEFAULTS } as any);
+        }
+      },
+    }
+  )
+);

src/renderer/test/setup.ts

@@ -33,3 +33,25 @@ if (typeof window !== 'undefined') {
   Object.defineProperty(window, 'innerWidth', { writable: true, value: 1920 });
   Object.defineProperty(window, 'innerHeight', { writable: true, value: 1080 });
 }
+
+// Polyfill ResizeObserver for @radix-ui/react-use-size
+if (typeof window !== 'undefined' && !window.ResizeObserver) {
+  class ResizeObserver {
+    observe() {}
+    unobserve() {}
+    disconnect() {}
+  }
+  window.ResizeObserver = ResizeObserver;
+}
+
+// Polyfill hasPointerCapture for @radix-ui/react-select (jsdom doesn't implement it)
+if (typeof window !== 'undefined' && !Element.prototype.hasPointerCapture) {
+  Element.prototype.hasPointerCapture = function () {
+    return false;
+  };
+}
+
+// Polyfill scrollIntoView for @radix-ui/react-select (jsdom doesn't implement it)
+if (typeof window !== 'undefined' && !Element.prototype.scrollIntoView) {
+  Element.prototype.scrollIntoView = function () {};
+}

tests/component/layout/AppHeader.test.tsx

@@ -4,11 +4,27 @@ import userEvent from '@testing-library/user-event';
 import { ThemeProvider } from '@/components/theme-provider';
 import { AppHeader } from '@/components/layout/AppHeader';
 import { useAppStore } from '@/stores/app-store';
+import { useCommandStore } from '@/stores/command-store';
 
 describe('AppHeader', () => {
   beforeEach(() => {
     localStorage.clear();
     useAppStore.setState({ sidebarVisible: true, previewVisible: true, zenMode: false });
+    useCommandStore.setState({ handlers: {} });
+    // Mirror what AppShell registers so dispatching actually does something.
+    useCommandStore.getState().register('view.toggleSidebar', () => {
+      useAppStore.getState().toggleSidebar();
+    });
+    useCommandStore.getState().register('view.togglePreview', () => {
+      useAppStore.getState().togglePreview();
+    });
+    useCommandStore.getState().register('shortcuts.show', () => {});
+    useCommandStore.getState().register('settings.open', () => {
+      useAppStore.getState().openModal('settings');
+    });
+    useCommandStore.getState().register('help.about', () => {
+      useAppStore.getState().openModal('about');
+    });
   });
 
   it('renders the app title', () => {
@@ -30,4 +46,48 @@ describe('AppHeader', () => {
     await userEvent.click(btn);
     expect(useAppStore.getState().sidebarVisible).toBe(false);
   });
+
+  it('toggles preview when preview button clicked', async () => {
+    render(
+      <ThemeProvider defaultTheme="dark" attribute="class">
+        <AppHeader />
+      </ThemeProvider>
+    );
+    const btn = screen.getByRole('button', { name: /toggle preview/i });
+    await userEvent.click(btn);
+    expect(useAppStore.getState().previewVisible).toBe(false);
+  });
+
+  it('disables-shortcut button dispatches shortcuts.show', async () => {
+    render(
+      <ThemeProvider defaultTheme="dark" attribute="class">
+        <AppHeader />
+      </ThemeProvider>
+    );
+    const btn = screen.getByTestId('header-shortcuts');
+    await userEvent.click(btn);
+    // No observable side effect; the command was registered as a no-op.
+    // The test passes if no error is thrown and the click is processed.
+    expect(btn).toBeInTheDocument();
+  });
+
+  it('settings button opens settings modal', async () => {
+    render(
+      <ThemeProvider defaultTheme="dark" attribute="class">
+        <AppHeader />
+      </ThemeProvider>
+    );
+    await userEvent.click(screen.getByRole('button', { name: /settings/i }));
+    expect(useAppStore.getState().modal).toEqual({ kind: 'settings' });
+  });
+
+  it('about button opens about modal', async () => {
+    render(
+      <ThemeProvider defaultTheme="dark" attribute="class">
+        <AppHeader />
+      </ThemeProvider>
+    );
+    await userEvent.click(screen.getByRole('button', { name: /^about$/i }));
+    expect(useAppStore.getState().modal).toEqual({ kind: 'about' });
+  });
 });

tests/component/layout/Toolbar.test.tsx

@@ -1,11 +1,98 @@
-import { describe, it, expect } from 'vitest';
+import { describe, it, expect, beforeEach, vi } from 'vitest';
-import { render, screen } from '@testing-library/react';
+import { render, screen, fireEvent, act } from '@testing-library/react';
 import { Toolbar } from '@/components/layout/Toolbar';
+import { useCommandStore } from '@/stores/command-store';
+import { useAppStore } from '@/stores/app-store';
 
 describe('Toolbar', () => {
+  beforeEach(() => {
+    useCommandStore.setState({ handlers: {} });
+    useAppStore.setState({
+      sidebarVisible: true,
+      previewVisible: true,
+      zenMode: false,
+      paneSizes: { sidebar: 20, editor: 50, preview: 30 },
+    });
+  });
+
   it('renders formatting buttons', () => {
     render(<Toolbar />);
     expect(screen.getByRole('button', { name: /bold/i })).toBeInTheDocument();
     expect(screen.getByRole('button', { name: /italic/i })).toBeInTheDocument();
   });
+
+  it('renders all toolbar buttons', () => {
+    render(<Toolbar />);
+    expect(screen.getByTestId('toolbar-open-file')).toBeInTheDocument();
+    expect(screen.getByTestId('toolbar-open-folder')).toBeInTheDocument();
+    expect(screen.getByTestId('toolbar-save')).toBeInTheDocument();
+    expect(screen.getByTestId('toolbar-toggle-sidebar')).toBeInTheDocument();
+    expect(screen.getByTestId('toolbar-toggle-preview')).toBeInTheDocument();
+  });
+
+  it('Open file button dispatches file.open', () => {
+    const handler = vi.fn();
+    useCommandStore.getState().register('file.open', handler);
+    render(<Toolbar />);
+    fireEvent.click(screen.getByTestId('toolbar-open-file'));
+    expect(handler).toHaveBeenCalledTimes(1);
+  });
+
+  it('Open folder button dispatches file.openFolder', () => {
+    const handler = vi.fn();
+    useCommandStore.getState().register('file.openFolder', handler);
+    render(<Toolbar />);
+    fireEvent.click(screen.getByTestId('toolbar-open-folder'));
+    expect(handler).toHaveBeenCalledTimes(1);
+  });
+
+  it('Save button dispatches file.save', () => {
+    const handler = vi.fn();
+    useCommandStore.getState().register('file.save', handler);
+    render(<Toolbar />);
+    fireEvent.click(screen.getByTestId('toolbar-save'));
+    expect(handler).toHaveBeenCalledTimes(1);
+  });
+
+  it('Toggle sidebar button dispatches view.toggleSidebar and reflects aria-pressed', () => {
+    const handler = vi.fn();
+    useCommandStore.getState().register('view.toggleSidebar', handler);
+    render(<Toolbar />);
+    const btn = screen.getByTestId('toolbar-toggle-sidebar');
+    expect(btn).toHaveAttribute('aria-pressed', 'true');
+    fireEvent.click(btn);
+    expect(handler).toHaveBeenCalledTimes(1);
+  });
+
+  it('Toggle preview button dispatches view.togglePreview', () => {
+    const handler = vi.fn();
+    useCommandStore.getState().register('view.togglePreview', handler);
+    render(<Toolbar />);
+    fireEvent.click(screen.getByTestId('toolbar-toggle-preview'));
+    expect(handler).toHaveBeenCalledTimes(1);
+  });
+
+  it('toggle sidebar end-to-end: command flips appStore state, aria-pressed reflects it', () => {
+    useCommandStore.getState().register('view.toggleSidebar', () => {
+      useAppStore.getState().toggleSidebar();
+    });
+    render(<Toolbar />);
+    const btn = screen.getByTestId('toolbar-toggle-sidebar');
+    expect(btn).toHaveAttribute('aria-pressed', 'true');
+    act(() => {
+      fireEvent.click(btn);
+    });
+    expect(useAppStore.getState().sidebarVisible).toBe(false);
+    expect(btn).toHaveAttribute('aria-pressed', 'false');
+  });
+
+  it('formatting buttons (bold, italic, etc.) are disabled (Phase 9 work)', () => {
+    render(<Toolbar />);
+    expect(screen.getByLabelText('Bold')).toBeDisabled();
+    expect(screen.getByLabelText('Italic')).toBeDisabled();
+    expect(screen.getByLabelText('Unordered list')).toBeDisabled();
+    expect(screen.getByLabelText('Ordered list')).toBeDisabled();
+    expect(screen.getByLabelText('Code')).toBeDisabled();
+    expect(screen.getByLabelText('Link')).toBeDisabled();
+  });
 });

tests/component/modals/AboutDialog.test.tsx

@@ -0,0 +1,34 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { AboutDialog } from '@/components/modals/AboutDialog';
+import { useAppStore } from '@/stores/app-store';
+
+describe('AboutDialog', () => {
+  beforeEach(() => {
+    window.electronAPI = {
+      app: {
+        getVersion: vi.fn().mockResolvedValue('5.0.0'),
+        openExternal: vi.fn().mockResolvedValue({ ok: true }),
+      },
+    } as any;
+    // Reset store to about modal so dialog renders
+    useAppStore.setState({ modal: { kind: 'about' } } as any);
+  });
+
+  it('renders title and version', async () => {
+    render(<AboutDialog />);
+    expect(screen.getByText(/about markdownconverter/i)).toBeInTheDocument();
+    expect(await screen.findByText(/5\.0\.0/)).toBeInTheDocument();
+  });
+
+  it('closes when the close button is clicked', async () => {
+    render(<AboutDialog />);
+    // dialog-footer has the visible Close button; the X button also has sr-only "Close"
+    const closeButtons = await screen.findAllByRole('button', { name: /close/i });
+    const close = closeButtons[0];
+    await userEvent.click(close);
+    // closeModal sets modal.kind = null, so isOpen=false, Dialog unmounts
+    expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
+  });
+});

tests/component/modals/ConfirmDialog.test.tsx

@@ -0,0 +1,43 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { ConfirmDialog } from '@/components/modals/ConfirmDialog';
+import { useAppStore } from '@/stores/app-store';
+
+describe('ConfirmDialog', () => {
+  beforeEach(() => {
+    localStorage.clear();
+    useAppStore.setState({ modal: { kind: null } } as any);
+  });
+
+  it('renders title, body, and confirm/cancel labels', () => {
+    render(
+      <ConfirmDialog
+        title="Delete file?"
+        body="This cannot be undone."
+        confirmLabel="Delete"
+        onConfirm={() => {}}
+      />
+    );
+    expect(screen.getByText(/delete file/i)).toBeInTheDocument();
+    expect(screen.getByText(/cannot be undone/i)).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: /^delete$/i })).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: /cancel/i })).toBeInTheDocument();
+  });
+
+  it('calls onConfirm and closes on confirm click', async () => {
+    const onConfirm = vi.fn();
+    render(<ConfirmDialog title="T" body="B" onConfirm={onConfirm} />);
+    await userEvent.click(screen.getByRole('button', { name: /confirm/i }));
+    expect(onConfirm).toHaveBeenCalledTimes(1);
+    expect(useAppStore.getState().modal).toEqual({ kind: null });
+  });
+
+  it('destructive variant uses destructive button class', () => {
+    render(
+      <ConfirmDialog title="T" body="B" destructive onConfirm={() => {}} />
+    );
+    const btn = screen.getByRole('button', { name: /confirm/i });
+    expect(btn.className).toContain('bg-destructive');
+  });
+});

tests/component/modals/ExportBatchDialog.test.tsx

@@ -0,0 +1,29 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { ExportBatchDialog } from '@/components/modals/ExportBatchDialog';
+
+describe('ExportBatchDialog', () => {
+  beforeEach(() => {
+    localStorage.clear();
+    window.electronAPI = {
+      export: { batch: vi.fn().mockResolvedValue({ ok: true, data: { total: 2, succeeded: 2, failed: 0, results: [] } }) },
+    } as any;
+  });
+
+  it('renders the file list passed via sourcePaths', () => {
+    render(<ExportBatchDialog sourcePaths={['/a.md', '/b.md']} />);
+    expect(screen.getByText('/a.md')).toBeInTheDocument();
+    expect(screen.getByText('/b.md')).toBeInTheDocument();
+  });
+
+  it('selecting format and concurrency submits correct options', async () => {
+    render(<ExportBatchDialog sourcePaths={['/a.md', '/b.md']} />);
+    await userEvent.click(screen.getByRole('combobox', { name: /format/i }));
+    await userEvent.click(screen.getByRole('option', { name: /^pdf$/i }));
+    await userEvent.click(screen.getByRole('button', { name: /^export$/i }));
+    const call = (window.electronAPI.export.batch as any).mock.calls[0];
+    expect(call[0]).toEqual([{ inputPath: '/a.md', outputPath: expect.any(String) }, { inputPath: '/b.md', outputPath: expect.any(String) }]);
+    expect(call[1].format).toBe('pdf');
+  });
+});

tests/component/modals/ExportDocxDialog.test.tsx

@@ -0,0 +1,41 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { ExportDocxDialog } from '@/components/modals/ExportDocxDialog';
+import { useFileStore } from '@/stores/file-store';
+import { useEditorStore } from '@/stores/editor-store';
+import { useSettingsStore } from '@/stores/settings-store';
+
+describe('ExportDocxDialog', () => {
+  beforeEach(() => {
+    localStorage.clear();
+    window.electronAPI = {
+      export: { docx: vi.fn().mockResolvedValue({ ok: true, data: { outputPath: '/out.docx' } }) },
+    } as any;
+    useSettingsStore.setState(useSettingsStore.getInitialState());
+    useFileStore.setState({ activeTabId: '/test.md', openTabs: [{ id: '/test.md', path: '/test.md', title: 'test.md', dirty: false }] } as any);
+    useEditorStore.setState({ buffers: new Map([['/test.md', { id: '/test.md', path: '/test.md', content: '# hi', dirty: false }]]) } as any);
+  });
+
+  it('renders with standard template selected by default', () => {
+    render(<ExportDocxDialog sourcePath="/test.md" />);
+    expect(screen.getByText(/export to docx/i)).toBeInTheDocument();
+    expect(screen.getByRole('combobox', { name: /template/i })).toBeInTheDocument();
+  });
+
+  it('submitting with default options sends template=standard', async () => {
+    render(<ExportDocxDialog sourcePath="/test.md" />);
+    await userEvent.click(screen.getByRole('button', { name: /^export$/i }));
+    const call = (window.electronAPI.export.docx as any).mock.calls[0][0];
+    expect(call.template).toBe('standard');
+  });
+
+  it('selecting "modern" template sends template=modern', async () => {
+    render(<ExportDocxDialog sourcePath="/test.md" />);
+    await userEvent.click(screen.getByRole('combobox', { name: /template/i }));
+    await userEvent.click(screen.getByRole('option', { name: /modern/i }));
+    await userEvent.click(screen.getByRole('button', { name: /^export$/i }));
+    const call = (window.electronAPI.export.docx as any).mock.calls[0][0];
+    expect(call.template).toBe('modern');
+  });
+});

tests/component/modals/ExportHtmlDialog.test.tsx

@@ -0,0 +1,35 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { ExportHtmlDialog } from '@/components/modals/ExportHtmlDialog';
+import { useFileStore } from '@/stores/file-store';
+import { useEditorStore } from '@/stores/editor-store';
+import { useSettingsStore } from '@/stores/settings-store';
+
+describe('ExportHtmlDialog', () => {
+  beforeEach(() => {
+    localStorage.clear();
+    window.electronAPI = {
+      export: { html: vi.fn().mockResolvedValue({ ok: true, data: { outputPath: '/out.html' } }) },
+    } as any;
+    useSettingsStore.setState(useSettingsStore.getInitialState());
+    useFileStore.setState({ activeTabId: '/test.md', openTabs: [{ id: '/test.md', path: '/test.md', title: 'test.md', dirty: false }] } as any);
+    useEditorStore.setState({ buffers: new Map([['/test.md', { id: '/test.md', path: '/test.md', content: '# hi', dirty: false }]]) } as any);
+  });
+
+  it('renders with default github highlight style', () => {
+    render(<ExportHtmlDialog sourcePath="/test.md" />);
+    expect(screen.getByText(/export to html/i)).toBeInTheDocument();
+  });
+
+  it('toggles standalone and submits with chosen highlight', async () => {
+    render(<ExportHtmlDialog sourcePath="/test.md" />);
+    await userEvent.click(screen.getByRole('checkbox', { name: /standalone/i }));
+    await userEvent.click(screen.getByRole('combobox', { name: /highlight/i }));
+    await userEvent.click(screen.getByRole('option', { name: /monokai/i }));
+    await userEvent.click(screen.getByRole('button', { name: /^export$/i }));
+    const call = (window.electronAPI.export.html as any).mock.calls[0][0];
+    expect(call.standalone).toBe(false);
+    expect(call.highlightStyle).toBe('monokai');
+  });
+});

tests/component/modals/ExportPdfDialog.test.tsx

@@ -0,0 +1,43 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { ExportPdfDialog } from '@/components/modals/ExportPdfDialog';
+import { useFileStore } from '@/stores/file-store';
+import { useEditorStore } from '@/stores/editor-store';
+import { useSettingsStore } from '@/stores/settings-store';
+
+describe('ExportPdfDialog', () => {
+  beforeEach(() => {
+    localStorage.clear();
+    window.electronAPI = {
+      export: {
+        pdf: vi.fn().mockResolvedValue({ ok: true, data: { outputPath: '/out.pdf', bytes: 1024, durationMs: 100 } }),
+      },
+    } as any;
+    useSettingsStore.setState(useSettingsStore.getInitialState());
+    useFileStore.setState({ activeTabId: '/test.md', openTabs: [{ id: '/test.md', path: '/test.md', title: 'test.md', dirty: false }] } as any);
+    useEditorStore.setState({ buffers: new Map([['/test.md', { id: '/test.md', path: '/test.md', content: '# hi', dirty: false }]]) } as any);
+  });
+
+  it('renders with default PDF options from settings', () => {
+    render(<ExportPdfDialog sourcePath="/test.md" />);
+    expect(screen.getByText(/export to pdf/i)).toBeInTheDocument();
+    expect(screen.getByRole('combobox', { name: /format/i })).toBeInTheDocument();
+  });
+
+  it('toggles ASCII tables and submits merged options', async () => {
+    render(<ExportPdfDialog sourcePath="/test.md" />);
+    await userEvent.click(screen.getByRole('checkbox', { name: /ascii/i }));
+    await userEvent.click(screen.getByRole('button', { name: /^export$/i }));
+    const call = (window.electronAPI.export.pdf as any).mock.calls[0][0];
+    expect(call.renderTablesAsAscii).toBe(true);
+    expect(call.format).toBe('a4');
+  });
+
+  it('renders an error banner when IPC fails', async () => {
+    (window.electronAPI.export.pdf as any).mockRejectedValueOnce(new Error('Pandoc not found'));
+    render(<ExportPdfDialog sourcePath="/test.md" />);
+    await userEvent.click(screen.getByRole('button', { name: /^export$/i }));
+    expect(await screen.findByText(/pandoc not found/i)).toBeInTheDocument();
+  });
+});

tests/component/modals/ModalLayer.test.tsx

@@ -0,0 +1,32 @@
+import { describe, it, expect, beforeEach } from 'vitest';
+import { render, screen } from '@testing-library/react';
+import { ModalLayer } from '@/components/modals/ModalLayer';
+import { useAppStore } from '@/stores/app-store';
+
+describe('ModalLayer', () => {
+  beforeEach(() => {
+    localStorage.clear();
+    useAppStore.setState({ modal: { kind: null } } as any);
+  });
+
+  it('renders nothing when modal is null', () => {
+    const { container } = render(<ModalLayer />);
+    expect(container.firstChild).toBeNull();
+  });
+
+  it('renders AboutDialog when kind is "about"', () => {
+    useAppStore.getState().openModal('about');
+    render(<ModalLayer />);
+    expect(screen.getByRole('dialog')).toBeInTheDocument();
+  });
+
+  it('switches from about to settings when modal kind changes', () => {
+    useAppStore.getState().openModal('about');
+    const { rerender } = render(<ModalLayer />);
+    expect(screen.getByText(/about markdownconverter/i)).toBeInTheDocument();
+    useAppStore.getState().openModal('settings');
+    rerender(<ModalLayer />);
+    expect(screen.queryByText(/about markdownconverter/i)).not.toBeInTheDocument();
+    expect(screen.getByText(/settings/i)).toBeInTheDocument();
+  });
+});

tests/component/modals/SettingsSheet.test.tsx

@@ -0,0 +1,58 @@
+import { describe, it, expect, beforeEach } from 'vitest';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { SettingsSheet } from '@/components/modals/SettingsSheet';
+import { useSettingsStore } from '@/stores/settings-store';
+
+describe('SettingsSheet', () => {
+  beforeEach(() => {
+    localStorage.clear();
+    useSettingsStore.setState(useSettingsStore.getInitialState());
+  });
+
+  it('renders 5 tab triggers', () => {
+    render(<SettingsSheet />);
+    expect(screen.getByRole('tab', { name: /editor/i })).toBeInTheDocument();
+    expect(screen.getByRole('tab', { name: /theme/i })).toBeInTheDocument();
+    expect(screen.getByRole('tab', { name: /export/i })).toBeInTheDocument();
+    expect(screen.getByRole('tab', { name: /plugins/i })).toBeInTheDocument();
+    expect(screen.getByRole('tab', { name: /about/i })).toBeInTheDocument();
+  });
+
+  it('editor tab is open by default and shows font size', () => {
+    render(<SettingsSheet />);
+    expect(screen.getByText(/font size/i)).toBeInTheDocument();
+  });
+
+  it('theme tab shows theme radio group', async () => {
+    render(<SettingsSheet />);
+    await userEvent.click(screen.getByRole('tab', { name: /theme/i }));
+    expect(screen.getByText(/accent color/i)).toBeInTheDocument();
+  });
+
+  it('export tab shows ascii toggle and template picker', async () => {
+    render(<SettingsSheet />);
+    await userEvent.click(screen.getByRole('tab', { name: /export/i }));
+    expect(screen.getByText(/render tables as ascii by default/i)).toBeInTheDocument();
+    expect(screen.getByText(/default docx template/i)).toBeInTheDocument();
+  });
+
+  it('plugins tab shows coming soon message', async () => {
+    render(<SettingsSheet />);
+    await userEvent.click(screen.getByRole('tab', { name: /plugins/i }));
+    expect(screen.getByText(/coming soon/i)).toBeInTheDocument();
+  });
+
+  it('about tab shows version', async () => {
+    render(<SettingsSheet />);
+    await userEvent.click(screen.getByRole('tab', { name: /about/i }));
+    expect(screen.getByText(/markdownconverter/i)).toBeInTheDocument();
+  });
+
+  it('reset to defaults button clears all settings', async () => {
+    useSettingsStore.getState().setSetting('fontSize', 22);
+    render(<SettingsSheet />);
+    await userEvent.click(screen.getByRole('button', { name: /reset/i }));
+    expect(useSettingsStore.getState().fontSize).toBe(14);
+  });
+});

tests/component/modals/WelcomeDialog.test.tsx

@@ -0,0 +1,34 @@
+import { describe, it, expect, beforeEach } from 'vitest';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { WelcomeDialog } from '@/components/modals/WelcomeDialog';
+import { useSettingsStore } from '@/stores/settings-store';
+import { useAppStore } from '@/stores/app-store';
+
+describe('WelcomeDialog', () => {
+  beforeEach(() => {
+    localStorage.clear();
+    useSettingsStore.setState(useSettingsStore.getInitialState());
+    useAppStore.setState({ modal: { kind: null } } as any);
+  });
+
+  it('renders a heading and quick-start content', () => {
+    render(<WelcomeDialog />);
+    expect(screen.getByRole('heading', { name: /welcome/i })).toBeInTheDocument();
+    expect(screen.getByText(/open a folder/i)).toBeInTheDocument();
+  });
+
+  it('closing without the checkbox does not dismiss future welcome dialogs', async () => {
+    render(<WelcomeDialog />);
+    await userEvent.click(screen.getByRole('button', { name: /get started/i }));
+    expect(useSettingsStore.getState().welcomeDismissed).toBe(false);
+    expect(useAppStore.getState().modal).toEqual({ kind: null });
+  });
+
+  it('checking "don\'t show again" persists the flag', async () => {
+    render(<WelcomeDialog />);
+    await userEvent.click(screen.getByRole('checkbox', { name: /don't show again/i }));
+    await userEvent.click(screen.getByRole('button', { name: /get started/i }));
+    expect(useSettingsStore.getState().welcomeDismissed).toBe(true);
+  });
+});

tests/component/ui/checkbox.test.tsx

@@ -0,0 +1,13 @@
+import { describe, it, expect, vi } from 'vitest';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { Checkbox } from '@/components/ui/checkbox';
+
+describe('Checkbox', () => {
+  it('toggles checked state on click', async () => {
+    const onCheckedChange = vi.fn();
+    render(<Checkbox aria-label="agree" onCheckedChange={onCheckedChange} />);
+    await userEvent.click(screen.getByRole('checkbox', { name: /agree/i }));
+    expect(onCheckedChange).toHaveBeenCalledWith(true);
+  });
+});

tests/component/ui/dialog.test.tsx

@@ -0,0 +1,30 @@
+import { describe, it, expect } from 'vitest';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from '@/components/ui/dialog';
+
+describe('Dialog', () => {
+  it('opens on trigger click and shows content', async () => {
+    render(
+      <Dialog>
+        <DialogTrigger>Open</DialogTrigger>
+        <DialogContent aria-describedby="d">
+          <DialogHeader>
+            <DialogTitle>Title</DialogTitle>
+            <DialogDescription id="d">Desc</DialogDescription>
+          </DialogHeader>
+        </DialogContent>
+      </Dialog>
+    );
+    await userEvent.click(screen.getByRole('button', { name: /open/i }));
+    expect(screen.getByRole('dialog')).toBeInTheDocument();
+    expect(screen.getByText(/title/i)).toBeInTheDocument();
+  });
+});

tests/component/ui/form.test.tsx

@@ -0,0 +1,42 @@
+import { describe, it, expect } from 'vitest';
+import { render, screen } from '@testing-library/react';
+import { useForm, FormProvider } from 'react-hook-form';
+import { z } from 'zod';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { Form, FormField, FormItem, FormLabel, FormControl, FormMessage } from '@/components/ui/form';
+import { Input } from '@/components/ui/input';
+
+const schema = z.object({ name: z.string().min(2) });
+
+function Harness() {
+  const form = useForm<{ name: string }>({
+    resolver: zodResolver(schema),
+    defaultValues: { name: '' },
+  });
+  return (
+    <FormProvider {...form}>
+      <Form>
+        <FormField
+          control={form.control}
+          name="name"
+          render={({ field }) => (
+            <FormItem>
+              <FormLabel>Name</FormLabel>
+              <FormControl>
+                <Input {...field} aria-label="name" />
+              </FormControl>
+              <FormMessage />
+            </FormItem>
+          )}
+        />
+      </Form>
+    </FormProvider>
+  );
+}
+
+describe('Form', () => {
+  it('renders a labeled form field', () => {
+    render(<Harness />);
+    expect(screen.getByLabelText(/name/i)).toBeInTheDocument();
+  });
+});

tests/component/ui/input.test.tsx

@@ -0,0 +1,14 @@
+import { describe, it, expect, vi } from 'vitest';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { Input } from '@/components/ui/input';
+
+describe('Input', () => {
+  it('renders and accepts typing', async () => {
+    const onChange = vi.fn();
+    render(<Input aria-label="name" onChange={onChange} />);
+    const input = screen.getByLabelText(/name/i);
+    await userEvent.type(input, 'a');
+    expect(onChange).toHaveBeenCalled();
+  });
+});

tests/component/ui/label.test.tsx

@@ -0,0 +1,17 @@
+import { describe, it, expect } from 'vitest';
+import { render, screen } from '@testing-library/react';
+import { Label } from '@/components/ui/label';
+
+describe('Label', () => {
+  it('renders children and associates with a control', () => {
+    render(
+      <>
+        <Label htmlFor="x">Username</Label>
+        <input id="x" />
+      </>
+    );
+    const label = screen.getByText(/username/i);
+    expect(label).toBeInTheDocument();
+    expect(label.tagName).toBe('LABEL');
+  });
+});

tests/component/ui/radio-group.test.tsx

@@ -0,0 +1,18 @@
+import { describe, it, expect, vi } from 'vitest';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { RadioGroup, RadioGroupItem } from '@/components/ui/radio-group';
+
+describe('RadioGroup', () => {
+  it('selects the clicked item', async () => {
+    const onValueChange = vi.fn();
+    render(
+      <RadioGroup onValueChange={onValueChange} defaultValue="a">
+        <RadioGroupItem value="a" aria-label="A" />
+        <RadioGroupItem value="b" aria-label="B" />
+      </RadioGroup>
+    );
+    await userEvent.click(screen.getByRole('radio', { name: /b/i }));
+    expect(onValueChange).toHaveBeenCalledWith('b');
+  });
+});

tests/component/ui/select.test.tsx

@@ -0,0 +1,29 @@
+import { describe, it, expect, vi } from 'vitest';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@/components/ui/select';
+
+describe('Select', () => {
+  it('renders trigger and opens content on click', async () => {
+    const onValueChange = vi.fn();
+    render(
+      <Select onValueChange={onValueChange}>
+        <SelectTrigger aria-label="fruit">
+          <SelectValue placeholder="Pick one" />
+        </SelectTrigger>
+        <SelectContent>
+          <SelectItem value="apple">Apple</SelectItem>
+          <SelectItem value="banana">Banana</SelectItem>
+        </SelectContent>
+      </Select>
+    );
+    await userEvent.click(screen.getByRole('combobox', { name: /fruit/i }));
+    expect(screen.getByRole('option', { name: /apple/i })).toBeInTheDocument();
+  });
+});

tests/component/ui/sheet.test.tsx

@@ -0,0 +1,29 @@
+import { describe, it, expect } from 'vitest';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import {
+  Sheet,
+  SheetContent,
+  SheetDescription,
+  SheetHeader,
+  SheetTitle,
+  SheetTrigger,
+} from '@/components/ui/sheet';
+
+describe('Sheet', () => {
+  it('opens on trigger click', async () => {
+    render(
+      <Sheet>
+        <SheetTrigger>Open</SheetTrigger>
+        <SheetContent aria-describedby="d" side="right">
+          <SheetHeader>
+            <SheetTitle>Settings</SheetTitle>
+            <SheetDescription id="d">Desc</SheetDescription>
+          </SheetHeader>
+        </SheetContent>
+      </Sheet>
+    );
+    await userEvent.click(screen.getByRole('button', { name: /open/i }));
+    expect(screen.getByRole('dialog')).toBeInTheDocument();
+  });
+});

tests/component/ui/slider.test.tsx

@@ -0,0 +1,10 @@
+import { describe, it, expect, vi } from 'vitest';
+import { render, screen } from '@testing-library/react';
+import { Slider } from '@/components/ui/slider';
+
+describe('Slider', () => {
+  it('renders with default value', () => {
+    render(<Slider aria-label="volume" defaultValue={[50]} onValueChange={vi.fn()} />);
+    expect(screen.getByRole('slider', { name: /volume/i })).toHaveAttribute('aria-valuenow', '50');
+  });
+});

tests/component/ui/sonner.test.tsx

@@ -0,0 +1,17 @@
+import { describe, it, expect } from 'vitest';
+import { render } from '@testing-library/react';
+import { Toaster } from '@/components/ui/sonner';
+import { ThemeProvider } from '@/components/theme-provider';
+
+describe('Toaster', () => {
+  it('renders inside ThemeProvider without crashing', () => {
+    const { container } = render(
+      <ThemeProvider defaultTheme="light" attribute="class">
+        <Toaster />
+      </ThemeProvider>
+    );
+    // The Toaster portal is mounted at body level, so the container may be empty
+    // but the test should not throw
+    expect(container).toBeDefined();
+  });
+});

tests/component/ui/switch.test.tsx

@@ -0,0 +1,13 @@
+import { describe, it, expect, vi } from 'vitest';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { Switch } from '@/components/ui/switch';
+
+describe('Switch', () => {
+  it('toggles checked state', async () => {
+    const onCheckedChange = vi.fn();
+    render(<Switch aria-label="airplane" onCheckedChange={onCheckedChange} />);
+    await userEvent.click(screen.getByRole('switch', { name: /airplane/i }));
+    expect(onCheckedChange).toHaveBeenCalledWith(true);
+  });
+});

tests/component/ui/tabs.test.tsx

@@ -0,0 +1,22 @@
+import { describe, it, expect } from 'vitest';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { Tabs, TabsList, TabsTrigger, TabsContent } from '@/components/ui/tabs';
+
+describe('Tabs', () => {
+  it('switches content on trigger click', async () => {
+    render(
+      <Tabs defaultValue="one">
+        <TabsList>
+          <TabsTrigger value="one">One</TabsTrigger>
+          <TabsTrigger value="two">Two</TabsTrigger>
+        </TabsList>
+        <TabsContent value="one">Content one</TabsContent>
+        <TabsContent value="two">Content two</TabsContent>
+      </Tabs>
+    );
+    expect(screen.getByText(/content one/i)).toBeVisible();
+    await userEvent.click(screen.getByRole('tab', { name: /two/i }));
+    expect(screen.getByText(/content two/i)).toBeVisible();
+  });
+});

tests/component/ui/textarea.test.tsx

@@ -0,0 +1,12 @@
+import { describe, it, expect } from 'vitest';
+import { render, screen } from '@testing-library/react';
+import { Textarea } from '@/components/ui/textarea';
+
+describe('Textarea', () => {
+  it('renders a multi-line input', () => {
+    render(<Textarea aria-label="notes" defaultValue="hello" />);
+    const ta = screen.getByLabelText(/notes/i);
+    expect(ta.tagName).toBe('TEXTAREA');
+    expect(ta).toHaveValue('hello');
+  });
+});

tests/integration/phase5-smoke.test.tsx

@@ -37,6 +37,9 @@ vi.mock('@/lib/ipc', () => ({
       pickFile: vi.fn().mockResolvedValue({ ok: true, data: '/root/README.md' }),
       onChange: vi.fn(() => () => {}),
     },
+    menu: {
+      on: vi.fn(() => () => {}),
+    },
   },
 }));
 
@@ -68,9 +71,11 @@ describe('Phase 5 integration', () => {
 
   it('opening a folder via the Open Folder button populates the tree', async () => {
     render(<AppShell />);
-    const openBtn = screen.getByRole('button', { name: /open folder/i });
+    // Two buttons share the "Open folder" name (toolbar + sidebar).
+    // Either one triggers the same command, so click the first match.
+    const buttons = screen.getAllByRole('button', { name: /open folder/i });
     await act(async () => {
-      fireEvent.click(openBtn);
+      fireEvent.click(buttons[0]);
     });
     // After openFolder, the tree should have children
     const state = useFileStore.getState();

tests/integration/phase6-smoke.test.tsx

@@ -0,0 +1,165 @@
+import { describe, it, expect, beforeEach, vi } from 'vitest';
+import { render, screen, fireEvent, act } from '@testing-library/react';
+import { AppShell } from '@/components/layout/AppShell';
+import { useFileStore } from '@/stores/file-store';
+import { useEditorStore } from '@/stores/editor-store';
+import { useAppStore } from '@/stores/app-store';
+import { useCommandStore } from '@/stores/command-store';
+
+// Mock react-resizable-panels (jsdom can't measure DOM for it)
+vi.mock('@/components/ui/resizable', () => ({
+  ResizablePanelGroup: ({ children, direction }: any) => (
+    <div data-testid="resizable-panel-group" data-direction={direction}>
+      {children}
+    </div>
+  ),
+  ResizablePanel: ({ children, defaultSize }: any) => (
+    <div data-testid="resizable-panel" data-size={defaultSize}>
+      {children}
+    </div>
+  ),
+  ResizableHandle: () => <div data-testid="resizable-handle" />,
+}));
+
+const menuListeners = new Map<string, (...args: unknown[]) => void>();
+vi.mock('@/lib/ipc', () => ({
+  ipc: {
+    file: {
+      open: vi.fn().mockResolvedValue({ ok: false, error: { code: 'NO_BRIDGE', message: 'mock' } }),
+      read: vi.fn().mockResolvedValue({ ok: true, data: '# hello' }),
+      write: vi.fn().mockResolvedValue({ ok: true, data: undefined }),
+      list: vi.fn().mockResolvedValue({
+        ok: true,
+        data: [{ name: 'README.md', path: '/root/README.md', isDirectory: false }],
+      }),
+      pickFolder: vi.fn().mockResolvedValue({ ok: true, data: '/root' }),
+      pickFile: vi.fn().mockResolvedValue({ ok: true, data: '/root/README.md' }),
+      onChange: vi.fn(() => () => {}),
+    },
+    menu: {
+      on: vi.fn((channel: string, cb: (...args: unknown[]) => void) => {
+        menuListeners.set(channel, cb);
+        return () => {
+          if (menuListeners.get(channel) === cb) menuListeners.delete(channel);
+        };
+      }),
+    },
+  },
+}));
+
+function fireMenu(channel: string, ...args: unknown[]): void {
+  const listener = menuListeners.get(channel);
+  if (!listener) throw new Error(`No menu listener for ${channel}`);
+  listener(...args);
+}
+
+describe('Phase 6 integration: menu → command → store', () => {
+  beforeEach(() => {
+    localStorage.clear();
+    menuListeners.clear();
+    useFileStore.setState({
+      tree: null,
+      rootPath: null,
+      expanded: new Set(),
+      openTabs: [],
+      activeTabId: null,
+    });
+    useEditorStore.setState({ buffers: new Map(), activeId: null });
+    useAppStore.setState({
+      sidebarVisible: true,
+      previewVisible: true,
+      zenMode: false,
+      paneSizes: { sidebar: 20, editor: 50, preview: 30 },
+    });
+    useCommandStore.setState({ handlers: {}, userBindings: {} });
+  });
+
+  it('toolbar Open Folder button opens the folder dialog and populates the tree', async () => {
+    render(<AppShell />);
+    const btn = screen.getByTestId('toolbar-open-folder');
+    await act(async () => {
+      fireEvent.click(btn);
+    });
+    expect(useFileStore.getState().tree).not.toBeNull();
+    expect(useFileStore.getState().rootPath).toBe('/root');
+  });
+
+  it('toolbar Save button invokes the registered file.save command (which writes)', async () => {
+    // Seed an open buffer
+    useFileStore.setState({
+      openTabs: [{ id: '/root/doc.md', path: '/root/doc.md', title: 'doc.md', dirty: true }],
+      activeTabId: '/root/doc.md',
+    });
+    useEditorStore.setState({
+      buffers: new Map([['/root/doc.md', { id: '/root/doc.md', content: '# x', dirty: true }]]),
+      activeId: '/root/doc.md',
+    });
+
+    render(<AppShell />);
+    const saveBtn = screen.getByTestId('toolbar-save');
+    await act(async () => {
+      fireEvent.click(saveBtn);
+    });
+    // After save, the buffer should be clean
+    expect(useEditorStore.getState().buffers.get('/root/doc.md')?.dirty).toBe(false);
+  });
+
+  it('header toggle sidebar button flips sidebarVisible', async () => {
+    render(<AppShell />);
+    const btn = screen.getByTestId('header-toggle-sidebar');
+    expect(btn).toHaveAttribute('aria-pressed', 'true');
+    await act(async () => {
+      fireEvent.click(btn);
+    });
+    expect(useAppStore.getState().sidebarVisible).toBe(false);
+    expect(btn).toHaveAttribute('aria-pressed', 'false');
+  });
+
+  it('native menu file-save event triggers save through the command store', async () => {
+    useFileStore.setState({
+      openTabs: [{ id: '/root/doc.md', path: '/root/doc.md', title: 'doc.md', dirty: true }],
+      activeTabId: '/root/doc.md',
+    });
+    useEditorStore.setState({
+      buffers: new Map([['/root/doc.md', { id: '/root/doc.md', content: '# y', dirty: true }]]),
+      activeId: '/root/doc.md',
+    });
+
+    render(<AppShell />);
+    await act(async () => {
+      fireMenu('file-save');
+    });
+    expect(useEditorStore.getState().buffers.get('/root/doc.md')?.dirty).toBe(false);
+  });
+
+  it('native menu toggle-preview event flips previewVisible', () => {
+    render(<AppShell />);
+    expect(useAppStore.getState().previewVisible).toBe(true);
+    act(() => {
+      fireMenu('toggle-preview');
+    });
+    expect(useAppStore.getState().previewVisible).toBe(false);
+  });
+
+  it('userBindings survive a remount via zustand persist', async () => {
+    useCommandStore.getState().setUserBinding('file.save', 'mod+shift+s');
+    await useCommandStore.persist?.flush?.();
+
+    // Read raw stored value
+    const stored = JSON.parse(localStorage.getItem('mc-command-store') ?? '{}');
+    expect(stored.state.userBindings['file.save']).toBe('mod+shift+s');
+  });
+
+  it('commands registered in AppShell are accessible by id from any consumer', () => {
+    render(<AppShell />);
+    const handlers = useCommandStore.getState().handlers;
+    expect(typeof handlers['file.open']).toBe('function');
+    expect(typeof handlers['file.openFolder']).toBe('function');
+    expect(typeof handlers['file.save']).toBe('function');
+    expect(typeof handlers['file.closeTab']).toBe('function');
+    expect(typeof handlers['tab.next']).toBe('function');
+    expect(typeof handlers['tab.prev']).toBe('function');
+    expect(typeof handlers['view.toggleSidebar']).toBe('function');
+    expect(typeof handlers['view.togglePreview']).toBe('function');
+  });
+});

tests/integration/phase7-modals-smoke.test.tsx

@@ -0,0 +1,62 @@
+import { describe, it, expect, beforeEach, vi } from 'vitest';
+import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import App from '@/App';
+import { useAppStore } from '@/stores/app-store';
+import { useCommandStore } from '@/stores/command-store';
+import { useSettingsStore } from '@/stores/settings-store';
+import { useFileStore } from '@/stores/file-store';
+import { useEditorStore } from '@/stores/editor-store';
+import { registerMenuCommands } from '@/lib/commands/register-menu-commands';
+
+vi.mock('@/lib/ipc', () => ({
+  ipc: {
+    app: {
+      getVersion: vi.fn().mockResolvedValue({ ok: true, data: '5.0.0' }),
+      openExternal: vi.fn().mockResolvedValue({ ok: true }),
+    },
+    menu: {
+      on: vi.fn().mockReturnValue(vi.fn()),
+ },
+  },
+}));
+
+describe('Phase 7 modals integration', () => {
+  beforeEach(() => {
+    localStorage.clear();
+    useAppStore.setState({ modal: { kind: null }, sidebarVisible: true, previewVisible: true, zenMode: false, paneSizes: { sidebar: 20, editor: 50, preview: 30 } } as any);
+    useCommandStore.setState({ handlers: {}, userBindings: {} } as any);
+    useSettingsStore.setState(useSettingsStore.getInitialState());
+    useFileStore.setState({ activeTabId: '/x.md', openTabs: [{ id: '/x.md', path: '/x.md', title: 'x.md', dirty: false }] } as any);
+    useEditorStore.setState({ buffers: new Map([['/x.md', { id: '/x.md', path: '/x.md', content: '# hi', dirty: false }]]) } as any);
+  });
+
+  it('dispatching settings.open from command store opens SettingsSheet', () => {
+    registerMenuCommands();
+    render(<App />);
+    useCommandStore.getState().dispatch('settings.open');
+    expect(screen.getByRole('dialog')).toBeInTheDocument();
+  });
+
+  it('AppHeader Settings button dispatches settings.open', async () => {
+    useSettingsStore.setState({ ...useSettingsStore.getInitialState(), welcomeDismissed: true });
+    registerMenuCommands();
+    render(<App />);
+    await userEvent.click(screen.getByRole('button', { name: 'Settings' }));
+    expect(useAppStore.getState().modal.kind).toBe('settings');
+  });
+
+  it('first launch with welcomeDismissed=false opens welcome modal', () => {
+    useSettingsStore.setState({ ...useSettingsStore.getInitialState(), welcomeDismissed: false });
+    registerMenuCommands();
+    render(<App />);
+    expect(useAppStore.getState().modal.kind).toBe('welcome');
+  });
+
+  it('first launch with welcomeDismissed=true does not open welcome', () => {
+    useSettingsStore.setState({ ...useSettingsStore.getInitialState(), welcomeDismissed: true });
+    registerMenuCommands();
+    render(<App />);
+    expect(useAppStore.getState().modal).toEqual({ kind: null });
+  });
+});

tests/integration/phase8-toasts-smoke.test.tsx

@@ -0,0 +1,109 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+
+vi.mock('@/lib/toast', () => ({
+  toast: {
+    success: vi.fn(),
+    error: vi.fn(),
+    info: vi.fn(),
+    warning: vi.fn(),
+    promise: vi.fn(),
+    dismiss: vi.fn(),
+  },
+}));
+
+vi.mock('@/lib/ipc', () => ({
+  ipc: {
+    app: {
+      getVersion: vi.fn().mockResolvedValue({ ok: true, data: '5.0.0' }),
+      openExternal: vi.fn().mockResolvedValue({ ok: true }),
+    },
+    file: {
+      read: vi.fn(),
+      write: vi.fn(),
+      list: vi.fn(),
+      pickFolder: vi.fn(),
+      pickFile: vi.fn(),
+      onChange: vi.fn(),
+    },
+    menu: {
+      on: vi.fn(() => () => {}),
+    },
+    export: {
+      pdf: vi.fn(),
+      docx: vi.fn(),
+      html: vi.fn(),
+      batch: vi.fn(),
+    },
+  },
+}));
+
+import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import App from '@/App';
+import { useFileStore } from '@/stores/file-store';
+import { useEditorStore } from '@/stores/editor-store';
+import { useAppStore } from '@/stores/app-store';
+import { useCommandStore } from '@/stores/command-store';
+import { useSettingsStore } from '@/stores/settings-store';
+import { ipc } from '@/lib/ipc';
+import { toast } from '@/lib/toast';
+import { registerMenuCommands } from '@/lib/commands/register-menu-commands';
+
+describe('Phase 8 toasts integration', () => {
+  beforeEach(() => {
+    localStorage.clear();
+    vi.clearAllMocks();
+    useAppStore.setState({ modal: { kind: null }, sidebarVisible: true, previewVisible: true, zenMode: false, paneSizes: { sidebar: 20, editor: 50, preview: 30 } } as any);
+    useCommandStore.setState({ handlers: {}, userBindings: {} } as any);
+    useSettingsStore.setState({ ...useSettingsStore.getInitialState(), welcomeDismissed: true });
+    useFileStore.setState({ activeTabId: '/test.md', openTabs: [{ id: '/test.md', path: '/test.md', title: 'test.md', dirty: false }] } as any);
+    useEditorStore.setState({ buffers: new Map([['/test.md', { id: '/test.md', path: '/test.md', content: '# hi', dirty: true }]]) } as any);
+  });
+
+  it('saving a file calls toast.success with "Saved test.md"', async () => {
+    (ipc.file.write as any).mockResolvedValue({ ok: true });
+    registerMenuCommands();
+    render(<App />);
+
+    const result = await useFileStore.getState().saveActiveBuffer();
+    expect(result).toBe(true);
+    expect(toast.success).toHaveBeenCalledWith('Saved test.md');
+  });
+
+  it('saving with IPC error calls toast.error', async () => {
+    (ipc.file.write as any).mockResolvedValue({ ok: false, error: { code: 'EACCES', message: 'Permission denied' } });
+    registerMenuCommands();
+    render(<App />);
+
+    const result = await useFileStore.getState().saveActiveBuffer();
+    expect(result).toBe(false);
+    expect(toast.error).toHaveBeenCalledWith('Failed to save: Permission denied');
+  });
+
+  it('opening a missing file calls toast.error', async () => {
+    (ipc.file.read as any).mockResolvedValue({ ok: false, error: { code: 'ENOENT', message: 'No such file' } });
+    registerMenuCommands();
+    render(<App />);
+
+    await useFileStore.getState().openFile('/missing.md');
+    expect(toast.error).toHaveBeenCalledWith('Failed to open file: No such file');
+  });
+
+  it('exporting a file calls toast.success on success', async () => {
+    (ipc.export.pdf as any).mockResolvedValue({ ok: true, data: { outputPath: '/test.pdf', bytes: 100, durationMs: 50 } });
+    registerMenuCommands();
+    render(<App />);
+
+    // Open the export-pdf modal via command dispatch
+    useCommandStore.getState().dispatch('file.exportPdf');
+    expect(useAppStore.getState().modal).toEqual({ kind: 'export-pdf', props: { sourcePath: '/test.md' } });
+
+    // Click the Export button
+    const exportBtn = await screen.findByRole('button', { name: /^export$/i });
+    await userEvent.click(exportBtn);
+
+    await waitFor(() => {
+      expect(toast.success).toHaveBeenCalledWith(expect.stringContaining('Exported test.md'));
+    });
+  });
+});

tests/unit/commands/modal-commands.test.ts

@@ -0,0 +1,53 @@
+import { describe, it, expect, beforeEach, vi } from 'vitest';
+import { registerMenuCommands } from '@/lib/commands/register-menu-commands';
+import { useCommandStore } from '@/stores/command-store';
+import { useAppStore } from '@/stores/app-store';
+import { useFileStore } from '@/stores/file-store';
+import { useEditorStore } from '@/stores/editor-store';
+
+describe('modal commands', () => {
+  beforeEach(() => {
+    localStorage.clear();
+    useCommandStore.setState({ handlers: {}, userBindings: {} } as any);
+    useAppStore.setState({ modal: { kind: null } } as any);
+    useFileStore.setState({ activeTabId: '/x.md', openTabs: [{ id: '/x.md', path: '/x.md', title: 'x.md', dirty: false }] } as any);
+    useEditorStore.setState({ buffers: new Map([['/x.md', { id: '/x.md', path: '/x.md', content: '# hi', dirty: false }]]) } as any);
+  });
+
+  it('settings.open opens settings modal', () => {
+    registerMenuCommands();
+    useCommandStore.getState().dispatch('settings.open');
+    expect(useAppStore.getState().modal).toEqual({ kind: 'settings' });
+  });
+
+  it('help.about opens about modal', () => {
+    registerMenuCommands();
+    useCommandStore.getState().dispatch('help.about');
+    expect(useAppStore.getState().modal).toEqual({ kind: 'about' });
+  });
+
+  it('help.welcome opens welcome modal', () => {
+    registerMenuCommands();
+    useCommandStore.getState().dispatch('help.welcome');
+    expect(useAppStore.getState().modal).toEqual({ kind: 'welcome' });
+  });
+
+  it('file.exportPdf opens export-pdf modal with active path', () => {
+    registerMenuCommands();
+    useCommandStore.getState().dispatch('file.exportPdf');
+    expect(useAppStore.getState().modal).toEqual({ kind: 'export-pdf', props: { sourcePath: '/x.md' } });
+  });
+
+  it('file.exportDocx opens export-docx modal', () => {
+    registerMenuCommands();
+    useCommandStore.getState().dispatch('file.exportDocx');
+    expect(useAppStore.getState().modal).toEqual({ kind: 'export-docx', props: { sourcePath: '/x.md' } });
+  });
+
+  it('file.exportBatch opens export-batch modal with all open files', () => {
+    useFileStore.setState({ activeTabId: '/x.md', openTabs: [{ id: '/x.md', path: '/x.md', title: 'x.md', dirty: false }, { id: '/y.md', path: '/y.md', title: 'y.md', dirty: false }] } as any);
+    registerMenuCommands();
+    useCommandStore.getState().dispatch('file.exportBatch');
+    expect(useAppStore.getState().modal).toEqual({ kind: 'export-batch', props: { sourcePaths: ['/x.md', '/y.md'] } });
+  });
+});

tests/unit/hooks/use-menu-action.test.ts

@@ -0,0 +1,84 @@
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import { renderHook } from '@testing-library/react';
+import { useMenuAction } from '@/hooks/use-menu-action';
+import { useCommandStore } from '@/stores/command-store';
+
+type Cleanup = () => void;
+
+const menuListeners = new Map<string, (...args: unknown[]) => void>();
+const subscribeToMenu = vi.fn(
+  (channel: string, callback: (...args: unknown[]) => void): Cleanup => {
+    menuListeners.set(channel, callback);
+    return () => {
+      if (menuListeners.get(channel) === callback) menuListeners.delete(channel);
+    };
+  }
+);
+
+vi.mock('@/lib/ipc', () => ({
+  ipc: {
+    menu: {
+      on: (channel: string, callback: (...args: unknown[]) => void) =>
+        subscribeToMenu(channel, callback),
+    },
+  },
+}));
+
+function fireMenu(channel: string, ...args: unknown[]): void {
+  const listener = menuListeners.get(channel);
+  if (!listener) throw new Error(`No listener registered for ${channel}`);
+  listener(...args);
+}
+
+describe('useMenuAction', () => {
+  beforeEach(() => {
+    menuListeners.clear();
+    subscribeToMenu.mockClear();
+    useCommandStore.setState({ handlers: {} });
+  });
+
+  afterEach(() => {
+    vi.restoreAllMocks();
+  });
+
+  it('subscribes to the given IPC channel and dispatches the matching command on fire', () => {
+    const dispatched: unknown[] = [];
+    useCommandStore.getState().register('file.save', (args) => dispatched.push(args));
+
+    renderHook(() => useMenuAction('file-save', 'file.save'));
+
+    expect(subscribeToMenu).toHaveBeenCalledWith('file-save', expect.any(Function));
+    fireMenu('file-save');
+    expect(dispatched).toEqual([undefined]);
+  });
+
+  it('forwards the IPC payload to the command as args', () => {
+    const dispatched: unknown[] = [];
+    useCommandStore.getState().register('template.load', (args) => dispatched.push(args));
+
+    renderHook(() => useMenuAction('load-template-menu', 'template.load', (name) => ({ name })));
+
+    fireMenu('load-template-menu', 'blog-post.md');
+    expect(dispatched).toEqual([{ name: 'blog-post.md' }]);
+  });
+
+  it('default transform: args is the first IPC payload as-is', () => {
+    const dispatched: unknown[] = [];
+    useCommandStore.getState().register('file.opened', (args) => dispatched.push(args));
+
+    renderHook(() => useMenuAction('file-opened', 'file.opened'));
+
+    fireMenu('file-opened', { path: '/a.md', content: '# hi' });
+    expect(dispatched).toEqual([{ path: '/a.md', content: '# hi' }]);
+  });
+
+  it('if no command is registered, fire is a no-op (does not throw)', () => {
+    renderHook(() => useMenuAction('file-save', 'file.save'));
+    expect(() => fireMenu('file-save')).not.toThrow();
+  });
+
+  it('unsubscribes on unmount', () => {
+    renderHook(() => useMenuAction('file-save', 'file.save'));
+    expect(menuListeners.has('file-save')).toBe(true);
+  });
+});

tests/unit/hooks/use-shortcut.test.ts

@@ -0,0 +1,137 @@
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import { renderHook } from '@testing-library/react';
+import { fireEvent } from '@testing-library/dom';
+import { useShortcut } from '@/hooks/use-shortcut';
+
+describe('useShortcut', () => {
+  beforeEach(() => {
+    // No-op: each test sets up its own keydown
+  });
+
+  afterEach(() => {
+    vi.restoreAllMocks();
+  });
+
+  it('calls the callback when the shortcut matches (mod+s)', () => {
+    const cb = vi.fn();
+    renderHook(() => useShortcut('mod+s', cb));
+    fireEvent.keyDown(window, { key: 's', ctrlKey: true });
+    expect(cb).toHaveBeenCalledTimes(1);
+  });
+
+  it('recognizes metaKey as well as ctrlKey (Mac shortcut)', () => {
+    const cb = vi.fn();
+    renderHook(() => useShortcut('mod+s', cb));
+    fireEvent.keyDown(window, { key: 's', metaKey: true });
+    expect(cb).toHaveBeenCalledTimes(1);
+  });
+
+  it('matches plain keys without modifier (just "k")', () => {
+    const cb = vi.fn();
+    renderHook(() => useShortcut('k', cb));
+    fireEvent.keyDown(window, { key: 'k' });
+    expect(cb).toHaveBeenCalledTimes(1);
+  });
+
+  it('matches shift variants (mod+shift+s)', () => {
+    const cb = vi.fn();
+    renderHook(() => useShortcut('mod+shift+s', cb));
+    fireEvent.keyDown(window, { key: 'S', ctrlKey: true, shiftKey: true });
+    expect(cb).toHaveBeenCalledTimes(1);
+  });
+
+  it('does NOT fire when shift is required but missing', () => {
+    const cb = vi.fn();
+    renderHook(() => useShortcut('mod+shift+s', cb));
+    fireEvent.keyDown(window, { key: 's', ctrlKey: true });
+    expect(cb).not.toHaveBeenCalled();
+  });
+
+  it('does NOT fire when the wrong key is pressed', () => {
+    const cb = vi.fn();
+    renderHook(() => useShortcut('mod+s', cb));
+    fireEvent.keyDown(window, { key: 'x', ctrlKey: true });
+    expect(cb).not.toHaveBeenCalled();
+  });
+
+  it('does NOT fire when no modifier is held but one is required', () => {
+    const cb = vi.fn();
+    renderHook(() => useShortcut('mod+s', cb));
+    fireEvent.keyDown(window, { key: 's' });
+    expect(cb).not.toHaveBeenCalled();
+  });
+
+  it('does NOT fire when the target is an <input>', () => {
+    const cb = vi.fn();
+    renderHook(() => useShortcut('mod+s', cb));
+    const input = document.createElement('input');
+    document.body.appendChild(input);
+    fireEvent.keyDown(input, { key: 's', ctrlKey: true });
+    document.body.removeChild(input);
+    expect(cb).not.toHaveBeenCalled();
+  });
+
+  it('does NOT fire when the target is a <textarea>', () => {
+    const cb = vi.fn();
+    renderHook(() => useShortcut('mod+s', cb));
+    const ta = document.createElement('textarea');
+    document.body.appendChild(ta);
+    fireEvent.keyDown(ta, { key: 's', ctrlKey: true });
+    document.body.removeChild(ta);
+    expect(cb).not.toHaveBeenCalled();
+  });
+
+  it('does NOT fire when the target is contentEditable', () => {
+    const cb = vi.fn();
+    renderHook(() => useShortcut('mod+s', cb));
+    const div = document.createElement('div');
+    Object.defineProperty(div, 'isContentEditable', { value: true, configurable: true });
+    document.body.appendChild(div);
+    fireEvent.keyDown(div, { key: 's', ctrlKey: true });
+    document.body.removeChild(div);
+    expect(cb).not.toHaveBeenCalled();
+  });
+
+  it('calls preventDefault when the shortcut matches', () => {
+    const cb = vi.fn();
+    renderHook(() => useShortcut('mod+s', cb));
+    const event = new KeyboardEvent('keydown', { key: 's', ctrlKey: true, bubbles: true, cancelable: true });
+    window.dispatchEvent(event);
+    expect(event.defaultPrevented).toBe(true);
+  });
+
+  it('does NOT call preventDefault when the shortcut does NOT match', () => {
+    const cb = vi.fn();
+    renderHook(() => useShortcut('mod+s', cb));
+    const event = new KeyboardEvent('keydown', { key: 'x', ctrlKey: true, bubbles: true, cancelable: true });
+    window.dispatchEvent(event);
+    expect(event.defaultPrevented).toBe(false);
+  });
+
+  it('supports the special "Tab" key as a non-modifier shortcut', () => {
+    const cb = vi.fn();
+    renderHook(() => useShortcut('mod+tab', cb));
+    fireEvent.keyDown(window, { key: 'Tab', ctrlKey: true });
+    expect(cb).toHaveBeenCalledTimes(1);
+  });
+
+  it('unbinds the listener on unmount', () => {
+    const cb = vi.fn();
+    const { unmount } = renderHook(() => useShortcut('mod+s', cb));
+    unmount();
+    fireEvent.keyDown(window, { key: 's', ctrlKey: true });
+    expect(cb).not.toHaveBeenCalled();
+  });
+
+  it('updates the bound callback when the function reference changes', () => {
+    const a = vi.fn();
+    const b = vi.fn();
+    const { rerender } = renderHook(({ cb }) => useShortcut('mod+s', cb), {
+      initialProps: { cb: a },
+    });
+    rerender({ cb: b });
+    fireEvent.keyDown(window, { key: 's', ctrlKey: true });
+    expect(a).not.toHaveBeenCalled();
+    expect(b).toHaveBeenCalledTimes(1);
+  });
+});

tests/unit/lib/ascii-table.test.ts

@@ -0,0 +1,60 @@
+import { describe, it, expect } from 'vitest';
+import { toAsciiTable, applyAsciiTransform } from '@/lib/ascii-table';
+
+describe('toAsciiTable', () => {
+  it('renders a simple 2x2 table with aligned columns', () => {
+    const out = toAsciiTable([
+      ['Name', 'Age'],
+      ['Alice', '30'],
+      ['Bob', '25'],
+    ]);
+    expect(out).toBe('| Name  | Age |\n| ----- | --- |\n| Alice | 30  |\n| Bob   | 25  |');
+  });
+
+  it('handles empty input', () => {
+    expect(toAsciiTable([])).toBe('');
+  });
+
+  it('left-aligns non-numeric columns', () => {
+    // With header 'Price' (starts with P, not digit), all columns are left-aligned.
+    // Col 0 width = max(4,1,2) = 4 (from 'Item'); col 1 width = max(5,3,1) = 5 (from 'Price').
+    const out = toAsciiTable([
+      ['Item', 'Price'],
+      ['X', '100'],
+      ['YY', '7'],
+    ]);
+    expect(out).toContain('| X    | 100   |');
+    expect(out).toContain('| YY   | 7     |');
+  });
+
+  it('right-aligns all columns when any header starts with a digit', () => {
+    // Header '7' starts with a digit -> right-align all columns.
+    // Col 0 width = max(4,1,2) = 4 (from 'Item'); col 1 width = max(1,3,2) = 3 (from '100').
+    const out = toAsciiTable([
+      ['Item', '7'],
+      ['X', '100'],
+      ['YY', '25'],
+    ]);
+    // Right-aligned: "X" padStart(4) -> "   X", "100" padStart(3) -> "100"
+    expect(out).toContain('|    X | 100 |');
+    // Right-aligned: "YY" padStart(4) -> "  YY", "25" padStart(3) -> " 25"
+    expect(out).toContain('|   YY |  25 |');
+ });
+});
+
+describe('applyAsciiTransform', () => {
+  it('replaces markdown tables with fenced ASCII tables', () => {
+    const md = 'Before\n\n| Name | Age |\n| --- | --- |\n| Alice | 30 |\n\nAfter';
+    const out = applyAsciiTransform(md);
+    expect(out).toContain('```\n| Name  | Age |');
+    expect(out).toContain('| Alice | 30  |');
+    expect(out).toContain('```');
+    expect(out).toContain('Before');
+    expect(out).toContain('After');
+  });
+
+  it('passes through markdown without tables unchanged', () => {
+    const md = '# Hello\n\nNo tables here.';
+    expect(applyAsciiTransform(md)).toBe(md);
+  });
+});

tests/unit/lib/register-menu-commands.test.tsx

@@ -0,0 +1,145 @@
+import { describe, it, expect, beforeEach, vi } from 'vitest';
+import { render, act } from '@testing-library/react';
+import { useCommandStore } from '@/stores/command-store';
+import { useFileStore } from '@/stores/file-store';
+import { useAppStore } from '@/stores/app-store';
+import { useRegisterMenuCommands, useBridgeNativeMenu } from '@/lib/commands/register-menu-commands';
+
+type Cleanup = () => void;
+const menuListeners = new Map<string, (...args: unknown[]) => void>();
+const menuOn = vi.fn(
+  (channel: string, callback: (...args: unknown[]) => void): Cleanup => {
+    menuListeners.set(channel, callback);
+    return () => {
+      if (menuListeners.get(channel) === callback) menuListeners.delete(channel);
+    };
+  }
+);
+
+vi.mock('@/lib/ipc', () => ({
+  ipc: {
+    menu: {
+      on: (channel: string, cb: (...args: unknown[]) => void) => menuOn(channel, cb),
+    },
+  },
+}));
+
+function fireMenu(channel: string, ...args: unknown[]): void {
+  const listener = menuListeners.get(channel);
+  if (!listener) throw new Error(`No listener for ${channel}`);
+  listener(...args);
+}
+
+function Harness() {
+  useRegisterMenuCommands();
+  useBridgeNativeMenu();
+  return null;
+}
+
+describe('useRegisterMenuCommands + useBridgeNativeMenu', () => {
+  beforeEach(() => {
+    menuListeners.clear();
+    menuOn.mockClear();
+    useCommandStore.setState({ handlers: {} });
+    useFileStore.setState({
+      tree: null,
+      rootPath: null,
+      expanded: new Set(),
+      openTabs: [],
+      activeTabId: null,
+    });
+    useAppStore.setState({
+      sidebarVisible: true,
+      previewVisible: true,
+      zenMode: false,
+      paneSizes: { sidebar: 20, editor: 50, preview: 30 },
+    });
+  });
+
+  it('registers file.open, file.save, file.closeTab handlers in the command store', () => {
+    render(<Harness />);
+    const handlers = useCommandStore.getState().handlers;
+    expect(typeof handlers['file.open']).toBe('function');
+    expect(typeof handlers['file.save']).toBe('function');
+    expect(typeof handlers['file.closeTab']).toBe('function');
+  });
+
+  it('registers tab.next / tab.prev and view.toggle* commands', () => {
+    render(<Harness />);
+    const handlers = useCommandStore.getState().handlers;
+    expect(typeof handlers['tab.next']).toBe('function');
+    expect(typeof handlers['tab.prev']).toBe('function');
+    expect(typeof handlers['view.toggleSidebar']).toBe('function');
+    expect(typeof handlers['view.togglePreview']).toBe('function');
+  });
+
+  it('view.togglePreview command flips previewVisible', () => {
+    render(<Harness />);
+    expect(useAppStore.getState().previewVisible).toBe(true);
+    act(() => useCommandStore.getState().dispatch('view.togglePreview'));
+    expect(useAppStore.getState().previewVisible).toBe(false);
+  });
+
+  it('view.toggleSidebar command flips sidebarVisible', () => {
+    render(<Harness />);
+    expect(useAppStore.getState().sidebarVisible).toBe(true);
+    act(() => useCommandStore.getState().dispatch('view.toggleSidebar'));
+    expect(useAppStore.getState().sidebarVisible).toBe(false);
+  });
+
+  it('file.closeTab with no active tab is a no-op (does not throw)', () => {
+    render(<Harness />);
+    expect(() => act(() => useCommandStore.getState().dispatch('file.closeTab'))).not.toThrow();
+  });
+
+  it('tab.next wraps from last tab to first', () => {
+    useFileStore.setState({
+      openTabs: [
+        { id: '/a.md', path: '/a.md', title: 'a.md', dirty: false },
+        { id: '/b.md', path: '/b.md', title: 'b.md', dirty: false },
+      ],
+      activeTabId: '/b.md',
+    });
+    render(<Harness />);
+    act(() => useCommandStore.getState().dispatch('tab.next'));
+    expect(useFileStore.getState().activeTabId).toBe('/a.md');
+  });
+
+  it('tab.prev wraps from first tab to last', () => {
+    useFileStore.setState({
+      openTabs: [
+        { id: '/a.md', path: '/a.md', title: 'a.md', dirty: false },
+        { id: '/b.md', path: '/b.md', title: 'b.md', dirty: false },
+      ],
+      activeTabId: '/a.md',
+    });
+    render(<Harness />);
+    act(() => useCommandStore.getState().dispatch('tab.prev'));
+    expect(useFileStore.getState().activeTabId).toBe('/b.md');
+  });
+
+  it('file-save IPC event dispatches file.save command', () => {
+    render(<Harness />);
+    act(() => fireMenu('file-save'));
+    // No assertion on side effect (saveActiveBuffer is async) but
+    // we can verify the command ran by checking no error was thrown.
+    expect(true).toBe(true);
+  });
+
+  it('toggle-preview IPC event flips previewVisible via the command', () => {
+    render(<Harness />);
+    expect(useAppStore.getState().previewVisible).toBe(true);
+    act(() => fireMenu('toggle-preview'));
+    expect(useAppStore.getState().previewVisible).toBe(false);
+  });
+
+  it('load-template-menu IPC event forwards the template name as args', () => {
+    let captured: unknown;
+    useCommandStore.getState().register('template.load', (args) => {
+      captured = args;
+    });
+    render(<Harness />);
+    act(() => fireMenu('load-template-menu', 'blog-post.md'));
+    expect(captured).toBe('blog-post.md');
+  });
+});

tests/unit/lib/toast.test.ts

@@ -0,0 +1,48 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+
+vi.mock('sonner', () => ({
+  toast: {
+    success: vi.fn(),
+    error: vi.fn(),
+    info: vi.fn(),
+    warning: vi.fn(),
+    promise: vi.fn(),
+    dismiss: vi.fn(),
+  },
+}));
+
+import { toast } from '@/lib/toast';
+import { toast as sonnerToast } from 'sonner';
+
+describe('toast helpers', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('toast.success forwards to sonner with the message', () => {
+    toast.success('Saved test.md');
+    expect(sonnerToast.success).toHaveBeenCalledWith('Saved test.md');
+  });
+
+  it('toast.error forwards to sonner with the message', () => {
+    toast.error('Failed to save: ENOENT');
+    expect(sonnerToast.error).toHaveBeenCalledWith('Failed to save: ENOENT');
+  });
+
+  it('toast.info forwards to sonner with the message', () => {
+    toast.info('Update available');
+    expect(sonnerToast.info).toHaveBeenCalledWith('Update available');
+  });
+
+  it('toast.warning forwards to sonner with the message', () => {
+    toast.warning('Disk space low');
+    expect(sonnerToast.warning).toHaveBeenCalledWith('Disk space low');
+  });
+
+  it('toast.promise forwards the promise and messages to sonner', async () => {
+    const promise = Promise.resolve('ok');
+    const msgs = { loading: 'Loading…', success: 'Done', error: 'Failed' };
+    toast.promise(promise, msgs);
+    expect(sonnerToast.promise).toHaveBeenCalledWith(promise, msgs);
+  });
+});

tests/unit/lib/validators.test.ts

@@ -0,0 +1,53 @@
+import { describe, it, expect } from 'vitest';
+import {
+  settingsSchema,
+  exportPdfSchema,
+  exportDocxSchema,
+  exportHtmlSchema,
+  exportBatchSchema,
+} from '@/lib/validators';
+
+describe('settingsSchema', () => {
+  it('accepts an empty object (all fields have defaults)', () => {
+    const r = settingsSchema.safeParse({});
+    expect(r.success).toBe(true);
+  });
+
+  it('rejects out-of-range fontSize', () => {
+    const r = settingsSchema.safeParse({ fontSize: 100 });
+    expect(r.success).toBe(false);
+  });
+});
+
+describe('exportPdfSchema', () => {
+  it('accepts a4 + normal margins + embedFonts true', () => {
+    expect(exportPdfSchema.safeParse({ format: 'a4', margins: 'normal', embedFonts: true }).success).toBe(true);
+  });
+  it('rejects unknown format', () => {
+    expect(exportPdfSchema.safeParse({ format: 'b4' }).success).toBe(false);
+  });
+});
+
+describe('exportDocxSchema', () => {
+  it('accepts standard template', () => {
+    expect(exportDocxSchema.safeParse({ template: 'standard' }).success).toBe(true);
+  });
+  it('rejects unknown template', () => {
+    expect(exportDocxSchema.safeParse({ template: 'fancy' }).success).toBe(false);
+  });
+});
+
+describe('exportHtmlSchema', () => {
+  it('accepts github highlight style', () => {
+    expect(exportHtmlSchema.safeParse({ standalone: true, highlightStyle: 'github' }).success).toBe(true);
+  });
+});
+
+describe('exportBatchSchema', () => {
+  it('accepts a non-empty file list', () => {
+    expect(exportBatchSchema.safeParse({ format: 'pdf', concurrency: 4, filePaths: ['/a.md'] }).success).toBe(true);
+  });
+  it('rejects empty file list', () => {
+    expect(exportBatchSchema.safeParse({ format: 'pdf', concurrency: 4, filePaths: [] }).success).toBe(false);
+  });
+});

tests/unit/stores/app-store.test.ts

@@ -33,3 +33,32 @@ describe('useAppStore', () => {
     expect(useAppStore.getState().zenMode).toBe(true);
   });
 });
+
+describe('useAppStore (modal)', () => {
+  beforeEach(() => {
+    localStorage.clear();
+    useAppStore.setState({
+      sidebarVisible: true,
+      previewVisible: true,
+      zenMode: false,
+      paneSizes: { sidebar: 20, editor: 50, preview: 30 },
+      modal: { kind: null },
+    } as any);
+  });
+
+  it('openModal sets the modal state', () => {
+    useAppStore.getState().openModal('about');
+    expect(useAppStore.getState().modal).toEqual({ kind: 'about' });
+  });
+
+  it('openModal with kind requiring props passes them through', () => {
+    useAppStore.getState().openModal('export-pdf', { sourcePath: '/a.md' });
+    expect(useAppStore.getState().modal).toEqual({ kind: 'export-pdf', props: { sourcePath: '/a.md' } });
+  });
+
+  it('closeModal clears the modal state', () => {
+    useAppStore.getState().openModal('about');
+    useAppStore.getState().closeModal();
+    expect(useAppStore.getState().modal).toEqual({ kind: null });
+  });
+});

tests/unit/stores/command-store-persist.test.ts

@@ -0,0 +1,59 @@
+import { describe, it, expect, beforeEach, vi } from 'vitest';
+import { useCommandStore } from '@/stores/command-store';
+
+describe('useCommandStore — user bindings persistence', () => {
+  beforeEach(() => {
+    localStorage.clear();
+    useCommandStore.setState({
+      handlers: {},
+      userBindings: {},
+    });
+  });
+
+  it('starts with empty userBindings', () => {
+    expect(useCommandStore.getState().userBindings).toEqual({});
+  });
+
+  it('setUserBinding stores a combo for a command id', () => {
+    useCommandStore.getState().setUserBinding('file.save', 'mod+shift+s');
+    expect(useCommandStore.getState().userBindings['file.save']).toBe('mod+shift+s');
+  });
+
+  it('setUserBinding overwrites an existing binding for the same command', () => {
+    useCommandStore.getState().setUserBinding('file.save', 'mod+shift+s');
+    useCommandStore.getState().setUserBinding('file.save', 'mod+alt+s');
+    expect(useCommandStore.getState().userBindings['file.save']).toBe('mod+alt+s');
+  });
+
+  it('clearUserBinding removes a binding', () => {
+    useCommandStore.getState().setUserBinding('file.save', 'mod+shift+s');
+    useCommandStore.getState().clearUserBinding('file.save');
+    expect(useCommandStore.getState().userBindings['file.save']).toBeUndefined();
+  });
+
+  it('clearUserBinding on a missing id is a no-op', () => {
+    expect(() => useCommandStore.getState().clearUserBinding('does.not.exist')).not.toThrow();
+  });
+
+  it('getUserBinding returns the combo or undefined', () => {
+    useCommandStore.getState().setUserBinding('file.save', 'mod+shift+s');
+    expect(useCommandStore.getState().getUserBinding('file.save')).toBe('mod+shift+s');
+    expect(useCommandStore.getState().getUserBinding('does.not.exist')).toBeUndefined();
+  });
+
+  it('persists userBindings to localStorage and restores on next mount', async () => {
+    useCommandStore.getState().setUserBinding('file.save', 'mod+shift+s');
+    useCommandStore.getState().setUserBinding('view.toggleSidebar', 'mod+b');
+
+    // Force the persist middleware to flush
+    await useCommandStore.persist?.flush?.();
+
+    const stored = JSON.parse(localStorage.getItem('mc-command-store') ?? '{}');
+    expect(stored.state.userBindings).toEqual({
+      'file.save': 'mod+shift+s',
+      'view.toggleSidebar': 'mod+b',
+    });
+    // Handlers must NOT be persisted (functions aren't serializable)
+    expect(stored.state.handlers).toBeUndefined();
+  });
+});

tests/unit/stores/command-store.test.ts

@@ -0,0 +1,80 @@
+import { describe, it, expect, beforeEach, vi } from 'vitest';
+import { useCommandStore, CommandHandler } from '@/stores/command-store';
+
+describe('useCommandStore', () => {
+  beforeEach(() => {
+    useCommandStore.setState({ handlers: {} });
+  });
+
+  it('register stores a handler keyed by id', () => {
+    const handler = vi.fn();
+    useCommandStore.getState().register('file.open', handler);
+    expect(useCommandStore.getState().handlers['file.open']).toBe(handler);
+  });
+
+  it('register overwrites any existing handler for the same id', () => {
+    const a = vi.fn();
+    const b = vi.fn();
+    useCommandStore.getState().register('file.open', a);
+    useCommandStore.getState().register('file.open', b);
+    expect(useCommandStore.getState().handlers['file.open']).toBe(b);
+  });
+
+  it('dispatch invokes the registered handler with the provided args', () => {
+    const handler = vi.fn();
+    useCommandStore.getState().register('file.save', handler);
+    useCommandStore.getState().dispatch('file.save', { path: '/x.md' });
+    expect(handler).toHaveBeenCalledWith({ path: '/x.md' });
+  });
+
+  it('dispatch with no args calls the handler with undefined', () => {
+    const handler = vi.fn();
+    useCommandStore.getState().register('view.toggleSidebar', handler);
+    useCommandStore.getState().dispatch('view.toggleSidebar');
+    expect(handler).toHaveBeenCalledWith(undefined);
+  });
+
+  it('dispatch on an unregistered id is a no-op (no throw)', () => {
+    expect(() => useCommandStore.getState().dispatch('does.not.exist')).not.toThrow();
+  });
+
+  it('unregister removes a handler', () => {
+    const handler = vi.fn();
+    useCommandStore.getState().register('file.open', handler);
+    useCommandStore.getState().unregister('file.open');
+    expect(useCommandStore.getState().handlers['file.open']).toBeUndefined();
+    useCommandStore.getState().dispatch('file.open');
+    expect(handler).not.toHaveBeenCalled();
+  });
+
+  it('unregister on a missing id is a no-op', () => {
+    expect(() => useCommandStore.getState().unregister('does.not.exist')).not.toThrow();
+  });
+
+  it('get returns the handler or undefined', () => {
+    const handler: CommandHandler = () => {};
+    useCommandStore.getState().register('file.open', handler);
+    expect(useCommandStore.getState().get('file.open')).toBe(handler);
+    expect(useCommandStore.getState().get('does.not.exist')).toBeUndefined();
+  });
+
+  it('registerMany registers multiple handlers in one call', () => {
+    const a = vi.fn();
+    const b = vi.fn();
+    useCommandStore.getState().registerMany({
+      'file.open': a,
+      'file.save': b,
+    });
+    expect(useCommandStore.getState().handlers['file.open']).toBe(a);
+    expect(useCommandStore.getState().handlers['file.save']).toBe(b);
+  });
+
+  it('registerMany does not clear handlers that were already registered', () => {
+    const existing = vi.fn();
+    const added = vi.fn();
+    useCommandStore.getState().register('file.open', existing);
+    useCommandStore.getState().registerMany({ 'file.save': added });
+    expect(useCommandStore.getState().handlers['file.open']).toBe(existing);
+    expect(useCommandStore.getState().handlers['file.save']).toBe(added);
+  });
+});

tests/unit/stores/file-store-toasts.test.ts

@@ -0,0 +1,100 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { useEditorStore } from '@/stores/editor-store';
+import { useFileStore } from '@/stores/file-store';
+
+vi.mock('@/lib/ipc', () => ({
+  ipc: {
+    file: {
+      list: vi.fn(),
+      read: vi.fn(),
+      pickFolder: vi.fn(),
+      pickFile: vi.fn(),
+      write: vi.fn(),
+    },
+  },
+}));
+
+vi.mock('@/lib/toast', () => ({
+  toast: {
+    success: vi.fn(),
+    error: vi.fn(),
+    info: vi.fn(),
+    warning: vi.fn(),
+    promise: vi.fn(),
+    dismiss: vi.fn(),
+  },
+}));
+
+import { ipc } from '@/lib/ipc';
+import { toast } from '@/lib/toast';
+
+const fakeRead = ipc.file.read as ReturnType<typeof vi.fn>;
+const fakeWrite = ipc.file.write as ReturnType<typeof vi.fn>;
+const fakeList = ipc.file.list as ReturnType<typeof vi.fn>;
+
+describe('file-store toasts', () => {
+  beforeEach(() => {
+    localStorage.clear();
+    vi.clearAllMocks();
+    useFileStore.setState({
+      tree: null,
+      rootPath: null,
+      expanded: new Set<string>(),
+      openTabs: [],
+      activeTabId: null,
+    } as any);
+    useEditorStore.setState({ buffers: new Map(), activeId: null } as any);
+  });
+
+  describe('saveActiveBuffer', () => {
+    it('calls toast.success when save succeeds', async () => {
+      fakeWrite.mockResolvedValue({ ok: true, data: undefined });
+      useFileStore.setState({
+        activeTabId: '/test.md',
+        openTabs: [{ id: '/test.md', path: '/test.md', title: 'test.md', dirty: false }],
+      } as any);
+      useEditorStore.setState({
+        buffers: new Map([['/test.md', { id: '/test.md', path: '/test.md', content: '# hi', dirty: true }]]),
+        activeId: '/test.md',
+      } as any);
+
+      const result = await useFileStore.getState().saveActiveBuffer();
+      expect(result).toBe(true);
+      expect(toast.success).toHaveBeenCalledWith('Saved test.md');
+    });
+
+    it('calls toast.error when save fails', async () => {
+      fakeWrite.mockResolvedValue({ ok: false, error: { code: 'EACCES', message: 'Permission denied' } });
+      useFileStore.setState({
+        activeTabId: '/test.md',
+        openTabs: [{ id: '/test.md', path: '/test.md', title: 'test.md', dirty: false }],
+      } as any);
+      useEditorStore.setState({
+        buffers: new Map([['/test.md', { id: '/test.md', path: '/test.md', content: '# hi', dirty: true }]]),
+        activeId: '/test.md',
+      } as any);
+
+      const result = await useFileStore.getState().saveActiveBuffer();
+      expect(result).toBe(false);
+      expect(toast.error).toHaveBeenCalledWith('Failed to save: Permission denied');
+    });
+  });
+
+  describe('openFile', () => {
+    it('calls toast.error when IPC read fails', async () => {
+      fakeRead.mockResolvedValue({ ok: false, error: { code: 'ENOENT', message: 'No such file' } });
+
+      await useFileStore.getState().openFile('/missing.md');
+      expect(toast.error).toHaveBeenCalledWith('Failed to open file: No such file');
+    });
+  });
+
+  describe('openFolder', () => {
+    it('calls toast.error when IPC list fails', async () => {
+      fakeList.mockResolvedValue({ ok: false, error: { code: 'EACCES', message: 'Permission denied' } });
+
+      await useFileStore.getState().openFolder('/forbidden');
+      expect(toast.error).toHaveBeenCalledWith('Failed to open folder: Permission denied');
+    });
+  });
+});

tests/unit/stores/settings-store.test.ts

@@ -0,0 +1,44 @@
+import { describe, it, expect, beforeEach } from 'vitest';
+import { useSettingsStore } from '@/stores/settings-store';
+
+describe('useSettingsStore', () => {
+  beforeEach(() => {
+    localStorage.clear();
+    useSettingsStore.setState(useSettingsStore.getInitialState());
+  });
+
+  it('has sensible defaults', () => {
+    const s = useSettingsStore.getState();
+    expect(s.fontSize).toBe(14);
+    expect(s.theme).toBe('auto');
+    expect(s.pdfFormat).toBe('a4');
+    expect(s.docxTemplate).toBe('standard');
+    expect(s.renderTablesAsAscii).toBe(false);
+    expect(s.welcomeDismissed).toBe(false);
+  });
+
+  it('setSetting updates a leaf field', () => {
+    useSettingsStore.getState().setSetting('fontSize', 18);
+    expect(useSettingsStore.getState().fontSize).toBe(18);
+  });
+
+  it('resetToDefaults restores all defaults', () => {
+    useSettingsStore.getState().setSetting('fontSize', 22);
+    useSettingsStore.getState().setSetting('theme', 'dark');
+    useSettingsStore.getState().resetToDefaults();
+    expect(useSettingsStore.getState().fontSize).toBe(14);
+    expect(useSettingsStore.getState().theme).toBe('auto');
+  });
+
+  it('persists only leaf settings (partialize), not actions', () => {
+    useSettingsStore.getState().setSetting('fontSize', 16);
+    useSettingsStore.getState().setSetting('docxTemplate', 'modern');
+    const raw = localStorage.getItem('mc-settings-store');
+    expect(raw).toBeTruthy();
+    const parsed = JSON.parse(raw!);
+    expect(parsed.state.fontSize).toBe(16);
+    expect(parsed.state.docxTemplate).toBe('modern');
+    expect(parsed.state.setSetting).toBeUndefined();
+    expect(parsed.state.resetToDefaults).toBeUndefined();
+  });
+});