continuous-improvement 3.21.0 → 3.22.0

package/plugins/continuous-improvement/lib/git-state.mjs

@@ -0,0 +1,411 @@
+/**
+ * git-state: pure classifiers for the `reconcile` ground-truth contract.
+ *
+ * No I/O. `src/bin/reconcile.mts` does the actual `git` spawning and feeds raw
+ * stdout plus exit codes in here; keeping the logic pure lets the unit tests
+ * cover every boundary (no configured upstream, detached HEAD, linked worktree,
+ * failed remote probe, autocrlf phantom drift) without building a repo per case.
+ *
+ * This module is also the single source of truth for the ground-truth command
+ * set: `GROUND_TRUTH_PROBES` is what `bin/reconcile.mjs` runs and what
+ * `bin/check-reconcile-parity.mjs` asserts the reconcile skill and command docs
+ * still document. Prose that drifts from this array fails `verify:all`.
+ *
+ * Every classifier fails closed. "We could not tell" is reported as unknown or
+ * unverified, never as clean, even, absent, or landed.
+ */
+/** Branch names treated as protected unless the caller overrides the list. */
+export const DEFAULT_PROTECTED_BRANCHES = [
+    "main",
+    "master",
+    "release",
+    "production",
+];
+/**
+ * The ground-truth command set.
+ *
+ * Every entry is portable: plain `git` argv with no shell, no `ls`, no
+ * coreutils, and no literal `.git/` path — inside a linked worktree `.git` is a
+ * *file*, so a `.git/`-relative probe silently reports nothing. Ordering is the
+ * order the runner executes and the renderer prints.
+ */
+export const GROUND_TRUTH_PROBES = [
+    {
+        id: "repo-root",
+        args: ["rev-parse", "--show-toplevel"],
+        purpose: "Confirm we are inside a work tree and learn its root.",
+        tolerateFailure: false,
+    },
+    {
+        id: "head-sha",
+        args: ["rev-parse", "HEAD"],
+        purpose: "Pin the exact commit every later claim is relative to.",
+        tolerateFailure: false,
+    },
+    {
+        id: "head-branch",
+        args: ["symbolic-ref", "--quiet", "--short", "HEAD"],
+        purpose: "Branch name, or a non-zero exit that proves a detached HEAD.",
+        tolerateFailure: true,
+    },
+    {
+        id: "upstream-ref",
+        args: ["rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{u}"],
+        purpose: "Configured upstream, or a non-zero exit that proves there is none.",
+        tolerateFailure: true,
+    },
+    {
+        id: "upstream-counts",
+        args: ["rev-list", "--left-right", "--count", "@{u}...HEAD"],
+        purpose: "Behind/ahead counts; only meaningful once an upstream exists.",
+        tolerateFailure: true,
+    },
+    {
+        id: "status-porcelain",
+        args: ["status", "--porcelain=v1"],
+        purpose: "Reported working-tree changes — inflated by autocrlf on Windows.",
+        tolerateFailure: false,
+    },
+    {
+        id: "content-drift",
+        args: ["diff", "--name-only", "--ignore-all-space"],
+        purpose: "Real content drift — the number to trust when autocrlf is on.",
+        tolerateFailure: false,
+    },
+    {
+        id: "stash-list",
+        args: ["stash", "list"],
+        purpose: "Stashes an earlier session may have left holding real work.",
+        tolerateFailure: false,
+    },
+    {
+        id: "worktree-list",
+        args: ["worktree", "list", "--porcelain"],
+        purpose: "Sibling worktrees another session may be writing to.",
+        tolerateFailure: false,
+    },
+];
+/**
+ * In-progress operation markers, addressed via `git rev-parse --git-path` so
+ * they resolve correctly inside a linked worktree, where `.git` is a file and
+ * the real marker lives under `.git/worktrees/<name>/`.
+ */
+export const IN_PROGRESS_MARKERS = [
+    { id: "merge", gitPath: "MERGE_HEAD", label: "merge in progress" },
+    { id: "rebase-merge", gitPath: "rebase-merge", label: "interactive rebase in progress" },
+    { id: "rebase-apply", gitPath: "rebase-apply", label: "rebase/am in progress" },
+    { id: "cherry-pick", gitPath: "CHERRY_PICK_HEAD", label: "cherry-pick in progress" },
+    { id: "revert", gitPath: "REVERT_HEAD", label: "revert in progress" },
+    { id: "bisect", gitPath: "BISECT_LOG", label: "bisect in progress" },
+];
+const SHA = /^[0-9a-f]{7,64}$/i;
+const SAFE_REF = /^[A-Za-z0-9._/-]+$/;
+/** Split git output on either line ending — git on Windows emits CRLF. */
+function toLines(raw) {
+    return raw.split(/\r?\n/);
+}
+function isSha(value) {
+    return SHA.test(value);
+}
+/**
+ * True when `name` is safe to interpolate into a path, an argv entry, or a
+ * comparison that authorizes a mutation.
+ *
+ * Fails closed: null, empty, surrounding whitespace, shell metacharacters,
+ * `..`, refspec syntax (`@{`), a leading `-`, a trailing `/` or `.lock`, and
+ * anything over 255 characters all return false rather than being sanitized
+ * into something that then looks valid.
+ */
+export function isSafeRefName(name) {
+    if (typeof name !== "string")
+        return false;
+    if (name.length === 0 || name.length > 255)
+        return false;
+    if (name.trim() !== name)
+        return false;
+    if (name.startsWith("-"))
+        return false;
+    if (name.endsWith("/") || name.endsWith(".lock"))
+        return false;
+    if (name.includes("..") || name.includes("@{"))
+        return false;
+    return SAFE_REF.test(name);
+}
+/**
+ * Classify HEAD from `git symbolic-ref --quiet --short HEAD`.
+ *
+ * A detached HEAD makes that command exit non-zero with empty output. This
+ * module deliberately never uses `git branch --show-current`, which returns an
+ * empty string with exit 0 and so cannot be told apart from a successful read.
+ * Returns `{ kind: "unknown", branch: null }` when output is present but is not
+ * a usable ref name, so an unparseable branch never reads as a match against an
+ * expected one.
+ */
+export function classifyHead(rawBranch, exitCode = 0) {
+    const value = typeof rawBranch === "string" ? rawBranch.trim() : "";
+    if (exitCode !== 0 || value.length === 0) {
+        return { kind: "detached", branch: null };
+    }
+    if (!isSafeRefName(value))
+        return { kind: "unknown", branch: null };
+    return { kind: "branch", branch: value };
+}
+/**
+ * Parse `git rev-list --left-right --count @{u}...HEAD` output, which is
+ * `"<behind>\t<ahead>"`.
+ *
+ * Returns null for empty, malformed, negative, or non-integer output. Callers
+ * must treat null as "unknown" — never as zero.
+ */
+export function parseRevListCounts(raw) {
+    if (typeof raw !== "string")
+        return null;
+    const first = toLines(raw).find((line) => line.trim().length > 0);
+    if (first === undefined)
+        return null;
+    const parts = first.trim().split(/\s+/);
+    if (parts.length !== 2)
+        return null;
+    const behind = Number(parts[0]);
+    const ahead = Number(parts[1]);
+    if (!Number.isInteger(behind) || behind < 0)
+        return null;
+    if (!Number.isInteger(ahead) || ahead < 0)
+        return null;
+    return { behind, ahead };
+}
+/**
+ * Map counts to an upstream relation.
+ *
+ * Fails closed: no upstream returns `"no-upstream"`, and an upstream that does
+ * exist but whose counts would not parse returns `"unknown"` — never `"even"`.
+ */
+export function classifyUpstream(counts, hasUpstream) {
+    if (!hasUpstream)
+        return "no-upstream";
+    if (counts === null)
+        return "unknown";
+    const { behind, ahead } = counts;
+    if (behind === 0 && ahead === 0)
+        return "even";
+    if (behind > 0 && ahead > 0)
+        return "diverged";
+    return ahead > 0 ? "ahead" : "behind";
+}
+/**
+ * Collect a label for every in-progress operation whose marker is present.
+ *
+ * `present` is keyed by `InProgressMarker.id`. A marker missing from the map is
+ * treated as *unprobed*, not absent, and reported as `"<id>: unprobed"` — a
+ * probe that never ran must not masquerade as a clean tree. Returns `[]` only
+ * when every known marker was probed and none was present.
+ */
+export function classifyInProgress(present) {
+    const found = [];
+    for (const marker of IN_PROGRESS_MARKERS) {
+        const state = present[marker.id];
+        if (state === undefined) {
+            found.push(`${marker.id}: unprobed`);
+        }
+        else if (state) {
+            found.push(marker.label);
+        }
+    }
+    return found;
+}
+/**
+ * True when `branch` must not be pushed to or committed onto directly.
+ *
+ * Fails closed: null, an unparseable name, and a detached HEAD all return true,
+ * because an unknown branch is not proof of safety. Supports one trailing `/*`
+ * wildcard per pattern (`release/*`).
+ */
+export function isProtectedBranch(branch, patterns = DEFAULT_PROTECTED_BRANCHES) {
+    if (!isSafeRefName(branch))
+        return true;
+    const name = branch;
+    return patterns.some((pattern) => pattern.endsWith("/*")
+        ? name.startsWith(pattern.slice(0, -1))
+        : name === pattern);
+}
+/**
+ * Decide whether a push actually landed, from `git ls-remote` output.
+ *
+ * Three outcomes, never collapsed into two: a non-zero exit is `"unverified"`
+ * (the network or the remote failed, so absence of the ref is unproven and the
+ * push may well have landed), an empty successful probe is `"not-landed"` (the
+ * ref is genuinely absent), and a present ref is compared by SHA. An
+ * unparseable local HEAD or unparseable remote output is `"unverified"`.
+ */
+export function verifyPushLanded(input) {
+    const local = (input.localHead ?? "").trim();
+    if (!isSha(local)) {
+        return { verdict: "unverified", reason: "local HEAD is not a usable sha" };
+    }
+    if (input.lsRemoteExitCode !== 0) {
+        return {
+            verdict: "unverified",
+            reason: `git ls-remote exited ${input.lsRemoteExitCode}; absence of the ref is unproven`,
+        };
+    }
+    const raw = (input.lsRemoteStdout ?? "").trim();
+    if (raw.length === 0) {
+        return { verdict: "not-landed", reason: "remote ref does not exist" };
+    }
+    const remoteSha = ((toLines(raw)[0] ?? "").trim().split(/\s+/)[0] ?? "");
+    if (!isSha(remoteSha)) {
+        return { verdict: "unverified", reason: "could not parse a sha from ls-remote output" };
+    }
+    if (remoteSha.toLowerCase() === local.toLowerCase()) {
+        return {
+            verdict: "landed",
+            reason: `remote tip matches local HEAD ${local.slice(0, 12)}`,
+        };
+    }
+    return {
+        verdict: "not-landed",
+        reason: `remote tip ${remoteSha.slice(0, 12)} differs from local HEAD ${local.slice(0, 12)}`,
+    };
+}
+/**
+ * Reconcile `git status --porcelain` output against real content drift.
+ *
+ * On an `autocrlf=true` tree status reports line-ending-only modifications that
+ * carry no content change, which is why the reconcile skill says to trust
+ * `git diff` instead. A `contentDrift` of null means the drift probe never ran;
+ * it is reported as null rather than assumed to be zero.
+ */
+export function accountDirty(statusStdout, diffNamesStdout) {
+    const count = (raw) => typeof raw === "string"
+        ? toLines(raw).filter((line) => line.trim().length > 0).length
+        : null;
+    const reported = count(statusStdout) ?? 0;
+    const contentDrift = count(diffNamesStdout);
+    return {
+        reported,
+        contentDrift,
+        phantomSuspected: contentDrift !== null && reported > contentDrift,
+    };
+}
+/**
+ * True when the repo moved under us since `before` was captured — the check to
+ * run immediately before each mutation on a host with concurrent writers.
+ *
+ * Fails closed: a missing or unparseable sha on either side counts as shifted,
+ * because "we could not tell" must never read as "nothing moved".
+ */
+export function baselineShifted(before, after) {
+    if (before === null || after === null)
+        return true;
+    const beforeHead = (before.head ?? "").trim();
+    const afterHead = (after.head ?? "").trim();
+    if (!isSha(beforeHead) || !isSha(afterHead))
+        return true;
+    if (beforeHead.toLowerCase() !== afterHead.toLowerCase())
+        return true;
+    return (before.branch ?? null) !== (after.branch ?? null);
+}
+/**
+ * Turn a probed state into the ordered finding list the resolved-state block
+ * renders. Every finding carries a severity; `blocker` means do not mutate.
+ */
+export function assessGitState(input) {
+    const findings = [];
+    const protectedList = input.protectedBranches ?? DEFAULT_PROTECTED_BRANCHES;
+    if (input.head.kind === "branch") {
+        const onProtected = isProtectedBranch(input.head.branch, protectedList);
+        findings.push({
+            id: "head",
+            label: "HEAD",
+            detail: onProtected
+                ? `on protected branch ${input.head.branch} — branch before mutating`
+                : `on ${input.head.branch}`,
+            severity: onProtected ? "warn" : "ok",
+        });
+    }
+    else if (input.head.kind === "detached") {
+        findings.push({
+            id: "head",
+            label: "HEAD",
+            detail: "detached — no branch to commit onto, push, or name in a PR",
+            severity: "blocker",
+        });
+    }
+    else {
+        findings.push({
+            id: "head",
+            label: "HEAD",
+            detail: "branch name unparseable — treat repo identity as unknown",
+            severity: "blocker",
+        });
+    }
+    const relation = classifyUpstream(input.counts, input.upstreamRef !== null);
+    const upstreamRows = {
+        even: { detail: `even with ${input.upstreamRef}`, severity: "ok" },
+        ahead: {
+            detail: `${input.counts?.ahead ?? "?"} ahead of ${input.upstreamRef}`,
+            severity: "ok",
+        },
+        behind: {
+            detail: `${input.counts?.behind ?? "?"} behind ${input.upstreamRef} — pull --ff-only first`,
+            severity: "warn",
+        },
+        diverged: {
+            detail: `diverged from ${input.upstreamRef} ` +
+                `(${input.counts?.behind ?? "?"} behind / ${input.counts?.ahead ?? "?"} ahead) — ` +
+                "rebase or merge deliberately, never blind --force",
+            severity: "warn",
+        },
+        "no-upstream": {
+            detail: "no configured upstream — compare against origin/<default> explicitly before classifying",
+            severity: "warn",
+        },
+        unknown: {
+            detail: "upstream exists but counts did not parse — relationship unknown, do not assume even",
+            severity: "blocker",
+        },
+    };
+    findings.push({ id: "upstream", label: "upstream", ...upstreamRows[relation] });
+    const ops = classifyInProgress(Object.fromEntries(IN_PROGRESS_MARKERS.map((marker) => [marker.id, input.inProgress.includes(marker.id)])));
+    findings.push({
+        id: "in-progress",
+        label: "in-progress op",
+        detail: ops.length === 0 ? "none" : `${ops.join(", ")} — another actor may own this tree`,
+        severity: ops.length === 0 ? "ok" : "blocker",
+    });
+    const { reported, contentDrift, phantomSuspected } = input.dirty;
+    findings.push({
+        id: "dirty",
+        label: "working tree",
+        detail: contentDrift === null
+            ? `${reported} path(s) reported by status; content drift unprobed`
+            : phantomSuspected
+                ? `${reported} reported by status but only ${contentDrift} with content drift — ` +
+                    "stage by explicit filename, never git add -A"
+                : `${contentDrift} path(s) with content drift`,
+        severity: contentDrift === null ? "warn" : "ok",
+    });
+    return findings;
+}
+/** True when any finding blocks mutation. */
+export function hasBlockers(findings) {
+    return findings.some((finding) => finding.severity === "blocker");
+}
+const SEVERITY_TAG = {
+    ok: "ok",
+    warn: "WARN",
+    blocker: "BLOCKER",
+};
+/**
+ * Render the resolved-state block an operator reads before mutating. Returns a
+ * single "state unknown" line when no probe produced a finding, so an empty
+ * result never renders as a clean tree.
+ */
+export function renderResolvedState(findings) {
+    if (findings.length === 0) {
+        return "reconcile (resolved): no probes ran — state unknown";
+    }
+    const width = Math.max(...findings.map((finding) => finding.label.length));
+    const rows = findings.map((finding) => `  ${finding.label.padEnd(width)}  ${SEVERITY_TAG[finding.severity].padEnd(7)}  ${finding.detail}`);
+    return ["reconcile (resolved):", ...rows].join("\n");
+}

