@open-agent-toolkit/cli 0.3.15 → 0.3.17

package/assets/skills/oat-wrap-up/SKILL.md

@@ -6,7 +6,7 @@ disable-model-invocation: false
 allowed-tools: Read, Write, Bash, Glob, Grep, AskUserQuestion
 user-invocable: true
 metadata:
-  version: 1.0.3
+  version: 1.0.4
 ---
 
 # Wrap-Up
@@ -365,7 +365,13 @@ so I can review before committing it.
 - Automation patterns (Claude Code `CronCreate`, Codex host scheduling, plain cron): `references/automation-recipes.md`
 - Prerequisite command: `oat repo archive sync` at `packages/cli/src/commands/repo/archive/index.ts`
 - Merged-PR query pattern: `packages/cli/src/commands/repo/pr-comments/collect/collect-comments.ts:198-205`
-- Summary frontmatter schema: `.oat/templates/summary.md`
+- Summary frontmatter schema: the `summary` template, resolved through the repository, user, then bundled tier. Run `oat template resolve summary --json` and read the reported `path`. A user-scope-only install has no repository `.oat/templates/`, and the bundle tier reports `"path": null`; in that case copy it to a scratch file and read the copy:
+
+  ```bash
+  SUMMARY_TEMPLATE_DIR="$(mktemp -d)"
+  oat template resolve summary --output "$SUMMARY_TEMPLATE_DIR/summary.md"
+  ```
+
 - Config key: `archive.wrapUpExportPath` (managed via `oat config set archive.wrapUpExportPath <path>`)
 
 ## Troubleshooting
@@ -394,7 +400,7 @@ so I can review before committing it.
 
 **"Shipped via OAT projects" is empty or "Other merged PRs" contains PRs that clearly correspond to included summaries (false negative):**
 
