Commit 028071c
committed
Merge remote-tracking branch 'origin/main' into claude/issue-14378-translate-meta-item-comment
Conflict: content/docs/permissions/system-context.mdx.
main renumbered the elevation table (rows 49..61 became 48..60) and rewrote the
cross-reference prose with it ("row 51's doors" became "row 50's doors"), while
this branch had rewritten five absolute line anchors in the row that moved. The
`os-regen` merge driver declined to defer -- the file is MIXED, a generated half
plus hand-written prose -- and text-merged, which conflicted.
Resolved by taking main's side of the file whole (byte-identical to
origin/main), which keeps its renumbering and its prose intact and discards
only the five anchor numbers, then re-deriving those from the merged tree with
`node scripts/check-system-context-census.mjs --fix`. No line number was
hand-edited and no prose was hand-merged.
The conflicting path was identified with a driver-free instrument -- a
`--bare --shared` clone with no `merge.os-regen.driver` configured, which is
GitHub's condition -- because setting the driver to empty in the real checkout
makes git fail to execute it and report a conflict on every path routed to it.
The probe named exactly one conflicting path, and its control (the same probe
against the branch's own merge base) returned clean, so the instrument
discriminates.
Structurally re-verified at this head rather than reusing the previous
reading, because main's own numbers moved (107 sites became 106, 141 anchors
became 140, and that is main's change, not this branch's). Comparing the
merged tree against the merged tree carrying main's `rest-server.ts`:
sites 106 = 106, identifierAppearances 885 = 885, classified 462 = 462,
roleCounts.read 112 = 112, staleLedgerRows 0 = 0, and ARRIVED = 0 with
VANISHED = 0 on the position-blind multiset of (file, receiver, package,
text). Control `scannedFiles` = 293 on both sides, non-zero and re-validated
in the same run. Only movement positional: per-site delta 0 -1 -1 -1 -1 -1.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01D47qPfEWVPmhguWgBZCi5N78 files changed
Lines changed: 2386 additions & 980 deletions
File tree
- .changeset
- content/docs
- automation
- data-modeling
- kernel/contracts
- permissions
- protocol/objectql
- references
- api
- automation
- data
- kernel
- docs/qa/platform-checklist/areas
- examples/app-todo/test
- packages
- lint/src
- mcp/src
- metadata-protocol/src
- objectql/src
- integrity
- validation
- qa/dogfood/test
- rest/src
- services
- service-automation/src/builtin
- service-settings/src
- spec
- api-surface
- authorable-surface
- declaration-map
- export-origins
- json-schema.manifest
- liveness
- src
- api
- automation
- contracts
- data
- kernel
- security
- scripts
- audits
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 | |
|---|---|---|---|
| |||
| 1 | + | |
| 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 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
252 | 252 | | |
253 | 253 | | |
254 | 254 | | |
255 | | - | |
| 255 | + | |
256 | 256 | | |
257 | | - | |
| 257 | + | |
258 | 258 | | |
259 | 259 | | |
260 | 260 | | |
261 | 261 | | |
262 | 262 | | |
263 | 263 | | |
264 | | - | |
| 264 | + | |
265 | 265 | | |
266 | 266 | | |
267 | 267 | | |
268 | 268 | | |
269 | 269 | | |
270 | 270 | | |
271 | | - | |
| 271 | + | |
272 | 272 | | |
273 | 273 | | |
274 | 274 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
316 | 316 | | |
317 | 317 | | |
318 | 318 | | |
319 | | - | |
| 319 | + | |
320 | 320 | | |
321 | 321 | | |
322 | 322 | | |
| |||
0 commit comments