Skip to content

Commit fccd199

Browse files
claudeclaude
committed
fix(plan): resolve merge conflict markers in plan 2606260615
The plan file was committed with unresolved merge conflict markers from a prior automated merge. Resolves to the completed (✅) state, matching the already-merged engine_helpers_test.go implementation. Regenerates PLAN.md catalog which was broken by the invalid YAML. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_0151UijTBtRU3dm2Mbfndp8i
1 parent a497c1f commit fccd199

2 files changed

Lines changed: 19 additions & 71 deletions

File tree

‎PLAN.md‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,24 @@ footer: |
1616

1717
| ID | Status | Model | Title |
1818
| ---------- | ------ | ------ | ---------------------------------------------------------------------------------------------------------------------------------------------- |
19-
| | | | [](plan/2606260615_arch-fix-cuelite-engine-helper-tests.md) |
19+
| 52 | ✅ | | [Archetype / Template Library for Agentic Patterns](plan/52_archetype-template-library.md) |
20+
| 61 | ✅ | | [Required Structure Rule Hardening](plan/61_required-structure-hardening.md) |
21+
| 65 | ✅ | | [Spike WASM-Embedded Weasel Inference](plan/65_spike-wasm-embedded-inference.md) |
22+
| 78 | ✅ | | [Query subcommand for front-matter filtering](plan/78_query-command.md) |
23+
| 83 | ✅ | | [Security hardening batch](plan/83_security-hardening-batch.md) |
24+
| 84 | ✅ | | [Symlink default-deny for file discovery](plan/84_symlink-default-deny.md) |
25+
| 85 | ✅ | | [Increase test coverage to 95% by extracting shared rule helpers](plan/85_coverage-to-95-percent.md) |
26+
| 86 | ✅ | | [Markdown flavor validation](plan/86_markdown-flavor-validation.md) |
27+
| 89 | ✅ | | [TOC generator directive and MDS035 auto-fix](plan/89_toc-generator-directive.md) |
28+
| 90 | ✅ | | [Isolate corpus test git config from host signing](plan/90_corpus-test-git-config-isolation.md) |
29+
| 91 | ✅ | | [MDS037 skips paragraphs inside generated sections](plan/91_mds037-skip-generated-sections.md) |
30+
| 92 | ✅ | sonnet | [File kinds — config schema, assignment, merge](plan/92_file-kinds.md) |
31+
| 93 | ✅ | sonnet | [Placeholder grammar — opt-in token vocabulary](plan/93_placeholder-grammar.md) |
32+
| 94 | ✅ | sonnet | [Lint-once for `<?include?>` and `<?catalog?>` embeds](plan/94_lint-once-for-embeds.md) |
33+
| 95 | ✅ | opus | [Kind/rule resolution observability via `kinds` subcommand](plan/95_kind-rule-resolution-cli.md) |
34+
| 96 | ✅ | sonnet | [Adopt kinds in mdsmith repo and ship the docs](plan/96_kinds-adoption-and-docs.md) |
35+
| 97 | ✅ | opus | [Deep-merge for kinds and overrides](plan/97_deep-merge-config.md) |
36+
| 98 | ✅ | sonnet | [Replace `archetypes` with `kinds`](plan/98_replace-archetypes-with-kinds.md) |
2037
| 100 | ✅ | sonnet | [build config block and MDS040 recipe-safety rule](plan/100_build-config-and-mds040.md) |
2138
| 101 | ✅ | sonnet | [build directive and MDS039 lint rule](plan/101_build-directive-mds039.md) |
2239
| 102 | ✅ | opus | [Multi-output `<?build?>` directive](plan/102_build-subcommand.md) |
@@ -215,22 +232,5 @@ footer: |
215232
| 2606241815 | ✅ | sonnet | [Add unit tests for three remaining unexported helpers in internal/index/locate.go](plan/2606241815_arch-fix-locate-remaining-helper-tests.md) |
216233
| 2606260211 | ✅ | sonnet | [Add dedicated unit tests for layer0_html.go helpers](plan/2606260211_arch-fix-layer0-html-helper-tests.md) |
217234
| 2606260614 | ✅ | sonnet | [arch-fix: add dedicated unit tests for lineclass_scan.go HTML-scanning helpers](plan/2606260614_arch-fix-lineclass-scan-helper-tests.md) |
218-
| 52 | ✅ | | [Archetype / Template Library for Agentic Patterns](plan/52_archetype-template-library.md) |
219-
| 61 | ✅ | | [Required Structure Rule Hardening](plan/61_required-structure-hardening.md) |
220-
| 65 | ✅ | | [Spike WASM-Embedded Weasel Inference](plan/65_spike-wasm-embedded-inference.md) |
221-
| 78 | ✅ | | [Query subcommand for front-matter filtering](plan/78_query-command.md) |
222-
| 83 | ✅ | | [Security hardening batch](plan/83_security-hardening-batch.md) |
223-
| 84 | ✅ | | [Symlink default-deny for file discovery](plan/84_symlink-default-deny.md) |
224-
| 85 | ✅ | | [Increase test coverage to 95% by extracting shared rule helpers](plan/85_coverage-to-95-percent.md) |
225-
| 86 | ✅ | | [Markdown flavor validation](plan/86_markdown-flavor-validation.md) |
226-
| 89 | ✅ | | [TOC generator directive and MDS035 auto-fix](plan/89_toc-generator-directive.md) |
227-
| 90 | ✅ | | [Isolate corpus test git config from host signing](plan/90_corpus-test-git-config-isolation.md) |
228-
| 91 | ✅ | | [MDS037 skips paragraphs inside generated sections](plan/91_mds037-skip-generated-sections.md) |
229-
| 92 | ✅ | sonnet | [File kinds — config schema, assignment, merge](plan/92_file-kinds.md) |
230-
| 93 | ✅ | sonnet | [Placeholder grammar — opt-in token vocabulary](plan/93_placeholder-grammar.md) |
231-
| 94 | ✅ | sonnet | [Lint-once for `<?include?>` and `<?catalog?>` embeds](plan/94_lint-once-for-embeds.md) |
232-
| 95 | ✅ | opus | [Kind/rule resolution observability via `kinds` subcommand](plan/95_kind-rule-resolution-cli.md) |
233-
| 96 | ✅ | sonnet | [Adopt kinds in mdsmith repo and ship the docs](plan/96_kinds-adoption-and-docs.md) |
234-
| 97 | ✅ | opus | [Deep-merge for kinds and overrides](plan/97_deep-merge-config.md) |
235-
| 98 | ✅ | sonnet | [Replace `archetypes` with `kinds`](plan/98_replace-archetypes-with-kinds.md) |
235+
| 2606260615 | ✅ | sonnet | [Add dedicated unit tests for unexported helpers in cue/cuelite/engine.go](plan/2606260615_arch-fix-cuelite-engine-helper-tests.md) |
236236
<?/catalog?>

‎plan/2606260615_arch-fix-cuelite-engine-helper-tests.md‎

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,6 @@
11
---
22
id: 2606260615
33
title: >-
4-
<<<<<<< .merge_file_CyC6Z1
5-
arch-fix: add dedicated unit tests for
6-
cue/cuelite/engine.go unexported helpers
7-
status: "🔲"
8-
summary: >-
9-
Seven unexported helpers in
10-
cue/cuelite/engine.go lack dedicated
11-
unit tests: combineMode, mkBottom,
12-
topValue, engineValue.isBottomV,
13-
engineValue.defaultValue,
14-
engineValue.describeBound, and
15-
bound.describe. This plan adds a
16-
dedicated TestFoo for each.
17-
=======
184
Add dedicated unit tests for unexported
195
helpers in cue/cuelite/engine.go
206
status: "✅"
@@ -27,7 +13,6 @@ summary: >-
2713
TestEngineValue_DefaultValue,
2814
TestEngineValue_DescribeBound,
2915
and TestBound_Describe.
30-
>>>>>>> .merge_file_rqVTnH
3116
model: sonnet
3217
---
3318
# arch-fix: cuelite engine helper tests
@@ -64,31 +49,6 @@ by name" requires one.
6449

6550
## Tasks
6651

67-
<<<<<<< .merge_file_CyC6Z1
68-
69-
1. [ ] Add `TestCombineMode` in
70-
`cue/cuelite/engine_test.go` or a new
71-
`engine_helpers_test.go`. Cover all
72-
four `combineMode` table entries.
73-
2. [ ] Add `TestMkBottom`. Confirm the
74-
returned value satisfies `isBottomV()`
75-
and that `describe()` includes the
76-
formatted message.
77-
3. [ ] Add `TestTopValue`. Confirm
78-
`describe() == "_"` and
79-
`isBottomV() == false`.
80-
4. [ ] Add `TestEngineValue_IsBottomV`.
81-
Cover `nil` receiver (false), `kBottom`
82-
(true), and a non-bottom value (false).
83-
5. [ ] Add `TestEngineValue_DefaultValue`.
84-
Cover a value with a default (returns
85-
default and `true`) and a value with no
86-
default (returns `false`).
87-
6. [ ] Add `TestEngineValue_DescribeBound`.
88-
Cover a bounded integer (`>=1 & <=10`)
89-
and a string match constraint.
90-
7. [ ] Add `TestBound_Describe`. Cover each
91-
=======
9252
1. [x] Add `TestCombineMode` in
9353
`cue/cuelite/engine_test.go` or a new
9454
`engine_helpers_test.go`. Cover all
@@ -111,25 +71,13 @@ by name" requires one.
11171
Cover a bounded integer (`>=1 & <=10`)
11272
and a string match constraint.
11373
7. [x] Add `TestBound_Describe`. Cover each
114-
115-
>>>>>>> .merge_file_rqVTnH
11674
operator (`>=`, `<=`, `>`, `<`, `!=`,
11775
`=~`, `!~`) and `strings.MinRunes`.
11876

11977
## Acceptance Criteria
12078

121-
<<<<<<< .merge_file_CyC6Z1
122-
123-
- [ ] Each of the seven functions has a
124-
dedicated top-level test.
125-
- [ ] `go test ./cue/cuelite/...` green.
126-
- [ ] `go vet ./...` clean.
127-
- [ ] No production code changed; tests only.
128-
=======
12979
- [x] Each of the seven functions has a
13080
dedicated top-level test.
13181
- [x] `go test ./cue/cuelite/...` green.
13282
- [x] `go vet ./...` clean.
13383
- [x] No production code changed; tests only.
134-
135-
>>>>>>> .merge_file_rqVTnH

0 commit comments

Comments
 (0)