Commit 8b55ebc
committed
Merge origin/main into the docs-hygiene sweep branch
main landed a repo-wide behavior-preserving simplification sweep (#3379) across
203 files, which collided with this branch on 43 of them: one plugin.json and
one CHANGELOG.md for each of 23 plugins.
This conflict is why CI went quiet rather than red. GitHub schedules
pull_request workflows against the computed merge commit, and it could not
compute one, so ci, pr-title, claude-review and claude-security-review stopped
being created for the last two heads while the pull_request_target workflows
(do-not-merge, pr-issue-linkage) kept firing normally against the base. A
missing run reads exactly like a slow one, which is what made it worth chasing.
Every collision is the same shape. main took the next patch after the base
version for its sweep entry, and this branch had already used that same number
for a different change. Resolution rule: main's entry is released and keeps its
number; this branch's entries are unreleased and renumber above it, with the
manifest ending at the highest. So docs-hygiene's 0.21.12 through 0.21.16 become
0.21.13 through 0.21.17, main's 0.21.12 stays, and the manifest reads 0.21.17.
Resolved by script rather than by hand across 43 files, and the script refuses
rather than guesses: it requires main's new entries to be contiguous patches
sitting directly on the base version, and reports anything else for a human. It
refused three plugins on the first pass, correctly, because ai-briefing,
repo-fleet-hygiene and testing had both sides land on the same version number,
so their manifests never conflicted and the slice boundary cut inside our own
block. Anchoring that boundary on the base entry rather than on main's newest
fixed it, and all 23 then resolved.
Verified: no conflict markers anywhere in the tree, every one of the 23
manifests agrees with its changelog's top entry, both changelog gates pass
including the duplicate-version check that this collision would have tripped,
markdownlint clean at 1358 files, typos, editorconfig, the plugin-options gate,
plugin contracts across 3018 files, and the contract-slice prune gate.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01FTVH5ZRVph75kvxzUAnb6q200 files changed
Lines changed: 1913 additions & 1591 deletions
File tree
- plugins
- ai-briefing
- skills/generate/output/build
- lib
- autonomy
- .claude-plugin
- skills/setup/scripts
- claude-config
- .claude-plugin
- skills
- audit-instructions/scripts
- audit-permission-grants/scripts
- audit/scripts
- claude-ops
- .claude-plugin
- hooks
- skills
- audit-skill-visibility/scripts
- known-issues/scripts
- morning-brief/scripts
- observability/scripts
- code-tidying
- .claude-plugin
- skills
- audit-comment-residue/scripts
- lib
- audit-dead-code/scripts
- context-budget
- .claude-plugin
- hooks
- skills/audit/scripts
- discovery
- .claude-plugin
- scripts
- disk-hygiene
- .claude-plugin
- lib
- skills/clean/scripts
- docs-hygiene
- .claude-plugin
- skills
- audit-encapsulation/scripts
- compress/scripts
- guardrails
- .claude-plugin
- hooks
- lib/verification
- instruction-placement
- .claude-plugin
- hooks
- scripts
- lib
- kindle-dedrm
- .claude-plugin
- skills/manage/scripts
- knowledge
- .claude-plugin
- skills
- course-digest/extraction
- lib/auth
- docpage-digest/scripts
- map-corpus
- discovery
- extraction
- video-digest/extraction
- acquisition
- evals
- harvesting
- lib
- liveness
- transcript
- watching
- watch
- machine-health
- .claude-plugin
- skills/audit
- scripts/windows
- checks
- lib
- tests
- helpers
- windows
- checks
- lib
- miro
- .claude-plugin
- src
- tools
- planning
- .claude-plugin
- scripts
- plugin-quality
- .claude-plugin
- scripts
- rate-limit-guard
- .claude-plugin
- bench
- scripts
- repo-fleet-hygiene
- skills
- apply/scripts
- audit/scripts
- repo-hygiene
- .claude-plugin
- skills/clean/scripts
- session-flow
- .claude-plugin
- skills
- keep-going/scripts
- retro/scripts
- running-retro/scripts
- skill-quality
- .claude-plugin
- scripts
- source-control
- .claude-plugin
- hooks
- scripts
- skills
- babysit-prs/scripts
- tests
- pull-request/scripts
- testing
- skills/audit/scripts
- work-items
- .claude-plugin
- scripts
- tools/work-item-tracker
- adapters
- gitea
- linear
- local-markdown
- scripts
- lib
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 | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
| 6 | + | |
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
28 | 42 | | |
29 | 43 | | |
30 | 44 | | |
| |||
Lines changed: 1 addition & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
272 | 272 | | |
273 | 273 | | |
274 | 274 | | |
275 | | - | |
276 | | - | |
| 275 | + | |
277 | 276 | | |
278 | 277 | | |
279 | 278 | | |
| |||
Lines changed: 0 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
39 | 39 | | |
40 | 40 | | |
41 | 41 | | |
42 | | - | |
43 | | - | |
44 | | - | |
45 | | - | |
46 | | - | |
47 | | - | |
48 | | - | |
49 | 42 | | |
50 | 43 | | |
51 | 44 | | |
| |||
Lines changed: 23 additions & 26 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
50 | 50 | | |
51 | 51 | | |
52 | 52 | | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
53 | 71 | | |
54 | 72 | | |
55 | 73 | | |
| |||
81 | 99 | | |
82 | 100 | | |
83 | 101 | | |
84 | | - | |
85 | | - | |
86 | | - | |
87 | | - | |
88 | | - | |
89 | | - | |
| 102 | + | |
90 | 103 | | |
91 | 104 | | |
92 | 105 | | |
| |||
113 | 126 | | |
114 | 127 | | |
115 | 128 | | |
116 | | - | |
117 | | - | |
118 | | - | |
119 | | - | |
120 | | - | |
121 | | - | |
122 | | - | |
123 | 129 | | |
124 | 130 | | |
| 131 | + | |
125 | 132 | | |
126 | 133 | | |
127 | 134 | | |
| |||
263 | 270 | | |
264 | 271 | | |
265 | 272 | | |
266 | | - | |
267 | | - | |
268 | | - | |
269 | | - | |
270 | | - | |
271 | | - | |
| 273 | + | |
272 | 274 | | |
273 | 275 | | |
274 | | - | |
275 | | - | |
276 | | - | |
277 | | - | |
278 | | - | |
279 | | - | |
| 276 | + | |
280 | 277 | | |
281 | 278 | | |
282 | 279 | | |
| |||
328 | 325 | | |
329 | 326 | | |
330 | 327 | | |
331 | | - | |
| 328 | + | |
332 | 329 | | |
333 | 330 | | |
334 | 331 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
28 | | - | |
| 28 | + | |
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
| |||
43 | 43 | | |
44 | 44 | | |
45 | 45 | | |
46 | | - | |
| 46 | + | |
47 | 47 | | |
48 | 48 | | |
49 | 49 | | |
| |||
67 | 67 | | |
68 | 68 | | |
69 | 69 | | |
70 | | - | |
| 70 | + | |
71 | 71 | | |
72 | 72 | | |
73 | 73 | | |
74 | 74 | | |
75 | 75 | | |
76 | | - | |
| 76 | + | |
77 | 77 | | |
78 | 78 | | |
79 | 79 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
| 6 | + | |
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
17 | | - | |
| 17 | + | |
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
27 | | - | |
| 27 | + | |
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
| |||
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
36 | 50 | | |
37 | 51 | | |
38 | 52 | | |
| |||
Lines changed: 7 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
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 | | - | |
270 | | - | |
271 | | - | |
272 | | - | |
273 | | - | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
274 | 274 | | |
275 | 275 | | |
276 | 276 | | |
| |||
Lines changed: 0 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
159 | 159 | | |
160 | 160 | | |
161 | 161 | | |
162 | | - | |
163 | 162 | | |
164 | 163 | | |
165 | 164 | | |
| |||
Lines changed: 9 additions & 20 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
578 | 578 | | |
579 | 579 | | |
580 | 580 | | |
581 | | - | |
582 | | - | |
583 | | - | |
584 | | - | |
585 | | - | |
586 | | - | |
587 | | - | |
588 | | - | |
589 | | - | |
590 | | - | |
591 | | - | |
592 | | - | |
593 | | - | |
594 | | - | |
595 | | - | |
596 | | - | |
597 | | - | |
598 | | - | |
599 | | - | |
| 581 | + | |
| 582 | + | |
| 583 | + | |
| 584 | + | |
| 585 | + | |
| 586 | + | |
| 587 | + | |
| 588 | + | |
| 589 | + | |
600 | 590 | | |
601 | 591 | | |
602 | 592 | | |
| |||
817 | 807 | | |
818 | 808 | | |
819 | 809 | | |
820 | | - | |
821 | 810 | | |
822 | 811 | | |
823 | 812 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
5 | | - | |
| 4 | + | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| |||
0 commit comments