Repository navigation
Commit 5bdfd3a
Merge upstream/main into main
Brings in 694 upstream commits on top of the fork's account pools,
independent CLI account sign-in, and provider account sync.
Twenty-three files conflicted where upstream's provider and orchestrator
refactors met those features. Upstream's shapes were adopted (Effect.fn
wrappers, the split queued-run promotion, the rebuilt test harnesses) and
the fork's logic re-applied inside them. Four fork tests were adapted to
upstream behaviour: a snapshot refresh now resolves maintenance fresh and
probes, so the managed Codex executable is acquired twice; Windows launcher
fixtures compare the executable path case-insensitively because PATHEXT
candidates match on a case-insensitive host; the ws config test mocks the
published-provider registry methods; installation start is a function.
Sixteen fork closures were converted to Effect.fn for upstream's new
prefer-effect-fn rule, and one browser test's lifecycle hooks became
per-test setup with disposable spies.
Conflict resolution by Claude Opus 5.5 (orchestrator core), GPT-6 Astra via
Codex (Codex driver and adapter), and Claude Sonnet 5.5 (Claude driver and
adapter, web provider files, Effect.fn conversions), integrated and
verified by Claude Fable 5.1 in Claude Code.
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>1,808 files changed
Lines changed: 154815 additions & 47414 deletions
File tree
- .github
- actions/setup-ci-deps
- scripts
- workflows
- .macroscope/check-run-agents
- apps
- desktop
- resources
- scripts
- src
- app
- backend
- electron
- ipc
- methods
- preview
- shell
- snapShot
- ssh
- telemetry
- updates
- window
- wsl
- marketing
- mobile
- assets/context-chip-icons
- deps
- modules
- t3-composer-editor
- android/src
- main/java/expo/modules/t3composereditor
- test/java/expo/modules/t3composereditor
- ios
- t3-native-controls
- android
- src/main
- java/expo/modules/t3nativecontrols
- res/drawable
- ios
- t3-review-diff/android/src
- main/java/expo/modules/t3reviewdiff
- test/java/expo/modules/t3reviewdiff
- t3-terminal/android/src/main/java/expo/modules/t3terminal
- scripts
- fixtures
- src
- components
- ui
- connection
- features
- agent-awareness
- archive
- browser
- cloud
- connection
- devices
- diagnostics
- diffs
- files
- home
- layout
- projects
- pull-requests
- guide
- review
- settings
- appearance
- sections
- components
- terminal
- threads
- git
- updates
- usage
- voice-input
- workspace
- lib
- native
- persistence
- state
- widgets
- server
- schema
- scripts
- src
- assets
- auth
- background
- checkpointing
- cli
- cloud
- desktopUpdate
- device
- diagnostics
- environment
- git
- htmlRender
- mcp
- toolkits
- device
- html
- orchestrator
- project
- pullRequests
- thread
- worktree
- observability
- orchestration-v2
- Adapters
- legacy
- testkit
- fixtures
- multi_turn
- muse_permission
- muse_subagent_approval
- muse_subagent_interrupt
- muse_workflow
- plan_questions
- proposed_plan
- simple
- subagent_v2
- tool_call_restricted_granular
- turn_interrupt
- persistence
- Migrations
- preview
- process
- project
- provider
- Drivers
- acp
- testUtils
- testing
- pullRequest
- relay
- resourceTelemetry
- scheduledTasks
- scheduling
- secrets
- sourceControl
- telemetry
- terminal
- testUtils
- textGeneration
- usage
- vcs
- workspace
- web
- src
- assets
- browser
- cloud
- components
- chat
- clerk
- cloud
- desktop
- device
- diffs
- files
- media
- onboarding
- permissions
- preview
- promptLinks
- pullRequest
- guide
- search
- settings
- sidebar
- ui
- usage
- connection
- hooks
- lib
- onboarding
- routes
- rpc
- state
- terminal/ghostty
- test
- fixtures/usage-limits-hub
- vite
- docs
- internals
- operations
- orchestration-v2
- user
- infra/relay
- migrations/postgres/20261020013101_upstream_api_pauses
- src
- agentActivity
- auth
- environments
- hooks
- http
- persistence
- native/resource-monitor/src
- oxlint-plugin-t3code
- rules
- packages
- client-runtime/src
- authorization
- connection
- device
- environment
- errors
- operations
- platform
- relay
- rpc
- state
- work-log
- contracts/src
- effect-acp/src
- _internal
- effect-codex-app-server/src
- provider-acp-registry/src/server
- provider-acp/src/server
- provider-core/src/server
- provider-cursor/src/server
- provider-grok/src/server
- provider-muse/src/server
- provider-opencode/src/server
- v2
- provider-pi/src/server
- source-control-azure-devops/src/server
- source-control-bitbucket/src/server
- source-control-core/src/server
- source-control-forgejo/src/server
- source-control-gitcafe/src/server
- source-control-github/src/server
- source-control-gitlab/src/server
- ssh/src
- tailscale/src
- patches
- scripts
- lib
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 | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
| 6 | + | |
7 | 7 | | |
| 8 | + | |
8 | 9 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
21 | 37 | | |
22 | 38 | | |
23 | 39 | | |
24 | 40 | | |
25 | | - | |
26 | | - | |
| 41 | + | |
| 42 | + | |
27 | 43 | | |
28 | | - | |
29 | | - | |
30 | | - | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
| 39 | + | |
39 | 40 | | |
40 | 41 | | |
41 | 42 | | |
| |||
112 | 113 | | |
113 | 114 | | |
114 | 115 | | |
| 116 | + | |
115 | 117 | | |
116 | | - | |
| 118 | + | |
117 | 119 | | |
118 | | - | |
119 | 120 | | |
120 | 121 | | |
121 | 122 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
244 | 244 | | |
245 | 245 | | |
246 | 246 | | |
247 | | - | |
248 | | - | |
249 | | - | |
250 | | - | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
251 | 267 | | |
252 | 268 | | |
253 | 269 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
216 | 216 | | |
217 | 217 | | |
218 | 218 | | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
219 | 260 | | |
220 | 261 | | |
221 | 262 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
93 | 93 | | |
94 | 94 | | |
95 | 95 | | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
96 | 99 | | |
97 | 100 | | |
98 | 101 | | |
| |||
482 | 485 | | |
483 | 486 | | |
484 | 487 | | |
485 | | - | |
486 | | - | |
487 | 488 | | |
488 | 489 | | |
489 | 490 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
7 | 9 | | |
8 | 10 | | |
9 | 11 | | |
| |||
34 | 36 | | |
35 | 37 | | |
36 | 38 | | |
37 | | - | |
| 39 | + | |
38 | 40 | | |
39 | 41 | | |
40 | 42 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
30 | | - | |
| 30 | + | |
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
| |||
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
| 44 | + | |
| 45 | + | |
44 | 46 | | |
45 | 47 | | |
46 | 48 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
| 18 | + | |
18 | 19 | | |
19 | 20 | | |
20 | 21 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
75 | 75 | | |
76 | 76 | | |
77 | 77 | | |
| 78 | + | |
78 | 79 | | |
79 | 80 | | |
80 | 81 | | |
| |||
0 commit comments