@on-par/factory-core 0.9.28-next.8 → 0.9.28

package/dist/run/pr-run-state.d.ts

@@ -0,0 +1,99 @@
+import type { Octokit } from '@octokit/rest';
+import type { RunStatus } from '../types/index.js';
+import { type WorkKey } from '../work/work-key.js';
+export declare const PR_RUN_STATE_VERSION = "v1";
+export declare const PR_RUN_STATUSES: readonly ['building', 'awaiting-ci', 'awaiting-review', 'parked'];
+export type PrRunStatus = (typeof PR_RUN_STATUSES)[number];
+export declare const SPEC_SUMMARY_MAX = 1000;
+export declare const MAX_HANDLED_IDS = 200;
+export declare const MAX_ROUNDS = 50;
+export declare const MAX_ENCODED_CHARS = 60000;
+export declare function prRunStateMarker(key: WorkKey): string;
+export interface PrRunRound {
+    kind: 'check' | 'review' | 'ci';
+    id?: number;
+    headSha: string;
+    at: string;
+}
+export interface PrRunState {
+    version: 1;
+    key: WorkKey;
+    prNumber: number;
+    status: PrRunStatus;
+    spec: {
+        sha256: string;
+        summary: string;
+    };
+    checkRework: {
+        used: number;
+        cap: number;
+    };
+    reviewRework: {
+        used: number;
+        cap: number;
+    };
+    handledReviewIds: number[];
+    handledCommentIds: number[];
+    rounds: PrRunRound[];
+    updatedAt: string;
+}
+export type PrRunStateRejectReason = 'untrusted-author' | 'digest-mismatch' | 'key-mismatch' | 'malformed' | 'identity-unavailable';
+export interface PrStateComment {
+    id: number;
+    authorId: number | undefined;
+    body: string;
+}
+type Ignored = {
+    commentId: number;
+    reason: PrRunStateRejectReason;
+}[];
+export type PrRunStateLoad = {
+    status: 'found';
+    commentId: number;
+    state: PrRunState;
+    ignored: Ignored;
+} | {
+    status: 'none';
+    ignored: Ignored;
+};
+/** Allow-list step: rebuilds the state from known fields only, redacts the summary and bounds every list. */
+export declare function sanitizePrRunState(state: PrRunState, maxIds?: number, maxRounds?: number): PrRunState;
+/** The hidden marker block for a state; halves rounds and handled ids until it fits one comment. */
+export declare function encodePrRunState(state: PrRunState): string;
+export declare function decodePrRunState(body: string, key: WorkKey): {
+    ok: true;
+    state: PrRunState;
+} | {
+    ok: false;
+    reason: PrRunStateRejectReason;
+} | null;
+/**
+ * Picks the state to trust: only a comment by `selfId` (the authenticated identity) is decoded. Lowest comment id
+ * wins, as in `readParkState`. An unknown identity fails closed: every marker comment is ignored.
+ */
+export declare function selectTrustedPrRunState(comments: readonly PrStateComment[], selfId: number | undefined, key: WorkKey): PrRunStateLoad;
+/**
+ * Monotonic merge of local and remote state. `used` counters take the max (a restore can only raise them, never
+ * reset a cap), `cap` comes from local because local config is current, handled ids and rounds are unioned (rounds
+ * deduped by kind+id+headSha, sorted by `at`), and `status`, `spec` and `prNumber` come from the side with the
+ * later `updatedAt`. One missing side returns the other.
+ */
+export declare function reconcilePrRunState(local: PrRunState | null, remote: PrRunState | null): PrRunState | null;
+export declare function prRunStatusFor(status: RunStatus, ciPending?: boolean): PrRunStatus;
+export declare function loadPrRunState(deps: {
+    octokit: Pick<Octokit, 'rest'>;
+    repo: string;
+    prNumber: number;
+    key: WorkKey;
+}): Promise<PrRunStateLoad>;
+export declare function savePrRunState(deps: {
+    octokit: Octokit;
+    repo: string;
+    prNumber: number;
+    state: PrRunState;
+}): Promise<{
+    commentId: number;
+    created: boolean;
+}>;
+export {};
+//# sourceMappingURL=pr-run-state.d.ts.map

package/dist/run/pr-run-state.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pr-run-state.d.ts","sourceRoot":"","sources":["../../src/run/pr-run-state.ts"],"names":[],"mappings":"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"}

package/dist/run/pr-run-state.js

