Repository navigation
Commit 27a2836
committed
fix(webview): exempt keys ContextProxy does not count from the rollback generation guard
_restoreSharedValuesAfterFailedViewWrite gates every key on the per-key write generation the
setter captured. ContextProxy counts only cached global-state writes: secrets go through
storeSecret and pass-through keys straight to the Memento, and neither advances the map, so
those keys are captured with generation 1 and still read 0 afterwards. The guard is never
satisfiable for them, which exempts exactly the keys whose value cannot be compared back
(a secret is not in getValues, a pass-through key is not cached) from the rollback of their
own failed attempt: after a failed per-view write the secret and the durable task history
stay at the value the failed attempt wrote while every other key is restored.
The filter now skips the generation clause for keys the repo's own predicates say ContextProxy
does not count - isSecretStateKey from @roo-code/types and isPassThroughStateKey from
../config/ContextProxy - and keeps it everywhere else. ClineProvider.ts 6456 -> 6464 lines.
Tests (three cases, all red before the change).
- a secret key (nanoGptApiKey) written alongside a counted key with the per-view write
failing: asserts the store moved to the new value and the cache is back to the old one;
failed with expected 'new-secret' to be 'old-secret'. storeSecret is fire-and-forget, so the
attempted value is asserted by presence, not order.
- a pass-through key (taskHistory) in the same shape: asserts the Memento was written the new
history and then the old one; received only the new write before the fix. The double delegates
to the real store, because replacing it would also silence the read-back the guard compares.
- the guard's own case: a concurrent provider re-writes the very value the attempt wrote, so
only the generation distinguishes them; asserts the newer write stands. Without the generation
clause it reads expected 'architect' to be 'code'.
Controls (ClineProvider.ts snapshotted at 8a5977a, restored by content hash after each):
drop the exemption (the previous guard) -> the secret and pass-through cases fail and the
other three pass; delete the generation clause -> only the same-value case fails, so the guard
is still load-bearing for counted keys; delete only the secret arm -> only the secret case
fails; delete only the pass-through arm -> only the pass-through case fails.
Gates: prettier --check clean; tsc --noEmit -p . clean; eslint --max-warnings=0 clean on both
files with no suppression count changed; vitest core/webview + core/config 44 files / 1304
tests green (1301 before, +3 cases). Scope 815 -> 818 extension executable lines (types 8).1 parent 49c626d commit 27a2836
2 files changed
Lines changed: 156 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
75 | 75 | | |
76 | 76 | | |
77 | 77 | | |
| 78 | + | |
78 | 79 | | |
79 | 80 | | |
80 | 81 | | |
| |||
132 | 133 | | |
133 | 134 | | |
134 | 135 | | |
135 | | - | |
| 136 | + | |
136 | 137 | | |
137 | 138 | | |
138 | 139 | | |
| |||
6432 | 6433 | | |
6433 | 6434 | | |
6434 | 6435 | | |
| 6436 | + | |
| 6437 | + | |
| 6438 | + | |
| 6439 | + | |
| 6440 | + | |
6435 | 6441 | | |
6436 | 6442 | | |
6437 | | - | |
| 6443 | + | |
| 6444 | + | |
| 6445 | + | |
6438 | 6446 | | |
6439 | 6447 | | |
6440 | 6448 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7210 | 7210 | | |
7211 | 7211 | | |
7212 | 7212 | | |
| 7213 | + | |
| 7214 | + | |
| 7215 | + | |
| 7216 | + | |
| 7217 | + | |
| 7218 | + | |
| 7219 | + | |
| 7220 | + | |
| 7221 | + | |
| 7222 | + | |
| 7223 | + | |
| 7224 | + | |
| 7225 | + | |
| 7226 | + | |
| 7227 | + | |
| 7228 | + | |
| 7229 | + | |
| 7230 | + | |
| 7231 | + | |
| 7232 | + | |
| 7233 | + | |
| 7234 | + | |
| 7235 | + | |
| 7236 | + | |
| 7237 | + | |
| 7238 | + | |
| 7239 | + | |
| 7240 | + | |
| 7241 | + | |
| 7242 | + | |
| 7243 | + | |
| 7244 | + | |
| 7245 | + | |
| 7246 | + | |
| 7247 | + | |
| 7248 | + | |
| 7249 | + | |
| 7250 | + | |
| 7251 | + | |
| 7252 | + | |
| 7253 | + | |
| 7254 | + | |
| 7255 | + | |
| 7256 | + | |
| 7257 | + | |
| 7258 | + | |
| 7259 | + | |
| 7260 | + | |
| 7261 | + | |
| 7262 | + | |
| 7263 | + | |
| 7264 | + | |
| 7265 | + | |
| 7266 | + | |
| 7267 | + | |
| 7268 | + | |
| 7269 | + | |
| 7270 | + | |
| 7271 | + | |
| 7272 | + | |
| 7273 | + | |
| 7274 | + | |
| 7275 | + | |
| 7276 | + | |
| 7277 | + | |
| 7278 | + | |
| 7279 | + | |
| 7280 | + | |
| 7281 | + | |
| 7282 | + | |
| 7283 | + | |
| 7284 | + | |
| 7285 | + | |
| 7286 | + | |
| 7287 | + | |
| 7288 | + | |
| 7289 | + | |
| 7290 | + | |
| 7291 | + | |
| 7292 | + | |
| 7293 | + | |
| 7294 | + | |
| 7295 | + | |
| 7296 | + | |
| 7297 | + | |
| 7298 | + | |
| 7299 | + | |
| 7300 | + | |
| 7301 | + | |
| 7302 | + | |
| 7303 | + | |
| 7304 | + | |
| 7305 | + | |
| 7306 | + | |
| 7307 | + | |
| 7308 | + | |
| 7309 | + | |
| 7310 | + | |
| 7311 | + | |
| 7312 | + | |
| 7313 | + | |
| 7314 | + | |
| 7315 | + | |
| 7316 | + | |
| 7317 | + | |
| 7318 | + | |
| 7319 | + | |
| 7320 | + | |
| 7321 | + | |
| 7322 | + | |
| 7323 | + | |
| 7324 | + | |
| 7325 | + | |
| 7326 | + | |
| 7327 | + | |
| 7328 | + | |
| 7329 | + | |
| 7330 | + | |
| 7331 | + | |
| 7332 | + | |
| 7333 | + | |
| 7334 | + | |
| 7335 | + | |
| 7336 | + | |
| 7337 | + | |
| 7338 | + | |
| 7339 | + | |
| 7340 | + | |
| 7341 | + | |
| 7342 | + | |
| 7343 | + | |
| 7344 | + | |
| 7345 | + | |
| 7346 | + | |
| 7347 | + | |
| 7348 | + | |
| 7349 | + | |
| 7350 | + | |
| 7351 | + | |
| 7352 | + | |
| 7353 | + | |
| 7354 | + | |
| 7355 | + | |
| 7356 | + | |
| 7357 | + | |
| 7358 | + | |
7213 | 7359 | | |
7214 | 7360 | | |
7215 | 7361 | | |
| |||
0 commit comments