happy-stacks 0.6.12 → 0.6.13

package/docs/commit-audits/happy/leeroy-wip.rewrite-deferred-fragments.tsv

@@ -0,0 +1,65 @@
+oldN	oldSha	oldSubject	deferredToPr	path	kind	reason	status	plannedAt	resolvedByNewSha	notes
+006	a5fbc3e8ba00ba0f41b9af18ca0c6296414f5533	feat(persistence): scope storage and validate draft modes	PR05	expo-app/sources/sync/persistence.test.ts	file	Persistence correctness tests (draft parsing + model modes) are not part of PR04 storage scoping; apply when executing PR05/PR28.	resolved	2026-01-25T19:46:02+0100	20a2d994	Superseded: implemented PR05-owned draft tests as `persistence.drafts.test.ts`. Keep model-mode tests deferred to PR28 (see PR28 row).
+006	a5fbc3e8ba00ba0f41b9af18ca0c6296414f5533	feat(persistence): scope storage and validate draft modes	PR05	expo-app/sources/sync/persistence.ts	hunk	Draft persistence hardening (selectedProfileId in draft; clamp invalid draft fields; loadSettings version guard) belongs with persistence/drafts, not the storage-scope baseline.	resolved	2026-01-25T19:46:02+0100	20a2d994	Applied selectedProfileId + settings version guard in PR05. Deferred permission/model clamps to PR10/PR28.
+006	a5fbc3e8ba00ba0f41b9af18ca0c6296414f5533	feat(persistence): scope storage and validate draft modes	PR10	expo-app/sources/sync/persistence.ts	hunk	Clamp persisted permissionMode via shared `isPermissionMode` once permission types land (avoid duplicating validation).	pending	2026-01-25T19:57:34+0100		
+006	a5fbc3e8ba00ba0f41b9af18ca0c6296414f5533	feat(persistence): scope storage and validate draft modes	PR28	expo-app/sources/sync/persistence.ts	hunk	Clamp persisted modelMode via shared validation once model modes land (avoid duplicating allowlists).	pending	2026-01-25T19:57:34+0100		
+006	a5fbc3e8ba00ba0f41b9af18ca0c6296414f5533	feat(persistence): scope storage and validate draft modes	PR28	expo-app/sources/sync/persistence.test.ts	file	Original persistence test file also covered session-model-modes; reintroduce equivalent tests when PR28 implements session model mode persistence.	pending	2026-01-25T19:57:34+0100		
+011	c2d3507357dc7ef150105ff56468ec2f580943f6	fix(settings): make parsing tolerant for profiles	PR27	expo-app/sources/sync/sync.ts	hunk	Settings sync convergence under version-mismatch depends on a `replaceSettings` primitive not yet present in the rewrite base; apply later with sync robustness/replaceSettings work.	pending	2026-01-25T20:10:04+0100		
+038	7976b877259cac770f41537f44fa70e54df721a2	feat(experiments): gate Zen, file viewer, and voice auth flow	PR06	expo-app/sources/-zen/ZenAdd.tsx	file	Zen i18n literal replacement (`t('zen.*')`) was mixed into the gating commit; keep i18n changes separate but in-slice.	pending	2026-01-25T20:10:04+0100		Requires `zen.*` translation keys to exist (fold into PR06 i18n commits or PR03 if revived).
+038	7976b877259cac770f41537f44fa70e54df721a2	feat(experiments): gate Zen, file viewer, and voice auth flow	PR06	expo-app/sources/-zen/ZenHome.tsx	file	Zen i18n literal replacement (`t('zen.*')`) was mixed into the gating commit; keep i18n changes separate but in-slice.	pending	2026-01-25T20:10:04+0100		
+038	7976b877259cac770f41537f44fa70e54df721a2	feat(experiments): gate Zen, file viewer, and voice auth flow	PR06	expo-app/sources/-zen/ZenView.tsx	file	Zen i18n literal replacement (`t('zen.*')`) was mixed into the gating commit; keep i18n changes separate but in-slice.	pending	2026-01-25T20:10:04+0100		
+038	7976b877259cac770f41537f44fa70e54df721a2	feat(experiments): gate Zen, file viewer, and voice auth flow	PR06	expo-app/sources/-zen/components/ZenHeader.tsx	file	Zen i18n literal replacement (`t('zen.*')`) was mixed into the gating commit; keep i18n changes separate but in-slice.	pending	2026-01-25T20:10:04+0100		
+006	a5fbc3e8ba00ba0f41b9af18ca0c6296414f5533	feat(persistence): scope storage and validate draft modes	PR28	expo-app/sources/sync/persistence.ts	hunk	Session model modes persistence (load/save/filter + allowlist) belongs to Model modes end-to-end.	pending	2026-01-25T19:46:02+0100		
+020	8d9f56e85e5a0abf2a7bdd9eec48c172dad5c110	refactor(ui): unify list selectors and modal primitives	PR26	expo-app/sources/components/NewSessionWizard.tsx	file	Commit 020 also deleted/moved wizard implementation; keep wizard refactors inside PR26 (new-session wizard).	pending	2026-01-25T17:35:00+0100		Was present as a deletion in the 020 mega-commit worktree state; intentionally not included in PR02.
+020	8d9f56e85e5a0abf2a7bdd9eec48c172dad5c110	refactor(ui): unify list selectors and modal primitives	PR10	expo-app/sources/components/PermissionModeSelector.tsx	file	Permission-mode selector deletion/refactor is permission-feature work; keep it out of PR02 UI overlays.	pending	2026-01-25T17:35:00+0100		Confirm final PR (PR10 vs PR11) when executing permission slices.
+020	8d9f56e85e5a0abf2a7bdd9eec48c172dad5c110	refactor(ui): unify list selectors and modal primitives	PR08	expo-app/sources/sync/profileSync.ts	file	Profile sync deletion/refactor belongs with Profiles.	pending	2026-01-25T17:35:00+0100		If this ends up being sync-transport instead of profiles, move to PR27.
+020	8d9f56e85e5a0abf2a7bdd9eec48c172dad5c110	refactor(ui): unify list selectors and modal primitives	PR38	expo-app/sources/components/ItemGroup.dividers.ts	file	ItemGroup helper (dividers) is list-primitive polish; keep with PR38.	resolved	2026-01-25T17:35:00+0100	ed3de522	Applied in PR38 via ed3de522 (final list primitives commit).
+020	8d9f56e85e5a0abf2a7bdd9eec48c172dad5c110	refactor(ui): unify list selectors and modal primitives	PR38	expo-app/sources/components/ItemGroup.dividers.test.ts	file	ItemGroup helper test; keep with PR38.	resolved	2026-01-25T17:35:00+0100	ed3de522	Applied in PR38 via ed3de522 (final list primitives commit).
+020	8d9f56e85e5a0abf2a7bdd9eec48c172dad5c110	refactor(ui): unify list selectors and modal primitives	PR38	expo-app/sources/components/ItemGroup.selectableCount.ts	file	ItemGroup helper (selectable count); keep with PR38.	resolved	2026-01-25T17:35:00+0100	ed3de522	Applied in PR38 via ed3de522 (final list primitives commit).
+020	8d9f56e85e5a0abf2a7bdd9eec48c172dad5c110	refactor(ui): unify list selectors and modal primitives	PR38	expo-app/sources/components/ItemGroup.selectableCount.test.ts	file	ItemGroup helper test; keep with PR38.	resolved	2026-01-25T17:35:00+0100	ed3de522	Applied in PR38 via ed3de522 (final list primitives commit).
+020	8d9f56e85e5a0abf2a7bdd9eec48c172dad5c110	refactor(ui): unify list selectors and modal primitives	PR02	expo-app/sources/utils/promptUnsavedChangesAlert.ts	file	Unsaved-changes alert is modal-related (uses modal/alert primitives).	pending	2026-01-25T17:35:00+0100		If it stays stable and relevant, it can land in PR02; otherwise defer to PR25.
+020	8d9f56e85e5a0abf2a7bdd9eec48c172dad5c110	refactor(ui): unify list selectors and modal primitives	PR02	expo-app/sources/utils/promptUnsavedChangesAlert.test.ts	file	Tests for promptUnsavedChangesAlert.	pending	2026-01-25T17:35:00+0100		
+020	8d9f56e85e5a0abf2a7bdd9eec48c172dad5c110	refactor(ui): unify list selectors and modal primitives	PR25	expo-app/sources/components/Switch.web.tsx	file	Switch.web changes are UI polish but not overlay-specific; keep out of PR02 unless required.	pending	2026-01-25T17:35:00+0100		Prefer folding into the owning UI PR if a dependency emerges.
+037	5f5b57df5181fdb2879d44c72e1d41b871c0e5ff	refactor(ui): improve item rendering and action menu timing	PR38	expo-app/sources/components/ItemGroup.tsx	hunk	ItemGroup selectable-count override optimization depends on selection-context helpers not present in upstream state during PR02.	resolved	2026-01-25T17:35:00+0100	ed3de522	Superseded by PR38 list primitives (ItemGroup selection context + selectableItemCountOverride).
+039	6ed379f82c3497512316f23d15b2c2a0556a160e	refactor(ui): add modal + popover overlay primitives	PR38	expo-app/sources/components/dropdown/DropdownMenu.tsx	file	Dropdown/menu primitives are list/UI infra; keep separate from core modal/popover foundation.	resolved	2026-01-25T17:35:00+0100	ed3de522	Applied in PR38 via ed3de522 (final list primitives commit).
+039	6ed379f82c3497512316f23d15b2c2a0556a160e	refactor(ui): add modal + popover overlay primitives	PR38	expo-app/sources/components/dropdown/useSelectableMenu.ts	file	Selectable-menu hook used by dropdown/menu.	resolved	2026-01-25T17:35:00+0100	ed3de522	Applied in PR38 via ed3de522 (final list primitives commit).
+039	6ed379f82c3497512316f23d15b2c2a0556a160e	refactor(ui): add modal + popover overlay primitives	PR38	expo-app/sources/components/SelectableRow.tsx	file	SelectableRow is list primitive used widely; keep with PR38.	resolved	2026-01-25T17:35:00+0100	ed3de522	Applied in PR38 via ed3de522 (final list primitives commit).
+039	6ed379f82c3497512316f23d15b2c2a0556a160e	refactor(ui): add modal + popover overlay primitives	PR38	expo-app/sources/components/CommandPalette/CommandPalette.tsx	file	CommandPalette refactor is a large UI primitive; keep with PR38.	resolved	2026-01-25T17:35:00+0100	c429a814	No-op: rewrite base already contains the intended CommandPalette structure; remaining CommandPalette refactors are covered by c429a814.
+039	6ed379f82c3497512316f23d15b2c2a0556a160e	refactor(ui): add modal + popover overlay primitives	PR38	expo-app/sources/components/CommandPalette/CommandPaletteInput.tsx	file	CommandPalette input refactor (Unistyles + placeholder/autoFocus props) is part of CommandPalette UI primitive changes.	resolved	2026-01-25T17:40:00+0100	c429a814	No-op: rewrite base already contains the intended CommandPaletteInput behavior.
+039	6ed379f82c3497512316f23d15b2c2a0556a160e	refactor(ui): add modal + popover overlay primitives	PR38	expo-app/sources/components/CommandPalette/CommandPaletteItem.tsx	file	CommandPalette item refactor depends on SelectableRow and updated hover/selection behavior; keep with PR38.	resolved	2026-01-25T17:40:00+0100	c429a814	CommandPaletteItem now uses SelectableRow (unifies hover/pressed/selected styling).
+039	6ed379f82c3497512316f23d15b2c2a0556a160e	refactor(ui): add modal + popover overlay primitives	PR38	expo-app/sources/components/CommandPalette/CommandPaletteModal.tsx	file	CommandPalette modal wrapper changes are part of the command palette subsystem; keep with PR38.	resolved	2026-01-25T17:40:00+0100	c429a814	No-op: CommandPaletteModal is already present in rewrite base (not introduced by old 039).
+039	6ed379f82c3497512316f23d15b2c2a0556a160e	refactor(ui): add modal + popover overlay primitives	PR38	expo-app/sources/components/CommandPalette/CommandPaletteResults.tsx	file	CommandPalette results empty state should be localized; keep with PR38.	resolved	2026-01-25T17:40:00+0100	c429a814	CommandPaletteResults now uses t('commandPalette.noCommandsFound').
+039	6ed379f82c3497512316f23d15b2c2a0556a160e	refactor(ui): add modal + popover overlay primitives	PR38	expo-app/sources/components/dropdown/SelectableMenuResults.tsx	file	Dropdown selectable-results rendering belongs with dropdown/menu primitives in PR38.	resolved	2026-01-25T17:40:00+0100	ed3de522	Applied in PR38 via ed3de522 (final list primitives commit).
+039	6ed379f82c3497512316f23d15b2c2a0556a160e	refactor(ui): add modal + popover overlay primitives	PR38	expo-app/sources/components/dropdown/selectableMenuTypes.ts	file	Selectable menu types belong with dropdown/menu primitives in PR38.	resolved	2026-01-25T17:40:00+0100	ed3de522	Applied in PR38 via ed3de522 (final list primitives commit).
+039	6ed379f82c3497512316f23d15b2c2a0556a160e	refactor(ui): add modal + popover overlay primitives	PR38	expo-app/sources/components/itemActions/types.ts	file	Item action type refactor is list-primitive infra; keep with PR38.	resolved	2026-01-25T17:40:00+0100	7357579e	Added shared item action type and re-exported it from ItemActionsMenuModal.
+059	f7f81497444d9547c9e077e3ad45c41a3293c2a2	fix(modal): prevent non-dismissible WebAlertModal	PR26	expo-app/sources/__tests__/app/new/pick/machine.presentation.test.ts	file	New-session presentation test mocking belongs with new-session wizard PR; keep out of PR02 popover/overlay slice.	pending	2026-01-25T17:50:00+0100		Add the @react-navigation/native mock (CommonActions.setParams) when executing PR26.
+054	66c6784513355e763d09dcfc530c09348c1c3a70	fix(ui): apply small review fixes	PR28	expo-app/sources/-session/SessionView.tsx	hunk	Session model-mode UI polish (hoist configurable mode constants/typeguard) belongs with model modes.	pending	2026-01-25T18:00:00+0100		
+054	66c6784513355e763d09dcfc530c09348c1c3a70	fix(ui): apply small review fixes	PR26	expo-app/sources/app/(app)/new/pick/machine.tsx	hunk	New-session machine picker: use CommonActions.setParams (react-navigation idiomatic).	pending	2026-01-25T18:00:00+0100		
+054	66c6784513355e763d09dcfc530c09348c1c3a70	fix(ui): apply small review fixes	PR18	expo-app/sources/app/(app)/settings/terminal.tsx	hunk	Terminal settings: guard TextInput value (`tmuxSessionName ?? ''`) to avoid controlled/uncontrolled warnings.	pending	2026-01-25T18:00:00+0100		
+054	66c6784513355e763d09dcfc530c09348c1c3a70	fix(ui): apply small review fixes	PR38	expo-app/sources/components/OptionTiles.tsx	hunk	OptionTiles: ensure title text uses theme text color (UI primitive styling correctness).	resolved	2026-01-25T18:00:00+0100	7357579e	No-op: OptionTiles component no longer exists in upstream/rewrite base.
+054	66c6784513355e763d09dcfc530c09348c1c3a70	fix(ui): apply small review fixes	PR06	expo-app/sources/components/SettingsView.tsx	hunk	Settings: clear githubUnavailableReason before retrying GitHub connect (stale error UX).	pending	2026-01-25T18:00:00+0100		
+054	66c6784513355e763d09dcfc530c09348c1c3a70	fix(ui): apply small review fixes	PR38	expo-app/sources/components/dropdown/DropdownMenu.tsx	hunk	DropdownMenu: fix chevron opacity logic (was always 0).	resolved	2026-01-25T18:00:00+0100	ed3de522	Included in PR38 DropdownMenu (ed3de522).
+054	66c6784513355e763d09dcfc530c09348c1c3a70	fix(ui): apply small review fixes	PR27	expo-app/sources/utils/sync.ts	hunk	Sync util: move backoff init into constructor (definite assignment) for correctness/clarity.	pending	2026-01-25T18:00:00+0100		
+064	e5848c4805226e1c460df58717b182d25f06d504	fix(ui): harden overlays and permission cycling	PR26	expo-app/sources/app/(app)/new/NewSessionWizard.tsx	hunk	New-session wizard wiring: pass `onPermissionModeChange` into AgentInput so permission-mode changes can propagate.	pending	2026-01-25T18:10:37+0100		PR02 rewrite intentionally skipped wizard-side wiring; apply during PR26 against the rewritten wizard implementation.
+064	e5848c4805226e1c460df58717b182d25f06d504	fix(ui): harden overlays and permission cycling	PR10	expo-app/sources/components/AgentInput.tsx	hunk	Final permission-cycling reconciliation (Shift+Tab): source-of-truth and mode order must match the rewritten permission framework.	pending	2026-01-25T18:10:37+0100		Current rewritten AgentInput differs from the original patch; re-implement behavior rather than cherry-picking hunks.
+248	bf3027799623c286fe138c7b69e140ea90fdfa48	Set EXPO_UNSTABLE_WEB_MODAL env var in Expo scripts	PR19	expo-app/sources/app/(app)/session/[id]/info.tsx	hunk	Session-info gating: show Codex session id / resume affordances for `expCodexAcp` (in addition to `expCodexResume`).	pending	2026-01-25T18:16:11+0100		Deferred to keep PR02 focused on Expo web modal behavior; apply during PR19 with the final resume/codex UX.
+275	63cda8b20882dde5746e9f007b0866a0e39c3134	expo-app(ui): add list/pending primitives and polish	PR37	expo-app/sources/components/AgentInput.tsx	file	AgentInput refactor (AgentId, permission-mode options, resume/path row, action-bar logic) is agent-registry UX and must be split out of PR38.	pending	2026-01-25T18:29:53+0100		Mixed; likely split further into PR37 (agent registry) + PR19 (resume chip/path row) + PR10/PR11 (permission labels/options).
+275	63cda8b20882dde5746e9f007b0866a0e39c3134	expo-app(ui): add list/pending primitives and polish	PR37	expo-app/sources/components/MultiTextInput.tsx	file	Agent input infra changes should land with the AgentInput/agent-registry slice, not PR38 list primitives.	pending	2026-01-25T18:29:53+0100		
+275	63cda8b20882dde5746e9f007b0866a0e39c3134	expo-app(ui): add list/pending primitives and polish	PR13	expo-app/sources/components/PendingMessagesModal.tsx	file	Pending queue UI belongs with MessageQueueV1/Pending messages end-to-end.	pending	2026-01-25T18:29:53+0100		
+275	63cda8b20882dde5746e9f007b0866a0e39c3134	expo-app(ui): add list/pending primitives and polish	PR13	expo-app/sources/components/PendingMessagesModal.test.ts	file	Pending queue UI tests belong with MessageQueueV1/Pending messages end-to-end.	pending	2026-01-25T18:29:53+0100		
+275	63cda8b20882dde5746e9f007b0866a0e39c3134	expo-app(ui): add list/pending primitives and polish	PR13	expo-app/sources/components/PendingQueueIndicator.tsx	file	Pending queue UI belongs with MessageQueueV1/Pending messages end-to-end.	pending	2026-01-25T18:29:53+0100		
+275	63cda8b20882dde5746e9f007b0866a0e39c3134	expo-app(ui): add list/pending primitives and polish	PR13	expo-app/sources/components/PendingQueueIndicator.test.ts	file	Pending queue UI tests belong with MessageQueueV1/Pending messages end-to-end.	pending	2026-01-25T18:29:53+0100		
+275	63cda8b20882dde5746e9f007b0866a0e39c3134	expo-app(ui): add list/pending primitives and polish	PR08	expo-app/sources/components/EnvironmentVariableCard.tsx	file	Env var UI belongs with Profiles/env var UX (may depend on profile model).	pending	2026-01-25T18:29:53+0100		
+275	63cda8b20882dde5746e9f007b0866a0e39c3134	expo-app(ui): add list/pending primitives and polish	PR08	expo-app/sources/components/ProfileEditForm.tsx	file	Profile editor changes belong with Profiles feature.	pending	2026-01-25T18:29:53+0100		
+275	63cda8b20882dde5746e9f007b0866a0e39c3134	expo-app(ui): add list/pending primitives and polish	PR08	expo-app/sources/components/profiles/ProfilesList.tsx	file	Profiles list UX belongs with Profiles feature.	pending	2026-01-25T18:29:53+0100		
+275	63cda8b20882dde5746e9f007b0866a0e39c3134	expo-app(ui): add list/pending primitives and polish	PR08	expo-app/sources/components/profiles/profileListModel.ts	file	Profile list model helper updates belong with Profiles feature.	pending	2026-01-25T18:29:53+0100		
+275	63cda8b20882dde5746e9f007b0866a0e39c3134	expo-app(ui): add list/pending primitives and polish	PR08	expo-app/sources/components/profiles/profileListModel.test.ts	file	Profile list model tests belong with Profiles feature.	pending	2026-01-25T18:29:53+0100		
+275	63cda8b20882dde5746e9f007b0866a0e39c3134	expo-app(ui): add list/pending primitives and polish	PR08	expo-app/sources/utils/profileConfigRequirements.ts	file	Profile requirements logic belongs with Profiles feature.	pending	2026-01-25T18:29:53+0100		
+275	63cda8b20882dde5746e9f007b0866a0e39c3134	expo-app(ui): add list/pending primitives and polish	PR08	expo-app/sources/utils/profileConfigRequirements.test.ts	file	Profile requirements tests belong with Profiles feature.	pending	2026-01-25T18:29:53+0100		
+275	63cda8b20882dde5746e9f007b0866a0e39c3134	expo-app(ui): add list/pending primitives and polish	PR06	expo-app/sources/components/SettingsView.tsx	file	Settings screen changes belong with Settings feature.	pending	2026-01-25T18:29:53+0100		
+275	63cda8b20882dde5746e9f007b0866a0e39c3134	expo-app(ui): add list/pending primitives and polish	PR25	expo-app/sources/components/MainView.tsx	file	App shell/layout polish (non-feature-specific) belongs in misc UI polish unless it becomes a dependency.	pending	2026-01-25T18:29:53+0100		
+275	63cda8b20882dde5746e9f007b0866a0e39c3134	expo-app(ui): add list/pending primitives and polish	PR25	expo-app/sources/components/SidebarView.tsx	file	App shell/layout polish (non-feature-specific) belongs in misc UI polish unless it becomes a dependency.	pending	2026-01-25T18:29:53+0100		
+275	63cda8b20882dde5746e9f007b0866a0e39c3134	expo-app(ui): add list/pending primitives and polish	PR25	expo-app/sources/components/TabBar.tsx	file	App shell/layout polish (non-feature-specific) belongs in misc UI polish unless it becomes a dependency.	pending	2026-01-25T18:29:53+0100		
+275	63cda8b20882dde5746e9f007b0866a0e39c3134	expo-app(ui): add list/pending primitives and polish	PR25	expo-app/sources/components/Avatar.tsx	file	Avatar UI polish is generic UI; keep out of PR38 unless required by list primitives.	pending	2026-01-25T18:29:53+0100		
+275	63cda8b20882dde5746e9f007b0866a0e39c3134	expo-app(ui): add list/pending primitives and polish	PR02	expo-app/sources/components/Popover.tsx	file	Popover changes are overlay primitives; PR02 already rewritten—verify whether this is net-noop vs current and either drop or add a focused follow-up.	pending	2026-01-25T18:29:53+0100		PR02 is closed; only reopen if there is a meaningful diff.
+275	63cda8b20882dde5746e9f007b0866a0e39c3134	expo-app(ui): add list/pending primitives and polish	PR02	expo-app/sources/components/Popover.test.ts	file	Popover tests are overlay primitives; PR02 already rewritten—verify whether this is net-noop vs current and either drop or add a focused follow-up.	pending	2026-01-25T18:29:53+0100		PR02 is closed; only reopen if there is a meaningful diff.

package/docs/commit-audits/happy/leeroy-wip.rewrite-ledger.tsv

@@ -0,0 +1,56 @@
+oldN	oldSha	oldSubject	finalPr	action	newSha(s)	newSubject(s)	notes
+001	58528a7c37d3a4eea2874dbe1258c2626b88cd5e	chore(crypto): patch react-native-libsodium	PR01	pick	4fd3438312304518f3a5896a96883f340c12ecfa	chore(crypto): patch react-native-libsodium	cherry-pick (no edits).
+002	552b8da0f62129749a8dd96bc7cfba125e51c1f6	test(deps): add @types/react-test-renderer	PR01	pick	002b5bdd4e26175de5c0717af38486b8118ba1c5	test(deps): add @types/react-test-renderer	cherry-pick (no edits).
+003	017b15c07ad75413718d9e734b8f40f2ce738ce7	chore(config): harden app variant defaults	PR01	pick	4a05b3b6faf71aa7b652c9adb4068f4bb76d86f4	chore(config): harden app variant defaults	cherry-pick (no edits).
+012	207ef1b2f57207ad67a08256a11b40863e9fba76	fix(dev): gate CLI detection logging	PR01	pick	527d958dd28832955a5930c8011ff04c77229d64	fix(dev): gate CLI detection logging	cherry-pick (no edits).
+023	d97924f3ef398638746919a3fee3675b0a12cee6	chore(test): define __DEV__ for vitest	PR01	pick	397d4ce715af9326366ae6e14403c0762afd51a3	chore(test): define __DEV__ for vitest	cherry-pick (no edits).
+044	cb11d4bdb25a6423f156dd0f9b859b5fbf603857	docs: add AGENTS.md symlink + update CLAUDE.md	PR01	pick	dde1cd4aa8422cd7be0f0e62f34ee7f00e3b3633	docs: add AGENTS.md symlink + update CLAUDE.md	cherry-pick (no edits).
+046	ea2e4d19d63370180f5558093ab3df1b9fb2f75b	chore(deps): align react-test-renderer with react	PR01	pick	d06987ecfedc4c10f2e1329f24a1fb94d1b8b45b	chore(deps): align react-test-renderer with react	cherry-pick (no edits).
+051	43f23f2f082e149eb2d5d29b43b5c7461eaa5e40	chore(format): replace stray tabs with spaces	PR01	drop-net-noop			Skipped: conflicts due to deleted files in upstream; formatting-only noise not worth resurrecting.
+052	e1d55fdbd9ee31fb9bb80ce1a65643bef5890d44	fix(i18n): improve untranslated literal scan parsing	PR01	drop-net-noop			Skipped: target script path deleted upstream; likely superseded by upstream dev tooling.
+108	f7db44dea4586a2a399e6765e31f8ad9d3f61475	docs: add AGENTS.md symlink	PR01	pick	7809e86f0ebd34541bb59e20e2ef06f92e46a422	docs: add AGENTS.md symlink	cherry-pick (no edits).
+157	320a89e19ca060f23f67c0283cb075b1fd68635c	test(happy): run cli and server checks from root scripts	PR01	pick	7ef02fb2be31563f8bf5b2cfe4c2290d1b5e78f5	test(happy): run cli and server checks from root scripts	Resolved trivial conflict in root package.json (kept added scripts).
+184	ac5bf2f3abfa54b992c42f7249084dab4424a4c7	test(happy-cli): reset modules for runtime override	PR01	drop-net-noop			Skipped: target test file deleted upstream; net-noise.
+201	ce42bf56d7b682929ce1022293c8cbaa78918711	fix(web): correct libsodium wrapper typing	PR01	pick	2c2a0b0e3b83fb930bd13a8d0e39f97f5f31e8f0	fix(web): correct libsodium wrapper typing	Resolved conflict by taking the CJS-require + typed export variant.
+202	f0417ca11ac5112ee9f9a38b6d0b3bdbf644749b	fix(web): keep libsodium wrapper namespace typing	PR01	pick	fcb5a992b6841c9e2b60c35c875d4b7c507e3b33	fix(web): keep libsodium wrapper namespace typing	cherry-pick (no edits).
+207	61bf70183ebff64ec14716cee0ccf8c1b2a59ea4	test(cli): set DEBUG before importing logger	PR01	drop-net-noop			Skipped: target test file deleted upstream; net-noise.
+250	0c3b41030bbc4a888e621a6b5787eaac4b581a59	Add Vitest stubs for Expo and React Native modules	PR01	squash-into	67323a48f4b922c0de096f70cdda8e9de49bcefe	test(expo-app): add Vitest stubs for Expo/RN modules	Squashed with old 262 into one final test-infra commit (conflicts resolved; final message rewritten).
+262	2edc5305ca3fa26cd148a5ad9f775fd9d1f4eb41	expo-app(test): harden vitest stubs + unistyles typing	PR01	pick+amend	67323a48f4b922c0de096f70cdda8e9de49bcefe	test(expo-app): add Vitest stubs for Expo/RN modules	Combined with old 250 to represent final state; includes alias hardening, Unistyles typing, and hook-order regression test.
+013	58a892d413d17670aa459491ca3e4c60024d894f	fix(command-palette): include navigate dependency	PR02	pick	ab906ce8c2f54d33a065b0d2de50c97947e82888	fix(command-palette): include navigate dependency	cherry-pick (no edits).
+020	8d9f56e85e5a0abf2a7bdd9eec48c172dad5c110	refactor(ui): unify list selectors and modal primitives	PR02	split	798b923a7d746a87b64a4b07b87cd38f35b0087e,9d83a2f7709d3eacba1bf518f0624ecfc8bf8c1d,523f3364739c1cb58dadeb83dddc3a5177723f52	refactor(ui): add SearchHeader and harden SearchableListSelector; feat(ui): add row actions with overflow menu; refactor(modal): harden modal primitives and alert behavior	Split mega-commit; deferred wizard/profileSync deletions + list-helper hunks to later PR slices (PR26/PR08/PR38).
+022	2d4675a5d051d623b18ca85f284e74c21197237d	fix(agent-input): use compact permission badges	PR02	pick+resolve	a45c277645bbc31264447df2e4e94759e75c3a93	fix(agent-input): use compact permission badges	Resolved conflict by computing compact label + rendering it on the settings chip; kept abort button behavior unchanged.
+029	12e75a3b36fa49aa4d91cedd8464e8afcb65e2a8	fix(autocomplete): remove debug suggestion logs	PR02	pick	cc611ae6380441ac4ff0b0e3e25205ec0b1a0851	fix(autocomplete): remove debug suggestion logs	cherry-pick (no edits).
+031	4dc9c7f8759c1f5f1713167ca0888b87463084b3	feat(agent-input): add configurable action bar layout	PR06	defer				Reordered/deferred: depends on settings schema keys from PR06 (`agentInputActionBarLayout`, `agentInputChipDensity`) and i18n.
+032	e8e42a6087add8e0c3713980c9497c59e34a3fa9	fix(modal): prevent stacked modal touch-blocking on iOS	PR02	pick+resolve	13c93a68d12f696ce9d9a33a051ebae93e6b5f99	fix(modal): prevent stacked modal touch-blocking on iOS	Resolved conflict in `app/(app)/_layout.tsx` (kept containedModal presentation + explicit close button on iOS).
+035	7ffd0c3428cbbceb7df39396142100da8fd4841d	fix(ui): localize error alerts	PR02	pick	fe7f66c9322c800dec0bf47588bc737ffb540583	fix(ui): localize error alerts	cherry-pick (no edits).
+037	5f5b57df5181fdb2879d44c72e1d41b871c0e5ff	refactor(ui): improve item rendering and action menu timing	PR02	pick+amend	bf1a903583c9ad874bcc2eb2ad92e99166b7c9bd	refactor(ui): improve item subtitles and action menu timing	Kept Item subtitle ReactNode rendering + action menu timing + compact threshold + SessionsList cleanup; deferred ItemGroup selectable-count optimization to PR38 (current upstream ItemGroup lacks the selection context helpers).
+039	6ed379f82c3497512316f23d15b2c2a0556a160e	refactor(ui): add modal + popover overlay primitives	PR02	split	3fb6ed4ed3e4722c4efe3cdaf4dcbf79b16381f8,c878a8d179e8726a9b8443c73ce0714a4a3e2658,6f27bb96cbc274222c9597965da2d9c3019353d8,94e484a350b1df43cdabca339a3a9d09e91a07d9,4da8e01c68437e2347bf0cf694303392b31f5671	feat(modal): add overlay portal and Radix-backed web modals; feat(popover): add Popover primitive with portal support; feat(ui): add FloatingOverlay edge fades and indicators; feat(ui): add ConnectionStatusControl popover menu; feat(agent-input): allow customizing autocomplete max height	Split by subsystem; deferred dropdown/selectable-row/command-palette refactors and other list primitives from old 039 to later PR slices (PR38).
+050	2da2f9349ec5f50932cd3c2834c7b6c2fd0db16f	fix(popover): allow web fixed positioning types	PR02	pick	6dc0c2b7b10974394b2f25462d646f01d533f7cc	fix(popover): allow web fixed positioning types	cherry-pick (no edits).
+055	2472b376775cf1ba60b0af98e7abcda7299defba	test(modal): make backdrop z-index assertion safer	PR02	pick	c6925f76fabd2469f39e43851f1e75fba47d540c	test(modal): make backdrop z-index assertion safer	cherry-pick (no edits).
+059	f7f81497444d9547c9e077e3ad45c41a3293c2a2	fix(modal): prevent non-dismissible WebAlertModal	PR02	split	eefc1fcd10773b82649341456c22560b7c4aa7ec	fix(popover): measure DOM anchors on web and enable native portal	Kept popover + connection-status portal/test improvements in PR02; deferred unrelated new-session test mocking to PR26 (tracked in rewrite-deferred-fragments.tsv).
+062	e533db1813a54a9f6901b133b10e6d848e091ac3	fix(popover): add screens cjs helper and fix fixed positioning types	PR02	pick+resolve	f8ed5c88d126c35536c2e90adaa8ddcee97795f2	fix(popover): add screens cjs helper and fix fixed positioning types	Resolved conflicts in Popover.tsx by using a typed fixed-position helper; added react-native-screens CJS helper.
+054	66c6784513355e763d09dcfc530c09348c1c3a70	fix(ui): apply small review fixes	PR02	split-defer-all			No PR02-owned hunks remain after PR planning; deferred by hunk to PR28/PR26/PR18/PR38/PR06/PR27. See rewrite-deferred-fragments.tsv for exact paths/notes.
+064	e5848c4805226e1c460df58717b182d25f06d504	fix(ui): harden overlays and permission cycling	PR02	split	37a65d0e981b8f4add787f43a1bfcba04451fb4e	fix(ui): harden overlay portals and iOS popover behavior	Applied PR02-owned overlay hardening (OverlayPortal store to prevent provider child rerenders, iOS FullWindowOverlay pointerEvents correctness, closeThen fallback + tests). Deferred new-session wizard wiring and final permission cycling reconciliation to PR26/PR10 (tracked in rewrite-deferred-fragments.tsv).
+163	84df0d2605133a165a381dd6ae65507cfda23795	fix(expo-app): stabilize postinstall and libsodium patches	PR02	pick+resolve	554364de85d87920efb3c9fe10769ff6e273fe68	fix(expo-app): stabilize postinstall and libsodium patches	Cherry-picked with conflict resolved by keeping the existing web libsodium CJS import (avoids top-level-await issues); switched postinstall to a hoist-aware script; added libsodium-wrappers patch and removed obsolete RN libsodium patch; updated lockfile as needed.
+248	bf3027799623c286fe138c7b69e140ea90fdfa48	Set EXPO_UNSTABLE_WEB_MODAL env var in Expo scripts	PR02	split	b8486137a83c72745e68564b20f2ac7a4d89490a	fix(expo-web): enable web modals and pin expo-router	Applied Expo-web modal plumbing + expo-router pin/patch/resolution. Deferred session-info (Codex session id gating) change to PR19 (tracked in rewrite-deferred-fragments.tsv).
+249	c803115dcbdcd55c036e47c0f0cfd6e1bceb9f74	Improve postinstall script for symlinked paths and patching	PR02	pick	96a8c336d54e1fe44ff0165b66c2d33f8cfcdcd8	fix(expo): improve postinstall patching for hoisted and local deps	cherry-pick (no edits).
+276	10dca4ca7057ad04c6d121110f7fd2f006a411bc	chore(expo): pin libsodium-wrappers and align patch-package dirs	PR02	pick	ad0c5ae9867ce4fc3593b0d30e87e2ea76e47795	chore(expo): pin libsodium-wrappers and align patch-package dirs	cherry-pick (no edits); supersedes earlier patch-dir split by co-locating expo-router patch under expo-app/patches and pinning libsodium-wrappers.
+275	63cda8b20882dde5746e9f007b0866a0e39c3134	expo-app(ui): add list/pending primitives and polish	PR38	split	ed3de522739ed219b5d259aa49942ed4f615c022	feat(ui): add list primitives for selection menus	Extracted PR38-owned list primitives (ItemGroup divider/row-position helpers, selection context, SelectableRow, dropdown menu primitives + tests). Deferred the rest of old 275 (AgentInput refactors, pending queue UI, profiles changes, app shell polish, popover tweaks) via rewrite-deferred-fragments.tsv.
+039	6ed379f82c3497512316f23d15b2c2a0556a160e	refactor(ui): add modal + popover overlay primitives	PR38	deferred-fragment	c429a8148e933dd754ba904510f8128a7bb9d068	refactor(ui): make command palette use SelectableRow	Applied the PR38-owned CommandPalette refactor fragments (SelectableRow-based items + localized empty state) after introducing SelectableRow in PR38.
+039	6ed379f82c3497512316f23d15b2c2a0556a160e	refactor(ui): add modal + popover overlay primitives	PR38	deferred-fragment	7357579e594c84ca99cd56c791bb319831d8d5bb	refactor(ui): centralize item action types	Added shared `itemActions/types.ts` and re-exported from ItemActionsMenuModal to avoid duplicate ItemAction type definitions.
+004	4890a471df312191ae325d5691b61231097df078	fix(auth): harden tokenStorage web persistence	PR04	pick	64cbe8634d0db65b24b20272a4ad9e3735b47212	fix(auth): harden tokenStorage web persistence	cherry-pick (no edits).
+006	a5fbc3e8ba00ba0f41b9af18ca0c6296414f5533	feat(persistence): scope storage and validate draft modes	PR04	split	4bae1291fe99a8919da72e0d55e252830d0be4a4,150a12282ba957b74330a6c727c31627ad92afa4	feat(storage): add storage scoping helpers; feat(storage): scope native persistence by storage scope	Split old 006: extracted storageScope helpers + MMKV id scoping. Deferred draft/model-mode persistence hunks to PR05/PR28 (see rewrite-deferred-fragments.tsv).
+156	8c16ee8f9cef04c3ae515ab2ebcb12b5ef317759	fix(auth): surface auth failures and gate unauth routes	PR04	pick	cc7d04e5e5777bee18db25aa1bc2fea70d248450	fix(auth): surface auth failures and gate unauth routes	cherry-pick (no edits).
+177	893ce7af5df079be26925ff7a7c5baf6e9d35088	fix(expo-app): avoid hooks order violation on redirect	PR04	pick	e0f0fa69d440c7c3f2cc9b74b4ba9d1c8f8a6d36	fix(expo-app): avoid hooks order violation on redirect	cherry-pick (no edits).
+256	5537815563059192774839feca13768250362b79	cli(auth): add --no-open to skip browser open	PR04	pick	9d308d09e6b78f9b6883c348f31456be7332c772	cli(auth): add --no-open to skip browser open	cherry-pick (no edits).
+006	a5fbc3e8ba00ba0f41b9af18ca0c6296414f5533	feat(persistence): scope storage and validate draft modes	PR05	deferred-fragment	20a2d994fd2c3ca74f1ae82409db9913665640d3	fix(persistence): persist selectedProfileId and harden settings version	Applied PR05-owned draft persistence hardening + tests; left permission/model-mode clamps deferred to PR10/PR28 to avoid duplicating validation.
+115	a8093e3e4ddb6ff974e69d8aa29fe43fce34dbad	docs(persistence): update profile schema version comment	PR05	pick+resolve	812e7842481298d86a53e80764d042caea347b2f	docs(persistence): update profile schema version comment	Resolved trivial conflict in cli/src/persistence.ts comment by keeping generic wording; content-only change.
+011	c2d3507357dc7ef150105ff56468ec2f580943f6	fix(settings): make parsing tolerant for profiles	PR06	split	f212f57fab2715c28749a356a026cd175df56caa	fix(settings): make parsing tolerant for profiles	Applied tolerant parsing + legacy profile normalization; deferred sync convergence hunk in `expo-app/sources/sync/sync.ts` to PR27 (depends on replaceSettings).
+024	9c19baa833b9e1875e6f5811440db6ff903e4d86	feat(settings): add api keys and experiment toggles	PR06	pick	463c97c3e42c8c046761a0e0c8390893c2460669	feat(settings): add api keys and experiment toggles	Applied settings schema + persistence for saved API keys and per-experiment toggles (includes resurrected/centralized `profileRouteParams.ts` usage).
+025	21cc6df79f50cf13bfec4545c19b77034d3f3a4c	feat(api-keys): add saved API keys UI	PR06	pick+resolve	6012c889aeec3064ddc9aa7f2c4f4ace569f1a6b	feat(api-keys): add saved API keys UI	Applied API keys list/detail UI + selection wiring; resolved SettingsView conflicts by adding API keys nav + usage gating.
+030	679877c26ea934a3d4c0ff9ba68072662af1dc48	feat(settings): expose per-experiment toggles	PR06	pick+resolve	724146cb5c765098f1fb253014cbf156a6fc5a1f	feat(settings): expose per-experiment toggles	Applied Settings UI for per-experiment toggles; resolved minor conflicts and removed now-unused `useProfiles` import to keep TS clean.
+038	7976b877259cac770f41537f44fa70e54df721a2	feat(experiments): gate Zen, file viewer, and voice auth flow	PR06	split	62c43e4bffa6bdf05036baca27d0d5a9d82503af	feat(experiments): gate Zen, file viewer, and voice auth flow	Applied gating behavior for Zen/file viewer/voice auth; deferred Zen i18n literal replacements to PR06 follow-up (tracked in rewrite-deferred-fragments.tsv).
+048	395da4ff31674675c93d443626d50d3baa3f99ed	refactor(zen): avoid todo variable shadowing	PR06	pick	f3aec2f5c2ba1e5ca188fd1303d64006f5636d56	refactor(zen): avoid todo variable shadowing	Cherry-picked as tiny Zen readability refactor; can squash into other Zen commits in PR06 if desired.
+196	21e096e9454e4ab8ed684aa90eb544e8dbacb14f	fix(i18n): localize session settings item	PR06	pick+resolve	dc274999ecf65b044b9124eddb628fcd7f6d4708	fix(i18n): localize session settings item	Applied with 3-way conflict resolution (SettingsView routing differs in rewrite base); also restored missing `settings.{secrets,terminal,session}` keys across locales to match current SettingsView usage.
+203	b6d3874bf175911f2dea935203994ce6027d6ad1	fix(settings): include Codex resume in master experiment toggle	PR06	pick	392bb13cad6b246e00b6781f1f3b033caa77ba91	fix(settings): include Codex resume in master experiment toggle	Applied as-is (small correctness fix on master experiments switch).
+223	73ce32d242a050a44cdf4cb70439abcd594fcde1	fix(i18n): translate Spanish experiment subtitles	PR06	split	71a768da58c0f9af0c4d85a8bdacdeab613b91f9	fix(i18n): add experiments toggle strings	Adapted: upstream refactor moved experiment strings under `settingsFeatures.*`; added missing experiment toggle keys for all locales and applied the Spanish subtitle translations from old 223 (plus expGemini strings required by current features screen).