@@ -0,0 +1,235 @@
+// packages/core/src/run/pr-run-state.ts — a run's resumable state in a factory-owned PR comment (#3909, ADR-0174)
+//
+// A disposable host loses `.factory/state` with the container. The run persists the state it needs to resume
+// (rework counters, handled review ids, status, spec summary) in one hidden comment on its open PR. Anyone can post
+// the marker, so only a comment by the authenticated identity whose sha256 digest matches is trusted.
+import { createHash } from 'node:crypto';
+import { z } from 'zod';
+import { redactSecrets } from '../filing/redact.js';
+import { workKeyFromIssue } from '../work/work-key.js';
+import { upsertMarkerComment } from './park-comment.js';
+export const PR_RUN_STATE_VERSION = 'v1';
+export const PR_RUN_STATUSES = ['building', 'awaiting-ci', 'awaiting-review', 'parked'];
+export const SPEC_SUMMARY_MAX = 1000;
+export const MAX_HANDLED_IDS = 200;
+export const MAX_ROUNDS = 50;
+export const MAX_ENCODED_CHARS = 60_000;
+const MARKER_PREFIX = `<!-- factory:run-state ${PR_RUN_STATE_VERSION} key:`;
+const MARKER_RE = new RegExp(`<!-- factory:run-state ${PR_RUN_STATE_VERSION} key:(\\S+) -->`);
+const DATA_RE = /<!-- factory:run-state-data ([A-Za-z0-9+/=]*) sha256:([0-9a-f]{64}) -->/;
+const PAGE_SIZE = 100;
+export function prRunStateMarker(key) {
+    return `${MARKER_PREFIX}${key} -->`;
+}
+const count = z.number().int().nonnegative();
+const sha = z.string().regex(/^[0-9a-f]{7,40}$/);
+const counter = z.object({ used: count, cap: count }).strict();
+const schema = z
+    .object({
+    version: z.literal(1),
+    key: z.string().min(1),
+    prNumber: count,
+    status: z.enum(PR_RUN_STATUSES),
+    spec: z.object({ sha256: z.string().regex(/^[0-9a-f]{64}$|^$/), summary: z.string() }).strict(),
+    checkRework: counter,
+    reviewRework: counter,
+    handledReviewIds: z.array(count),
+    handledCommentIds: z.array(count),
+    rounds: z.array(z
+        .object({ kind: z.enum(['check', 'review', 'ci']), id: count.optional(), headSha: sha, at: z.string() })
+        .strict()),
+    updatedAt: z.string(),
+})
+    .strict();
+const sha256 = (text) => createHash('sha256').update(text).digest('hex');
+const clampCount = (n) => (Number.isFinite(n) ? Math.max(0, Math.trunc(n)) : 0);
+const uniqueSorted = (ids) => [...new Set(ids.map(clampCount))].sort((a, b) => a - b);
+/** Allow-list step: rebuilds the state from known fields only, redacts the summary and bounds every list. */
+export function sanitizePrRunState(state, maxIds = MAX_HANDLED_IDS, maxRounds = MAX_ROUNDS) {
+    return {
+        version: 1,
+        key: state.key,
+        prNumber: clampCount(state.prNumber),
+        status: state.status,
+        spec: { sha256: state.spec.sha256, summary: redactSecrets(state.spec.summary).slice(0, SPEC_SUMMARY_MAX) },
+        checkRework: { used: clampCount(state.checkRework.used), cap: clampCount(state.checkRework.cap) },
+        reviewRework: { used: clampCount(state.reviewRework.used), cap: clampCount(state.reviewRework.cap) },
+        handledReviewIds: uniqueSorted(state.handledReviewIds).slice(-maxIds),
+        handledCommentIds: uniqueSorted(state.handledCommentIds).slice(-maxIds),
+        rounds: state.rounds.slice(-maxRounds).map((r) => ({
+            kind: r.kind,
+            ...(r.id === undefined ? {} : { id: clampCount(r.id) }),
+            headSha: r.headSha,
+            at: r.at,
+        })),
+        updatedAt: state.updatedAt,
+    };
+}
+function render(state) {
+    const json = JSON.stringify(state);
+    return [
+        prRunStateMarker(state.key),
+        '_Factory run state for resuming on another host. Do not edit; edits are ignored._',
+        `<!-- factory:run-state-data ${Buffer.from(json).toString('base64')} sha256:${sha256(json)} -->`,
+    ].join('\n');
+}
+/** The hidden marker block for a state; halves rounds and handled ids until it fits one comment. */
+export function encodePrRunState(state) {
+    let ids = MAX_HANDLED_IDS;
+    let rounds = MAX_ROUNDS;
+    let body = render(sanitizePrRunState(state, ids, rounds));
+    while (body.length > MAX_ENCODED_CHARS && (ids > 0 || rounds > 0)) {
+        ids = Math.floor(ids / 2);
+        rounds = Math.floor(rounds / 2);
+        body = render(sanitizePrRunState(state, ids, rounds));
+    }
+    return body;
+}
+export function decodePrRunState(body, key) {
+    const marker = MARKER_RE.exec(body);
+    if (!marker)
+        return null;
+    if (marker[1] !== key)
+        return { ok: false, reason: 'key-mismatch' };
+    const data = DATA_RE.exec(body);
+    if (!data)
+        return { ok: false, reason: 'malformed' };
+    const json = Buffer.from(data[1] ?? '', 'base64').toString('utf8');
+    let parsed;
+    try {
+        parsed = JSON.parse(json);
+    }
+    catch {
+        return { ok: false, reason: 'malformed' };
+    }
+    const checked = schema.safeParse(parsed);
+    if (!checked.success)
+        return { ok: false, reason: 'malformed' };
+    if (sha256(json) !== data[2])
+        return { ok: false, reason: 'digest-mismatch' };
+    if (checked.data.key !== key)
+        return { ok: false, reason: 'key-mismatch' };
+    return { ok: true, state: { ...checked.data, key } };
+}
+/**
+ * Picks the state to trust: only a comment by `selfId` (the authenticated identity) is decoded. Lowest comment id
+ * wins, as in `readParkState`. An unknown identity fails closed: every marker comment is ignored.
+ */
+export function selectTrustedPrRunState(comments, selfId, key) {
+    const ignored = [];
+    let winner;
+    for (const c of [...comments].sort((a, b) => a.id - b.id)) {
+        if (!MARKER_RE.test(c.body))
+            continue;
+        if (selfId === undefined) {
+            ignored.push({ commentId: c.id, reason: 'identity-unavailable' });
+            continue;
+        }
+        if (c.authorId !== selfId) {
+            ignored.push({ commentId: c.id, reason: 'untrusted-author' });
+            continue;
+        }
+        const decoded = decodePrRunState(c.body, key);
+        if (decoded === null)
+            continue;
+        if (!decoded.ok)
+            ignored.push({ commentId: c.id, reason: decoded.reason });
+        else
+            winner ??= { commentId: c.id, state: decoded.state };
+    }
+    return winner ? { status: 'found', ...winner, ignored } : { status: 'none', ignored };
+}
+function mergeRounds(a, b) {
+    const seen = new Map();
+    for (const r of [...a, ...b])
+        seen.set(`${r.kind}:${r.id ?? ''}:${r.headSha}`, r);
+    return [...seen.values()].sort((x, y) => x.at.localeCompare(y.at));
+}
+/**
+ * Monotonic merge of local and remote state. `used` counters take the max (a restore can only raise them, never
+ * reset a cap), `cap` comes from local because local config is current, handled ids and rounds are unioned (rounds
+ * deduped by kind+id+headSha, sorted by `at`), and `status`, `spec` and `prNumber` come from the side with the
+ * later `updatedAt`. One missing side returns the other.
+ */
+export function reconcilePrRunState(local, remote) {
+    if (local === null)
+        return remote;
+    if (remote === null)
+        return local;
+    const later = remote.updatedAt > local.updatedAt ? remote : local;
+    return {
+        version: 1,
+        key: local.key,
+        prNumber: later.prNumber,
+        status: later.status,
+        spec: later.spec,
+        checkRework: { used: Math.max(local.checkRework.used, remote.checkRework.used), cap: local.checkRework.cap },
+        reviewRework: { used: Math.max(local.reviewRework.used, remote.reviewRework.used), cap: local.reviewRework.cap },
+        handledReviewIds: uniqueSorted([...local.handledReviewIds, ...remote.handledReviewIds]),
+        handledCommentIds: uniqueSorted([...local.handledCommentIds, ...remote.handledCommentIds]),
+        rounds: mergeRounds(local.rounds, remote.rounds),
+        updatedAt: local.updatedAt > remote.updatedAt ? local.updatedAt : remote.updatedAt,
+    };
+}
+export function prRunStatusFor(status, ciPending) {
+    switch (status) {
+        case 'pending':
+        case 'planning':
+        case 'building':
+        case 'checking':
+        case 'reworking':
+            return 'building';
+        case 'shipping':
+            return 'awaiting-ci';
+        case 'ready':
+            return ciPending ? 'awaiting-ci' : 'awaiting-review';
+        case 'awaiting-review':
+        case 'merged':
+            return 'awaiting-review';
+        case 'parked':
+        case 'escalated':
+        case 'failed':
+            return 'parked';
+        default: {
+            const unreachable = status;
+            return unreachable;
+        }
+    }
+}
+export async function loadPrRunState(deps) {
+    const { octokit, repo, prNumber, key } = deps;
+    const [owner, name] = repo.split('/');
+    let selfId;
+    try {
+        selfId = (await octokit.rest.users.getAuthenticated()).data.id;
+    }
+    catch {
+        selfId = undefined;
+    }
+    const comments = [];
+    for (let page = 1;; page++) {
+        const { data } = await octokit.rest.issues.listComments({
+            owner,
+            repo: name,
+            issue_number: prNumber,
+            per_page: PAGE_SIZE,
+            page,
+        });
+        for (const c of data)
+            comments.push({ id: c.id, authorId: c.user?.id, body: c.body ?? '' });
+        if (data.length < PAGE_SIZE)
+            break;
+    }
+    return selectTrustedPrRunState(comments, selfId, key);
+}
+export function savePrRunState(deps) {
+    const { octokit, repo, prNumber, state } = deps;
+    return upsertMarkerComment({
+        octokit,
+        repo,
+        issue: workKeyFromIssue(prNumber),
+        marker: prRunStateMarker(state.key),
+        body: encodePrRunState(state),
+    });
+}
+//# sourceMappingURL=pr-run-state.js.map

package/dist/run/pr-run-state.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pr-run-state.js","sourceRoot":"","sources":["../../src/run/pr-run-state.ts"],"names":[],"mappings":"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"}

package/dist/run/prerequisite-restack.d.ts

@@ -0,0 +1,39 @@
+import type { Octokit } from '@octokit/rest';
+import type { PrerequisiteStackTarget } from '../queue/prerequisite-stack.js';
+export interface PrerequisiteRestackOptions {
+    /** Main checkout; a short-lived detached worktree is added from it. */
+    repoRoot: string;
+    octokit: Octokit;
+    /** owner/name */
+    repo: string;
+    /** The stacked PR. */
+    prNumber: number;
+    branch: string;
+    /** The stacked branch head the factory last saw; the push lease and the ownership check. */
+    recordedHead: string;
+    /** The prerequisite PR and head the stacked branch was built on (from the PR body marker). */
+    stackedOn: PrerequisiteStackTarget;
+    onto: {
+        kind: 'main';
+        mergedHead: string;
+    } | {
+        kind: 'prerequisite';
+        newHead: string;
+    };
+    /** Default 'origin'. */
+    remote?: string;
+    /** Default 'main'. */
+    baseBranch?: string;
+}
+export type PrerequisiteRestackOutcome = {
+    status: 'restacked';
+    headSha: string;
+    retargeted: boolean;
+} | {
+    status: 'park';
+    reason: string;
+    files: string[];
+};
+/** Rebases the stacked branch `--onto` main (prerequisite merged) or the prerequisite's new head, then updates the PR. */
+export declare function restackOnPrerequisite(opts: PrerequisiteRestackOptions): Promise<PrerequisiteRestackOutcome>;
+//# sourceMappingURL=prerequisite-restack.d.ts.map

package/dist/run/prerequisite-restack.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"prerequisite-restack.d.ts","sourceRoot":"","sources":["../../src/run/prerequisite-restack.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAG7C,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAI9E,MAAM,WAAW,0BAA0B;IACzC,uEAAuE;IACvE,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,iBAAiB;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,sBAAsB;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,4FAA4F;IAC5F,YAAY,EAAE,MAAM,CAAC;IACrB,8FAA8F;IAC9F,SAAS,EAAE,uBAAuB,CAAC;IACnC,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,IAAI,EAAE,cAAc,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IACvF,wBAAwB;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,sBAAsB;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,MAAM,0BAA0B,GACpC;IAAE,MAAM,EAAE,WAAW,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,OAAO,CAAA;CAAE,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAQtH,0HAA0H;AAC1H,wBAAsB,qBAAqB,CAAC,IAAI,EAAE,0BAA0B,GAAG,OAAO,CAAC,0BAA0B,CAAC,CA+EjH"}

package/dist/run/prerequisite-restack.js

@@ -0,0 +1,79 @@
+// packages/core/src/run/prerequisite-restack.ts — cross-issue stacks (#3916): rebase a stacked PR onto main after its
+// prerequisite squash-merged, or onto the prerequisite's new head after it moved. Reuses ADR-0161's rebase/push.
+import { prerequisiteStackOrder, renderPrerequisiteStackLine, replaceStackOrderLine } from '../phases/stack-order.js';
+import { execGit } from '../utils/git-exec.js';
+import { gitErrorDetail, rebaseAndPushStack } from './stack-rebase.js';
+const PREREQUISITE_MARKER_PREFIX = '<!-- factory:prerequisite-stack ';
+async function git(cwd, ...args) {
+    return (await execGit(args, { cwd })).stdout.trim();
+}
+/** Rebases the stacked branch `--onto` main (prerequisite merged) or the prerequisite's new head, then updates the PR. */
+export async function restackOnPrerequisite(opts) {
+    const { repoRoot, octokit, prNumber, branch, recordedHead, stackedOn, onto } = opts;
+    const remote = opts.remote ?? 'origin';
+    const base = opts.baseBranch ?? 'main';
+    const [owner, repoName] = opts.repo.split('/');
+    const park = (reason, files = []) => ({
+        status: 'park',
+        reason,
+        files,
+    });
+    const label = `PR #${prNumber} (${branch})`;
+    let startBase;
+    try {
+        await git(repoRoot, 'fetch', remote, `+refs/heads/${base}:refs/remotes/${remote}/${base}`);
+        await git(repoRoot, 'fetch', remote, `+refs/heads/${branch}:refs/remotes/${remote}/${branch}`);
+        if (onto.kind === 'prerequisite') {
+            await git(repoRoot, 'fetch', remote, `+refs/heads/${stackedOn.branch}:refs/remotes/${remote}/${stackedOn.branch}`);
+            await git(repoRoot, 'cat-file', '-e', `${onto.newHead}^{commit}`);
+            startBase = onto.newHead;
+        }
+        else {
+            startBase = `${remote}/${base}`;
+        }
+        const head = await git(repoRoot, 'rev-parse', `refs/remotes/${remote}/${branch}`);
+        if (head !== recordedHead) {
+            return park(`${label} moved since the factory recorded ${recordedHead}; a human may have pushed — not restacking onto prerequisite PR #${stackedOn.prNumber}`);
+        }
+    }
+    catch (err) {
+        return park(`restack of ${label} onto prerequisite PR #${stackedOn.prNumber} could not fetch: ${gitErrorDetail(err)}`);
+    }
+    const rebased = await rebaseAndPushStack({
+        repoRoot,
+        remote,
+        startBase,
+        layers: [{ branch, recordedHead, upstream: stackedOn.headSha }],
+    });
+    if (!rebased.ok) {
+        return park(`restack of ${label} ${rebased.reason}`, rebased.files);
+    }
+    const headSha = rebased.newHeads[0];
+    try {
+        const { data } = await octokit.rest.pulls.get({ owner, repo: repoName, pull_number: prNumber });
+        const merged = onto.kind === 'main';
+        const retargeted = merged && data.base.ref !== base;
+        const without = (data.body ?? '')
+            .split('\n')
+            .filter((l) => !l.startsWith(PREREQUISITE_MARKER_PREFIX))
+            .join('\n');
+        const issue = Number(/^factory\/(\d+)-/.exec(branch)?.[1]);
+        const body = merged
+            ? replaceStackOrderLine(without, renderPrerequisiteStackLine({ prerequisite: stackedOn, issue, base }))
+            : replaceStackOrderLine(without, prerequisiteStackOrder({ ...stackedOn, headSha: onto.newHead }, issue, stackedOn.branch));
+        if (retargeted || body !== (data.body ?? '')) {
+            await octokit.rest.pulls.update({
+                owner,
+                repo: repoName,
+                pull_number: prNumber,
+                body,
+                ...(retargeted ? { base } : {}),
+            });
+        }
+        return { status: 'restacked', headSha, retargeted };
+    }
+    catch (err) {
+        return park(`${label} restacked and pushed but updating the PR failed: ${gitErrorDetail(err)}`);
+    }
+}
+//# sourceMappingURL=prerequisite-restack.js.map

