Skip to content

feat(app): show git branch in the session composer and move the permission select - #339

Merged
quickbeard merged 3 commits into
mainfrom
feat/composer-branch-indicator
Aug 27, 2026
Merged

quickbeard merged 3 commits into
mainfrom
feat/composer-branch-indicator

Conversation

@quickbeard

@quickbeard quickbeard commented Aug 27, 2026 •

Copy link
Copy Markdown
Owner

What

Two composer changes for existing sessions in the desktop app, applying identically to Code and Work:

  • Auto/Manual permission select moved beside the agent (Plan/Build) select. It still rides the modelControl slot, but now leads the fragment, so the footer row reads: add-menu, agent, permission mode, model, branch.
  • Git branch indicator. The current branch of the session's directory now shows right of the model picker, reusing the new-session PromptGitStatus chip in the same muted text color as the surrounding controls. On Work it shows the sandbox guest checkout's branch (per-server sync already supplies it); it hides when the directory has no branch, and is gated on a session id so the new-session views (which already show the branch beside the project selector) don't render it twice.

How

  • packages/app/src/components/prompt-input-v2.tsx: reordered the permission control ahead of the model control; new fork-only PromptInputV2BranchIndicator renders after the model control in the same modelControl fragment, wrapped in text-v2-text-text-muted to match the ghost-muted buttons. No session-ui changes needed.
  • packages/app/src/components/prompt-workspace-selector.tsx: PromptGitStatus gains a separator?: boolean prop (default true) so the footer usage drops the leading "/" divider.
  • DIVERGENCES.md: updated the prompt-permission-mode row and added a row for the branch indicator.

Verification

  • bun typecheck clean in packages/app (session-ui untouched vs main)
  • bun run test:unit in packages/app: 814 pass

🤖 Generated with Claude Code

quickbeard and others added 3 commits August 27, 2026 15:09
…ssion select

Existing sessions (Code and Work alike) now show the current git branch at
the right end of the composer control row, reusing the new-session
PromptGitStatus chip via a new trailing slot on session-ui's PromptInputV2.
The Auto/Manual permission select moves ahead of the model select so it
sits beside the agent (Plan/Build) dropdown.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
The chip now rides the modelControl fragment right of the model select,
in the same muted text color as the surrounding controls; the session-ui
trailing slot is no longer needed and is reverted.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@quickbeard
quickbeard merged commit a3e5390 into main Aug 27, 2026
0 of 5 checks passed
@quickbeard
quickbeard deleted the feat/composer-branch-indicator branch August 27, 2026 08:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant