Preserve live stream subscriptions across explicit reconnects by juliusmarminge · Pull Request #1972 · pingdotgg/t3code

juliusmarminge · 2026-04-13T01:14:39Z

Summary

Preserve active WebSocket stream subscriptions when the transport is explicitly reconnected.
Avoid resubscribing against a stale session after reconnect by checking the session that initiated the stream.
Add coverage for reconnecting an active subscription and verifying the listener resumes on the new socket.

Testing

Added apps/web/src/rpc/wsTransport.test.ts coverage for explicit reconnect behavior.
Not run: bun fmt
Not run: bun lint
Not run: bun typecheck
Not run: bun run test

Note

Medium Risk
Touches WsTransport.subscribe retry logic during reconnects, which could affect real-time stream reliability if session tracking is wrong. Scope is small and guarded by a new reconnect resubscription test.

Overview
Active WsTransport.subscribe streams now survive an explicit reconnect() by continuing the subscription loop on the new session and skipping retry/resubscribe handling for errors from the old session.

Adds a Vitest case asserting that a live stream listener is re-subscribed on the new socket after reconnect(), with onResubscribe firing and events continuing to deliver.

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

Note

Preserve live stream subscriptions across explicit reconnects in `WsTransport`

When transport.reconnect() is called, the subscription loop now captures a session snapshot at the start of each iteration and checks in the catch block whether the session has changed; if so, the error is ignored and the loop continues immediately.
This allows listeners to re-subscribe on the new session without prematurely terminating or logging a spurious disconnect for the stale session.
A new test in wsTransport.test.ts verifies that after reconnect, a new subscribe request is sent, onResubscribe fires once, and subsequent events are delivered to the original listener.

^{Macroscope summarized c1c0ae4.}

- Capture the active session before restarting a stream - Requeue live subscription listeners after transport reconnects - Add regression coverage for resubscribed lifecycle streams

coderabbitai · 2026-04-13T01:14:46Z

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: 0dc8d624-848d-4331-8027-382cd9bb183a

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/resume-stream-subscriptions

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

macroscopeapp · 2026-04-13T01:19:55Z

Approvability

Verdict: Approved

Small bug fix that captures WebSocket session state earlier in a subscription loop and adds a staleness check to prevent processing errors from old sessions after an explicit reconnect. The change is minimal (4 lines), well-tested, and the author is a frequent contributor to this file.