package/dist/run/prerequisite-restack.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"prerequisite-restack.js","sourceRoot":"","sources":["../../src/run/prerequisite-restack.ts"],"names":[],"mappings":"AAAA,sHAAsH;AACtH,iHAAiH;AAIjH,OAAO,EAAE,sBAAsB,EAAE,2BAA2B,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAEtH,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAyBvE,MAAM,0BAA0B,GAAG,kCAAkC,CAAC;AAEtE,KAAK,UAAU,GAAG,CAAC,GAAW,EAAE,GAAG,IAAc;IAC/C,OAAO,CAAC,MAAM,OAAO,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;AACtD,CAAC;AAED,0HAA0H;AAC1H,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,IAAgC;IAC1E,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;IACpF,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,QAAQ,CAAC;IACvC,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,IAAI,MAAM,CAAC;IACvC,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAqB,CAAC;IACnE,MAAM,IAAI,GAAG,CAAC,MAAc,EAAE,KAAK,GAAa,EAAE,EAA8B,EAAE,CAAC,CAAC;QAClF,MAAM,EAAE,MAAM;QACd,MAAM;QACN,KAAK;KACN,CAAC,CAAC;IACH,MAAM,KAAK,GAAG,OAAO,QAAQ,KAAK,MAAM,GAAG,CAAC;IAE5C,IAAI,SAAiB,CAAC;IACtB,IAAI,CAAC;QACH,MAAM,GAAG,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,eAAe,IAAI,iBAAiB,MAAM,IAAI,IAAI,EAAE,CAAC,CAAC;QAC3F,MAAM,GAAG,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,eAAe,MAAM,iBAAiB,MAAM,IAAI,MAAM,EAAE,CAAC,CAAC;QAC/F,IAAI,IAAI,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;YACjC,MAAM,GAAG,CACP,QAAQ,EACR,OAAO,EACP,MAAM,EACN,eAAe,SAAS,CAAC,MAAM,iBAAiB,MAAM,IAAI,SAAS,CAAC,MAAM,EAAE,CAC7E,CAAC;YACF,MAAM,GAAG,CAAC,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,OAAO,WAAW,CAAC,CAAC;YAClE,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC;QAC3B,CAAC;aAAM,CAAC;YACN,SAAS,GAAG,GAAG,MAAM,IAAI,IAAI,EAAE,CAAC;QAClC,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,QAAQ,EAAE,WAAW,EAAE,gBAAgB,MAAM,IAAI,MAAM,EAAE,CAAC,CAAC;QAClF,IAAI,IAAI,KAAK,YAAY,EAAE,CAAC;YAC1B,OAAO,IAAI,CACT,GAAG,KAAK,qCAAqC,YAAY,oEAAoE,SAAS,CAAC,QAAQ,EAAE,CAClJ,CAAC;QACJ,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,IAAI,CACT,cAAc,KAAK,0BAA0B,SAAS,CAAC,QAAQ,qBAAqB,cAAc,CAAC,GAAG,CAAC,EAAE,CAC1G,CAAC;IACJ,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC;QACvC,QAAQ;QACR,MAAM;QACN,SAAS;QACT,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,CAAC,OAAO,EAAE,CAAC;KAChE,CAAC,CAAC;IACH,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC;QAChB,OAAO,IAAI,CAAC,cAAc,KAAK,IAAI,OAAO,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IACtE,CAAC;IACD,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAE,CAAC;IAErC,IAAI,CAAC;QACH,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAC,CAAC;QAChG,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC;QACpC,MAAM,UAAU,GAAG,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,IAAI,CAAC;QACpD,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;aAC9B,KAAK,CAAC,IAAI,CAAC;aACX,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,0BAA0B,CAAC,CAAC;aACxD,IAAI,CAAC,IAAI,CAAC,CAAC;QACd,MAAM,KAAK,GAAG,MAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3D,MAAM,IAAI,GAAG,MAAM;YACjB,CAAC,CAAC,qBAAqB,CAAC,OAAO,EAAE,2BAA2B,CAAC,EAAE,YAAY,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YACvG,CAAC,CAAC,qBAAqB,CACnB,OAAO,EACP,sBAAsB,CAAC,EAAE,GAAG,SAAS,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,SAAS,CAAC,MAAM,CAAE,CAC1F,CAAC;QACN,IAAI,UAAU,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,CAAC;YAC7C,MAAM,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;gBAC9B,KAAK;gBACL,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,QAAQ;gBACrB,IAAI;gBACJ,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAChC,CAAC,CAAC;QACL,CAAC;QACD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC;IACtD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,IAAI,CAAC,GAAG,KAAK,qDAAqD,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAClG,CAAC;AACH,CAAC"}

