Repository navigation
Commit e58093f
authored
chore: merge upstream t3code to e536bfd (pingdotgg#237)
Merges `pingdotgg/t3code` `e536bfd33b` (106 commits since `6002c5c68c`)
into the fork. One merge commit; nothing stacked.
## Merge summary
- **Landed:** 475 files against 476 in the upstream range. The one
missing is `package.json`: its only upstream change was the `tsc-rs`
0.7.0 bump, which the fork drops (`root-package-json`). The fork delta
is 809 files.
- **Conflicts (5):**
- `package.json`: dropped the `tsc-rs` bump.
- `pnpm-lock.yaml`: stripped the `[email protected]` entries from upstream's
copy and re-derived it.
- `Sidebar.tsx`: kept the fork's thread-list filter and took upstream's
new `useSidebarProjectGroups` hook. That hook sorts project groups by
all thread shells, not by the filtered list.
- `SettingsPanels.tsx`: kept the `serverBehaviorSettings` gate and took
upstream's new description.
- `threadShell.ts`: kept the fork's subagent predicate and took
upstream's `subagentRequests` argument.
- **Fix after the merge:** upstream's new
`useProjectScriptSettings.test.tsx` used `previewUrl`/`autoOpenPreview`.
I changed it to the fork's `port`.
- **Unsupported methods:** nothing to add or drop. `vcs.switchRef` and
`git.preparePullRequestThread` stay as they are.
- **Verification:** `verify.mjs` passes every check except `test`:
- duplicate-adds, tripwires, resolution-check, lockfile, fmt, lint,
typecheck (re-run after the fix) and build all pass.
- Six test files fail on their own, all because of the sandbox:
- the five recorded in earlier merges: `AgentScope` (`oom_score_adj`),
`ServerBrowserPage` (no Playwright browser), `AcpAdapterV2`,
`OrchestratorReplayFixtures`, `OpenCodeServerLedger`;
- one new: `@t3tools/ssh` `tunnel.test.ts` from upstream pingdotgg#19432. It
fails the same way `AcpAdapterV2` does: a killed process is never
reaped, so it still reads as alive. The fork does not touch
`packages/ssh`.
- `@t3tools/web` tests pass after the fix.
- Details are in `docs/fork/upstream-merge-log.md`. `docs/fork/gaps.md`
has new notes under five existing entries: capabilities, settlement
rules, pull request link, Orchestrator V2 (transcript read) and runtime
fixes.
## Usable as-is
- Waiting status icon and elapsed timer in the sidebar (pingdotgg#19617)
- The settle shortcut moves on to the next thread, the same way the
sidebar does (pingdotgg#19328)
- Terminal resize, recorded-shortcut save, a keybindings page that
prompts to connect, and settings that save after a stored value fails to
decode (pingdotgg#19395, pingdotgg#19365, pingdotgg#19400, pingdotgg#19312)
- The Mermaid code toggle stays in place, cursor stops stay outside
styled markers, and live reasoning stays scrolled while it streams
(pingdotgg#19601, pingdotgg#19651, pingdotgg#19334)
- PR filters hide Scratch and the project filter follows sidebar order;
`#` suggestions include the thread's PRs; merged PRs are no longer
re-read every minute (pingdotgg#19179, pingdotgg#19180, pingdotgg#19357, pingdotgg#19374)
- New provider-update-checks copy (pingdotgg#18208), shown only where the fork's
`serverBehaviorSettings` gate already shows that row
- Dependency bumps: Effect 4.0.4, OpenCode 2.0.28. `tsc-rs` 0.7.0 is
deliberately dropped.
## Unsupported in Moatless / needs implementation
- **Auto-settle keeps threads with a PR** (pingdotgg#14642): adds the
`sidebarAutoSettleKeepPullRequests` setting and the
`threadAutoSettlementScope` capability. Moatless does not report the
capability, so the row stays hidden.
- **Settled-worktree cleanup** (pingdotgg#15208): adds the
`worktreeSettledAfterDays` setting and the `settledWorktreeCleanup`
capability (Storage settings). Not reported, so the row is hidden.
- **Thread transcript HTTP read** (pingdotgg#15210): `GET
/api/orchestration/threads/:threadId/transcript`, used only for a thread
dropped in from another environment. Moatless does not route it, and a
single-environment deployment cannot reach it.
- **`thread.pull-request-link-updated` event** (pingdotgg#19248): Moatless sends
no pull-request frames; it changes the listing instead.
- **Delegated-task question handling**: `hasPendingQuestion` on the
orchestrator MCP task result (pingdotgg#18459, pingdotgg#19521, pingdotgg#19538).
- T3 Connect revoked links, SSH and Tailscale, pairing, and desktop- and
mobile-only items: not used by the Moatless web client.
## Backend behavior to consider reproducing in Moatless
- Inactivity auto-settle that skips PR-linked threads (pingdotgg#14642); settled
and idle-released threads stop reading as Waiting (pingdotgg#19355)
- A retention sweep for settled threads' workspaces (pingdotgg#15208, pingdotgg#19418)
- Store a PR link only when it changes, and stop re-reading merged PRs
each turn (pingdotgg#19248, pingdotgg#19344)
- GitHub reviewers include requested teams (pingdotgg#19375); new worktrees
survive a concurrent fetch (pingdotgg#19411)
- Commit and title generation fall back to the custom model (pingdotgg#19386)
- Claude: `managed-mcp.json` is honoured and a 403 no longer says to log
in (pingdotgg#18706, pingdotgg#15872)
- Codex: "Always allow this session" works and slow MCP servers no
longer drop tools (pingdotgg#19635, pingdotgg#19368)
- CLIs behind mise wrappers no longer time out (pingdotgg#19340); cold usage
scans stop stalling the server (pingdotgg#19446); a single database owner is
enforced, with exit code 78 (pingdotgg#16102)
🤖 Generated with [Claude Code](https://claude.com/claude-code)
---
Moatless task:
https://moatless.soaplabstest.com/tasks/4979b4c3-e4cc-4911-849b-adb94cb65be6477 files changed
Lines changed: 20455 additions & 4944 deletions
File tree
- .github
- ISSUE_TEMPLATE
- triage
- apps
- desktop/src
- app
- backend
- preview
- settings
- shell
- snapShot
- ssh
- updates
- wsl
- mobile/src
- components
- features
- cloud
- connection
- home
- pull-requests
- settings
- sharing
- threads
- workspace
- lib
- state
- server
- integration
- scripts
- src
- assets
- auth
- cli
- cloud
- desktopUpdate
- environment
- git
- mcp
- toolkits
- orchestrator
- pullRequests
- observability
- orchestration-v2
- Adapters
- testkit
- fixtures
- delegated_task_status
- message_steering
- multi_turn
- muse_permission
- muse_subagent_approval
- muse_subagent_interrupt
- muse_workflow
- plan_questions
- proposed_plan
- provider_thread_resume
- queued_turn
- simple
- subagent_continue
- subagent_v2_approval
- subagent_v2_nested_approval
- subagent_v2_nested
- subagent_v2
- subagent
- thread_fork_native_continue
- thread_fork_native_prior_turn
- thread_fork_native_siblings
- thread_fork_native
- thread_merge_back_continue
- thread_merge_back_siblings
- thread_rollback_after_restart
- thread_rollback_to_stopped_turn
- thread_rollback
- todo_list
- tool_call_read_only_on_request
- tool_call_restricted_granular
- tool_call_workspace_never
- turn_interrupt_mid_tool
- turn_interrupt
- web_search
- persistence
- preview
- process
- project
- provider
- Drivers
- acp
- testing
- pullRequest
- relay
- resourceTelemetry
- scheduledTasks
- sourceControl
- telemetry
- terminal
- textGeneration
- vcs
- web/src
- assets
- cloud
- components
- chat
- cloud
- onboarding
- pullRequest
- settings
- sidebar
- hooks
- lib
- routes
- state
- terminal/ghostty
- docs
- fork
- internals
- operations
- orchestration-v2
- user
- infra/relay/src
- agentActivity
- environments
- hooks
- http
- packages
- client-runtime
- src
- connection
- operations
- relay
- rpc
- state
- contracts/src
- provider-acp-registry/src/server
- provider-acp/src/server
- provider-core/src
- server
- provider-cursor/src/server
- provider-muse/src
- server
- provider-opencode
- src/server
- v2
- source-control-bitbucket/src/server
- source-control-github/src/server
- ssh/src
- tailscale/src
- patches
- scripts
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
40 | | - | |
| 40 | + | |
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
| 9 | + | |
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
21 | | - | |
22 | | - | |
23 | | - | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
24 | 30 | | |
25 | 31 | | |
26 | 32 | | |
| |||
30 | 36 | | |
31 | 37 | | |
32 | 38 | | |
33 | | - | |
34 | | - | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
35 | 49 | | |
36 | 50 | | |
37 | 51 | | |
| |||
82 | 96 | | |
83 | 97 | | |
84 | 98 | | |
85 | | - | |
86 | | - | |
| 99 | + | |
| 100 | + | |
87 | 101 | | |
88 | 102 | | |
89 | 103 | | |
| |||
105 | 119 | | |
106 | 120 | | |
107 | 121 | | |
| 122 | + | |
| 123 | + | |
108 | 124 | | |
109 | 125 | | |
110 | 126 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
97 | 97 | | |
98 | 98 | | |
99 | 99 | | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
100 | 112 | | |
101 | 113 | | |
102 | 114 | | |
103 | 115 | | |
104 | 116 | | |
105 | | - | |
106 | | - | |
107 | | - | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
108 | 121 | | |
109 | 122 | | |
110 | 123 | | |
| |||
140 | 153 | | |
141 | 154 | | |
142 | 155 | | |
| 156 | + | |
143 | 157 | | |
144 | 158 | | |
145 | 159 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
45 | | - | |
| 45 | + | |
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
411 | 411 | | |
412 | 412 | | |
413 | 413 | | |
414 | | - | |
| 414 | + | |
415 | 415 | | |
416 | 416 | | |
417 | 417 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
| 2 | + | |
2 | 3 | | |
3 | 4 | | |
4 | 5 | | |
| |||
124 | 125 | | |
125 | 126 | | |
126 | 127 | | |
| 128 | + | |
127 | 129 | | |
128 | 130 | | |
129 | 131 | | |
| |||
186 | 188 | | |
187 | 189 | | |
188 | 190 | | |
| 191 | + | |
189 | 192 | | |
190 | 193 | | |
191 | 194 | | |
| |||
264 | 267 | | |
265 | 268 | | |
266 | 269 | | |
267 | | - | |
| 270 | + | |
268 | 271 | | |
269 | 272 | | |
270 | 273 | | |
| |||
1206 | 1209 | | |
1207 | 1210 | | |
1208 | 1211 | | |
| 1212 | + | |
| 1213 | + | |
| 1214 | + | |
| 1215 | + | |
| 1216 | + | |
| 1217 | + | |
| 1218 | + | |
| 1219 | + | |
| 1220 | + | |
| 1221 | + | |
| 1222 | + | |
| 1223 | + | |
| 1224 | + | |
| 1225 | + | |
| 1226 | + | |
| 1227 | + | |
| 1228 | + | |
| 1229 | + | |
| 1230 | + | |
| 1231 | + | |
| 1232 | + | |
| 1233 | + | |
| 1234 | + | |
| 1235 | + | |
| 1236 | + | |
| 1237 | + | |
| 1238 | + | |
| 1239 | + | |
| 1240 | + | |
| 1241 | + | |
| 1242 | + | |
| 1243 | + | |
| 1244 | + | |
1209 | 1245 | | |
1210 | 1246 | | |
1211 | 1247 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
| 45 | + | |
45 | 46 | | |
46 | 47 | | |
47 | 48 | | |
| |||
65 | 66 | | |
66 | 67 | | |
67 | 68 | | |
68 | | - | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
69 | 72 | | |
70 | 73 | | |
71 | 74 | | |
| |||
304 | 307 | | |
305 | 308 | | |
306 | 309 | | |
| 310 | + | |
307 | 311 | | |
308 | 312 | | |
309 | 313 | | |
| |||
867 | 871 | | |
868 | 872 | | |
869 | 873 | | |
| 874 | + | |
870 | 875 | | |
| 876 | + | |
871 | 877 | | |
872 | 878 | | |
873 | 879 | | |
| |||
937 | 943 | | |
938 | 944 | | |
939 | 945 | | |
| 946 | + | |
| 947 | + | |
| 948 | + | |
| 949 | + | |
| 950 | + | |
940 | 951 | | |
941 | 952 | | |
942 | 953 | | |
| |||
1013 | 1024 | | |
1014 | 1025 | | |
1015 | 1026 | | |
1016 | | - | |
| 1027 | + | |
1017 | 1028 | | |
1018 | 1029 | | |
1019 | 1030 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
| 17 | + | |
17 | 18 | | |
18 | 19 | | |
19 | 20 | | |
| |||
86 | 87 | | |
87 | 88 | | |
88 | 89 | | |
| 90 | + | |
89 | 91 | | |
90 | 92 | | |
91 | 93 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
102 | 102 | | |
103 | 103 | | |
104 | 104 | | |
| 105 | + | |
105 | 106 | | |
106 | 107 | | |
107 | 108 | | |
| |||
215 | 216 | | |
216 | 217 | | |
217 | 218 | | |
| 219 | + | |
218 | 220 | | |
219 | 221 | | |
220 | 222 | | |
| |||
303 | 305 | | |
304 | 306 | | |
305 | 307 | | |
| 308 | + | |
| 309 | + | |
| 310 | + | |
| 311 | + | |
| 312 | + | |
| 313 | + | |
| 314 | + | |
306 | 315 | | |
307 | 316 | | |
308 | 317 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2501 | 2501 | | |
2502 | 2502 | | |
2503 | 2503 | | |
2504 | | - | |
| 2504 | + | |
2505 | 2505 | | |
2506 | 2506 | | |
2507 | 2507 | | |
| |||
0 commit comments