@tokenfactory/acc-runner 0.14.0 → 0.16.0

package/README.md

@@ -238,6 +238,35 @@ remain uncovered by its budget/backoff. The client is the sanctioned path
 for any future **direct** REST call (`fetch` against `api.github.com`) the
 runner adds.
 
+## Conflict-resolution integrity guardrail (v0.57, T-57-2)
+
+When a Claude/worktree task whose job is to **resolve a merge conflict**
+finishes, the runner does not trust the agent's self-reported gate results.
+Before the resolution is pushed, `src/runtime/resolution-integrity.ts`
+re-verifies it from the runner's own vantage point. The invariant —
+**a conflict resolution is shippable only if all three hold**:
+
+1. **Zero conflict markers** remain in any tracked file
+   (`<<<<<<<` / `=======` / `>>>>>>>`).
+2. **`pnpm typecheck` passes** (or the task's `typecheck_cmd`).
+3. **No version regression**: if a `package.json` `"version"` changed in the
+   resolution it must move **forward** (semver-greater than the base ref,
+   never backward) **and** `CHANGELOG.md` must carry a matching entry for the
+   new version.
+
+On ANY failure the resolution is **rejected**: the runner does not push and
+does not mark the task resolved. The task transitions to `failed` (so it is
+reworked, not merged broken), an `append_task_event` of kind
+`resolution_integrity_failed` records the offending assertion(s), and a
+`conflict.integrity_rejected` activity event surfaces it to the operator. A
+guardrail that itself errors **fails closed** (rejects). The check is a no-op
+for every non-conflict task — it is gated by `isConflictResolutionTask`.
+
+This exists because v0.55–v0.56 agent resolutions repeatedly shipped broken
+merges that were still marked "resolved": stale-variable splices
+(task-runner.ts), duplicate declarations (health.ts), and a silently dropped
+version bump (#496 reverted `package.json` 0.14.0 → 0.13.0).
+
 ## Security notes
 
 - The CLI never reads or writes your git, gh, or Anthropic credentials.

package/dist/failure-classifier.d.ts

@@ -1,20 +1,32 @@
 /**
- * v0.48: classify a non-zero claude CLI exit into one of four categories
+ * v0.48: classify a non-zero claude CLI exit into one of five categories
  * so the watch loop can distinguish machine-level failures (which should
  * quarantine the runner) from genuine task errors (which count toward the
- * task's retry budget).
+ * task's retry budget) and from a spent capacity window (which should
+ * PAUSE, not quarantine).
  *
- * The four classes:
- *   usage_limit  — Claude/Anthropic plan limit or rate limit reached.
+ * The five classes:
+ *   capacity_exhausted — Claude/Anthropic session or usage limit reached
+ *                  (api_error_status 429 + a "resets <time>" message).
+ *                  A NEW v0.56 (T-56-1) retryable-infra class: capacity is
+ *                  a resource, not a failure. NEVER task_error and NEVER
+ *                  quarantine — the runner pauses claiming until the stated
+ *                  reset time (or a default backoff) then resumes with a
+ *                  single probe. Root cause of the 2026-06-05 brownout.
+ *   usage_limit  — A hard Claude/Anthropic plan limit that will NOT reset
+ *                  on its own soon (out of credits, monthly spend cap,
+ *                  quota exhausted). Quarantine is still the right response
+ *                  — an operator has to top up or wait out the billing cycle.
  *   auth_expired — API key invalid or session expired on the user's machine.
  *   env_broken   — Host-side environment failure (dyld, missing binary, OOM).
  *                  Root cause of the pd36 claim-and-fail storm (INCIDENT_2026-06-02).
  *   task_error   — Everything else; genuine task-level failure.
  *
- * Only task_error counts toward a task's retry budget. The other three
- * trigger runner quarantine in watch.ts.
+ * Only task_error counts toward a task's retry budget. usage_limit /
+ * auth_expired / env_broken trigger runner quarantine in watch.ts;
+ * capacity_exhausted triggers the pause/resume path instead.
  */
-export type ClaudeExitClass = "usage_limit" | "auth_expired" | "env_broken" | "task_error";
+export type ClaudeExitClass = "capacity_exhausted" | "usage_limit" | "auth_expired" | "env_broken" | "task_error";
 export interface ClassifiedExit {
     exitCode: number | null;
     class: ClaudeExitClass;
@@ -33,6 +45,32 @@ export interface ClassifiedExit {
      */
     heuristic?: boolean;
 }
+/**
+ * v0.56 (T-56-1): pull `api_error_status` out of claude's
+ * `--output-format=json` envelope. On a session/usage limit the CLI exits
+ * 1 with a JSON object carrying `{ "is_error": true, "api_error_status":
+ * 429, "result": "You've hit your session limit - resets 3:20pm
+ * (Asia/Calcutta)" }`. Returns the numeric status when present, else null.
+ * Kept self-contained (a local parse, no cost-pricing import) so the
+ * classifier stays a pure (strings) → class function for unit tests.
+ */
+export declare function parseApiErrorStatus(stdout: string): number | null;
+/**
+ * v0.56 (T-56-1): parse the reset time Claude states when it pauses a
+ * session ("...resets 3:20pm (Asia/Calcutta)") into an absolute epoch
+ * (ms). The runner schedules its capacity resume off this so it wakes
+ * exactly when the window reopens rather than guessing a fixed backoff.
+ *
+ *   - 12h ("3:20pm") and 24h ("15:20") clock forms are both accepted.
+ *   - A parenthetical IANA zone ("(Asia/Calcutta)") is honoured; without
+ *     one the time is read in the runner's local zone.
+ *   - The soonest FUTURE occurrence wins: a stated time already past today
+ *     rolls to tomorrow.
+ *
+ * Returns null when no reset time is present or the zone is unparseable —
+ * the caller then falls back to a default backoff.
+ */
+export declare function extractResetTime(text: string, now?: number): number | null;
 /**
  * Classify a non-zero claude exit.
  *

package/dist/failure-classifier.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"failure-classifier.d.ts","sourceRoot":"","sources":["../src/failure-classifier.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,MAAM,MAAM,eAAe,GACvB,aAAa,GACb,cAAc,GACd,YAAY,GACZ,YAAY,CAAC;AAEjB,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,KAAK,EAAE,eAAe,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf;;;;;;;;;;;OAWG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AA0DD;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,MAAM,GAAG,IAAI,EACvB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CA8DhB"}
+{"version":3,"file":"failure-classifier.d.ts","sourceRoot":"","sources":["../src/failure-classifier.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AAEH,MAAM,MAAM,eAAe,GACvB,oBAAoB,GACpB,aAAa,GACb,cAAc,GACd,YAAY,GACZ,YAAY,CAAC;AAEjB,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,KAAK,EAAE,eAAe,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf;;;;;;;;;;;OAWG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AA0ED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAYjE;AA2DD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,GAAE,MAAmB,GAAG,MAAM,GAAG,IAAI,CAiCtF;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,MAAM,GAAG,IAAI,EACvB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CA2EhB"}

package/dist/failure-classifier.js

@@ -1,19 +1,46 @@
 /**
- * v0.48: classify a non-zero claude CLI exit into one of four categories
+ * v0.48: classify a non-zero claude CLI exit into one of five categories
  * so the watch loop can distinguish machine-level failures (which should
  * quarantine the runner) from genuine task errors (which count toward the
- * task's retry budget).
+ * task's retry budget) and from a spent capacity window (which should
+ * PAUSE, not quarantine).
  *
- * The four classes:
- *   usage_limit  — Claude/Anthropic plan limit or rate limit reached.
+ * The five classes:
+ *   capacity_exhausted — Claude/Anthropic session or usage limit reached
+ *                  (api_error_status 429 + a "resets <time>" message).
+ *                  A NEW v0.56 (T-56-1) retryable-infra class: capacity is
+ *                  a resource, not a failure. NEVER task_error and NEVER
+ *                  quarantine — the runner pauses claiming until the stated
+ *                  reset time (or a default backoff) then resumes with a
+ *                  single probe. Root cause of the 2026-06-05 brownout.
+ *   usage_limit  — A hard Claude/Anthropic plan limit that will NOT reset
+ *                  on its own soon (out of credits, monthly spend cap,
+ *                  quota exhausted). Quarantine is still the right response
+ *                  — an operator has to top up or wait out the billing cycle.
  *   auth_expired — API key invalid or session expired on the user's machine.
  *   env_broken   — Host-side environment failure (dyld, missing binary, OOM).
  *                  Root cause of the pd36 claim-and-fail storm (INCIDENT_2026-06-02).
  *   task_error   — Everything else; genuine task-level failure.
  *
- * Only task_error counts toward a task's retry budget. The other three
- * trigger runner quarantine in watch.ts.
+ * Only task_error counts toward a task's retry budget. usage_limit /
+ * auth_expired / env_broken trigger runner quarantine in watch.ts;
+ * capacity_exhausted triggers the pause/resume path instead.
  */
+// v0.56 (T-56-1): signatures of a SPENT-BUT-RECOVERABLE capacity window —
+// the session/usage limit Claude resets on a clock (vs. usage_limit below,
+// which is a hard billing wall). These must stay disjoint from the
+// usage_limit patterns so the live 2026-06-05 signature
+// ("You've hit your session limit - resets 3:20pm (Asia/Calcutta)")
+// routes to pause, while "out of credits" / "monthly spend limit" still
+// route to quarantine. The authoritative signal is api_error_status 429 in
+// the result JSON; these message patterns are the fallback when the runner
+// only has plain text (older claude, or the JSON envelope was not emitted).
+const CAPACITY_PATTERNS = [
+    /hit your (?:session|usage|account) limit/i,
+    /session limit/i,
+    /(?:session|usage|account|limit).*resets?\b/i,
+    /resets?\s+(?:at\s+)?\d{1,2}(?::\d{2})?\s*(?:am|pm)/i,
+];
 const USAGE_LIMIT_PATTERNS = [
     /usage limit/i,
     /you have reached the maximum number of tokens/i,
@@ -65,6 +92,129 @@ const FAST_EXIT_MAX_OUTPUT_BYTES = 100;
 function matchesAny(text, patterns) {
     return patterns.some((p) => p.test(text));
 }
+/**
+ * v0.56 (T-56-1): pull `api_error_status` out of claude's
+ * `--output-format=json` envelope. On a session/usage limit the CLI exits
+ * 1 with a JSON object carrying `{ "is_error": true, "api_error_status":
+ * 429, "result": "You've hit your session limit - resets 3:20pm
+ * (Asia/Calcutta)" }`. Returns the numeric status when present, else null.
+ * Kept self-contained (a local parse, no cost-pricing import) so the
+ * classifier stays a pure (strings) → class function for unit tests.
+ */
+export function parseApiErrorStatus(stdout) {
+    const trimmed = stdout.trim();
+    if (!trimmed.startsWith("{"))
+        return null;
+    try {
+        const parsed = JSON.parse(trimmed);
+        const status = parsed?.api_error_status;
+        if (typeof status === "number")
+            return status;
+        if (typeof status === "string" && /^\d+$/.test(status))
+            return Number(status);
+        return null;
+    }
+    catch {
+        return null;
+    }
+}
+const RESET_TIME_RE = /resets?\s+(?:at\s+|by\s+)?(\d{1,2})(?::(\d{2}))?\s*(am|pm)?\s*(?:\(([^)]+)\))?/i;
+function tzDateParts(instant, tz) {
+    const dtf = new Intl.DateTimeFormat("en-US", {
+        timeZone: tz,
+        year: "numeric",
+        month: "2-digit",
+        day: "2-digit",
+        hour: "2-digit",
+        minute: "2-digit",
+        second: "2-digit",
+        hour12: false,
+    });
+    const map = {};
+    for (const p of dtf.formatToParts(instant)) {
+        if (p.type !== "literal")
+            map[p.type] = p.value;
+    }
+    // Intl can emit "24" for midnight in hour12:false mode; normalise to 0.
+    const hour = Number(map.hour) === 24 ? 0 : Number(map.hour);
+    return {
+        year: Number(map.year),
+        month: Number(map.month),
+        day: Number(map.day),
+        hour,
+        minute: Number(map.minute),
+        second: Number(map.second),
+    };
+}
+/** Offset (ms) of `tz` relative to UTC at the given instant (east = positive). */
+function zoneOffsetMs(instant, tz) {
+    const p = tzDateParts(instant, tz);
+    const asUtc = Date.UTC(p.year, p.month - 1, p.day, p.hour, p.minute, p.second);
+    return asUtc - instant;
+}
+/** Resolve a wall-clock Y-M-D H:M in `tz` to a UTC epoch (one DST refinement). */
+function wallClockToUtc(year, month, day, hour, minute, tz) {
+    const guess = Date.UTC(year, month - 1, day, hour, minute, 0);
+    let instant = guess - zoneOffsetMs(guess, tz);
+    const off2 = zoneOffsetMs(instant, tz);
+    const refined = guess - off2;
+    if (refined !== instant)
+        instant = refined;
+    return instant;
+}
+/**
+ * v0.56 (T-56-1): parse the reset time Claude states when it pauses a
+ * session ("...resets 3:20pm (Asia/Calcutta)") into an absolute epoch
+ * (ms). The runner schedules its capacity resume off this so it wakes
+ * exactly when the window reopens rather than guessing a fixed backoff.
+ *
+ *   - 12h ("3:20pm") and 24h ("15:20") clock forms are both accepted.
+ *   - A parenthetical IANA zone ("(Asia/Calcutta)") is honoured; without
+ *     one the time is read in the runner's local zone.
+ *   - The soonest FUTURE occurrence wins: a stated time already past today
+ *     rolls to tomorrow.
+ *
+ * Returns null when no reset time is present or the zone is unparseable —
+ * the caller then falls back to a default backoff.
+ */
+export function extractResetTime(text, now = Date.now()) {
+    if (!text)
+        return null;
+    const m = RESET_TIME_RE.exec(text);
+    if (!m)
+        return null;
+    let hour = Number(m[1]);
+    const minute = m[2] ? Number(m[2]) : 0;
+    const ampm = m[3]?.toLowerCase();
+    const tz = m[4]?.trim();
+    if (Number.isNaN(hour) || hour > 23 || minute > 59)
+        return null;
+    if (ampm === "pm" && hour < 12)
+        hour += 12;
+    if (ampm === "am" && hour === 12)
+        hour = 0;
+    try {
+        if (tz) {
+            const today = tzDateParts(now, tz);
+            let instant = wallClockToUtc(today.year, today.month, today.day, hour, minute, tz);
+            if (instant <= now) {
+                const tomorrow = tzDateParts(now + 24 * 3_600_000, tz);
+                instant = wallClockToUtc(tomorrow.year, tomorrow.month, tomorrow.day, hour, minute, tz);
+            }
+            return instant;
+        }
+        const local = new Date(now);
+        local.setHours(hour, minute, 0, 0);
+        let instant = local.getTime();
+        if (instant <= now)
+            instant += 24 * 3_600_000;
+        return instant;
+    }
+    catch {
+        // Unknown/garbled IANA zone — let the caller apply its default backoff.
+        return null;
+    }
+}
 /**
  * Classify a non-zero claude exit.
  *
@@ -84,6 +234,18 @@ export function classifyClaudeExit(exitCode, stderr, stdout, durationMs) {
         };
     }
     const combined = `${stderr}\n${stdout}`;
+    // v0.56 (T-56-1): capacity check FIRST so the recoverable session/usage
+    // window routes to pause, not quarantine. Authoritative signal is the
+    // result JSON's api_error_status 429; the message patterns are the
+    // plain-text fallback. Disjoint from USAGE_LIMIT_PATTERNS below, which
+    // stay quarantine-worthy (hard billing walls).
+    if (parseApiErrorStatus(stdout) === 429 || matchesAny(combined, CAPACITY_PATTERNS)) {
+        return {
+            exitCode,
+            class: "capacity_exhausted",
+            detail: "Claude session/usage capacity reached (429) — runner will pause until reset",
+        };
+    }
     if (matchesAny(combined, USAGE_LIMIT_PATTERNS)) {
         return {
             exitCode,

package/dist/failure-classifier.js.map

@@ -1 +1 @@
-{"version":3,"file":"failure-classifier.js","sourceRoot":"","sources":["../src/failure-classifier.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AA2BH,MAAM,oBAAoB,GAAa;IACrC,cAAc;IACd,gDAAgD;IAChD,sBAAsB;IACtB,iBAAiB;IACjB,sBAAsB;IACtB,aAAa;IACb,iBAAiB;IACjB,sBAAsB;IACtB,oCAAoC;CACrC,CAAC;AAEF,MAAM,qBAAqB,GAAa;IACtC,kBAAkB;IAClB,yBAAyB;IACzB,oBAAoB;IACpB,eAAe;IACf,0CAA0C;IAC1C,mBAAmB;IACnB,yCAAyC;IACzC,oBAAoB;IACpB,uBAAuB;IACvB,gBAAgB;CACjB,CAAC;AAEF,yEAAyE;AACzE,4EAA4E;AAC5E,2EAA2E;AAC3E,MAAM,mBAAmB,GAAa;IACpC,8BAA8B;IAC9B,qBAAqB;IACrB,kBAAkB;IAClB,oCAAoC;IACpC,QAAQ;IACR,aAAa;IACb,qBAAqB;IACrB,SAAS;IACT,eAAe;IACf,oBAAoB;IACpB,4BAA4B;IAC5B,0BAA0B;IAC1B,WAAW;IACX,SAAS;IACT,6BAA6B;CAC9B,CAAC;AAEF,kEAAkE;AAClE,sEAAsE;AACtE,4EAA4E;AAC5E,MAAM,YAAY,GAAG,KAAK,CAAC;AAC3B,MAAM,0BAA0B,GAAG,GAAG,CAAC;AAEvC,SAAS,UAAU,CAAC,IAAY,EAAE,QAAkB;IAClD,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AAC5C,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,kBAAkB,CAChC,QAAuB,EACvB,MAAc,EACd,MAAc,EACd,UAAmB;IAEnB,mEAAmE;IACnE,IAAI,QAAQ,KAAK,GAAG,EAAE,CAAC;QACrB,OAAO;YACL,QAAQ;YACR,KAAK,EAAE,YAAY;YACnB,MAAM,EAAE,4CAA4C;SACrD,CAAC;IACJ,CAAC;IAED,MAAM,QAAQ,GAAG,GAAG,MAAM,KAAK,MAAM,EAAE,CAAC;IAExC,IAAI,UAAU,CAAC,QAAQ,EAAE,oBAAoB,CAAC,EAAE,CAAC;QAC/C,OAAO;YACL,QAAQ;YACR,KAAK,EAAE,aAAa;YACpB,MAAM,EAAE,wCAAwC;SACjD,CAAC;IACJ,CAAC;IAED,IAAI,UAAU,CAAC,QAAQ,EAAE,qBAAqB,CAAC,EAAE,CAAC;QAChD,OAAO;YACL,QAAQ;YACR,KAAK,EAAE,cAAc;YACrB,MAAM,EAAE,6DAA6D;SACtE,CAAC;IACJ,CAAC;IAED,IAAI,UAAU,CAAC,QAAQ,EAAE,mBAAmB,CAAC,EAAE,CAAC;QAC9C,OAAO;YACL,QAAQ;YACR,KAAK,EAAE,YAAY;YACnB,MAAM,EAAE,mDAAmD;SAC5D,CAAC;IACJ,CAAC;IAED,kEAAkE;IAClE,wEAAwE;IACxE,qEAAqE;IACrE,qEAAqE;IACrE,IACE,UAAU,KAAK,SAAS;QACxB,UAAU,GAAG,YAAY;QACzB,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC;QAC1B,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,0BAA0B,EACjD,CAAC;QACD,OAAO;YACL,QAAQ;YACR,KAAK,EAAE,YAAY;YACnB,MAAM,EAAE,iBAAiB,QAAQ,IAAI,QAAQ,OAAO,UAAU,6CAA6C;YAC3G,qEAAqE;YACrE,sEAAsE;YACtE,uDAAuD;YACvD,SAAS,EAAE,IAAI;SAChB,CAAC;IACJ,CAAC;IAED,OAAO;QACL,QAAQ;QACR,KAAK,EAAE,YAAY;QACnB,MAAM,EAAE,iBAAiB,QAAQ,IAAI,QAAQ,uBAAuB;KACrE,CAAC;AACJ,CAAC"}
+{"version":3,"file":"failure-classifier.js","sourceRoot":"","sources":["../src/failure-classifier.ts"],"names":[],"mappings":"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"}

package/dist/runtime/resolution-integrity.d.ts

@@ -0,0 +1,86 @@
+export type IntegrityAssertion = "conflict_markers" | "typecheck" | "version_regression" | "changelog_missing";
+export interface IntegrityFailure {
+    assertion: IntegrityAssertion;
+    /** Human-readable, log-safe (no secrets) explanation of the failure. */
+    detail: string;
+    /** Offending tracked files, when the assertion is file-scoped. */
+    files?: string[];
+}
+export interface ResolutionIntegrityResult {
+    ok: boolean;
+    /** Assertions that actually ran (version checks skip when nothing changed). */
+    checked: IntegrityAssertion[];
+    failures: IntegrityFailure[];
+}
+/** A package.json / CHANGELOG.md pair to version-check, relative to workdir. */
+export interface VersionTarget {
+    packageJsonPath: string;
+    changelogPath: string;
+}
+export interface AssertResolutionOptions {
+    /**
+     * Base ref the resolution should not regress against (e.g. the integration
+     * branch). When omitted, or when the base file can't be read, the version
+     * assertion is skipped — never false-failed.
+     */
+    baseRef?: string;
+    /** Typecheck command (defaults to `pnpm typecheck`). */
+    typecheckCmd?: string;
+    /**
+     * package.json / CHANGELOG.md pairs to version-check. Defaults to the repo
+     * root pair. The runner passes the acc-runner package pair (the #496 site).
+     */
+    versionTargets?: VersionTarget[];
+}
+export interface ResolutionIntegrityDeps {
+    /** Tracked files still carrying a conflict marker. Default: `git grep`. */
+    findConflictMarkers?: (workdir: string) => Promise<string[]>;
+    /** Run the typecheck command. Default: spawn `pnpm typecheck` in workdir. */
+    runTypecheck?: (workdir: string, cmd: string) => Promise<{
+        ok: boolean;
+        output: string;
+    }>;
+    /** Resolved (post-resolution, on-disk) version for a target, or null. */
+    readResolvedVersion?: (workdir: string, target: VersionTarget) => Promise<string | null>;
+    /** Base-ref version for a target, or null when unreadable (→ skip check). */
+    readBaseVersion?: (workdir: string, baseRef: string, target: VersionTarget) => Promise<string | null>;
+    /** CHANGELOG.md text for a target, or null when absent. */
+    readChangelog?: (workdir: string, target: VersionTarget) => Promise<string | null>;
+}
+/**
+ * Conflict-marker line shape: 7 of the same marker char at the start of a
+ * line. `<<<<<<<` and `>>>>>>>` are unambiguous; the `=======` divider is
+ * matched only as a whole line so a 7-equals markdown rule plus trailing text
+ * does not trip it.
+ */
+export declare const CONFLICT_MARKER_RE: RegExp;
+export declare function textHasConflictMarker(text: string): boolean;
+/** Semver compare (a-b sign); tolerant of pre-release/build suffixes. */
+export declare function cmpSemver(a: string, b: string): number;
+/**
+ * True when `changelog` carries an entry for `version`. The version must
+ * appear bounded by non-version characters so 0.14.0 does not match inside
+ * 0.14.00 or 10.14.0.
+ */
+export declare function changelogMentionsVersion(changelog: string, version: string): boolean;
+export declare const DEFAULT_VERSION_TARGET: VersionTarget;
+/**
+ * Assert that a conflict resolution in `workdir` is shippable. Returns a
+ * structured result; `ok === false` means the caller MUST reject the
+ * resolution (do not push, do not mark resolved).
+ */
+export declare function assertResolutionIntegrity(workdir: string, opts?: AssertResolutionOptions, deps?: ResolutionIntegrityDeps): Promise<ResolutionIntegrityResult>;
+/**
+ * True when a task that reaches the worktree/push path is a conflict
+ * resolution and must clear the integrity guardrail. `conflict_resolution`
+ * task types are handled mechanically upstream and never reach the push path,
+ * so the live signal here is the title an operator/manager files when the
+ * mechanical resolver bails and a Claude session takes over the merge.
+ */
+export declare function isConflictResolutionTask(task: {
+    type?: string | null;
+    title?: string | null;
+}): boolean;
+/** One-line, log-safe summary of which assertions failed. */
+export declare function summariseFailures(failures: IntegrityFailure[]): string;
+//# sourceMappingURL=resolution-integrity.d.ts.map

package/dist/runtime/resolution-integrity.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolution-integrity.d.ts","sourceRoot":"","sources":["../../src/runtime/resolution-integrity.ts"],"names":[],"mappings":"AAsCA,MAAM,MAAM,kBAAkB,GAC1B,kBAAkB,GAClB,WAAW,GACX,oBAAoB,GACpB,mBAAmB,CAAC;AAExB,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,kBAAkB,CAAC;IAC9B,wEAAwE;IACxE,MAAM,EAAE,MAAM,CAAC;IACf,kEAAkE;IAClE,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;CAClB;AAED,MAAM,WAAW,yBAAyB;IACxC,EAAE,EAAE,OAAO,CAAC;IACZ,+EAA+E;IAC/E,OAAO,EAAE,kBAAkB,EAAE,CAAC;IAC9B,QAAQ,EAAE,gBAAgB,EAAE,CAAC;CAC9B;AAED,gFAAgF;AAChF,MAAM,WAAW,aAAa;IAC5B,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,uBAAuB;IACtC;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,wDAAwD;IACxD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;OAGG;IACH,cAAc,CAAC,EAAE,aAAa,EAAE,CAAC;CAClC;AAED,MAAM,WAAW,uBAAuB;IACtC,2EAA2E;IAC3E,mBAAmB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC7D,6EAA6E;IAC7E,YAAY,CAAC,EAAE,CACb,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,MAAM,KACR,OAAO,CAAC;QAAE,EAAE,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC9C,yEAAyE;IACzE,mBAAmB,CAAC,EAAE,CACpB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,aAAa,KAClB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC5B,6EAA6E;IAC7E,eAAe,CAAC,EAAE,CAChB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,aAAa,KAClB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC5B,2DAA2D;IAC3D,aAAa,CAAC,EAAE,CACd,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,aAAa,KAClB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;CAC7B;AAMD;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,QAAsC,CAAC;AAEtE,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE3D;AAED,yEAAyE;AACzE,wBAAgB,SAAS,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAQtD;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CACtC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,GACd,OAAO,CAGT;AAED,eAAO,MAAM,sBAAsB,EAAE,aAGpC,CAAC;AAqGF;;;;GAIG;AACH,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,MAAM,EACf,IAAI,GAAE,uBAA4B,EAClC,IAAI,GAAE,uBAA4B,GACjC,OAAO,CAAC,yBAAyB,CAAC,CAgFpC;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE;IAC7C,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB,GAAG,OAAO,CAIV;AAED,6DAA6D;AAC7D,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,GAAG,MAAM,CAEtE"}