Commit 4ff77c6
committed
chore: merge main into the local-first storage epic
One conflict, in the provider hook that both sides rewrote.
Main gave saveProvider a return value so callers learn which row actually
persisted: a single-instance save keeps the earlier provider's id, and that
is the id chat target selection needs. The epic replaced the same function
with a query over the server and returned nothing.
Resolved by keeping the epic's implementation and restoring the contract.
planProviderSave already computes the row that gets written, so it returns
that. Taking either side wholesale would have been wrong: the epic's alone
silently breaks the first-run handoff, main's alone reverts the switch to
server-backed storage.91 files changed
Lines changed: 2492 additions & 2755 deletions
File tree
- .github/workflows
- packages
- browseros-agent
- apps
- app-onboard
- app
- entrypoints/app
- modules/llm-providers
- screens
- ai-settings
- onboarding-ai
- claw-server-rust
- src
- analytics
- tests
- server
- resources/skills/browseros
- src
- agent
- lib
- agents/acp
- tests
- agent
- api/routes
- lib
- agents/acp
- tools/browser
- contracts/claw-mcp/tests
- crates/browseros-mcp/src
- tools
- packages/browser-mcp/src/tools
- scripts/build/config
- tools/dev/cmd
- browseros
- bos_build
- chromium_patches
- chrome
- browser
- browseros
- core
- metrics
- server
- devtools/protocol
- extensions/api/browser_os
- metrics
- prefs
- profiles
- ui
- startup
- common
- third_party/blink/public/devtools_protocol/domains
- resources
- updates
- extensions
- server
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 | |
|---|---|---|---|
| |||
101 | 101 | | |
102 | 102 | | |
103 | 103 | | |
| 104 | + | |
104 | 105 | | |
105 | 106 | | |
106 | 107 | | |
| |||
181 | 182 | | |
182 | 183 | | |
183 | 184 | | |
| 185 | + | |
| 186 | + | |
184 | 187 | | |
185 | 188 | | |
186 | 189 | | |
| |||
196 | 199 | | |
197 | 200 | | |
198 | 201 | | |
| 202 | + | |
| 203 | + | |
199 | 204 | | |
200 | 205 | | |
201 | 206 | | |
| |||
228 | 233 | | |
229 | 234 | | |
230 | 235 | | |
| 236 | + | |
231 | 237 | | |
232 | 238 | | |
233 | 239 | | |
| |||
273 | 279 | | |
274 | 280 | | |
275 | 281 | | |
276 | | - | |
| 282 | + | |
| 283 | + | |
277 | 284 | | |
278 | 285 | | |
279 | 286 | | |
| |||
287 | 294 | | |
288 | 295 | | |
289 | 296 | | |
290 | | - | |
| 297 | + | |
| 298 | + | |
291 | 299 | | |
292 | 300 | | |
293 | 301 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
| 19 | + | |
19 | 20 | | |
20 | 21 | | |
21 | 22 | | |
| |||
89 | 90 | | |
90 | 91 | | |
91 | 92 | | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
92 | 100 | | |
93 | 101 | | |
94 | 102 | | |
| |||
Lines changed: 11 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
31 | | - | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
32 | 37 | | |
33 | 38 | | |
34 | 39 | | |
| |||
88 | 93 | | |
89 | 94 | | |
90 | 95 | | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
91 | 100 | | |
92 | 101 | | |
93 | 102 | | |
| |||
130 | 139 | | |
131 | 140 | | |
132 | 141 | | |
133 | | - | |
134 | | - | |
135 | | - | |
| 142 | + | |
136 | 143 | | |
137 | 144 | | |
138 | 145 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| |||
0 commit comments