package/docs/commit-audits/happy/leeroy-wip.rewrite-process.md

@@ -0,0 +1,240 @@
+# `leeroy-wip` history rewrite process (non-destructive, auditable)
+
+This document defines the **end-to-end process** to rebuild the `leeroy-wip` branch into a clean, coherent commit history while **keeping the original branch untouched** so other agents can continue working.
+
+Scope: **planning + execution of the rewrite**, not feature changes.
+
+## Goals
+
+- Keep `leeroy-wip` **unchanged** and available for ongoing work.
+- Build a new branch (`rewrite/clean-stack`) with a **clean linear history**:
+  - commits represent the **final correct state** of each feature/fix (not the “evolution”)
+  - keep **useful commit granularity** (avoid 1 mega-commit per PR)
+  - improve commit subjects/bodies so reviewers understand **what/why**
+- Create **PR boundary markers** so we can later cut stacked PR branches mechanically.
+- Preserve provenance in a **ledger** (old commits → new commits) so we can:
+  - prove equivalence (`range-diff`, `diff --stat`)
+  - audit that no commits/features were dropped unintentionally
+
+## Non-goals
+
+- Do not rebase or otherwise rewrite `leeroy-wip`.
+- Do not “fix” unrelated code during rewrite (rewrite should be behavior-preserving vs the frozen baseline).
+- Do not create backups early “just in case”; backups are taken **right before** rewrite execution.
+
+## Source-of-truth inputs
+
+- Commit-by-commit deep review: `docs/commit-audits/happy/leeroy-wip.commit-manual-review.md`
+- Commit → final PR assignment (source of truth): `docs/commit-audits/happy/leeroy-wip.pr-assignment.working.tsv`
+- PR definitions: `docs/commit-audits/happy/leeroy-wip.pr-catalog.draft.md`
+- Split guidance: `docs/commit-audits/happy/leeroy-wip.split-plan.draft.md`
+- Patch artifacts (Pass2): `/tmp/leeroy-wip-pass2/NNN.patch`
+
+## Tracking outputs (rewrite execution)
+
+These two files are the execution control plane (always update them as you go):
+
+- Rewrite ledger: `docs/commit-audits/happy/leeroy-wip.rewrite-ledger.tsv`
+  - one row per **original commit NNN**
+  - records whether it was cherry-picked, split, squashed into another commit, or dropped as a net no-op
+  - records the **new commit SHA(s)** created in `rewrite/clean-stack`
+- Rewrite status board: `docs/commit-audits/happy/leeroy-wip.rewrite-status.tsv`
+  - one row per **PR slice**
+  - records start/end new SHA, boundary tag, validation commands run, notes
+
+### Deferred fragment tracking (mandatory when splitting/deferring)
+
+To ensure each PR slice represents the **final state** of that feature/fix (and to ensure we don’t “lose” parts of mega-commits), we also maintain:
+
+- Deferred fragments tracker: `docs/commit-audits/happy/leeroy-wip.rewrite-deferred-fragments.tsv`
+  - one row per **intentionally deferred file/hunk** from an original commit
+  - records the **target PR**, path, reason, and resolution status (`pending` → `resolved`)
+
+Hard rule:
+- If you split an original commit and do **not** bring all its changes into the current PR slice, you **must** add rows for the deferred pieces immediately.
+
+## Hard invariants (must follow)
+
+- All git operations must go through `happys wt git ...` (no raw `git` directly).
+- Never modify default checkouts under `components/<component>`; use worktrees only.
+- Never rebase `leeroy-wip`. Never force-push it. Never amend commits on it.
+- Rewrite happens only in the rewrite worktree/branch.
+- Every original commit in scope **must** be accounted for in the ledger (pick/split/squash/drop).
+- By default: **i18n is folded into the owning feature PR**, not centralized, unless explicitly decided otherwise.
+
+## Ensuring “final state per PR” is actually true
+
+We cannot “prove” final-state correctness until the full rewrite completes and we compare to the frozen baseline (Phase E).
+But we can enforce strong guarantees during execution:
+
+1) **PR slices are defined by final feature buckets**, not chronology:
+   - The picklist for PRxx includes *all* original commits assigned to PRxx (even if they happened late in `leeroy-wip`).
+   - Therefore, bugfixes for a feature are applied in the same PR slice, yielding the feature’s “final state” at the PR boundary.
+
+2) **PR boundary means “no more changes for this feature”**:
+   - Before tagging `rewrite/prXX-end`, ensure:
+     - the working tree is clean
+     - all PRxx commits are accounted for in the ledger
+     - any deferred fragments have explicit rows in `rewrite-deferred-fragments.tsv`
+
+3) **Post-boundary drift detection**:
+   - If a later PR slice touches “owned” files from an earlier PR (beyond expected cross-cutting infra), treat that as a signal:
+     - either the change belongs in the earlier PR and should be pulled down, or
+     - the PR boundaries/ownership need explicit documentation.
+
+## Phase A — Freeze a baseline snapshot (right before rewrite execution)
+
+Purpose: create immutable anchors so we can prove “rewritten history == baseline end state”.
+
+Run in the `leeroy-wip` worktree:
+
+1) Record anchors (copy into `leeroy-wip.commit-inventory.md`):
+- `happys wt git happy slopus/tmp/leeroy-wip -- rev-parse upstream/main`
+- `happys wt git happy slopus/tmp/leeroy-wip -- merge-base HEAD upstream/main`
+- `happys wt git happy slopus/tmp/leeroy-wip -- rev-parse HEAD`
+
+2) Create immutable refs pointing at the baseline HEAD:
+- `happys wt git happy slopus/tmp/leeroy-wip -- branch backup/leeroy-wip-YYYY-MM-DD HEAD`
+- `happys wt git happy slopus/tmp/leeroy-wip -- tag -a backup/leeroy-wip-YYYY-MM-DD -m "leeroy-wip rewrite baseline" HEAD`
+
+3) Create a portable bundle snapshot:
+- `happys wt git happy slopus/tmp/leeroy-wip -- bundle create /tmp/leeroy-wip-YYYY-MM-DD.bundle upstream/main..HEAD`
+
+## Phase B — Create one rewrite worktree + one rewrite branch
+
+Create a new worktree from `upstream/main` (example names):
+
+- Worktree: `slopus/tmp/leeroy-rewrite`
+- Branch: `rewrite/clean-stack`
+
+Example:
+- `happys wt new happy tmp/leeroy-rewrite --from=upstream --use`
+- `happys wt git happy slopus/tmp/leeroy-rewrite -- checkout -b rewrite/clean-stack upstream/main`
+
+## Phase C — Lock the PR execution order
+
+We reconstruct a single linear branch by applying **PR slices** in an intentional order (dependency-safe, but still feature/fix oriented).
+
+Rule:
+- Write the final PR order into `leeroy-wip.rewrite-status.tsv` (top-to-bottom).
+- Do not change that order mid-flight without documenting the reason (and updating the TSV).
+
+## Phase D — The reconstruction loop (PR slice by PR slice)
+
+For each PR (in the locked order):
+
+### D1) Compute the PR picklist
+
+Use `leeroy-wip.pr-assignment.working.tsv` to list all commits where `finalPr == PRxx`.
+
+Picklist must be:
+- ordered by `n` (oldest → newest)
+- include `needsSplit` / “drop/squash” notes
+
+### D2) For each commit in the picklist, decide the action (must be ledgered)
+
+For commit `NNN`:
+
+1) Read the full commit section:
+   - `docs/commit-audits/happy/leeroy-wip.commit-manual-review.md` `## NNN ...`
+2) Read the patch (mandatory for split decisions and safety-critical changes):
+   - `/tmp/leeroy-wip-pass2/NNN.patch`
+3) Choose one action and record it immediately in the ledger:
+   - `pick`: cherry-pick as-is (maybe with message rewrite)
+   - `split`: cherry-pick `-n`, then `git add -p`, produce multiple focused commits
+   - `squash-into`: do not cherry-pick this commit; absorb its change into another new commit in this PR slice
+   - `drop-net-noop`: only when it is a revert pair or true net no-op (must explain)
+   - `defer`: only when the *entire* original commit belongs to a later PR slice due to ordering dependencies
+
+If the action is `split` and some changes are intentionally not applied:
+- add rows to `leeroy-wip.rewrite-deferred-fragments.tsv` for each deferred file/hunk.
+
+### D3) Apply the change in the rewrite worktree
+
+Commands (examples; always use `happys wt git happy slopus/tmp/leeroy-rewrite -- ...`):
+
+- Pick:
+  - `cherry-pick <oldSha>`
+  - optionally `--edit` to rewrite subject/body to Conventional Commits
+
+- Split:
+  - `cherry-pick -n <oldSha>`
+  - `git add -p` (multiple times)
+  - `git commit -m "feat(scope): ..." -m "<why + constraints + key behavior>"`
+  - repeat until the working tree is clean
+
+- Squash-into:
+  - do not cherry-pick the commit
+  - apply the relevant hunks when you build the “final” commit for the feature
+  - ledger must point to the “destination” new commit SHA(s)
+
+### D4) Commit message rules (mandatory)
+
+Each rewritten commit must have:
+- Conventional Commit subject (`feat|fix|refactor|test|chore(scope): ...`)
+- body that answers:
+  - **what changed** (observable behavior)
+  - **why** (user problem / reliability / safety / invariants)
+  - any **constraints** (back-compat, migrations, ordering)
+
+Do **not** copy-paste old SHAs into commit messages.
+Provenance is preserved in `leeroy-wip.rewrite-ledger.tsv`.
+
+### D5) Close the PR slice
+
+When all commits assigned to PRxx are accounted for (ledger complete for those NNNs):
+
+1) Run validation appropriate to the slice:
+   - `happys typecheck ...`
+   - `happys test ...`
+2) Record validation commands + results in `leeroy-wip.rewrite-status.tsv`.
+3) Create a boundary marker at HEAD:
+   - tag: `rewrite/prXX-end`
+4) Record:
+   - `prEndNewSha`
+   - `boundaryTag`
+
+## Phase E — Final equivalence proof
+
+When `rewrite/clean-stack` is complete:
+
+1) Compare to the frozen baseline:
+   - `range-diff upstream/main...backup/leeroy-wip-YYYY-MM-DD upstream/main...rewrite/clean-stack`
+   - `diff --stat upstream/main...backup/leeroy-wip-YYYY-MM-DD upstream/main...rewrite/clean-stack`
+2) If differences exist:
+   - decide if intentional
+   - otherwise fix the rewrite branch (do not touch `leeroy-wip`)
+
+## Phase F — Cut stacked PR branches from boundary markers (later)
+
+Once the full rewrite stack is validated:
+
+- PR01 branch = `rewrite/pr01-end`
+- PR02 branch = `rewrite/pr02-end` (base is PR01 boundary)
+- …
+
+Because each PR slice has a boundary tag, branch cutting is mechanical and safe.
+
+## Handling new commits landing on `leeroy-wip` during rewrite
+
+1) Audit only the delta (append to docs; update TSV).
+2) Assign new commits to existing PRs when they belong to an existing final feature/fix.
+3) Only create a new PR bucket when it’s truly a new final feature/fix.
+4) In the rewrite branch:
+   - if PR slice not yet closed → incorporate into that PR slice
+   - if PR slice already closed → add a new PR slice on top (or reopen only with explicit decision + new boundary tag)
+
+## Resume prompt (copy/paste)
+
+Use this exact prompt to resume work without losing process invariants:
+
+“Continue the `leeroy-wip` rewrite on `slopus/tmp/rewrite-clean-stack`.
+Work on the current PR slice (see `docs/commit-audits/happy/leeroy-wip.rewrite-status.tsv` for which PR is `in_progress`).
+For the next unprocessed original commit(s) in that PR slice:
+1) Read its section in `docs/commit-audits/happy/leeroy-wip.commit-manual-review.md` and its Pass2 patch under `/tmp/leeroy-wip-pass2/NNN.patch`.
+2) Apply via `happys wt git ...` as `pick` or `split` (or explicit `defer`/`drop-net-noop` only when justified).
+3) If splitting and deferring any file/hunk, add rows immediately to `docs/commit-audits/happy/leeroy-wip.rewrite-deferred-fragments.tsv`.
+4) Update `docs/commit-audits/happy/leeroy-wip.rewrite-ledger.tsv` for each original commit touched (old→new mapping + notes).
+5) Update `docs/commit-audits/happy/leeroy-wip.rewrite-status.tsv` notes with what was completed.
+6) Keep the rewrite worktree clean after each commit (`git status` clean).
+Stop after a small batch (5–10 commits or ~1–2 hours of work) and report: new SHAs, which old commits were accounted for, any new defers, and any reclassifications.”