-- Step 7's cross-reference logic is strict: it only claims a PR for a summary when the summary body literally contains the PR number (`#<n>`, `github.com/.../pull/<n>`, or a bare PR number adjacent to keywords like "PR", "merged", "ships in"), or when a sibling `pr/` directory inside the project references the PR. OAT summaries as authored today (see `.oat/templates/summary.md`) do not inline PR numbers, so in repos that have not adopted the convention of citing PRs in summaries, the cross-reference will often find zero matches and all merged PRs will land in "Other merged PRs".
+- Step 7's cross-reference logic is strict: it only claims a PR for a summary when the summary body literally contains the PR number (`#<n>`, `github.com/.../pull/<n>`, or a bare PR number adjacent to keywords like "PR", "merged", "ships in"), or when a sibling `pr/` directory inside the project references the PR. OAT summaries as authored today (see the `summary` template, resolved as in Reference) do not inline PR numbers, so in repos that have not adopted the convention of citing PRs in summaries, the cross-reference will often find zero matches and all merged PRs will land in "Other merged PRs".
 - **Workaround options (author-time)**: add a short "Associated PRs" section to project summaries and list PR numbers inline, OR populate `pr/` under each project directory with PR metadata so the sibling scan has data to match against.
 - **Workaround options (report-time)**: manually re-read the generated report; move PRs from "Other merged PRs" into "Shipped via OAT projects" by hand if the correspondence is obvious (matching keywords in the PR title and the summary's What Was Implemented section). The skill is designed to produce an editable draft, not a final release note.
 - This is a v1 limitation. Future versions may add a looser heuristic (e.g., title-keyword matching, commit-to-project mapping via `git log`) to close the gap.

package/assets/skills/oat-wrap-up/references/report-template.md

@@ -63,7 +63,7 @@ generated_at: YYYY-MM-DDTHH:MM:SSZ
 
 ## Section omission rule
 
-Apply the same rule as `.oat/templates/summary.md`: **omit any section with no content**. Do not leave empty sections or "None" placeholders. The minimum viable wrap-up is `# Wrap-up` + `## TL;DR` + one of (`Features introduced` | `Bug fixes` | `Shipped via OAT projects` | `Other merged PRs`) + `Included summaries (provenance)`.
+Apply the same rule as the `summary` template (resolve it with `oat template resolve summary`, as in the skill's Reference section): **omit any section with no content**. Do not leave empty sections or "None" placeholders. The minimum viable wrap-up is `# Wrap-up` + `## TL;DR` + one of (`Features introduced` | `Bug fixes` | `Shipped via OAT projects` | `Other merged PRs`) + `Included summaries (provenance)`.
 
 If the window is completely empty (no summaries, no merged PRs), still write the file (or stdout) with:
 

package/assets/skills/recon/SKILL.md

@@ -6,7 +6,7 @@ disable-model-invocation: true
 user-invocable: true
 allowed-tools: Read, Write, Glob, Grep, Bash, AskUserQuestion, Agent, mcp__*
 metadata:
-  version: 1.1.7
+  version: 1.1.8
 ---
 
 # Recon

package/assets/skills/recon/references/packet-contract.md

@@ -393,9 +393,24 @@ canonical JSON. Any edited, injected, duplicated, or unprojected field differs
 (`REVIEW_BRIEF_MISMATCH`), so a brief cannot carry an injected claim, note, or
 source. Each review's dispositions must be unique and name claims its brief
 lists. The brief `id` is a lowercase slug of at most 64 characters and
-`createdAt` a UTC ISO-8601 instant. A reviewer may leave a briefed claim without
-a disposition; like an `uncertain` one, the claim stays `unresolved`, and
-`packet.md` lists it under Review Downgrades as not reviewed.
+`createdAt` a UTC ISO-8601 instant. A `verified` claim needs the affirming
+disposition of every review kind the achieved profile requires, and
+reconciliation and publication read the one rule
+(`requiredReviewKindsForProfile` in `scripts/lib/contracts.mjs`):
+
+- `semantic` (`affirmed`), `adversarial` (`unchallenged`), and `coverage`
+  (`covered`) are required at `standard` and `thorough`.
+- `redundant-verification` (`affirmed`) is also required at `thorough`. The
+  reconciler requires it whenever a complete same-run result is incorporated,
+  because only a complete redundant-verification pass achieves `thorough`.
+- `contradiction-resolution` is conditional and never required; a `rejected`
+  disposition still makes a claim `unsupported`.
+
+A claim any required review leaves without a disposition stays `unresolved`,
+like an `uncertain` one, so the packet publishes as an honest `complete` or
+`partial` instead of failing with `MISSING_INDEPENDENT_REVIEW`. `packet.md`
+lists it under Review Downgrades: as not reviewed when the review's brief
+listed the claim, and as outside its brief when it did not.
 All reject dossier paths, compiler reasoning, synthesis prose, provenance
 references, and prior review IDs.
 

package/assets/skills/recon/scripts/lib/contracts.mjs

@@ -2281,8 +2281,9 @@ function validateReviewBriefArtifact(value, errors) {
 }
 
 // The affirming disposition each review kind gives a claim it supports. The
-// first three are the required reviews for `verified`. The reconciler, the
-// validator, and the renderer all read this one table.
+// first three are required for `verified` at every reviewed profile
+// (`requiredReviewKindsForProfile` adds the thorough kind). The reconciler,
+// the validator, and the renderer all read this one table.
 export const affirmingDispositionByReviewKind = Object.freeze({
   semantic: 'affirmed',
   adversarial: 'unchallenged',
@@ -2297,6 +2298,19 @@ export const requiredReviewKinds = Object.freeze([
   'coverage',
 ]);
 
+// The review kinds whose affirming disposition a `verified` claim needs at the
+// given achieved profile: the core reviews, plus redundant verification at
+// `thorough`. Contradiction resolution is conditional and never required.
+// Reconciliation, publication, and the renderer all read this one rule, so a
+// claim any required kind leaves without a disposition stays below `verified`
+// everywhere.
+export function requiredReviewKindsForProfile(profile) {
+  return Object.freeze([
+    ...requiredReviewKinds,
+    ...(profile === 'thorough' ? ['redundant-verification'] : []),
+  ]);
+}
+
 // `unresolvedIssues` entries are a closed union:
 // - a string (legacy), read as a global issue;
 // - `{ text, claimIds }`, scoped to a non-empty list of unique claims the

package/assets/skills/recon/scripts/reconcile-ledger.mjs

@@ -15,6 +15,7 @@ import { isDirectExecution } from './lib/cli-entry.mjs';
 import {
   affirmingDispositionByReviewKind,
   requiredReviewKinds,
+  requiredReviewKindsForProfile,
   unresolvedIssuesBlockClaim,
   validateArtifactShape,
 } from './lib/contracts.mjs';
@@ -25,13 +26,6 @@ import {
   assertUnchangedRoot,
 } from './lib/safe-path.mjs';
 
-const requiredDispositions = new Map(
-  requiredReviewKinds.map((kind) => [
-    kind,
-    affirmingDispositionByReviewKind[kind],
-  ]),
-);
-
 const permittedDispositions = new Map([
   ['semantic', new Set(['affirmed', 'rejected', 'uncertain'])],
   ['adversarial', new Set(['unchallenged', 'challenged'])],
@@ -99,7 +93,7 @@ export function reconcileLedger({
   const reviews = new Map(
     reviewResults.map((review) => [review.reviewKind, review]),
   );
-  for (const [kind] of requiredDispositions) {
+  for (const kind of requiredReviewKinds) {
     const review = reviews.get(kind);
     if (!review || review.runId !== runId || review.status !== 'complete') {
       throw new Error(`Reconciliation requires a complete ${kind} result`);
@@ -109,6 +103,22 @@ export function reconcileLedger({
       throw new Error(`Reconciliation received an invalid ${kind} disposition`);
     }
   }
+  // A claim needs a disposition from every review kind publication requires
+  // for the achieved profile. The thorough profile is achieved only with a
+  // complete redundant-verification pass, so an incorporated complete result
+  // of that kind makes it required here too. Missing it keeps the claim
+  // `unresolved`, exactly like an `uncertain` disposition.
+  const achievesThorough = reviewResults.some(
+    (review) =>
+      review.reviewKind === 'redundant-verification' &&
+      review.runId === runId &&
+      review.status === 'complete',
+  );
+  const verifyingDispositions = new Map(
+    requiredReviewKindsForProfile(
+      achievesThorough ? 'thorough' : 'standard',
+    ).map((kind) => [kind, affirmingDispositionByReviewKind[kind]]),
+  );
   const ledger = exactClone(priorLedger);
   ledger.revision = priorLedger.revision + 1;
   ledger.inputArtifacts = [
@@ -244,7 +254,7 @@ export function reconcileLedger({
     const issueBlocked = supporting.some((review) =>
       unresolvedIssuesBlockClaim(review, claim.id),
     );
-    const incomplete = [...requiredDispositions.keys()].some(
+    const incomplete = [...verifyingDispositions.keys()].some(
       (kind) =>
         !reviewResults.some(
           (review) =>
@@ -267,7 +277,7 @@ export function reconcileLedger({
             finding.material === true && finding.claimIds.includes(claim.id),
         ),
     );
-    const coreComplete = [...requiredDispositions].every(
+    const coreComplete = [...verifyingDispositions].every(
       ([kind, disposition]) =>
         supporting.some(
           (review) =>

package/assets/skills/recon/scripts/render-packet.mjs

@@ -9,6 +9,7 @@ import { isDirectExecution } from './lib/cli-entry.mjs';
 import {
   affirmingDispositionByReviewKind,
   classifyUnresolvedIssue,
+  requiredReviewKindsForProfile,
   unresolvedIssuesBlockClaim,
 } from './lib/contracts.mjs';
 import { reviewBriefEntries } from './lib/review-binding.mjs';
@@ -151,17 +152,35 @@ function omittedReviews(claimId, reviews) {
     .map(({ value }) => value);
 }
 
+// Every incorporated review of a kind the achieved profile requires whose
+// brief did not list `claimId`, so it gave the claim no disposition. Such a
+// claim cannot be verified, and the reason is the missing review, not an
+// omission by the reviewer.
+function unbriefedRequiredReviews(claimId, reviews, requiredKinds) {
+  return reviews
+    .filter(
+      ({ value, briefed }) =>
+        requiredKinds.includes(value.reviewKind) &&
+        !briefed.has(claimId) &&
+        !(value.dispositions ?? []).some((item) => item.claimId === claimId),
+    )
+    .map(({ value }) => value);
+}
+
 function issueText(entry) {
   return typeof entry === 'string' ? entry : (entry?.text ?? '');
 }
 
 // Every claim an incorporated review kept below `verified` (an unresolved
 // issue that applies to it, a coverage finding that names it, a
-// non-affirming disposition, or an assurance review that left a briefed claim
-// without a disposition), with the review's own words. Key-claim status
+// non-affirming disposition, an assurance review that left a briefed claim
+// without a disposition, or a review the achieved profile requires whose
+// brief left the claim out), with the review's own words. Key-claim status
 // alone would let a `complete` packet hide a downgraded non-key claim.
 function reviewDowngradeLines(validatedRun) {
-  const { ledger, artifacts, assuranceReviewIds } = validatedRun;
+  const { ledger, artifacts, assuranceReviewIds, achievedProfile } =
+    validatedRun;
+  const requiredKinds = requiredReviewKindsForProfile(achievedProfile);
   const assurance = new Set(assuranceReviewIds);
   const reviews = artifacts
     .map(({ value }) => value)
@@ -214,6 +233,15 @@ function reviewDowngradeLines(validatedRun) {
         `${review.reviewKind} review: not reviewed (no disposition)`,
       );
     }
+    for (const review of unbriefedRequiredReviews(
+      claim.id,
+      briefedReviews,
+      requiredKinds,
+    )) {
+      reasons.push(
+        `${review.reviewKind} review: outside its brief (no disposition)`,
+      );
+    }
     for (const review of reviews) {
       for (const finding of review.coverageFindings ?? []) {
         if (!finding.claimIds.includes(claim.id)) continue;

package/assets/skills/recon/scripts/validate-packet.mjs

@@ -12,7 +12,7 @@ import {
   isObject,
   issue,
   profiles,
-  requiredReviewKinds,
+  requiredReviewKindsForProfile,
   unresolvedIssuesBlockClaim,
   validateArtifactShape,
 } from './lib/contracts.mjs';
@@ -2082,10 +2082,10 @@ function validateAssurance(validatedRun, errors, checkBrief) {
         );
       }
       const required = new Map(
-        [
-          ...requiredReviewKinds,
-          ...(achievedProfile === 'thorough' ? ['redundant-verification'] : []),
-        ].map((kind) => [kind, affirmingDispositionByReviewKind[kind]]),
+        requiredReviewKindsForProfile(achievedProfile).map((kind) => [
+          kind,
+          affirmingDispositionByReviewKind[kind],
+        ]),
       );
       const satisfied = new Set();
       const reviewerLanes = new Set();

package/assets/templates/pjm-agents.md

@@ -31,15 +31,41 @@ Invariant: `backlog/items/` holds only active work (`status: open` or
 The agent or person shipping the work owns the close-out, in the same
 commit/PR as the work whenever practical.
 
-**Close-out (primary path).** Run `oat backlog archive <id>` — add `--wont-do`
-for abandoned work and `--summary "<text>"` to record the outcome. The command
+**Close-out (primary path).** Run `oat backlog archive <id> --summary "<outcome>" --json`
+for completed work; a nonblank summary is required. Add `--wont-do` for
+abandoned work; that path may omit its summary and ledger entry. The command
 performs the whole close-out atomically: it flips `status` to the terminal
 value and bumps `updated`, appends the canonical `backlog/completed.md` entry
 (always for `closed`; for `wont_do` only when `--summary` is given), moves the
 item file from `backlog/items/` to `backlog/archived/`, rewrites inbound
 `.oat/repo` links and path references to the moved file (reporting each
-rewritten file), and regenerates `backlog/index.md`. Stage the resulting
-changes with the shipping commit/PR.
+rewritten file), and regenerates `backlog/index.md`. Commit the resulting
+changes through the exact-path close-out below with the shipping commit/PR.
+
+Archive never stages files. Capture each successful `--json` result and retain
+its complete `affectedPaths` array, including the old tracked item deletion,
+the archived destination, completed ledger, index and rewritten references.
+On retry use the returned operation paths; do not reconstruct ownership from
+all files that mention the item. If this close-out owns a kickoff handoff,
+remove it with a filesystem operation and append its tracked deletion path.
+Convert returned absolute paths to literal repository-relative files using
+the same repository root (avoiding checkout/scratch-path aliases).
+Deduplicate the exact file list, format only existing supported text files
+with the repository's documented formatter, and commit that list through
+`oat internal commit-paths` with enabled hooks. Verify helper availability
+first; if unavailable, stop and update the CLI. Set a unique `COMMIT_IDENTITY`
+before the first attempt and retain the identity, message and literal paths
+through retries; a blocked/failed helper result stops close-out. Unrelated
+staged and unstaged work must remain intact. An empty settled-noop path list
+needs no commit; omit a missing source path only if Git proves it was never
+tracked, never omit a tracked old path or the new destination.
+
+```bash
+oat internal commit-paths --help || exit 1
+# ARCHIVE_OWNED_FILES is the literal affectedPaths union plus owned handoff deletion.
+# Format the existing text members with the repository's documented write command.
+oat internal commit-paths --identity "${COMMIT_IDENTITY:?set once and retain for retries}:backlog-closeout" --message "chore(pjm): archive completed backlog work" -- "${ARCHIVE_OWNED_FILES[@]}" || exit 1
+```
 
 **Manual fallback.** These are the steps the command automates — follow them, in
 order, only when closing out by hand:
@@ -48,13 +74,16 @@ order, only when closing out by hand:
 2. Append a summary entry to `backlog/completed.md` (newest first; entry format
    is documented at the top of that file). Add the entry for a `wont_do` item
    only when the abandonment itself is worth recording (an explicit summary).
-3. `git mv` the item file from `backlog/items/` to `backlog/archived/`, then
+3. Move the item file with a filesystem rename (`mv`, without staging) from `backlog/items/` to `backlog/archived/`, then
    rewrite inbound `.oat/repo` links to `archived/` (plans, decision records,
    other items, and repository-root paths such as `oat_external_plan_sources`).
-4. Run `oat backlog regenerate-index` and stage the regenerated
-   `backlog/index.md`.
+4. Run `oat backlog regenerate-index`; include the regenerated
+   `backlog/index.md` in the exact owned path list.
 5. If the completion changes the operating picture, refresh
    `current-state.md` and the curated overview section of `backlog/index.md`.
+6. Collect both old/new item names, every written ledger/index/reference and
+   any owned handoff deletion, format existing text, then commit the complete
+   operation through `oat internal commit-paths` as above.
 
 A partial close-out (status flipped or `completed.md` updated, but the file
 left in `items/`) is how drift starts — finish all steps or none. `oat pjm
@@ -97,7 +126,8 @@ convention.
   - repo conventions and verification gates the item file does not restate;
   - a close-out section requiring (a) the **Backlog Lifecycle** above executed
     in the same PR that ships the item and (b) deletion of the handoff file
-    (`git rm`) in that same PR.
+    (filesystem removal, included as an owned tracked deletion in
+    the same exact-path commit) in that same PR.
 - **Staleness:** if a later alignment pass drops an item from the kickoff
   stack, delete its handoff in that pass rather than letting it drift.
 - Every backlog item reference — in review output, alignment docs, and

package/assets/templates/repo-agents.md

@@ -15,3 +15,8 @@ Use this directory as the canonical OAT repo-reference root.
   `oat backlog archive <id>` in the same PR that ships the work.
 - `README.md` is the human-facing orientation for this directory; agent-facing
   rules live in the `AGENTS.md` files alongside each subdirectory.
+
+Backlog archive is staging-neutral. Follow `pjm/AGENTS.md` Backlog Lifecycle:
+consume the complete JSON `affectedPaths`, add any owned handoff deletion,
+format existing text, and commit the exact operation through
+`oat internal commit-paths`, preserving unrelated staged/unstaged work.

package/assets/templates/repo-readme.md

@@ -33,3 +33,8 @@ Agent-facing rules live in the `AGENTS.md` files alongside each directory.
 - **Close-out.** When work ships that satisfies a backlog item's acceptance
   criteria, the item is closed and archived in the same commit/PR — run
   `oat backlog archive <id>`. See the Backlog Lifecycle in `pjm/AGENTS.md`.
+
+Backlog archive is staging-neutral. Follow `pjm/AGENTS.md` Backlog Lifecycle:
+consume the complete JSON `affectedPaths`, add any owned handoff deletion,
+format existing text, and commit the exact operation through
+`oat internal commit-paths`, preserving unrelated staged/unstaged work.

package/assets/templates/state.md

@@ -75,6 +75,13 @@ oat_workflow_origin: native # native | imported
 #   receive_completed: false
 #   failure: null
 #   updated_at: '2026-07-18T00:00:00Z'
+#   decided_at: null # ISO 8601 UTC; set with every allowed or blocked outcome (core record: gate-approval-record.md)
+# oat_quick_start_gate: # optional; persisted quick-start plan gate outcome, absent when no gate is configured (core record: gate-approval-record.md)
+#   status: allowed # allowed | blocked
+#   disposition: passed # passed | warned | prompt_approved | project_disabled; null when blocked
+#   config_fingerprint: '<stable hash of resolved gate declaration>'
+#   reviewed_head: null # full SHA of the commit the gate reviewed; provenance only
+#   decided_at: null # ISO 8601 UTC
 oat_docs_updated: null # null | skipped | complete — documentation sync status
 oat_pr_status: null # null | ready | open | closed | merged — actual PR state for the current project
 oat_pr_url: null # null | string — tracked PR URL when a PR exists

package/dist/commands/backlog/archive.d.ts

@@ -13,6 +13,9 @@ export interface ArchiveBacklogItemResult {
      * repository root.
      */
     rewrittenReferences: string[];
+    /** Normalized absolute paths owned by this operation, including the old
+     * item deletion and retry outputs. Archive never stages any of these paths. */
+    affectedPaths: string[];
     warnings: string[];
 }
 export interface ArchiveBacklogItemOptions {

package/dist/commands/backlog/archive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"archive.d.ts","sourceRoot":"","sources":["../../../src/commands/backlog/archive.ts"],"names":[],"mappings":"AAUA,OAAO,EAEL,KAAK,iBAAiB,EAGvB,MAAM,sBAAsB,CAAC;AAmB9B,mDAAmD;AACnD,MAAM,WAAW,wBAAwB;IACvC,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,UAAU,GAAG,MAAM,CAAC;IAC5B,MAAM,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACjC,cAAc,EAAE,SAAS,GAAG,YAAY,GAAG,SAAS,CAAC;IACrD,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,gBAAgB,EAAE,OAAO,CAAC;IAC1B;;;;OAIG;IACH,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAC9B,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,MAAM,WAAW,yBAAyB;IACxC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,8EAA8E;IAC9E,GAAG,CAAC,EAAE,IAAI,CAAC;CACZ;AAED;;;GAGG;AACH,qBAAa,mBAAoB,SAAQ,KAAK;IAC5C,QAAQ,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC;IAEzB,YAAY,OAAO,EAAE,MAAM,EAAE,QAAQ,GAAE,CAAC,GAAG,CAAK,EAI/C;CACF;AAkID;;;;;;;GAOG;AACH,wBAAsB,kBAAkB,CACtC,WAAW,EAAE,MAAM,EACnB,EAAE,EAAE,MAAM,EACV,OAAO,GAAE,yBAA8B,GACtC,OAAO,CAAC,wBAAwB,CAAC,CA4InC"}
+{"version":3,"file":"archive.d.ts","sourceRoot":"","sources":["../../../src/commands/backlog/archive.ts"],"names":[],"mappings":"AAUA,OAAO,EAEL,KAAK,iBAAiB,EAGvB,MAAM,sBAAsB,CAAC;AAmB9B,mDAAmD;AACnD,MAAM,WAAW,wBAAwB;IACvC,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,UAAU,GAAG,MAAM,CAAC;IAC5B,MAAM,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACjC,cAAc,EAAE,SAAS,GAAG,YAAY,GAAG,SAAS,CAAC;IACrD,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,gBAAgB,EAAE,OAAO,CAAC;IAC1B;;;;OAIG;IACH,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAC9B;mFAC+E;IAC/E,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,MAAM,WAAW,yBAAyB;IACxC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,8EAA8E;IAC9E,GAAG,CAAC,EAAE,IAAI,CAAC;CACZ;AAED;;;GAGG;AACH,qBAAa,mBAAoB,SAAQ,KAAK;IAC5C,QAAQ,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC;IAEzB,YAAY,OAAO,EAAE,MAAM,EAAE,QAAQ,GAAE,CAAC,GAAG,CAAK,EAI/C;CACF;AAwJD;;;;;;;GAOG;AACH,wBAAsB,kBAAkB,CACtC,WAAW,EAAE,MAAM,EACnB,EAAE,EAAE,MAAM,EACV,OAAO,GAAE,yBAA8B,GACtC,OAAO,CAAC,wBAAwB,CAAC,CA0LnC"}

package/dist/commands/backlog/archive.js

@@ -1,6 +1,6 @@
 import { execFile } from 'node:child_process';
 import { access, readFile, rename, writeFile } from 'node:fs/promises';
-import { join } from 'node:path';
+import { join, relative, resolve } from 'node:path';
 import { promisify } from 'node:util';
 import { getFrontmatterBlock } from '../shared/frontmatter.js';
 import YAML from 'yaml';
@@ -48,15 +48,6 @@ async function pathExists(path) {
         return false;
     }
 }
-async function isInsideGitWorkTree(cwd) {
-    try {
-        await execFileAsync('git', ['rev-parse', '--is-inside-work-tree'], { cwd });
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
 /**
  * Read the item `title` from its frontmatter. Parses the YAML block (rather
  * than a line regex) so a legitimate `#` inside a quoted title — e.g.
@@ -117,19 +108,37 @@ function insertCompletedEntry(completed, entryLine) {
     }
     return { content, scaffolded: false, warning: null };
 }
-async function moveItemFile(backlogRoot, fromPath, toPath, warnings) {
-    if (await isInsideGitWorkTree(backlogRoot)) {
-        try {
-            await execFileAsync('git', ['mv', fromPath, toPath], {
-                cwd: backlogRoot,
-            });
-            return;
-        }
-        catch {
-            warnings.push(`\`git mv\` failed for ${fromPath}; falling back to a plain filesystem rename (the move is no longer staged).`);
-        }
+async function readHeadFile(backlogRoot, path) {
+    try {
+        const { stdout } = await execFileAsync('git', ['show', `HEAD:./${relative(resolve(backlogRoot), resolve(path))}`], { cwd: backlogRoot });
+        return stdout;
+    }
+    catch {
+        // No Git/HEAD or absent path gives no evidence of a prior operation.
+        return null;
     }
-    await rename(fromPath, toPath);
+}
+function hasCompletedEntry(content, id) {
+    return (content !== null &&
+        content
+            .split('\n')
+            .some((line) => line.startsWith('- ') && line.includes(` — ${id} — `)));
+}
+function hasIndexEntry(content, id) {
+    return (content !== null &&
+        content
+            .split('\n')
+            .some((line) => line.startsWith('|') && line.split('|')[1]?.trim() === id));
+}
+function collectAffectedPaths(backlogRoot, id, references, changes) {
+    const paths = [...references];
+    if (changes.item)
+        paths.push(resolve(backlogRoot, 'items', `${id}.md`), resolve(backlogRoot, 'archived', `${id}.md`));
+    if (changes.completed)
+        paths.push(resolve(backlogRoot, 'completed.md'));
+    if (changes.index)
+        paths.push(resolve(backlogRoot, 'index.md'));
+    return [...new Set(paths)].sort();
 }
 /**
  * Atomic backlog close-out. Validates the current status, sets the terminal
@@ -143,6 +152,8 @@ export async function archiveBacklogItem(backlogRoot, id, options = {}) {
     const itemsPath = join(backlogRoot, 'items', `${id}.md`);
     const archivedPath = join(backlogRoot, 'archived', `${id}.md`);
     const warnings = [];
+    const completedPath = join(backlogRoot, 'completed.md');
+    const indexPath = join(backlogRoot, 'index.md');
     // Already archived: no status, completed-log, or move writes; only the
     // idempotent reference rewrite and index regeneration are retried.
     if (await pathExists(archivedPath)) {
@@ -165,7 +176,19 @@ export async function archiveBacklogItem(backlogRoot, id, options = {}) {
         // Retry the idempotent tail of a close-out: a run that failed during the
         // reference rewrite (or an item archived before the rewrite existed)
         // still gets its inbound links repointed and the index regenerated.
-        const references = await rewriteInboundReferences(backlogRoot, itemsPath, archivedPath, { rebaseMovedItem: false });
+        const [headItem, headArchived, headCompleted, headIndex] = await Promise.all([
+            readHeadFile(backlogRoot, itemsPath),
+            readHeadFile(backlogRoot, archivedPath),
+            readHeadFile(backlogRoot, completedPath),
+            readHeadFile(backlogRoot, indexPath),
+        ]);
+        const pendingMove = headItem !== null && headArchived === null;
+        const indexBefore = await readFile(indexPath, 'utf8').catch((error) => {
+            if (error.code === 'ENOENT')
+                return null;
+            throw error;
+        });
+        const references = await rewriteInboundReferences(backlogRoot, itemsPath, archivedPath, { rebaseMovedItem: false, recoverPendingArchive: pendingMove });
         warnings.push(...references.warnings);
         const regeneration = await regenerateBacklogIndex(backlogRoot);
         warnings.push(...regeneration.warnings);
@@ -177,6 +200,20 @@ export async function archiveBacklogItem(backlogRoot, id, options = {}) {
             movedTo: archivedPath,
             indexRegenerated: true,
             rewrittenReferences: references.rewritten,
+            affectedPaths: collectAffectedPaths(backlogRoot, id, references.affectedPaths, {
+                item: pendingMove,
+                completed: pendingMove &&
+                    hasCompletedEntry(await readFile(completedPath, 'utf8').catch((error) => {
+                        if (error.code === 'ENOENT')
+                            return '';
+                        throw error;
+                    }), id) &&
+                    !hasCompletedEntry(headCompleted, id),
+                index: indexBefore !== (await readFile(indexPath, 'utf8')) ||
+                    (pendingMove &&
+                        hasIndexEntry(headIndex, id) &&
+                        !hasIndexEntry(await readFile(indexPath, 'utf8'), id)),
+            }),
             warnings,
         };
     }
@@ -206,7 +243,6 @@ export async function archiveBacklogItem(backlogRoot, id, options = {}) {
     const shouldWriteEntry = targetStatus === 'closed' || summary.length > 0;
     if (shouldWriteEntry) {
         const entryLine = `- ${entryDate} — ${id} — ${title} — ${summary}`;
-        const completedPath = join(backlogRoot, 'completed.md');
         let scaffoldedFile = false;
         let existing;
         if (await pathExists(completedPath)) {
@@ -224,8 +260,8 @@ export async function archiveBacklogItem(backlogRoot, id, options = {}) {
         completedEntry =
             scaffoldedFile || inserted.scaffolded ? 'scaffolded' : 'written';
     }
-    // 6. Move items/<id>.md -> archived/<id>.md (git mv with rename fallback).
-    await moveItemFile(backlogRoot, itemsPath, archivedPath, warnings);
+    // 6. Filesystem-only move: the caller owns staging the complete operation.
+    await rename(itemsPath, archivedPath);
     // 7. Rewrite inbound references so no `.oat/repo` link dangles at items/.
     const references = await rewriteInboundReferences(backlogRoot, itemsPath, archivedPath);
     warnings.push(...references.warnings);
@@ -240,6 +276,7 @@ export async function archiveBacklogItem(backlogRoot, id, options = {}) {
         movedTo: archivedPath,
         indexRegenerated: true,
         rewrittenReferences: references.rewritten,
+        affectedPaths: collectAffectedPaths(backlogRoot, id, references.affectedPaths, { item: true, completed: shouldWriteEntry, index: true }),
         warnings,
     };
 }

package/dist/commands/backlog/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/backlog/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAuB,MAAM,sBAAsB,CAAC;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAG5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,kBAAkB,EAAuB,MAAM,WAAW,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAC3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AA8B5D,UAAU,0BAA0B;IAClC,mBAAmB,EAAE,OAAO,mBAAmB,CAAC;IAChD,kBAAkB,EAAE,OAAO,kBAAkB,CAAC;IAC9C,iBAAiB,EAAE,OAAO,iBAAiB,CAAC;IAC5C,kBAAkB,EAAE,OAAO,kBAAkB,CAAC;IAC9C,iBAAiB,EAAE,OAAO,iBAAiB,CAAC;IAC5C,sBAAsB,EAAE,OAAO,sBAAsB,CAAC;IACtD,iBAAiB,EAAE,OAAO,iBAAiB,CAAC;IAC5C,kBAAkB,EAAE,OAAO,kBAAkB,CAAC;IAC9C,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAChD;AA4ED,wBAAgB,oBAAoB,CAClC,SAAS,GAAE,OAAO,CAAC,0BAA0B,CAAM,GAClD,OAAO,CA6RT"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/backlog/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAuB,MAAM,sBAAsB,CAAC;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAG5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,kBAAkB,EAAuB,MAAM,WAAW,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAC3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AA8B5D,UAAU,0BAA0B;IAClC,mBAAmB,EAAE,OAAO,mBAAmB,CAAC;IAChD,kBAAkB,EAAE,OAAO,kBAAkB,CAAC;IAC9C,iBAAiB,EAAE,OAAO,iBAAiB,CAAC;IAC5C,kBAAkB,EAAE,OAAO,kBAAkB,CAAC;IAC9C,iBAAiB,EAAE,OAAO,iBAAiB,CAAC;IAC5C,sBAAsB,EAAE,OAAO,sBAAsB,CAAC;IACtD,iBAAiB,EAAE,OAAO,iBAAiB,CAAC;IAC5C,kBAAkB,EAAE,OAAO,kBAAkB,CAAC;IAC9C,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAChD;AA4ED,wBAAgB,oBAAoB,CAClC,SAAS,GAAE,OAAO,CAAC,0BAA0B,CAAM,GAClD,OAAO,CAkST"}

package/dist/commands/backlog/index.js

@@ -210,6 +210,9 @@ export function createBacklogCommand(overrides = {}) {
                 for (const path of result.rewrittenReferences) {
                     context.logger.info(`Rewrote references in ${path}`);
                 }
+                for (const path of result.affectedPaths) {
+                    context.logger.info(`Affected path (caller-owned staging): ${path}`);
+                }
             }
             process.exitCode = 0;
         }

package/dist/commands/backlog/rewrite-references.d.ts

@@ -2,6 +2,9 @@
 export interface RewriteInboundReferencesResult {
     /** Files whose content was rewritten, relative to the repository root. */
     rewritten: string[];
+    /** Normalized absolute reference paths associated with this item, including
+     * links already repaired by an interrupted prior archive pass. */
+    affectedPaths: string[];
     /** One warning per reference that names the item but cannot be resolved. */
     warnings: string[];
 }
@@ -13,6 +16,8 @@ export interface RewriteInboundReferencesOptions {
      * because its links were rebased (or written) against `archived/` already.
      */
     rebaseMovedItem?: boolean;
+    /** True only when the archive caller proved an uncommitted old/new move in HEAD. */
+    recoverPendingArchive?: boolean;
 }
 /** A Markdown segment: prose, an inline code span, or a fenced code block. */
 export interface MarkdownSegment {

package/dist/commands/backlog/rewrite-references.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rewrite-references.d.ts","sourceRoot":"","sources":["../../../src/commands/backlog/rewrite-references.ts"],"names":[],"mappings":"AAsCA,kDAAkD;AAClD,MAAM,WAAW,8BAA8B;IAC7C,0EAA0E;IAC1E,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,4EAA4E;IAC5E,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,oDAAoD;AACpD,MAAM,WAAW,+BAA+B;IAC9C;;;;OAIG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AA0RD,8EAA8E;AAC9E,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC;IACjC,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,eAAe,EAAE,CA0EpE;AAmND;;;;;;;;;GASG;AACH,wBAAsB,wBAAwB,CAC5C,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EACpB,OAAO,GAAE,+BAAoC,GAC5C,OAAO,CAAC,8BAA8B,CAAC,CAsCzC"}
+{"version":3,"file":"rewrite-references.d.ts","sourceRoot":"","sources":["../../../src/commands/backlog/rewrite-references.ts"],"names":[],"mappings":"AAsCA,kDAAkD;AAClD,MAAM,WAAW,8BAA8B;IAC7C,0EAA0E;IAC1E,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB;sEACkE;IAClE,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,4EAA4E;IAC5E,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,oDAAoD;AACpD,MAAM,WAAW,+BAA+B;IAC9C;;;;OAIG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,oFAAoF;IACpF,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC;AAqSD,8EAA8E;AAC9E,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC;IACjC,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,eAAe,EAAE,CA0EpE;AAmND;;;;;;;;;GASG;AACH,wBAAsB,wBAAwB,CAC5C,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EACpB,OAAO,GAAE,+BAAoC,GAC5C,OAAO,CAAC,8BAA8B,CAAC,CAsEzC"}