^{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

…tgg#1972)

juliusmarminge · 2026-04-13T01:14:39Z

Summary

Preserve active WebSocket stream subscriptions when the transport is explicitly reconnected.
Avoid resubscribing against a stale session after reconnect by checking the session that initiated the stream.
Add coverage for reconnecting an active subscription and verifying the listener resumes on the new socket.

Testing

Added apps/web/src/rpc/wsTransport.test.ts coverage for explicit reconnect behavior.
Not run: bun fmt
Not run: bun lint
Not run: bun typecheck
Not run: bun run test

Note

Medium Risk
Touches WsTransport.subscribe retry logic during reconnects, which could affect real-time stream reliability if session tracking is wrong. Scope is small and guarded by a new reconnect resubscription test.

Overview
Active WsTransport.subscribe streams now survive an explicit reconnect() by continuing the subscription loop on the new session and skipping retry/resubscribe handling for errors from the old session.

Adds a Vitest case asserting that a live stream listener is re-subscribed on the new socket after reconnect(), with onResubscribe firing and events continuing to deliver.

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

Note

Preserve live stream subscriptions across explicit reconnects in `WsTransport`

When transport.reconnect() is called, the subscription loop now captures a session snapshot at the start of each iteration and checks in the catch block whether the session has changed; if so, the error is ignored and the loop continues immediately.
This allows listeners to re-subscribe on the new session without prematurely terminating or logging a spurious disconnect for the stale session.
A new test in wsTransport.test.ts verifies that after reconnect, a new subscribe request is sent, onResubscribe fires once, and subsequent events are delivered to the original listener.

^{Macroscope summarized c1c0ae4.}

- Capture the active session before restarting a stream - Requeue live subscription listeners after transport reconnects - Add regression coverage for resubscribed lifecycle streams

coderabbitai · 2026-04-13T01:14:46Z

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: 0dc8d624-848d-4331-8027-382cd9bb183a

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/resume-stream-subscriptions

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

macroscopeapp · 2026-04-13T01:19:55Z

Approvability

Verdict: Approved

Small bug fix that captures WebSocket session state earlier in a subscription loop and adds a staleness check to prevent processing errors from old sessions after an explicit reconnect. The change is minimal (4 lines), well-tested, and the author is a frequent contributor to this file.

^{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

…tgg#1972)

juliusmarminge · 2026-04-13T01:14:39Z

Summary

Preserve active WebSocket stream subscriptions when the transport is explicitly reconnected.
Avoid resubscribing against a stale session after reconnect by checking the session that initiated the stream.
Add coverage for reconnecting an active subscription and verifying the listener resumes on the new socket.

Testing

Added apps/web/src/rpc/wsTransport.test.ts coverage for explicit reconnect behavior.
Not run: bun fmt
Not run: bun lint
Not run: bun typecheck
Not run: bun run test

Note

Medium Risk
Touches WsTransport.subscribe retry logic during reconnects, which could affect real-time stream reliability if session tracking is wrong. Scope is small and guarded by a new reconnect resubscription test.

Overview
Active WsTransport.subscribe streams now survive an explicit reconnect() by continuing the subscription loop on the new session and skipping retry/resubscribe handling for errors from the old session.

Adds a Vitest case asserting that a live stream listener is re-subscribed on the new socket after reconnect(), with onResubscribe firing and events continuing to deliver.

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

Note

Preserve live stream subscriptions across explicit reconnects in `WsTransport`

When transport.reconnect() is called, the subscription loop now captures a session snapshot at the start of each iteration and checks in the catch block whether the session has changed; if so, the error is ignored and the loop continues immediately.
This allows listeners to re-subscribe on the new session without prematurely terminating or logging a spurious disconnect for the stale session.
A new test in wsTransport.test.ts verifies that after reconnect, a new subscribe request is sent, onResubscribe fires once, and subsequent events are delivered to the original listener.

^{Macroscope summarized c1c0ae4.}

- Capture the active session before restarting a stream - Requeue live subscription listeners after transport reconnects - Add regression coverage for resubscribed lifecycle streams

coderabbitai · 2026-04-13T01:14:46Z

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: 0dc8d624-848d-4331-8027-382cd9bb183a

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/resume-stream-subscriptions

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

macroscopeapp · 2026-04-13T01:19:55Z

Approvability

Verdict: Approved

Small bug fix that captures WebSocket session state earlier in a subscription loop and adds a staleness check to prevent processing errors from old sessions after an explicit reconnect. The change is minimal (4 lines), well-tested, and the author is a frequent contributor to this file.

^{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

…tgg#1972)

juliusmarminge · 2026-04-13T01:14:39Z

Summary

Preserve active WebSocket stream subscriptions when the transport is explicitly reconnected.
Avoid resubscribing against a stale session after reconnect by checking the session that initiated the stream.
Add coverage for reconnecting an active subscription and verifying the listener resumes on the new socket.

Testing

Added apps/web/src/rpc/wsTransport.test.ts coverage for explicit reconnect behavior.
Not run: bun fmt
Not run: bun lint
Not run: bun typecheck
Not run: bun run test

Note

Medium Risk
Touches WsTransport.subscribe retry logic during reconnects, which could affect real-time stream reliability if session tracking is wrong. Scope is small and guarded by a new reconnect resubscription test.

Overview
Active WsTransport.subscribe streams now survive an explicit reconnect() by continuing the subscription loop on the new session and skipping retry/resubscribe handling for errors from the old session.

Adds a Vitest case asserting that a live stream listener is re-subscribed on the new socket after reconnect(), with onResubscribe firing and events continuing to deliver.

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

Note

Preserve live stream subscriptions across explicit reconnects in `WsTransport`

When transport.reconnect() is called, the subscription loop now captures a session snapshot at the start of each iteration and checks in the catch block whether the session has changed; if so, the error is ignored and the loop continues immediately.
This allows listeners to re-subscribe on the new session without prematurely terminating or logging a spurious disconnect for the stale session.
A new test in wsTransport.test.ts verifies that after reconnect, a new subscribe request is sent, onResubscribe fires once, and subsequent events are delivered to the original listener.

^{Macroscope summarized c1c0ae4.}

- Capture the active session before restarting a stream - Requeue live subscription listeners after transport reconnects - Add regression coverage for resubscribed lifecycle streams

coderabbitai · 2026-04-13T01:14:46Z

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: 0dc8d624-848d-4331-8027-382cd9bb183a

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/resume-stream-subscriptions

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

macroscopeapp · 2026-04-13T01:19:55Z

Approvability

Verdict: Approved

Small bug fix that captures WebSocket session state earlier in a subscription loop and adds a staleness check to prevent processing errors from old sessions after an explicit reconnect. The change is minimal (4 lines), well-tested, and the author is a frequent contributor to this file.

^{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

…tgg#1972)

juliusmarminge · 2026-04-13T01:14:39Z

Summary

Preserve active WebSocket stream subscriptions when the transport is explicitly reconnected.
Avoid resubscribing against a stale session after reconnect by checking the session that initiated the stream.
Add coverage for reconnecting an active subscription and verifying the listener resumes on the new socket.

Testing

Added apps/web/src/rpc/wsTransport.test.ts coverage for explicit reconnect behavior.
Not run: bun fmt
Not run: bun lint
Not run: bun typecheck
Not run: bun run test

Note

Medium Risk
Touches WsTransport.subscribe retry logic during reconnects, which could affect real-time stream reliability if session tracking is wrong. Scope is small and guarded by a new reconnect resubscription test.

Overview
Active WsTransport.subscribe streams now survive an explicit reconnect() by continuing the subscription loop on the new session and skipping retry/resubscribe handling for errors from the old session.

Adds a Vitest case asserting that a live stream listener is re-subscribed on the new socket after reconnect(), with onResubscribe firing and events continuing to deliver.

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

Note

Preserve live stream subscriptions across explicit reconnects in `WsTransport`

When transport.reconnect() is called, the subscription loop now captures a session snapshot at the start of each iteration and checks in the catch block whether the session has changed; if so, the error is ignored and the loop continues immediately.
This allows listeners to re-subscribe on the new session without prematurely terminating or logging a spurious disconnect for the stale session.
A new test in wsTransport.test.ts verifies that after reconnect, a new subscribe request is sent, onResubscribe fires once, and subsequent events are delivered to the original listener.

^{Macroscope summarized c1c0ae4.}

- Capture the active session before restarting a stream - Requeue live subscription listeners after transport reconnects - Add regression coverage for resubscribed lifecycle streams

coderabbitai · 2026-04-13T01:14:46Z

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: 0dc8d624-848d-4331-8027-382cd9bb183a

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/resume-stream-subscriptions

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

macroscopeapp · 2026-04-13T01:19:55Z

Approvability

Verdict: Approved

Small bug fix that captures WebSocket session state earlier in a subscription loop and adds a staleness check to prevent processing errors from old sessions after an explicit reconnect. The change is minimal (4 lines), well-tested, and the author is a frequent contributor to this file.

^{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

…tgg#1972)

juliusmarminge · 2026-04-13T01:14:39Z

Summary

Preserve active WebSocket stream subscriptions when the transport is explicitly reconnected.
Avoid resubscribing against a stale session after reconnect by checking the session that initiated the stream.
Add coverage for reconnecting an active subscription and verifying the listener resumes on the new socket.

Testing

Added apps/web/src/rpc/wsTransport.test.ts coverage for explicit reconnect behavior.
Not run: bun fmt
Not run: bun lint
Not run: bun typecheck
Not run: bun run test

Note

Medium Risk
Touches WsTransport.subscribe retry logic during reconnects, which could affect real-time stream reliability if session tracking is wrong. Scope is small and guarded by a new reconnect resubscription test.

Overview
Active WsTransport.subscribe streams now survive an explicit reconnect() by continuing the subscription loop on the new session and skipping retry/resubscribe handling for errors from the old session.

Adds a Vitest case asserting that a live stream listener is re-subscribed on the new socket after reconnect(), with onResubscribe firing and events continuing to deliver.

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

Note

Preserve live stream subscriptions across explicit reconnects in `WsTransport`

When transport.reconnect() is called, the subscription loop now captures a session snapshot at the start of each iteration and checks in the catch block whether the session has changed; if so, the error is ignored and the loop continues immediately.
This allows listeners to re-subscribe on the new session without prematurely terminating or logging a spurious disconnect for the stale session.
A new test in wsTransport.test.ts verifies that after reconnect, a new subscribe request is sent, onResubscribe fires once, and subsequent events are delivered to the original listener.

^{Macroscope summarized c1c0ae4.}

- Capture the active session before restarting a stream - Requeue live subscription listeners after transport reconnects - Add regression coverage for resubscribed lifecycle streams

coderabbitai · 2026-04-13T01:14:46Z

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: 0dc8d624-848d-4331-8027-382cd9bb183a

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/resume-stream-subscriptions

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

macroscopeapp · 2026-04-13T01:19:55Z

Approvability

Verdict: Approved

Small bug fix that captures WebSocket session state earlier in a subscription loop and adds a staleness check to prevent processing errors from old sessions after an explicit reconnect. The change is minimal (4 lines), well-tested, and the author is a frequent contributor to this file.

^{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

…tgg#1972)

juliusmarminge · 2026-04-13T01:14:39Z

Summary

Preserve active WebSocket stream subscriptions when the transport is explicitly reconnected.
Avoid resubscribing against a stale session after reconnect by checking the session that initiated the stream.
Add coverage for reconnecting an active subscription and verifying the listener resumes on the new socket.

Testing

Added apps/web/src/rpc/wsTransport.test.ts coverage for explicit reconnect behavior.
Not run: bun fmt
Not run: bun lint
Not run: bun typecheck
Not run: bun run test

Note

Medium Risk
Touches WsTransport.subscribe retry logic during reconnects, which could affect real-time stream reliability if session tracking is wrong. Scope is small and guarded by a new reconnect resubscription test.

Overview
Active WsTransport.subscribe streams now survive an explicit reconnect() by continuing the subscription loop on the new session and skipping retry/resubscribe handling for errors from the old session.

Adds a Vitest case asserting that a live stream listener is re-subscribed on the new socket after reconnect(), with onResubscribe firing and events continuing to deliver.

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

Note

Preserve live stream subscriptions across explicit reconnects in `WsTransport`

When transport.reconnect() is called, the subscription loop now captures a session snapshot at the start of each iteration and checks in the catch block whether the session has changed; if so, the error is ignored and the loop continues immediately.
This allows listeners to re-subscribe on the new session without prematurely terminating or logging a spurious disconnect for the stale session.
A new test in wsTransport.test.ts verifies that after reconnect, a new subscribe request is sent, onResubscribe fires once, and subsequent events are delivered to the original listener.

^{Macroscope summarized c1c0ae4.}

- Capture the active session before restarting a stream - Requeue live subscription listeners after transport reconnects - Add regression coverage for resubscribed lifecycle streams

coderabbitai · 2026-04-13T01:14:46Z

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: 0dc8d624-848d-4331-8027-382cd9bb183a

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/resume-stream-subscriptions

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

macroscopeapp · 2026-04-13T01:19:55Z

Approvability

Verdict: Approved

Small bug fix that captures WebSocket session state earlier in a subscription loop and adds a staleness check to prevent processing errors from old sessions after an explicit reconnect. The change is minimal (4 lines), well-tested, and the author is a frequent contributor to this file.

^{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

…tgg#1972)

juliusmarminge · 2026-04-13T01:14:39Z

Summary

Preserve active WebSocket stream subscriptions when the transport is explicitly reconnected.
Avoid resubscribing against a stale session after reconnect by checking the session that initiated the stream.
Add coverage for reconnecting an active subscription and verifying the listener resumes on the new socket.

Testing

Added apps/web/src/rpc/wsTransport.test.ts coverage for explicit reconnect behavior.
Not run: bun fmt
Not run: bun lint
Not run: bun typecheck
Not run: bun run test

Note

Medium Risk
Touches WsTransport.subscribe retry logic during reconnects, which could affect real-time stream reliability if session tracking is wrong. Scope is small and guarded by a new reconnect resubscription test.

Overview
Active WsTransport.subscribe streams now survive an explicit reconnect() by continuing the subscription loop on the new session and skipping retry/resubscribe handling for errors from the old session.

Adds a Vitest case asserting that a live stream listener is re-subscribed on the new socket after reconnect(), with onResubscribe firing and events continuing to deliver.

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

Note

Preserve live stream subscriptions across explicit reconnects in `WsTransport`

When transport.reconnect() is called, the subscription loop now captures a session snapshot at the start of each iteration and checks in the catch block whether the session has changed; if so, the error is ignored and the loop continues immediately.
This allows listeners to re-subscribe on the new session without prematurely terminating or logging a spurious disconnect for the stale session.
A new test in wsTransport.test.ts verifies that after reconnect, a new subscribe request is sent, onResubscribe fires once, and subsequent events are delivered to the original listener.

^{Macroscope summarized c1c0ae4.}

- Capture the active session before restarting a stream - Requeue live subscription listeners after transport reconnects - Add regression coverage for resubscribed lifecycle streams

coderabbitai · 2026-04-13T01:14:46Z

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: 0dc8d624-848d-4331-8027-382cd9bb183a

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/resume-stream-subscriptions

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

macroscopeapp · 2026-04-13T01:19:55Z

Approvability

Verdict: Approved

Small bug fix that captures WebSocket session state earlier in a subscription loop and adds a staleness check to prevent processing errors from old sessions after an explicit reconnect. The change is minimal (4 lines), well-tested, and the author is a frequent contributor to this file.

^{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

…tgg#1972)

Preserve stream subscriptions across explicit reconnects
c1c0ae4
- Capture the active session before restarting a stream - Requeue live subscription listeners after transport reconnects - Add regression coverage for resubscribed lifecycle streams

github-actionsBot added size:XS 0-9 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 94d13a2 into mainApr 13, 2026
12 checks passed

juliusmarminge deleted the t3code/resume-stream-subscriptions branch April 13, 2026 01:22

juliusmarminge added a commit that referenced this pull request Apr 13, 2026
Preserve live stream subscriptions across explicit reconnects (#1972)
a4ca7ce

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
Preserve live stream subscriptions across explicit reconnects (pingdo…
45dacd6
…tgg#1972)

youpele52 referenced this pull request in youpele52/bigbud Jun 17, 2026
Preserve live stream subscriptions across explicit reconnects (#1972)
5b6522e

NeilTheFisher pushed a commit to NeilTheFisher/t3code that referenced this pull request Aug 18, 2026
Preserve live stream subscriptions across explicit reconnects (pingdo…
286e74a
…tgg#1972)