Uh oh!
There was an error while loading. Please reload this page.
Allow empty server threads to bootstrap new worktrees - #1936
Merged
Conversation
Important Review skippedAuto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Repository UI Review profile: CHILL Plan: Pro Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
Uh oh!
There was an error while loading. Please reload this page.
Contributor
There was a problem hiding this comment.
Cursor Bugbot has reviewed your changes and found 1 potential issue.
Bugbot Autofix prepared a fix for the issue found in the latest run.
- ✅ Fixed: Pending override state leaks between empty server threads
- Added a ref to track the previous thread ID so the cleanup effect resets pendingServerThreadEnvMode and pendingServerThreadBranch whenever activeThread.id changes, even when canOverrideServerThreadEnvMode remains true for both threads.
Or push these changes by commenting:
@cursor push a440ab779e
Preview (a440ab779e)
diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsx--- a/apps/web/src/components/ChatView.tsx+++ b/apps/web/src/components/ChatView.tsx@@ -2228,12 +2228,15 @@
isGitRepo,
});
+ const prevThreadIdForPendingReset = useRef(activeThread?.id);
useEffect(() => {
- if (canOverrideServerThreadEnvMode) {- return;+ const threadChanged = prevThreadIdForPendingReset.current !== activeThread?.id;+ prevThreadIdForPendingReset.current = activeThread?.id;++ if (threadChanged || !canOverrideServerThreadEnvMode) {+ setPendingServerThreadEnvMode(null);+ setPendingServerThreadBranch(undefined);
}
- setPendingServerThreadEnvMode(null);- setPendingServerThreadBranch(undefined);
}, [canOverrideServerThreadEnvMode, activeThread?.id]);
useEffect(() => {You can send follow-ups to the cloud agent here.
Reviewed by Cursor Bugbot for commit 9efc9f9. Configure here.
Uh oh!
There was an error while loading. Please reload this page.
Contributor
ApprovabilityVerdict: Needs human review This PR introduces new feature capability allowing empty server threads to be configured for worktree mode before the first message is sent. While well-tested and the code is reasonable, this changes runtime behavior for thread bootstrapping workflows and introduces new user-facing functionality that warrants human review. You can customize Macroscope's approvability policy. Learn more. |
- Let the first send on an empty server thread override env mode and base branch - Use shorter locked workspace labels in the branch toolbar - Add coverage for worktree bootstrap and env-mode resolution
juliusmarmingeforce-pushed
the
feature/empty-server-worktree-bootstrap
branch
from
April 13, 2026 17:14
9efc9f9 to
db1833bCompare- Clear staged server thread env/branch overrides when the active thread changes - Add regression coverage for switching between empty server threads
- Move worktree branch prefix and matcher into shared git utils - Add coverage for temporary branch detection
- Generate temp worktree branch names in `packages/shared` - Update the web chat view to use the shared helper - Add coverage for the generated branch format
Uh oh!
There was an error while loading. Please reload this page.
juliusmarminge added a commit
that referenced
this pull request
Apr 13, 2026
aaditagrawal added a commit
to aaditagrawal/t3code
that referenced
this pull request
Apr 16, 2026
Integrates upstream/main (d22c6f5) into the fork while preserving all multi-provider support (codex, claudeAgent, copilot, cursor, opencode, geminiCli, amp, kilo) and fork UI/UX additions. Highlights adopted from upstream: - Nightly release channel + update channel selector (pingdotgg#2012, pingdotgg#2049, pingdotgg#1969) - Filesystem browse API + command palette project picker (pingdotgg#2024) - Launch Args setting for Claude provider (pingdotgg#1971) - Kiro editor support in open picker (pingdotgg#1974) - Claude plan events for TodoWrite during input streaming (pingdotgg#1541) - Lost provider session recovery (pingdotgg#1938) - Cache provider status and gate desktop startup (pingdotgg#1962) - LegendList migration for chat scrolling and branch lists (pingdotgg#1953) - Shell snapshot queries + backfill migration (pingdotgg#1973, pingdotgg#2004) - PATH hydration + fallback detection (pingdotgg#1799) - Warm sidebar thread subscriptions (pingdotgg#2001) - Full thread title tooltip (pingdotgg#1994) - Markdown file link UX (pingdotgg#1956), composer polish (pingdotgg#1944, pingdotgg#1992, pingdotgg#1985) - Worktree/branch state + draft reuse fixes (pingdotgg#2005, pingdotgg#2003, pingdotgg#1995, pingdotgg#1936) - Window controls overlay for Windows/Linux (pingdotgg#1969) - Backend readiness timeout 10s→30s (pingdotgg#1979) - Clear tracked RPCs on reconnect, live stream subscriptions (pingdotgg#2000, pingdotgg#1972) - Various misc fixes (pingdotgg#2051, pingdotgg#2052, pingdotgg#2025, pingdotgg#2027, pingdotgg#2049, pingdotgg#1997, pingdotgg#1975) Fork features preserved and reconciled: - All 8 provider adapters + conformance tests - Extended ProviderKind union across contracts/model/settings/provider - appearance/accentColor/themeConfig/ProviderLogo UI system - customModels + gitTextGeneration + providerModelOptions - Migration IDs 23 (NormalizeLegacyProviderKinds) and 24 (RepairProjectionThreadProposedPlanImplementationColumns) kept; new upstream migrations registered at IDs 25-26 to avoid breaking deployed fork databases - DesktopBridge: log directory channels (LOG_DIR/LIST/READ/OPEN_DIR) retained; getWsUrl replaced by upstream's getAppBranding - PROVIDER_CACHE_IDS extended to all 8 providers
9 tasks
znoraka pushed a commit
to znoraka/t3code
that referenced
this pull request
Apr 17, 2026
youpele52 referenced
this pull request
in youpele52/bigbud
Jun 17, 2026
NeilTheFisher pushed a commit
to NeilTheFisher/t3code
that referenced
this pull request
Aug 18, 2026
2 tasks
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 freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Summary
New worktreemode and bootstrap the first send without forcing a separate draft thread.Testing
bun fmtbun lintbun typecheckbun run testapps/web/src/components/ChatView.browser.tsxfor:New worktreemode from an empty server threadNote
Medium Risk
Medium risk because it changes first-send behavior and branch/env-mode selection for server threads, which affects worktree creation and command dispatch paths; mistakes could create worktrees off the wrong base branch or leave UI state inconsistent.
Overview
Enables empty server threads (no messages, no worktree) to temporarily opt into
New worktreemode, select a base branch in the toolbar, and have that choice used to bootstrap worktree creation on the first send (via pending overrides cleared on thread switch / when no longer eligible).Extracts temporary-worktree branch utilities into
@t3tools/shared/git(WORKTREE_BRANCH_PREFIX,buildTemporaryWorktreeBranchName,isTemporaryWorktreeBranch) and updates server/web to use them, while addingresolveSendEnvModeto forcelocalsends for non-git repos.UI/UX tweaks: introduces
resolveLockedWorkspaceLabelso locked workspace state shows shorter labels, and expands unit + browser tests to cover the new first-send bootstrap and override-reset flows.Reviewed by Cursor Bugbot for commit ae19339. Bugbot is set up for automated code reviews on this repo. Configure here.
Note
Allow empty server threads to bootstrap new worktrees with a user-selected base branch
pendingServerThreadEnvModeandpendingServerThreadBranchstate toChatView.tsxso empty server threads can remain in 'New worktree' mode before the first message is sent.prepareWorktreeusing a temporaryt3code/<8-hex>branch name generated by the newbuildTemporaryWorktreeBranchNamehelper inpackages/shared/src/git.ts.WORKTREE_BRANCH_PREFIX,buildTemporaryWorktreeBranchName, andisTemporaryWorktreeBranchinto the sharedgitmodule, removing duplicate definitions fromChatView.logic.tsandProviderCommandReactor.ts.resolveSendEnvModeinChatView.logic.tsto force non-git repositories to'local'mode regardless of the user's selected env mode.BranchToolbarandBranchToolbarBranchSelectorto accept override props for env mode and active branch, enabling the pre-send selection UI for empty server threads.Macroscope summarized ae19339.