Repository navigation
Commit 7a94ff9
authored
chore: merge upstream t3code to ebdcda1 (pingdotgg#191)
Merges `pingdotgg/t3code` `78af372cf..ebdcda1` (39 commits) into the
fork. The merge PR is not stacked; it branches from `main`.
## Resolution
- **8 conflicts.** Each was resolved using the verdict `preflight.mjs`
gave for it. The per-file details are in
`docs/fork/upstream-merge-log.md`.
- `apps/server/src/cli/pair.ts` stays deleted, as listed in
`deletedUpstreamPaths`.
- `ThreadPullRequestsPanel.tsx` takes upstream. Upstream pingdotgg#13061 now
names the repository on each linked PR, so the fork's delta there has
converged and the file is identical to upstream.
- **New gate.** Upstream's chat code-block **Run** button (pingdotgg#13060) runs
`scripts.run` with a synthetic `chat-code-block` id. The Moatless
backend rejects that id with `ScriptNotFound`, so `ChatView` hides the
button on environments that report `workspaceScripts`. This is recorded
in the inventory (`host-run-scripts`) and in `gaps.md`.
- **Lint.** Upstream pingdotgg#13371/pingdotgg#13397 made `shadcn(no-arbitrary-values)` a
lint error, which flagged 130 hits in fork code, mostly
`settings/moatless/**`. I mapped each one onto the type scale the same
way upstream mapped its own: `text-[13px]` becomes `text-sm`, `[11px]`
becomes `text-2xs`, `[10.5px]` and `[.65rem]` become `text-3xs`, and so
on. Some Moatless settings text therefore renders at slightly different
sizes.
- **Type fix.** The fork's Mermaid `MarkdownCodeBlock` now passes
upstream's required `isStreaming` prop.
- **Lockfile.** `pnpm-lock.yaml` was re-derived with `install.mjs`.
- **File counts.** 515 files landed, against 489 in the upstream range.
The fork delta is 756 files. The gap is explained in the log entry.
## Verification
- A full run of `verify.mjs` passes all 10 checks, tests included.
- The unsupported-method derivation reports no ADD and no DROP.
- `resolution-check.mjs` and `duplicate-adds.mjs` report nothing.
## Upstream feature classification
### Usable as-is
- The sidebar Back button always returns to the main app (pingdotgg#13516),
including Escape on settings.
- Linked PRs show repository names (pingdotgg#13061).
- Colors come from theme tokens, text uses scale values, and disabled
controls have consistent opacity (pingdotgg#13371, pingdotgg#13397, pingdotgg#11441).
- Working and monitoring threads fade in the sidebar again (pingdotgg#13506).
Sidebar terminal pulses stay in sync (pingdotgg#12962).
- Selected text stays visible on a revealed file line (pingdotgg#13548).
- The usage page has a keybinding, `usage.open` (pingdotgg#9434).
### Unsupported in Moatless / needs implementation
- **Per-thread auto-settle switch (pingdotgg#11846).** This adds the
`thread.auto-settle.set` command, the `thread.auto-settle-set` event,
and the `threadAutoSettleOptOut` capability. Moatless never auto-settles
and does not report the capability, so the menu item stays hidden.
- **Run a shell command from a chat code block (pingdotgg#13060).** Gated off on
`workspaceScripts` environments. It needs `scripts.run` to accept an
inline command.
- **iPhone Duo 3D device controls (pingdotgg#12813).** Behind
`FEATURES.deviceHub`, which is off.
- **One-click Grok CLI update (pingdotgg#13523).** Provider management is behind
`FEATURES.providerConfiguration`, which is off.
- **Relay/tunnel cleanup and a managed endpoint reaper (pingdotgg#9386,
pingdotgg#13528).** Also the forced relay deploy workflow (pingdotgg#13550). Relay is
decided out of the fork.
- **Desktop update reconnect (pingdotgg#12006).** Electron is not a target.
### Backend behavior to consider reproducing in Moatless
- **Racy edits in review diffs (pingdotgg#12613).** The review index copy rounds
its mtime down so that edits made in the same second as the copy still
appear in the diff (`apps/server/src/vcs/GitVcsDriverCore.ts`).
- **Codex 0.156 (pingdotgg#13481, pingdotgg#13480).** Codex 0.156 is now the minimum, and
the app-server protocol was regenerated
(`packages/effect-codex-app-server`).
- **Claude banked resets (pingdotgg#13118).** Upstream shows and redeems them
(`claudeResetCredits.ts`, `resetCreditCoordinator.ts`). Separately, Grok
account emails are reported so usage limits merge across environments,
and Grok accounts no longer vanish (pingdotgg#12588, pingdotgg#12799). Codex keeps its
reset answer when the re-probe fails (pingdotgg#13363).
- **ACP (pingdotgg#13386).** Keeps one answer when a running tool reports
progress.
- **Antigravity (pingdotgg#13388, pingdotgg#13389).** Stop ends commands that outlived
their turn, and Windows unpacking stays under MAX_PATH.
- **Streamed section titles (pingdotgg#13504).** A title waits for the text
beneath it.
- **OpenTelemetry (pingdotgg#13355, pingdotgg#13469).** The kill switch is honored, and a
malformed `OTEL_RESOURCE_ATTRIBUTES` no longer stops startup.
- **Settlement.** If Moatless ever adds automatic settlement, it must
honor the per-thread opt-out from pingdotgg#11846.
The gaps register (`docs/fork/gaps.md`) was updated for the auto-settle
capability, the chat-run gate, and three runtime-fix bullets.
## Left undone
- Four files that auto-merged cleanly carry small fork deltas with no
path-policy entry: `AgentsPanel.tsx`, `ThreadTerminalDrawer.tsx`,
`client-runtime/src/state/threadDetail.ts` and `threadReducer.test.ts`.
- `preflight.mjs` labels a modify/delete conflict on a
`deletedUpstreamPaths` entry as `[unlisted]`. That is a minor script bug
and was not fixed here.
🤖 Generated with [Claude Code](https://claude.com/claude-code)
---
Moatless task:
https://moatless.soaplabstest.com/tasks/8f4381ee-c9ed-4fc5-9ffd-039ee15731ca515 files changed
Lines changed: 51701 additions & 24876 deletions
File tree
- .github
- workflows
- .macroscope/check-run-agents
- apps
- desktop/src
- app
- backend
- electron
- ipc/methods
- preview
- BrowserImport
- settings
- snapShot
- ssh
- telemetry
- updates
- window
- wsl
- marketing
- public/harnesses
- src/pages
- mobile
- assets
- modules/t3-subscription-widget/android/src/main
- java/expo/modules/t3subscriptionwidget
- res
- layout
- values-v32
- values
- src
- components
- features
- home
- showcase
- threads
- state
- widgets
- server
- integration
- scripts
- src
- assets
- auth
- checkpointing
- cli
- cloud
- desktopUpdate
- device
- diagnostics
- environment
- git
- mcp
- toolkits/preview
- observability/Layers
- orchestration
- Layers
- persistence
- Layers
- Migrations
- Services
- project
- provider
- Drivers
- Layers
- acp
- testFixtures
- pullRequest
- relay
- resourceTelemetry
- sourceControl
- telemetry
- terminal
- textGeneration
- usage
- vcs
- web/src
- browser
- components
- auth
- chat
- clerk
- cloud
- device
- models
- diffs
- files
- onboarding
- preview
- pullRequest
- sandbox
- search
- settings
- moatless
- sidebar
- ui
- usage
- connection
- fork
- hooks
- lib
- routes
- state
- docs
- fork
- internals
- operations
- user
- infra/relay
- migrations/postgres/20260919015455_managed_endpoint_recovery
- src
- agentActivity
- environments
- http
- persistence
- packages
- client-runtime
- src
- authorization
- connection
- device
- operations
- platform
- relay
- rpc
- state
- contracts/src
- effect-acp/src
- effect-codex-app-server
- scripts
- src
- _generated
- _internal
- test/fixtures
- 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 | |
|---|---|---|---|
| |||
68 | 68 | | |
69 | 69 | | |
70 | 70 | | |
| 71 | + | |
71 | 72 | | |
72 | 73 | | |
73 | 74 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
7 | 16 | | |
8 | 17 | | |
9 | 18 | | |
| |||
17 | 26 | | |
18 | 27 | | |
19 | 28 | | |
| 29 | + | |
| 30 | + | |
20 | 31 | | |
21 | 32 | | |
22 | 33 | | |
| |||
28 | 39 | | |
29 | 40 | | |
30 | 41 | | |
| 42 | + | |
31 | 43 | | |
32 | 44 | | |
33 | 45 | | |
| |||
54 | 66 | | |
55 | 67 | | |
56 | 68 | | |
57 | | - | |
| 69 | + | |
58 | 70 | | |
59 | 71 | | |
60 | 72 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
4 | | - | |
| 3 | + | |
| 4 | + | |
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
4 | | - | |
| 3 | + | |
| 4 | + | |
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
76 | 76 | | |
77 | 77 | | |
78 | 78 | | |
79 | | - | |
| 79 | + | |
80 | 80 | | |
81 | 81 | | |
82 | 82 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
49 | | - | |
| 49 | + | |
50 | 50 | | |
51 | 51 | | |
52 | 52 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
205 | 205 | | |
206 | 206 | | |
207 | 207 | | |
208 | | - | |
| 208 | + | |
209 | 209 | | |
210 | 210 | | |
211 | 211 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
| 4 | + | |
4 | 5 | | |
5 | 6 | | |
6 | 7 | | |
| |||
427 | 428 | | |
428 | 429 | | |
429 | 430 | | |
| 431 | + | |
| 432 | + | |
| 433 | + | |
| 434 | + | |
| 435 | + | |
| 436 | + | |
| 437 | + | |
| 438 | + | |
| 439 | + | |
| 440 | + | |
| 441 | + | |
| 442 | + | |
| 443 | + | |
| 444 | + | |
| 445 | + | |
| 446 | + | |
| 447 | + | |
| 448 | + | |
| 449 | + | |
| 450 | + | |
| 451 | + | |
| 452 | + | |
| 453 | + | |
| 454 | + | |
| 455 | + | |
| 456 | + | |
| 457 | + | |
| 458 | + | |
| 459 | + | |
| 460 | + | |
430 | 461 | | |
431 | 462 | | |
432 | 463 | | |
| |||
491 | 522 | | |
492 | 523 | | |
493 | 524 | | |
| 525 | + | |
| 526 | + | |
| 527 | + | |
| 528 | + | |
| 529 | + | |
| 530 | + | |
| 531 | + | |
| 532 | + | |
| 533 | + | |
| 534 | + | |
| 535 | + | |
| 536 | + | |
| 537 | + | |
| 538 | + | |
| 539 | + | |
| 540 | + | |
| 541 | + | |
| 542 | + | |
| 543 | + | |
| 544 | + | |
| 545 | + | |
| 546 | + | |
| 547 | + | |
| 548 | + | |
| 549 | + | |
| 550 | + | |
| 551 | + | |
| 552 | + | |
| 553 | + | |
| 554 | + | |
| 555 | + | |
| 556 | + | |
| 557 | + | |
494 | 558 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| 7 | + | |
7 | 8 | | |
8 | 9 | | |
9 | 10 | | |
| |||
353 | 354 | | |
354 | 355 | | |
355 | 356 | | |
| 357 | + | |
| 358 | + | |
| 359 | + | |
| 360 | + | |
| 361 | + | |
| 362 | + | |
| 363 | + | |
| 364 | + | |
| 365 | + | |
| 366 | + | |
| 367 | + | |
356 | 368 | | |
357 | 369 | | |
358 | 370 | | |
359 | 371 | | |
360 | 372 | | |
361 | 373 | | |
| 374 | + | |
| 375 | + | |
362 | 376 | | |
363 | 377 | | |
364 | 378 | | |
| |||
671 | 685 | | |
672 | 686 | | |
673 | 687 | | |
674 | | - | |
| 688 | + | |
| 689 | + | |
| 690 | + | |
| 691 | + | |
| 692 | + | |
| 693 | + | |
| 694 | + | |
| 695 | + | |
| 696 | + | |
675 | 697 | | |
676 | 698 | | |
677 | 699 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
946 | 946 | | |
947 | 947 | | |
948 | 948 | | |
| 949 | + | |
| 950 | + | |
| 951 | + | |
| 952 | + | |
| 953 | + | |
| 954 | + | |
| 955 | + | |
| 956 | + | |
| 957 | + | |
| 958 | + | |
| 959 | + | |
| 960 | + | |
| 961 | + | |
| 962 | + | |
| 963 | + | |
| 964 | + | |
| 965 | + | |
| 966 | + | |
| 967 | + | |
| 968 | + | |
| 969 | + | |
| 970 | + | |
| 971 | + | |
| 972 | + | |
| 973 | + | |
| 974 | + | |
| 975 | + | |
| 976 | + | |
| 977 | + | |
| 978 | + | |
| 979 | + | |
| 980 | + | |
| 981 | + | |
| 982 | + | |
| 983 | + | |
| 984 | + | |
| 985 | + | |
| 986 | + | |
| 987 | + | |
| 988 | + | |
| 989 | + | |
| 990 | + | |
| 991 | + | |
949 | 992 | | |
950 | 993 | | |
951 | 994 | | |
| |||
0 commit comments