package/plugins/continuous-improvement/skills/reconcile/SKILL.md

@@ -20,27 +20,65 @@ Law 1 says research before executing. The most expensive skipped research is the
 
 ## Establish Ground Truth First
 
-Read before you write. Capture the full state in one pass:
+Read before you write. One command runs the whole pass and prints the resolved-state block:
 
 ```
-git branch --show-current
-git status --porcelain=v1
-git rev-list --left-right --count '@{u}...HEAD'     # behind / ahead of upstream (quote the ref — bare @{u} trips the Bash parser)
+npx ci-reconcile              # resolved-state block; exit 1 if anything blocks a mutation
+npx ci-reconcile --json       # the same state, machine-readable
+npx ci-reconcile --explain    # print the probe set and why each probe runs
+```
+
+Exit codes: `0` nothing blocks, `1` at least one blocker, `2` not a git repository. The probe set is defined once in `src/lib/git-state.mts`, and `npm run verify:reconcile-parity` fails if this document drifts from it — the list below is the list the runner executes.
+
+Run the pass by hand when the runner is not installed:
+
+```
+git rev-parse --show-toplevel                          # inside a work tree, and where
+git rev-parse HEAD                                     # the sha every later claim is relative to
+git symbolic-ref --quiet --short HEAD                  # branch name; NON-ZERO EXIT = detached HEAD
+git rev-parse --abbrev-ref --symbolic-full-name @{u}   # upstream, or non-zero = none configured
+git rev-list --left-right --count @{u}...HEAD          # behind/ahead — only after the line above succeeded
+git status --porcelain=v1                              # reported changes (inflated by autocrlf)
+git diff --name-only --ignore-all-space                # real content drift — the number to trust
 git stash list
-git worktree list
-ls .git/MERGE_HEAD .git/rebase-merge .git/rebase-apply 2>/dev/null   # in-progress operation?
+git worktree list --porcelain
+git rev-parse --git-path MERGE_HEAD                    # in-progress op: test the RESOLVED path for existence
 ```
 
