[devswha]

Wave 4 of the App.tsx split. The plan is .omo/plans/app-stores-split.md in the maintainer's workspace. It follows PR #1762.

This wave moves the drawer, sidebar and file-panel layout state out of src/App.tsx into src/lib/useSidebarLayout.ts. The hook runs inside App's render, so updates and effect order are unchanged.

What changes

Three blocks move verbatim, in their order, into useSidebarLayout({ initialLink }):

1. Drawer: the drawer state (a link can open it), drawerOpenRef, wideScreen, and the effect that closes the drawer on a wide window.
2. Gestures: the edge-swipe effect and the Escape capture listener that puts the drawer away.
3. Widths: sidebarCollapsed, sidebarWidth, filePanelAvailable and filePanelWidth.

The hook returns those values, their setters, and the same drawerOpenRef object.

What stays in App.tsx:

• One call at the first block's position.
• selectionRef and its layout effect, which sat between the blocks but belong to selection. They now follow the call directly.
• Every call site.

Listener order: the lastKeyAt keydown listener still comes after the call, so the Escape capture listener still registers first.

Imports: storedSidebarWidth, FILE_PANEL_DOCK_QUERY, storedFilePanelWidth and watchDrawerSwipe leave App's imports.

Hook ceiling: APP_HOOK_CEILING drops from 171 to 163, after moving four useState, one useRef and three useEffect calls.

Checks

• --color-moved: git diff --color-moved=plain --color-moved-ws=allow-indentation-change origin/main...HEAD shows 56 lines as moved. The other 22 lines are:
  • App's removed imports and the new import;
  • the call line;
  • the ceiling value;
  • the new file's imports, params type, signature, doc comment and return.
• Moved blocks are exact: each block (lines 365-371, 379-393 and 394-399 of App.tsx on e44fc9f8f) appears byte for byte in the hook.
• Typecheck: bun run typecheck passes.
• Unit tests: HERDR_TEST_MODE=unit bun test src/app-hooks.test.ts src/lib/edgeSwipe.test.ts src/lib/sidebarWidth.test.ts src/lib/filePanelWidth.test.ts src/conventions.test.ts: 45 pass, 0 fail.
• Ceiling test: adding const zz = useState(false); to App.tsx makes it fail.
• bun run check fast: passes after the rebase (unit 6253 pass, 0 fail, 13 skip in 443 files, 8 at a time, 57.6s)
• bun run check integration browser: the browser lane exits 0 (every browser script passed, 2036 s), run on this commit before its rebase onto the latest main (which changed only PaneTerminal and server files). The integration lane had two failures, none in code this PR touches: server/api.contract.test.ts "creates, edits, searches, inspects, and closes an owned workspace" (line 1540, fails the same way on unchanged origin/main on this PC) and server/gjc.contract.test.ts "binds same-cwd panes independently by native PID…" (pane.process_info did not yet list the isolated GJC process while other lanes ran on the same PC); rerun alone on this branch, server/gjc.contract.test.ts passes (10 pass, 0 fail). CI runs the integration lane in its own environment.

Outside PRs that touch the same files

No other maintainer PR touches these files. One outside contributor's PR touches src/App.tsx: #1427. It already conflicts with main in App.tsx, and needs a rebase either way.

Move-only: moved lines plus imports, the hook signature and return, one call and the lowered ceiling. No changelog fragment: users see no change.

[coderabbitai]

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

• Source mode: Auto
• Repository: devswha/ovis
• Branch: refactor/app-sidebar-layout-hook
• File: .coderabbit.yaml
• Commit: d8db2ba
• Layers: Repository YAML
• Review profile: CHILL
• Plan: Advanced
• Run ID: a85aada5-f149-482f-95df-4b9f3ae0d049

📥 Commits

Reviewing files that changed from the base of the PR and between 1b838cb and d8db2ba.

📒 Files selected for processing: 3

• src/App.tsx
• src/app-hooks.test.ts
• src/lib/useSidebarLayout.ts

Included review availability: This review used your included allowance. Your plan provides up to 4 included reviews per hour; 0 remain after this review.

📝 Summary

Summary by CodeRabbit

• Layout
  • Drawer behavior now adapts to screen width when opening a link that requests a visible sidebar.
  • On smaller screens, the drawer can be dismissed with Escape or a swipe gesture. Escape does not close it during text composition or while a dialog is open.
  • Sidebar collapse state and sidebar and file-panel widths continue to reflect saved settings.

useSidebarLayout now manages drawer, sidebar, and file-panel layout state. App uses the hook instead of defining that behavior locally. The hook-call ceiling test threshold is lower.

Changes: Sidebar layout

Layer / File(s)	Summary
Layout state and drawer behavior src/lib/useSidebarLayout.ts	Adds SidebarLayoutParams and useSidebarLayout. The hook initializes drawer state from the initial link and viewport, handles swipe gestures and Escape events, and initializes sidebar and file-panel state.
App integration and hook threshold src/App.tsx, src/app-hooks.test.ts	App calls the hook for layout state and removes the corresponding local setup. Selection tracking remains unchanged. The hook-call ceiling decreases from 171 to 163.

Priority: ⬇️ Low

Estimated code review effort: 2 (Simple) | ~10 minutes

Change: Refactor

Merge Risk: ⚪ Minimal · up to d8db2

No actionable behavior change is established, so the PR is mergeable after normal checks.

Pre-merge checks: 4 · 1

Failed checks: 1 warning

Check name	Status	Explanation	Resolution
Docstring Coverage		Docstring coverage is 50.00% which is insufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff. Analyzed 2 functions across 3 files.	Write docstrings for the functions missing them to satisfy the coverage threshold.

Passed checks: 4 passed

Check name	Status	Explanation
Title check		The title clearly and concisely describes the main change: moving sidebar and drawer layout state into a hook.
Description check		The description explains the change, preserved behavior, implementation details, listener order, scope, validation results, and known unrelated integration failures. It uses "## What changes" and "## …
Linked Issues check		Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check		Check skipped because no linked issues were found for this pull request.

Full details: Description check

Explanation

The description explains the change, preserved behavior, implementation details, listener order, scope, validation results, and known unrelated integration failures. It uses "## What changes" and "## Checks" instead of the template headings, but it provides the required information.

✨ Finishing Touches: 💡 1

📝 Generate docstrings: 💡

• Commit to this branch
• Create a new PR

🧪 Generate unit tests (beta)

• Commit to this branch
• Create a new PR

• Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands.}

[devswha]

Merge pass: move-only PR (wave 4 of the App.tsx split). It merges on its checks without waiting for a CodeRabbit review, as AGENTS.md allows.

Diff. Compared as a multiset of lines, the removed and added lines differ only in:

• imports;
• the call line;
• the ceiling;
• the new file's wrapper.

Gate review, by a reviewer on a different model than the author's:

• The move is verbatim. All three blocks moved unchanged and in their original order.
• Effect order. On main, selectionRef's effect sat between the moved blocks. It is a useLayoutEffect, while the moved effects and the useMediaQuery subscriptions are passive, and none of them touches selection state. So moving them above it changes no order anything can observe, at mount, update or cleanup.
• Listener order. The Escape capture listener still registers before lastKeyAt. Its stopPropagation() does not suppress the later listener on the same window.
• Identities. drawerOpenRef, the setters and the lazy initial state keep their identities.
• Hook count. Counted on the TypeScript AST: 171 → 163.

Tests. 45 unit tests and the typecheck pass at this head (merge-pass run).

All required checks are green and no review thread is open.