package/dist/run/review-rework-cap.d.ts

@@ -1,6 +1,6 @@
 import type { FactoryConfig } from '../config/index.js';
 import { type QueueGitHubClient } from '../queue/github-queue.js';
-import type { ReviewReworkStore } from '../queue/review-rework-trigger.js';
+import type { ReviewReworkSource, ReviewReworkStore } from '../queue/review-rework-trigger.js';
 import { type ParkCommentInput } from './park-comment.js';
 import { type WorkKey } from '../work/work-key.js';
 export declare function resolveMaxReviewReworkRuns(config: Pick<FactoryConfig, 'queue'>): number;
@@ -12,6 +12,7 @@ export declare function reviewReworkCapMessage(input: {
     cap: number;
     count: number;
     reviewIds: readonly number[];
+    source?: ReviewReworkSource;
 }): string;
 export declare function parkAtReviewReworkCap(deps: {
     queue: QueueGitHubClient;
@@ -24,6 +25,7 @@ export declare function parkAtReviewReworkCap(deps: {
     cap: number;
     count: number;
     reviewIds: readonly number[];
+    source?: ReviewReworkSource;
     publishComment?: (input: Omit<ParkCommentInput, 'parkSha' | 'order'>) => Promise<unknown>;
 }): Promise<void>;
 //# sourceMappingURL=review-rework-cap.d.ts.map

package/dist/run/review-rework-cap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"review-rework-cap.d.ts","sourceRoot":"","sources":["../../src/run/review-rework-cap.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAiC,KAAK,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AACjG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,OAAO,EAAqB,KAAK,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC7E,OAAO,EAAiB,KAAK,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAElE,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,GAAG,MAAM,CAEvF;AAED,qGAAqG;AACrG,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,IAAI,CAAC,iBAAiB,EAAE,MAAM,CAAC,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,CAEpG;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE;IAC5C,KAAK,EAAE,OAAO,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;CAC9B,GAAG,MAAM,CAGT;AAED,wBAAsB,qBAAqB,CAAC,IAAI,EAAE;IAChD,KAAK,EAAE,iBAAiB,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;IAC7B,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,gBAAgB,EAAE,SAAS,GAAG,OAAO,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAC3F,GAAG,OAAO,CAAC,IAAI,CAAC,CAqBhB"}
+{"version":3,"file":"review-rework-cap.d.ts","sourceRoot":"","sources":["../../src/run/review-rework-cap.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAiC,KAAK,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AACjG,OAAO,KAAK,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAC/F,OAAO,EAAqB,KAAK,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC7E,OAAO,EAAiB,KAAK,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAElE,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,GAAG,MAAM,CAEvF;AAED,qGAAqG;AACrG,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,IAAI,CAAC,iBAAiB,EAAE,MAAM,CAAC,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,CAEpG;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE;IAC5C,KAAK,EAAE,OAAO,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;IAC7B,MAAM,CAAC,EAAE,kBAAkB,CAAC;CAC7B,GAAG,MAAM,CAIT;AAED,wBAAsB,qBAAqB,CAAC,IAAI,EAAE;IAChD,KAAK,EAAE,iBAAiB,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;IAC7B,MAAM,CAAC,EAAE,kBAAkB,CAAC;IAC5B,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,gBAAgB,EAAE,SAAS,GAAG,OAAO,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAC3F,GAAG,OAAO,CAAC,IAAI,CAAC,CAqBhB"}

package/dist/run/review-rework-cap.js

@@ -12,7 +12,8 @@ export function countReviewReworkRuns(store, issue) {
 }
 export function reviewReworkCapMessage(input) {
     const { issue, pr, cap, count, reviewIds } = input;
-    return `#${issue} has had ${count} review-rework runs (cap ${cap}, queue.max_review_rework_runs); PR #${pr} review ${reviewIds.join(', ')} started no new run. Resolve the review by hand, then run \`factory unpark ${issue}\`.`;
+    const what = input.source === 'comment' ? 'comment' : input.source === 'feedback' ? 'feedback round' : 'review';
+    return `#${issue} has had ${count} review-rework runs (cap ${cap}, queue.max_review_rework_runs); PR #${pr} ${what} ${reviewIds.join(', ')} started no new run. Resolve the review by hand, then run \`factory unpark ${issue}\`.`;
 }
 export async function parkAtReviewReworkCap(deps) {
     const { queue, owner, repo, issue } = deps;

package/dist/run/review-rework-cap.js.map

@@ -1 +1 @@
-{"version":3,"file":"review-rework-cap.js","sourceRoot":"","sources":["../../src/run/review-rework-cap.ts"],"names":[],"mappings":"AAAA,iIAAiI;AACjI,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAG9D,OAAO,EAAE,YAAY,EAAE,eAAe,EAA0B,MAAM,0BAA0B,CAAC;AAEjG,OAAO,EAAE,iBAAiB,EAAyB,MAAM,mBAAmB,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAgB,MAAM,qBAAqB,CAAC;AAElE,MAAM,UAAU,0BAA0B,CAAC,MAAoC;IAC7E,OAAO,MAAM,CAAC,KAAK,EAAE,sBAAsB,IAAI,oBAAoB,CAAC,KAAK,CAAC,sBAAsB,CAAC;AACnG,CAAC;AAED,qGAAqG;AACrG,MAAM,UAAU,qBAAqB,CAAC,KAAsC,EAAE,KAAc;IAC1F,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC;AACrF,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,KAMtC;IACC,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IACnD,OAAO,IAAI,KAAK,YAAY,KAAK,4BAA4B,GAAG,wCAAwC,EAAE,WAAW,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,8EAA8E,KAAK,KAAK,CAAC;AACpO,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,IAY3C;IACC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IAC3C,MAAM,MAAM,GAAG,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC;IACpF,IAAI,MAAM;QAAE,MAAM,KAAK,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC;IAChE,MAAM,KAAK,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE,aAAa,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IACnG,MAAM,KAAK,GAAG;QACZ,KAAK;QACL,MAAM,EAAE,UAAmB;QAC3B,OAAO,EAAE,sBAAsB,CAAC,IAAI,CAAC;QACrC,KAAK,EAAE,GAAG;QACV,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,IAAI,EAAE,IAAI,CAAC,IAAI;KAChB,CAAC;IACF,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;QACxB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAC7C,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,IAAI,IAAI,IAAI,GAAG,IAAI,GAAG,CAAC,EAAE,KAAK,KAAK,EAAE,CAAC;YAC/E,MAAM,IAAI,KAAK,CAAC,wBAAwB,OAAO,IAAI,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC,CAAC;QAClG,CAAC;QACD,OAAO;IACT,CAAC;IACD,MAAM,KAAK,CAAC,kBAAkB,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE,aAAa,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;AACtH,CAAC"}
+{"version":3,"file":"review-rework-cap.js","sourceRoot":"","sources":["../../src/run/review-rework-cap.ts"],"names":[],"mappings":"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"}

package/dist/run/review-rework.d.ts

@@ -1,11 +1,14 @@
 import type { Octokit } from '@octokit/rest';
 import { reworkWorker, type checkPhase } from '../phases/check.js';
 import type { CheckSummary } from '../types/index.js';
+import type { FeedbackRoundPlan, FeedbackRoundTarget } from './feedback-round.js';
 import type { RunPorts, RunRequest } from './run-issue.js';
 export interface ReviewReworkTarget {
     prNumber: number;
     reviewId: number;
     reviewer: string;
+    /** `'comment'`: `reviewId` is a `/factory rework` issue-comment id (#3882). */
+    source?: 'comment';
 }
 /** #3625: a trusted `/factory iterate` comment; the run re-runs CHECK/rework on the PR branch. */
 export interface IterateTarget {
@@ -19,6 +22,10 @@ export interface ReworkRequestFields {
     reviewRework?: ReviewReworkTarget;
     /** #3625: a /factory iterate comment — skip PLAN/BUILD and re-run CHECK/rework on the PR branch. */
     iterate?: IterateTarget;
+    /** #3910: a feedback round — read every unhandled trusted PR feedback item, triage, then rework or re-plan. */
+    feedbackRound?: FeedbackRoundTarget;
+    /** Logins trusted to give feedback (intake.trustedApprovers); absent falls back to repo permission (ADR-0128). */
+    trustedApprovers?: readonly string[];
 }
 export interface ReviewFeedback {
     prNumber: number;
@@ -32,6 +39,7 @@ export interface ReviewFeedback {
         body: string;
         author: string;
     }[];
+    source?: 'comment';
 }
 export declare class ReviewReworkError extends Error {
     name: string;
@@ -44,11 +52,18 @@ export declare function fetchReviewFeedback(octokit: Pick<Octokit, 'rest' | 'pag
     prNumber: number;
     reviewId: number;
 }): Promise<ReviewFeedback>;
+/** The feedback of one `/factory rework` comment, re-read from GitHub so only the text after the command is used. */
+export declare function fetchCommentFeedback(octokit: Pick<Octokit, 'rest'>, opts: {
+    owner: string;
+    repo: string;
+    prNumber: number;
+    commentId: number;
+}): Promise<ReviewFeedback>;
 export declare function renderReviewFeedback(feedback: ReviewFeedback): string;
 /** The review as a one-result CheckSummary, the same shape ciReworkSummary gives the rework worker. */
 export declare function reviewReworkSummary(feedback: ReviewFeedback): CheckSummary;
 /** A synthetic CHECK resume: skips PLAN and BUILD for a review-rework run. */
-export declare function reviewReworkResume(request: Pick<RunRequest, 'reviewRework' | 'iterate' | 'preferredRoute' | 'modelPins'>): NonNullable<RunRequest['resumeFrom']> | undefined;
+export declare function reviewReworkResume(request: Pick<RunRequest, 'reviewRework' | 'iterate' | 'feedbackRound' | 'preferredRoute' | 'modelPins'>, feedbackPlan?: Pick<FeedbackRoundPlan, 'replan'>): NonNullable<RunRequest['resumeFrom']> | undefined;
 export declare function runReviewReworkBuild(opts: {
     target: ReviewReworkTarget;
     repo: string;
@@ -60,5 +75,5 @@ export declare function runReviewReworkBuild(opts: {
     feedback: ReviewFeedback;
 }>;
 /** runIssue's hook before the first CHECK: reworks the requested review unless a CHECK resume was asked for. */
-export declare function runRequestedReviewRework(request: Pick<RunRequest, 'reviewRework' | 'iterate' | 'resumeFrom' | 'repo' | 'branch'>, ports: Pick<RunPorts, 'octokit' | 'reworkWorker'>, checkOpts: Parameters<typeof checkPhase>[0]): Promise<void>;
+export declare function runRequestedReviewRework(request: Pick<RunRequest, 'reviewRework' | 'iterate' | 'feedbackRound' | 'resumeFrom' | 'repo' | 'branch'>, ports: Pick<RunPorts, 'octokit' | 'reworkWorker'>, checkOpts: Parameters<typeof checkPhase>[0], feedbackPlan?: Pick<FeedbackRoundPlan, 'prNumber' | 'summary'>): Promise<void>;
 //# sourceMappingURL=review-rework.d.ts.map

package/dist/run/review-rework.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"review-rework.d.ts","sourceRoot":"","sources":["../../src/run/review-rework.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,EAAE,YAAY,EAAE,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE3D,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,kGAAkG;AAClG,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,8FAA8F;AAC9F,MAAM,WAAW,mBAAmB;IAClC,uGAAuG;IACvG,YAAY,CAAC,EAAE,kBAAkB,CAAC;IAClC,oGAAoG;IACpG,OAAO,CAAC,EAAE,aAAa,CAAC;CACzB;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAC3E;AAED,qBAAa,iBAAkB,SAAQ,KAAK;IACjC,IAAI,SAAuB;CACrC;AAID,eAAO,MAAM,0BAA0B,QAGsG,CAAC;AAI9I,2GAA2G;AAC3G,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,CAAC,EAC3C,IAAI,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GACxE,OAAO,CAAC,cAAc,CAAC,CA6BzB;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,cAAc,GAAG,MAAM,CAiBrE;AAED,uGAAuG;AACvG,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,cAAc,GAAG,YAAY,CAQ1E;AAED,8EAA8E;AAC9E,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,cAAc,GAAG,SAAS,GAAG,gBAAgB,GAAG,WAAW,CAAC,GACrF,WAAW,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,GAAG,SAAS,CAQnD;AAED,wBAAsB,oBAAoB,CAAC,IAAI,EAAE;IAC/C,MAAM,EAAE,kBAAkB,CAAC;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,CAAC,CAAC;IAC5C,SAAS,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5C,MAAM,CAAC,EAAE,OAAO,YAAY,CAAC;CAC9B,GAAG,OAAO,CAAC;IAAE,QAAQ,EAAE,cAAc,CAAA;CAAE,CAAC,CAoDxC;AA2BD,gHAAgH;AAChH,wBAAsB,wBAAwB,CAC5C,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,cAAc,GAAG,SAAS,GAAG,YAAY,GAAG,MAAM,GAAG,QAAQ,CAAC,EACxF,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,SAAS,GAAG,cAAc,CAAC,EACjD,SAAS,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,GAC1C,OAAO,CAAC,IAAI,CAAC,CAcf"}
+{"version":3,"file":"review-rework.d.ts","sourceRoot":"","sources":["../../src/run/review-rework.ts"],"names":[],"mappings":"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"}