Repository navigation
Commit fbb074b
authored
chore: merge upstream t3code to 18e2742 (pingdotgg#253)
Merges upstream `pingdotgg/t3code` `18e2742519` (base `e07595714a`, 45
commits) into the fork. Branched from `main`; no open merge PR to stack
on.
## What needs a reviewer's eye
- **tsc-rs came back through silent auto-merges.** Upstream pingdotgg#23023 made
the catalog `typescript` `npm:@tsc-rs/typescript` and dropped
`@effect/tsgo` and the `effect-tsgo patch` prepare step. Most of that
landed in `pnpm-workspace.yaml` and `package.json` with no conflict.
Restored TypeScript 7.0.2, `@effect/tsgo` and the prepare step, and
added a `typecheck-toolchain` inventory entry so the next merge checks
these files. Upstream's 25 per-package `tsc-rs --noEmit` → `tsc
--noEmit` edits converge with what the fork already had.
- **`apps/server/src/ws.ts`:** upstream now splits the RPC group in two
to keep handler requirements typed (pingdotgg#23813). That fixes the same TS2589
problem the fork's `toWsRpcLayer`/`WsRpcHandlers` cast worked around, so
I took upstream's version and dropped the cast. The fork's sandbox,
subtask and scripts handlers fall into upstream's "other" group.
- **`no-em-dash-copy` lint (pingdotgg#23799)** flagged 16 lines of fork-only copy
(sandbox panel, Moatless settings, fork dialog, preview inspector).
Rewrote them, and placeholder `"—"` is now `"-"` to match upstream.
- **`resolution-check.mjs`** now reports a path as convergence, not as a
dropped upstream change, when a three-way merge of upstream's change
onto the fork's copy is a clean no-op.
Other conflicts: `SettingsPanels.tsx` puts upstream's
`ThreadTitleInstructionsSettings` inside the
`FEATURES.serverBehaviorSettings` gate, and its search item is mapped to
the same flag. `TimelineUserMessageRow.tsx` keeps the origin chip next
to upstream's folded agent rows. `PreviewView.tsx` takes upstream's copy
and keeps the fork's inspector reason. In `AGENTS.md` I kept the fork's
text and dropped upstream's tsc-rs, "never make a PR" and GitCafe lines.
`pnpm-lock.yaml` was re-derived from upstream's copy; the fork's
`moatless-api` edge is present and there are no `@tsc-rs` entries.
Counts: 323 files landed against 348 in the upstream range. The 25-file
gap is the converged typecheck scripts plus the two `decide` files. The
fork delta went from 825 files to 797.
## Verification
`verify.mjs`: duplicate-adds, tripwires, resolution-check,
unsupported-methods (ADD 0 / DROP 0 / KEEP 2), lockfile, fmt, lint,
typecheck and build all pass. The test step has failures that are all
environmental:
- Seen in earlier merges: `t3` `RepositoryIdentityResolver` and
`GitVcsDriver` (the sandbox's git `insteadOf` rewrite),
`ServerBrowserPage` (missing chromium build), and `provider-opencode`
`OpenCodeServerLedger`.
- New: `t3` `CodexChatGptAuth` and `CodexManagedRuntime` fail with
`Untrusted IPC parent`. The cause is the sandbox's `/tmp`, which is mode
2777 with no sticky bit. Both pass (58 tests) with a private `TMPDIR`.
Registered in `gaps.md`.
- With a Playwright browser-path shim and that `TMPDIR`, `@t3tools/web`
passes 381/381 files and `t3` fails only the two `insteadOf` files.
## Feature classification
**Usable as-is**
- Messages from other agents fold into one-line rows (pingdotgg#23135). Keyed on
`createdBy: "agent"`, which the Moatless projection already sends.
- Tool images beyond the preview limit are marked (pingdotgg#23595); tool icons
keep their detail in light mode (pingdotgg#23896); toast and subagent-bar layout
fixes (pingdotgg#23777, pingdotgg#23502).
- ChatView re-render work (pingdotgg#23117, pingdotgg#23124); the sidebar follows the
active thread after history navigation (pingdotgg#23519); paused sidebar videos
stop reloading (pingdotgg#23106).
- A ChatGPT Business usage limit offers a copyable admin request
(pingdotgg#23361). It shows when the thread error carries the code.
- Provider updates no longer pop toasts on launch (pingdotgg#23233).
**Unsupported in Moatless / needs implementation**
- Thread title instructions: the `threadTitleInstructions` server
setting (pingdotgg#21882). Hidden under `FEATURES.serverBehaviorSettings` because
Moatless names its own threads.
- Telemetry export endpoint source: the `otlp*Source` and
`otlp*Variable` fields (pingdotgg#23713). This is on the diagnostics surface,
which `FEATURES.diagnostics` already gates.
- GitCafe reviewers, labels and MCP URLs (pingdotgg#23034, pingdotgg#23887, pingdotgg#23899), and
managed Codex token renewal (pingdotgg#21786, pingdotgg#21787). These belong to upstream's
own server.
**Backend behavior to consider reproducing in Moatless** (added to
[runtime
fixes](docs/fork/gaps.md#runtime-fixes-upstream-made-to-its-own-server))
- `compactIdleThreads` is a boolean on the wire again, and the mode
moved to `idleCompaction` (pingdotgg#23454).
- A PR watch records `checksAwaitedSince` and wakes its thread when no
check ever reports (pingdotgg#23863).
- Shell snapshots on large databases no longer scan every thread
(pingdotgg#23751). Subagent transcript updates stay off the shell stream
(pingdotgg#23783).
- A Codex parent resumes once its native children finish (pingdotgg#23840). A
Claude agent stops when the server that started it dies (pingdotgg#23389).
- A clone retries over HTTPS when the SSH key is refused (pingdotgg#23170).
Forgejo merges follow the repository's delete-branch setting (pingdotgg#23471).
- Assets carry a `fileRevision` that does not change when the URL is
re-signed.
Sweep: 2 new-file hits (`apps/mobile/.../ThreadScreenHost.tsx` and the
Clerk Expo patch rename). Both are outside the web surface the fork
ships, so I took them as upstream's. No new workflows.
🤖 Generated with [Claude Code](https://claude.com/claude-code)
---
Moatless task:
https://moatless.soaplabstest.com/tasks/e677a17e-2f52-4c8d-b273-27a449d05732337 files changed
Lines changed: 10810 additions & 5201 deletions
File tree
- .agents/skills/fork-upstream-merge/scripts
- .devcontainer
- .github
- actions/setup-ci-deps
- workflows
- apps
- desktop
- src
- app
- wsl
- marketing/src
- layouts
- pages
- mobile
- modules
- t3-composer-editor/ios
- t3-native-controls/ios
- Resources/Icons
- src
- components
- ui
- features
- files
- home
- keyboard
- layout
- projects
- prompt-links
- pull-requests
- showcase
- threads
- voice-input
- workspace
- lib
- native
- state
- widgets
- server
- scripts
- src
- assets
- cli
- cloud
- mcp/toolkits/pullRequests
- observability
- orchestration-v2
- Adapters
- persistence
- Migrations
- provider
- Drivers
- pullRequest
- sourceControl
- textGeneration
- usage
- web
- src
- components
- chat
- cloud
- device
- diffs
- files
- media
- preview
- pullRequest
- sandbox
- settings
- moatless
- sidebar
- ui
- usage
- fork
- lib
- routes
- state
- docs
- fork
- internals
- operations
- user
- oxlint-plugin-t3code
- rules
- packages
- client-runtime/src
- state
- work-log
- contracts
- src
- provider-core/src/server
- provider-opencode/src/server
- source-control-core/src/server
- source-control-forgejo/src/server
- source-control-gitcafe/src
- client
- server
- patches
- scripts
- fixtures/issue-16534
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 | | |
| 42 | + | |
41 | 43 | | |
42 | 44 | | |
43 | 45 | | |
| |||
184 | 186 | | |
185 | 187 | | |
186 | 188 | | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
187 | 215 | | |
188 | 216 | | |
189 | 217 | | |
190 | 218 | | |
191 | 219 | | |
192 | 220 | | |
193 | 221 | | |
194 | | - | |
| 222 | + | |
195 | 223 | | |
196 | 224 | | |
197 | 225 | | |
| |||
204 | 232 | | |
205 | 233 | | |
206 | 234 | | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
207 | 239 | | |
208 | 240 | | |
209 | 241 | | |
| |||
365 | 397 | | |
366 | 398 | | |
367 | 399 | | |
368 | | - | |
| 400 | + | |
369 | 401 | | |
370 | 402 | | |
371 | 403 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
11 | | - | |
| 11 | + | |
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
7 | | - | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
8 | 9 | | |
9 | 10 | | |
10 | 11 | | |
11 | 12 | | |
12 | 13 | | |
| 14 | + | |
| 15 | + | |
13 | 16 | | |
14 | 17 | | |
| 18 | + | |
15 | 19 | | |
16 | 20 | | |
17 | 21 | | |
18 | 22 | | |
19 | | - | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
20 | 35 | | |
21 | 36 | | |
| 37 | + | |
22 | 38 | | |
23 | 39 | | |
24 | 40 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
43 | 43 | | |
44 | 44 | | |
45 | 45 | | |
46 | | - | |
| 46 | + | |
47 | 47 | | |
48 | 48 | | |
49 | 49 | | |
| |||
87 | 87 | | |
88 | 88 | | |
89 | 89 | | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
90 | 93 | | |
91 | 94 | | |
92 | 95 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
8 | 17 | | |
9 | 18 | | |
10 | 19 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
366 | 366 | | |
367 | 367 | | |
368 | 368 | | |
369 | | - | |
| 369 | + | |
370 | 370 | | |
371 | 371 | | |
372 | 372 | | |
373 | 373 | | |
374 | 374 | | |
375 | | - | |
| 375 | + | |
376 | 376 | | |
377 | 377 | | |
378 | 378 | | |
379 | 379 | | |
380 | 380 | | |
381 | | - | |
| 381 | + | |
382 | 382 | | |
383 | 383 | | |
384 | 384 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
463 | 463 | | |
464 | 464 | | |
465 | 465 | | |
466 | | - | |
467 | | - | |
| 466 | + | |
| 467 | + | |
468 | 468 | | |
469 | 469 | | |
470 | 470 | | |
471 | 471 | | |
472 | 472 | | |
473 | | - | |
| 473 | + | |
474 | 474 | | |
475 | 475 | | |
476 | 476 | | |
| |||
699 | 699 | | |
700 | 700 | | |
701 | 701 | | |
702 | | - | |
| 702 | + | |
703 | 703 | | |
704 | 704 | | |
705 | 705 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
43 | 43 | | |
44 | 44 | | |
45 | 45 | | |
46 | | - | |
47 | | - | |
48 | | - | |
| 46 | + | |
49 | 47 | | |
50 | 48 | | |
51 | 49 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
95 | 95 | | |
96 | 96 | | |
97 | 97 | | |
98 | | - | |
| 98 | + | |
99 | 99 | | |
100 | 100 | | |
101 | 101 | | |
| |||
0 commit comments