package/docs/commit-audits/happy/leeroy-wip.rewrite-status.tsv

@@ -0,0 +1,39 @@
+order	prId	prTitle	status	startedAt	finishedAt	prStartNewSha	prEndNewSha	boundaryTag	validationCommands	notes
+01	PR01	Foundations / DevX	completed	2026-01-25T16:48:03+0100	2026-01-25T16:54:19+0100	f1144d58da0498137c639b7d2970f1c89945bbc9	67323a48f4b922c0de096f70cdda8e9de49bcefe	rewrite/pr01-end	TODO: run stack-scoped typecheck/tests against slopus/tmp/rewrite-clean-stack	Applied all PR01 commits; skipped format/untranslated-scan and two deleted tests as net-noise. Combined old 250+262 into a single final Vitest stub commit. Rewrite branch: `slopus/tmp/rewrite-clean-stack`.
+02	PR02	UI modal/overlay/popover system (native + web) + Expo web modal behavior	completed	2026-01-25T16:58:13+0100	2026-01-25T18:16:51+0100	67323a48f4b922c0de096f70cdda8e9de49bcefe	ad0c5ae9867ce4fc3593b0d30e87e2ea76e47795	rewrite/pr02-end	TODO: run stack-scoped typecheck/tests against slopus/tmp/rewrite-clean-stack	Applied old 013/022/029/032/035; split old 020 into 3 commits; split old 039 into overlay+Radix web modals + Popover + FloatingOverlay edge fades/indicators + ConnectionStatusControl (+ AgentInputAutocomplete maxHeight); applied old 050/055; split old 059 (kept popover/connection-status bits, deferred new-session test); applied old 062; applied overlay hardening from old 064 as new 37a65d0e (deferred wizard+permission pieces). Accounted: old 054 as split/defer-all (see rewrite-deferred-fragments.tsv + ledger). Applied expo install/web-modal plumbing (old 163/248/249/276) and tagged boundary.
+03	PR38	UI list primitives + pending UI polish	completed	2026-01-25T18:16:51+0100	2026-01-25T18:41:24+0100	ad0c5ae9867ce4fc3593b0d30e87e2ea76e47795	7357579e997e17fc928f6b1d4d513437ac49ef1f	rewrite/pr38-end	TODO: run stack-scoped typecheck/tests against slopus/tmp/rewrite-clean-stack	Split old 275; applied PR38-owned list primitives as ed3de522 (ItemGroup dividers/row-position/selection context + SelectableRow + dropdown menu primitives + tests). Applied deferred CommandPalette refactor fragment as c429a814 (SelectableRow-based palette items + localized empty state). Added shared item action types as 7357579e. Deferred remaining old 275 files to PR13/PR08/PR37/PR06/PR25/PR02. Marked PR38 deferred fragments as resolved (including OptionTiles hunk as net-noop since file is gone).
+04	PR03	i18n foundation sweep (optional, early)	deferred										Default strategy: fold i18n into owning PRs; only run this slice if we explicitly decide to reduce conflict surface.
+05	PR04	Auth + storage scoping (app auth persistence, scoped storage roots)	completed	2026-01-25T18:41:24+0100	2026-01-25T19:46:02+0100	7357579e997e17fc928f6b1d4d513437ac49ef1f	150a12282ba957b74330a6c727c31627ad92afa4	rewrite/pr04-end		TODO: run stack-scoped typecheck/tests against slopus/tmp/rewrite-clean-stack	Applied old 004/156/177/256. Split old 006 into storageScope helpers (4bae1291) + MMKV id scoping + regression test (150a1228). Deferred draft/model-mode hunks from old 006 to PR05/PR28 via rewrite-deferred-fragments.tsv. Baseline for equivalence remains backup/leeroy-wip-2026-01-25-10dca4ca (do not fold post-baseline commits during rewrite).
+06	PR05	Persistence / drafts (draft modes, persistence invariants)	completed	2026-01-25T19:46:02+0100	2026-01-25T19:59:46+0100	150a12282ba957b74330a6c727c31627ad92afa4	812e7842481298d86a53e80764d042caea347b2f	rewrite/pr05-end			Applied PR05-owned deferred fragments from old 006 as 20a2d994 (selectedProfileId + settings version guard + draft tests); picked+resolved old 115 as 812e7842. Deferred permission/model clamps and model-mode tests to PR10/PR28.
+07	PR06	Settings: API keys + experiments + settings screens	in_progress	2026-01-25T19:59:46+0100			812e7842481298d86a53e80764d042caea347b2f	71a768da58c0f9af0c4d85a8bdacdeab613b91f9			Settings surfaces used by later features. Applied old 011 (split sync.ts hunk → PR27), 024, 025, 030, 038 (gating only; Zen i18n deferred in-slice), 048, 196, 203, 223 (adapted to `settingsFeatures.*`).
+08	PR07	Env var templates + preview/resolution end-to-end	pending										Env templates + preview/resolution UX (excluding preview-env RPC if kept separate).
+09	PR15	preview-env feature end-to-end	pending										Backend/RPC slice; keep narrowly scoped to preview-env.
+10	PR08	Profiles feature (profiles + env var selection UX)	pending										Depends on env/templates + settings.
+11	PR09	Secrets / vault (SecretString + sealing + tolerant parsing + redaction)	pending										Includes secret UI + parsing hardening; keep i18n in-slice.
+12	PR10	Permission framework (Claude/cloud baseline)	pending										Baseline permission types/persistence/arbitration for Claude/cloud.
+13	PR11	Agent permissions (Codex/Gemini): permission modes + allowlists (agent-specific correctness)	pending										Extends permission behavior beyond Claude; includes per-session allowlists + shell approvals hardening.
+14	PR16	Daemon reliability (ownership + reattach/restart safety)	pending										Process ownership, idempotency, shutdown policies.
+15	PR17	CLI reliability (socket/metadata waiters + backoff semantics)	pending										Waiter cleanup/reconnect/backoff correctness.
+16	PR27	Sync robustness (transport/error parsing + backoff semantics)	pending										App sync robustness not specific to queue/capabilities.
+17	PR28	Model modes (configurable per-session model selection + persistence)	pending										Per-session model mode correctness + persistence.
+18	PR14	Capabilities feature end-to-end (protocol + wiring + reliability)	pending										Capabilities protocol + caching + request/retry semantics.
+19	PR37	Agent registry end-to-end (selection + settings + UX helpers)	pending										Typed agent registry in app; unify selection/toggles and helpers.
+20	PR36	ACP agents end-to-end (runtimes + replay + tool normalization)	pending										ACP runtimes (Codex ACP/OpenCode) + replay capture/import + normalization.
+21	PR12	Tool interaction: AskUserQuestion + ExitPlan native handling (end-to-end)	pending										interaction.respond wiring + permission-id guardrails + submit flows.
+22	PR39	Tool UX: normalization + specialized views + tracing	pending										Normalize tool-call shapes + specialized rendering + tool-trace fixtures.
+23	PR13	MessageQueueV1 + Pending messages (end-to-end)	pending										Queue semantics + pending/discard + wake behavior.
+24	PR26	New session wizard end-to-end (wizard + pick flows + machine selection)	pending										New-session flow; keep coherent and split mixed commits.
+25	PR19	Resume feature end-to-end (inactive resume + session lifecycle)	pending										Resume UX + RPCs + daemon plumbing; keep i18n/a11y in-slice.
+26	PR20	Claude session reliability (switching + transcript/scanner + local runner)	pending										Claude-specific reliability beyond resume and terminal IO.
+27	PR31	Terminal switching reliability (remote↔local UX + Ink input + signal forwarding)	pending										Terminal IO + switching reliability; non-tmux specific.
+28	PR18	TMUX end-to-end (headless sessions + attach + settings)	pending										Tmux only; keep pure tmux concerns here.
+29	PR32	Codex approvals + MCP tool interactions (execpolicy + elicitation)	pending										Codex approvals + MCP tool-call begin/end + bridge runner compat.
+30	PR21	Codex MCP tool-call result correctness	pending										Falsy Ok/Err correctness + adjacent fixes.
+31	PR33	Codex special commands (/clear session reset)	pending										Session boundary reset semantics.
+32	PR30	Agent error surfaces (Codex/Gemini)	pending										Make agent failures user-visible/actionable; keep focused.
+33	PR29	Sessions & message list UX (inactive grouping, unread, archive reliability)	pending										Session list UX improvements; keep to browsing + archive behavior.
+34	PR35	Friends: UX + reliability (search errors + follow-ups)	pending										Inbox/friends gating + reliability fixes.
+35	PR22	Server-light flavor (final feature: lightweight server variant)	pending										Server flavor work; keep schema/prisma sync coherent.
+36	PR23	Server: optionally serve UI + public files safely (final feature)	pending										UI serving + public file path hardening.
+37	PR24	Storage: S3 env + bucket validation (final fix)	pending										S3/Minio fail-fast validation.
+38	PR25	Misc small UX polish (only if it stays small)	pending										Only truly isolated polish; otherwise fold into owning PR.

package/docs/commit-audits/happy/leeroy-wip.split-plan.draft.md

@@ -0,0 +1,93 @@
+# Split plan (draft)
+
+Generated: 2026-01-25T18:08:26.316Z
+
+This lists commits whose manual-review verdict suggests **splitting** (mixed concerns).
+The “how to split” is captured here as a checklist so we can execute it mechanically during the rewrite (via `cherry-pick -n` + selective staging).
+
+## 054 66c678451335 fix(ui): apply small review fixes
+
+- Verdict: split
+- Depends on:
+  - none (but many of these are follow-ups to nearby feature commits: session model mode, new picker, settings, dropdown, sync backoff).
+
+Files touched:
+- M `expo-app/sources/-session/SessionView.tsx`
+- M `expo-app/sources/app/(app)/new/pick/machine.tsx`
+- M `expo-app/sources/app/(app)/settings/terminal.tsx`
+- M `expo-app/sources/components/ConnectionStatusControl.tsx`
+- M `expo-app/sources/components/OptionTiles.tsx`
+- M `expo-app/sources/components/SettingsView.tsx`
+- M `expo-app/sources/components/dropdown/DropdownMenu.tsx`
+- M `expo-app/sources/utils/sync.ts`
+
+Rewrite hints (from manual review):
+- Keep subject (if not splitting): `fix(ui): apply small review fixes`
+- If splitting by topic: convert into multiple commits scoped to the touched features (session model mode, new picker, settings terminal, dropdown chevron opacity, sync backoff).
+
+## 059 f7f81497444d fix(modal): prevent non-dismissible WebAlertModal
+
+- Verdict: split
+- Depends on:
+  - 
+
+Files touched:
+- M `expo-app/sources/__tests__/app/new/pick/machine.presentation.test.ts`
+- A `expo-app/sources/components/ConnectionStatusControl.popover.test.ts`
+- M `expo-app/sources/components/ConnectionStatusControl.tsx`
+- M `expo-app/sources/components/Popover.test.ts`
+- M `expo-app/sources/components/Popover.tsx`
+- M `expo-app/sources/modal/components/WebAlertModal.tsx`
+
+Rewrite hints (from manual review):
+- If kept as a single commit: rewrite subject to reflect the actual scope (Popover + modal + portal).
+- Preferred: split as described above and keep the original subject only for the WebAlertModal change.
+
+## 082 3fbdc10018fe fix: tmux parsing/targeting + review feedback
+
+- Verdict: split
+- Depends on:
+  - tmux semantics and consistent env formatting (this commit documents the assumptions).
+
+Files touched:
+- M `cli/bin/happy-dev.mjs`
+- M `cli/docs/bug-fix-plan-2025-01-15-athundt.md`
+- M `cli/scripts/__tests__/ripgrep_launcher.test.ts`
+- M `cli/scripts/claude_version_utils.cjs`
+- M `cli/scripts/claude_version_utils.test.ts`
+- M `cli/scripts/env-wrapper.cjs`
+- M `cli/scripts/ripgrep_launcher.cjs`
+- M `cli/scripts/test-continue-fix.sh`
+- M `cli/src/api/api.test.ts`
+- M `cli/src/api/apiSession.ts`
+- M `cli/src/api/types.ts`
+- M `cli/src/claude/claudeLocal.ts`
+- M `cli/src/claude/runClaude.ts`
+- M `cli/src/utils/tmux.test.ts`
+- M `cli/src/utils/tmux.ts`
+
+Rewrite hints (from manual review):
+- Rewrite subject to Conventional Commits: `fix(tmux): correct TMUX parsing and command targeting`
+
+## 224 98bc00096e86 fix(i18n): localize Codex resume banner
+
+- Verdict: split
+
+Files touched:
+- M `expo-app/sources/app/(app)/new/NewSessionWizard.tsx`
+- M `expo-app/sources/text/translations/ca.ts`
+- M `expo-app/sources/text/translations/en.ts`
+- M `expo-app/sources/text/translations/es.ts`
+- M `expo-app/sources/text/translations/it.ts`
+- M `expo-app/sources/text/translations/ja.ts`
+- M `expo-app/sources/text/translations/pl.ts`
+- M `expo-app/sources/text/translations/pt.ts`
+- M `expo-app/sources/text/translations/ru.ts`
+- M `expo-app/sources/text/translations/zh-Hans.ts`
+
+Rewrite hints (from manual review):
+- If split:
+- `fix(i18n): localize Codex resume banner`
+- `refactor(new-session): use WizardSectionHeaderRow for wizard sections`
+- `refactor(new-session): centralize permission mode options`
+- If squashed: keep the “fix(i18n)” message but mention the refactor in the body.

