Fix new-thread draft reuse for worktree defaults by juliusmarminge · Pull Request #2003 · pingdotgg/t3code

juliusmarminge · 2026-04-13T21:37:11Z

Summary

Prevents the new-thread flow from reusing an existing draft when the project default environment mode is worktree.
Preserves promoting draft threads so they are not reused while promotion is still in progress.
Adds coverage for the sidebar seed-context logic and the browser-level new-thread flow.

Testing

bun fmt
bun lint
bun typecheck
bun run test
Not run: additional manual verification beyond the automated tests

Note

Medium Risk
Touches new-thread draft creation/reuse logic and draft-store cleanup rules, which can impact routing and draft persistence across projects. Changes are localized and covered by new unit and browser-level tests, reducing regression risk.

Overview
New-thread draft reuse is tightened for worktree defaults and promotion in-flight. When the project default env mode is worktree, sidebar seed context now forces envMode: "worktree" instead of inheriting an active thread’s branch/worktree path, ensuring the next thread starts as a fresh worktree draft.

Draft reuse/cleanup is also guarded so promoting draft threads aren’t reused or deleted mid-promotion (useHandleNewThread checks promotedTo == null; composerDraftStore won’t evict a prior draft if it’s promoting). Adds regression coverage in ChatView.browser.tsx and Sidebar.logic.test.ts.

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

Note

Fix new-thread draft reuse when the default environment mode is worktree

Fixes two bugs in the new-thread flow: promoting drafts were being reused instead of creating a new draft, and worktree-defaulted projects were inheriting branch/path context from active threads.
In useHandleNewThread.ts, draft reuse is now skipped when the active draft has already been promoted (promotedTo != null).
In composerDraftStore.ts, deletion of a previous logical-project draft is skipped when that draft is in a promoting state.
In Sidebar.logic.ts, resolveSidebarNewThreadSeedContext returns { envMode: 'worktree' } immediately when defaultEnvMode is 'worktree', ignoring any active thread context.

^{Macroscope summarized 33d6b03.}

- Prefer worktree mode when the server default is worktree - Avoid reusing promoting drafts as the source for new threads - Preserve existing worktree drafts instead of deleting them

coderabbitai · 2026-04-13T21:37:18Z

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

Run ID: fc5eb936-4c33-4383-bf48-15c5c0aaa69d

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

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests
Commit unit tests in branch t3code/investigate-issue-1989

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

macroscopeapp · 2026-04-13T21:44:09Z

Approvability

Verdict: Approved

Small bug fix adding guard conditions to prevent incorrect draft thread reuse when worktree defaults are set or when drafts are being promoted. Production changes are minimal (~12 lines) with defensive null/state checks, accompanied by comprehensive test coverage (~114 lines). Low-risk, well-scoped fix.

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

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

juliusmarminge · 2026-04-13T21:37:11Z

Summary

Prevents the new-thread flow from reusing an existing draft when the project default environment mode is worktree.
Preserves promoting draft threads so they are not reused while promotion is still in progress.
Adds coverage for the sidebar seed-context logic and the browser-level new-thread flow.

Testing

bun fmt
bun lint
bun typecheck
bun run test
Not run: additional manual verification beyond the automated tests

Note

Medium Risk
Touches new-thread draft creation/reuse logic and draft-store cleanup rules, which can impact routing and draft persistence across projects. Changes are localized and covered by new unit and browser-level tests, reducing regression risk.

Overview
New-thread draft reuse is tightened for worktree defaults and promotion in-flight. When the project default env mode is worktree, sidebar seed context now forces envMode: "worktree" instead of inheriting an active thread’s branch/worktree path, ensuring the next thread starts as a fresh worktree draft.

Draft reuse/cleanup is also guarded so promoting draft threads aren’t reused or deleted mid-promotion (useHandleNewThread checks promotedTo == null; composerDraftStore won’t evict a prior draft if it’s promoting). Adds regression coverage in ChatView.browser.tsx and Sidebar.logic.test.ts.

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

Note

Fix new-thread draft reuse when the default environment mode is worktree

Fixes two bugs in the new-thread flow: promoting drafts were being reused instead of creating a new draft, and worktree-defaulted projects were inheriting branch/path context from active threads.
In useHandleNewThread.ts, draft reuse is now skipped when the active draft has already been promoted (promotedTo != null).
In composerDraftStore.ts, deletion of a previous logical-project draft is skipped when that draft is in a promoting state.
In Sidebar.logic.ts, resolveSidebarNewThreadSeedContext returns { envMode: 'worktree' } immediately when defaultEnvMode is 'worktree', ignoring any active thread context.

