feat: allow disabling auto-settle on merge by t3dotgg · Pull Request #5880 · pingdotgg/t3code

t3dotgg · 2026-08-09T21:15:57Z

Threads settle as soon as their pull request merges, with no way to keep follow-up work active.

This adds an Auto-settle merged threads setting for web, desktop, and mobile. It stays enabled by default. Turning it off keeps merged threads active unless the inactivity rule settles them later. Closed pull requests still settle automatically.

Tests:

264 focused tests
scoped type checks for contracts, client runtime, web, mobile, and desktop
targeted lint and formatting checks

Made with GPT-5.6-sol in the Codex harness.

Note

Medium Risk
Changes shared thread-settlement classification used across web, mobile, and desktop UIs; default behavior is unchanged, but a wrong wiring could mis-partition threads or disagree between sidebar and chat.

Overview
Adds an Auto-settle merged threads preference (default on) so users can keep merged pull-request threads in the active inbox for follow-up work. Closed PRs still auto-settle regardless of the toggle.

Shared settlement logic gains changeRequestAutoSettles and an optional autoSettleOnMerge flag on effectiveSettled. Web/desktop expose sidebarAutoSettleOnMerge in client settings (General settings switch, search, restore defaults); mobile stores autoSettleOnMerge in device preferences with a matching General settings switch.

Sidebar partitioning, chat settled state, thread context menus, and mobile v2 thread lists pass the preference through so list placement, settle actions, and the “Woke” pill stay consistent with the configured merge rule.

^{Reviewed by Cursor Bugbot for commit 65c2e53. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Add user-configurable auto-settle on merge setting for threads

Adds a new autoSettleOnMerge / sidebarAutoSettleOnMerge boolean setting (default true) to both web and mobile, controlling whether merged PRs automatically settle threads.
Introduces changeRequestAutoSettles in threadSettled.ts as a single source of truth; closed PRs always auto-settle regardless of the setting.
Exposes a toggle in General settings on web (SettingsPanels.tsx) and mobile (SettingsRouteScreen.tsx), including settings search support on web.
Behavioral Change: users with the setting disabled will see merged-PR threads remain active in the sidebar and thread list instead of being auto-settled.

^{Macroscope summarized 65c2e53.}

coderabbitai · 2026-08-09T21:16:06Z

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: db762cc9-1fba-416d-8320-244b4f543fdc

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

🔍 Trigger review

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands.}

cursor

Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit e3f303b. Configure here.}

github-actions · 2026-08-09T21:19:57Z

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

Provider	Metric	Main baseline	This PR	Impact	PR ceiling
Codex	Total thread wire	11.3 KiB	11.3 KiB	−3 B (−0.0%)	15.1 KiB	✅
Codex	Thread snapshot wire	5.5 KiB	5.5 KiB	−2 B (−0.0%)	7.3 KiB	✅
Codex	Live turn WebSocket wire	5.9 KiB	5.9 KiB	−1 B (−0.0%)	7.8 KiB	✅
Codex	Live turn WebSocket decoded	49.7 KiB	49.7 KiB	0 B (0.0%)	66.4 KiB	✅
Codex	Live turn messages	16	16	0 (0.0%)	21	✅
Claude	Total thread wire	11.3 KiB	11.3 KiB	−17 B (−0.1%)	15.1 KiB	✅
Claude	Thread snapshot wire	5.5 KiB	5.5 KiB	−6 B (−0.1%)	7.3 KiB	✅
Claude	Live turn WebSocket wire	5.9 KiB	5.8 KiB	−11 B (−0.2%)	7.8 KiB	✅
Claude	Live turn WebSocket decoded	50.6 KiB	50.6 KiB	0 B (0.0%)	66.4 KiB	✅
Claude	Live turn messages	16	16	0 (0.0%)	21	✅

Baseline: bd18d8d · PR result: 65c2e53 · Source CI: success

Scenario and decoded snapshot size

10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.

Codex decoded thread snapshot: 94.6 KiB
Claude decoded thread snapshot: 95.4 KiB

Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed.

macroscopeapp · 2026-08-09T21:21:09Z

Approvability

Verdict: Needs human review

This PR introduces a new user-facing feature (auto-settle on merge toggle) that changes runtime thread-settling behavior across web and mobile. New features that introduce user-facing capabilities warrant human review even when well-implemented.

