<?xml version="1.0" encoding="utf-8"?>
<entry xmlns="http://www.w3.org/2005/Atom" xml:base="https://docs.spec-kitty.ai/adr/3.x/2026-07-30-1-consolidated-write-surface-and-consolidate-terminology/">
  <id>https://docs.spec-kitty.ai/adr/3.x/2026-07-30-1-consolidated-write-surface-and-consolidate-terminology/</id>
  <title>ADR: CONSOLIDATED Write-Surface Wiring and `consolidate` as Canonical Lane-Consolidation Terminology</title>
  <updated>2026-07-30T00:00:00.000Z</updated>
  <author><name>Spec Kitty</name></author>
  <link rel="alternate" type="text/html" href="https://docs.spec-kitty.ai/adr/3.x/2026-07-30-1-consolidated-write-surface-and-consolidate-terminology/"/>
  <summary>Wires `TopologySurface.CONSOLIDATED` to the integrated tree with the phase derived internally, and fixes `consolidate` as the canonical word for the lane-consolidation sense.</summary>
  <content type="html">&lt;h2 id=&quot;context-and-problem-statement&quot;&gt;Context and Problem Statement&lt;/h2&gt;
&lt;p&gt;PR #3076 shipped the write-side placement seam but deferred the CONSOLIDATED half of it.
ADR &lt;a href=&quot;/adr/3.x/2026-07-23-1-surface-vocabulary-two-domains-and-topology-surface-rename/&quot;&gt;2026-07-23-1&lt;/a&gt;
declared &lt;code dir=&quot;auto&quot;&gt;TopologySurface.CONSOLIDATED&lt;/code&gt; as a member and gave &lt;code dir=&quot;auto&quot;&gt;translate_surface&lt;/code&gt; a
&lt;strong&gt;total&lt;/strong&gt; arm for it — every &lt;code dir=&quot;auto&quot;&gt;TopologySurface&lt;/code&gt; member has a translation entry, asserted
by &lt;code dir=&quot;auto&quot;&gt;assert_surface_totality&lt;/code&gt;. But &lt;code dir=&quot;auto&quot;&gt;SurfaceLocations.consolidated&lt;/code&gt; (the field that arm
reads) has never been populated in production: &lt;code dir=&quot;auto&quot;&gt;translate_surface(CONSOLIDATED, …)&lt;/code&gt;
raises &lt;code dir=&quot;auto&quot;&gt;ValueError&lt;/code&gt; rather than resolving anything, because no caller has ever supplied
the location. &lt;code dir=&quot;auto&quot;&gt;resolve_placement_only&lt;/code&gt; instead resolves PRIMARY-kind writes to the
mission’s Target Ref (&lt;code dir=&quot;auto&quot;&gt;target_branch&lt;/code&gt;) unconditionally, regardless of lifecycle phase.&lt;/p&gt;
&lt;p&gt;That gap is now load-bearing (issue #3033, P0). After a mission is consolidated
(lane-consolidation, “E1”) and then published to trunk (“E2”), the Target Ref branch is
&lt;strong&gt;deleted&lt;/strong&gt; — &lt;code dir=&quot;auto&quot;&gt;spec-kitty merge&lt;/code&gt;’s local consolidation only ever &lt;em&gt;keeps&lt;/em&gt; lane branches
deleted, but the operator-driven publish-to-trunk step (PR + merge to the Primary Branch)
deletes the Target Ref itself. Post-consolidation evidence writes (an acceptance-matrix
verdict, a tracer finding, an issue-matrix update, a retrospective) still resolve against
that deleted ref, so &lt;code dir=&quot;auto&quot;&gt;safe-commit&lt;/code&gt;’s HEAD-vs-ref guard can never be satisfied and the
write fails or is refused. &lt;code dir=&quot;auto&quot;&gt;spec-kitty review --mode post-merge&lt;/code&gt; is the operator-visible
symptom; it performs no commit itself, so the fix is not there.&lt;/p&gt;
&lt;p&gt;A second, narrower gap sits underneath the first: the codebase’s overloaded &lt;code dir=&quot;auto&quot;&gt;merge&lt;/code&gt; (a
three-sense term already disambiguated by ADR
&lt;a href=&quot;/adr/3.x/2026-07-23-2-post-consolidation-deferral-and-external-enforcement/&quot;&gt;2026-07-23-2&lt;/a&gt; —
lane consolidation / branch integration / publish-to-origin) has &lt;strong&gt;no single-word
canonical replacement&lt;/strong&gt; for the lane-consolidation sense. Every line of new code or prose
that needs to name that sense precisely has to reach for a multi-word disambiguating
phrase (“local lane consolidation”) rather than one word, which is exactly the friction
that lets “merge” creep back in for that sense (mission #3080). This mission
(&lt;code dir=&quot;auto&quot;&gt;post-merge-write-authoring-finish-01KYRRM5&lt;/code&gt;) lands only the “do not make it worse”
&lt;strong&gt;foundation&lt;/strong&gt; of #3080 — this ADR’s terminology decision, a glossary update, and a CI
drift-ratchet guard — sequenced before any of the functional CONSOLIDATED-wiring work.
The full command/code/docs rename (&lt;code dir=&quot;auto&quot;&gt;spec-kitty merge&lt;/code&gt;, &lt;code dir=&quot;auto&quot;&gt;MergeState&lt;/code&gt;,
&lt;code dir=&quot;auto&quot;&gt;baseline_merge_commit&lt;/code&gt;, …) stays #3080; this ADR explicitly does not perform it.&lt;/p&gt;
&lt;h2 id=&quot;decision-drivers&quot;&gt;Decision Drivers&lt;/h2&gt;
&lt;ul&gt;
&lt;li&gt;&lt;strong&gt;Single write resolver&lt;/strong&gt; (ADR &lt;a href=&quot;/adr/3.x/2026-06-24-1-kind-and-topology-aware-artifact-placement/&quot;&gt;2026-06-24-1&lt;/a&gt;
C-006) — &lt;code dir=&quot;auto&quot;&gt;resolve_placement_only&lt;/code&gt; is the one write authority; the fix must not add a
parallel/second resolver, and must not thread a phase parameter through
&lt;code dir=&quot;auto&quot;&gt;PlacementSeam.write_target&lt;/code&gt; or &lt;code dir=&quot;auto&quot;&gt;commit_for_mission&lt;/code&gt; (both must independently
re-derive the identical phase from the same durable signal).&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Squash-robustness&lt;/strong&gt; — a squash publish-to-trunk rewrites history, so the E1
consolidation commit is not a commit-ancestor of the Primary Branch tip; any resolution
keyed on commit ancestry produces a false refusal on the common publish path.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Terminology precision, extended&lt;/strong&gt; — ADR 2026-07-23-2 already applies “always name
the sense” discipline to &lt;code dir=&quot;auto&quot;&gt;merge&lt;/code&gt;; this ADR extends that discipline by giving the
lane-consolidation sense a canonical single word, so future code and prose can comply
cheaply instead of reaching for a phrase every time.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Scope discipline&lt;/strong&gt; (C-005, C-012) — land the CONSOLIDATED wiring and the terminology
foundation without widening into the full #3080 rename or into per-artifact-kind
branching inside the resolver (which would reintroduce the call-site kind-conditioning
C-006 forbids).&lt;/li&gt;
&lt;/ul&gt;
&lt;h2 id=&quot;decision-outcome&quot;&gt;Decision Outcome&lt;/h2&gt;
&lt;p&gt;&lt;strong&gt;Chosen: wire &lt;code dir=&quot;auto&quot;&gt;TopologySurface.CONSOLIDATED&lt;/code&gt; as the phase-resolved integrated-tree
surface, and adopt &lt;code dir=&quot;auto&quot;&gt;consolidate&lt;/code&gt; / &lt;code dir=&quot;auto&quot;&gt;consolidation&lt;/code&gt; as the canonical term for the
lane-consolidation sense.&lt;/strong&gt; Two decisions, recorded together because the second becomes
load-bearing exactly where the first makes it real: wiring CONSOLIDATED is the point at
which the codebase needs to say “the tree lane consolidation produced” precisely and
repeatedly, in artifact names, log messages, and error text.&lt;/p&gt;
&lt;h3 id=&quot;decision-1--consolidated-surface-wiring-design&quot;&gt;Decision 1 — CONSOLIDATED surface wiring (design)&lt;/h3&gt;
&lt;p&gt;&lt;code dir=&quot;auto&quot;&gt;SurfaceLocations.consolidated&lt;/code&gt; is populated so &lt;code dir=&quot;auto&quot;&gt;translate_surface(CONSOLIDATED, …)&lt;/code&gt;
resolves the &lt;em&gt;integrated tree&lt;/em&gt;, wherever it currently lives:&lt;/p&gt;
&lt;ol&gt;
&lt;li&gt;&lt;strong&gt;Phase is derived internally, inside &lt;code dir=&quot;auto&quot;&gt;resolve_placement_only&lt;/code&gt;.&lt;/strong&gt; No phase parameter
is threaded through &lt;code dir=&quot;auto&quot;&gt;PlacementSeam.write_target&lt;/code&gt; or &lt;code dir=&quot;auto&quot;&gt;commit_for_mission&lt;/code&gt; — both
re-derive the identical phase from the same durable &lt;code dir=&quot;auto&quot;&gt;meta.json&lt;/code&gt; signal
(&lt;code dir=&quot;auto&quot;&gt;baseline_merge_commit&lt;/code&gt;, landed on the Target Ref at E1) plus the Target Ref’s
existence. This preserves the single-write-resolver invariant: a threaded parameter
would let the probe and the materializer disagree (probe says “routable”, commit
resolves to the deleted Target Ref — a split-brain that reproduces #3073-shaped
residue). &lt;code dir=&quot;auto&quot;&gt;resolve_placement_only&lt;/code&gt; is the only resolver that computes phase; it is an
input the resolver derives, not a second resolver.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;E1 (lane-consolidated, Target Ref still exists):&lt;/strong&gt; &lt;code dir=&quot;auto&quot;&gt;consolidated&lt;/code&gt; = the Target Ref
tree — the same tree PRIMARY-kind writes already resolve to today. No behavior change
on this leg.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;E2 (published-to-trunk, Target Ref deleted):&lt;/strong&gt; &lt;code dir=&quot;auto&quot;&gt;consolidated&lt;/code&gt; = the
&lt;strong&gt;repository-root checkout&lt;/strong&gt;, gated by a &lt;strong&gt;content-presence&lt;/strong&gt; predicate — the
mission’s own committed artifact tree is present at &lt;code dir=&quot;auto&quot;&gt;HEAD&lt;/code&gt; (e.g. via &lt;code dir=&quot;auto&quot;&gt;git cat-file -e HEAD:kitty-specs/&amp;#x3C;mission_slug&gt;/meta.json&lt;/code&gt;, or an equivalent committed marker) —
&lt;strong&gt;not commit ancestry&lt;/strong&gt;. A squash publish-to-trunk rewrites history so the E1
consolidation commit is not a commit-ancestor of the Primary Branch; content-presence
succeeds regardless of commit topology (squash, rebase, or merge-commit), and it does
not hard-code “main” — it accepts any checkout that carries the consolidated content.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;E2 disambiguation&lt;/strong&gt; — “Target Ref absent” alone does not mean E2: a &lt;em&gt;pre-
consolidation&lt;/em&gt; mission whose Target Ref was never materialized also has an absent
branch. E2 requires &lt;code dir=&quot;auto&quot;&gt;baseline_merge_commit&lt;/code&gt; present &lt;strong&gt;and&lt;/strong&gt; the Target Ref absent
&lt;strong&gt;and&lt;/strong&gt; terminal-completion evidence a consolidation produces (all work packages
&lt;code dir=&quot;auto&quot;&gt;done&lt;/code&gt; in the status event log and/or &lt;code dir=&quot;auto&quot;&gt;mission_number&lt;/code&gt; assigned). The foundation
reader &lt;code dir=&quot;auto&quot;&gt;get_feature_target_branch&lt;/code&gt; stays unrouted — the branch-existence probe lives
in the phase reader this wiring adds, not in that reader.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Off-checkout refusal (FR-006).&lt;/strong&gt; When the phase signal says “consolidated” but the
content-presence check fails on the &lt;em&gt;current&lt;/em&gt; checkout, the write refuses with a
recovery instruction rather than forcing a checkout (C-004). The named recovery
branch is &lt;strong&gt;derived, not hard-coded and not a SHA&lt;/strong&gt;: it reads the same
branch-derived default the codebase already uses elsewhere for “the Primary Branch,
whatever it is called” (&lt;code dir=&quot;auto&quot;&gt;git symbolic-ref refs/remotes/origin/HEAD&lt;/code&gt;, the pattern
already in production at &lt;code dir=&quot;auto&quot;&gt;src/specify_cli/core/git_ops.py:_origin_head_branch&lt;/code&gt; and
&lt;code dir=&quot;auto&quot;&gt;src/specify_cli/git/protection_policy.py&lt;/code&gt;) — never a literal &lt;code dir=&quot;auto&quot;&gt;&quot;main&quot;&lt;/code&gt; string and
never a commit SHA, so the message stays correct on a repository whose default branch
is not &lt;code dir=&quot;auto&quot;&gt;main&lt;/code&gt;.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;E2 routing is scoped, not blanket&lt;/strong&gt; (operator HiC decision, recorded here for
citability). The CONSOLIDATED-surface routing this ADR wires applies to
PRIMARY-kind writes and to the three coord-partition kinds named in scope —
&lt;code dir=&quot;auto&quot;&gt;ISSUE_MATRIX&lt;/code&gt;, &lt;code dir=&quot;auto&quot;&gt;TRACER_FILE&lt;/code&gt;, &lt;code dir=&quot;auto&quot;&gt;ACCEPTANCE_MATRIX&lt;/code&gt; — &lt;strong&gt;only&lt;/strong&gt;. &lt;code dir=&quot;auto&quot;&gt;STATUS_STATE&lt;/code&gt; and
&lt;code dir=&quot;auto&quot;&gt;DECISION_LOG&lt;/code&gt; are &lt;strong&gt;not&lt;/strong&gt; re-routed to CONSOLIDATED in E2: although both kinds pass
through the same shared &lt;code dir=&quot;auto&quot;&gt;resolve_placement_only&lt;/code&gt; (per C-005, sharing one resolver is
the point, not an exception to it), their pre-mission resolution is left unchanged by
this wiring. This is deliberately non-regressive (C-005): &lt;code dir=&quot;auto&quot;&gt;DECISION_LOG&lt;/code&gt; is
in-mission and is not an E2 write target by design, and &lt;code dir=&quot;auto&quot;&gt;STATUS_STATE&lt;/code&gt;’s existing
resolution is out of this mission’s scope (&lt;code dir=&quot;auto&quot;&gt;emit.py&lt;/code&gt; placement-routing, #3071, is
explicitly excluded). Scoping the CONSOLIDATED destination to the four named kinds,
rather than making every shared-resolver caller inherit E2 routing implicitly, avoids
the per-kind branching C-006 forbids while still keeping the two untouched kinds
verifiably unaffected.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;No new field.&lt;/strong&gt; This is not a ref-swap around CONSOLIDATED and it introduces no new
&lt;code dir=&quot;auto&quot;&gt;merge_target_branch&lt;/code&gt; field; &lt;code dir=&quot;auto&quot;&gt;translate_surface&lt;/code&gt;’s existing total arm for
&lt;code dir=&quot;auto&quot;&gt;CONSOLIDATED&lt;/code&gt; already exists (ADR 2026-07-23-1) — this decision is its first
production wiring.&lt;/li&gt;
&lt;/ol&gt;
&lt;p&gt;This decision extends ADR 2026-07-23-2, which named the &lt;code dir=&quot;auto&quot;&gt;post-consolidation&lt;/code&gt; phase and
the &lt;code dir=&quot;auto&quot;&gt;CONSOLIDATED&lt;/code&gt; surface and wired only the acceptance-verification side (negative
invariants deferred to a post-consolidation Op); it did not wire the write-routing side.
It re-affirms ADR 2026-06-24-1’s C-006 (single write resolver): CONSOLIDATED is populated
inside the existing resolver, not by a parallel one.&lt;/p&gt;
&lt;h3 id=&quot;decision-2--consolidate--consolidation-is-canonical-for-the-lane-consolidation-sense-terminology-3080-foundation&quot;&gt;Decision 2 — &lt;code dir=&quot;auto&quot;&gt;consolidate&lt;/code&gt; / &lt;code dir=&quot;auto&quot;&gt;consolidation&lt;/code&gt; is canonical for the lane-consolidation sense (terminology, #3080 foundation)&lt;/h3&gt;
&lt;p&gt;&lt;code dir=&quot;auto&quot;&gt;consolidate&lt;/code&gt; / &lt;code dir=&quot;auto&quot;&gt;consolidation&lt;/code&gt; becomes the &lt;strong&gt;canonical term&lt;/strong&gt; for &lt;code dir=&quot;auto&quot;&gt;merge&lt;/code&gt; &lt;strong&gt;Sense 1&lt;/strong&gt; —
the &lt;code dir=&quot;auto&quot;&gt;spec-kitty merge&lt;/code&gt; local operation that folds completed lane branches into the mission
branch (glossary: &lt;a href=&quot;/context/orchestration/#lane-consolidation&quot;&gt;Lane Consolidation&lt;/a&gt;).
The other two senses are unaffected and keep their existing canonical names:&lt;/p&gt;
&lt;ul&gt;
&lt;li&gt;&lt;code dir=&quot;auto&quot;&gt;merge&lt;/code&gt; / “branch integration” stays canonical for &lt;code dir=&quot;auto&quot;&gt;git merge&lt;/code&gt;
(&lt;a href=&quot;/context/orchestration/#branch-integration--git-merge&quot;&gt;Branch Integration / Git Merge&lt;/a&gt;).&lt;/li&gt;
&lt;li&gt;“publish” stays canonical for the operator-only push-to-origin step
(&lt;a href=&quot;/context/orchestration/#publish-to-originmain&quot;&gt;Publish to origin/main&lt;/a&gt;).&lt;/li&gt;
&lt;/ul&gt;
&lt;p&gt;The bare word “merge” for the lane-consolidation sense becomes a &lt;strong&gt;legacy alias&lt;/strong&gt;:
existing occurrences are grandfathered (they do not need to be rewritten by this
mission), but new code, new symbols, and touched prose must say “consolidate” /
“consolidation” for this sense (boyscouting, C-012). This is the same disambiguation
discipline ADR 2026-07-23-2 already applied when it named &lt;code dir=&quot;auto&quot;&gt;CONSOLIDATED&lt;/code&gt; instead of
&lt;code dir=&quot;auto&quot;&gt;MERGED&lt;/code&gt; for the surface member — this ADR gives that same choice a canonical prose word.&lt;/p&gt;
&lt;p&gt;&lt;strong&gt;Foundation now, full rename in #3080.&lt;/strong&gt; This ADR and its accompanying glossary update
(FR-015) and CI drift-ratchet guard (FR-016) are the entire scope landed here. They do
&lt;strong&gt;not&lt;/strong&gt; rename &lt;code dir=&quot;auto&quot;&gt;spec-kitty merge&lt;/code&gt;, &lt;code dir=&quot;auto&quot;&gt;MergeState&lt;/code&gt;, &lt;code dir=&quot;auto&quot;&gt;baseline_merge_commit&lt;/code&gt;, or any other
existing public symbol — that full command/code/docs rename is issue #3080’s scope.
Landing it here would explode this mission’s scope for no P0 benefit; the foundation
exists so the overload cannot get &lt;em&gt;worse&lt;/em&gt; while #3080 is pending, not so it is fully
resolved today.&lt;/p&gt;
&lt;h2 id=&quot;consequences&quot;&gt;Consequences&lt;/h2&gt;
&lt;h3 id=&quot;positive&quot;&gt;Positive&lt;/h3&gt;
&lt;ul&gt;
&lt;li&gt;#3033 (P0) is fixed at its root: post-consolidation evidence writes resolve through a
wired CONSOLIDATED surface instead of an unconditionally-resolved, possibly-deleted
Target Ref.&lt;/li&gt;
&lt;li&gt;The fix is squash-robust: a squash publish-to-trunk does not produce a false refusal,
because E2 resolution never depends on commit ancestry.&lt;/li&gt;
&lt;li&gt;&lt;code dir=&quot;auto&quot;&gt;STATUS_STATE&lt;/code&gt; / &lt;code dir=&quot;auto&quot;&gt;DECISION_LOG&lt;/code&gt; resolution is unchanged, so the shared-resolver
consequence (C-005) is non-regressive by construction rather than by incidental luck.&lt;/li&gt;
&lt;li&gt;Future code and prose gain a canonical, single-word way to name the lane-consolidation
sense, lowering the cost of complying with the terminology canon and making genuine new
drift (“lane merge”, “merge the lanes”, …) visible to a CI gate (FR-016) instead of
silently accumulating.&lt;/li&gt;
&lt;li&gt;No new abort path is introduced into consolidation (consistent with ADR 2026-07-23-2);
the off-checkout case (Decision 1 §5) is a refusal at write time, not a consolidation-
time gate.&lt;/li&gt;
&lt;/ul&gt;
&lt;h3 id=&quot;negative--accepted-trade-offs&quot;&gt;Negative / accepted trade-offs&lt;/h3&gt;
&lt;ul&gt;
&lt;li&gt;The lane-consolidation sense of “merge” remains legally present in existing code and
prose until #3080 lands the full rename — this ADR accepts a grandfathered baseline
rather than forcing an immediate, scope-exploding rewrite.&lt;/li&gt;
&lt;li&gt;The content-presence predicate (Decision 1 §3) is a git subprocess call, only paid on
the E2 leg (Target Ref absent) — NFR-004 requires it add no new subprocess on the
pre-consolidation happy path, which the phase-gating in §1/§4 satisfies by construction
but which a future change to the predicate must preserve.&lt;/li&gt;
&lt;/ul&gt;
&lt;h3 id=&quot;neutral&quot;&gt;Neutral&lt;/h3&gt;
&lt;ul&gt;
&lt;li&gt;&lt;code dir=&quot;auto&quot;&gt;SurfaceLocations.consolidated&lt;/code&gt; was already declared (a &lt;code dir=&quot;auto&quot;&gt;Path | None&lt;/code&gt; field) ahead of
this ADR; wiring it does not change its type or its place in the dataclass.&lt;/li&gt;
&lt;/ul&gt;
&lt;h2 id=&quot;alternatives-considered&quot;&gt;Alternatives considered&lt;/h2&gt;
&lt;ul&gt;
&lt;li&gt;&lt;strong&gt;Record a new &lt;code dir=&quot;auto&quot;&gt;merge_target_branch&lt;/code&gt; / &lt;code dir=&quot;auto&quot;&gt;consolidation_ref&lt;/code&gt; field at E1 and swap the
Target Ref for it at E2.&lt;/strong&gt; Rejected: unnecessary scope. The content-presence predicate
needs no new durable field beyond &lt;code dir=&quot;auto&quot;&gt;baseline_merge_commit&lt;/code&gt;, which already exists; a
ref-swap is also the shape C-002 explicitly forbids (“NOT a ref-swap around
CONSOLIDATED”).&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Commit-ancestry check (&lt;code dir=&quot;auto&quot;&gt;git merge-base --is-ancestor baseline_merge_commit HEAD&lt;/code&gt;) for
E2.&lt;/strong&gt; Rejected: breaks under a squash publish-to-trunk, the common publish mode — the
exact false-negative this ADR’s Decision 1 §3 exists to avoid.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;&lt;code dir=&quot;auto&quot;&gt;git branch --contains&lt;/code&gt; to find the checkout.&lt;/strong&gt; Rejected: the merge-base is an
ancestor of every descendant branch, so this is maximally ambiguous and cannot
distinguish a valid CONSOLIDATED home from an unrelated descendant.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Route &lt;code dir=&quot;auto&quot;&gt;STATUS_STATE&lt;/code&gt; / &lt;code dir=&quot;auto&quot;&gt;DECISION_LOG&lt;/code&gt; to CONSOLIDATED in E2 for symmetry with the
other four kinds.&lt;/strong&gt; Rejected: out of scope (C-005 excludes &lt;code dir=&quot;auto&quot;&gt;emit.py&lt;/code&gt; placement-routing,
#3071) and &lt;code dir=&quot;auto&quot;&gt;DECISION_LOG&lt;/code&gt; is intentionally in-mission-only; routing them would be an
unrequested behavior change smuggled in under “consistency.”&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Do the full #3080 rename now, alongside the CONSOLIDATED wiring.&lt;/strong&gt; Rejected: C-012
is explicit that this mission lands only the tidy-first foundation; renaming
&lt;code dir=&quot;auto&quot;&gt;spec-kitty merge&lt;/code&gt; / &lt;code dir=&quot;auto&quot;&gt;MergeState&lt;/code&gt; / &lt;code dir=&quot;auto&quot;&gt;baseline_merge_commit&lt;/code&gt; touches a much larger,
independently-scoped surface (command help text, CLI flags, serialized state shapes)
that belongs to #3080, not to a P0 write-routing fix.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Pick “integrate” instead of “consolidate” as the canonical word.&lt;/strong&gt; Rejected: “branch
integration” is already the canonical name for &lt;code dir=&quot;auto&quot;&gt;merge&lt;/code&gt; Sense 2 (the &lt;code dir=&quot;auto&quot;&gt;git merge&lt;/code&gt; step);
reusing “integrate” for Sense 1 would create a new overload instead of resolving one.&lt;/li&gt;
&lt;/ul&gt;
&lt;h2 id=&quot;more-information&quot;&gt;More Information&lt;/h2&gt;
&lt;p&gt;&lt;strong&gt;Extends:&lt;/strong&gt; &lt;a href=&quot;/adr/3.x/2026-07-23-2-post-consolidation-deferral-and-external-enforcement/&quot;&gt;2026-07-23-2 — Post-Consolidation Deferral and External Enforcement of
Negative Invariants&lt;/a&gt;
(named &lt;code dir=&quot;auto&quot;&gt;post-consolidation&lt;/code&gt; / &lt;code dir=&quot;auto&quot;&gt;CONSOLIDATED&lt;/code&gt; and wired the acceptance-verification side;
this ADR wires the write-routing side and gives the lane-consolidation sense its
canonical word).&lt;/p&gt;
&lt;p&gt;&lt;strong&gt;Re-affirms:&lt;/strong&gt; &lt;a href=&quot;/adr/3.x/2026-06-24-1-kind-and-topology-aware-artifact-placement/&quot;&gt;2026-06-24-1 — Kind- and Topology-Aware Artifact Placement&lt;/a&gt;
C-006 (single write resolver — phase is derived inside &lt;code dir=&quot;auto&quot;&gt;resolve_placement_only&lt;/code&gt;, never a
second resolver, never a threaded parameter).&lt;/p&gt;
&lt;p&gt;&lt;strong&gt;Cites:&lt;/strong&gt; &lt;a href=&quot;/adr/3.x/2026-07-23-1-surface-vocabulary-two-domains-and-topology-surface-rename/&quot;&gt;2026-07-23-1 — Surface Vocabulary: Two Domains and &lt;code dir=&quot;auto&quot;&gt;TopologySurface&lt;/code&gt;
Rename&lt;/a&gt;
(declared &lt;code dir=&quot;auto&quot;&gt;TopologySurface.CONSOLIDATED&lt;/code&gt; and its total &lt;code dir=&quot;auto&quot;&gt;translate_surface&lt;/code&gt; arm, wired by
this ADR).&lt;/p&gt;
&lt;p&gt;&lt;strong&gt;Glossary:&lt;/strong&gt; &lt;a href=&quot;/context/orchestration/#lane-consolidation&quot;&gt;Lane Consolidation&lt;/a&gt;
canonicalizes &lt;code dir=&quot;auto&quot;&gt;consolidate&lt;/code&gt; / &lt;code dir=&quot;auto&quot;&gt;consolidation&lt;/code&gt; for this sense (FR-015); &lt;a href=&quot;/context/orchestration/#branch-integration--git-merge&quot;&gt;Branch
Integration / Git Merge&lt;/a&gt;
and &lt;a href=&quot;/context/orchestration/#publish-to-originmain&quot;&gt;Publish to origin/main&lt;/a&gt; are
unchanged.&lt;/p&gt;
&lt;p&gt;&lt;strong&gt;Issues:&lt;/strong&gt; &lt;a href=&quot;https://github.com/Priivacy-ai/spec-kitty/issues/3033&quot;&gt;#3033&lt;/a&gt; (P0 — post-
consolidation writes fail against a deleted Target Ref; Decision 1),
&lt;a href=&quot;https://github.com/Priivacy-ai/spec-kitty/issues/3073&quot;&gt;#3073&lt;/a&gt; (no-residue-on-refusal;
downstream of the CONSOLIDATED wiring, not this ADR’s decision),
&lt;a href=&quot;https://github.com/Priivacy-ai/spec-kitty/issues/3080&quot;&gt;#3080&lt;/a&gt; (the full &lt;code dir=&quot;auto&quot;&gt;consolidate&lt;/code&gt;
rename; this ADR lands only its foundation — Decision 2), &lt;a href=&quot;https://github.com/Priivacy-ai/spec-kitty/issues/2653&quot;&gt;#2653&lt;/a&gt;
(the original &lt;code dir=&quot;auto&quot;&gt;primary&lt;/code&gt;/&lt;code dir=&quot;auto&quot;&gt;merge&lt;/code&gt; disambiguation this ADR’s terminology decision extends).&lt;/p&gt;
&lt;p&gt;&lt;strong&gt;Mission:&lt;/strong&gt; &lt;code dir=&quot;auto&quot;&gt;kitty-specs/post-merge-write-authoring-finish-01KYRRM5/&lt;/code&gt; (WP01, FR-014/
FR-015/FR-016; the CONSOLIDATED wiring itself is executed by this mission’s later work
packages — IC-03 through IC-07 of &lt;code dir=&quot;auto&quot;&gt;plan.md&lt;/code&gt;). Research: &lt;code dir=&quot;auto&quot;&gt;research.md&lt;/code&gt; D1-D5. Contract:
&lt;code dir=&quot;auto&quot;&gt;contracts/authoring-commands.md&lt;/code&gt; (Terminology foundation section).&lt;/p&gt;
&lt;p&gt;&lt;strong&gt;Canonical seams:&lt;/strong&gt; &lt;a href=&quot;../../../src/mission_runtime/resolution.py&quot;&gt;&lt;code dir=&quot;auto&quot;&gt;src/mission_runtime/resolution.py&lt;/code&gt;&lt;/a&gt;
(&lt;code dir=&quot;auto&quot;&gt;resolve_placement_only&lt;/code&gt;, &lt;code dir=&quot;auto&quot;&gt;SurfaceLocations&lt;/code&gt;, &lt;code dir=&quot;auto&quot;&gt;translate_surface&lt;/code&gt;,
&lt;code dir=&quot;auto&quot;&gt;resolve_artifact_surface&lt;/code&gt;), &lt;a href=&quot;../../../src/mission_runtime/artifacts.py&quot;&gt;&lt;code dir=&quot;auto&quot;&gt;src/mission_runtime/artifacts.py&lt;/code&gt;&lt;/a&gt;
(&lt;code dir=&quot;auto&quot;&gt;TopologySurface.CONSOLIDATED&lt;/code&gt;, &lt;code dir=&quot;auto&quot;&gt;MissionArtifactKind&lt;/code&gt;), &lt;a href=&quot;../../../src/specify_cli/coordination/write_seam.py&quot;&gt;&lt;code dir=&quot;auto&quot;&gt;src/specify_cli/coordination/write_seam.py&lt;/code&gt;&lt;/a&gt;
(post-consolidation write routing), &lt;a href=&quot;../../../src/specify_cli/core/git_ops.py&quot;&gt;&lt;code dir=&quot;auto&quot;&gt;src/specify_cli/core/git_ops.py&lt;/code&gt;&lt;/a&gt;
(&lt;code dir=&quot;auto&quot;&gt;_origin_head_branch&lt;/code&gt; — the existing &lt;code dir=&quot;auto&quot;&gt;git symbolic-ref refs/remotes/origin/HEAD&lt;/code&gt;
pattern the FR-006 recovery message reuses).&lt;/p&gt;</content>
</entry>