package/docs/commit-audits/happy/leeroy-wip.topic-buckets.md

@@ -0,0 +1,76 @@
+# Topic buckets (auto-triage)
+
+Generated: 2026-01-25T18:08:26.315Z
+
+Counts:
+
+- `i18n`: 15
+- `cli`: 15
+- `sync`: 14
+- `ui`: 13
+- `claude`: 13
+- `codex`: 13
+- `expo-app`: 11
+- `server`: 11
+- `resume`: 10
+- `daemon`: 7
+- `tools`: 6
+- `terminal`: 6
+- `session`: 5
+- `settings`: 5
+- `new-session`: 5
+- `profiles`: 5
+- `rpc`: 5
+- `happy`: 5
+- `persistence`: 4
+- `env`: 4
+- `tmux`: 4
+- `happy-cli`: 4
+- `server-light`: 4
+- `agent-input`: 3
+- `modal`: 3
+- `secrets`: 3
+- `queue`: 3
+- `utils`: 3
+- `deps`: 2
+- `auth`: 2
+- `storage`: 2
+- `popover`: 2
+- `sessions`: 2
+- `typecheck`: 2
+- `fork`: 2
+- `pr107`: 2
+- `detect-cli`: 2
+- `app`: 2
+- `permission`: 2
+- `web`: 2
+- `crypto`: 1
+- `config`: 1
+- `dev`: 1
+- `command-palette`: 1
+- `cli-detection`: 1
+- `test`: 1
+- `api-keys`: 1
+- `machine`: 1
+- `autocomplete`: 1
+- `experiments`: 1
+- `zen`: 1
+- `new`: 1
+- `format`: 1
+- `security`: 1
+- `socket`: 1
+- `logging`: 1
+- `runtime`: 1
+- `offline`: 1
+- `gemini`: 1
+- `common`: 1
+- `scanner`: 1
+- `reducer`: 1
+- `ink`: 1
+- `a11y`: 1
+- `hooks`: 1
+- `expo`: 1
+
+Notes:
+- These buckets come from `leeroy-wip.commit-analysis.md` and are a starting point, not the final PR grouping.
+- Some buckets (notably `expo-app`, `storage`, `env`, `sync`) will be split across PRs by feature surface during planning.