Skip to content

fix(plan): resolve merge conflict markers in plan 2606260615 #704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeduden merged 3 commits into from
Jun 27, 2026
Merged

fix(plan): resolve merge conflict markers in plan 2606260615 #704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5035d1e
fix(plan): resolve merge conflict markers in plan 2606260615
claude Jun 26, 2026
306c3c0
fix(docs): regenerate PLAN.md catalog and close audit tax items
claude Jun 26, 2026
a5d60e5
fix(docs): fix audit closure format — move 'Plans green.' to intro pa…
claude Jun 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions PLAN.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,24 @@ footer: |

| ID | Status | Model | Title |
| ---------- | ------ | ------ | ---------------------------------------------------------------------------------------------------------------------------------------------- |
| | | | [](plan/2606260615_arch-fix-cuelite-engine-helper-tests.md) |
| 52 | ✅ | | [Archetype / Template Library for Agentic Patterns](plan/52_archetype-template-library.md) |
| 61 | ✅ | | [Required Structure Rule Hardening](plan/61_required-structure-hardening.md) |
| 65 | ✅ | | [Spike WASM-Embedded Weasel Inference](plan/65_spike-wasm-embedded-inference.md) |
| 78 | ✅ | | [Query subcommand for front-matter filtering](plan/78_query-command.md) |
| 83 | ✅ | | [Security hardening batch](plan/83_security-hardening-batch.md) |
| 84 | ✅ | | [Symlink default-deny for file discovery](plan/84_symlink-default-deny.md) |
| 85 | ✅ | | [Increase test coverage to 95% by extracting shared rule helpers](plan/85_coverage-to-95-percent.md) |
| 86 | ✅ | | [Markdown flavor validation](plan/86_markdown-flavor-validation.md) |
| 89 | ✅ | | [TOC generator directive and MDS035 auto-fix](plan/89_toc-generator-directive.md) |
| 90 | ✅ | | [Isolate corpus test git config from host signing](plan/90_corpus-test-git-config-isolation.md) |
| 91 | ✅ | | [MDS037 skips paragraphs inside generated sections](plan/91_mds037-skip-generated-sections.md) |
| 92 | ✅ | sonnet | [File kinds — config schema, assignment, merge](plan/92_file-kinds.md) |
| 93 | ✅ | sonnet | [Placeholder grammar — opt-in token vocabulary](plan/93_placeholder-grammar.md) |
| 94 | ✅ | sonnet | [Lint-once for `<?include?>` and `<?catalog?>` embeds](plan/94_lint-once-for-embeds.md) |
| 95 | ✅ | opus | [Kind/rule resolution observability via `kinds` subcommand](plan/95_kind-rule-resolution-cli.md) |
| 96 | ✅ | sonnet | [Adopt kinds in mdsmith repo and ship the docs](plan/96_kinds-adoption-and-docs.md) |
| 97 | ✅ | opus | [Deep-merge for kinds and overrides](plan/97_deep-merge-config.md) |
| 98 | ✅ | sonnet | [Replace `archetypes` with `kinds`](plan/98_replace-archetypes-with-kinds.md) |
| 100 | ✅ | sonnet | [build config block and MDS040 recipe-safety rule](plan/100_build-config-and-mds040.md) |
| 101 | ✅ | sonnet | [build directive and MDS039 lint rule](plan/101_build-directive-mds039.md) |
| 102 | ✅ | opus | [Multi-output `<?build?>` directive](plan/102_build-subcommand.md) |
Expand Down Expand Up @@ -215,22 +232,5 @@ footer: |
| 2606241815 | ✅ | sonnet | [Add unit tests for three remaining unexported helpers in internal/index/locate.go](plan/2606241815_arch-fix-locate-remaining-helper-tests.md) |
| 2606260211 | ✅ | sonnet | [Add dedicated unit tests for layer0_html.go helpers](plan/2606260211_arch-fix-layer0-html-helper-tests.md) |
| 2606260614 | ✅ | sonnet | [arch-fix: add dedicated unit tests for lineclass_scan.go HTML-scanning helpers](plan/2606260614_arch-fix-lineclass-scan-helper-tests.md) |
| 52 | ✅ | | [Archetype / Template Library for Agentic Patterns](plan/52_archetype-template-library.md) |
| 61 | ✅ | | [Required Structure Rule Hardening](plan/61_required-structure-hardening.md) |
| 65 | ✅ | | [Spike WASM-Embedded Weasel Inference](plan/65_spike-wasm-embedded-inference.md) |
| 78 | ✅ | | [Query subcommand for front-matter filtering](plan/78_query-command.md) |
| 83 | ✅ | | [Security hardening batch](plan/83_security-hardening-batch.md) |
| 84 | ✅ | | [Symlink default-deny for file discovery](plan/84_symlink-default-deny.md) |
| 85 | ✅ | | [Increase test coverage to 95% by extracting shared rule helpers](plan/85_coverage-to-95-percent.md) |
| 86 | ✅ | | [Markdown flavor validation](plan/86_markdown-flavor-validation.md) |
| 89 | ✅ | | [TOC generator directive and MDS035 auto-fix](plan/89_toc-generator-directive.md) |
| 90 | ✅ | | [Isolate corpus test git config from host signing](plan/90_corpus-test-git-config-isolation.md) |
| 91 | ✅ | | [MDS037 skips paragraphs inside generated sections](plan/91_mds037-skip-generated-sections.md) |
| 92 | ✅ | sonnet | [File kinds — config schema, assignment, merge](plan/92_file-kinds.md) |
| 93 | ✅ | sonnet | [Placeholder grammar — opt-in token vocabulary](plan/93_placeholder-grammar.md) |
| 94 | ✅ | sonnet | [Lint-once for `<?include?>` and `<?catalog?>` embeds](plan/94_lint-once-for-embeds.md) |
| 95 | ✅ | opus | [Kind/rule resolution observability via `kinds` subcommand](plan/95_kind-rule-resolution-cli.md) |
| 96 | ✅ | sonnet | [Adopt kinds in mdsmith repo and ship the docs](plan/96_kinds-adoption-and-docs.md) |
| 97 | ✅ | opus | [Deep-merge for kinds and overrides](plan/97_deep-merge-config.md) |
| 98 | ✅ | sonnet | [Replace `archetypes` with `kinds`](plan/98_replace-archetypes-with-kinds.md) |
| 2606260615 | ✅ | sonnet | [Add dedicated unit tests for unexported helpers in cue/cuelite/engine.go](plan/2606260615_arch-fix-cuelite-engine-helper-tests.md) |
<?/catalog?>
1 change: 1 addition & 0 deletions docs/development/architecture-audit.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ fixes (map→struct, fmt→strconv); type-6 tag
gap fix; plan-2606241814/15 test additions.
No new production functions, DIP, SRP, or
line-count violations.
Plans 2606260211, 2606260614, 2606260615 green.

### tax (2026-06-26)

Expand Down
52 changes: 0 additions & 52 deletions plan/2606260615_arch-fix-cuelite-engine-helper-tests.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,6 @@
---
id: 2606260615
title: >-
<<<<<<< .merge_file_CyC6Z1
arch-fix: add dedicated unit tests for
cue/cuelite/engine.go unexported helpers
status: "🔲"
summary: >-
Seven unexported helpers in
cue/cuelite/engine.go lack dedicated
unit tests: combineMode, mkBottom,
topValue, engineValue.isBottomV,
engineValue.defaultValue,
engineValue.describeBound, and
bound.describe. This plan adds a
dedicated TestFoo for each.
=======
Add dedicated unit tests for unexported
helpers in cue/cuelite/engine.go
status: "✅"
Expand All @@ -27,7 +13,6 @@ summary: >-
TestEngineValue_DefaultValue,
TestEngineValue_DescribeBound,
and TestBound_Describe.
>>>>>>> .merge_file_rqVTnH
model: sonnet
---
# arch-fix: cuelite engine helper tests
Expand Down Expand Up @@ -64,31 +49,6 @@ by name" requires one.

## Tasks

<<<<<<< .merge_file_CyC6Z1

1. [ ] Add `TestCombineMode` in
`cue/cuelite/engine_test.go` or a new
`engine_helpers_test.go`. Cover all
four `combineMode` table entries.
2. [ ] Add `TestMkBottom`. Confirm the
returned value satisfies `isBottomV()`
and that `describe()` includes the
formatted message.
3. [ ] Add `TestTopValue`. Confirm
`describe() == "_"` and
`isBottomV() == false`.
4. [ ] Add `TestEngineValue_IsBottomV`.
Cover `nil` receiver (false), `kBottom`
(true), and a non-bottom value (false).
5. [ ] Add `TestEngineValue_DefaultValue`.
Cover a value with a default (returns
default and `true`) and a value with no
default (returns `false`).
6. [ ] Add `TestEngineValue_DescribeBound`.
Cover a bounded integer (`>=1 & <=10`)
and a string match constraint.
7. [ ] Add `TestBound_Describe`. Cover each
=======
1. [x] Add `TestCombineMode` in
`cue/cuelite/engine_test.go` or a new
`engine_helpers_test.go`. Cover all
Expand All @@ -111,25 +71,13 @@ by name" requires one.
Cover a bounded integer (`>=1 & <=10`)
and a string match constraint.
7. [x] Add `TestBound_Describe`. Cover each

>>>>>>> .merge_file_rqVTnH
operator (`>=`, `<=`, `>`, `<`, `!=`,
`=~`, `!~`) and `strings.MinRunes`.

## Acceptance Criteria

<<<<<<< .merge_file_CyC6Z1

- [ ] Each of the seven functions has a
dedicated top-level test.
- [ ] `go test ./cue/cuelite/...` green.
- [ ] `go vet ./...` clean.
- [ ] No production code changed; tests only.
=======
- [x] Each of the seven functions has a
dedicated top-level test.
- [x] `go test ./cue/cuelite/...` green.
- [x] `go vet ./...` clean.
- [x] No production code changed; tests only.

>>>>>>> .merge_file_rqVTnH
Loading