^{Macroscope summarized 33d6b03.}

- Prefer worktree mode when the server default is worktree - Avoid reusing promoting drafts as the source for new threads - Preserve existing worktree drafts instead of deleting them

coderabbitai · 2026-04-13T21:37:18Z

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

Run ID: fc5eb936-4c33-4383-bf48-15c5c0aaa69d

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

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests
Commit unit tests in branch t3code/investigate-issue-1989

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

macroscopeapp · 2026-04-13T21:44:09Z

Approvability

Verdict: Approved

Small bug fix adding guard conditions to prevent incorrect draft thread reuse when worktree defaults are set or when drafts are being promoted. Production changes are minimal (~12 lines) with defensive null/state checks, accompanied by comprehensive test coverage (~114 lines). Low-risk, well-scoped fix.

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

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

juliusmarminge · 2026-04-13T21:37:11Z

Summary

Prevents the new-thread flow from reusing an existing draft when the project default environment mode is worktree.
Preserves promoting draft threads so they are not reused while promotion is still in progress.
Adds coverage for the sidebar seed-context logic and the browser-level new-thread flow.

Testing

bun fmt
bun lint
bun typecheck
bun run test
Not run: additional manual verification beyond the automated tests

Note

Medium Risk
Touches new-thread draft creation/reuse logic and draft-store cleanup rules, which can impact routing and draft persistence across projects. Changes are localized and covered by new unit and browser-level tests, reducing regression risk.

Overview
New-thread draft reuse is tightened for worktree defaults and promotion in-flight. When the project default env mode is worktree, sidebar seed context now forces envMode: "worktree" instead of inheriting an active thread’s branch/worktree path, ensuring the next thread starts as a fresh worktree draft.

Draft reuse/cleanup is also guarded so promoting draft threads aren’t reused or deleted mid-promotion (useHandleNewThread checks promotedTo == null; composerDraftStore won’t evict a prior draft if it’s promoting). Adds regression coverage in ChatView.browser.tsx and Sidebar.logic.test.ts.

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

Note

Fix new-thread draft reuse when the default environment mode is worktree

Fixes two bugs in the new-thread flow: promoting drafts were being reused instead of creating a new draft, and worktree-defaulted projects were inheriting branch/path context from active threads.
In useHandleNewThread.ts, draft reuse is now skipped when the active draft has already been promoted (promotedTo != null).
In composerDraftStore.ts, deletion of a previous logical-project draft is skipped when that draft is in a promoting state.
In Sidebar.logic.ts, resolveSidebarNewThreadSeedContext returns { envMode: 'worktree' } immediately when defaultEnvMode is 'worktree', ignoring any active thread context.

^{Macroscope summarized 33d6b03.}

- Prefer worktree mode when the server default is worktree - Avoid reusing promoting drafts as the source for new threads - Preserve existing worktree drafts instead of deleting them

coderabbitai · 2026-04-13T21:37:18Z

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

Run ID: fc5eb936-4c33-4383-bf48-15c5c0aaa69d

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

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests
Commit unit tests in branch t3code/investigate-issue-1989

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

macroscopeapp · 2026-04-13T21:44:09Z

Approvability

Verdict: Approved

Small bug fix adding guard conditions to prevent incorrect draft thread reuse when worktree defaults are set or when drafts are being promoted. Production changes are minimal (~12 lines) with defensive null/state checks, accompanied by comprehensive test coverage (~114 lines). Low-risk, well-scoped fix.

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

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

juliusmarminge · 2026-04-13T21:37:11Z

Summary

Prevents the new-thread flow from reusing an existing draft when the project default environment mode is worktree.
Preserves promoting draft threads so they are not reused while promotion is still in progress.
Adds coverage for the sidebar seed-context logic and the browser-level new-thread flow.

Testing

bun fmt
bun lint
bun typecheck
bun run test
Not run: additional manual verification beyond the automated tests

Note

Medium Risk
Touches new-thread draft creation/reuse logic and draft-store cleanup rules, which can impact routing and draft persistence across projects. Changes are localized and covered by new unit and browser-level tests, reducing regression risk.

Overview
New-thread draft reuse is tightened for worktree defaults and promotion in-flight. When the project default env mode is worktree, sidebar seed context now forces envMode: "worktree" instead of inheriting an active thread’s branch/worktree path, ensuring the next thread starts as a fresh worktree draft.