-On Windows with `autocrlf=true`, `git status` reports phantom line-ending-only modifications. Trust `git diff --stat` (and `git diff --ignore-all-space`) for real content drift, not `git status`. Never stage with `git add -A` / `git add .` on such a tree — stage by explicit filename.
+Four boundaries make the obvious commands lie. Each was reproduced against real git; do not simplify them back.
+
+- **No configured upstream.** Asking `git rev-list` for counts against `@{u}` exits **128** with `fatal: no upstream configured` — it does not return zeros. Probe for the upstream first and ask for counts only once it resolved. With no upstream, compare against `origin/<default>` explicitly; never read the failure as "even".
+- **Detached HEAD.** The `--show-current` form of `git branch` prints an empty string and exits **0**, so a detached HEAD is indistinguishable from a successful read. `git symbolic-ref --quiet --short HEAD` exits non-zero instead, which is checkable. A detached HEAD blocks: there is no branch to commit onto, push, or name in a PR.
+- **Linked worktrees.** Inside a worktree `.git` is a *file*, not a directory, so listing a `.git/`-relative path for `MERGE_HEAD` fails with "Not a directory" and exit **2** — byte-identical to the "no operation in progress" result on a clean tree. A real conflicted merge therefore reads as clean. Resolve the marker with `git rev-parse --git-path MERGE_HEAD` and test *that* path; it is correct in a main checkout and in a worktree alike. Same for `rebase-merge`, `rebase-apply`, `CHERRY_PICK_HEAD`, `REVERT_HEAD`, `BISECT_LOG`.
+- **Windows `autocrlf=true`.** `git status` reports phantom line-ending-only modifications. Trust `git diff --stat` / `git diff --name-only --ignore-all-space` for real content drift. Never stage with `git add -A` / `git add .` on such a tree — stage by explicit filename. The runner prints both numbers so the gap is visible instead of assumed.
+
+## Compatibility
+
+The ground-truth pass has to work wherever the agent runs, not only in Bash. `ci-reconcile` spawns `git` argv directly with no shell, so it needs no `bash`, no coreutils, and no `.git/`-relative path.
+
+| Surface | PowerShell / cmd | Git Bash / WSL | POSIX shell | Linked worktree | Detached HEAD | No upstream |
+|---|---|---|---|---|---|---|
+| `ci-reconcile` (Node) | yes | yes | yes | correct | blocks | warns |
+| `scripts/git-state-snapshot.sh` | needs Git Bash | yes | yes | root/branch only | reports `detached` | reports `none` |
+| Hand-run probe list above | yes | yes | yes | correct | non-zero exit | non-zero exit |
+
+Smoke-test on the OS you actually ship on. Both surfaces emit the same `{head, upstream, dirty, root, branch}` envelope — `ci-reconcile --snapshot` adds `contentDrift` and `inProgress` — and a test pins that parity so the two cannot drift apart silently.
 
 ## Detect a Concurrent Writer
 
 When another session/loop may be active, do not assume the tree is yours:
 
