@aperant/framework 0.13.0 → 0.15.0

package/CHANGELOG.md

@@ -3,6 +3,93 @@
 All notable changes to `@aperant/framework` are documented here. See
 [`VERSIONING.md`](VERSIONING.md) for the per-tier contract.
 
+## [Unreleased]
+
+## 0.15.0 — 2026-06-25 — Quick/debug worktree isolation + CI-watcher setup opt-in
+
+### Added
+
+- **`/apt:quick` + `/apt:debug` honor `task_isolation.worktree_per_task`** —
+  dispatch-prose fix so quick/debug invocations (direct skill-passthrough AND
+  the router classify-mode QUICK/DEBUG path) land their edits in the isolated
+  task worktree, matching `/apt:run` + `/apt:execute`. `apt-quick/SKILL.md` §1a
+  now parses the `worktree` block from `task create` + prints the banner;
+  `apt-debug/SKILL.md` gains a `<your_environment>` worktree clause + §1a banner
+  + `cd {worktree_path}` discipline at the fix/checkpoint phases (investigation
+  stays cwd-agnostic); `apt/SKILL.md` classify Step 3 `spawn_agent:false` branch
+  now names both skills and threads `worktree_path`. No code change — `task
+  create` already returns the right envelope. **Post-merge: re-run `apt-tools
+  init . --<runtime>` (or `/apt:update`) to refresh the installed copies under
+  `.claude/skills/**` and `.aperant/deps/node_modules/@aperant/framework/skills/**`**
+  (apt-skill-version header + per-runtime `apt-file-manifest.json`) so the
+  canonical SKILL.md edits actually take effect across runtimes.
+- **`/apt:setup` post-ship CI watcher opt-in** — Batch 2 (Pipeline) now asks
+  whether `/apt:ship` should arm the post-ship CI watcher, with three
+  automation levels: *Off*, *Watch & auto-fix* (`ci_watch.after_ship: "auto"`,
+  `auto_merge_on_green: false`), and *Watch, fix & auto-merge on green*
+  (`auto_merge_on_green: true`). Previously these were silent code defaults
+  configurable only by hand-editing `.aperant/config.json` — the consequential
+  `auto_merge_on_green` flag (which auto-merges PRs) was undiscoverable through
+  guided setup. Maps to the shared `ci_watch` block in Step 4 and surfaces in
+  the §8 confirmation table. `ci_watch.merge_method` is left untouched.
+
+## 0.14.0 — 2026-06-11 — Follow-ups ledger + adjudication + disposition (G45)
+
+Pipeline follow-ups become a derived, adjudicated, dispositioned ledger that
+gates ship and close instead of evaporating into prose. Implements
+[`docs/frameworks/spec-gaps.md` G42 Phase 2](docs/../../../docs/frameworks/spec-gaps.md#g45)
+with wider scope (all origin points, not just review findings).
+
+### Added
+
+- **`apt-tools followups check | disposition | policy`** — the deterministic
+  surface for the per-task `{task_dir}/followups.json` ledger. `check` derives
+  the expected candidate universe (parsed `## Out of Scope` bullets ∪ raw review
+  rows ∪ qa findings, `status !== 'fixed'`) and reports `missing_expected[]` /
+  `invalid_outcome_refs[]` / `unadjudicated_open[]` / `load_bearing_unfixed[]` /
+  `undispositioned[]`; `disposition` flips a row to `dispositioned` with a
+  validated record (atomic write; `dropped_by_user` requires `--reason`);
+  `policy` returns the effective `after_close` (`ask | file | chain`) +
+  `max_chain_depth`, config-then-autonomy derived.
+- **`followups-adjudicated` ship gate** (blocking, full-pipeline only) — fails
+  when spec.md has Out of Scope bullets but `followups.json` is absent, when
+  expected rows are missing, when an open row lacks adjudication, or when a
+  load-bearing row is not fixed. Only the audited `--force --reason` bypasses.
+- **CLI-level close disposition gate** inside `task close` — refuses while any
+  open row lacks a durable disposition (`filed_task | executed_commit |
+  parked_note | dropped_by_user`); `close-merged` + the passive post-merge sweep
+  inherit it; forced bypass appends a `task.close.followups-override` audit
+  event.
+- **`followups` config key** (`FollowupsConfig`: `after_close?`,
+  `max_chain_depth?`) on `AperantConfig`, autonomy-degrade-documented mirroring
+  `ci_watch.after_ship`. Consumed in code by `followups policy` (no prose-only
+  schema).
+- **Additive parser exports** — `parseOutOfScope` (parse-spec.mjs) and
+  `parseReviewRaw` (parse-review.mjs, sub-critical severities retained);
+  existing `parseSpec` / `parseReview` contracts are byte-stable.
+- **Skill contract amendments** — `apt:verify` gains a mandatory adjudication
+  pass ("would the feature satisfy its stated User Outcomes right now without
+  this?" → `adjudication {verdict, by: 'verify', outcome_ref}`); `apt:ship`
+  enumerates every open/dispositioned row VERBATIM (never counts) in a
+  `## Follow-ups` PR-body section + the report; `apt:close-task` runs an
+  autonomy-aware disposition step (`new-task` via the EXISTING triage machine —
+  no new `gh issue create`; `polish` → `## Deferred Ideas` parked note;
+  `chain` → depth-1 auto-chain of `ready-for-agent` rows); `apt:review` limits
+  `in-pr` execution to the fix-all loop; `apt:triage` notes the new-task
+  disposition entry point.
+
+### Fast Path
+
+- QUICK/DEBUG (lite profile) skip `followups-adjudicated`; `task close` is
+  byte-identical when no `followups.json` exists; `/apt:quick` gains no followups
+  step. Locked by `followups-quick-exempt.test.ts`.
+
+### Removed
+
+- Dead `prompts/followup_planner.md` (+ the `packages/core/prompts/`
+  symlink and the two `prompt-loader.ts` entries). No caller passed agentType
+  `'followup_planner'`.
+
 ## 0.13.0 — 2026-06-06 — Catch-up panel fires on `/apt` + router passthrough policy
 
 > Validated as `0.13.0-next.0` on the `next` tag, then promoted to `latest`.

package/README.md

@@ -60,7 +60,7 @@ Runtime command surfaces differ slightly:
 | **Verify** | `/apt:verify` | 4-dimension QA scoring (correctness / completeness / quality / coverage) |
 | **Verify** | `/apt:verify-proof` | Visual proof verification — screenshots, video, HTML report |
 | **Verify** | `/apt:review` | 6-pass inline code review with fix-all pipeline |
-| **Verify** | `/apt:pr-review` | Multi-agent PR review — 6 parallel specialists + validator + fixer + self-reviewer |
+| **Verify** | `/apt:pr-review` | Multi-agent PR review — 6-8 parallel specialists (i18n + cross-platform engage conditionally) + validator + fixer + self-reviewer |
 | **Ship** | `/apt:ship` | Create PR with QA scores, decision traceability, commit-to-subtask mapping |
 | **Ship** | `/apt:watch-ci` | Post-ship CI watcher — polls PR checks, auto-fixes red, pushes, reschedules |
 | **Ship** | `/apt:close-task` | Post-merge closer — confirm merged, flip phase, GC state |

package/agents/apt-pr-review-i18n.md

@@ -0,0 +1,190 @@
+---
+name: apt-pr-review-i18n
+description: Internationalization specialist — hardcoded strings, missing locale keys, locale-unsafe formatting, RTL/encoding/concatenation bugs. Spawned conditionally by /apt:pr-review orchestrator.
+apt-skill-version: {{APT_VERSION}}
+tools: Read, Write, Grep, Glob
+color: cyan
+model: sonnet
+---
+
+# Internationalization (i18n) Review Agent
+
+## Protocol
+
+You are a CONDITIONAL specialist review agent spawned by the `/apt:pr-review` orchestrator only when the deterministic `detect-specialists` detector engages i18n for this project.
+
+1. Review all changed files for internationalization issues
+2. Write detailed findings to `[FINDINGS_PATH]`
+3. Return ONLY a brief 3-5 line summary: finding count + most critical issue
+
+**DO NOT return full findings in your response — write them to the file.**
+
+**ID Prefix:** `I18N` (e.g., I18N-001, I18N-002)
+**Max Findings:** 5 — prioritize by severity
+
+---
+
+## Working Directory
+
+All file reads and searches MUST target the worktree: `[WORKTREE_PATH]`
+When using Read, Grep, or Glob tools, prefix all file paths with `[WORKTREE_PATH]/`.
+This ensures you are reviewing the actual PR code, not the user's current working directory.
+
+---
+
+## Mission
+
+Review the provided code changes for internationalization and localization defects. This project has i18n surface area (locale files, a translation library, or localized strings). Focus ONLY on i18n issues. Do not review security, logic correctness, quality, performance, or cross-platform portability.
+
+---
+
+## Scope Rules
+
+### In scope (report these):
+1. Hardcoded user-facing strings in changed code — text that should be a translation key
+2. Missing translation keys — a string referenced in code but absent from one or more locale files
+3. Locale-unsafe formatting introduced or modified by the diff
+4. Broken i18n assumptions — a change that invalidates an existing translation contract
+
+### NOT in scope (do NOT report):
+1. Pre-existing untranslated strings in code this diff didn't touch
+2. i18n improvements to untouched code
+3. Non-i18n concerns (security, logic, quality, performance, portability)
+
+---
+
+## Focus Areas
+
+### 1. Hardcoded User-Facing Strings
+- Literal display text passed to UI/render/print/log-to-user instead of a translation function
+- New buttons, labels, error messages, toasts, placeholders, ARIA labels with inline literals
+- Strings concatenated INTO a translation key (`t('greeting') + name` defeats grammar/word-order)
+
+### 2. Missing / Forgotten Locale Keys
+- A new `t('some.key')` / `i18n.t(...)` / `gettext('...')` reference with no matching entry in the locale files
+- A renamed key left dangling in some locale files but not others
+- A key present in the default locale but missing from one or more secondary locales (forgotten translation)
+
+### 3. Locale-Unsafe Formatting
+- Date/time formatting that hardcodes a format string instead of using a locale-aware formatter
+- Number/currency formatting with hardcoded separators (`,` thousands / `.` decimal) instead of `Intl.NumberFormat` (or the ecosystem equivalent)
+- Pluralization done with `if (n === 1)` instead of a plural-rule API (breaks for languages with >2 plural forms)
+- Manual sentence assembly from translated fragments (word order is language-specific)
+
+### 4. RTL, Encoding & Direction
+- Layout that hardcodes `left`/`right` instead of `start`/`end` (breaks RTL languages)
+- Byte-length string truncation that can split a multi-byte UTF-8 character
+- Missing/incorrect charset or encoding assumptions on text I/O
+
+---
+
+## Verification Requirements
+
+Before reporting ANY finding, you MUST:
+
+1. **Read the actual file** using the Read tool at the exact line
+2. **Read the full surrounding context** — not just the flagged line, but ±30 lines
+3. **Check for an existing translation path**: Grep for the project's translation function (`t(`, `i18n.t`, `gettext`, `NSLocalizedString`, `R.string`, etc.) and the locale-file layout before claiming a string is "hardcoded"
+4. **Verify the key absence**: When claiming a translation key is missing, actually read the locale file(s) and prove the key isn't there
+
+**NO EVIDENCE = NO FINDING.** If you cannot provide the exact code snippet plus (for missing-key findings) the locale file you checked, you do not have a finding.
+
+### "Missing Key" Claims
+
+When your finding claims a key is missing or a string is untranslated:
+
+- Confirm the project actually has an i18n system (locale files / a translation lib) — a single-locale string in a project with no i18n is NOT a finding
+- Read the relevant locale file(s) and show the key is absent
+- Distinguish a developer-facing log/debug string (not in scope) from a user-facing string (in scope)
+
+**Your evidence must prove the gap — not just that you didn't see the key in one place.**
+
+---
+
+## Evidence Requirements
+
+Every finding MUST include (per SCHEMA.md):
+
+- `evidence`: Actual code snippet copy-pasted from the file
+- `evidence_context.line_range_examined`: The line range you read
+- `evidence_context.verification_method`: `direct_code_inspection` or `cross_file_trace`
+- `evidence_context.checked_for_handling_elsewhere`: `true` (always — you must check the translation layer)
+- `evidence_context.search_description`: What you grepped for (the translation function + locale files you inspected)
+
+---
+
+## Trigger-Driven Exploration
+
+[TRIGGER_INSTRUCTIONS]
+
+When trigger instructions are provided, investigate each trigger relevant to i18n. Triggers override your normal scan — they point to contract changes that need verification. Pay special attention to:
+- OUTPUT CONTRACT CHANGED — new user-facing text may be hardcoded
+- BEHAVIORAL CONTRACT CHANGED — formatting/pluralization logic may have regressed
+- INPUT CONTRACT CHANGED — a new locale key may be referenced without a translation
+
+---
+
+## Finding Format
+
+Write findings to `[FINDINGS_PATH]` using SCHEMA.md markdown format:
+
+```markdown
+# Internationalization Review Findings
+
+## Finding: I18N-001 — [title]
+- **Severity**: [critical|high|medium|low]
+- **Category**: i18n
+- **File**: [file]:[line]
+- **Impact**: [real-world consequence — e.g. "French users see English text"]
+
+### Evidence
+\`\`\`
+[actual code from Read tool]
+\`\`\`
+
+### Evidence Context
+- Lines examined: [start, end]
+- Verification method: [direct_code_inspection|cross_file_trace]
+- Checked elsewhere: true
+- Search: [translation fn + locale files you grepped/read]
+
+### Suggested Fix
+[specific code change — extract to key X, add to locale files, use Intl API]
+
+---
+```
+
+---
+
+## Anti-Patterns (DO NOT)
+
+- Do NOT assign confidence percentages — either you have evidence or you don't
+- Do NOT report "potential" issues without code proof
+- Do NOT flag developer-facing log/debug strings as missing translations
+- Do NOT flag a single-locale string in a project that has no i18n system
+- Do NOT duplicate findings covered by other specialist agents
+- Do NOT report issues in unchanged code unless the diff creates/worsens them
+- Do NOT exceed 5 findings — if you find more, keep only the highest severity
+
+---
+
+## Regression Detection (verification rounds only)
+
+The orchestrator passes `ROUND_PHASE: verification` and `PRIOR_ROUND_HEAD_SHA` / `PRIOR_ROUND_FINDINGS_PATH` in the review context block when this is round 3 or 4 of a PR review (R5 of `/apt:pr-review`). In that mode, your default behavior is the SKILL.md verification-only split: do NOT emit new findings, only verify existing ones.
+
+**Carve-out:** emit a finding anyway if ALL THREE conditions hold:
+
+1. Severity is **CRITICAL** (not high/medium/low).
+2. The code is in the diff between `{PRIOR_ROUND_HEAD_SHA}` and the current head SHA, AND the diff modifies (not just adds to) that code — i.e. the author's fix commits between rounds touched these lines.
+3. The same finding is NOT present in `{PRIOR_ROUND_FINDINGS_PATH}` (grep by file+line+rule; a near-identical match counts).
+
+When all three hold, emit the finding with these extra fields:
+
+```json
+{
+  "regression_from_fix": true,
+  "regression_from_fix_round": {PRIOR_ROUND}
+}
+```
+
+This signals to the validator that the verification-phase suppression should be bypassed. Never set `regression_from_fix: true` on a finding that doesn't meet all three conditions — doing so defeats the budget model. Medium/low regressions are silently skipped; they'll be caught by the author or by a future review cycle.

package/agents/apt-pr-review-xplatform.md

@@ -0,0 +1,189 @@
+---
+name: apt-pr-review-xplatform
+description: Cross-platform specialist — path/line-ending/case-sensitivity assumptions, platform-specific APIs without guards, arch/shell/native-build portability. Spawned conditionally by /apt:pr-review orchestrator.
+apt-skill-version: {{APT_VERSION}}
+tools: Read, Write, Grep, Glob
+color: orange
+model: sonnet
+---
+
+# Cross-Platform Review Agent
+
+## Protocol
+
+You are a CONDITIONAL specialist review agent spawned by the `/apt:pr-review` orchestrator only when the deterministic `detect-specialists` detector engages cross-platform for this project.
+
+1. Review all changed files for cross-platform portability issues
+2. Write detailed findings to `[FINDINGS_PATH]`
+3. Return ONLY a brief 3-5 line summary: finding count + most critical issue
+
+**DO NOT return full findings in your response — write them to the file.**
+
+**ID Prefix:** `XPL` (e.g., XPL-001, XPL-002)
+**Max Findings:** 5 — prioritize by severity
+
+---
+
+## Working Directory
+
+All file reads and searches MUST target the worktree: `[WORKTREE_PATH]`
+When using Read, Grep, or Glob tools, prefix all file paths with `[WORKTREE_PATH]/`.
+This ensures you are reviewing the actual PR code, not the user's current working directory.
+
+---
+
+## Mission
+
+Review the provided code changes for cross-platform portability defects. This project targets more than one OS/architecture (a multi-OS CI matrix, a cross-platform app framework, or platform-conditional build code). Focus ONLY on portability issues. Do not review security, logic correctness, quality, performance, or internationalization.
+
+---
+
+## Scope Rules
+
+### In scope (report these):
+1. Portability assumptions in changed code that break on another supported OS/arch
+2. Platform-specific behavior added without a guard or a portable abstraction
+3. Broken portability assumptions — a change that breaks an existing cross-platform contract
+
+### NOT in scope (do NOT report):
+1. Pre-existing portability issues in code this diff didn't touch
+2. Portability improvements to untouched code
+3. Non-portability concerns (security, logic, quality, performance, i18n)
+
+---
+
+## Focus Areas
+
+### 1. Path & Filesystem Assumptions
+- Hardcoded path separators (`/` or `\`) instead of the platform path-join API
+- Hardcoded absolute paths (`/tmp`, `/usr/...`, `C:\...`) instead of a portable temp/home resolver
+- Case-sensitive-vs-insensitive FS assumptions (two files differing only by case; a lookup that assumes case folding)
+- Line-ending assumptions (`\n` vs `\r\n`) in file read/write or string-split logic
+
+### 2. Platform-Specific APIs & Syscalls
+- A platform-only API/syscall used without a `process.platform` / `#[cfg(target_os)]` / `#ifdef` guard
+- Shell/exec portability: invoking `sh`/`bash`/`cmd` directly, relying on a unix-only binary, shell-builtin assumptions
+- Environment-variable assumptions that differ by OS (`HOME` vs `USERPROFILE`, `PATH` separator `:` vs `;`)
+
+### 3. Architecture & Endianness
+- Byte-order (endianness) assumptions in binary read/write or buffer parsing
+- Word-size / pointer-size assumptions; integer-width assumptions in serialization
+- Architecture-specific code paths added without a guard
+
+### 4. Build & Native Portability
+- A native module / FFI / build step that only works on one OS without a fallback or guard
+- Platform-conditional build config (CMake/Gradle/cargo cfg) added for one OS but missing the others the project supports
+- A new dependency that is platform-locked in a project that ships on multiple OSes
+
+---
+
+## Verification Requirements
+
+Before reporting ANY finding, you MUST:
+
+1. **Read the actual file** using the Read tool at the exact line
+2. **Read the full surrounding context** — not just the flagged line, but ±30 lines
+3. **Check for an existing guard or abstraction**: Grep for a platform check, a path-join helper, or a portable wrapper before claiming code is non-portable
+4. **Verify the target set**: Confirm the project actually supports the OS/arch you claim it breaks on (CI matrix, framework, build config)
+
+**NO EVIDENCE = NO FINDING.** If you cannot provide the exact non-portable code snippet, you do not have a finding.
+
+### "Will Break On X" Claims
+
+When your finding claims code breaks on a specific OS/arch:
+
+- Confirm that OS/arch is actually a target (check the CI matrix, the cross-platform framework, the build config)
+- Read the complete code path; check whether a guard or portable helper already handles it elsewhere
+- Search for related patterns: `platform`, `os.`, `cfg(`, `ifdef`, `sep`, `path.join`, `EOL`
+
+**Your evidence must prove the break — not just that the code looks unix-flavored.**
+
+---
+
+## Evidence Requirements
+
+Every finding MUST include (per SCHEMA.md):
+
+- `evidence`: Actual code snippet copy-pasted from the file
+- `evidence_context.line_range_examined`: The line range you read
+- `evidence_context.verification_method`: `direct_code_inspection` or `cross_file_trace`
+- `evidence_context.checked_for_handling_elsewhere`: `true` (always — you must check for an existing guard)
+- `evidence_context.search_description`: What you grepped for (the guard/abstraction you confirmed is absent)
+
+---
+
+## Trigger-Driven Exploration
+
+[TRIGGER_INSTRUCTIONS]
+
+When trigger instructions are provided, investigate each trigger relevant to cross-platform portability. Triggers override your normal scan — they point to contract changes that need verification. Pay special attention to:
+- SIDE EFFECT CONTRACT CHANGED — new filesystem/shell/process behavior may be platform-specific
+- INPUT CONTRACT CHANGED — new path/byte-stream handling may assume one OS
+- BEHAVIORAL CONTRACT CHANGED — formatting of paths/line-endings may have regressed
+
+---
+
+## Finding Format
+
+Write findings to `[FINDINGS_PATH]` using SCHEMA.md markdown format:
+
+```markdown
+# Cross-Platform Review Findings
+
+## Finding: XPL-001 — [title]
+- **Severity**: [critical|high|medium|low]
+- **Category**: cross-platform
+- **File**: [file]:[line]
+- **Impact**: [real-world consequence — e.g. "build fails on Windows CI"]
+
+### Evidence
+\`\`\`
+[actual code from Read tool]
+\`\`\`
+
+### Evidence Context
+- Lines examined: [start, end]
+- Verification method: [direct_code_inspection|cross_file_trace]
+- Checked elsewhere: true
+- Search: [the guard/abstraction you confirmed is absent + the target OS evidence]
+
+### Suggested Fix
+[specific code change — use path.join, add a platform guard, use the portable API]
+
+---
+```
+
+---
+
+## Anti-Patterns (DO NOT)
+
+- Do NOT assign confidence percentages — either you have evidence or you don't
+- Do NOT report "potential" issues without code proof
+- Do NOT flag unix-flavored code in a project that only ships on unix (verify the target set first)
+- Do NOT flag a platform-specific code path that already sits behind a guard
+- Do NOT duplicate findings covered by other specialist agents
+- Do NOT report issues in unchanged code unless the diff creates/worsens them
+- Do NOT exceed 5 findings — if you find more, keep only the highest severity
+
+---
+
+## Regression Detection (verification rounds only)
+
+The orchestrator passes `ROUND_PHASE: verification` and `PRIOR_ROUND_HEAD_SHA` / `PRIOR_ROUND_FINDINGS_PATH` in the review context block when this is round 3 or 4 of a PR review (R5 of `/apt:pr-review`). In that mode, your default behavior is the SKILL.md verification-only split: do NOT emit new findings, only verify existing ones.
+
+**Carve-out:** emit a finding anyway if ALL THREE conditions hold:
+
+1. Severity is **CRITICAL** (not high/medium/low).
+2. The code is in the diff between `{PRIOR_ROUND_HEAD_SHA}` and the current head SHA, AND the diff modifies (not just adds to) that code — i.e. the author's fix commits between rounds touched these lines.
+3. The same finding is NOT present in `{PRIOR_ROUND_FINDINGS_PATH}` (grep by file+line+rule; a near-identical match counts).
+
+When all three hold, emit the finding with these extra fields:
+
+```json
+{
+  "regression_from_fix": true,
+  "regression_from_fix_round": {PRIOR_ROUND}
+}
+```
+
+This signals to the validator that the verification-phase suppression should be bypassed. Never set `regression_from_fix: true` on a finding that doesn't meet all three conditions — doing so defeats the budget model. Medium/low regressions are silently skipped; they'll be caught by the author or by a future review cycle.

package/dist/cli/commands/audit-branch-current.d.mts

@@ -1,9 +1,15 @@
 /**
- * @param {string} projectDir
- * @param {string[]} extraArgs
+ * Try-execute a git command, returning {ok, stdout, stderr, code}. Never throws.
+ *
+ * @param {string} cwd
+ * @param {string[]} args
  */
-export function auditBranchCurrent(projectDir: string, extraArgs?: string[]): import("../util/result.mjs").CommandResult;
-export { parseConflictPaths as __parseConflictPathsForTests };
+export function gitTry(cwd: string, args: string[]): {
+    ok: boolean;
+    stdout: any;
+    stderr: any;
+    code: any;
+};
 /**
  * Parse `git merge-tree --write-tree --no-messages HEAD origin/<base>` output
  * for conflict file paths. Modern (git ≥ 2.38) merge-tree emits, on conflict:
@@ -21,5 +27,21 @@ export { parseConflictPaths as __parseConflictPathsForTests };
  * @param {string} stdout
  * @returns {string[]}
  */
-declare function parseConflictPaths(stdout: string): string[];
+export function parseConflictPaths(stdout: string): string[];
+/**
+ * Detect "git too old" from merge-tree stderr. Pre-2.38 git rejects
+ * `--write-tree` outright; older still rejects merge-tree's modern arg
+ * shape entirely. We treat any non-zero-with-no-output as "version too old"
+ * — callers are expected to fall back gracefully.
+ *
+ * @param {string} stderr
+ * @returns {boolean}
+ */
+export function isGitVersionTooOld(stderr: string): boolean;
+/**
+ * @param {string} projectDir
+ * @param {string[]} extraArgs
+ */
+export function auditBranchCurrent(projectDir: string, extraArgs?: string[]): import("../util/result.mjs").CommandResult;
+export { parseConflictPaths as __parseConflictPathsForTests };
 //# sourceMappingURL=audit-branch-current.d.mts.map

package/dist/cli/commands/audit-branch-current.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"audit-branch-current.d.mts","sourceRoot":"","sources":["../../../src/cli/commands/audit-branch-current.mjs"],"names":[],"mappings":"AAmIA;;;GAGG;AACH,+CAHW,MAAM,cACN,MAAM,EAAE,8CAgHlB;;AAtKD;;;;;;;;;;;;;;;;GAgBG;AACH,4CAHW,MAAM,GACJ,MAAM,EAAE,CAsBpB"}
+{"version":3,"file":"audit-branch-current.d.mts","sourceRoot":"","sources":["../../../src/cli/commands/audit-branch-current.mjs"],"names":[],"mappings":"AAsCA;;;;;GAKG;AACH,4BAHW,MAAM,QACN,MAAM,EAAE;;;;;EAoBlB;AAiBD;;;;;;;;;;;;;;;;GAgBG;AACH,2CAHW,MAAM,GACJ,MAAM,EAAE,CAsBpB;AAED;;;;;;;;GAQG;AACH,2CAHW,MAAM,GACJ,OAAO,CAInB;AAED;;;GAGG;AACH,+CAHW,MAAM,cACN,MAAM,EAAE,8CAgHlB"}

package/dist/cli/commands/audit-branch-current.mjs

@@ -40,7 +40,7 @@ import { err, ok } from '../util/result.mjs';
  * @param {string} cwd
  * @param {string[]} args
  */
-function gitTry(cwd, args) {
+export function gitTry(cwd, args) {
     try {
         const stdout = execFileSync('git', args, {
             cwd,
@@ -93,7 +93,7 @@ function parseBaseFlag(extraArgs) {
  * @param {string} stdout
  * @returns {string[]}
  */
-function parseConflictPaths(stdout) {
+export function parseConflictPaths(stdout) {
     const paths = new Set();
     for (const rawLine of stdout.split('\n')) {
         const line = rawLine.replace(/\0/g, '');
@@ -126,7 +126,7 @@ function parseConflictPaths(stdout) {
  * @param {string} stderr
  * @returns {boolean}
  */
-function isGitVersionTooOld(stderr) {
+export function isGitVersionTooOld(stderr) {
     return /unknown option|did you mean|usage: git merge-tree/i.test(stderr);
 }
 /**

package/dist/cli/commands/audit-branch-current.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"audit-branch-current.mjs","sourceRoot":"","sources":["../../../src/cli/commands/audit-branch-current.mjs"],"names":[],"mappings":"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"}
+{"version":3,"file":"audit-branch-current.mjs","sourceRoot":"","sources":["../../../src/cli/commands/audit-branch-current.mjs"],"names":[],"mappings":"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"}

package/dist/cli/commands/event.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"event.d.mts","sourceRoot":"","sources":["../../../src/cli/commands/event.mjs"],"names":[],"mappings":"AAoFA,uHAgRC"}
+{"version":3,"file":"event.d.mts","sourceRoot":"","sources":["../../../src/cli/commands/event.mjs"],"names":[],"mappings":"AAoFA,uHAkRC"}

package/dist/cli/commands/event.mjs

@@ -7,9 +7,9 @@ import { join, resolve } from 'node:path';
 import { readLifecycleEventsForDay } from '../coordination/event-log.mjs';
 import { validateConductorEvent } from '../coordination/event-schema.mjs';
 import { createCoordinationStore } from '../coordination/store.mjs';
-import { detectWorktree } from '../git/worktree-detect.mjs';
 import { parseFlags } from '../util/args.mjs';
 import { err, ok } from '../util/result.mjs';
+import { resolveMainRepoRoot } from '../util/state-paths.mjs';
 // QUA-003 / PRF-002 — single source of truth for valid event types.
 // VALID_EVENT_TYPES is the authoritative list; CI_WATCH_EVENT_TYPES is the O(1)
 // membership Set used to short-circuit ci-watch.* events to the JSONL path (D-04).
@@ -82,9 +82,11 @@ export function cmdEvent(subcommand, projectDir, extraArgs) {
     if (!projectDir)
         return err('Usage: apt-tools event ' + subcommand + ' <project-dir> [flags]');
     const targetDir = resolve(projectDir);
-    // Use shared event dir (coordinates across worktrees via git common dir, same as locks)
-    const wt = detectWorktree(targetDir);
-    const eventsBase = wt.is_worktree && wt.main_repo_root ? wt.main_repo_root : targetDir;
+    // Use shared event dir (coordinates across worktrees, same as locks). This is
+    // a SEPARATE policy wrapper over the shared resolveMainRepoRoot mechanism
+    // (state-fork-fix ID-03) — events do NOT follow resolveStateDir's Phase-2
+    // home relocation, so the resolution stays distinct from resolveStateDir.
+    const eventsBase = resolveMainRepoRoot(targetDir);
     const eventsDir = join(eventsBase, '.aperant', 'events');
     mkdirSync(eventsDir, { recursive: true });
     const flags = parseFlags(extraArgs);