Draft reuse/cleanup is also guarded so promoting draft threads aren’t reused or deleted mid-promotion (useHandleNewThread checks promotedTo == null; composerDraftStore won’t evict a prior draft if it’s promoting). Adds regression coverage in ChatView.browser.tsx and Sidebar.logic.test.ts.

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

Note

Fix new-thread draft reuse when the default environment mode is worktree

Fixes two bugs in the new-thread flow: promoting drafts were being reused instead of creating a new draft, and worktree-defaulted projects were inheriting branch/path context from active threads.
In useHandleNewThread.ts, draft reuse is now skipped when the active draft has already been promoted (promotedTo != null).
In composerDraftStore.ts, deletion of a previous logical-project draft is skipped when that draft is in a promoting state.
In Sidebar.logic.ts, resolveSidebarNewThreadSeedContext returns { envMode: 'worktree' } immediately when defaultEnvMode is 'worktree', ignoring any active thread context.

^{Macroscope summarized 33d6b03.}

- Prefer worktree mode when the server default is worktree - Avoid reusing promoting drafts as the source for new threads - Preserve existing worktree drafts instead of deleting them

coderabbitai · 2026-04-13T21:37:18Z

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

Run ID: fc5eb936-4c33-4383-bf48-15c5c0aaa69d

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

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests
Commit unit tests in branch t3code/investigate-issue-1989

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

macroscopeapp · 2026-04-13T21:44:09Z

Approvability

Verdict: Approved

Small bug fix adding guard conditions to prevent incorrect draft thread reuse when worktree defaults are set or when drafts are being promoted. Production changes are minimal (~12 lines) with defensive null/state checks, accompanied by comprehensive test coverage (~114 lines). Low-risk, well-scoped fix.

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

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

juliusmarminge · 2026-04-13T21:37:11Z

Summary

Prevents the new-thread flow from reusing an existing draft when the project default environment mode is worktree.
Preserves promoting draft threads so they are not reused while promotion is still in progress.
Adds coverage for the sidebar seed-context logic and the browser-level new-thread flow.

Testing

bun fmt
bun lint
bun typecheck
bun run test
Not run: additional manual verification beyond the automated tests

Note

Medium Risk
Touches new-thread draft creation/reuse logic and draft-store cleanup rules, which can impact routing and draft persistence across projects. Changes are localized and covered by new unit and browser-level tests, reducing regression risk.

Overview
New-thread draft reuse is tightened for worktree defaults and promotion in-flight. When the project default env mode is worktree, sidebar seed context now forces envMode: "worktree" instead of inheriting an active thread’s branch/worktree path, ensuring the next thread starts as a fresh worktree draft.

Draft reuse/cleanup is also guarded so promoting draft threads aren’t reused or deleted mid-promotion (useHandleNewThread checks promotedTo == null; composerDraftStore won’t evict a prior draft if it’s promoting). Adds regression coverage in ChatView.browser.tsx and Sidebar.logic.test.ts.

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

Note

Fix new-thread draft reuse when the default environment mode is worktree

Fixes two bugs in the new-thread flow: promoting drafts were being reused instead of creating a new draft, and worktree-defaulted projects were inheriting branch/path context from active threads.
In useHandleNewThread.ts, draft reuse is now skipped when the active draft has already been promoted (promotedTo != null).
In composerDraftStore.ts, deletion of a previous logical-project draft is skipped when that draft is in a promoting state.
In Sidebar.logic.ts, resolveSidebarNewThreadSeedContext returns { envMode: 'worktree' } immediately when defaultEnvMode is 'worktree', ignoring any active thread context.

^{Macroscope summarized 33d6b03.}

- Prefer worktree mode when the server default is worktree - Avoid reusing promoting drafts as the source for new threads - Preserve existing worktree drafts instead of deleting them

coderabbitai · 2026-04-13T21:37:18Z

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

Run ID: fc5eb936-4c33-4383-bf48-15c5c0aaa69d

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

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests
Commit unit tests in branch t3code/investigate-issue-1989

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

macroscopeapp · 2026-04-13T21:44:09Z

Approvability

Verdict: Approved

Small bug fix adding guard conditions to prevent incorrect draft thread reuse when worktree defaults are set or when drafts are being promoted. Production changes are minimal (~12 lines) with defensive null/state checks, accompanied by comprehensive test coverage (~114 lines). Low-risk, well-scoped fix.

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

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

juliusmarminge · 2026-04-13T21:37:11Z

Summary

Prevents the new-thread flow from reusing an existing draft when the project default environment mode is worktree.
Preserves promoting draft threads so they are not reused while promotion is still in progress.
Adds coverage for the sidebar seed-context logic and the browser-level new-thread flow.

