Repository navigation
Commit 589b64b
committed
Merge upstream/main (58341d8) into feat/abort-r1-vscode-lm
Conflict resolution: keep the branch's completePrompt cancellation
scope (request-local CancellationTokenSource bridged from the
external signal, timeout armed before getClient); upstream's
_options variant predates the abort wiring.
Review follow-ups folded into this round (threads GUIH/GUIN/GUIP/
GUIU):
- createMessage/completePrompt now build their abort errors through
the shared createAbortError("VS Code LM") instead of ten
hand-built copies; the canonical abort message is now
"The VS Code LM request was aborted" for both methods (spec
assertions updated). The host-cancellation variant ("Request
cancelled by user") keeps its distinct message.
- All 18 Stryker suppression comments removed from vscode-lm.ts
(the copy-adjacent StringLiteral pairs disappear with the port;
the two LogicalOperator pairs are equivalent - onExternalAbort/
onAbort are only assigned when the signal is present - argued in
the PR body per the directive ban).
- Bridge test now asserts the token handed to sendRequest is the
request's own source token (identity, not just cancel()).
- New test: a newer request superseding during input token counting
(no external signal) rejects with the canonical abort and never
reaches the host call - pins the post-count token check.
- New test: quiet stream end after an abort with a complete leaked
tool call still buffered rejects with the canonical abort instead
of flushing salvage - pins the guard-before-flush ordering.
- Early-consumer test renames the intentionally-unused gate resolver
to _releaseStream for the re-enabled unused-variable rule.
Negative controls: removing the post-count check, swapping the guard
with flushSalvage, and passing a fresh token to sendRequest each fail
exactly one test.230 files changed
Lines changed: 1050 additions & 1165 deletions
File tree
- packages/types/src
- __tests__
- providers
- src
- __tests__
- activate
- api
- providers
- __tests__
- fetchers
- __tests__
- transform
- __tests__
- core
- assistant-message
- __tests__
- auto-approval
- checkpoints
- __tests__
- condense
- __tests__
- config
- __tests__
- context-management
- __tests__
- diff/strategies
- environment
- ignore
- mentions
- __tests__
- message-manager
- prompts
- __tests__
- sections
- __tests__
- tools
- __tests__
- native-tools/__tests__
- task-persistence
- task
- __tests__
- tools
- __tests__
- webview
- __tests__
- worktree
- extension
- __tests__
- integrations
- editor/__tests__
- misc
- __tests__
- terminal
- __tests__
- services
- __tests__
- checkpoints
- __tests__
- code-index
- __tests__
- embedders
- __tests__
- processors
- __tests__
- semble/__tests__
- vector-store
- __tests__
- command/__tests__
- glob/__tests__
- marketplace
- mcp
- __tests__
- utils/__tests__
- roo-config
- search
- __tests__
- skills
- __tests__
- tree-sitter
- __tests__
- fixtures
- 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 | |
|---|---|---|---|
| |||
68 | 68 | | |
69 | 69 | | |
70 | 70 | | |
| 71 | + | |
| 72 | + | |
71 | 73 | | |
72 | 74 | | |
73 | 75 | | |
| |||
| 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 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
18 | 52 | | |
19 | 53 | | |
20 | 54 | | |
| |||
25 | 59 | | |
26 | 60 | | |
27 | 61 | | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
28 | 65 | | |
29 | 66 | | |
30 | 67 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
20 | 23 | | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
21 | 36 | | |
22 | 37 | | |
23 | 38 | | |
| |||
66 | 81 | | |
67 | 82 | | |
68 | 83 | | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
69 | 96 | | |
70 | 97 | | |
71 | 98 | | |
| |||
102 | 129 | | |
103 | 130 | | |
104 | 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 | + | |
105 | 168 | | |
106 | 169 | | |
107 | 170 | | |
| |||
174 | 237 | | |
175 | 238 | | |
176 | 239 | | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
177 | 252 | | |
178 | 253 | | |
179 | 254 | | |
| |||
0 commit comments