You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
fix(mobile): keep chat open when branch actions finish after dismissal - #39562
A branch or worktree operation could navigate back after its sheet had already closed, returning the user to the thread list or closing a newly opened sheet. The Android and iOS sheet now closes on success only while the initiating route still has focus, and worktree attachment continues after dismissal.
Commit 59651c1761 (main). The chat closes when the worktree finishes, returning you to the thread list. The cause is at apps/mobile/src/features/threads/git/GitBranchesSheet.tsx:128. Followed the steps under Evidence in the app on Pixel_9_API_37 (Android 17.0): I closed the branch sheet while the checkout was still running. When the checkout finished, the app closed the Delayed checkout chat and returned to the Chats list.
Evidence
Environment: Pixel_9_API_37, Android 17.0, Android Emulator on Linux x64
Steps:
On an Android phone emulator, open a chat from the thread list in a test Git project whose post-checkout hook takes 10 seconds and succeeds.
Tap Git controls in the chat header.
Tap More.
Tap Branches & worktrees.
Enter an unused branch name under New worktree.
Tap Create worktree.
Tap Close on the branch sheet while the checkout is still running.
Wait for the checkout to finish.
Proven: the bug shows on main at 59651c1761 and no longer shows on head 5b6426c734.
Shows: I closed the branch sheet while the checkout was still running. When the checkout finished, the app closed the Delayed checkout chat and returned to the Chats list.
Does not show: I closed the branch sheet while checkout was still running. When checkout finished, the Delayed checkout chat stayed open and the new worktree was attached to it.
No actionable comments were generated in the recent review.
Walkthrough
After a Git action succeeds, the branches sheet clears relevant inputs and navigates back only if the sheet is still focused. Tests cover delayed action completion after the sheet loses focus.
Changes: Branch sheet navigation
Layer / File(s)
Summary
Guard successful action completion and test navigation apps/mobile/src/features/threads/git/GitBranchesSheet.tsx, apps/mobile/src/features/threads/git/GitBranchesSheet.test.tsx
Branch creation, worktree creation, and checkout now clear relevant inputs and navigate back only when the sheet remains focused after a successful result. Tests model navigation state and verify navigation after delayed actions.
The change keeps the chat open when a branch or worktree operation finishes after the sheet has been dismissed. No remaining merge-blocking risk is evident.
Pre-merge checks: 4
Check name
Status
Explanation
Title check
The title "fix(mobile): keep chat open when branch actions finish after dismissal" matches the main change: the mobile branch/worktree sheet now closes on success only while its initiating route has f…
Description check
The description covers the problem (sheet-initiated navigation back after dismissal closes the chat), the change (close on success only while the initiating route has focus, and worktree attachment co…
Linked Issues check
Directly linked issue #39561 requires that a finished worktree checkout does not return the user from the chat after the branch sheet is dismissed. At head ca090fb, GitBranchesSheet.tsx adds `!navi…
Out of Scope Changes check
The change set in the supplied summary contains two files: apps/mobile/src/features/threads/git/GitBranchesSheet.tsx (+3/-3, focus guard on three success paths) and GitBranchesSheet.test.tsx (+50/-11,…
Full details: Title check
Explanation
The title "fix(mobile): keep chat open when branch actions finish after dismissal" matches the main change: the mobile branch/worktree sheet now closes on success only while its initiating route has focus, so the chat stays open when a Git action finishes after the sheet is dismissed. It follows the conventional commit style and names the scope (mobile) and the behavior.
Full details: Description check
Explanation
The description covers the problem (sheet-initiated navigation back after dismissal closes the chat), the change (close on success only while the initiating route has focus, and worktree attachment continues after dismissal), reproduction steps and environment, and a linked issue. Verification lists the focused test file and the check command, and the before/after evidence includes screenshots and a recording. It follows the template's section structure. Minor gaps: the Scope section does not explicitly say why an issue is needed beyond the linked issue, and the commit-level test claims are not independently verifiable from the PR text. These do not make the description largely incomplete.
Full details: Linked Issues check
Explanation
Directly linked issue #39561 requires that a finished worktree checkout does not return the user from the chat after the branch sheet is dismissed. At head ca090fb, GitBranchesSheet.tsx adds !navigation.isFocused() to the success guard in three paths: Create branch (around line 86), Create worktree (around line 126), and existing-branch checkout (around line 164). When the sheet route has lost focus, the callback returns before navigation.goBack(). The user dismissal path is unchanged, so the sheet still closes normally. The Git action promise is not cancelled by the sheet, so attachment continues. The author reports a device repro on main at 59651c1 that shows the bug and a clean run on head with the Delayed checkout chat kept open. The test file GitBranchesSheet.test.tsx is reported to cover the unfocused case for Create worktree, Create & checkout, and release/stable checkout. Limitations: the test file content and the Git action hook implementation were not read. Attachment after dismissal rests on the unchanged action path and the device evidence. The incremental diff from 5b6426c to ca090fb showed no change to GitBranchesSheet.tsx, so the earlier conclusion holds for this file.
Full details: Out of Scope Changes check
Explanation
The change set in the supplied summary contains two files: apps/mobile/src/features/threads/git/GitBranchesSheet.tsx (+3/-3, focus guard on three success paths) and GitBranchesSheet.test.tsx (+50/-11, focus and goBack mocks with unfocused-route tests). Both match the reported bug class, which covers branch and worktree actions on the mobile sheet. The PR states that error handling, eligibility checks, and Git action internals are unchanged. The directory listing at head also shows GitBranchesSheet.occupancy.test.tsx. It is not listed in the supplied change summary, and its content was not read. It is not treated as an in-scope change for this verdict. No unrelated change is demonstrated.
Finishing Touches
Generate unit tests (beta)
Create a new PR
Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts
Included review availability: This review used your included allowance. Your plan provides up to 10 included reviews per hour; 3 remain after this review.
The guard only reads navigation.isFocused(), so a focus flag proves it
without reaching into @react-navigation/routers through createRequire.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Android Pixel 9, API 36, portrait 1080×2424, light theme; isolated fresh databases and synthetic replay-agent threads on both commits.
Steps: open chat → Git controls → More → Branches & worktrees → enter an unused worktree branch → Create worktree → close the sheet during the successful 10-second post-checkout hook → wait for completion.
The focused-sheet control closes its originating sheet and leaves the chat open on both commits. Runtime state confirms the completed worktree remains attached to the initiating thread: base attachment summary, head attachment summary.
Reopening the branch sheet before completion remains unverified: its entry in the Git inspector is disabled while checkout runs on both commits.
Not shown:
A newly reopened branch sheet staying visible: the reported UI path disables Branches & worktrees during checkout on both commits, so that sheet could not be reopened before completion.
The separate Create & checkout and existing-branch checkout handlers were not manually exercised; the captured reproduction covers Create worktree.
iOS was not exercised; this proof uses the reported Android surface.
* fix(server): Antigravity usage skips agy index databases instead of reporting partial history (pingdotgg#39435)
* fix(web): a later thread error with the same text shows its banner again (pingdotgg#37419)
Co-authored-by: Claude Haiku 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
* fix(client-runtime): connection supervisor restarts its background listeners after a defect (pingdotgg#39431)
* fix(cursor): Max Mode tiers keep working after Cursor changes a model (pingdotgg#39453)
Co-authored-by: Cursor <cursoragent@cursor.com>
* feat(web): choose which projects the issues list shows (pingdotgg#38799)
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
* perf(server): refreshing a branch list frees the snapshot it replaces (pingdotgg#39440)
* feat(web): reference a side chat from its main thread with Add to chat and @ (pingdotgg#38323)
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
* fix(server): refuse Antigravity runtimes below 1.5 (pingdotgg#38970)
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
* fix(server): one compatibility lookup and one refusal for broken provider versions (pingdotgg#39427)
Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
* fix(server): OpenCode and Pi read their minimum version from the manifest (pingdotgg#39434)
Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
* feat(issues): a fork lists its upstream's issues and its own (pingdotgg#39159)
* fix(server): background subagents can delegate after their parent's turn ends (pingdotgg#38869)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
* fix(web): show status for grouped sidebar issues (pingdotgg#39351)
* feat(antigravity): Auto uses agy's own Auto review (pingdotgg#39378)
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
* fix(server): compacting a subagent thread no longer adds a task to its parent (pingdotgg#39455)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
* fix(antigravity): accept UTF-16 text attachments with a BOM (pingdotgg#39456)
Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
* fix(server): signed URLs stay out of HTTP request logs (pingdotgg#39464)
* fix(server): Antigravity drops a stale sign-in failure once a session signs in (pingdotgg#39443)
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
* fix(server): keep escaped spaces in Codex launch overrides (pingdotgg#39458)
Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
* feat(server): links between environments renew while they are used (pingdotgg#39399)
Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
* fix(opencode): label xhigh reasoning Extra High (pingdotgg#39451)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
* fix(web): keep revealed folder in view while restored folders load (pingdotgg#39470)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
* feat: link several environments at once (pingdotgg#39426)
* fix(server): Linux keep-awake no longer blocks screen lock and display-off (pingdotgg#39490)
* fix(evals): GPT run summaries capitalise the cost sentence (pingdotgg#39380)
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
* docs(codex): explain Chrome extension connection errors (pingdotgg#38429)
Co-authored-by: maria-rcks <maria@kuuro.net>
* fix(shared): count each pending subagent thread once (pingdotgg#39501)
* fix(github): keep the enterprise token off hosts other than GH_HOST (pingdotgg#39480)
* fix(web): keep long-named VS Code themes separate on import (pingdotgg#39493)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
* fix(antigravity): MCP calls through call_mcp_tool show the tool, not "Ran command" (pingdotgg#39474)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
* fix(relay): refuse to relink an active environment under a different key (pingdotgg#39482)
* fix(server): secret names can no longer leave the secrets directory (pingdotgg#39483)
* fix(server): a linked workspace file is served only if its target is previewable (pingdotgg#39491)
* fix(server): revoking all other clients also revokes unspent pairing codes (pingdotgg#39495)
* fix(web): the preview only embeds PDFs from its own environment (pingdotgg#39497)
* fix(relay): parse Hermes stack frames in linear time (pingdotgg#39498)
* perf(server): rank queued provider snapshots by focus and combine superseded ones (pingdotgg#39502)
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix(gitlab): keep the environment token off hosts a caller names (pingdotgg#39522)
* fix(server): stop managed Antigravity CLI from self-updating in place and recover on reinstall (pingdotgg#39363)
* fix(server): a killed Antigravity subagent no longer keeps its turn running (pingdotgg#39519)
* fix(server): Claude history import skips sessions answered only by a synthetic error (pingdotgg#39527)
* fix(server): deliver child results to running Claude turns (pingdotgg#39528)
* fix(server): Antigravity threads follow the user's global AGENTS.md and GEMINI.md (pingdotgg#39531)
* fix(server): launches whose caller goes away still start (pingdotgg#36499)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
* fix(server): each Antigravity Google sign-in stays in its own instance (pingdotgg#39485)
* fix(web): Retry on the Pull Requests list only refetches the environments that failed (pingdotgg#39536)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
* fix(web): scope checkout errors to the selected pull request (pingdotgg#39554)
* fix(web): ignore superseded microphone refreshes in voice setup (pingdotgg#39552)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
* fix(web): fold accents in thread link picker search (pingdotgg#39557)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
* fix(server): imported thread titles no longer end in a broken emoji (pingdotgg#39548)
Co-authored-by: MarcoDotIO <20867620+MarcoDotIO@users.noreply.github.com>
* chore(release): prepare v0.1.11
* fix(mobile): keep chat open when branch actions finish after dismissal (pingdotgg#39562)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
* fix(composer): keep screenshots preparing after an unanswered question closes (pingdotgg#39569)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
* fix(web): keep reopened pairing link dialogs open on completion (pingdotgg#39579)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
* fix(server): Codex web searches list the query once (pingdotgg#39585)
Co-authored-by: MarcoDotIO <20867620+MarcoDotIO@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
* test(server): use the live clock for theme watch notifications (pingdotgg#39598)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
* fix(cursor): stop repeating runtime instructions on every turn (pingdotgg#39605)
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
* fix(web): file find scrolls to matches below wrapped lines (pingdotgg#39616)
---------
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: Claude Haiku 5.5 <noreply@anthropic.com>
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Bilal Bakr <62337003+Bil0000@users.noreply.github.com>
Co-authored-by: miley <mkantenko@gmail.com>
Co-authored-by: Noah Sigel <30538387+nsigel@users.noreply.github.com>
Co-authored-by: Simone <lucenz@proton.me>
Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
Co-authored-by: Daniel <rootdevdb@gmail.com>
Co-authored-by: Jex <jieyuexing@outlook.com>
Co-authored-by: Lenori <richter.leander@icloud.com>
Co-authored-by: DukMaxxi <Samuel.Wamwiri@gmail.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Soroush Baraouf <soroushraouf44@gmail.com>
Co-authored-by: Hayden <121905330+hh36000@users.noreply.github.com>
Co-authored-by: Theo Browne <me@t3.gg>
Co-authored-by: Shlok Sheth <92412925+shethshlok@users.noreply.github.com>
Co-authored-by: Manuel Huez <manuel.huez@gmail.com>
Co-authored-by: tiliakoos <73005126+tiliakoos@users.noreply.github.com>
Co-authored-by: Wout Stiens <71498452+StiensWout@users.noreply.github.com>
Co-authored-by: MarcoDotIO <20867620+MarcoDotIO@users.noreply.github.com>
Co-authored-by: t3-code-bot[bot] <269035359+t3-code-bot[bot]@users.noreply.github.com>
github-actionsBot
added a commit
to omarcresp/t3code-flake
that referenced
this pull request
Nov 20, 2026
pingdotgg#39562)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
(cherry picked from commit 16d4094)
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
size:XS0-9 changed lines (additions + deletions).vouch:trustedAuthor is trusted by repo permissions or the VOUCHED list.
2 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.
A branch or worktree operation could navigate back after its sheet had already closed, returning the user to the thread list or closing a newly opened sheet. The Android and iOS sheet now closes on success only while the initiating route still has focus, and worktree attachment continues after dismissal.
Fixes #39561
Related: #38993
Reproduction on main
Commit 59651c1761 (main). The chat closes when the worktree finishes, returning you to the thread list. The cause is at
apps/mobile/src/features/threads/git/GitBranchesSheet.tsx:128. Followed the steps under Evidence in the app on Pixel_9_API_37 (Android 17.0): I closed the branch sheet while the checkout was still running. When the checkout finished, the app closed the Delayed checkout chat and returned to the Chats list.Evidence
Environment: Pixel_9_API_37, Android 17.0, Android Emulator on Linux x64
Steps:
Proven: the bug shows on main at 59651c1761 and no longer shows on head 5b6426c734.
Tests
pnpm exec vp test run apps/mobile/src/features/threads/git/GitBranchesSheet.test.tsxpassed on 3879bed822.pnpm exec vp run check:changedpassed on 3879bed822.Not in this change
Who did the work
Made in T3 Code by GPT 6.2 Sol and Claude Opus 5.5