Testing

bun fmt
bun lint
bun typecheck
bun run test
Not run: additional manual verification beyond the automated tests

Note

Medium Risk
Touches new-thread draft creation/reuse logic and draft-store cleanup rules, which can impact routing and draft persistence across projects. Changes are localized and covered by new unit and browser-level tests, reducing regression risk.

Overview
New-thread draft reuse is tightened for worktree defaults and promotion in-flight. When the project default env mode is worktree, sidebar seed context now forces envMode: "worktree" instead of inheriting an active thread’s branch/worktree path, ensuring the next thread starts as a fresh worktree draft.

Draft reuse/cleanup is also guarded so promoting draft threads aren’t reused or deleted mid-promotion (useHandleNewThread checks promotedTo == null; composerDraftStore won’t evict a prior draft if it’s promoting). Adds regression coverage in ChatView.browser.tsx and Sidebar.logic.test.ts.

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

Note

Fix new-thread draft reuse when the default environment mode is worktree

Fixes two bugs in the new-thread flow: promoting drafts were being reused instead of creating a new draft, and worktree-defaulted projects were inheriting branch/path context from active threads.
In useHandleNewThread.ts, draft reuse is now skipped when the active draft has already been promoted (promotedTo != null).
In composerDraftStore.ts, deletion of a previous logical-project draft is skipped when that draft is in a promoting state.
In Sidebar.logic.ts, resolveSidebarNewThreadSeedContext returns { envMode: 'worktree' } immediately when defaultEnvMode is 'worktree', ignoring any active thread context.

^{Macroscope summarized 33d6b03.}

- Prefer worktree mode when the server default is worktree - Avoid reusing promoting drafts as the source for new threads - Preserve existing worktree drafts instead of deleting them

coderabbitai · 2026-04-13T21:37:18Z

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

Run ID: fc5eb936-4c33-4383-bf48-15c5c0aaa69d

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

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests
Commit unit tests in branch t3code/investigate-issue-1989

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

macroscopeapp · 2026-04-13T21:44:09Z

Approvability

Verdict: Approved

Small bug fix adding guard conditions to prevent incorrect draft thread reuse when worktree defaults are set or when drafts are being promoted. Production changes are minimal (~12 lines) with defensive null/state checks, accompanied by comprehensive test coverage (~114 lines). Low-risk, well-scoped fix.

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

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

juliusmarminge · 2026-04-13T21:37:11Z

Summary

Prevents the new-thread flow from reusing an existing draft when the project default environment mode is worktree.
Preserves promoting draft threads so they are not reused while promotion is still in progress.
Adds coverage for the sidebar seed-context logic and the browser-level new-thread flow.

Testing

bun fmt
bun lint
bun typecheck
bun run test
Not run: additional manual verification beyond the automated tests

Note

Medium Risk
Touches new-thread draft creation/reuse logic and draft-store cleanup rules, which can impact routing and draft persistence across projects. Changes are localized and covered by new unit and browser-level tests, reducing regression risk.

Overview
New-thread draft reuse is tightened for worktree defaults and promotion in-flight. When the project default env mode is worktree, sidebar seed context now forces envMode: "worktree" instead of inheriting an active thread’s branch/worktree path, ensuring the next thread starts as a fresh worktree draft.

Draft reuse/cleanup is also guarded so promoting draft threads aren’t reused or deleted mid-promotion (useHandleNewThread checks promotedTo == null; composerDraftStore won’t evict a prior draft if it’s promoting). Adds regression coverage in ChatView.browser.tsx and Sidebar.logic.test.ts.

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

Note

Fix new-thread draft reuse when the default environment mode is worktree

Fixes two bugs in the new-thread flow: promoting drafts were being reused instead of creating a new draft, and worktree-defaulted projects were inheriting branch/path context from active threads.
In useHandleNewThread.ts, draft reuse is now skipped when the active draft has already been promoted (promotedTo != null).
In composerDraftStore.ts, deletion of a previous logical-project draft is skipped when that draft is in a promoting state.
In Sidebar.logic.ts, resolveSidebarNewThreadSeedContext returns { envMode: 'worktree' } immediately when defaultEnvMode is 'worktree', ignoring any active thread context.

^{Macroscope summarized 33d6b03.}

- Prefer worktree mode when the server default is worktree - Avoid reusing promoting drafts as the source for new threads - Preserve existing worktree drafts instead of deleting them

coderabbitai · 2026-04-13T21:37:18Z

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

