Commit fdf95e5
Zeph Gillen
Merge upstream v3.58.1 into local/daily-driver
Brings in 30 upstream commits (v3.56.0 → v3.58.1). Notable features:
- Zoo Gateway provider (types, handler, model fetcher, auth/token sync, settings UI)
- Gemini 3.5 Flash (Vertex)
- Semble: local on-the-fly embedding+search provider for code-index (Zoo-Code-Org#399)
- Privacy: remove extension-side LLM telemetry; gateway-only server logs (Zoo-Code-Org#346)
(deletes src/services/zoo-telemetry.ts + test — upstream intent)
- WorkspacePathResolver (symlink-aware path canonicalization)
- Configurable chat font size; VS Code integrated-terminal shell override
- GitHub-style markdown alerts in the webview
- Z.ai GLM configurable max output tokens (supportsMaxTokens)
- Security dep bumps (axios, mermaid, etc.)
Conflict resolutions (3 files; everything else auto-merged):
packages/types/src/vscode-extension-host.ts
Both sides appended a field after `debug`. Kept BOTH: our
`codebaseIndexConfigSources` (dotfile-origin map for the pinned-by-dotfile
badges) and upstream's `platform`/`arch` (semble binary availability).
src/services/code-index/config-manager.ts
Upstream added a `semble` arm to the per-provider if/else that selects
embedderProvider; our rework had already replaced that chain with a direct
assignment from the resolved config. Kept our direct assignment — the
resolver (config-resolver.ts) defaults unset/invalid to "openai" exactly
like upstream's else-branch, and the resolved type now includes "semble",
so every provider (incl. the new one) carries through. Upstream's
isConfigured() semble early-return auto-applied cleanly alongside it.
webview-ui/src/components/chat/CodeIndexPopover.tsx
Upstream wraps the Qdrant URL+key blocks in `{provider !== "semble" && (…)}`
(Qdrant is hidden when semble is selected, since semble needs no Qdrant);
we had added dotfile "pinned" badges + `disabled` to the Qdrant URL field.
Merged: kept upstream's semble conditional wrapper AND our badge/disabled
logic inside it. Also folded both into the single useExtensionState()
destructure and kept both the saveScope state and semble platform-gate.
Semble vs our workspace-scoped code-index rework are orthogonal: semble is a
*which-embedder* choice (parallel indexing path that bypasses Qdrant), our
work is *where-config-comes-from* (global/workspace/dotfile layering). They
compose — manager.ts auto-merged keeping both the SembleProvider path and our
dotfile watchers/dispose logic.
Vertex Opus 4.8 retains our effort-shape entry (no supportsReasoningBudget);
upstream's new gemini-3.5-flash entry slotted in above it cleanly. The
silent-automerge 400 trap from the 3.56.0 merge did not recur (verified).
Verification:
- pnpm -w check-types: 11/11 clean
- pnpm -w lint: 11/11 clean
- pnpm -w test: 22 failures, all pre-existing in reasoning.spec.ts and
model-params.spec.ts (fd93c5b baseline). +281 new upstream tests pass.
Zero new failures.
Follow-ups unchanged from 3.56.0: Vertex Opus 4.7 still uses the legacy
budget shape (live 400); CodeIndexPopover semble/badge interaction is
compile-verified but not yet render-verified.231 files changed
Lines changed: 13310 additions & 2407 deletions
File tree
- .github
- actions/setup-node-pnpm
- workflows
- .roo/commands
- apps/vscode-e2e
- fixtures
- src
- fixtures
- suite
- tools
- locales
- ca
- de
- es
- fr
- hi
- id
- it
- ja
- ko
- nl
- pl
- pt-BR
- ru
- tr
- vi
- zh-CN
- zh-TW
- packages/types/src
- providers
- src
- __tests__
- helpers
- activate
- __tests__
- api
- providers
- __tests__
- fetchers
- __tests__
- core
- assistant-message
- config
- __tests__
- prompts/__tests__
- task
- tools
- __tests__
- webview
- __tests__
- extension
- __tests__
- i18n/locales
- ca
- de
- en
- es
- fr
- hi
- id
- it
- ja
- ko
- nl
- pl
- pt-BR
- ru
- tr
- vi
- zh-CN
- zh-TW
- integrations/terminal
- __tests__
- streamUtils
- services
- __tests__
- code-index
- __tests__
- interfaces
- semble
- __tests__
- utils
- __tests__
- webview-ui/src
- components
- chat
- __tests__
- common
- __tests__
- settings
- __tests__
- providers
- __tests__
- utils
- ui/hooks
- __tests__
- welcome
- context
- __tests__
- i18n/locales
- ca
- de
- en
- es
- fr
- hi
- id
- it
- ja
- ko
- nl
- pl
- pt-BR
- ru
- tr
- vi
- zh-CN
- zh-TW
- utils
- __tests__
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 | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
27 | | - | |
| 27 | + | |
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
35 | | - | |
| 35 | + | |
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
41 | 41 | | |
42 | | - | |
| 42 | + | |
43 | 43 | | |
44 | 44 | | |
45 | 45 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
37 | | - | |
| 37 | + | |
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
| |||
195 | 195 | | |
196 | 196 | | |
197 | 197 | | |
198 | | - | |
| 198 | + | |
199 | 199 | | |
200 | 200 | | |
201 | 201 | | |
| |||
213 | 213 | | |
214 | 214 | | |
215 | 215 | | |
216 | | - | |
| 216 | + | |
217 | 217 | | |
218 | 218 | | |
219 | 219 | | |
| |||
227 | 227 | | |
228 | 228 | | |
229 | 229 | | |
230 | | - | |
| 230 | + | |
231 | 231 | | |
232 | 232 | | |
233 | 233 | | |
| |||
373 | 373 | | |
374 | 374 | | |
375 | 375 | | |
376 | | - | |
| 376 | + | |
377 | 377 | | |
378 | 378 | | |
379 | 379 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
17 | | - | |
| 17 | + | |
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
27 | | - | |
| 27 | + | |
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
| |||
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
37 | | - | |
| 37 | + | |
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
| |||
58 | 58 | | |
59 | 59 | | |
60 | 60 | | |
61 | | - | |
| 61 | + | |
62 | 62 | | |
63 | 63 | | |
64 | 64 | | |
65 | 65 | | |
66 | | - | |
| 66 | + | |
67 | 67 | | |
68 | 68 | | |
69 | 69 | | |
| |||
78 | 78 | | |
79 | 79 | | |
80 | 80 | | |
81 | | - | |
| 81 | + | |
82 | 82 | | |
83 | 83 | | |
84 | 84 | | |
| |||
94 | 94 | | |
95 | 95 | | |
96 | 96 | | |
97 | | - | |
| 97 | + | |
98 | 98 | | |
99 | 99 | | |
100 | 100 | | |
| |||
107 | 107 | | |
108 | 108 | | |
109 | 109 | | |
110 | | - | |
| 110 | + | |
111 | 111 | | |
112 | 112 | | |
113 | 113 | | |
114 | 114 | | |
115 | 115 | | |
116 | 116 | | |
117 | 117 | | |
118 | | - | |
| 118 | + | |
119 | 119 | | |
120 | 120 | | |
121 | 121 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
43 | 43 | | |
44 | 44 | | |
45 | 45 | | |
46 | | - | |
| 46 | + | |
47 | 47 | | |
48 | 48 | | |
49 | 49 | | |
50 | | - | |
| 50 | + | |
51 | 51 | | |
52 | 52 | | |
53 | 53 | | |
| |||
75 | 75 | | |
76 | 76 | | |
77 | 77 | | |
78 | | - | |
| 78 | + | |
79 | 79 | | |
80 | 80 | | |
| 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 | | - | |
16 | 7 | | |
17 | 8 | | |
18 | 9 | | |
| |||
22 | 13 | | |
23 | 14 | | |
24 | 15 | | |
25 | | - | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
26 | 31 | | |
| 32 | + | |
27 | 33 | | |
28 | 34 | | |
| 35 | + | |
29 | 36 | | |
30 | 37 | | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
31 | 41 | | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
| 12 | + | |
12 | 13 | | |
13 | 14 | | |
14 | 15 | | |
15 | 16 | | |
16 | 17 | | |
17 | | - | |
| 18 | + | |
18 | 19 | | |
19 | 20 | | |
20 | 21 | | |
| |||
29 | 30 | | |
30 | 31 | | |
31 | 32 | | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
32 | 40 | | |
33 | 41 | | |
34 | 42 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
| 18 | + | |
18 | 19 | | |
19 | 20 | | |
20 | 21 | | |
21 | | - | |
| 22 | + | |
22 | 23 | | |
23 | 24 | | |
24 | 25 | | |
| |||
33 | 34 | | |
34 | 35 | | |
35 | 36 | | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
36 | 44 | | |
37 | 45 | | |
38 | 46 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
27 | | - | |
| 27 | + | |
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
39 | | - | |
40 | | - | |
41 | | - | |
42 | | - | |
43 | | - | |
44 | | - | |
45 | | - | |
46 | | - | |
47 | | - | |
| 39 | + | |
48 | 40 | | |
| 41 | + | |
49 | 42 | | |
50 | 43 | | |
51 | 44 | | |
| |||
58 | 51 | | |
59 | 52 | | |
60 | 53 | | |
61 | | - | |
| 54 | + | |
| 55 | + | |
62 | 56 | | |
63 | 57 | | |
64 | 58 | | |
65 | 59 | | |
66 | 60 | | |
67 | 61 | | |
68 | 62 | | |
69 | | - | |
70 | | - | |
71 | | - | |
72 | | - | |
73 | | - | |
| 63 | + | |
74 | 64 | | |
75 | | - | |
| 65 | + | |
| 66 | + | |
76 | 67 | | |
77 | 68 | | |
78 | 69 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
3 | 35 | | |
4 | 36 | | |
5 | 37 | | |
| |||
0 commit comments