-- An in-progress `MERGE_HEAD` / `rebase-merge` you did not start means another actor is mid-operation. Do not "help" by editing conflicted files — wait, or hand off.
-- Re-read the current branch immediately before any mutation; if it shifted since your snapshot, re-survey from the top.
-- If `.git/index` keeps changing while you are idle, a writer is active. Pause and surface it rather than racing.
-- If `gateguard` is installed, its Parallel-Actor Gate already captured this baseline on the session's first mutation by running `bash "${CLAUDE_PLUGIN_ROOT}/scripts/git-state-snapshot.sh"` (source: `scripts/git-state-snapshot.sh`) and divergence-checks every later mutation — `reconcile` complements that gate, it does not replace it. Without gateguard, run the snapshot above yourself.
+- An in-progress `MERGE_HEAD` / `rebase-merge` you did not start means another actor is mid-operation. Do not "help" by editing conflicted files — wait, or hand off. The runner reports this as a blocker; the retired `.git/`-relative probe could not see it inside a worktree at all.
+- **Re-read HEAD and the branch immediately before every mutation, not once per session.** Capture a baseline, then compare right before you commit, push, or rebase:
+  ```
+  npx ci-reconcile --snapshot > .git/reconcile-baseline.json   # or any scratch path
+  # ... do work ...
+  npx ci-reconcile --snapshot                                   # compare head + branch against the baseline
+  ```
+  If either field moved, another writer got there first — re-survey from the top instead of committing onto an unexpected base. A missing or unparseable field counts as *shifted*; "we could not tell" is never "nothing moved".
+- More than one entry in `git worktree list --porcelain` means a sibling checkout exists that another session may be writing to. The runner flags this.
+- If the git index keeps changing while you are idle, a writer is active. Pause and surface it rather than racing.
+- If `gateguard` is installed, its Parallel-Actor Gate already captured this baseline on the session's first mutation by running `bash "${CLAUDE_PLUGIN_ROOT}/scripts/git-state-snapshot.sh"` (source: `scripts/git-state-snapshot.sh`) and divergence-checks every later mutation — `reconcile` complements that gate, it does not replace it. That shell snapshot needs Git Bash and derives its `dirty` count from `git status`, which overstates drift on an `autocrlf` tree; `ci-reconcile --snapshot` is the same envelope without either limitation. Without gateguard, run one of them yourself.
 
 ## Classify, Then Act
 