^{You can customize Macroscope's approvability policy. Learn more.}

@t3-code

## What's Changed * fix(web): restore default stage artwork colors by @t3-code[bot] in pingdotgg/t3code#6535 * fix(web): align sidebar wordmark label by @WarheadTaylor in pingdotgg/t3code#6086 * fix(web): align the snoozed thread wake icon by @RakshithBhat03 in pingdotgg/t3code#6215 * feat: allow disabling auto-settle on merge by @t3dotgg in pingdotgg/t3code#5880 * Nest mobile task settings in bottom sheets by @juliusmarminge in pingdotgg/t3code#6224 ## New Contributors * @WarheadTaylor made their first contribution in pingdotgg/t3code#6086 * @RakshithBhat03 made their first contribution in pingdotgg/t3code#6215 **Full Changelog**: pingdotgg/t3code@v0.0.34-nightly.20260813.1088...v0.0.34-nightly.20260814.1089 Upstream release: https://github.com/pingdotgg/t3code/releases/tag/v0.0.34-nightly.20260814.1089

- ChatView: #5880 auto-settle-on-merge setting flows into effectiveSettled, #5644 browser favicon project registration effect, activeProjectRef memo, desktopByTabId on both RightPanelTabs mounts - server: provide ServerSecretStore to the McpSessionRegistry's ServerEnvironment layer (#6325 reads publish opt-in per descriptor) - mobile: 3-way merged main's deltas into the v2 thread screens (NewTaskDraftScreen keeps the branch title seed + main's environmentId, threadListV2 keeps both new test suites, queries imports deduped) Co-Authored-By: Claude Fable 5 <[email protected]>

* feat: pick worktree or current checkout per project (pingdotgg#5766) Co-authored-by: Claude Fable 5 <[email protected]> * fix(web): sidebar rows show the branch again, not a truncated plan step (pingdotgg#5776) Co-authored-by: Claude Opus 5 (1M context) <[email protected]> * feat(server): vp run migrate-dev-db seeds worktree dev dbs with real data (pingdotgg#5773) Co-authored-by: Claude Fable 5 <[email protected]> * feat(web): keep unsent drafts one click away in the sidebar (pingdotgg#5777) Co-authored-by: Claude Fable 5 <[email protected]> * feat(web): project icons can be chosen manually (pingdotgg#5775) * fix(server): one greedy agent process no longer takes down the whole server (pingdotgg#5788) Co-authored-by: Claude Opus 5 (1M context) <[email protected]> * ci: label-gated hosted-web preview deploys (pingdotgg#5465) Co-authored-by: Claude Fable 5 <[email protected]> * Add cross-platform mobile usage dashboard (pingdotgg#5743) * fix(web): preserve desktop route during Clerk auth (pingdotgg#5770) * fix(web): match create theme and import theme buttons to the standard outline style (pingdotgg#5860) * fix(server): favicon resolution no longer pins the event loop (pingdotgg#5538) * fix(shared): bound the file-link label so bracket runs stop rescanning (pingdotgg#5782) Co-authored-by: tsouth89 <[email protected]> Co-authored-by: Claude Opus 5 (1M context) <[email protected]> * fix(web): thread title button no longer eats the drag area (pingdotgg#5857) * fix(web): unify usage page chrome (pingdotgg#5823) * fix(shell): add ~/.local/bin to the Windows CLI resolver so native-installed providers are found (pingdotgg#5074) Co-authored-by: Claude Opus 4.8 (1M context) <[email protected]> * fix(web): match settings search shortcut styling to command palette's (pingdotgg#5841) * fix(mobile): long-pressing a thread row no longer navigates into the thread (pingdotgg#5901) Co-authored-by: Claude Fable 5 <[email protected]> * fix(server): usage no longer double-counts forked Codex sessions (pingdotgg#5887) Co-authored-by: Claude Fable 5 <[email protected]> * fix(server): sandbox user-provided SVGs (pingdotgg#5916) * fix(web): match usage titlebar text styling (pingdotgg#5897) Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com> * Move project settings to contextual project routes (pingdotgg#5923) * Preserve back navigation when opening settings (pingdotgg#5930) Co-authored-by: codex <[email protected]> * Automate production mobile EAS releases (pingdotgg#5609) * Add settings and usage breadcrumbs (pingdotgg#5929) * fix(web): correct model picker trigger padding (pingdotgg#5935) * fix(web): show worktree icon in sidebar v2 (pingdotgg#5909) * fix(web): enable restore defaults after theme mix changes (pingdotgg#5928) Co-authored-by: Simone <[email protected]> * fix(web): trait menu closes after you pick a level (pingdotgg#5879) Co-authored-by: Claude Opus 5 (1M context) <[email protected]> * fix(web): align project name with headline (pingdotgg#5864) * fix(web): update pills use readable theme foregrounds (pingdotgg#5938) * fix(web): use themed confirmation dialogs (pingdotgg#5624) * fix(web): use import/export-appropriate icons for theme buttons (pingdotgg#5964) * fix(mobile): detect PowerShell cmdlet errors in work log rows (pingdotgg#5726) * fix(mobile): stop Android user bubbles with code blocks from overlapping (pingdotgg#5659) Co-authored-by: Rodrigo Brechard <[email protected]> Co-authored-by: Claude Opus 5 (1M context) <[email protected]> * fix(mobile): parse EAS fingerprint JSON (pingdotgg#5991) Co-authored-by: codex <[email protected]> * chore(release): prepare v0.0.33 * feat: multi-provider pull requests page with in-app reviews (pingdotgg#4849) Co-authored-by: Julius Marminge <[email protected]> Co-authored-by: Claude Fable 5 <[email protected]> Co-authored-by: maria <[email protected]> Co-authored-by: maria-rcks <[email protected]> Co-authored-by: codex <[email protected]> * perf(desktop): probe the Windows shell environment concurrently (pingdotgg#5878) Co-authored-by: tsouth89 <[email protected]> * feat(web): add duplicate action to the T3 Code default theme (pingdotgg#6013) * fix(web): improve built-in theme contrast (pingdotgg#6000) * fix(ci): extend release publish timeout (pingdotgg#6034) * Allow Android tablets to rotate (pingdotgg#5613) * fix(web): account for Windows window controls in PR page header (pingdotgg#6049) * feat: add three-hour snooze option (pingdotgg#5914) * fix(mobile): keep chat composer above the Android gesture bar (pingdotgg#5988) Co-authored-by: Claude Fable 5 <[email protected]> * fix(server): OpenCode model parsing drops models with a slash in the JSON body (pingdotgg#5072) Co-authored-by: Claude Opus 4.8 (1M context) <[email protected]> * fix(web): persist sidebar shelf collapse state (pingdotgg#5136) Co-authored-by: Illia Panasenko <[email protected]> * perf(web): skip base64 for oversized image candidates (pingdotgg#5220) * fix(server): skip Linux libc detection on Windows/macOS (pingdotgg#5354) * fix(server): advertise 256-color TERM on Windows terminals (pingdotgg#5693) * fix(server): handle unborn HEAD in VCS status (pingdotgg#5944) Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com> * fix(pull-requests): route self-hosted GitLab remotes (pingdotgg#6061) * feat: add ability to create a new thread in the current project with shift+click and show shortcut in tooltip (pingdotgg#5994) Co-authored-by: shivam <[email protected]> * feat(web): add Copy Thread ID to the sidebar and chat header thread context menu (pingdotgg#5574) Co-authored-by: shivam <[email protected]> * fix(mobile): stabilize thread composer and interactions (pingdotgg#5986) Co-authored-by: codex <[email protected]> Co-authored-by: Thuong Tin <[email protected]> Co-authored-by: Kapish14 <[email protected]> Co-authored-by: Claude Fable 5 <[email protected]> * Add hourly past-24-hour usage view (pingdotgg#6170) * fix(mobile): guard App Store release versions (pingdotgg#6177) Co-authored-by: codex <[email protected]> * fix(web): restore typography font sizes to defaults (pingdotgg#6172) * feat(web): make environment artwork theme aware (pingdotgg#6183) Co-authored-by: codex <[email protected]> * fix(shared): normalize a bare Windows drive root the same as C:\ / C:/ (pingdotgg#6189) Co-authored-by: Claude Opus 4.8 (1M context) <[email protected]> * fix(shared): detect Azure DevOps SSH remotes (ssh.dev.azure.com) (pingdotgg#6187) Co-authored-by: Claude Opus 4.8 (1M context) <[email protected]> * feat(web): add back buttons for the pull requests and usage pages in the sidebar footer (pingdotgg#6031) Co-authored-by: shivam <[email protected]> * fix(web): render dropdowns above toasts (pingdotgg#6165) Co-authored-by: Rodrigo Brechard <[email protected]> Co-authored-by: Claude Opus 5 (1M context) <[email protected]> * fix(web): thread error banner dismiss survives reconnect and rerenders (pingdotgg#6123) * fix(web): use a clearer pull action icon (pingdotgg#6194) * feat(web): use OKLCH for theme palettes (pingdotgg#6036) * fix(web): use upload icon for disabled push action (pingdotgg#6207) * feat(web): add Open VSX theme search (pingdotgg#5654) Co-authored-by: Julius Marminge <[email protected]> Co-authored-by: codex <[email protected]> * fix(web): clean up composer resize animation (pingdotgg#6209) * feat(web): compact sidebar footer actions (pingdotgg#6210) * fix(web): keep sidebar wordmark visible at minimum width (pingdotgg#6246) * feat(mobile): add thread title regeneration (pingdotgg#6253) * chore: add dara to vouched (pingdotgg#6259) * fix(web): align the composer model picker (pingdotgg#6252) Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com> Co-authored-by: maria <[email protected]> * fix(mobile): keep ordered lists inside user bubbles (pingdotgg#6154) Co-authored-by: shivam <[email protected]> * feat(web): a better right panel empty state (pingdotgg#6258) * fix(web): align mobile onboarding header (pingdotgg#6293) Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com> Co-authored-by: Utkarsh Patil <[email protected]> * fix(connect): preserve CLI OAuth parameters through browser sign-in (pingdotgg#6285) * fix(web): prevent changed files header overlap (pingdotgg#6314) Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com> Co-authored-by: Wout Stiens <[email protected]> * fix(web): theme Clerk surfaces (pingdotgg#6300) * feat(web): reset sidebar width on double click (pingdotgg#6320) * fix(web): align update toast release notes link (pingdotgg#6322) Co-authored-by: t3-code[bot] <219304759+t3-code[bot]@users.noreply.github.com> Co-authored-by: Utkarsh Patil <[email protected]> Co-authored-by: Exotic <[email protected]> * fix(web): render tooltips above dropdowns (pingdotgg#6241) * fix(web): open modified PR clicks in browser (pingdotgg#6278) Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com> Co-authored-by: maria <[email protected]> * Fix mobile command popover glass rendering (pingdotgg#6370) * test(mobile): seed snoozed showcase threads (pingdotgg#5155) * fix(web): preserve appearance mode when changing themes (pingdotgg#6343) * feat(connect): deregister account environments from any client (pingdotgg#4844) Co-authored-by: Julius Marminge <[email protected]> Co-authored-by: codex <[email protected]> * feat(web): pull request surfaces — filters & qualifiers, all-server listing, update branch, reactions, in-place editing, smarter diffs (pingdotgg#6039) Co-authored-by: Julius Marminge <[email protected]> * fix(web): cmd+click sidebar PR numbers open in the browser (pingdotgg#6378) * feat(web): project favicon and workspace icons in command subtitles (pingdotgg#6330) Co-authored-by: Cursor <[email protected]> * web/settings: fix source control scan on relay environments (pingdotgg#6230) * fix(web): make reset zoom hover visible (pingdotgg#6385) Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com> Co-authored-by: Utkarsh Patil <[email protected]> * fix(web): keep the typed prompt when a draft changes repo (pingdotgg#6393) Co-authored-by: Claude Fable 5 <[email protected]> * fix(web): keep diff file lists scrollable past expanded files (pingdotgg#6423) Co-authored-by: Claude Fable 5 <[email protected]> * fix(server): align Codex collaboration prompts (pingdotgg#6432) * fix(web): keep turn minimap stable as composer grows (pingdotgg#6414) * fix(web): keep pull request panel within viewport (pingdotgg#6451) * Add bil0000 to VOUCHED contributors list (pingdotgg#6462) * fix: ignore pull request actions in latency tracker (pingdotgg#6476) Co-authored-by: Julius Marminge <[email protected]> * Remove rebase requirement before opening PR (pingdotgg#6479) * fix(mobile): extend blockquotes across wrapped lines (pingdotgg#6482) * fix(mobile): prevent invalid HTML entities from crashing markdown (pingdotgg#6495) Co-authored-by: Simone <[email protected]> * fix(web): avoid Clerk close button overlap (pingdotgg#6442) Co-authored-by: t3-code[bot] <236186684+t3-code[bot]@users.noreply.github.com> Co-authored-by: Wout Stiens <[email protected]> * fix(web): show unlinked icon when viewport aspect ratio is unlocked (pingdotgg#6509) * fix(web): scope pull request errors to their environment (pingdotgg#6490) Co-authored-by: Julius Marminge <[email protected]> * fix(mobile): show a real settings cog in the Android sidebar header (pingdotgg#6520) Co-authored-by: Claude Opus 5 <[email protected]> * fix(web): restore default stage artwork colors (pingdotgg#6535) Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com> Co-authored-by: maria <[email protected]> * fix(web): align sidebar wordmark label (pingdotgg#6086) * fix(web): align the snoozed thread wake icon (pingdotgg#6215) * feat: allow disabling auto-settle on merge (pingdotgg#5880) * Nest mobile task settings in bottom sheets (pingdotgg#6224) Co-authored-by: codex <[email protected]> Co-authored-by: Claude Fable 5 <[email protected]> * chore(mobile): bump app version to 1.0.4 Co-authored-by: codex <[email protected]> * fix(web): simplify the desktop-managed server update banner copy (pingdotgg#6549) Co-authored-by: Claude Fable 5 <[email protected]> * fix(web): show background policy tooltips sooner (pingdotgg#6506) * feat(desktop): add favicons to the Browser panel (pingdotgg#5644) * fix(preview): only show browser-ready local servers (pingdotgg#6021) * perf(build): stop unpacking node_modules wholesale from the Windows asar (pingdotgg#5877) Co-authored-by: tsouth89 <[email protected]> Co-authored-by: t3-code[bot] <t3-code[bot]@users.noreply.github.com> Co-authored-by: Utkarsh Patil <[email protected]> Co-authored-by: Shivam Sharma <[email protected]> * fix: avoid stale Live Activities when publishing is disabled (pingdotgg#6325) Co-authored-by: Claude Fable 5 <[email protected]> * fix(mobile): add breathing room between the git progress overlay and the app bar (pingdotgg#6587) Co-authored-by: Claude Fable 5 <[email protected]> * fix(web): keep thread rename open during IME composition (pingdotgg#6281) * refactor(mobile): name the iOS nav bar height fallback (pingdotgg#6589) Co-authored-by: Claude Fable 5 <[email protected]> Co-authored-by: Julius Marminge <[email protected]> * fix(mobile): preserve keyboard suggestions while typing (pingdotgg#6323) Co-authored-by: Claude Fable 5 <[email protected]> * fix(mobile): prevent OTA update restart crashes (pingdotgg#6324) Co-authored-by: Claude Fable 5 <[email protected]> * fix(web): align every titlebar control cluster on one shared inset (pingdotgg#6592) Co-authored-by: Claude Fable 5 <[email protected]> * fix(mobile): steer active turns by default (pingdotgg#6543) * fix(web): clarify desktop update status (pingdotgg#6504) * fix(server): terminal subprocess polling no longer floods the PID space (pingdotgg#6377) * fix(web): add copying terminal selection with ctrl+c in the web app (pingdotgg#5638) * perf(desktop): speed up Windows update installation (pingdotgg#6169) * fix(web): style sidebar action tooltips (pingdotgg#6371) Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com> Co-authored-by: Utkarsh Patil <[email protected]> * refactor(web): simplify global styling (pingdotgg#6381) Co-authored-by: Julius Marminge <[email protected]> Co-authored-by: Julius Marminge <[email protected]> * fix(server): handle files named HEAD in git status (pingdotgg#6397) Co-authored-by: Simone <[email protected]> * feat(packaging): maintain AUR packages in-repo (pingdotgg#4128) * fix(web): bound OKLCH gamut mapping (pingdotgg#6485) Co-authored-by: Simone <[email protected]> * feat(web): open remote environments in your local editor over SSH (pingdotgg#6572) Co-authored-by: Claude Fable 5 <[email protected]> * feat(web): refresh workspace layouts and tool activity * revert: refresh workspace layouts and tool activity (pingdotgg#6657) * Sync upstream with public-safe fixtures Squash the reviewed upstream sync into a public-safe history while preserving its final tree. * feat(web): older chat timestamps show the date, not just the time (pingdotgg#6654) Co-authored-by: Claude Fable 5 <[email protected]> * fix(web): align pull request action menu rows (pingdotgg#6534) Co-authored-by: Nickolas Kyryliuk <[email protected]> Co-authored-by: Claude Opus 5 (1M context) <[email protected]> * fix(web): restore selected themes in dark mode (pingdotgg#6665) * fix(web): improve Codex usage graph contrast (pingdotgg#6669) * docs: route feature requests to Discussions - Disable feature-request issue templates - Direct contributors to Ideas discussions for proposals * fix(desktop): app zoom no longer zooms the preview browser (pingdotgg#6649) Co-authored-by: Claude Opus 5 (1M context) <[email protected]> * fix(server): keep provider notification consumers alive past startSession (pingdotgg#6538) Co-authored-by: tsouth89 <[email protected]> * fix(server): treat removed Bitbucket permissions endpoint as unknown, not blocking (pingdotgg#6525) * fix(ssh): let cold remote servers finish starting (pingdotgg#6168) * fix(web): preserve Claude insight line breaks (pingdotgg#4344) * feat(web): accept file drops across the chat workspace (pingdotgg#6636) * fix(web): widen ordered-list marker gutter for 3+ digit item numbers (pingdotgg#6527) * fix(server): bound thread activity hydration (pingdotgg#6153) Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com> * fix(web): restore the Archive action in the default sidebar thread menu (pingdotgg#6526) * fix(web): open diff files from nested projects (pingdotgg#6174) * fix(mobile): use tryOpenExternalUrl for markdown links in ThreadFeed (pingdotgg#5872) Co-authored-by: codex <[email protected]> Co-authored-by: Julius Marminge <[email protected]> * fix(web): open the file a bare filename reference names (pingdotgg#6297) Co-authored-by: Rodrigo Brechard <[email protected]> Co-authored-by: Claude Opus 5 (1M context) <[email protected]> * fix(server): stop the provider title mirror from overwriting real thread titles (pingdotgg#5941) * fix(shared): match source-control providers by DNS label (pingdotgg#6175) * feat(desktop): Chrome-style hold-to-quit (pingdotgg#5508) * fix(gitlab): submit review comments on context lines (pingdotgg#6348) * fix(marketing): keep Grok mark clear of mobile hero copy (pingdotgg#4542) * fix(mobile): recover the QR pairing scanner when camera access is denied (pingdotgg#6487) * fix(web): keep a long path from running under the folder picker button (pingdotgg#4823) Co-authored-by: Sy-D <[email protected]> Co-authored-by: Claude Opus 5 <[email protected]> Co-authored-by: Julius Marminge <[email protected]> Co-authored-by: codex <[email protected]> * fix(terminal): right-click paste works in the terminal (pingdotgg#5240) * fix(mobile): explain iOS-only settings on Android (pingdotgg#4981) * fix(web): stop counting a workflow coordinator as a working agent (pingdotgg#6672) * fix(web): keep floating preview anchored after panel closes (pingdotgg#6547) * fix(web): unstick /connect after in-modal sign-in by redirecting to the authorize endpoint (pingdotgg#5133) * fix(web): keep send reachable while a turn is running on mobile (pingdotgg#4781) Co-authored-by: AMohamedAakhil <[email protected]> Co-authored-by: Claude Opus 5 (1M context) <[email protected]> Co-authored-by: Julius Marminge <[email protected]> Co-authored-by: codex <[email protected]> * fix(web): reject unsupported composer image types at attach time (pingdotgg#6574) * Make ClaudeTextGeneration tests hermetic on Windows (pingdotgg#4508) Co-authored-by: Julius Marminge <[email protected]> Co-authored-by: codex <[email protected]> * fix(web): show command output in work log (pingdotgg#4083) Co-authored-by: Julius Marminge <[email protected]> Co-authored-by: codex <[email protected]> * fix(web): reserve sibling column width when resizing the right panel (pingdotgg#6279) * fix(web): replace whitespace in new ref names with dashes (pingdotgg#6270) * fix(client-runtime): branch list no longer resets while paging through refs (pingdotgg#5858) * fix(web): support Shift+Insert terminal paste (pingdotgg#5982) * fix(web): keep the composer glass aligned with the context strip at any interface font size (pingdotgg#5703) Co-authored-by: Claude Fable 5 <[email protected]> * fix(codex): keep background memory out of chats (pingdotgg#5468) * fix(server): treat a missing Codex rollout as a recoverable resume error (pingdotgg#6671) * fix(web): hide provider Update toast action while an update is running (pingdotgg#6544) Co-authored-by: Cursor <[email protected]> * fix(desktop): agent shells inherit a UTF-8 locale on macOS (pingdotgg#6236) * fix(server): ignore Claude command lifecycle messages (pingdotgg#6606) * docs: mention Bitbucket user read scope needed by auth probe (pingdotgg#6291) Co-authored-by: Gerwin Bisschop <[email protected]> Co-authored-by: Claude Fable 5 <[email protected]> * fix(server): return valid preview action results (pingdotgg#5966) Co-authored-by: duncan-vc <[email protected]> * fix(claude): make "Always allow for session" stick, and only for the session (pingdotgg#5041) Co-authored-by: Claude Fable 5 <[email protected]> * fix(ssh): surface a failed remote t3 install instead of a silent 0-byte server.log (pingdotgg#5132) * perf(server): persist the wire projection for streaming tool.updated data (pingdotgg#6675) Co-authored-by: mInrOz <[email protected]> Co-authored-by: Claude Fable 5 <[email protected]> * fix(web): stop wrapping partial code block selections in markdown fences (pingdotgg#5069) * fix(web): hide T3 Connect toggle in web app settings (pingdotgg#5068) * fix(web): show provider account accent badge in sidebar rows and hover card (pingdotgg#5980) Co-authored-by: Claude Fable 5 <[email protected]> * fix(server): wait for concurrent SQLite writers instead of failing with SQLITE_BUSY (pingdotgg#5134) * fix(web): reject oversized prompts before provider turn start (pingdotgg#6602) * feat(web): collapse the question prompt from its header (pingdotgg#6773) Co-authored-by: Claude Opus 5 <[email protected]> * fix(shared): degrade an unknown system time zone to UTC in usage windows (pingdotgg#6670) * fix(claude): discover repo-local .agents/skills in skill discovery (pingdotgg#5488) * fix(server): let slow provider CLIs raise their discovery probe budget (pingdotgg#6223) Co-authored-by: Julius Marminge <[email protected]> * fix(web): retain terminal PR badges after checkout switch (pingdotgg#4755) Co-authored-by: Julius Marminge <[email protected]> Co-authored-by: codex <[email protected]> * fix(web): show selected model in context window tooltip (pingdotgg#4772) Co-authored-by: Julius Marminge <[email protected]> Co-authored-by: codex <[email protected]> * fix(web): scale command details with code font (pingdotgg#6510) * fix(web): preserve XML-like tags in user messages (pingdotgg#4133) Co-authored-by: codex <[email protected]> Co-authored-by: Julius Marminge <[email protected]> * fix(desktop): route mouse thumb buttons to the in-app browser (pingdotgg#4459) Co-authored-by: Claude Opus 4.8 <[email protected]> * fix(web): keep the final segment of directory paths with a trailing separator (pingdotgg#5460) Co-authored-by: jorvarea <[email protected]> * Keep block code plain when copying from rendered markdown (pingdotgg#4468) * fix(web): add web app manifest so installed app keeps its scope (pingdotgg#4306) * Skip user hooks during Claude capability probes (pingdotgg#4466) * fix(mobile): use Android monospace font family (pingdotgg#4609) * fix(desktop): timestamps follow the OS locale instead of en-US (pingdotgg#6190) * fix(web): keep multi-select questions open after the first click (pingdotgg#6646) * fix(web): stop clipping the changed-files expand hover on Windows (pingdotgg#6545) Co-authored-by: Cursor <[email protected]> * fix(server): allow long-running git pushes (pingdotgg#6499) * fix(desktop): keep probing backend readiness while the process is alive (pingdotgg#5526) * fix(server): allow install scripts in npm-global provider updates (pingdotgg#5646) * fix: detect SSH remotes with non-git user prefixes (e.g. gitlab@) (pingdotgg#3649) * fix(web): describe what Ultracode does in the Reasoning picker (pingdotgg#6092) * fix(server): settle pending user-input requests when a Claude session stops (pingdotgg#5127) Co-authored-by: Capxul Agent <[email protected]> Co-authored-by: Julius Marminge <[email protected]> Co-authored-by: codex <[email protected]> * fix(server): stop replaying a command receipt for a different aggregate (pingdotgg#5246) * fix(server): settle snoozed threads immediately (pingdotgg#5379) * fix(mobile): prevent crash on sign out in settings (pingdotgg#4899) * fix(mobile): local-checkout threads record their branch so PR badges show (pingdotgg#4986) Co-authored-by: Julius Marminge <[email protected]> Co-authored-by: codex <[email protected]> * fix(web): contain long approval commands (pingdotgg#6503) * feat(web): make right panel maximize bindable (pingdotgg#5091) * fix(server): respect inherited OPENCODE_CONFIG_CONTENT (pingdotgg#4242) Co-authored-by: Julius Marminge <[email protected]> Co-authored-by: codex <[email protected]> * fix(marketing): detect Mac chip on homepage download button (pingdotgg#4197) Co-authored-by: Claude Opus 4.8 <[email protected]> Co-authored-by: Julius Marminge <[email protected]> Co-authored-by: codex <[email protected]> * Keep the server alive when a response write hits a dead socket (pingdotgg#4470) * Limit physical key fallback to non-Latin layout output (pingdotgg#4469) * fix: restore CLAUDE.md symlink target (pingdotgg#3929) * fix(clients): default clone destination to folder plus repo name (pingdotgg#5989) Co-authored-by: Julius Marminge <[email protected]> Co-authored-by: codex <[email protected]> * fix(web): keep timestamp date and time in the same locale (pingdotgg#7081) Co-authored-by: codex <[email protected]> * feat(desktop): add signal macOS DMG installer background (pingdotgg#6201) Co-authored-by: Rodrigo Brechard <[email protected]> Co-authored-by: Julius Marminge <[email protected]> Co-authored-by: codex <[email protected]> * feat(web): send PR line requests to agent (pingdotgg#6597) * fix(web): restore dark theme palette (pingdotgg#6663) Co-authored-by: maria <[email protected]> * refactor(web): simplify advanced theme controls (pingdotgg#7107) * fix(web): keep highlighted command menu items clear of the scroll fade (pingdotgg#7132) Co-authored-by: Claude Fable 5 <[email protected]> * test: remove redundant and stale tests (pingdotgg#6267) * fix: repair typecheck errors left by the upstream/main merge Fixes surfaced by a full repo-wide typecheck after merging upstream/main and origin/main into sync-upstream-continue: - apps/web/src/components/SidebarV2.tsx: add missing isRunning field - apps/web/src/components/settings/BetaSettingsPanel.tsx: replace removed useSidebarV2Enabled hook with useClientSettings selector - apps/web/src/components/settings/SettingsFontPreviews.tsx: drop obsolete onCopy callback (GhosttyTerminalSurface now handles copy natively) - apps/mobile/src/lib/threadActivity.ts: remove duplicate MOBILE_TERMINAL_UPDATE_STATUSES/isTerminalBypassUpdate/isAgentInternalActivity block left by a silent (non-conflict-marked) merge duplication - apps/mobile/src/features/threads/ThreadComposer.tsx: remove duplicate handleEfficiencyMenuAction, same cause - apps/mobile/src/features/threads/ThreadDetailScreen.tsx: stop passing activeThreadBusy to ThreadComposer, which no longer accepts it - apps/mobile/src/features/home/HomeScreen.tsx: remove dead shouldShowConnectionStatus/WorkspaceConnectionStatus/connectionStatus references (connection state now surfaces via the header title slot) - apps/mobile/src/features/home/HomeRouteScreen.tsx: fix settings-sheet navigation params, drop the now-removed onOpenEnvironments prop - apps/mobile/src/features/settings/SettingsUsageRouteScreen.tsx: use the fork's UsageQuerySummary/UsageQueryTokenTotals types instead of upstream's UsageSummary/UsageTokenTotals, matching what the usage RPC actually returns - packages/contracts/src/ipc.ts: drop DesktopBridge.confirm, superseded by LocalApi.dialogs.confirm; every desktop-side implementation had already dropped it independently - apps/desktop/src/window/DesktopApplicationMenu.test.ts: drop the now-invalid confirm mock to match - apps/desktop/src/preview/Manager.ts: remove a duplicate FrameCaptureConsumer/FrameCaptureSession/PictureInPictureSession block - apps/server/src/environment/RemoteOpenTargets.ts: fix service tag to the fork's @awtprod/command-center/... convention - apps/server/src/persistence/Layers/ProjectionThreads.ts: restore the upsertProjectionThreadRow query, which a conflict resolution had mangled into an invalid mix of INSERT and SELECT clauses - apps/mobile/package.json, patches/@[email protected]: fix @legendapp/list version pin and repair a patch file left with unresolved nested conflict markers from a rename/rename conflict Full repo-wide `vp run -r typecheck` now passes clean across all 16 workspace packages. Co-Authored-By: Claude Sonnet 5 <[email protected]> * fix: repair pre-existing SQL and test bugs surfaced by running the full suite - apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts: three activity-listing queries selected correlated_message_id in their outer SELECT but never in the inner bounded subquery (two cases) or not at all (listPinnedThreadActivityRowsByThread), causing "no such column" SQL errors and schema decode failures. Pre-existing in HEAD before this merge, just never exercised until the full test suite ran clean of conflict markers. - packages/contracts/src/settings.test.ts: removed a test asserting that decoding drops the sidebarV2Enabled/sidebarV2ConfiguredByUser keys — contradicted the adjacent "ClientSettings sidebar v2" tests and the real schema, which keeps both fields alive alongside legacySidebarEnabled for BetaSettingsPanel.tsx. - packages/contracts/src/settings.ts: fixed the legacySidebarEnabled comment to describe the fields as coexisting, not superseding. - apps/web/src/browserFaviconStore.test.ts, browserHistoryStore.test.ts: switched their `~/state/session` mocks to importOriginal() + override, so the real environmentSession export (now used transitively via state/server.ts) stays available instead of being dropped entirely. Full repo-wide `vp run -r test` passes (aside from two known-flaky poll-based tests that pass in isolation but time out under full concurrent load, unrelated to this merge). Co-Authored-By: Claude Sonnet 5 <[email protected]> * fix(server): update stale npm-global test expectation for --allow-scripts Upstream added the --allow-scripts=<package> flag to npm-global provider update commands; this test's expectation was the only one in the file that hadn't been updated to match (the other three assertions in the same file already expect the flag). Co-Authored-By: Claude Sonnet 5 <[email protected]> * test(server): skip a deadlocking git-push timeout test pending investigation "allows pushes to run longer than the default command timeout" hangs until the test timeout regardless of how long that timeout is (confirmed at both 120s and 180s), merged verbatim from upstream commit 86fb47a and untouched by any conflict resolution in this sync. Needs its own look at how pushCurrentBranch's command-timeout override interacts with TestClock; skipping for now so it doesn't block the suite. Co-Authored-By: Claude Sonnet 5 <[email protected]> * fix: keep usage dashboard current (#25) Co-authored-by: atryan <[email protected]> * fix(web): keep usage totals current by default (#26) Co-authored-by: atryan <[email protected]> * feat(desktop): run local threads without leaving a remote primary (#27) * fix(web): switch new threads between connected computers * feat(desktop): keep Windows available with a remote primary * docs: explain local execution with a remote primary --------- Co-authored-by: atryan <[email protected]> * fix(web): open usage on the past 24 hours (#28) * fix(web): open usage on the past 24 hours * fix(server): resolve native Codex npm runtimes --------- Co-authored-by: atryan <[email protected]> * fix(desktop): stop remote-primary mode from launching a local backend (#30) Co-authored-by: atryan <[email protected]> * fix(web): keep visible usage dashboards current (#31) Co-authored-by: atryan <[email protected]> * Fix/codex isolation missing auth (#32) * fix(web): open usage on the past 24 hours * fix(server): resolve native Codex npm runtimes * fix(desktop): stop remote-primary mode from launching a local backend * fix(server): bypass identity wrapper for isolated Codex * fix(server): accept enforced Codex read denials * fix(server): stop isolation probe from scanning host processes * fix(server): fail closed when Codex isolation finds no credentials `prepareCommandCenterCodexHome` only copied `auth.json` into the isolated home when the source home had one, and never checked the result. A source home without credentials produced a working session that failed on its first model call with an opaque provider 401 naming neither the missing file nor the home Command Center actually read. Require credentials in the isolated home before returning the layout, and name the resolved source path in the error. Seed `auth.json` in the fixtures that relied on the previous fail-open behavior; they cover home layout and profile injection, not auth. Co-Authored-By: Claude Opus 5 (1M context) <[email protected]> * fix(server): surface Codex sandbox permission requests Codex 0.147 asks to widen its sandbox with `item/permissions/requestApproval`. No handler was registered, so the request fell through to `handleUnknownServerRequest` and was answered with a JSON-RPC "method not found". Codex reports that as `user rejected MCP tool call`, so the turn failed with an approval the user was never shown and could not answer. Register the handler and map the method through to a real approval prompt. The request carries an arbitrary path list (each read/write/deny) plus a network toggle, so the decision is classified on the requested permissions rather than on the tool that triggered them — a read-only tool can still ask for write. `autoApproveReadOnlyPermissions` (off by default) grants an escalation without prompting only when every entry is a read: any write, sandbox denial, legacy write list, or network enable still prompts. Auto-grants are scoped to the turn, never the session. The approval channel carries only accept/decline, so the granted profile is the requested one echoed back on accept and an empty profile on refusal, mirroring how ClaudeAdapter replays SDK permission suggestions. Requests are surfaced with the `file-change` kind: ingestion derives the kind from the canonical request type alone, and a kind that varied per request would disagree between the opened and resolved activities. A request with no kind renders no prompt in web or mobile while the server still opens a pending row, which parks the thread unanswerable. The persisted activity keeps only `detail`, so the requested paths are folded into it — otherwise the prompt cannot be reviewed. Co-Authored-By: Claude Opus 5 (1M context) <[email protected]> --------- Co-authored-by: atryan <[email protected]> Co-authored-by: Claude Opus 5 (1M context) <[email protected]> * style(web): wrap an over-long condition in useLiveRefresh (#34) `vp check` fails on sync-upstream because this line exceeds the print width, which blocks CI for every PR targeting the branch. Formatter-only change: the condition is re-wrapped, with no behaviour difference. Co-authored-by: atryan <[email protected]> Co-authored-by: Claude Opus 5 (1M context) <[email protected]> * fix(dev): stop a stray system `vp` from silently killing dev servers (#33) dev-runner spawns `vp` by bare name with `extendEnv: false`, so resolution depended entirely on the PATH it inherited. When node_modules/.bin was absent from that PATH, an unrelated /usr/bin/vp (atfs/ShapeTools) won the lookup and failed in the worst possible way: it printed `basename: unrecognized option '--filter=...'`, started no dev server, and exited 0. The launcher reported success while the stack was already gone. Pin the repo's node_modules/.bin ahead of the inherited PATH so `vp` always means this repo's toolchain, whatever environment we were launched from. Co-authored-by: atryan <[email protected]> Co-authored-by: Claude Opus 5 (1M context) <[email protected]> * fix(web): drop stale ComposerPrimaryActions.test.ts duplicate The upstream sync left both .ts and .tsx test files for the same component; they collide on case-insensitive filesystems (Windows/macOS CI) and release-smoke's path-collision check fails the build. The .tsx version is upstream's current file and is a strict superset of the stale fork-only .ts copy. --------- Co-authored-by: Theo Browne <[email protected]> Co-authored-by: Claude Fable 5 <[email protected]> Co-authored-by: Julius Marminge <[email protected]> Co-authored-by: Robert Soriano <[email protected]> Co-authored-by: Utkarsh Patil <[email protected]> Co-authored-by: Matt Urenovich <[email protected]> Co-authored-by: Tyler <[email protected]> Co-authored-by: tsouth89 <[email protected]> Co-authored-by: nathangerday <[email protected]> Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com> Co-authored-by: Arham Amin <[email protected]> Co-authored-by: codex <[email protected]> Co-authored-by: Ellie Gummere <[email protected]> Co-authored-by: Tristan Knight <[email protected]> Co-authored-by: Simone <[email protected]> Co-authored-by: Simone <[email protected]> Co-authored-by: Carter Smith <[email protected]> Co-authored-by: Chris Deeming <[email protected]> Co-authored-by: Wout Stiens <[email protected]> Co-authored-by: Mina Yacoub <[email protected]> Co-authored-by: Rodrigo Brechard <[email protected]> Co-authored-by: Rodrigo Brechard <[email protected]> Co-authored-by: Bilal Bakr <[email protected]> Co-authored-by: maria <[email protected]> Co-authored-by: maria-rcks <[email protected]> Co-authored-by: Jono Kemball <[email protected]> Co-authored-by: Pavlo Trinko <[email protected]> Co-authored-by: Alex <[email protected]> Co-authored-by: Illia Panasenko <[email protected]> Co-authored-by: Taras <[email protected]> Co-authored-by: bkntr <[email protected]> Co-authored-by: yassiEmp <[email protected]> Co-authored-by: Guilherme Vieira <[email protected]> Co-authored-by: shivam <[email protected]> Co-authored-by: Thuong Tin <[email protected]> Co-authored-by: Kapish14 <[email protected]> Co-authored-by: Exotic <[email protected]> Co-authored-by: Nick Anisimov <[email protected]> Co-authored-by: t3-code[bot] <219304759+t3-code[bot]@users.noreply.github.com> Co-authored-by: Gianmarco <[email protected]> Co-authored-by: Cursor <[email protected]> Co-authored-by: Dominic Roy <[email protected]> Co-authored-by: Dominic Roy <[email protected]> Co-authored-by: Julius Marminge <[email protected]> Co-authored-by: t3-code[bot] <236186684+t3-code[bot]@users.noreply.github.com> Co-authored-by: Adamulek123 <[email protected]> Co-authored-by: Paul van Dyk <[email protected]> Co-authored-by: Taylor Bombay <[email protected]> Co-authored-by: Rakshith Bhat <[email protected]> Co-authored-by: David Hu <[email protected]> Co-authored-by: t3-code[bot] <t3-code[bot]@users.noreply.github.com> Co-authored-by: Michael Charles Aubrey <[email protected]> Co-authored-by: Dara Adedeji <[email protected]> Co-authored-by: atryan <[email protected]> Co-authored-by: Nickolas Kyryliuk <[email protected]> Co-authored-by: Lars Nieuwenhuis <[email protected]> Co-authored-by: Guilherme Barros <[email protected]> Co-authored-by: Yukun Shan <[email protected]> Co-authored-by: David Balderston <[email protected]> Co-authored-by: mohamedmastouri-hue <[email protected]> Co-authored-by: Ulises Britos <[email protected]> Co-authored-by: Nicolas Layne <[email protected]> Co-authored-by: JJ <[email protected]> Co-authored-by: Simon Doba <[email protected]> Co-authored-by: Sy-D <[email protected]> Co-authored-by: Daniel Vernon <[email protected]> Co-authored-by: Rishet11 <[email protected]> Co-authored-by: Akshar Patel <[email protected]> Co-authored-by: Torben Wetter <[email protected]> Co-authored-by: BootesVoid <[email protected]> Co-authored-by: AMohamedAakhil <[email protected]> Co-authored-by: mohammed shazeb <[email protected]> Co-authored-by: Mihnea Peteu <[email protected]> Co-authored-by: LikoKiko Tech <[email protected]> Co-authored-by: Vividh Mahajan <[email protected]> Co-authored-by: Jorge Pineda <[email protected]> Co-authored-by: abhwshek <[email protected]> Co-authored-by: aoright <[email protected]> Co-authored-by: Williawar <[email protected]> Co-authored-by: Mark Griffin <[email protected]> Co-authored-by: Linus Boehm <[email protected]> Co-authored-by: Naveed Iqbal <[email protected]> Co-authored-by: Gerwin <[email protected]> Co-authored-by: Gerwin Bisschop <[email protected]> Co-authored-by: duncan-vc <[email protected]> Co-authored-by: duncan-vc <[email protected]> Co-authored-by: Joaquin Navarro <[email protected]> Co-authored-by: Martin Bergo <[email protected]> Co-authored-by: mInrOz <[email protected]> Co-authored-by: Tai Nguyen <[email protected]> Co-authored-by: Vitaly Iegorov <[email protected]> Co-authored-by: Ostap <[email protected]> Co-authored-by: Jaroslav Brtis <[email protected]> Co-authored-by: Roshan Mhatre <[email protected]> Co-authored-by: Carlos Jimenez <[email protected]> Co-authored-by: Julius Marminge <[email protected]> Co-authored-by: sebbonit <[email protected]> Co-authored-by: nqrwhal <[email protected]> Co-authored-by: CursedApple <[email protected]> Co-authored-by: John Surles <[email protected]> Co-authored-by: Akos Balogh <[email protected]> Co-authored-by: jorvarea <[email protected]> Co-authored-by: jorvarea <[email protected]> Co-authored-by: Aditya Garud <[email protected]> Co-authored-by: Alex Brodsky <[email protected]> Co-authored-by: Harshith Goka <[email protected]> Co-authored-by: Paul <[email protected]> Co-authored-by: RaitP1 <[email protected]> Co-authored-by: Dev Talan <[email protected]> Co-authored-by: Luis Gustavo Couto Wacker <[email protected]> Co-authored-by: JackatDJL <[email protected]> Co-authored-by: delltrak <[email protected]> Co-authored-by: Aaron Abu Usama <[email protected]> Co-authored-by: Capxul Agent <[email protected]> Co-authored-by: Kevin Bravo <[email protected]> Co-authored-by: shubhu <[email protected]> Co-authored-by: Zeus-Deus <[email protected]> Co-authored-by: El-Hussein Abdelraouf <[email protected]> Co-authored-by: Jono <[email protected]> Co-authored-by: Mahdi Ben Messaoud <[email protected]> Co-authored-by: Ngo Quoc Viet <[email protected]> Co-authored-by: Inaya Yousfi <[email protected]> Co-authored-by: Eddy Naboulet <[email protected]>

142 upstream commits and 22 nightlies at bab4b6f: the activity-hydration bound (pingdotgg#6153), settle toggles (pingdotgg#5880/pingdotgg#5379/pingdotgg#5127), steer send-while-running composer, shared theme palettes with built-in mobile themes, desktop readiness re-probing, locale timestamps, AUR packaging, broad polish. Fork-preserving resolutions (35 conflicts): - Settled-lifecycle seam partially retired per its drop rule: upstream autoSettleOnMerge supersedes the updatedAt gate; decider sticky pin still carried. SEAM.md and customizations.json updated. - Theme region roles moved into @t3tools/shared/themePalettes so mobile built-in themes get them; web themePalette deduplicated against it. - ComposerPrimaryActions: upstream steer UI composed inside the fork fixed PrimaryActionSlot with the activity orb; stop fills the slot. - ChatMarkdown keeps both open-with-system-default and open-in-panel; launcher error contracts restored and unioned. - Desktop icons follow upstream to build-time staging from assets/turbo; NSIS keeps differentialPackage plus Turbo shortcuts; update feed and release notes stay on gfsaaser24/t3code. - Branding, versionSkew copy, Windows install warning, CLAUDE.md doc, and mobile usage meters preserved on upstream structures; desktop identity tests use fork names with portablePath normalization. Version line to 0.0.44. Seams verify (26/166). Web 2691 passed; desktop 37/39 (2 upstream tests hit Windows path separators locally; CI covers); client-runtime 655; typecheck clean x6. Co-Authored-By: Claude Fable 5 <[email protected]>

- ChatView: #5880 auto-settle-on-merge setting flows into effectiveSettled, #5644 browser favicon project registration effect, activeProjectRef memo, desktopByTabId on both RightPanelTabs mounts - server: provide ServerSecretStore to the McpSessionRegistry's ServerEnvironment layer (#6325 reads publish opt-in per descriptor) - mobile: 3-way merged main's deltas into the v2 thread screens (NewTaskDraftScreen keeps the branch title seed + main's environmentId, threadListV2 keeps both new test suites, queries imports deduped) Co-Authored-By: Claude Fable 5 <[email protected]>

github-actions Bot added vouch:trusted Author is trusted by repo permissions or the VOUCHED list. size:L 100-499 changed lines (additions + deletions). labels Aug 9, 2026

cursor Bot reviewed Aug 9, 2026

View reviewed changes

Comment thread apps/web/src/components/Sidebar.tsx Resolved

t3dotgg added 2 commits August 9, 2026 14:43

feat: allow disabling auto-settle on merge

57ffa7e

fix(web): keep wake state when merge settling is off

65c2e53

t3dotgg force-pushed the t3code/disable-merge-auto-settling branch from e3f303b to 65c2e53 Compare August 9, 2026 21:43

gfsaaser24 mentioned this pull request Aug 10, 2026

fix(threads): keep un-settled threads active after their PR merges gfsaaser24/t3code#61

Merged

t3dotgg merged commit db1507e into main Aug 13, 2026
18 checks passed

t3dotgg deleted the t3code/disable-merge-auto-settling branch August 13, 2026 23:18

maarco mentioned this pull request Aug 14, 2026

chore(upstream): sync marcode through 184d8ef3 maarco/marcode#31

Closed

1 of 4 tasks

t3dotgg mentioned this pull request Aug 15, 2026

refactor(server): settled state is now server-authored, ending client drift #5462

Closed

davidhu2000 mentioned this pull request Aug 15, 2026

feat(clients): add thread auto-settle modes #6192

Closed

JasperG134 mentioned this pull request Aug 16, 2026

fix(threads): make completed-PR auto-settle configurable #5842

Closed

4 tasks done

This was referenced Aug 16, 2026

merge(main): bring fork main up to upstream main bab4b6f02 gfsaaser24/t3code#74

Merged

chore(turbo): ingest upstream through v0.0.34-nightly.20260816.1110 gfsaaser24/t3code#75

Merged

maarco mentioned this pull request Aug 17, 2026

chore(upstream): sync marcode through cd096b9ad5a4 maarco/marcode#37

Closed

NoahHendrickson mentioned this pull request Aug 18, 2026

chore(sync): absorb upstream main through 82b8a9380 (v0.0.33 cycle) NoahHendrickson/no3ycode#96

Merged

This was referenced Aug 23, 2026

feat(clients): add PR auto-settle toggle #5141

Closed

fix(threads): make completed-PR auto-settle configurable #5643

Closed

Navigation Menu

Repository navigation

feat: allow disabling auto-settle on merge - #5880

feat: allow disabling auto-settle on merge#5880
t3dotgg merged 2 commits into
mainfrom
t3code/disable-merge-auto-settling

t3dotgg commented Aug 9, 2026 •

edited by macroscopeapp Bot

Loading

Uh oh!

coderabbitai Bot commented Aug 9, 2026 •

edited

Loading

Review skipped

Uh oh!

cursor Bot left a comment

Uh oh!

Uh oh!

github-actions Bot commented Aug 9, 2026 •

edited

Loading

Uh oh!

macroscopeapp Bot commented Aug 9, 2026 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Conversation

t3dotgg commented Aug 9, 2026 • edited by macroscopeapp Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Add user-configurable auto-settle on merge setting for threads

Uh oh!

coderabbitai Bot commented Aug 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Uh oh!

cursor Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions Bot commented Aug 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Thread transfer impact

Uh oh!

macroscopeapp Bot commented Aug 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Approvability

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

t3dotgg commented Aug 9, 2026 •

edited by macroscopeapp Bot

Loading

coderabbitai Bot commented Aug 9, 2026 •

edited

Loading

github-actions Bot commented Aug 9, 2026 •

edited

Loading

macroscopeapp Bot commented Aug 9, 2026 •

edited

Loading