Commit 9ca0909
## What
Reconciles the maintainer's **`estate-standardization-20260607`** branch
(the estate-standards catch-up) onto **current `main`**, resolving its
divergence + conflicts with the merged #34/#38 work — so `main` can
adopt the standardization without regressing recent fixes.
Brings onto main: the `svc/k9 → self-validating/` rename,
`bot_directives`, the contractiles refresh, governance docs, and flake
updates.
## Conflict resolutions (7 files)
| File(s) | Resolution | Why |
|---|---|---|
| `dependabot-automerge.yml`, `dogfood-gate.yml`,
`static-analysis-gate.yml`, `hypatia-scan.yml` | **take main** | main's
workflow layer has moved past the 6-day-old standardization (TruffleHog,
CodeQL `actions` extractor, hypatia-scan removal). `hypatia-scan.yml`
stays deleted — consistent with dropping the superseded
`hypatia-scan-reusable-wrapper` branch. |
| `contractiles/Justfile` (add/add) | take main | near-identical; main
is current. |
| `bust/Bustfile.a2ml`, `dust/Dustfile.a2ml` (modify/delete) | **keep
main's** | live, valued contractiles — not dropped. |
**Preserved from #34/#38** (auto-merged correctly): my **K9! magic +
pedigree** fixes carried through the `svc/k9 → self-validating` rename;
the **`ci.yml` grammar-guard `^data_` anchor**; the nightly-toolchain
`test` job.
## Verification
On the reconciled tree, run with the upstream actions:
- **`k9-validate-action` → 0 errors**
- **`a2ml-validate-action` → 0 errors**
The standardization touches **no Rust** (only `.machine_readable` /
workflows / flake / docs), so the code is main's, unchanged.
## Notes
- Draft — this reconciles a **maintainer-owned** standardization, so it
wants maintainer review. Once merged, the old
`estate-standardization-20260607` and the superseded
`chore/hypatia-scan-reusable-wrapper` branches can be deleted.
- CI is currently **billing-blocked** (jobs fail in 2–3s with no logs),
so this won't get a CI run until that's restored.
---
_Generated by [Claude
Code](https://claude.ai/code/session_018CaSgNjNURC7ocsyjYh9We)_
---------
Co-authored-by: Mistral Vibe <vibe@mistral.ai>
Co-authored-by: Claude <paraordinate@yahoo.co.uk>
1 parent 95dbc45 commit 9ca0909
30 files changed
Lines changed: 28 additions & 0 deletions
File tree
- .github/workflows
- .machine_readable/self-validating
- examples
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
| 17 | + | |
17 | 18 | | |
18 | 19 | | |
19 | 20 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
| 17 | + | |
17 | 18 | | |
18 | 19 | | |
19 | 20 | | |
| |||
96 | 97 | | |
97 | 98 | | |
98 | 99 | | |
| 100 | + | |
99 | 101 | | |
100 | 102 | | |
101 | 103 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
| 16 | + | |
16 | 17 | | |
17 | 18 | | |
18 | 19 | | |
| |||
30 | 31 | | |
31 | 32 | | |
32 | 33 | | |
| 34 | + | |
33 | 35 | | |
34 | 36 | | |
35 | 37 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| 22 | + | |
22 | 23 | | |
23 | 24 | | |
24 | 25 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| 9 | + | |
9 | 10 | | |
10 | 11 | | |
11 | 12 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| 9 | + | |
9 | 10 | | |
10 | 11 | | |
11 | 12 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| 9 | + | |
9 | 10 | | |
10 | 11 | | |
11 | 12 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
| 16 | + | |
16 | 17 | | |
17 | 18 | | |
18 | 19 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| 9 | + | |
9 | 10 | | |
10 | 11 | | |
11 | 12 | | |
| |||
32 | 33 | | |
33 | 34 | | |
34 | 35 | | |
| 36 | + | |
35 | 37 | | |
36 | 38 | | |
37 | 39 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
| 18 | + | |
18 | 19 | | |
19 | 20 | | |
20 | 21 | | |
| |||
72 | 73 | | |
73 | 74 | | |
74 | 75 | | |
| 76 | + | |
75 | 77 | | |
76 | 78 | | |
77 | 79 | | |
| |||
112 | 114 | | |
113 | 115 | | |
114 | 116 | | |
| 117 | + | |
115 | 118 | | |
116 | 119 | | |
117 | 120 | | |
| |||
0 commit comments