Repository navigation
Integrate open contributor PRs (#198, #200, #204, #206, #208, #210–#214) - #215
Merged
Merged
Conversation
Show the branch below the workspace name, keep the activity indicator beside the name, and preserve space for rename and branch controls.
Use OMP live resolution instead of duplicating discovery. Keep the native notice preference and never resume stopped sessions for inspection.
Add an icon-only dismiss button that hides the current report until its diagnostics change, and shorten the disable action to "Turn this off" so the notice text keeps its width on phones.
Browser-style back/forward over visited chat views on omp-web's own stack (not the browser history, which belongs to the mobile back-gesture machinery). ⌘[/⌘] on macOS, Alt+←/→ on Windows/Linux, plus the mouse back/forward buttons; sidebar header buttons hide below a 240px sidebar, and an exhausted stack swallows the keystroke so the app is never backed out of. Deleted sessions are skipped; ?session= URL handling is unchanged.
omp's steer, follow_up and prompt+streamingBehavior RPC commands accept images, so queued messages no longer need to be text-only. Allow attaching (+ menu, paste, drag and drop) while the agent runs, fold text files into the queued message as an idle send does, and let attachments alone turn Stop into Queue. Edit no longer restores omp's "[Image]" placeholder for an image-only queued message.
…ueing A steer or follow-up omp refuses, a queued message taken back by Edit, and the queue Stop withdraws now return their images to the draft, not just their text. Draft recovery (recoverDraft) carries images; Stop reads them from abort_and_restore_queue and Edit from remove_queued_message (can1357/oh-my-pi#14179). omp's "[Image]" label is never restored as text. The stale "queued messages remain text-only" changelog note is removed.
The composer now puts a refused steer, follow-up or queued prompt back into the draft it was sent from, text and images together. The hook's insertIfEmpty only restored the text, skipped it when the composer had new typing, and could land in another session after navigation.
Edit and Stop drop omp's "[Image]" label only when the entry carries images, so a message that literally reads "[Image]" survives. Recovered images are no longer truncated at the attachment cap; sending still enforces it, so the user picks which to keep.
…over cap, email-only labels
Keep the opener in the header and dismissal inside the panel, preserving keyboard focus and reachable controls in narrow layouts.
Moved from #208, where it landed by mistake.
# Conflicts: # CHANGELOG.md
# Conflicts: # CHANGELOG.md
# Conflicts: # CHANGELOG.md
# Conflicts: # components/AppShell.tsx # components/ChatInput.tsx # components/SessionSidebar.tsx
# Conflicts: # README.md # hooks/useAgentSession.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Lands the open PRs that could not merge one at a time because they conflict with each other (mostly
CHANGELOG.md, plus real overlaps between #208 / #211 / #213 inChatInput.tsx,SessionSidebar.tsx,AppShell.tsx, and #200 / #214 inuseAgentSession.ts). Each PR's own commits are included unchanged as merge parents, so authorship is preserved and GitHub should mark them merged.Included: #198, #200, #204, #206, #208, #210, #211, #212, #213, #214.
Conflict resolutions
CHANGELOG.md,README.md: keep both sides.AppShell.tsx/SessionSidebar.tsx: both the navigation-history props (feat(nav): add in-app navigate back/forward #211) and the mobile draweronClose(feat(ui): refine mobile sidebar controls, gestures, and title sizing #208).ChatInput.tsx: fix(ui): consistent reasoning menu, unscrolled context popover, real account emails #213's desktop context-popover height cap (contextMaxHeight) combined with feat(ui): refine mobile sidebar controls, gestures, and title sizing #208's mobile popover placement, focus handling and Escape capture (separate layout effects); mobile max-height from feat(ui): refine mobile sidebar controls, gestures, and title sizing #208, desktop from fix(ui): consistent reasoning menu, unscrolled context popover, real account emails #213.useAgentSession.ts: feat(composer): send images and text files with steers and follow-ups #214'srecoverDraftimport alongside feat: show skill startup diagnostics #200's skill diagnostics import.Verification
tsc --noEmitclean;npm run lint: 0 errors.npm test: 1211 pass, 5 skipped, 0 fail.ChatInput/SessionSidebarhas only had unit/type coverage.https://claude.ai/code/session_011RZdyVoycH4WVVDWJNctDR
Generated by Claude Code