| D1 | Rename `Resolution.InputInfo` to `EntryInfo`, describing the fixed resolution-entry metadata view, including retained defaults and CLI assignments. Preserve its return type and lookup behavior. |
| D2 | Rename `Definition.Secret` to `Sensitive`. Preserve classification behavior, the `configkit:"secret"` tag, and typed `Secret` references. |
| D3 | Rename `SourceVersionModeDefault` to `SourceVersionModeMainOnly`, `SourceVersionCheck` to `SourceVersionEvidence`, and `SourceInfo.VersionCheck` to `VersionEvidence`. Retain `SourceVersionModeIfPresent` and `SourceVersionModeRequired`. |
| D4 | Rename `ImportSelection` to `EmptyImportSelection` and `SourceInfo.ImportSelections` to `EmptyImportSelections`. Retain path, location, and selector; remove `Outcome`, `ImportSelectionOutcome`, and `ImportSelectionNone`. |
| D5 | Rename `SourceInfo.DestinationUnresolved` to `DestinationIsFallback`, preserving its existing meaning and destination coordinates. |
| D6 (including N4) | Replace `Resolution.Record` with the two intent-specific methods below and remove `CodeResolveInvalidKind` once its public trigger is eliminated. Retain `ChangeKind` and its inspection constants. |
| D7 | Rename `LoadSecretsDir` to `LoadSecretsIntoEnvironment`, making process-environment mutation explicit. Preserve its signature apart from the name, report-plus-error behavior, and existing bootstrap semantics. |
| D8 | Remove `CodeOptionsUnavailable` after confirming there is no intentional supported role. Do not introduce a failure merely to give the code a producer; a concrete reason to retain it should be brought back for discussion. |
| A1 (including N5) | Add `Result.Source(id)` and `LoadError.Source(id)` for direct lookup of source evidence on successful and failed loads, alongside their existing `Sources()` enumeration. Keep source evidence distinct from passive resource access through `SourceContext(id)`. |
| N2 | Replace `LayerBase = "base"` with `LayerMain = "main"`, without a compatibility alias. Update Go references and affected string comparisons, serialization, and rendered labels. Preserve the existing main-tier category, imported contributions' owning tiers, precedence, and acquisition order. |
| N3 | Replace `CodeExplainLimitExceeded = "explain.limit_exceeded"` with `CodeHistoryLimitExceeded = "history.limit_exceeded"`, without a compatibility alias. Update Go references and affected diagnostic-code consumers. Preserve the existing quota, retained-node accounting, failure conditions, diagnostic locations, and admission timing before effective secret lookup and application validation. |
| N6 | Rename `ImportDefaults.Follow` to `FollowSymlinks` and `ImportDefaults.Hidden` to `IncludeHidden`, replacing the old fields outright. Preserve `*bool` types, nil defaulting, explicit true/false, declaration overrides, traversal behavior, and search scope. Keep YAML keys `follow` and `hidden`, and Go fields `Required`, `Recursive`, and `Pattern`, unchanged. |
### 1. Migrate Public Declarations And Facade Conversions
Update the public declarations, comments, wrappers, and conversions as a coherent
surface. Useful existing owners are:
| Area | Baseline owners and required work |
| --- | --- |
| Entry metadata, sensitivity, version mode, and import defaults | [lifecycle.go](../../lifecycle.go), [layered.go](../../layered.go), and [conversion.go](../../conversion.go): update both ordinary and layered loading paths, callback wrappers, and definition/default conversions. |
| Source evidence | [records.go](../../records.go) and [conversion.go](../../conversion.go): rename records/fields and remove the empty-selection outcome. Cover source records returned through results, callbacks, and load errors. |
| Recording intents | [lifecycle.go](../../lifecycle.go) and [engine resolution](../../internal/engine/resolution.go): provide the two methods, route them to the existing recording/auditing machinery, and remove the public kind-selecting method. |
| Discovery and bootstrap | [discovery.go](../../discovery.go) and [secrets.go](../../secrets.go): replace constructor/function names and migrate their callers without changing acquisition or environment mutation behavior. |
| Provenance and diagnostic values | [records.go](../../records.go), [engine records](../../internal/engine/records.go), producers, conversions, and renderers: apply the selected labels and codes consistently. |
| Direct lookup | [lifecycle.go](../../lifecycle.go), [diagnostic.go](../../diagnostic.go), and their engine collaborators: expose the existing retained source evidence through the new result/error methods. |
Use explicit root/engine conversion as needed; no public aliases or engine types
are needed to implement these replacements. Private naming and helper placement
belong to implementation planning. Avoid unrelated internal renames merely to
make every private identifier match the facade.
Preserve distinctions that the new names clarify:
-`EntryInfo` remains a fixed, detached entry-state lookup with its current
unknown/invalid/shape-mismatch behavior. `IsExplicit` retains its own existing
validation behavior; the rename does not unify those two query contracts.
-`Sensitive` remains the classification predicate, separate from typed secret
references. Existing tag/predicate/dependency classification and redaction
still apply.
-`DestinationIsFallback` still describes the nearest resolved enclosing
container when the full destination is unavailable. It does not promise an
item's exact coordinates or upgrade evidence retained at an earlier stage.
- Empty-selection records keep their existing scope, order, and declaration-local
coordinates. Removing `Outcome` does not create a complete import ledger.
-`FollowSymlinks` and `IncludeHidden` retain pointer defaulting and load-preflight
snapshot behavior. Do not mechanically rename YAML `follow` or `hidden` keys.
### 2. Replace Recording Entry Points And Retire Obsolete Diagnostics
Implement the two recording methods over the existing resolution lifecycle.
Migrate manual-record callers according to the intent they currently supply;
keep assignment helper calls as helpers. Tests of container coverage, overlapping
records, dependencies, equal-valued intent, and net-change auditing continue to
protect the same behavior through the new entry points.
Complete the N4 check after replacing `Record`: trace supported recording routes,
then remove the obsolete exported invalid-kind code if its public trigger is
gone. Update tests of the removed input mechanism without weakening unrelated
record validation. Do not introduce a different public diagnostic solely to
represent an unreachable kind.
For D8, confirm both producer references and any documented intentional role for
`CodeOptionsUnavailable`, then remove the unused declaration and associated
active documentation. A concrete supported role discovered during this check
should be brought back for discussion. These are verification tasks for accepted
removals, not permission to delete other diagnostics that happen to be uncommon.
### 3. Add Direct Lookup Without Changing Source Evidence
Implement the result and error methods against each receiver's retained source
inventory. Reuse source-copying and facade-conversion helpers where practical so
lookup and enumeration agree, including nested locations, version evidence,
empty-selection evidence, and detached paths. Follow existing result-query
nil/zero conventions; failed-load nil/zero behavior is specified above.
Keep `Sources()` enumeration and `SourceContext(id)` responsibilities intact.
Lookup must not repeat acquisition, finalize failure evidence, or change source
IDs. A slice search or a suitable existing index can satisfy the contract; no
new lookup complexity promise or shared lazy cache is selected.
### 4. Carry The Two String Changes Through Their Producers And Readers
Replace the main-tier category's `"base"` spelling with `"main"` wherever that
category crosses the public boundary or is rendered. Imported contributions keep
their owning tier and ordinary source-location attribution. Other uses of the
word "base", such as filesystem base directories, are unrelated.
Change every retained-history-limit diagnostic producer and relevant reader to
`"history.limit_exceeded"`, including inheritance and final load admission.
Preserve the quota, accounting, and failure timing. This rename does not make
history optional or add a new limit control.
Review Go constant references and literal comparisons/expected output separately:
compilation catches old symbols but not stale diagnostic or provenance strings.
Other codes and layer values retain their existing meaning and spelling.
### 5. Update Consumer Guidance And Migration Information
Update declaration comments, applicable sections of [config.md](../config.md),
the [consumer guide](../consumers/README.md), README examples, and maintained
consumer code/fixtures under `examples/`. Use the new recording methods and source
lookups in relevant existing examples without expanding unrelated workflows.
Update internal documentation only where implemented ownership or terminology
changes. Accepted ADR decisions do not need revision for this cleanup.
Record the old-to-new Go names, removed outcome fields/codes, recording-call
replacements, and the two observable string changes as migration information.
Downstream applications may need to update literal comparisons and serialized
expectations as well as Go references. Version-specific release notes and
publication remain part of the normal [release process](../release.md); this
roadmap does not select a release version or authorize publication.
Keep revision-pinned review evidence and historical release records accurate for
their original revisions. Old names in those records are not stale active API
usage. Do not rewrite history or require external consumer migrations to claim
the repository implementation is complete.
## General Implementation Order
1. Map the accepted public changes to declarations, conversions, producers,
existing tests, and maintained consumer call sites. Confirm D8's intended-use
evidence and identify the D6/N4 dependency.
2. Apply the declaration and source-record changes across the facade and engine
boundary, preserving the existing semantics described above. Implement D6
with its associated N4 cleanup. Ordinary and layered paths must converge on
the same selected public vocabulary.
3. Add both source-lookup methods using the renamed source-evidence representation.
Complete the provenance and diagnostic string migration across production
sites and their readers.
4. Migrate maintained examples, documentation, and affected tests alongside the
relevant changes; finish consumer migration guidance after the public surface
is coherent.
5. Review the integrated public API and behavior, run applicable development
checks, and record completion evidence.
This is dependency ordering, not a prescribed commit count or a requirement for
intermediate releases. Independent renames can proceed together. The later
implementation plan should choose concrete work units without adding temporary
public compatibility machinery.
## Validation And Completion
Follow the [testing policy](../policy/testing.md) and