Run ID: fc5eb936-4c33-4383-bf48-15c5c0aaa69d

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

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests
Commit unit tests in branch t3code/investigate-issue-1989

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

macroscopeapp · 2026-04-13T21:44:09Z

Approvability

Verdict: Approved

Small bug fix adding guard conditions to prevent incorrect draft thread reuse when worktree defaults are set or when drafts are being promoted. Production changes are minimal (~12 lines) with defensive null/state checks, accompanied by comprehensive test coverage (~114 lines). Low-risk, well-scoped fix.

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

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

juliusmarminge · 2026-04-13T21:37:11Z

Summary

Prevents the new-thread flow from reusing an existing draft when the project default environment mode is worktree.
Preserves promoting draft threads so they are not reused while promotion is still in progress.
Adds coverage for the sidebar seed-context logic and the browser-level new-thread flow.

Testing

bun fmt
bun lint
bun typecheck
bun run test
Not run: additional manual verification beyond the automated tests

Note

Medium Risk
Touches new-thread draft creation/reuse logic and draft-store cleanup rules, which can impact routing and draft persistence across projects. Changes are localized and covered by new unit and browser-level tests, reducing regression risk.

Overview
New-thread draft reuse is tightened for worktree defaults and promotion in-flight. When the project default env mode is worktree, sidebar seed context now forces envMode: "worktree" instead of inheriting an active thread’s branch/worktree path, ensuring the next thread starts as a fresh worktree draft.

Draft reuse/cleanup is also guarded so promoting draft threads aren’t reused or deleted mid-promotion (useHandleNewThread checks promotedTo == null; composerDraftStore won’t evict a prior draft if it’s promoting). Adds regression coverage in ChatView.browser.tsx and Sidebar.logic.test.ts.

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

Note

Fix new-thread draft reuse when the default environment mode is worktree

Fixes two bugs in the new-thread flow: promoting drafts were being reused instead of creating a new draft, and worktree-defaulted projects were inheriting branch/path context from active threads.
In useHandleNewThread.ts, draft reuse is now skipped when the active draft has already been promoted (promotedTo != null).
In composerDraftStore.ts, deletion of a previous logical-project draft is skipped when that draft is in a promoting state.
In Sidebar.logic.ts, resolveSidebarNewThreadSeedContext returns { envMode: 'worktree' } immediately when defaultEnvMode is 'worktree', ignoring any active thread context.

^{Macroscope summarized 33d6b03.}

- Prefer worktree mode when the server default is worktree - Avoid reusing promoting drafts as the source for new threads - Preserve existing worktree drafts instead of deleting them

coderabbitai · 2026-04-13T21:37:18Z

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

Run ID: fc5eb936-4c33-4383-bf48-15c5c0aaa69d

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

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests
Commit unit tests in branch t3code/investigate-issue-1989

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

macroscopeapp · 2026-04-13T21:44:09Z

Approvability

Verdict: Approved

Small bug fix adding guard conditions to prevent incorrect draft thread reuse when worktree defaults are set or when drafts are being promoted. Production changes are minimal (~12 lines) with defensive null/state checks, accompanied by comprehensive test coverage (~114 lines). Low-risk, well-scoped fix.

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

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

Fix new-thread draft reuse for worktree defaults
33d6b03
- Prefer worktree mode when the server default is worktree - Avoid reusing promoting drafts as the source for new threads - Preserve existing worktree drafts instead of deleting them

github-actionsBot added size:S 10-29 changed lines (additions + deletions). vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. labels Apr 13, 2026

macroscopeappBot approved these changes Apr 13, 2026
View reviewed changes

juliusmarminge merged commit 5f7ec73 into mainApr 13, 2026
12 checks passed

juliusmarminge deleted the t3code/investigate-issue-1989 branch April 13, 2026 21:57

aaditagrawal mentioned this pull request Apr 16, 2026
sync: merge 35 upstream commits from pingdotgg/t3code aaditagrawal/t3code#69
Merged
9 tasks

znoraka pushed a commit to znoraka/t3code that referenced this pull request Apr 17, 2026
Fix new-thread draft reuse for worktree defaults (pingdotgg#2003)
c6943ba

youpele52 referenced this pull request in youpele52/bigbud Jun 17, 2026
Fix new-thread draft reuse for worktree defaults (#2003)
eb4df6e

NeilTheFisher pushed a commit to NeilTheFisher/t3code that referenced this pull request Aug 18, 2026
Fix new-thread draft reuse for worktree defaults (pingdotgg#2003)
5e096aa