Repository navigation
Commit 7f4a40a
fix(utils): refuse ambiguous backup recency in jsonFileRecovery
Two leftover backups whose mtimes are exactly equal carry no evidence about which one
is the newer committed state - mtime is the only recency signal recovery has - so the
previous code picked whichever readdir listed first and then garbage-collected the
other one. That is a silent, order-dependent choice between two committed states, and
the loser is deleted, so the evidence disappears with it. Recovery now refuses on an
exact tie: it restores nothing and deletes nothing, and both copies stay on disk for a
human to read. That is the same fail-closed decision recovery already makes for a
backup it cannot stat, so it is a rule the file already states, applied to the one
input where its recency signal says nothing.
AmbiguousBackupRecencyError carries code AMBIGUOUS_BACKUP_RECENCY plus targetPath,
mtimeMs and both backup paths; its message names basenames only, because error
telemetry captures message and stack and a workspace path there would carry the local
username into that capture. The full paths stay on the properties for whoever has to
decide between the two tied copies.
Proof, all five rows in jsonFileRecovery.test.ts: the tie between two backups rejects with
AmbiguousBackupRecencyError / AMBIGUOUS_BACKUP_RECENCY and leaves both copies on disk with the
canonical path still absent; the different-mtime pair still restores the newest backup and
garbage-collects the loser, which is the contract the tie rows must not break; three backups
whose tie sits BELOW the winner (200, 100, 100) still restore the newest and remove both losers,
so the guard cannot be widened into 'any duplicate mtime means refuse'; the same tie driven
through the reader entry point (recoverMissingJsonFile) rejects and reports through the
persistence trace; and the error message names basenames only while the full paths stay on
targetPath, firstBackupPath and secondBackupPath.
Negative controls and the mutation band for this unit are recorded on the PR body with their
exits and byte pairs, as is the price of the delta at the tip this branch was cut from.
Unit U5c-2 of the planned split of #2357 (plan of record:
#1991 (comment)). Branch
cut from main at d3d9cd4; it does not depend on the
fileLock unit that merges before it: this file only calls withFileLock, which exists at
that tip. No changeset, no CHANGELOG row (AGENTS.md).
Co-Authored-By: Claude <[email protected]>1 parent d3d9cd4 commit 7f4a40a
2 files changed
Lines changed: 173 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
| 7 | + | |
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| |||
57 | 57 | | |
58 | 58 | | |
59 | 59 | | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
60 | 111 | | |
61 | 112 | | |
62 | 113 | | |
| |||
106 | 157 | | |
107 | 158 | | |
108 | 159 | | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
109 | 236 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
99 | 99 | | |
100 | 100 | | |
101 | 101 | | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
102 | 132 | | |
103 | 133 | | |
104 | 134 | | |
| |||
112 | 142 | | |
113 | 143 | | |
114 | 144 | | |
115 | | - | |
116 | | - | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
117 | 148 | | |
118 | 149 | | |
119 | 150 | | |
| |||
181 | 212 | | |
182 | 213 | | |
183 | 214 | | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
184 | 227 | | |
185 | 228 | | |
186 | 229 | | |
| |||
0 commit comments