Repository navigation
Commit 415dd48
ForkBot
Merge upstream/main (5ccc65b, 442 commits) into sync/2026-11-13
Resolved conflicts (31 files):
- apps/mobile: package.json (upstream's new tarballs, Conn -conn.tgz rebuilt with scripts/build-conn-vendored-tarball.ts for react-native-screens t3.50 and enriched-markdown 0dc7ed81, old ones deleted), pnpm-workspace.yaml (Conn tarball allowance for new name + upstream's electron-updater patch), connection/runtime.ts (both capability flags), state/threads.ts (both blocks), Git*Sheet.tsx and SettingsEnvironmentsRouteScreen.tsx (upstream's new sheet/refresh components; fork only had font-weight tweaks). pnpm-lock: upstream then vp i.
- server: Migrations.ts (upstream's per-migration loop and skippedV2Migrations; Conn reconcile kept, connMigrations added to executedMigrations), ws.ts (mounted fork rpc group kept, dropped consts upstream removed), agentContextBudget.json (measured 57764 incl. preview tools), ServerBrowser.test.ts (both), ServerBrowserPage.test.ts (shared previewPage/previewSessionControl imports), ws.test.ts, Migrations tests extended to 87.
- web: Sidebar.tsx (3-way on de-wrapped tree; kept shell-inner-panel + SidebarChromeFooter utilities={false} inside upstream's SidebarFolderDrop), ChatView.tsx (ConnIconScope kept around upstream's ThreadTimeline, orbitReady prop kept), OpenInPicker.tsx (fork compact toolbar kept, upstream tooltip primary control), DesktopAppActivationCoordinator.tsx (upstream hook; Conn findThread/selectWorkspace/showThread moved into useOpenLocalWorkspace), uiStateStore.ts, composerDraftStore.ts, MessagesTimeline.tsx/timelineRowContext.ts (both labels), mainAppLocation.ts, PreviewView.tsx, RightPanelResizeHandle.tsx (fork), ReadOnlySourcePreview.tsx, VoiceSettingsPanel.tsx (upstream), CommandPalette.browser.test.tsx; lucide-react.ts: ReplyIcon, OctagonXIcon.
- contracts settings.ts (keepAwakeWhileAgentsWork + fork comment, offeredSourceControlProviders), scripts/dev-runner.ts (sighup + memory limit + descendant stop).
Uncertain: VoiceSettingsPanel shell divider tweak dropped (upstream restructured that form); OctagonXIcon maps to Phosphor Prohibit.1,228 files changed
Lines changed: 62135 additions & 12714 deletions
File tree
- .agents/skills/contribution-triage
- .github
- actions/setup-ci-deps
- readme
- scripts
- workflows
- apps
- desktop
- src
- app
- backend
- electron
- preview
- BrowserImport
- shell
- snapShot
- ssh
- updates
- wsl
- mobile
- deps
- modules/t3-composer-editor/android/src/main/java/expo/modules/t3composereditor
- src
- components/ui
- connection
- features
- archive
- browser
- cloud
- files
- home
- layout
- workspace
- projects
- pull-requests
- review
- settings
- threads
- git
- usage
- voice-input
- lib
- native
- state
- widgets
- server
- integration
- scripts
- src
- background
- cli
- cloud
- desktopUpdate
- device
- environment
- git
- mcp
- toolkits
- orchestrator
- pullRequests
- thread
- observability
- orchestration-v2
- Adapters
- testkit
- fixtures
- claude_background_monitor_wake
- claude_background_task_after_root
- claude_compact_after_resume_wake
- claude_idle_resume
- codex_model_reroute
- command_output_streaming
- delegated_task_status
- fx_early_stop
- fx_subagent
- grok_auto_blocked_command
- grok_background_bash_fast_wake
- grok_background_bash
- grok_prompt_error
- kiro_cloud_config
- kiro_compaction
- kiro_effort
- kiro_fork_from_turn
- kiro_message_steering
- kiro_model_switch
- kiro_permission_modes
- kiro_subagent_interrupt
- kiro_unknown_model
- message_steering
- multi_turn
- plan_questions
- proposed_plan
- provider_thread_resume
- queued_cancelled_while_active
- queued_turn
- simple
- stop_background_work_after_failed_turn
- subagent_continue
- subagent_v2_approval
- subagent_v2_nested_approval
- subagent_v2_nested
- subagent_v2
- subagent
- thread_fork_native_prior_turn
- thread_merge_back_siblings
- thread_rollback_after_restart
- thread_rollback_to_stopped_turn
- thread_rollback
- todo_list
- tool_call_denied_write
- tool_call_read_only_on_request
- tool_call_restricted_granular
- tool_call_workspace_never
- turn_interrupt_mid_tool
- turn_interrupt
- web_search
- peer
- persistence
- Migrations
- preview
- process
- project
- provider
- Drivers
- acp
- testUtils
- pullRequest
- relay
- scheduledTasks
- secrets
- sourceControl
- speech
- terminal
- textGeneration
- usage
- vcs
- workspace
- web
- src
- components
- chat
- desktop
- diffs
- files
- office
- mcp
- preview
- pullRequest
- guide
- settings
- sidebar
- ui
- usage
- hooks
- icons
- lib
- routes
- speech
- state
- terminal/ghostty
- test
- docs
- internals
- operations
- orchestration-v2
- user
- evals
- mcp-tool-use
- cases
- thread-titles
- packages
- client-runtime/src
- authorization
- connection
- mcpApps
- operations
- relay
- rpc
- state
- voice-input
- contracts/src
- effect-acp/src
- effect-codex-app-server/src
- provider-acp-registry/src/server
- provider-acp/src/server
- provider-core/src/server
- provider-cursor
- src/server
- provider-fx
- src/server
- provider-grok/src/server
- provider-kiro
- src/server
- provider-muse/src/server
- provider-opencode/src/server
- v2
- provider-pi/src/server
- secret-provider-core/src/server
- source-control-core/src/server
- source-control-forgejo/src/server
- source-control-github/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 | |
|---|---|---|---|
| |||
71 | 71 | | |
72 | 72 | | |
73 | 73 | | |
74 | | - | |
75 | | - | |
76 | | - | |
77 | | - | |
78 | | - | |
79 | | - | |
80 | | - | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
81 | 80 | | |
82 | 81 | | |
83 | 82 | | |
| |||
90 | 89 | | |
91 | 90 | | |
92 | 91 | | |
| 92 | + | |
| 93 | + | |
93 | 94 | | |
94 | | - | |
95 | | - | |
96 | | - | |
97 | | - | |
98 | | - | |
99 | | - | |
100 | | - | |
101 | | - | |
102 | | - | |
103 | | - | |
104 | | - | |
105 | | - | |
106 | | - | |
107 | | - | |
108 | | - | |
| 95 | + | |
| 96 | + | |
109 | 97 | | |
110 | 98 | | |
111 | 99 | | |
| |||
141 | 129 | | |
142 | 130 | | |
143 | 131 | | |
144 | | - | |
| 132 | + | |
145 | 133 | | |
146 | 134 | | |
147 | 135 | | |
148 | 136 | | |
149 | 137 | | |
150 | 138 | | |
151 | 139 | | |
152 | | - | |
153 | | - | |
154 | | - | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
155 | 143 | | |
156 | 144 | | |
157 | 145 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
83 | 83 | | |
84 | 84 | | |
85 | 85 | | |
| 86 | + | |
86 | 87 | | |
87 | 88 | | |
88 | 89 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
35 | 35 | | |
36 | 36 | | |
37 | 37 | | |
38 | | - | |
| 38 | + | |
39 | 39 | | |
40 | 40 | | |
41 | 41 | | |
| |||
56 | 56 | | |
57 | 57 | | |
58 | 58 | | |
59 | | - | |
| 59 | + | |
60 | 60 | | |
61 | 61 | | |
62 | 62 | | |
| |||
92 | 92 | | |
93 | 93 | | |
94 | 94 | | |
95 | | - | |
| 95 | + | |
96 | 96 | | |
97 | 97 | | |
98 | 98 | | |
| |||
106 | 106 | | |
107 | 107 | | |
108 | 108 | | |
109 | | - | |
| 109 | + | |
110 | 110 | | |
111 | 111 | | |
112 | 112 | | |
| |||
121 | 121 | | |
122 | 122 | | |
123 | 123 | | |
124 | | - | |
| 124 | + | |
125 | 125 | | |
126 | 126 | | |
127 | 127 | | |
| |||
138 | 138 | | |
139 | 139 | | |
140 | 140 | | |
141 | | - | |
| 141 | + | |
142 | 142 | | |
143 | 143 | | |
144 | 144 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | | - | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
28 | 23 | | |
29 | 24 | | |
30 | 25 | | |
| |||
Loading
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
121 | 121 | | |
122 | 122 | | |
123 | 123 | | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
124 | 168 | | |
125 | 169 | | |
126 | 170 | | |
127 | 171 | | |
128 | 172 | | |
| 173 | + | |
129 | 174 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
237 | 237 | | |
238 | 238 | | |
239 | 239 | | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
| 279 | + | |
| 280 | + | |
| 281 | + | |
| 282 | + | |
| 283 | + | |
| 284 | + | |
| 285 | + | |
| 286 | + | |
| 287 | + | |
| 288 | + | |
| 289 | + | |
| 290 | + | |
| 291 | + | |
| 292 | + | |
| 293 | + | |
| 294 | + | |
| 295 | + | |
| 296 | + | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
| 302 | + | |
| 303 | + | |
| 304 | + | |
| 305 | + | |
| 306 | + | |
| 307 | + | |
| 308 | + | |
| 309 | + | |
| 310 | + | |
| 311 | + | |
| 312 | + | |
| 313 | + | |
| 314 | + | |
| 315 | + | |
| 316 | + | |
| 317 | + | |
0 commit comments