@@ -99,12 +137,24 @@ Once ground truth is known and the halt gates are clear, carry the work to an op
 
 A push that printed no error is still a claim. Confirm:
 
+```
+npx ci-reconcile --verify-push <branch>      # exit 0 only when the remote tip equals local HEAD
+```
+
+or by hand:
+
 ```
 git rev-parse HEAD
 git ls-remote origin refs/heads/<branch>     # remote tip must equal local HEAD
 ```
 
-If the remote ref is absent or behind, the push did not land — investigate before reporting success.
+There are **three** outcomes here, not two, and collapsing them is how a false report gets made:
+
+- **landed** — the probe succeeded and the remote tip equals local HEAD.
+- **not-landed** — the probe succeeded and the ref is absent, or points at a different sha. The push really did not land.
+- **unverified** — `git ls-remote` itself failed (network, auth, remote down). This is *not* evidence the push failed; it is evidence you do not know. Retry the probe. Never report success, and never report failure, from a probe that did not run.
+
+Report only what the probe proved.
 
 ## Sync the Default Branch After the PR Merges
 

package/plugins/expert.json

@@ -1,6 +1,6 @@
 {
   "name": "continuous-improvement",
-  "version": "3.21.0",
+  "version": "3.22.0",
   "mode": "expert",
   "description": "Expert mode: tune confidence, manage instincts, and persist plans on disk. Adds safety, token-budget, and strategic-compact skills plus the /learn-eval command so long sessions stay sharp and learnings survive context resets.",
   "tools": [

package/skills/reconcile.md

@@ -20,27 +20,65 @@ Law 1 says research before executing. The most expensive skipped research is the
 
 ## Establish Ground Truth First
 
-Read before you write. Capture the full state in one pass:
+Read before you write. One command runs the whole pass and prints the resolved-state block:
 
 ```
-git branch --show-current
-git status --porcelain=v1
-git rev-list --left-right --count '@{u}...HEAD'     # behind / ahead of upstream (quote the ref — bare @{u} trips the Bash parser)
+npx ci-reconcile              # resolved-state block; exit 1 if anything blocks a mutation
+npx ci-reconcile --json       # the same state, machine-readable
+npx ci-reconcile --explain    # print the probe set and why each probe runs
+```
+
+Exit codes: `0` nothing blocks, `1` at least one blocker, `2` not a git repository. The probe set is defined once in `src/lib/git-state.mts`, and `npm run verify:reconcile-parity` fails if this document drifts from it — the list below is the list the runner executes.
+
+Run the pass by hand when the runner is not installed:
+
+```
+git rev-parse --show-toplevel                          # inside a work tree, and where
+git rev-parse HEAD                                     # the sha every later claim is relative to
+git symbolic-ref --quiet --short HEAD                  # branch name; NON-ZERO EXIT = detached HEAD
+git rev-parse --abbrev-ref --symbolic-full-name @{u}   # upstream, or non-zero = none configured
+git rev-list --left-right --count @{u}...HEAD          # behind/ahead — only after the line above succeeded
+git status --porcelain=v1                              # reported changes (inflated by autocrlf)
+git diff --name-only --ignore-all-space                # real content drift — the number to trust
 git stash list
-git worktree list
-ls .git/MERGE_HEAD .git/rebase-merge .git/rebase-apply 2>/dev/null   # in-progress operation?
+git worktree list --porcelain
+git rev-parse --git-path MERGE_HEAD                    # in-progress op: test the RESOLVED path for existence
 ```
 
-On Windows with `autocrlf=true`, `git status` reports phantom line-ending-only modifications. Trust `git diff --stat` (and `git diff --ignore-all-space`) for real content drift, not `git status`. Never stage with `git add -A` / `git add .` on such a tree — stage by explicit filename.
+Four boundaries make the obvious commands lie. Each was reproduced against real git; do not simplify them back.
+
+- **No configured upstream.** Asking `git rev-list` for counts against `@{u}` exits **128** with `fatal: no upstream configured` — it does not return zeros. Probe for the upstream first and ask for counts only once it resolved. With no upstream, compare against `origin/<default>` explicitly; never read the failure as "even".
+- **Detached HEAD.** The `--show-current` form of `git branch` prints an empty string and exits **0**, so a detached HEAD is indistinguishable from a successful read. `git symbolic-ref --quiet --short HEAD` exits non-zero instead, which is checkable. A detached HEAD blocks: there is no branch to commit onto, push, or name in a PR.
+- **Linked worktrees.** Inside a worktree `.git` is a *file*, not a directory, so listing a `.git/`-relative path for `MERGE_HEAD` fails with "Not a directory" and exit **2** — byte-identical to the "no operation in progress" result on a clean tree. A real conflicted merge therefore reads as clean. Resolve the marker with `git rev-parse --git-path MERGE_HEAD` and test *that* path; it is correct in a main checkout and in a worktree alike. Same for `rebase-merge`, `rebase-apply`, `CHERRY_PICK_HEAD`, `REVERT_HEAD`, `BISECT_LOG`.
+- **Windows `autocrlf=true`.** `git status` reports phantom line-ending-only modifications. Trust `git diff --stat` / `git diff --name-only --ignore-all-space` for real content drift. Never stage with `git add -A` / `git add .` on such a tree — stage by explicit filename. The runner prints both numbers so the gap is visible instead of assumed.
+
+## Compatibility
+
+The ground-truth pass has to work wherever the agent runs, not only in Bash. `ci-reconcile` spawns `git` argv directly with no shell, so it needs no `bash`, no coreutils, and no `.git/`-relative path.
+
+| Surface | PowerShell / cmd | Git Bash / WSL | POSIX shell | Linked worktree | Detached HEAD | No upstream |
+|---|---|---|---|---|---|---|
+| `ci-reconcile` (Node) | yes | yes | yes | correct | blocks | warns |
+| `scripts/git-state-snapshot.sh` | needs Git Bash | yes | yes | root/branch only | reports `detached` | reports `none` |
+| Hand-run probe list above | yes | yes | yes | correct | non-zero exit | non-zero exit |
+
+Smoke-test on the OS you actually ship on. Both surfaces emit the same `{head, upstream, dirty, root, branch}` envelope — `ci-reconcile --snapshot` adds `contentDrift` and `inProgress` — and a test pins that parity so the two cannot drift apart silently.
 
 ## Detect a Concurrent Writer
 
 When another session/loop may be active, do not assume the tree is yours:
 
-- An in-progress `MERGE_HEAD` / `rebase-merge` you did not start means another actor is mid-operation. Do not "help" by editing conflicted files — wait, or hand off.
-- Re-read the current branch immediately before any mutation; if it shifted since your snapshot, re-survey from the top.
-- If `.git/index` keeps changing while you are idle, a writer is active. Pause and surface it rather than racing.
-- If `gateguard` is installed, its Parallel-Actor Gate already captured this baseline on the session's first mutation by running `bash "${CLAUDE_PLUGIN_ROOT}/scripts/git-state-snapshot.sh"` (source: `scripts/git-state-snapshot.sh`) and divergence-checks every later mutation — `reconcile` complements that gate, it does not replace it. Without gateguard, run the snapshot above yourself.
+- An in-progress `MERGE_HEAD` / `rebase-merge` you did not start means another actor is mid-operation. Do not "help" by editing conflicted files — wait, or hand off. The runner reports this as a blocker; the retired `.git/`-relative probe could not see it inside a worktree at all.
+- **Re-read HEAD and the branch immediately before every mutation, not once per session.** Capture a baseline, then compare right before you commit, push, or rebase:
+  ```
+  npx ci-reconcile --snapshot > .git/reconcile-baseline.json   # or any scratch path
+  # ... do work ...
+  npx ci-reconcile --snapshot                                   # compare head + branch against the baseline
+  ```
+  If either field moved, another writer got there first — re-survey from the top instead of committing onto an unexpected base. A missing or unparseable field counts as *shifted*; "we could not tell" is never "nothing moved".
+- More than one entry in `git worktree list --porcelain` means a sibling checkout exists that another session may be writing to. The runner flags this.
+- If the git index keeps changing while you are idle, a writer is active. Pause and surface it rather than racing.
+- If `gateguard` is installed, its Parallel-Actor Gate already captured this baseline on the session's first mutation by running `bash "${CLAUDE_PLUGIN_ROOT}/scripts/git-state-snapshot.sh"` (source: `scripts/git-state-snapshot.sh`) and divergence-checks every later mutation — `reconcile` complements that gate, it does not replace it. That shell snapshot needs Git Bash and derives its `dirty` count from `git status`, which overstates drift on an `autocrlf` tree; `ci-reconcile --snapshot` is the same envelope without either limitation. Without gateguard, run one of them yourself.
 
 ## Classify, Then Act
 
@@ -99,12 +137,24 @@ Once ground truth is known and the halt gates are clear, carry the work to an op
 
 A push that printed no error is still a claim. Confirm:
 
+```
+npx ci-reconcile --verify-push <branch>      # exit 0 only when the remote tip equals local HEAD
+```
+
+or by hand:
+
 ```
 git rev-parse HEAD
 git ls-remote origin refs/heads/<branch>     # remote tip must equal local HEAD
 ```
 
-If the remote ref is absent or behind, the push did not land — investigate before reporting success.
+There are **three** outcomes here, not two, and collapsing them is how a false report gets made:
+
+- **landed** — the probe succeeded and the remote tip equals local HEAD.
+- **not-landed** — the probe succeeded and the ref is absent, or points at a different sha. The push really did not land.
+- **unverified** — `git ls-remote` itself failed (network, auth, remote down). This is *not* evidence the push failed; it is evidence you do not know. Retry the probe. Never report success, and never report failure, from a probe that did not run.
+
+Report only what the probe proved.
 
 ## Sync the Default Branch After the PR Merges