Skip to content

revert(web): working threads stay in the Working shelf when their environment disconnects - #31269

Merged
juliusmarminge merged 1 commit into
mainfrom
t3/revert-working-shelf-disconnect-gate
Nov 5, 2026
Merged

juliusmarminge merged 1 commit into
mainfrom
t3/revert-working-shelf-disconnect-gate

Conversation

@juliusmarminge

Copy link
Copy Markdown
Member

Reverts https://git.cafe/pingdotgg/t3code/pulls/26195.

A thread that says it is working belongs in the Working shelf. https://git.cafe/pingdotgg/t3code/pulls/26195 gated the shelf on the environment being connected and its shell fully synced, so after a remote box dropped (an OOM on cups here) its still-running threads moved back into the main list while their rows kept saying "Working 39m". The sidebar ended up contradicting itself.

This restores the previous rule: the shelf follows the thread's working state only.

Model: Claude Opus 5.5 in Claude Code (T3 Code).

🤖 Generated with Claude Code

…ironment disconnects

This reverts commit 033a753 (#26195).

A thread that says it is working belongs in the Working shelf. Gating the
shelf on connection and shell-sync state moved still-running threads on a
remote environment back into the main list after a disconnect, while their
rows kept showing "Working".

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@github-actions github-actions Bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:M 30-99 changed lines (additions + deletions). labels Nov 5, 2026
@macroscopeapp

macroscopeapp Bot commented Nov 5, 2026

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Approved at 15146f4

Macroscope's review found this PR approvable — Working threads now stay in the Working shelf when their environment disconnects. This is a limited display-grouping change; existing settings and connection-based dragging safeguards remain unchanged.

Notes:

  • All code in this push has already been reviewed. Approvability was decided on eligibility alone.

You can add or adjust custom eligibility rules. Learn more.

@juliusmarminge
juliusmarminge merged commit 3470164 into main Nov 5, 2026
31 of 32 checks passed
@juliusmarminge
juliusmarminge deleted the t3/revert-working-shelf-disconnect-gate branch November 5, 2026 03:22
sandscooling pushed a commit to sandscooling/t3code that referenced this pull request Nov 5, 2026
Sync 1105a: 31 upstream commits to 67eebac. Five conflicts, all
additive (pingdotgg#24186 tab eviction in three preview files, pingdotgg#31269 revert in
Sidebar.tsx, pingdotgg#24904 ghq clone layout in contracts settings). Fork code
adjusted for upstream's new Effect rules (pingdotgg#31216, pingdotgg#31217) and a doubled
import from the auto-merge.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
github-actions Bot added a commit to Jefferson-Butler1/t3code that referenced this pull request Nov 5, 2026
No patches were dropped. Upstream has no Inbox order setting of its own: nothing between 7f6f47b and the tag adds `InboxSortOrder` or anything like it.

I ported `inbox-order.patch`. Only `apps/web/src/components/Sidebar.tsx` conflicted. Upstream pingdotgg#31269 reverted "working threads stay in the Working shelf when their environment disconnects". That removed the `disconnectedEnvironmentIds` field from `SidebarThreadPartitionInput`, the code in `useSidebarThreads` that computed it, and the places that passed it in and read it back out. The patch's lines sat next to that code, so all four hunks conflicted. I took upstream's version each time and put back only the patch's `inboxSortOrder` line: the interface field, the `useClientSettings((s) => s.sidebarInboxSortOrder)` read, the argument passed to `partitionSidebarThreads`, and the destructured value it sorts with. The disconnected-environment code stays removed. The other 15 files in the patch merged on their own, and the commit message is unchanged.

Checks, all run on the fully patched tree:
- `vp -C apps/web run typecheck`, `apps/desktop`, `apps/mobile` and `packages/contracts` typecheck: all pass. The only output is effect `schemaClassMissingBrand` suggestions, no errors.
- `vp -C apps/desktop run build`: passes, 5 of 5 tasks.
- `vp lint apps/web/src/components/ChatView.tsx scripts/build-desktop-artifact.ts`: passes.
- `vp fmt --check` on all 16 files the patch touches: passes.
- `vp -C apps/web test run src/components/Sidebar.logic.test.ts`: 81 of 81 pass. This is the test next to the file I edited.
- `vp -C packages/client-runtime test run src/state/threadInbox.test.ts`: 23 of 23 pass.
- Replay: the regenerated patch applies with plain `git am` (no `--3way`) to a fresh checkout of the tag. The resulting tree (7c52bea) is identical to the tree I checked.
github-actions Bot added a commit to omarcresp/t3code-flake that referenced this pull request Nov 5, 2026
**v0.1.8-nightly.20261105.4218** · 9 changes from 3 contributors

- **Thread history.** Long threads retain their visible history when you open or reconnect to them.

### Plus 4 more bug fixes.

<details>
<summary>Full changelog</summary>

## What's Changed
* revert(web): working threads stay in the Working shelf when their environment disconnects by @juliusmarminge in pingdotgg/t3code#31269
* refactor: Effect code reads env through HostProcess.Environment by @juliusmarminge in pingdotgg/t3code#31218
* refactor: Effect.try calls map failures to typed errors by @juliusmarminge in pingdotgg/t3code#31217
* fix(web): sidebar project filter rows line up and stay still on hover by @shivamhwp in pingdotgg/t3code#29639
* refactor: errors are Schema.TaggedError, not Data.TaggedError or native Error by @juliusmarminge in pingdotgg/t3code#31216
* fix(server): a stopped run no longer shrinks thread history to one row by @shivamhwp in pingdotgg/t3code#31266
* fix(server): refresh divergence after a merged branch ref changes by @Yash-Singh1 in pingdotgg/t3code#31342
* fix(mobile): one aligned notice for ChatGPT sharing limits by @shivamhwp in pingdotgg/t3code#31277
* fix(mobile): composer keeps the keyboard when a queued edit ends by @shivamhwp in pingdotgg/t3code#31317


**Full Changelog**: pingdotgg/t3code@v0.1.8-nightly.20261105.4205...v0.1.8-nightly.20261105.4218

</details>


Upstream release: https://github.com/pingdotgg/t3code/releases/tag/v0.1.8-nightly.20261105.4218
Pipyakas pushed a commit to Pipyakas/t3code that referenced this pull request Nov 5, 2026
…ironment disconnects (pingdotgg#31269)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
(cherry picked from commit 3470164)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:M 30-99 changed lines (additions + deletions). vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant