[zxch3n]

Related issue

Follow-up to #1983 (merged).

Problem / pressure

Mobile new chat showed an internal selector such as lody:branch:local:main in the branch row when worktree was off. That path displayed the directory's current ref directly, bypassing the existing formatter. The story used plain branch names and did not expose this state. The GitHub owner avatar also sat 2.5px above the project label: its inline-flex frame introduced baseline space inside the trigger's icon slot.

Summary

Use one display resolver for the checked-out branch in direct local mode and the selected base branch in worktree mode. Both format local/remote selectors through the existing label formatter; launch values remain unchanged. GitHub branch names stay verbatim. Update the real-component story to use encoded local selectors and exercise switching worktree off and back on. Use block flex layout for the shared owner-avatar frame so both themes align the avatar with the project text while loading, after loading and in expanded options.

Main supplies the onboarding tour subscription and its regression test through #2001. This PR preserves that implementation and adds the matching frozen read subscription to the conversation Storybook runtime.

Visual explanation

local + worktree off → checked-out selector ─┐
local + worktree on  → selected selector ────┴→ existing formatter → readable branch label
GitHub              → selected branch name ─────────────────────→ unchanged name
owner avatar        → 16px block flex frame ─────────────────────→ no inline baseline gap
preview composer    → subscribePromptSuggestion → fixture null snapshot + cleanup

Before / after

State	Before	After
Local directory	lody:branch:local:main	main (local) (localized suffix)
Worktree	selected option label; raw fallback possible	consistently formatted selected ref
Toggle worktree off/on	story only covered plain names	checked-out branch, then previous selected base
GitHub project icon	avatar center 2.5px above text	centers coincide in Chromium/WebKit and light/dark

Real-component screenshots use synthetic workspace data. No user recording or device screenshot is uploaded.

Test plan

• Rebased onto main 1ce6a72c9; main's onboarding fix, mobile page entrance/edge-back behavior and scheduled-send changes are preserved. The first three original patches remain equivalent under git range-diff; the last drops duplicate upstream tour changes and retains the conversation-story fix.
• 121 focused unit tests in 10 suites pass, including upstream mobile gestures, session submission, prompt suggestions and the tour isolation boundary.
• 13 browser cases cover both avatar themes, branch/worktree labels, project restoration, delayed presentation, keyboard dismissal and onboarding completion. The send geometry case waits for the page's entrance animation to complete, then retains exact bounds assertions during sending.
• Components typecheck, type-aware lint, root formatting and git diff --check pass. Root pnpm check stops at CLI typecheck because ACP extension modules are uninitialized; docs validation reports 88 existing missing-submodule link errors and no errors in changed docs.
• Earlier iOS Debug 0.107.2 (20261028.8) was built, signed, installed and launched on the physical iPhone from the documented isolated native/cloud dependency baseline. It was not rebuilt for this rebase, and does not establish device acceptance of the rebased main features. New full desktop smoke results are tracked against the pushed PR head.