t3x sync 2026-08-08: 113 upstream commits onto the fork's 83 patches by radroid · Pull Request #62 · radroid/t3code

radroid · 2026-08-08T08:38:28Z

Manual upstream sync. Resolved locally rather than by the CI agent: the range is 113 upstream commits against 83 fork patches, roughly 3× the 36-vs-37 range that already spent 81% of the resolver's 45-minute budget.

Do not use the merge button. This branch is the fork's patch series rebased onto new upstream, so main is not an ancestor of it. Land with:
git push --force-with-lease origin origin/t3x/sync-20260808:main
Recovery point: tag t3x/pre-sync-20260808 → 4bcf3450a.

upstream/main = 2c7267ad4. Every fork patch replayed — subject sets are identical before and after, nothing dropped or absorbed.

Verify

Green locally: typecheck, lint, and test --testTimeout=120000 --hookTimeout=120000 (15/15 packages, ~6.4k tests). One lint warning remains, in ThemeEditorPanel.tsx, which is byte-identical to upstream.

Conflicts that were more than mechanical

ComposerPrimaryActions.tsx — both of the fork's hoists had to be re-derived. Upstream grew its own renderStopGenerationButton(insidePendingAction), a size axis, where the fork's hoist carried an emphasis axis (Stop drops to a quiet outline beside Queue); they are now one renderStopButton(emphasisClassName, insidePendingAction). Upstream also restyled the send button off stageBackdropVariant/StageBackdropButtonArt onto the message-action tokens — the fork's hoisted copy was reverting that restyle, so it was re-taken from upstream and only the steering-aware aria-label kept.
supervisor.ts — upstream's fix: prevent reconnect loops during server stalls pingdotgg/t3code#5561 marks wakeProbeFailed when a wake probe fails and reads it to skip the first backoff rung. The fork's shared runLivenessProbe never set it, so the Ref was written by nobody and read as always-false. It now takes isWakeProbe, passed only at the wake call site, matching where upstream sets it.
ChatView.tsx — upstream gave onSend a directAnnotation parameter. Queued messages are text-only, so the queue branch would have enqueued the text and dropped the annotation silently; it now reads composerQueueMode && !directAnnotation, letting an annotated submit reach upstream's gate, which says the annotation stayed on the draft.
SettingsPanels.tsx — upstream renamed enableAssistantStreaming → enableLegacyTokenStreaming and folded that row into Legacy features (feat(web): fold plan mode and token-by-token output into Legacy features pingdotgg/t3code#5664). The fork patch was carrying the old row as context; it is not restored.
pnpm-lock.yaml — took upstream's side at all three conflicts, then regenerated once. electron 41.10.3, web-push, the nanoid@3.3.17 dedupe and the relay importer all verified present afterwards.

Follow-ups, unchanged by this sync

getSnapshot() on the boot path still risks the OOM upstream moved its own route away from. Deliberately left for its own PR with coverage, as the ledger says.
The fork's notification row is still absent from upstream's settings-search catalog.
.github/workflows/thread-transfer-report.yml arrives from upstream and must be disabled once it registers.

Closes the t3x-sync escalation (#49) and unblocks #54, whose upstream fix (pingdotgg#5557) is in this range.

🤖 Generated with Claude Code

coderabbitai · 2026-08-08T08:38:37Z

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: Organization UI

Review profile: ASSERTIVE

Plan: Pro Plus

Run ID: 9be8f823-1498-43df-9b44-a8f0307269fd

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

Use the checkbox below for a quick retry:

🔍 Trigger review

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

❤️ Share

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

radroid · 2026-08-08T08:38:28Z

Manual upstream sync. Resolved locally rather than by the CI agent: the range is 113 upstream commits against 83 fork patches, roughly 3× the 36-vs-37 range that already spent 81% of the resolver's 45-minute budget.

Do not use the merge button. This branch is the fork's patch series rebased onto new upstream, so main is not an ancestor of it. Land with:
git push --force-with-lease origin origin/t3x/sync-20260808:main
Recovery point: tag t3x/pre-sync-20260808 → 4bcf3450a.

upstream/main = 2c7267ad4. Every fork patch replayed — subject sets are identical before and after, nothing dropped or absorbed.

Verify

Green locally: typecheck, lint, and test --testTimeout=120000 --hookTimeout=120000 (15/15 packages, ~6.4k tests). One lint warning remains, in ThemeEditorPanel.tsx, which is byte-identical to upstream.

Conflicts that were more than mechanical

ComposerPrimaryActions.tsx — both of the fork's hoists had to be re-derived. Upstream grew its own renderStopGenerationButton(insidePendingAction), a size axis, where the fork's hoist carried an emphasis axis (Stop drops to a quiet outline beside Queue); they are now one renderStopButton(emphasisClassName, insidePendingAction). Upstream also restyled the send button off stageBackdropVariant/StageBackdropButtonArt onto the message-action tokens — the fork's hoisted copy was reverting that restyle, so it was re-taken from upstream and only the steering-aware aria-label kept.
supervisor.ts — upstream's fix: prevent reconnect loops during server stalls pingdotgg/t3code#5561 marks wakeProbeFailed when a wake probe fails and reads it to skip the first backoff rung. The fork's shared runLivenessProbe never set it, so the Ref was written by nobody and read as always-false. It now takes isWakeProbe, passed only at the wake call site, matching where upstream sets it.
ChatView.tsx — upstream gave onSend a directAnnotation parameter. Queued messages are text-only, so the queue branch would have enqueued the text and dropped the annotation silently; it now reads composerQueueMode && !directAnnotation, letting an annotated submit reach upstream's gate, which says the annotation stayed on the draft.
SettingsPanels.tsx — upstream renamed enableAssistantStreaming → enableLegacyTokenStreaming and folded that row into Legacy features (feat(web): fold plan mode and token-by-token output into Legacy features pingdotgg/t3code#5664). The fork patch was carrying the old row as context; it is not restored.
pnpm-lock.yaml — took upstream's side at all three conflicts, then regenerated once. electron 41.10.3, web-push, the nanoid@3.3.17 dedupe and the relay importer all verified present afterwards.

Follow-ups, unchanged by this sync

getSnapshot() on the boot path still risks the OOM upstream moved its own route away from. Deliberately left for its own PR with coverage, as the ledger says.
The fork's notification row is still absent from upstream's settings-search catalog.
.github/workflows/thread-transfer-report.yml arrives from upstream and must be disabled once it registers.

Closes the t3x-sync escalation (#49) and unblocks #54, whose upstream fix (pingdotgg#5557) is in this range.

🤖 Generated with Claude Code

coderabbitai · 2026-08-08T08:38:37Z

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: Organization UI

Review profile: ASSERTIVE

Plan: Pro Plus

Run ID: 9be8f823-1498-43df-9b44-a8f0307269fd

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

Use the checkbox below for a quick retry:

🔍 Trigger review

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

❤️ Share

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

radroid · 2026-08-08T08:38:28Z

Manual upstream sync. Resolved locally rather than by the CI agent: the range is 113 upstream commits against 83 fork patches, roughly 3× the 36-vs-37 range that already spent 81% of the resolver's 45-minute budget.

Do not use the merge button. This branch is the fork's patch series rebased onto new upstream, so main is not an ancestor of it. Land with:
git push --force-with-lease origin origin/t3x/sync-20260808:main
Recovery point: tag t3x/pre-sync-20260808 → 4bcf3450a.

upstream/main = 2c7267ad4. Every fork patch replayed — subject sets are identical before and after, nothing dropped or absorbed.

Verify

Green locally: typecheck, lint, and test --testTimeout=120000 --hookTimeout=120000 (15/15 packages, ~6.4k tests). One lint warning remains, in ThemeEditorPanel.tsx, which is byte-identical to upstream.

Conflicts that were more than mechanical

ComposerPrimaryActions.tsx — both of the fork's hoists had to be re-derived. Upstream grew its own renderStopGenerationButton(insidePendingAction), a size axis, where the fork's hoist carried an emphasis axis (Stop drops to a quiet outline beside Queue); they are now one renderStopButton(emphasisClassName, insidePendingAction). Upstream also restyled the send button off stageBackdropVariant/StageBackdropButtonArt onto the message-action tokens — the fork's hoisted copy was reverting that restyle, so it was re-taken from upstream and only the steering-aware aria-label kept.
supervisor.ts — upstream's fix: prevent reconnect loops during server stalls pingdotgg/t3code#5561 marks wakeProbeFailed when a wake probe fails and reads it to skip the first backoff rung. The fork's shared runLivenessProbe never set it, so the Ref was written by nobody and read as always-false. It now takes isWakeProbe, passed only at the wake call site, matching where upstream sets it.
ChatView.tsx — upstream gave onSend a directAnnotation parameter. Queued messages are text-only, so the queue branch would have enqueued the text and dropped the annotation silently; it now reads composerQueueMode && !directAnnotation, letting an annotated submit reach upstream's gate, which says the annotation stayed on the draft.
SettingsPanels.tsx — upstream renamed enableAssistantStreaming → enableLegacyTokenStreaming and folded that row into Legacy features (feat(web): fold plan mode and token-by-token output into Legacy features pingdotgg/t3code#5664). The fork patch was carrying the old row as context; it is not restored.
pnpm-lock.yaml — took upstream's side at all three conflicts, then regenerated once. electron 41.10.3, web-push, the nanoid@3.3.17 dedupe and the relay importer all verified present afterwards.

Follow-ups, unchanged by this sync

getSnapshot() on the boot path still risks the OOM upstream moved its own route away from. Deliberately left for its own PR with coverage, as the ledger says.
The fork's notification row is still absent from upstream's settings-search catalog.
.github/workflows/thread-transfer-report.yml arrives from upstream and must be disabled once it registers.

Closes the t3x-sync escalation (#49) and unblocks #54, whose upstream fix (pingdotgg#5557) is in this range.

🤖 Generated with Claude Code

coderabbitai · 2026-08-08T08:38:37Z

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: Organization UI

Review profile: ASSERTIVE

Plan: Pro Plus

Run ID: 9be8f823-1498-43df-9b44-a8f0307269fd

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

Use the checkbox below for a quick retry:

🔍 Trigger review

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

❤️ Share

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

radroid · 2026-08-08T08:38:28Z

Manual upstream sync. Resolved locally rather than by the CI agent: the range is 113 upstream commits against 83 fork patches, roughly 3× the 36-vs-37 range that already spent 81% of the resolver's 45-minute budget.

Do not use the merge button. This branch is the fork's patch series rebased onto new upstream, so main is not an ancestor of it. Land with:
git push --force-with-lease origin origin/t3x/sync-20260808:main
Recovery point: tag t3x/pre-sync-20260808 → 4bcf3450a.

upstream/main = 2c7267ad4. Every fork patch replayed — subject sets are identical before and after, nothing dropped or absorbed.

Verify

Green locally: typecheck, lint, and test --testTimeout=120000 --hookTimeout=120000 (15/15 packages, ~6.4k tests). One lint warning remains, in ThemeEditorPanel.tsx, which is byte-identical to upstream.

Conflicts that were more than mechanical

ComposerPrimaryActions.tsx — both of the fork's hoists had to be re-derived. Upstream grew its own renderStopGenerationButton(insidePendingAction), a size axis, where the fork's hoist carried an emphasis axis (Stop drops to a quiet outline beside Queue); they are now one renderStopButton(emphasisClassName, insidePendingAction). Upstream also restyled the send button off stageBackdropVariant/StageBackdropButtonArt onto the message-action tokens — the fork's hoisted copy was reverting that restyle, so it was re-taken from upstream and only the steering-aware aria-label kept.
supervisor.ts — upstream's fix: prevent reconnect loops during server stalls pingdotgg/t3code#5561 marks wakeProbeFailed when a wake probe fails and reads it to skip the first backoff rung. The fork's shared runLivenessProbe never set it, so the Ref was written by nobody and read as always-false. It now takes isWakeProbe, passed only at the wake call site, matching where upstream sets it.
ChatView.tsx — upstream gave onSend a directAnnotation parameter. Queued messages are text-only, so the queue branch would have enqueued the text and dropped the annotation silently; it now reads composerQueueMode && !directAnnotation, letting an annotated submit reach upstream's gate, which says the annotation stayed on the draft.
SettingsPanels.tsx — upstream renamed enableAssistantStreaming → enableLegacyTokenStreaming and folded that row into Legacy features (feat(web): fold plan mode and token-by-token output into Legacy features pingdotgg/t3code#5664). The fork patch was carrying the old row as context; it is not restored.
pnpm-lock.yaml — took upstream's side at all three conflicts, then regenerated once. electron 41.10.3, web-push, the nanoid@3.3.17 dedupe and the relay importer all verified present afterwards.

Follow-ups, unchanged by this sync

getSnapshot() on the boot path still risks the OOM upstream moved its own route away from. Deliberately left for its own PR with coverage, as the ledger says.
The fork's notification row is still absent from upstream's settings-search catalog.
.github/workflows/thread-transfer-report.yml arrives from upstream and must be disabled once it registers.

Closes the t3x-sync escalation (#49) and unblocks #54, whose upstream fix (pingdotgg#5557) is in this range.

🤖 Generated with Claude Code

coderabbitai · 2026-08-08T08:38:37Z

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: Organization UI

Review profile: ASSERTIVE

Plan: Pro Plus

Run ID: 9be8f823-1498-43df-9b44-a8f0307269fd

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

Use the checkbox below for a quick retry:

🔍 Trigger review

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

❤️ Share

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

radroid · 2026-08-08T08:38:28Z

Manual upstream sync. Resolved locally rather than by the CI agent: the range is 113 upstream commits against 83 fork patches, roughly 3× the 36-vs-37 range that already spent 81% of the resolver's 45-minute budget.

Do not use the merge button. This branch is the fork's patch series rebased onto new upstream, so main is not an ancestor of it. Land with:
git push --force-with-lease origin origin/t3x/sync-20260808:main
Recovery point: tag t3x/pre-sync-20260808 → 4bcf3450a.

upstream/main = 2c7267ad4. Every fork patch replayed — subject sets are identical before and after, nothing dropped or absorbed.

Verify

Green locally: typecheck, lint, and test --testTimeout=120000 --hookTimeout=120000 (15/15 packages, ~6.4k tests). One lint warning remains, in ThemeEditorPanel.tsx, which is byte-identical to upstream.

Conflicts that were more than mechanical

ComposerPrimaryActions.tsx — both of the fork's hoists had to be re-derived. Upstream grew its own renderStopGenerationButton(insidePendingAction), a size axis, where the fork's hoist carried an emphasis axis (Stop drops to a quiet outline beside Queue); they are now one renderStopButton(emphasisClassName, insidePendingAction). Upstream also restyled the send button off stageBackdropVariant/StageBackdropButtonArt onto the message-action tokens — the fork's hoisted copy was reverting that restyle, so it was re-taken from upstream and only the steering-aware aria-label kept.
supervisor.ts — upstream's fix: prevent reconnect loops during server stalls pingdotgg/t3code#5561 marks wakeProbeFailed when a wake probe fails and reads it to skip the first backoff rung. The fork's shared runLivenessProbe never set it, so the Ref was written by nobody and read as always-false. It now takes isWakeProbe, passed only at the wake call site, matching where upstream sets it.
ChatView.tsx — upstream gave onSend a directAnnotation parameter. Queued messages are text-only, so the queue branch would have enqueued the text and dropped the annotation silently; it now reads composerQueueMode && !directAnnotation, letting an annotated submit reach upstream's gate, which says the annotation stayed on the draft.
SettingsPanels.tsx — upstream renamed enableAssistantStreaming → enableLegacyTokenStreaming and folded that row into Legacy features (feat(web): fold plan mode and token-by-token output into Legacy features pingdotgg/t3code#5664). The fork patch was carrying the old row as context; it is not restored.
pnpm-lock.yaml — took upstream's side at all three conflicts, then regenerated once. electron 41.10.3, web-push, the nanoid@3.3.17 dedupe and the relay importer all verified present afterwards.

Follow-ups, unchanged by this sync

getSnapshot() on the boot path still risks the OOM upstream moved its own route away from. Deliberately left for its own PR with coverage, as the ledger says.
The fork's notification row is still absent from upstream's settings-search catalog.
.github/workflows/thread-transfer-report.yml arrives from upstream and must be disabled once it registers.

Closes the t3x-sync escalation (#49) and unblocks #54, whose upstream fix (pingdotgg#5557) is in this range.

🤖 Generated with Claude Code

coderabbitai · 2026-08-08T08:38:37Z

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: Organization UI

Review profile: ASSERTIVE

Plan: Pro Plus

Run ID: 9be8f823-1498-43df-9b44-a8f0307269fd

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

Use the checkbox below for a quick retry:

🔍 Trigger review

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

❤️ Share

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

radroid · 2026-08-08T08:38:28Z

Manual upstream sync. Resolved locally rather than by the CI agent: the range is 113 upstream commits against 83 fork patches, roughly 3× the 36-vs-37 range that already spent 81% of the resolver's 45-minute budget.

Do not use the merge button. This branch is the fork's patch series rebased onto new upstream, so main is not an ancestor of it. Land with:
git push --force-with-lease origin origin/t3x/sync-20260808:main
Recovery point: tag t3x/pre-sync-20260808 → 4bcf3450a.

upstream/main = 2c7267ad4. Every fork patch replayed — subject sets are identical before and after, nothing dropped or absorbed.

Verify

Green locally: typecheck, lint, and test --testTimeout=120000 --hookTimeout=120000 (15/15 packages, ~6.4k tests). One lint warning remains, in ThemeEditorPanel.tsx, which is byte-identical to upstream.

Conflicts that were more than mechanical

ComposerPrimaryActions.tsx — both of the fork's hoists had to be re-derived. Upstream grew its own renderStopGenerationButton(insidePendingAction), a size axis, where the fork's hoist carried an emphasis axis (Stop drops to a quiet outline beside Queue); they are now one renderStopButton(emphasisClassName, insidePendingAction). Upstream also restyled the send button off stageBackdropVariant/StageBackdropButtonArt onto the message-action tokens — the fork's hoisted copy was reverting that restyle, so it was re-taken from upstream and only the steering-aware aria-label kept.
supervisor.ts — upstream's fix: prevent reconnect loops during server stalls pingdotgg/t3code#5561 marks wakeProbeFailed when a wake probe fails and reads it to skip the first backoff rung. The fork's shared runLivenessProbe never set it, so the Ref was written by nobody and read as always-false. It now takes isWakeProbe, passed only at the wake call site, matching where upstream sets it.
ChatView.tsx — upstream gave onSend a directAnnotation parameter. Queued messages are text-only, so the queue branch would have enqueued the text and dropped the annotation silently; it now reads composerQueueMode && !directAnnotation, letting an annotated submit reach upstream's gate, which says the annotation stayed on the draft.
SettingsPanels.tsx — upstream renamed enableAssistantStreaming → enableLegacyTokenStreaming and folded that row into Legacy features (feat(web): fold plan mode and token-by-token output into Legacy features pingdotgg/t3code#5664). The fork patch was carrying the old row as context; it is not restored.
pnpm-lock.yaml — took upstream's side at all three conflicts, then regenerated once. electron 41.10.3, web-push, the nanoid@3.3.17 dedupe and the relay importer all verified present afterwards.

Follow-ups, unchanged by this sync

getSnapshot() on the boot path still risks the OOM upstream moved its own route away from. Deliberately left for its own PR with coverage, as the ledger says.
The fork's notification row is still absent from upstream's settings-search catalog.
.github/workflows/thread-transfer-report.yml arrives from upstream and must be disabled once it registers.

Closes the t3x-sync escalation (#49) and unblocks #54, whose upstream fix (pingdotgg#5557) is in this range.

🤖 Generated with Claude Code

coderabbitai · 2026-08-08T08:38:37Z

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: Organization UI

Review profile: ASSERTIVE

Plan: Pro Plus

Run ID: 9be8f823-1498-43df-9b44-a8f0307269fd

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

Use the checkbox below for a quick retry:

🔍 Trigger review

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

❤️ Share

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

radroid · 2026-08-08T08:38:28Z

Manual upstream sync. Resolved locally rather than by the CI agent: the range is 113 upstream commits against 83 fork patches, roughly 3× the 36-vs-37 range that already spent 81% of the resolver's 45-minute budget.

Do not use the merge button. This branch is the fork's patch series rebased onto new upstream, so main is not an ancestor of it. Land with:
git push --force-with-lease origin origin/t3x/sync-20260808:main
Recovery point: tag t3x/pre-sync-20260808 → 4bcf3450a.

upstream/main = 2c7267ad4. Every fork patch replayed — subject sets are identical before and after, nothing dropped or absorbed.

Verify

Green locally: typecheck, lint, and test --testTimeout=120000 --hookTimeout=120000 (15/15 packages, ~6.4k tests). One lint warning remains, in ThemeEditorPanel.tsx, which is byte-identical to upstream.

Conflicts that were more than mechanical

ComposerPrimaryActions.tsx — both of the fork's hoists had to be re-derived. Upstream grew its own renderStopGenerationButton(insidePendingAction), a size axis, where the fork's hoist carried an emphasis axis (Stop drops to a quiet outline beside Queue); they are now one renderStopButton(emphasisClassName, insidePendingAction). Upstream also restyled the send button off stageBackdropVariant/StageBackdropButtonArt onto the message-action tokens — the fork's hoisted copy was reverting that restyle, so it was re-taken from upstream and only the steering-aware aria-label kept.
supervisor.ts — upstream's fix: prevent reconnect loops during server stalls pingdotgg/t3code#5561 marks wakeProbeFailed when a wake probe fails and reads it to skip the first backoff rung. The fork's shared runLivenessProbe never set it, so the Ref was written by nobody and read as always-false. It now takes isWakeProbe, passed only at the wake call site, matching where upstream sets it.
ChatView.tsx — upstream gave onSend a directAnnotation parameter. Queued messages are text-only, so the queue branch would have enqueued the text and dropped the annotation silently; it now reads composerQueueMode && !directAnnotation, letting an annotated submit reach upstream's gate, which says the annotation stayed on the draft.
SettingsPanels.tsx — upstream renamed enableAssistantStreaming → enableLegacyTokenStreaming and folded that row into Legacy features (feat(web): fold plan mode and token-by-token output into Legacy features pingdotgg/t3code#5664). The fork patch was carrying the old row as context; it is not restored.
pnpm-lock.yaml — took upstream's side at all three conflicts, then regenerated once. electron 41.10.3, web-push, the nanoid@3.3.17 dedupe and the relay importer all verified present afterwards.

Follow-ups, unchanged by this sync

getSnapshot() on the boot path still risks the OOM upstream moved its own route away from. Deliberately left for its own PR with coverage, as the ledger says.
The fork's notification row is still absent from upstream's settings-search catalog.
.github/workflows/thread-transfer-report.yml arrives from upstream and must be disabled once it registers.

Closes the t3x-sync escalation (#49) and unblocks #54, whose upstream fix (pingdotgg#5557) is in this range.

🤖 Generated with Claude Code

coderabbitai · 2026-08-08T08:38:37Z

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: Organization UI

Review profile: ASSERTIVE

Plan: Pro Plus

Run ID: 9be8f823-1498-43df-9b44-a8f0307269fd

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

Use the checkbox below for a quick retry:

🔍 Trigger review

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

❤️ Share

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

radroid · 2026-08-08T08:38:28Z

Manual upstream sync. Resolved locally rather than by the CI agent: the range is 113 upstream commits against 83 fork patches, roughly 3× the 36-vs-37 range that already spent 81% of the resolver's 45-minute budget.

Do not use the merge button. This branch is the fork's patch series rebased onto new upstream, so main is not an ancestor of it. Land with:
git push --force-with-lease origin origin/t3x/sync-20260808:main
Recovery point: tag t3x/pre-sync-20260808 → 4bcf3450a.

upstream/main = 2c7267ad4. Every fork patch replayed — subject sets are identical before and after, nothing dropped or absorbed.

Verify

Green locally: typecheck, lint, and test --testTimeout=120000 --hookTimeout=120000 (15/15 packages, ~6.4k tests). One lint warning remains, in ThemeEditorPanel.tsx, which is byte-identical to upstream.

Conflicts that were more than mechanical

ComposerPrimaryActions.tsx — both of the fork's hoists had to be re-derived. Upstream grew its own renderStopGenerationButton(insidePendingAction), a size axis, where the fork's hoist carried an emphasis axis (Stop drops to a quiet outline beside Queue); they are now one renderStopButton(emphasisClassName, insidePendingAction). Upstream also restyled the send button off stageBackdropVariant/StageBackdropButtonArt onto the message-action tokens — the fork's hoisted copy was reverting that restyle, so it was re-taken from upstream and only the steering-aware aria-label kept.
supervisor.ts — upstream's fix: prevent reconnect loops during server stalls pingdotgg/t3code#5561 marks wakeProbeFailed when a wake probe fails and reads it to skip the first backoff rung. The fork's shared runLivenessProbe never set it, so the Ref was written by nobody and read as always-false. It now takes isWakeProbe, passed only at the wake call site, matching where upstream sets it.
ChatView.tsx — upstream gave onSend a directAnnotation parameter. Queued messages are text-only, so the queue branch would have enqueued the text and dropped the annotation silently; it now reads composerQueueMode && !directAnnotation, letting an annotated submit reach upstream's gate, which says the annotation stayed on the draft.
SettingsPanels.tsx — upstream renamed enableAssistantStreaming → enableLegacyTokenStreaming and folded that row into Legacy features (feat(web): fold plan mode and token-by-token output into Legacy features pingdotgg/t3code#5664). The fork patch was carrying the old row as context; it is not restored.
pnpm-lock.yaml — took upstream's side at all three conflicts, then regenerated once. electron 41.10.3, web-push, the nanoid@3.3.17 dedupe and the relay importer all verified present afterwards.

Follow-ups, unchanged by this sync

getSnapshot() on the boot path still risks the OOM upstream moved its own route away from. Deliberately left for its own PR with coverage, as the ledger says.
The fork's notification row is still absent from upstream's settings-search catalog.
.github/workflows/thread-transfer-report.yml arrives from upstream and must be disabled once it registers.

Closes the t3x-sync escalation (#49) and unblocks #54, whose upstream fix (pingdotgg#5557) is in this range.

🤖 Generated with Claude Code

coderabbitai · 2026-08-08T08:38:37Z

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: Organization UI

Review profile: ASSERTIVE

Plan: Pro Plus

Run ID: 9be8f823-1498-43df-9b44-a8f0307269fd

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

Use the checkbox below for a quick retry:

🔍 Trigger review

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

❤️ Share

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

radroid merged commit daf639b into mainAug 8, 2026
2 of 3 checks passed