Repository navigation
Commit d82d63e
committed
Merge upstream/main (a0d03a0) into fws/u9-task-history-delete
Conflict resolution keeps both sides of the apply_diff work instead of dropping
either one:
- main's 1b9cb7d ([Fix] apply_diff auto-approves edits outside the workspace,
#2343) is kept in full: isOutsideWorkspace is computed in execute and in
handlePartial and carried in both approval payloads.
- this branch's failure-reporting work is kept in full: formatFailedParts and
truncate, the detailed-failure budgets, the stat-around-read observation
authorization, and the guarded-save approval plumbing (approvedCanonicalTarget
plus the isOutsideWorkspace argument to saveDirectly and saveChanges).
- git's auto-merge emitted the isOutsideWorkspace declaration twice in execute
(main's bare line plus this branch's documented line, textually identical, same
scope) and the file would not parse. The duplicate line is removed and the
documented one kept; the merged file typechecks clean and its specs load.
- applyDiffTool.outsideWorkspace.spec.ts: the fs/promises double exposes realpath
as a named export as well as on the default object (the shape
writeToFileTool.spec.ts and editTool.spec.ts use), because the merged tool
canonicalizes an outside-workspace approval target through guardedWrite, which
reaches realpath through a namespace import. Without it canonicalizeForApproval
threw the guard's "Path could not be resolved" refusal, the tool catch routed
it to handleError, and askApproval was never reached - that was the cause of the
five red rows, measured, not assumed. Setup only: no assertion was changed,
moved or deleted. The stat double added for the read-around authorization is
load-bearing the same way (dropping it re-reds nine rows).
- guardedWrite.spec.ts: the Task double exposes abort as a getter over an
abortState holder, because main's Task.ts:3587 exposes abort as an accessor;
the two mid-flight abort flips drive abortState.abort instead of assigning a
read-only property (TS2540 at :1218 and :1234). Same shape as the fws/u6 and
fws/u8 branches, so the three units carry one fix.
Measured on this tree with pinned node v22.23.4: vitest core/tools/__tests__ +
core/task/__tests__ + core/task-persistence/__tests__ -> 81 files, 1671 passed,
5 skipped, exit 0; tsc --noEmit -p tsconfig.json -> exit 0, 0 error lines;
eslint --max-warnings=0 on the five merge-touched files -> exit 0 each; prettier
--check -> exit 0; eslint --prune-suppressions (whole src) -> exit 0 with no
semantic change, file restored. Negative controls on the same tree: dropping the
payload flag at both payload sites -> 9 failed | 2 passed (11); skipping the
stat-around-read block -> 1 failed | 56 passed (57); dropping the spec's stat
double -> 9 failed | 2 passed (11); restoring the writable abort field -> tsc
exit 2 with the two TS2540 rows.33 files changed
Lines changed: 900 additions & 193 deletions
File tree
- .github/workflows
- apps/vscode-e2e
- src/suite
- src
- core
- task
- __tests__
- run-state
- __tests__
- tools
- __tests__
- webview/__tests__
- scripts
- test-utils
- __tests__
- webview-ui
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
247 | 247 | | |
248 | 248 | | |
249 | 249 | | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
250 | 255 | | |
251 | 256 | | |
252 | 257 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
140 | 140 | | |
141 | 141 | | |
142 | 142 | | |
143 | | - | |
144 | | - | |
145 | | - | |
146 | | - | |
147 | | - | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
148 | 150 | | |
149 | 151 | | |
150 | 152 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
28 | | - | |
| 28 | + | |
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
93 | 93 | | |
94 | 94 | | |
95 | 95 | | |
96 | | - | |
97 | | - | |
98 | | - | |
99 | | - | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
100 | 101 | | |
101 | 102 | | |
102 | 103 | | |
| |||
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
145 | 145 | | |
146 | 146 | | |
147 | 147 | | |
148 | | - | |
| 148 | + | |
149 | 149 | | |
150 | 150 | | |
151 | 151 | | |
| |||
397 | 397 | | |
398 | 398 | | |
399 | 399 | | |
400 | | - | |
401 | 400 | | |
402 | 401 | | |
403 | 402 | | |
| |||
415 | 414 | | |
416 | 415 | | |
417 | 416 | | |
418 | | - | |
419 | 417 | | |
420 | 418 | | |
421 | 419 | | |
| |||
3586 | 3584 | | |
3587 | 3585 | | |
3588 | 3586 | | |
| 3587 | + | |
| 3588 | + | |
| 3589 | + | |
| 3590 | + | |
| 3591 | + | |
| 3592 | + | |
| 3593 | + | |
| 3594 | + | |
3589 | 3595 | | |
3590 | | - | |
3591 | 3596 | | |
3592 | 3597 | | |
3593 | 3598 | | |
3594 | 3599 | | |
3595 | 3600 | | |
3596 | 3601 | | |
3597 | 3602 | | |
3598 | | - | |
3599 | 3603 | | |
3600 | 3604 | | |
3601 | 3605 | | |
| |||
3605 | 3609 | | |
3606 | 3610 | | |
3607 | 3611 | | |
3608 | | - | |
3609 | 3612 | | |
3610 | 3613 | | |
3611 | 3614 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
| 24 | + | |
24 | 25 | | |
25 | 26 | | |
26 | 27 | | |
| |||
909 | 910 | | |
910 | 911 | | |
911 | 912 | | |
912 | | - | |
| 913 | + | |
913 | 914 | | |
914 | 915 | | |
915 | 916 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
101 | 101 | | |
102 | 102 | | |
103 | 103 | | |
104 | | - | |
| 104 | + | |
105 | 105 | | |
106 | 106 | | |
107 | 107 | | |
108 | 108 | | |
109 | 109 | | |
110 | 110 | | |
111 | | - | |
| 111 | + | |
112 | 112 | | |
113 | 113 | | |
114 | 114 | | |
| |||
124 | 124 | | |
125 | 125 | | |
126 | 126 | | |
127 | | - | |
| 127 | + | |
128 | 128 | | |
129 | 129 | | |
130 | 130 | | |
| |||
149 | 149 | | |
150 | 150 | | |
151 | 151 | | |
152 | | - | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
153 | 157 | | |
154 | 158 | | |
155 | 159 | | |
156 | 160 | | |
157 | | - | |
158 | 161 | | |
159 | 162 | | |
160 | 163 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
99 | 99 | | |
100 | 100 | | |
101 | 101 | | |
| 102 | + | |
102 | 103 | | |
103 | 104 | | |
104 | 105 | | |
| |||
1071 | 1072 | | |
1072 | 1073 | | |
1073 | 1074 | | |
1074 | | - | |
| 1075 | + | |
1075 | 1076 | | |
1076 | 1077 | | |
1077 | 1078 | | |
| |||
4922 | 4923 | | |
4923 | 4924 | | |
4924 | 4925 | | |
4925 | | - | |
| 4926 | + | |
4926 | 4927 | | |
4927 | 4928 | | |
4928 | 4929 | | |
| |||
4943 | 4944 | | |
4944 | 4945 | | |
4945 | 4946 | | |
4946 | | - | |
| 4947 | + | |
4947 | 4948 | | |
4948 | 4949 | | |
4949 | 4950 | | |
| |||
7344 | 7345 | | |
7345 | 7346 | | |
7346 | 7347 | | |
7347 | | - | |
| 7348 | + | |
7348 | 7349 | | |
7349 | 7350 | | |
7350 | 7351 | | |
| |||
7398 | 7399 | | |
7399 | 7400 | | |
7400 | 7401 | | |
7401 | | - | |
| 7402 | + | |
7402 | 7403 | | |
7403 | 7404 | | |
7404 | 7405 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| 6 | + | |
6 | 7 | | |
7 | 8 | | |
8 | 9 | | |
| |||
11 | 12 | | |
12 | 13 | | |
13 | 14 | | |
14 | | - | |
| 15 | + | |
15 | 16 | | |
16 | 17 | | |
17 | 18 | | |
| |||
44 | 45 | | |
45 | 46 | | |
46 | 47 | | |
47 | | - | |
| 48 | + | |
48 | 49 | | |
49 | 50 | | |
50 | 51 | | |
| |||
62 | 63 | | |
63 | 64 | | |
64 | 65 | | |
65 | | - | |
| 66 | + | |
66 | 67 | | |
67 | 68 | | |
68 | 69 | | |
| |||
83 | 84 | | |
84 | 85 | | |
85 | 86 | | |
86 | | - | |
| 87 | + | |
87 | 88 | | |
88 | 89 | | |
89 | 90 | | |
| |||
102 | 103 | | |
103 | 104 | | |
104 | 105 | | |
105 | | - | |
| 106 | + | |
106 | 107 | | |
107 | 108 | | |
108 | 109 | | |
| |||
0 commit comments