<?xml version="1.0" encoding="utf-8"?>
<entry xmlns="http://www.w3.org/2005/Atom" xml:base="https://docs.spec-kitty.ai/guides/how-to/recovery/recover-from-interrupted-merge/">
  <id>https://docs.spec-kitty.ai/guides/how-to/recovery/recover-from-interrupted-merge/</id>
  <title>Recover from an Interrupted Consolidation</title>
  <updated>2026-11-12T00:00:00.000Z</updated>
  <author><name>Spec Kitty</name></author>
  <link rel="alternate" type="text/html" href="https://docs.spec-kitty.ai/guides/how-to/recovery/recover-from-interrupted-merge/"/>
  <summary>How to recover from an interrupted consolidation: Learn how to resume or abort a spec-kitty consolidate run that was interrupted before it completed.</summary>
  <content type="html">&lt;span id=&quot;recover-from-an-interrupted-consolidation&quot;&gt;&lt;/span&gt;
&lt;p&gt;Learn how to resume or abort a &lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate&lt;/code&gt; run that was interrupted before it completed.&lt;/p&gt;
&lt;h2 id=&quot;why-consolidation-runs-can-be-interrupted&quot;&gt;Why Consolidation Runs Can Be Interrupted&lt;/h2&gt;
&lt;p&gt;A &lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate&lt;/code&gt; operation touches multiple git refs in sequence (lane branches → mission branch → target branch). It can be interrupted by:&lt;/p&gt;
&lt;ul&gt;
&lt;li&gt;&lt;strong&gt;Network loss&lt;/strong&gt; during a &lt;code dir=&quot;auto&quot;&gt;git push&lt;/code&gt; after consolidation&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Linear-history branch protection&lt;/strong&gt; rejecting a merge or rebase commit&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Process kill&lt;/strong&gt; (Ctrl-C, timeout, OOM) mid-sequence&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Merge conflict&lt;/strong&gt; that requires manual resolution&lt;/li&gt;
&lt;/ul&gt;
&lt;p&gt;When an interruption occurs, spec-kitty saves progress to &lt;code dir=&quot;auto&quot;&gt;.kittify/runtime/merge/&amp;#x3C;mission_id&gt;/state.json&lt;/code&gt; before exiting. This file records which WPs have already been consolidated and which remain, so the operation can be resumed without re-doing completed work.&lt;/p&gt;
&lt;p&gt;One exception decides whether there is anything to resume. A run that fails &lt;strong&gt;after&lt;/strong&gt; it started moving branches rolls back: if the rollback restored every branch it moved, the run also drops that attempt’s recorded baseline and snapshot, so its record no longer describes a half-finished landing — a later run re-derives the target’s &lt;em&gt;current&lt;/em&gt; tip as its pre-mutation baseline instead of attempt 1’s. Resume still works (it re-derives the target baseline; the coordination anchor is kept on a coordination topology), and &lt;code dir=&quot;auto&quot;&gt;--abort&lt;/code&gt; still works (it clears what is left), but a re-run is the straightforward next step: &lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate --mission &amp;#x3C;slug&gt;&lt;/code&gt;. See &lt;a href=&quot;/guides/how-to/recovery/troubleshoot-merge/#a-failed-run-that-rolled-back-completely-drops-its-baseline&quot;&gt;A failed run that rolled back completely drops its baseline&lt;/a&gt;.&lt;/p&gt;
&lt;h2 id=&quot;resuming-with---resume&quot;&gt;Resuming with &lt;code dir=&quot;auto&quot;&gt;--resume&lt;/code&gt;&lt;/h2&gt;
&lt;p&gt;Once the blocking condition is resolved (conflict fixed, push retried, etc.), run:&lt;/p&gt;
&lt;div class=&quot;expressive-code&quot;&gt;&lt;figure class=&quot;frame is-terminal not-content&quot;&gt;&lt;figcaption class=&quot;header&quot;&gt;&lt;span class=&quot;title&quot;&gt;&lt;/span&gt;&lt;span class=&quot;sr-only&quot;&gt;Terminal window&lt;/span&gt;&lt;/figcaption&gt;&lt;pre data-language=&quot;bash&quot;&gt;&lt;code&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;spec-kitty&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;consolidate&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;--resume&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/figure&gt;&lt;/div&gt;
&lt;p&gt;This reads &lt;code dir=&quot;auto&quot;&gt;.kittify/runtime/merge/&amp;#x3C;mission_id&gt;/state.json&lt;/code&gt;, skips already-completed WPs, and continues from the current WP. A resume reads the strategy and the target branch recorded in that file, so you do not repeat &lt;code dir=&quot;auto&quot;&gt;--strategy&lt;/code&gt; or &lt;code dir=&quot;auto&quot;&gt;--target&lt;/code&gt;. A &lt;code dir=&quot;auto&quot;&gt;--strategy&lt;/code&gt; that contradicts the recorded one is refused, and an explicit &lt;code dir=&quot;auto&quot;&gt;--target&lt;/code&gt; takes precedence over the recorded target.&lt;/p&gt;
&lt;h3 id=&quot;a-worktree-that-shows-staged-deletions-after-an-interruption&quot;&gt;A worktree that shows staged deletions after an interruption&lt;/h3&gt;
&lt;p&gt;A run that is interrupted after it advanced a branch, but before it refreshed the
worktree that has that branch checked out, leaves the worktree behind its own
HEAD. &lt;code dir=&quot;auto&quot;&gt;git status&lt;/code&gt; there shows the newly integrated files as staged deletions.
They are the integrated work read in reverse.&lt;/p&gt;
&lt;p&gt;&lt;strong&gt;Do not commit, stage or stash them.&lt;/strong&gt; Committing them reverts the work that was
just integrated; a later &lt;code dir=&quot;auto&quot;&gt;consolidate&lt;/code&gt; then fails with &lt;code dir=&quot;auto&quot;&gt;APPROVED_CONTENT_MISSING&lt;/code&gt;
and rolls back.&lt;/p&gt;
&lt;p&gt;Run &lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate --resume&lt;/code&gt; instead. When the worktree only lags its
own HEAD, the resume refreshes it in place and continues. This applies to the
repository root checkout, the coordination worktree, a mission worktree and a
lane worktree.&lt;/p&gt;
&lt;p&gt;The resume refuses, before it changes anything, in these cases:&lt;/p&gt;
&lt;ul&gt;
&lt;li&gt;&lt;strong&gt;The worktree lags and also holds an edit of your own&lt;/strong&gt; (coordination,
mission or lane worktree). The refusal prints the exact commands, in this
order: save your edit as a patch outside the worktree (&lt;code dir=&quot;auto&quot;&gt;git diff --binary&lt;/code&gt;),
refresh the worktree (&lt;code dir=&quot;auto&quot;&gt;git reset --hard HEAD&lt;/code&gt;), run
&lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate --resume&lt;/code&gt;, and only then re-apply the patch
(&lt;code dir=&quot;auto&quot;&gt;git apply&lt;/code&gt;). Follow them as printed; &lt;code dir=&quot;auto&quot;&gt;git stash&lt;/code&gt; is ruled out by name
because popping the stash after the refresh deletes the integrated files
again.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;A git &lt;code dir=&quot;auto&quot;&gt;index.lock&lt;/code&gt; is left behind.&lt;/strong&gt; The checkout state is unknown. Confirm
that no other git process is running, remove the lock file named in the
message, and resume.&lt;/li&gt;
&lt;/ul&gt;
&lt;h3 id=&quot;exit-code-75-the-landing-stands-the-cleanup-did-not-finish&quot;&gt;Exit code 75: the landing stands, the cleanup did not finish&lt;/h3&gt;
&lt;p&gt;&lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate&lt;/code&gt; exits with code 75 and a message ending in
&lt;code dir=&quot;auto&quot;&gt;Error code: COORD_MOVED_AFTER_LANDING.&lt;/code&gt; when the landing was verified and the
coordination branch (or the mission branch of a Mission without a coordination
topology) then received a commit before it could be deleted. The branch is kept,
the late commit is intact and the target is not rolled back.&lt;/p&gt;
&lt;ul&gt;
&lt;li&gt;&lt;strong&gt;Coordination branch:&lt;/strong&gt; review the late commit(s) with the &lt;code dir=&quot;auto&quot;&gt;git log&lt;/code&gt; command
in the message, then run &lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate --resume&lt;/code&gt;. It lands the late
commit(s) on the target and finishes the teardown.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Mission branch without a coordination topology:&lt;/strong&gt; land the commit(s) that
belong on the target yourself, then delete the branch.&lt;/li&gt;
&lt;/ul&gt;
&lt;h3 id=&quot;the-lane-workspace-contexts-are-committed-on-teardown&quot;&gt;The lane workspace contexts are committed on teardown&lt;/h3&gt;
&lt;p&gt;&lt;code dir=&quot;auto&quot;&gt;consolidate&lt;/code&gt; tombstones each lane’s &lt;code dir=&quot;auto&quot;&gt;.kittify/workspaces/&amp;#x3C;slug&gt;-&amp;#x3C;lane&gt;.json&lt;/code&gt; when
it removes that lane’s worktree. Those tombstones are committed as one scoped
bookkeeping commit, so a landed run ends with a clean target branch even in a
project that tracks those files; the commit is skipped when nothing tracked was
removed, and a &lt;code dir=&quot;auto&quot;&gt;--push&lt;/code&gt; run pushes it too. If the commit cannot land (a
protected-ref refusal, a concurrent move), the run warns and names the paths
rather than failing a merge that already landed — commit them yourself before
the next &lt;code dir=&quot;auto&quot;&gt;consolidate&lt;/code&gt;.&lt;/p&gt;
&lt;h3 id=&quot;what-a-resume-lands-from-the-coordination-branch&quot;&gt;What a resume lands from the coordination branch&lt;/h3&gt;
&lt;p&gt;A &lt;code dir=&quot;auto&quot;&gt;--resume&lt;/code&gt; that finishes the teardown projects every coordination record the
coordination branch changed &lt;strong&gt;since the merge began&lt;/strong&gt; — review-cycle files,
tracer files, the decision log and the status pair, and a gate-matrix commit
such as &lt;code dir=&quot;auto&quot;&gt;spec-kitty agent issue-verdict&lt;/code&gt;. The window starts at the snapshot the
consolidation persisted before it touched anything, so it reaches back to the
START of the merge; it is not limited to what landed after the landing was
verified. That is why the remedy for a &lt;code dir=&quot;auto&quot;&gt;COORD_TEARDOWN_KEPT_ONLY_COPY&lt;/code&gt; (exit
76) refusal is to commit the files it names on the coordination branch and
resume: the resume carries them across instead of deleting them with the branch.&lt;/p&gt;
&lt;p&gt;The resume proves that before it deletes anything, and refuses when it cannot:&lt;/p&gt;
&lt;ul&gt;
&lt;li&gt;It will not bring a gate-matrix copy forward that would drop a row the target
already holds, or turn an established judgment (a terminal issue-matrix
verdict, a &lt;code dir=&quot;auto&quot;&gt;pass&lt;/code&gt; acceptance criterion, a terminal negative-invariant result)
into a non-established one.&lt;/li&gt;
&lt;li&gt;It will not express a deletion. A coordination record the window deletes does
stay on the target — a projection can only bring content forward — so the
resume REFUSES the window instead of treating the deletion as landed.&lt;/li&gt;
&lt;li&gt;It refuses if any change made in that window is not on the target: a
coordination record, a status event, or a file the target authors for itself
(see &lt;a href=&quot;#what-the-late-window-proves&quot;&gt;What the late window proves&lt;/a&gt;).&lt;/li&gt;
&lt;/ul&gt;
&lt;p&gt;&lt;strong&gt;This is stricter than earlier releases.&lt;/strong&gt; On ANY &lt;code dir=&quot;auto&quot;&gt;--resume&lt;/code&gt; — not only one
that follows &lt;code dir=&quot;auto&quot;&gt;COORD_TEARDOWN_KEPT_ONLY_COPY&lt;/code&gt; — a window that holds a record the
resume cannot land (a deleted record, a copy that would lose evidence, an
unreadable matrix) now makes &lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate&lt;/code&gt; exit 1, where it used to
exit 0 and let the record vanish with the coordination branch. The message ends
with &lt;code dir=&quot;auto&quot;&gt;Error code: COORD_LATE_PROJECTION_REFUSED.&lt;/code&gt;&lt;/p&gt;
&lt;p&gt;A refusal there names the file, exits 1 and keeps the coordination
branch, its worktree and the Mission’s coordination marker together, so nothing
is lost and nothing is rolled back. &lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate --abort&lt;/code&gt; does not
clear it: the landing is already verified, so an abort keeps it and refuses too.
What to do depends on the refusal, and each one names its own repair:&lt;/p&gt;
&lt;ul&gt;
&lt;li&gt;&lt;strong&gt;A coordination copy that would drop or overturn a judgment the target
holds:&lt;/strong&gt; fix the copy &lt;strong&gt;on the coordination branch&lt;/strong&gt; — commit the newer
judgment there (&lt;code dir=&quot;auto&quot;&gt;spec-kitty agent issue-verdict …&lt;/code&gt;), or revert the coordination
commit that regressed it — then run &lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate --resume&lt;/code&gt; again. Do
&lt;strong&gt;not&lt;/strong&gt; copy it onto the target: that writes the stale or regressing bytes over
the judgment the guard just protected.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;A coordination copy that cannot be read:&lt;/strong&gt; rewrite it on the coordination
branch as the document its own writer produces (&lt;code dir=&quot;auto&quot;&gt;spec-kitty agent issue-verdict&lt;/code&gt; for &lt;code dir=&quot;auto&quot;&gt;issue-matrix.json&lt;/code&gt;, &lt;code dir=&quot;auto&quot;&gt;spec-kitty accept&lt;/code&gt; for
&lt;code dir=&quot;auto&quot;&gt;acceptance-matrix.json&lt;/code&gt;), or revert the commit that corrupted it.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;A target gate matrix that cannot be read:&lt;/strong&gt; repair the target’s copy and
commit the repair &lt;strong&gt;on the target&lt;/strong&gt; — the guard will not overwrite the target’s
acceptance evidence until it can prove what that copy holds, so restoring it
from the target branch would hand back the same unreadable bytes. A repair
commit moves the target off the verified landing, so the next resume stops at
the branch-move guard, whose message prints the command that releases the move
and clears the record; delete the coordination branch by hand afterwards.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;A coordination record deleted in the window:&lt;/strong&gt; restore it on the coordination
branch — revert the commit that removed it, or &lt;code dir=&quot;auto&quot;&gt;git checkout &amp;#x3C;sha-before-the-deletion&gt; -- &amp;#x3C;path&gt;&lt;/code&gt; there. A projection can only bring content forward, and the target
still holds the record.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;A coordination record that is not on the target:&lt;/strong&gt; land it on the target from
the coordination branch (&lt;code dir=&quot;auto&quot;&gt;git checkout &amp;#x3C;coordination-branch&gt; -- &amp;#x3C;path&gt;&lt;/code&gt; in the
target checkout, then commit it), or, if it must not exist at all, delete it on
both branches.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;A status event that is not in the target’s log:&lt;/strong&gt; the resume folds the
coordination &lt;strong&gt;worktree’s&lt;/strong&gt; working-tree &lt;code dir=&quot;auto&quot;&gt;status.events.jsonl&lt;/code&gt;, not the
coordination branch’s commits, so add the missing events to that copy. Save a
copy of the file first, then append each line of &lt;code dir=&quot;auto&quot;&gt;git show &amp;#x3C;coordination-branch&gt;:&amp;#x3C;the log the refusal names&gt;&lt;/code&gt; whose &lt;code dir=&quot;auto&quot;&gt;event_id&lt;/code&gt; it does not
already hold, and keep every line it has. Do &lt;strong&gt;not&lt;/strong&gt; check the branch file out
over it: the working-tree log can hold events nobody has committed yet. You can
instead append the events to the target’s log the same way and rematerialize
&lt;code dir=&quot;auto&quot;&gt;status.json&lt;/code&gt; from the union. Do &lt;strong&gt;not&lt;/strong&gt; copy the coordination file over the
target’s log either: that would drop the events the target already holds.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;A status log that cannot be reconciled:&lt;/strong&gt; &lt;code dir=&quot;auto&quot;&gt;status.events.jsonl&lt;/code&gt; on the
coordination branch either does not parse as events, or carries an event id with
different bytes than the target’s log — the pair the merge’s own event union
refuses. Repair it &lt;strong&gt;on the coordination branch&lt;/strong&gt;: revert the commit that
corrupted or forked it, or rewrite the event so the two sides agree, then run
&lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate --resume&lt;/code&gt; again. Checking the same bytes out into the
coordination worktree cannot help: they are the bytes the union already refused.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;A file the target authors for itself (for example &lt;code dir=&quot;auto&quot;&gt;meta.json&lt;/code&gt;) that the
target’s copy does not carry:&lt;/strong&gt; merge your intended change into the target’s
own copy &lt;strong&gt;by hand&lt;/strong&gt; and commit it, or revert the coordination commit that made
it. Do &lt;strong&gt;not&lt;/strong&gt; check the coordination file out over the target’s: that replaces
the mission number, baseline stamp and marker the target owns — the exact
overwrite a consolidation refuses to perform — with the stale coordination
bytes. A consolidation never projects these files, so the merge is the
operator’s call. Committing on the target yourself moves it off the verified
landing, so the next resume may stop at the branch-move guard, whose message
prints the command that releases the move and clears the record.&lt;/li&gt;
&lt;/ul&gt;
&lt;p&gt;Then run &lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate --resume&lt;/code&gt; again.&lt;/p&gt;
&lt;h3 id=&quot;what-the-late-window-proves&quot;&gt;What the late window proves&lt;/h3&gt;
&lt;p&gt;Before the coordination branch is deleted, every change the window made inside
the Mission directory is accounted for, on a first run and on a resume alike.
Each one is either landed on the target, or excluded by a rule that says why its
bytes carry nothing the target lacks:&lt;/p&gt;
&lt;ul&gt;
&lt;li&gt;&lt;strong&gt;Landed:&lt;/strong&gt; the file is byte-identical on the target branch.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Landed by the status union:&lt;/strong&gt; every event id committed to the coordination
branch’s &lt;code dir=&quot;auto&quot;&gt;status.events.jsonl&lt;/code&gt; is present in the target’s committed event log.
The two logs must also reconcile: an event id carrying different bytes on the
two sides is refused, exactly as the merge’s own event union refuses it.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Derived, so not proved:&lt;/strong&gt; &lt;code dir=&quot;auto&quot;&gt;status.json&lt;/code&gt; is a reduced snapshot the
consolidation rematerializes from the unioned event log, so its own bytes are
not an independent record — but only while the target’s committed snapshot
really is that reduction. A Mission with no event log keeps &lt;code dir=&quot;auto&quot;&gt;status.json&lt;/code&gt; as a
record, and it is judged like any other document.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Carried by the target’s own copy:&lt;/strong&gt; a document the target authors for itself
(for example &lt;code dir=&quot;auto&quot;&gt;meta.json&lt;/code&gt;) when the change the window made is already on the
target’s committed copy. The comparison is the change since the window began,
not the whole file, because the merge legitimately rewrites other fields there
(the mission-number bake, the baseline stamp). A key the window removed must be
absent from the target; a key nobody touched is not compared.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;A rename&lt;/strong&gt; is judged by both halves: the new path must be on the target, and
the old one must not still be there.&lt;/li&gt;
&lt;/ul&gt;
&lt;p&gt;Anything else refuses, keeps the coordination branch, worktree and marker, and
names the repair above. A change to a file the target does not carry is never
approved just because the consolidation did not project it.&lt;/p&gt;
&lt;p&gt;The other codes &lt;code dir=&quot;auto&quot;&gt;consolidate&lt;/code&gt; can report are listed in the
&lt;a href=&quot;/api/cli-commands/#spec-kitty-consolidate-exit-codes-and-refusal-codes&quot;&gt;CLI reference&lt;/a&gt;.&lt;/p&gt;
&lt;h3 id=&quot;what-a-run-lands-before-it-tears-down&quot;&gt;What a run lands before it tears down&lt;/h3&gt;
&lt;p&gt;Both run kinds project and prove the late window before the coordination branch is
deleted; they differ only in where that window starts.&lt;/p&gt;
&lt;p&gt;A &lt;strong&gt;first&lt;/strong&gt; run (no &lt;code dir=&quot;auto&quot;&gt;--resume&lt;/code&gt;) gets the protection over a narrower window. The
merge records the coordination tip it verified — its own last write to the
coordination branch, after everything it was going to project had been projected
(the following bookkeeping commit lands it) — and
anything committed to the coordination branch &lt;strong&gt;after&lt;/strong&gt; that tip is late by
definition. Before the branch is deleted, a first run projects that window and
proves it landed, exactly as a resume does:&lt;/p&gt;
&lt;ul&gt;
&lt;li&gt;A late record that can be landed is committed on the target, then proven
there, and only then does the coordination branch go.&lt;/li&gt;
&lt;li&gt;A record that cannot be landed (a deletion, a copy that would lose evidence, an
unreadable matrix, a status event the union could not see, a target-authored
file the target does not carry) refuses with
&lt;code dir=&quot;auto&quot;&gt;Error code: COORD_LATE_PROJECTION_REFUSED.&lt;/code&gt;, keeps the coordination branch,
worktree and marker, and names its own repair — the same per-kind remedies
listed above.&lt;/li&gt;
&lt;li&gt;A run where nothing landed late projects nothing and makes no extra commit, so
a clean consolidation behaves exactly as it did before.&lt;/li&gt;
&lt;/ul&gt;
&lt;p&gt;A &lt;strong&gt;resume&lt;/strong&gt;’s window is wider on purpose — it spans everything the coordination
branch changed since the merge began, because a resume has no in-memory record of
what the interrupted attempt verified — and it uses the same projection and the
same proof.&lt;/p&gt;
&lt;p&gt;Once a run has proven the window landed, that tip becomes the tip the projection
teardown gate and the branch delete approve, on either run kind. So a resume that
lands a commit made &lt;em&gt;after&lt;/em&gt; it captured its own coordination tip finishes the
consolidation instead of refusing a landing it just completed.&lt;/p&gt;
&lt;p&gt;The window is read once, at the coordination tip the teardown opened it on. A
commit that lands on the coordination branch while the teardown runs is not in
that window: unless it is a status event in the worktree, which the union folds in, it is not projected, the approved tip does not move to it, and the
teardown refuses at the projection teardown gate with the branch kept. Run
&lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate --resume&lt;/code&gt; again, and the next window judges it: a status
event or coordination record lands or is refused with its remedy, and a change to
a primary artifact such as &lt;code dir=&quot;auto&quot;&gt;meta.json&lt;/code&gt; is refused until it is on the target.&lt;/p&gt;
&lt;p&gt;A Mission whose coordination directory is named &lt;code dir=&quot;auto&quot;&gt;&amp;#x3C;slug&gt;-&amp;#x3C;mid8&gt;&lt;/code&gt; (a bare-slug
Mission) gets the same proof for that directory, against the target’s copy. Nothing
is projected from it, so a record committed there is refused until you copy it to
the same relative path under the target’s own Mission directory, or revert it on
the coordination branch.&lt;/p&gt;
&lt;p&gt;This closes the window where a verification or status write made &lt;em&gt;between&lt;/em&gt; the
gate and the teardown was refused after a landing that was already complete,
leaving you to hand-assemble it. A first run that recorded no coordination tip
has no window to build and is still unprotected: such a commit can be lost with
the branch (#7121). A commit made while the merge is running, before that tip is
captured, is not judged on a first run either (#7300).&lt;/p&gt;
&lt;h2 id=&quot;aborting-a-consolidation&quot;&gt;Aborting a Consolidation&lt;/h2&gt;
&lt;p&gt;To undo what an interrupted run moved and discard its record:&lt;/p&gt;
&lt;div class=&quot;expressive-code&quot;&gt;&lt;figure class=&quot;frame is-terminal not-content&quot;&gt;&lt;figcaption class=&quot;header&quot;&gt;&lt;span class=&quot;title&quot;&gt;&lt;/span&gt;&lt;span class=&quot;sr-only&quot;&gt;Terminal window&lt;/span&gt;&lt;/figcaption&gt;&lt;pre data-language=&quot;bash&quot;&gt;&lt;code&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;spec-kitty&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;consolidate&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;--abort&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/figure&gt;&lt;/div&gt;
&lt;p&gt;&lt;code dir=&quot;auto&quot;&gt;--abort&lt;/code&gt; first restores the branches the run moved: the target branch, the mission branch and the coordination branch. Each branch goes back to the commit it had before the run, and only while it is still at the commit this run recorded. A commit that someone else added since then is never overwritten. It clears the record only after every branch is restored.&lt;/p&gt;
&lt;p&gt;The command prints a rollback report that starts &lt;code dir=&quot;auto&quot;&gt;Rollback to the pre-consolidation snapshot:&lt;/code&gt;, with one line per branch:&lt;/p&gt;
&lt;ul&gt;
&lt;li&gt;&lt;strong&gt;&lt;code dir=&quot;auto&quot;&gt;restored&lt;/code&gt;&lt;/strong&gt; shows the commit the branch left and the commit it returned to.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;&lt;code dir=&quot;auto&quot;&gt;unchanged&lt;/code&gt;&lt;/strong&gt; means the branch was already at its snapshot.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;&lt;code dir=&quot;auto&quot;&gt;NOT restored&lt;/code&gt;&lt;/strong&gt; names the branch, the commit observed and the commit expected, and the reason. A branch moved by another actor, or one that moved without a recorded tip, is reported this way.&lt;/li&gt;
&lt;/ul&gt;
&lt;p&gt;What happens next depends on the report:&lt;/p&gt;
&lt;ul&gt;
&lt;li&gt;
&lt;p&gt;&lt;strong&gt;Everything restored.&lt;/strong&gt; The command prints &lt;code dir=&quot;auto&quot;&gt;Aborted consolidation for &amp;#x3C;mission&gt;&lt;/code&gt; and exits 0. It also aborts a git merge left in the Mission’s own scratch workspace, removes that workspace, and releases the merge lock it took.&lt;/p&gt;
&lt;/li&gt;
&lt;li&gt;
&lt;p&gt;&lt;strong&gt;A branch is &lt;code dir=&quot;auto&quot;&gt;NOT restored&lt;/code&gt;.&lt;/strong&gt; Nothing was cleared, and the command exits 1. Under &lt;code dir=&quot;auto&quot;&gt;Next steps:&lt;/code&gt; the report names one step per branch, by cause, each of which completes the abort:&lt;/p&gt;
&lt;ul&gt;
&lt;li&gt;&lt;strong&gt;A checkout holds local changes&lt;/strong&gt;: commit or stash the changes in the named checkout, then re-run &lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate --abort&lt;/code&gt;.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Another actor moved the branch&lt;/strong&gt;: inspect the commits it shows (&lt;code dir=&quot;auto&quot;&gt;git log &amp;#x3C;expected&gt;..&amp;#x3C;observed&gt;&lt;/code&gt;); to keep them and finish the abort, run &lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate --abort --release-branch &amp;#x3C;branch&gt; --release-reason &quot;&amp;#x3C;why&gt;&quot;&lt;/code&gt;.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;The branch no longer exists&lt;/strong&gt;: recreate it with the &lt;code dir=&quot;auto&quot;&gt;git branch &amp;#x3C;branch&gt; &amp;#x3C;sha&gt;&lt;/code&gt; command the report prints, then re-run &lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate --abort&lt;/code&gt;.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;The restore was refused&lt;/strong&gt; (the branch moved while it was being restored, or git failed): inspect it (&lt;code dir=&quot;auto&quot;&gt;git log -3 &amp;#x3C;branch&gt;&lt;/code&gt;), then re-run &lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate --abort&lt;/code&gt;.&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;The coordination worktree holds a change that is not the tool’s own&lt;/strong&gt;: commit or stash it there, then re-run &lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate --abort&lt;/code&gt;.&lt;/li&gt;
&lt;/ul&gt;
&lt;p&gt;The report then closes with &lt;code dir=&quot;auto&quot;&gt;Kept the consolidation record so nothing is lost; complete the next steps above to finish the abort.&lt;/code&gt;&lt;/p&gt;
&lt;/li&gt;
&lt;li&gt;
&lt;p&gt;&lt;strong&gt;The landing was already verified.&lt;/strong&gt; The command prints &lt;code dir=&quot;auto&quot;&gt;Kept the landing verified by an earlier reconciliation&lt;/code&gt;, rolls nothing back, exits 1 and keeps the record. A verified landing is never rolled back, so &lt;code dir=&quot;auto&quot;&gt;--abort&lt;/code&gt; cannot finish here; its next step is &lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate --resume&lt;/code&gt;, which finishes the teardown of that landing.&lt;/p&gt;
&lt;/li&gt;
&lt;li&gt;
&lt;p&gt;&lt;strong&gt;The record has no snapshot&lt;/strong&gt; (written by an older release). The command prints a notice that no branch is restored, clears the record and exits 0.&lt;/p&gt;
&lt;/li&gt;
&lt;li&gt;
&lt;p&gt;&lt;strong&gt;Another Mission’s consolidation holds the merge lock and is still active.&lt;/strong&gt; The command refuses, exits 1, and restores and clears nothing. Finish or abort that consolidation first.&lt;/p&gt;
&lt;/li&gt;
&lt;/ul&gt;
&lt;p&gt;Lane branches are never moved by a consolidation, so &lt;code dir=&quot;auto&quot;&gt;--abort&lt;/code&gt; never moves them. A lane branch that was deleted since the run began is reported with the &lt;code dir=&quot;auto&quot;&gt;git branch&lt;/code&gt; command that recreates it, and does not block the abort.&lt;/p&gt;
&lt;p&gt;&lt;code dir=&quot;auto&quot;&gt;--abort&lt;/code&gt; does not touch a git merge in progress in your own checkout. For a Mission with a coordination topology, it also removes the coordination worktree unless the Mission’s &lt;code dir=&quot;auto&quot;&gt;meta.json&lt;/code&gt; retains worktrees (&lt;code dir=&quot;auto&quot;&gt;retain_worktrees&lt;/code&gt;); it then prints a notice.&lt;/p&gt;
&lt;h2 id=&quot;the-consolidation-state-file&quot;&gt;The consolidation state file&lt;/h2&gt;
&lt;p&gt;&lt;code dir=&quot;auto&quot;&gt;.kittify/runtime/merge/&amp;#x3C;mission_id&gt;/state.json&lt;/code&gt; is written atomically at each WP boundary. Fields:&lt;/p&gt;























































&lt;table&gt;&lt;thead&gt;&lt;tr&gt;&lt;th&gt;Field&lt;/th&gt;&lt;th&gt;Type&lt;/th&gt;&lt;th&gt;Description&lt;/th&gt;&lt;/tr&gt;&lt;/thead&gt;&lt;tbody&gt;&lt;tr&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;mission_slug&lt;/code&gt;&lt;/td&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;str&lt;/code&gt;&lt;/td&gt;&lt;td&gt;Mission slug being consolidated (e.g., &lt;code dir=&quot;auto&quot;&gt;017-my-mission&lt;/code&gt;)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;target_branch&lt;/code&gt;&lt;/td&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;str&lt;/code&gt;&lt;/td&gt;&lt;td&gt;Branch being consolidated into (e.g., &lt;code dir=&quot;auto&quot;&gt;main&lt;/code&gt;)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;wp_order&lt;/code&gt;&lt;/td&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;list[str]&lt;/code&gt;&lt;/td&gt;&lt;td&gt;Ordered WP IDs for the full consolidation sequence&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;completed_wps&lt;/code&gt;&lt;/td&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;list[str]&lt;/code&gt;&lt;/td&gt;&lt;td&gt;WPs already successfully consolidated&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;current_wp&lt;/code&gt;&lt;/td&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;str | null&lt;/code&gt;&lt;/td&gt;&lt;td&gt;WP in progress when interrupted (null if between WPs)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;has_pending_conflicts&lt;/code&gt;&lt;/td&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;bool&lt;/code&gt;&lt;/td&gt;&lt;td&gt;True if git merge conflicts are unresolved&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;strategy&lt;/code&gt;&lt;/td&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;str&lt;/code&gt;&lt;/td&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;merge&lt;/code&gt;, &lt;code dir=&quot;auto&quot;&gt;squash&lt;/code&gt;, or &lt;code dir=&quot;auto&quot;&gt;rebase&lt;/code&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;started_at&lt;/code&gt;&lt;/td&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;str&lt;/code&gt;&lt;/td&gt;&lt;td&gt;ISO 8601 timestamp of consolidation start&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;updated_at&lt;/code&gt;&lt;/td&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;str&lt;/code&gt;&lt;/td&gt;&lt;td&gt;ISO 8601 timestamp of last state write&lt;/td&gt;&lt;/tr&gt;&lt;/tbody&gt;&lt;/table&gt;
&lt;p&gt;The file also holds the snapshot of the branches taken before the run moved anything, which &lt;code dir=&quot;auto&quot;&gt;--abort&lt;/code&gt; restores from. Do not edit or delete it. Use &lt;code dir=&quot;auto&quot;&gt;--resume&lt;/code&gt; or &lt;code dir=&quot;auto&quot;&gt;--abort&lt;/code&gt;.&lt;/p&gt;
&lt;h2 id=&quot;consolidation-strategy-selection&quot;&gt;Consolidation Strategy Selection&lt;/h2&gt;
&lt;p&gt;The strategy is set at the start of a consolidation run with &lt;code dir=&quot;auto&quot;&gt;--strategy&lt;/code&gt;. Values are lower-case; &lt;code dir=&quot;auto&quot;&gt;--strategy SQUASH&lt;/code&gt; is rejected.&lt;/p&gt;





















&lt;table&gt;&lt;thead&gt;&lt;tr&gt;&lt;th&gt;Strategy&lt;/th&gt;&lt;th&gt;Effect&lt;/th&gt;&lt;/tr&gt;&lt;/thead&gt;&lt;tbody&gt;&lt;tr&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;merge&lt;/code&gt;&lt;/td&gt;&lt;td&gt;Creates a merge commit; preserves full lane history.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;squash&lt;/code&gt;&lt;/td&gt;&lt;td&gt;Collapses all lane commits into one commit on the target branch. &lt;strong&gt;Default.&lt;/strong&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;code dir=&quot;auto&quot;&gt;rebase&lt;/code&gt;&lt;/td&gt;&lt;td&gt;Replays commits linearly; may conflict with remote linear-history protection if the branch was already pushed.&lt;/td&gt;&lt;/tr&gt;&lt;/tbody&gt;&lt;/table&gt;
&lt;div class=&quot;expressive-code&quot;&gt;&lt;figure class=&quot;frame is-terminal not-content&quot;&gt;&lt;figcaption class=&quot;header&quot;&gt;&lt;span class=&quot;title&quot;&gt;&lt;/span&gt;&lt;span class=&quot;sr-only&quot;&gt;Terminal window&lt;/span&gt;&lt;/figcaption&gt;&lt;pre data-language=&quot;bash&quot;&gt;&lt;code&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;spec-kitty&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;consolidate&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;--strategy&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;squash&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;spec-kitty&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;consolidate&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;--strategy&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;rebase&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;--target&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;main&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/figure&gt;&lt;/div&gt;
&lt;p&gt;Once a consolidation run is started with a strategy, that strategy is stored in &lt;code dir=&quot;auto&quot;&gt;state.json&lt;/code&gt; and used automatically on &lt;code dir=&quot;auto&quot;&gt;--resume&lt;/code&gt;.&lt;/p&gt;
&lt;h2 id=&quot;manual-git-fallback&quot;&gt;Manual Git Fallback&lt;/h2&gt;
&lt;p&gt;If &lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate --resume&lt;/code&gt; keeps failing, do not finish the landing with &lt;code dir=&quot;auto&quot;&gt;git merge&lt;/code&gt;, and do not delete &lt;code dir=&quot;auto&quot;&gt;state.json&lt;/code&gt;.&lt;/p&gt;
&lt;ul&gt;
&lt;li&gt;A landing made by hand skips the reconciliation gate and the done bookkeeping that &lt;code dir=&quot;auto&quot;&gt;consolidate&lt;/code&gt; records.&lt;/li&gt;
&lt;li&gt;&lt;code dir=&quot;auto&quot;&gt;state.json&lt;/code&gt; holds the snapshot of the branches before the run moved anything. Deleting it removes what &lt;code dir=&quot;auto&quot;&gt;--abort&lt;/code&gt; needs to restore them.&lt;/li&gt;
&lt;/ul&gt;
&lt;p&gt;Do this instead:&lt;/p&gt;
&lt;div class=&quot;expressive-code&quot;&gt;&lt;figure class=&quot;frame is-terminal not-content&quot;&gt;&lt;figcaption class=&quot;header&quot;&gt;&lt;span class=&quot;title&quot;&gt;&lt;/span&gt;&lt;span class=&quot;sr-only&quot;&gt;Terminal window&lt;/span&gt;&lt;/figcaption&gt;&lt;pre data-language=&quot;bash&quot;&gt;&lt;code&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#919F9F;--1:#5F636F&quot;&gt;# 1. Read the progress and the recorded branch tips (read-only).&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;cat&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;.kittify/runtime/merge/&amp;#x3C;mission_id&gt;/state.json&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;
&lt;/div&gt;&lt;/div&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#919F9F;--1:#5F636F&quot;&gt;# 2. Undo the run and clear the record.&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;spec-kitty&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;consolidate&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;--abort&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/figure&gt;&lt;/div&gt;
&lt;p&gt;Fix the cause the refusal named, then run &lt;code dir=&quot;auto&quot;&gt;spec-kitty consolidate&lt;/code&gt; again.&lt;/p&gt;
&lt;p&gt;If the rollback restored every branch, the record was re-baselined and there is nothing for &lt;code dir=&quot;auto&quot;&gt;--abort&lt;/code&gt; to restore: it prints &lt;code dir=&quot;auto&quot;&gt;Aborted&lt;/code&gt;, clears the record and exits 0, and &lt;code dir=&quot;auto&quot;&gt;--resume&lt;/code&gt; re-derives the target baseline rather than reusing the failed attempt’s. Read the state file only when the run left a branch &lt;code dir=&quot;auto&quot;&gt;NOT restored&lt;/code&gt;.&lt;/p&gt;
&lt;p&gt;If &lt;code dir=&quot;auto&quot;&gt;--abort&lt;/code&gt; reports &lt;code dir=&quot;auto&quot;&gt;NOT restored&lt;/code&gt; for a branch, that branch holds a commit the run did not record. Inspect it, resolve it, and run &lt;code dir=&quot;auto&quot;&gt;--abort&lt;/code&gt; again.&lt;/p&gt;
&lt;h2 id=&quot;see-also&quot;&gt;See Also&lt;/h2&gt;
&lt;ul&gt;
&lt;li&gt;&lt;a href=&quot;/guides/how-to/missions/merge-mission/&quot;&gt;Merge Feature&lt;/a&gt; — full merge workflow&lt;/li&gt;
&lt;li&gt;&lt;a href=&quot;/guides/how-to/recovery/recover-from-implementation-crash/&quot;&gt;Recover from Implementation Crash&lt;/a&gt; — when a WP is stuck mid-implementation&lt;/li&gt;
&lt;li&gt;&lt;a href=&quot;/api/cli-commands/#spec-kitty-consolidate&quot;&gt;CLI Reference: spec-kitty consolidate&lt;/a&gt;&lt;/li&gt;
&lt;/ul&gt;</content>
</entry>
