@on-par/factory-core 0.9.7-next.9 → 0.9.8-next.1

package/dist/run/ci-rework.js

@@ -0,0 +1,113 @@
+// packages/core/src/run/ci-rework.ts — attribution, budget and feedback for SHIP CI rework (#2816)
+import { isPassingConclusion, listAllCheckRuns } from '../utils/ci-watch.js';
+export const MAX_CI_REWORK_ROUNDS = 2;
+export const CI_REWORK_ENV = 'FACTORY_MAX_CI_REWORK_ROUNDS';
+const LIST_FILES_PAGE_SIZE = 100;
+const LIST_FILES_MAX_PAGES = 30;
+export const CI_REWORK_INSTRUCTIONS = 'CI (CodeQL) flagged the alerts above on files this PR changed. Fix the root cause in the code at the listed file:line. ' +
+    'Suppression is forbidden: do not add `// codeql[...]`, `lgtm`, `eslint-disable` or `@ts-ignore` comments, do not exclude queries or paths in any config, and do not dismiss alerts. ' +
+    'Commit the fix.';
+/** Non-negative integer from FACTORY_MAX_CI_REWORK_ROUNDS (0 disables CI rework); anything else falls back to the default. */
+export function resolveMaxCiReworkRounds(env = process.env) {
+    const value = (env[CI_REWORK_ENV] ?? '').trim();
+    return /^\d+$/.test(value) ? Number(value) : MAX_CI_REWORK_ROUNDS;
+}
+function alertPath(location) {
+    const trimmed = location.trim();
+    if (trimmed === '' || trimmed === '(unknown location)')
+        return undefined;
+    const path = trimmed.replace(/:\d+$/, '').replace(/^\.\//, '');
+    return path === '' ? undefined : path;
+}
+/** Alerts whose file is among the PR's changed files; the rest are pre-existing or baseline. */
+export function attributableCodeqlAlerts(evidence, changedFiles) {
+    if (!evidence)
+        return [];
+    const changed = new Set(changedFiles);
+    return evidence.alerts.filter((alert) => {
+        const path = alertPath(alert.location);
+        return path !== undefined && changed.has(path);
+    });
+}
+/** True when a failing check is attributed on its own (not through CodeQL alerts). */
+export function needsBaseChecks(evidence) {
+    return !!evidence && evidence.failingChecks.some((c) => !(/codeql/i.test(c.name) && evidence.alerts.length > 0));
+}
+/** Attributes each failing item to the PR: alerts by changed file, other checks by the base commit (#2817). */
+export function attributeCiFailure(evidence, changedFiles, base) {
+    if (!evidence)
+        return { baseline: false, items: [] };
+    const changed = new Set(changedFiles);
+    const items = [];
+    for (const alert of evidence.alerts) {
+        const path = alertPath(alert.location);
+        const attributable = path !== undefined && changed.has(path);
+        items.push({
+            kind: 'codeql-alert',
+            ref: `${alert.ruleId} at ${alert.location}`,
+            attributable,
+            reason: attributable ? 'file changed by this PR' : 'file not changed by this PR',
+        });
+    }
+    const baseLabel = base ? `${base.baseRef}@${base.baseSha.slice(0, 12)}` : '';
+    for (const check of evidence.failingChecks) {
+        if (/codeql/i.test(check.name) && evidence.alerts.length > 0)
+            continue;
+        if (!base) {
+            items.push({ kind: 'check', ref: check.name, attributable: true, reason: 'base checks unavailable' });
+            continue;
+        }
+        const onBase = base.failing.includes(check.name);
+        items.push({
+            kind: 'check',
+            ref: check.name,
+            attributable: !onBase,
+            reason: onBase ? `also failing on base ${baseLabel}` : `not failing on base ${baseLabel}`,
+        });
+    }
+    const baseline = items.length > 0 && items.every((i) => !i.attributable) && !evidence.errors?.length;
+    return { baseline, ...(base ? { baseRef: base.baseRef, baseSha: base.baseSha } : {}), items };
+}
+/** Failing check names on the latest commit of the PR's base branch. Errors propagate to the caller. */
+export async function listBaseFailingChecks(octokit, owner, repo, prNumber) {
+    const { data: pr } = await octokit.rest.pulls.get({ owner, repo, pull_number: prNumber });
+    const baseRef = pr.base.ref;
+    const { data: branch } = await octokit.rest.repos.getBranch({ owner, repo, branch: baseRef });
+    const baseSha = branch.commit.sha;
+    const runs = await listAllCheckRuns(octokit, owner, repo, baseSha, 100, 10);
+    const failing = new Set();
+    for (const run of runs) {
+        if (run.name && run.status === 'completed' && !isPassingConclusion(run.conclusion))
+            failing.add(run.name);
+    }
+    return { baseRef, baseSha, failing: [...failing] };
+}
+/** The same CheckSummary shape local CHECK rework consumes, with one FAIL `ci_codeql` result. */
+export function ciReworkSummary(alerts) {
+    const lines = alerts.map((a) => `- ${a.ruleId} at ${a.location} — ${a.message}`);
+    const details = ['CodeQL alerts on files this PR changed:', ...lines].join('\n');
+    return {
+        failures: 1,
+        passes: 0,
+        skips: 0,
+        total: 1,
+        results: [{ checker: 'ci_codeql', result: 'FAIL', details }],
+    };
+}
+export async function listPrChangedFiles(octokit, owner, repo, prNumber) {
+    const files = [];
+    for (let page = 1; page <= LIST_FILES_MAX_PAGES; page++) {
+        const { data } = await octokit.rest.pulls.listFiles({
+            owner,
+            repo,
+            pull_number: prNumber,
+            per_page: LIST_FILES_PAGE_SIZE,
+            page,
+        });
+        files.push(...data.map((f) => f.filename));
+        if (data.length < LIST_FILES_PAGE_SIZE)
+            break;
+    }
+    return files;
+}
+//# sourceMappingURL=ci-rework.js.map

package/dist/run/ci-rework.js.map

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

package/dist/run/ci-suppression-guard.d.ts

@@ -0,0 +1,11 @@
+import type { CiSuppressionFinding } from '../types/index.js';
+export declare const SUPPRESSION_ATTEMPT = "suppression-attempt";
+/** Scans a unified git diff for suppression comments (added lines) and protected paths (any file header). */
+export declare function scanReworkDiff(diff: string): CiSuppressionFinding[];
+/** Reads the worktree's current HEAD SHA. */
+export declare function readWorktreeHead(worktree: string): Promise<string>;
+/** Reads the committed diff from `fromSha` to HEAD (SHIP re-entry pushes HEAD, not the working tree). */
+export declare function readReworkDiff(worktree: string, fromSha: string): Promise<string>;
+/** One-line summary of guard findings for park messages and logs. */
+export declare function describeSuppression(findings: readonly CiSuppressionFinding[]): string;
+//# sourceMappingURL=ci-suppression-guard.d.ts.map

package/dist/run/ci-suppression-guard.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ci-suppression-guard.d.ts","sourceRoot":"","sources":["../../src/run/ci-suppression-guard.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAG9D,eAAO,MAAM,mBAAmB,wBAAwB,CAAC;AA2CzD,6GAA6G;AAC7G,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,oBAAoB,EAAE,CAsEnE;AAED,6CAA6C;AAC7C,wBAAsB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAKxE;AAED,yGAAyG;AACzG,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAKvF;AAED,qEAAqE;AACrE,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,SAAS,oBAAoB,EAAE,GAAG,MAAM,CAOrF"}

package/dist/run/ci-suppression-guard.js

@@ -0,0 +1,143 @@
+// packages/core/src/run/ci-suppression-guard.ts — mechanical suppression guard for SHIP CI rework diffs (#2818)
+import { execGit } from '../utils/git-exec.js';
+export const SUPPRESSION_ATTEMPT = 'suppression-attempt';
+const MAX_MATCH = 200;
+const MAX_LISTED = 5;
+/** True when an eslint-disable directive in `line` is blanket or names a security rule. */
+function eslintDisablesSecurity(line) {
+    const m = /eslint-disable(?:-next-line|-line)?(?![\w-])([^\n]*)/.exec(line);
+    if (!m)
+        return false;
+    let list = m[1];
+    const dash = list.indexOf('--');
+    if (dash >= 0)
+        list = list.slice(0, dash);
+    const end = list.indexOf('*/');
+    if (end >= 0)
+        list = list.slice(0, end);
+    const rules = list.split(/[,\s]+/).filter(Boolean);
+    return rules.length === 0 || rules.some((r) => /security/i.test(r));
+}
+/** Added-line rules; the single owner of the known suppression comment forms. */
+const SUPPRESSION_COMMENT_RULES = [
+    { rule: 'codeql-comment', test: (l) => /\bcodeql\[/i.test(l) },
+    { rule: 'lgtm-comment', test: (l) => /(?:\/\/|#|\/\*|\*|<!--|--).*\blgtm\b/i.test(l) },
+    { rule: 'nosec-comment', test: (l) => /#\s*nosec\b/i.test(l) || /\/\/\s*#?nosec\b/i.test(l) },
+    { rule: 'eslint-disable-security', test: eslintDisablesSecurity },
+];
+function pathRules(path) {
+    const segments = path.split('/');
+    const base = segments[segments.length - 1];
+    const rules = [];
+    if (path.startsWith('.github/workflows/'))
+        rules.push('workflow-path');
+    if (segments.slice(0, -1).some((s) => /^\.?codeql$/i.test(s)) || /codeql.*\.(ya?ml|json)$/i.test(base)) {
+        rules.push('codeql-path');
+    }
+    if (/\.sarif(\.json)?$/i.test(base))
+        rules.push('sarif-path');
+    return rules;
+}
+/** Scans a unified git diff for suppression comments (added lines) and protected paths (any file header). */
+export function scanReworkDiff(diff) {
+    const findings = [];
+    const seen = new Set();
+    const add = (f) => {
+        const key = `${f.kind}|${f.rule}|${f.file}|${f.line ?? ''}|${f.kind === 'path' ? f.match : ''}`;
+        if (seen.has(key))
+            return;
+        seen.add(key);
+        findings.push(f);
+    };
+    const checkPath = (path) => {
+        if (!path || path === '/dev/null')
+            return;
+        for (const rule of pathRules(path))
+            add({ kind: 'path', rule, file: path, match: path });
+    };
+    let file = '(unknown)';
+    let line;
+    let inHunk = false;
+    for (const raw of diff.split('\n')) {
+        const header = /^diff --git a\/(.+) b\/(.+)$/.exec(raw);
+        if (header) {
+            inHunk = false;
+            line = undefined;
+            file = header[2];
+            checkPath(header[1]);
+            checkPath(header[2]);
+            continue;
+        }
+        if (!inHunk) {
+            const rename = /^rename (?:from|to) (.+)$/.exec(raw);
+            if (rename) {
+                checkPath(rename[1]);
+                continue;
+            }
+            const oldPath = /^--- (?:a\/)?(.+)$/.exec(raw);
+            if (oldPath) {
+                checkPath(oldPath[1]);
+                continue;
+            }
+            const newPath = /^\+\+\+ (?:b\/)?(.+)$/.exec(raw);
+            if (newPath) {
+                if (newPath[1] !== '/dev/null')
+                    file = newPath[1];
+                checkPath(newPath[1]);
+                continue;
+            }
+        }
+        const hunk = /^@@ -\d+(?:,\d+)? \+(\d+)(?:,\d+)? @@/.exec(raw);
+        if (hunk) {
+            inHunk = true;
+            line = Number(hunk[1]);
+            continue;
+        }
+        if (raw.startsWith('+')) {
+            const text = raw.slice(1);
+            for (const { rule, test } of SUPPRESSION_COMMENT_RULES) {
+                if (test(text)) {
+                    add({
+                        kind: 'comment',
+                        rule,
+                        file,
+                        ...(line !== undefined ? { line } : {}),
+                        match: text.trim().slice(0, MAX_MATCH),
+                    });
+                }
+            }
+            if (line !== undefined)
+                line++;
+        }
+        else if (raw.startsWith(' ') && line !== undefined) {
+            line++;
+        }
+    }
+    return findings;
+}
+/** Reads the worktree's current HEAD SHA. */
+export async function readWorktreeHead(worktree) {
+    const { stdout } = await execGit(['rev-parse', 'HEAD'], { cwd: worktree });
+    const sha = stdout.trim();
+    if (!sha)
+        throw new Error('git rev-parse HEAD returned nothing');
+    return sha;
+}
+/** Reads the committed diff from `fromSha` to HEAD (SHIP re-entry pushes HEAD, not the working tree). */
+export async function readReworkDiff(worktree, fromSha) {
+    const { stdout } = await execGit(['diff', '--no-color', '--no-ext-diff', '--unified=0', fromSha, 'HEAD'], {
+        cwd: worktree,
+    });
+    return stdout;
+}
+/** One-line summary of guard findings for park messages and logs. */
+export function describeSuppression(findings) {
+    const items = findings.slice(0, MAX_LISTED).map((f) => {
+        if (f.kind === 'comment')
+            return `${f.rule} at ${f.file}${f.line !== undefined ? `:${f.line}` : ''}`;
+        return `${f.rule} ${f.match}`;
+    });
+    const more = findings.length > MAX_LISTED ? `, +${findings.length - MAX_LISTED} more` : '';
+    return `${SUPPRESSION_ATTEMPT}: ${findings.length} finding(s): ${items.join(', ')}${more}`;
+}
+//# sourceMappingURL=ci-suppression-guard.js.map

package/dist/run/ci-suppression-guard.js.map

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

package/dist/run/outcome.d.ts

@@ -1,6 +1,13 @@
 import type { EventKind } from '../events/kinds.js';
-export type ParkReason = Extract<EventKind, 'escalate' | 'timeout' | 'fail' | 'conflict' | 'ci-failed' | 'ci-infra' | 'held' | 'config'>;
-export type BuildRoute = 'codex' | 'claude' | 'opencode';
+export type ParkReason = Extract<EventKind, 'escalate' | 'timeout' | 'fail' | 'conflict' | 'ci-failed' | 'ci-infra' | 'held' | 'config' | 'blocked'>;
+import type { BuildRoutePin } from '../config/repo.js';
+export type BuildRoute = BuildRoutePin;
+/** CHECK/CI rework reruns on the route BUILD completed on, `command` included (#2873):
+ *  reworkWorker keeps it when its model can run and reroutes otherwise. */
+export declare function reworkRouteFor(route: BuildRoute, model: string | undefined): {
+    reworkRoute?: BuildRoutePin;
+    reworkModel?: string;
+};
 /** A run's terminal outcome. `parked` is produced by the CLI's LaneParkError and `released`
  *  by an environment-caused CHECK failure (#1928, not a park); `shipped` / `ready` /
  *  `escalated` are defined here for later stories (#4, #5) that re-point the CLI

package/dist/run/outcome.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"outcome.d.ts","sourceRoot":"","sources":["../../src/run/outcome.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,MAAM,MAAM,UAAU,GAAG,OAAO,CAC9B,SAAS,EACT,UAAU,GAAG,SAAS,GAAG,MAAM,GAAG,UAAU,GAAG,WAAW,GAAG,UAAU,GAAG,MAAM,GAAG,QAAQ,CAC5F,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,OAAO,GAAG,QAAQ,GAAG,UAAU,CAAC;AAEzD;;;8CAG8C;AAC9C,MAAM,MAAM,UAAU,GAClB;IAAE,KAAK,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAC/F;IACE,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,UAAU,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,0CAA0C;IAC1C,KAAK,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;CAC1C,GACD;IACE,KAAK,EAAE,QAAQ,CAAC;IAChB,MAAM,EAAE,UAAU,CAAC;IACnB,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,yHAAyH;IACzH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,6FAA6F;IAC7F,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B,GACD;IACE,KAAK,EAAE,UAAU,CAAC;IAClB,MAAM,EAAE,aAAa,CAAC;IACtB,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,6DAA6D;IAC7D,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,uEAAuE;IACvE,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,GACD;IAAE,KAAK,EAAE,WAAW,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,UAAU,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEvG;;iFAEiF;AACjF,wBAAgB,aAAa,CAAC,GAAG,EAAE,OAAO,GAAG,UAAU,CAOtD;AAED;;;+EAG+E;AAC/E,wBAAgB,UAAU,CAAC,GAAG,EAAE,OAAO,GAAG;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,EAAE,CAQ3E"}
+{"version":3,"file":"outcome.d.ts","sourceRoot":"","sources":["../../src/run/outcome.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,MAAM,MAAM,UAAU,GAAG,OAAO,CAC9B,SAAS,EACT,UAAU,GAAG,SAAS,GAAG,MAAM,GAAG,UAAU,GAAG,WAAW,GAAG,UAAU,GAAG,MAAM,GAAG,QAAQ,GAAG,SAAS,CACxG,CAAC;AAEF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAEvD,MAAM,MAAM,UAAU,GAAG,aAAa,CAAC;AAEvC;2EAC2E;AAC3E,wBAAgB,cAAc,CAC5B,KAAK,EAAE,UAAU,EACjB,KAAK,EAAE,MAAM,GAAG,SAAS,GACxB;IAAE,WAAW,CAAC,EAAE,aAAa,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,CAEvD;AAED;;;8CAG8C;AAC9C,MAAM,MAAM,UAAU,GAClB;IAAE,KAAK,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAC/F;IACE,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,UAAU,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,0CAA0C;IAC1C,KAAK,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;CAC1C,GACD;IACE,KAAK,EAAE,QAAQ,CAAC;IAChB,MAAM,EAAE,UAAU,CAAC;IACnB,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,yHAAyH;IACzH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,6FAA6F;IAC7F,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B,GACD;IACE,KAAK,EAAE,UAAU,CAAC;IAClB,MAAM,EAAE,aAAa,CAAC;IACtB,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,6DAA6D;IAC7D,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,uEAAuE;IACvE,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,GACD;IAAE,KAAK,EAAE,WAAW,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,UAAU,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEvG;;iFAEiF;AACjF,wBAAgB,aAAa,CAAC,GAAG,EAAE,OAAO,GAAG,UAAU,CAOtD;AAED;;;+EAG+E;AAC/E,wBAAgB,UAAU,CAAC,GAAG,EAAE,OAAO,GAAG;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,EAAE,CAQ3E"}

package/dist/run/outcome.js

@@ -1,3 +1,8 @@
+/** CHECK/CI rework reruns on the route BUILD completed on, `command` included (#2873):
+ *  reworkWorker keeps it when its model can run and reroutes otherwise. */
+export function reworkRouteFor(route, model) {
+    return { reworkRoute: route, reworkModel: model };
+}
 /** Core classifies structurally — via a parked RunOutcome on `err.outcome` or a
  *  `parkReason` marker property — rather than `instanceof`, because core cannot import
  *  the CLI's error classes (LaneParkError, LandConflictError, CiFailedError). */

package/dist/run/outcome.js.map

@@ -1 +1 @@
-{"version":3,"file":"outcome.js","sourceRoot":"","sources":["../../src/run/outcome.ts"],"names":[],"mappings":"AAmDA;;iFAEiF;AACjF,MAAM,UAAU,aAAa,CAAC,GAAY;IACxC,MAAM,OAAO,GAAI,GAAmD,EAAE,OAAO,CAAC;IAC9E,IAAI,OAAO,IAAI,OAAO,CAAC,KAAK,KAAK,QAAQ;QAAE,OAAO,OAAO,CAAC,MAAM,CAAC;IACjE,MAAM,MAAM,GAAI,GAAsD,EAAE,UAAU,CAAC;IACnF,IAAI,MAAM;QAAE,OAAO,MAAM,CAAC;IAC1B,IAAK,GAA+C,EAAE,MAAM,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC7F,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;+EAG+E;AAC/E,MAAM,UAAU,UAAU,CAAC,GAAY;IACrC,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;IAClC,MAAM,GAAG,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC7D,MAAM,MAAM,GAAuC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IAC3E,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,wDAAwD,GAAG,EAAE,EAAE,CAAC,CAAC;IACrG,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
+{"version":3,"file":"outcome.js","sourceRoot":"","sources":["../../src/run/outcome.ts"],"names":[],"mappings":"AAWA;2EAC2E;AAC3E,MAAM,UAAU,cAAc,CAC5B,KAAiB,EACjB,KAAyB;IAEzB,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;AACpD,CAAC;AA4CD;;iFAEiF;AACjF,MAAM,UAAU,aAAa,CAAC,GAAY;IACxC,MAAM,OAAO,GAAI,GAAmD,EAAE,OAAO,CAAC;IAC9E,IAAI,OAAO,IAAI,OAAO,CAAC,KAAK,KAAK,QAAQ;QAAE,OAAO,OAAO,CAAC,MAAM,CAAC;IACjE,MAAM,MAAM,GAAI,GAAsD,EAAE,UAAU,CAAC;IACnF,IAAI,MAAM;QAAE,OAAO,MAAM,CAAC;IAC1B,IAAK,GAA+C,EAAE,MAAM,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC7F,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;+EAG+E;AAC/E,MAAM,UAAU,UAAU,CAAC,GAAY;IACrC,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;IAClC,MAAM,GAAG,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC7D,MAAM,MAAM,GAAuC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IAC3E,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,wDAAwD,GAAG,EAAE,EAAE,CAAC,CAAC;IACrG,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/dist/run/park-comment.d.ts

@@ -0,0 +1,73 @@
+import type { Octokit } from '@octokit/rest';
+import type { ParkReason } from './outcome.js';
+export declare const ISSUE_STATE_MARKER_VERSION = "v1";
+export interface ParkCommentInput {
+    issue: number;
+    reason: ParkReason;
+    message: string;
+    runId: string;
+    branch: string;
+    lane?: string;
+    parkSha?: string;
+    blockers?: readonly number[];
+    autoUnparks?: number;
+    status?: string;
+}
+/** `reason` is a plain string because the parser reads untrusted text. */
+export interface ParkState {
+    reason: string;
+    lane?: string;
+    runId?: string;
+    branch?: string;
+    parkSha?: string;
+    blockers: number[];
+    /** Times the blocked-park poller re-queued this issue; 0 when the line is absent or malformed. */
+    autoUnparks: number;
+    status?: string;
+}
+export interface ParkStateComment {
+    id: number;
+    body: string;
+}
+export declare function issueStateMarker(issue: number): string;
+export declare function parkUnblockHint(reason: ParkReason, issue: number): string;
+export declare function renderParkComment(input: ParkCommentInput): string;
+export interface ParkCommentPatch {
+    reason?: ParkReason;
+    status?: string;
+    autoUnparks?: number;
+}
+/** Rewrites the state block (and the unblock hint on a reason change) in place; null when there is no state block. */
+export declare function patchParkComment(body: string, issue: number, patch: ParkCommentPatch): string | null;
+/** Lowest-id marked comment decides; null when none, or when its state block is unreadable. */
+export declare function readParkState(comments: readonly ParkStateComment[], issue?: number): ParkState | null;
+/** The lowest-id marker comment written by the authenticated user, or undefined. */
+export declare function findOwnParkComment(deps: {
+    octokit: Octokit;
+    repo: string;
+    issue: number;
+}): Promise<ParkStateComment | undefined>;
+export declare function upsertParkComment(deps: {
+    octokit: Octokit;
+    repo: string;
+    input: ParkCommentInput;
+}): Promise<{
+    commentId: number;
+    created: boolean;
+}>;
+/** Never throws: a GitHub or git failure comes back as `{ ok: false, error }`. */
+export declare function publishParkComment(deps: {
+    octokit: Octokit;
+    repo: string;
+    worktree?: string;
+    input: Omit<ParkCommentInput, 'parkSha'>;
+    readHead?: (worktree: string) => Promise<string>;
+}): Promise<{
+    ok: true;
+    commentId: number;
+    created: boolean;
+} | {
+    ok: false;
+    error: string;
+}>;
+//# sourceMappingURL=park-comment.d.ts.map

package/dist/run/park-comment.d.ts.map

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

package/dist/run/park-comment.js

@@ -0,0 +1,211 @@
+// src/run/park-comment.ts — upsert one issue comment with the park state behind a hidden factory-issue-state marker (#2314, ADR-0130)
+//
+// Every runIssue park edits one comment per issue in place (#728). Anyone can post the marker, so only a
+// marker comment written by the authenticated identity is trusted (same rule as readiness/slice-plan-github.ts).
+import { fenceExcerpt, stripHiddenContent } from '../filing/sanitize.js';
+import { readWorktreeHead } from './ci-suppression-guard.js';
+export const ISSUE_STATE_MARKER_VERSION = 'v1';
+const PAGE_SIZE = 100;
+const STATE_HEADING = '**Park state**';
+const MARKER_RE = new RegExp(`<!-- factory-issue-state ${ISSUE_STATE_MARKER_VERSION} issue:(\\d+) -->`);
+export function issueStateMarker(issue) {
+    return `<!-- factory-issue-state ${ISSUE_STATE_MARKER_VERSION} issue:${issue} -->`;
+}
+const PARK_HINTS = {
+    fail: 'fix the failing checks on the branch or clarify the issue, then run `factory unpark <n>`.',
+    blocked: 'waiting on a filed blocker. The factory resumes it once the blocker closes; run `factory unpark <n>` to retry sooner.',
+    escalate: 'a human decision is needed. Answer it on the issue, then run `factory unpark <n>`.',
+    timeout: 'a phase timed out. Check the lane log and retry with `factory unpark <n>`.',
+    conflict: 'rebase the branch onto main, then run `factory unpark <n>`.',
+    'ci-failed': 'fix CI on the PR, then run `factory unpark <n>`.',
+    'ci-infra': 'CI infrastructure failed. Re-run CI, then run `factory unpark <n>`.',
+    held: 'the same failure parked a prior run. A human must change the approach before `factory unpark <n>`.',
+    config: 'fix the named config file and line, then run `factory unpark <n>`.',
+};
+export function parkUnblockHint(reason, issue) {
+    return PARK_HINTS[reason].replaceAll('<n>', String(issue));
+}
+function clean(v) {
+    return stripHiddenContent(v)
+        .replace(/[\r\n]+/g, ' ')
+        .trim();
+}
+export function renderParkComment(input) {
+    const blockers = input.blockers ?? [];
+    const stateLines = [
+        `reason: ${clean(input.reason)}`,
+        `lane: ${(input.lane && clean(input.lane)) || '-'}`,
+        `run: ${clean(input.runId)}`,
+        `branch: ${clean(input.branch)}`,
+        `park-sha: ${(input.parkSha && clean(input.parkSha)) || '-'}`,
+        `blockers: ${blockers.length > 0 ? blockers.map((n) => `#${n}`).join(', ') : '-'}`,
+    ];
+    if (input.autoUnparks !== undefined && input.autoUnparks > 0)
+        stateLines.push(`auto-unparks: ${input.autoUnparks}`);
+    if (input.status)
+        stateLines.push(`status: ${clean(input.status)}`);
+    const stateBlock = stateLines.join('\n');
+    return [
+        '### Factory park state',
+        '',
+        STATE_HEADING,
+        '',
+        fenceExcerpt(stateBlock),
+        '',
+        '**Why it parked**',
+        '',
+        fenceExcerpt(stripHiddenContent(input.message)),
+        '',
+        `**What unblocks this:** ${parkUnblockHint(input.reason, input.issue)}`,
+        '',
+        issueStateMarker(input.issue),
+    ].join('\n');
+}
+function findStateFence(body) {
+    const lines = body.split('\n');
+    const heading = lines.indexOf(STATE_HEADING);
+    if (heading === -1)
+        return null;
+    const isFence = (l) => /^`{5,}$/.test(l);
+    const open = lines.findIndex((l, i) => i > heading && isFence(l));
+    if (open === -1)
+        return null;
+    const close = lines.indexOf(lines[open], open + 1);
+    if (close === -1)
+        return null;
+    return { lines, open, close };
+}
+function parseStateBlock(body) {
+    const fence = findStateFence(body);
+    if (fence === null)
+        return null;
+    const { lines, open, close } = fence;
+    const values = new Map();
+    for (const line of lines.slice(open + 1, close)) {
+        const sep = line.indexOf(':');
+        if (sep === -1)
+            continue;
+        values.set(line.slice(0, sep).trim(), line.slice(sep + 1).trim());
+    }
+    const reason = values.get('reason');
+    if (!reason)
+        return null;
+    const optional = (key) => {
+        const v = values.get(key);
+        return v === undefined || v === '' || v === '-' ? undefined : v;
+    };
+    const blockers = [...(values.get('blockers') ?? '').matchAll(/#(\d+)/g)].map((m) => Number(m[1]));
+    const rawAutoUnparks = values.get('auto-unparks') ?? '';
+    const autoUnparks = /^\d+$/.test(rawAutoUnparks) && Number.isSafeInteger(Number(rawAutoUnparks)) ? Number(rawAutoUnparks) : 0;
+    return {
+        reason,
+        lane: optional('lane'),
+        runId: optional('run'),
+        branch: optional('branch'),
+        parkSha: optional('park-sha'),
+        blockers,
+        autoUnparks,
+        status: optional('status'),
+    };
+}
+/** Rewrites the state block (and the unblock hint on a reason change) in place; null when there is no state block. */
+export function patchParkComment(body, issue, patch) {
+    const fence = findStateFence(body);
+    if (fence === null)
+        return null;
+    const { lines, open, close } = fence;
+    const inner = lines.slice(open + 1, close);
+    const setLine = (key, value) => {
+        const at = inner.findIndex((l) => l.slice(0, Math.max(l.indexOf(':'), 0)).trim() === key);
+        if (at === -1)
+            inner.push(`${key}: ${value}`);
+        else
+            inner[at] = `${key}: ${value}`;
+    };
+    if (patch.reason !== undefined)
+        setLine('reason', clean(patch.reason));
+    if (patch.status !== undefined)
+        setLine('status', clean(patch.status));
+    if (patch.autoUnparks !== undefined)
+        setLine('auto-unparks', String(patch.autoUnparks));
+    const out = [...lines.slice(0, open + 1), ...inner, ...lines.slice(close)];
+    if (patch.reason !== undefined) {
+        const hint = out.findIndex((l) => l.startsWith('**What unblocks this:**'));
+        if (hint !== -1)
+            out[hint] = `**What unblocks this:** ${parkUnblockHint(patch.reason, issue)}`;
+    }
+    return out.join('\n');
+}
+/** Lowest-id marked comment decides; null when none, or when its state block is unreadable. */
+export function readParkState(comments, issue) {
+    const marked = comments
+        .filter((c) => {
+        const m = MARKER_RE.exec(c.body);
+        return m !== null && (issue === undefined || Number(m[1]) === issue);
+    })
+        .sort((a, b) => a.id - b.id);
+    if (marked.length === 0)
+        return null;
+    return parseStateBlock(marked[0].body);
+}
+/** The lowest-id marker comment written by the authenticated user, or undefined. */
+export async function findOwnParkComment(deps) {
+    const { octokit, repo, issue } = deps;
+    const [owner, name] = repo.split('/');
+    const marker = issueStateMarker(issue);
+    const { data: me } = await octokit.rest.users.getAuthenticated();
+    let existing;
+    for (let page = 1;; page++) {
+        const { data } = await octokit.rest.issues.listComments({
+            owner,
+            repo: name,
+            issue_number: issue,
+            per_page: PAGE_SIZE,
+            page,
+        });
+        for (const comment of data) {
+            const body = comment.body ?? '';
+            if (comment.user?.id !== me.id || !body.includes(marker))
+                continue;
+            if (existing === undefined || comment.id < existing.id)
+                existing = { id: comment.id, body };
+        }
+        if (data.length < PAGE_SIZE)
+            break;
+    }
+    return existing;
+}
+export async function upsertParkComment(deps) {
+    const { octokit, repo, input } = deps;
+    const [owner, name] = repo.split('/');
+    const existing = await findOwnParkComment({ octokit, repo, issue: input.issue });
+    const autoUnparks = input.autoUnparks ?? (existing === undefined ? 0 : (readParkState([existing], input.issue)?.autoUnparks ?? 0));
+    const body = renderParkComment({ ...input, autoUnparks });
+    if (existing !== undefined) {
+        await octokit.rest.issues.updateComment({ owner, repo: name, comment_id: existing.id, body });
+        return { commentId: existing.id, created: false };
+    }
+    const { data } = await octokit.rest.issues.createComment({ owner, repo: name, issue_number: input.issue, body });
+    return { commentId: data.id, created: true };
+}
+/** Never throws: a GitHub or git failure comes back as `{ ok: false, error }`. */
+export async function publishParkComment(deps) {
+    const { octokit, repo, worktree, input, readHead = readWorktreeHead } = deps;
+    let parkSha;
+    if (worktree) {
+        try {
+            parkSha = (await readHead(worktree)) || undefined;
+        }
+        catch {
+            parkSha = undefined;
+        }
+    }
+    try {
+        const result = await upsertParkComment({ octokit, repo, input: { ...input, parkSha } });
+        return { ok: true, ...result };
+    }
+    catch (err) {
+        return { ok: false, error: err instanceof Error ? err.message : String(err) };
+    }
+}
+//# sourceMappingURL=park-comment.js.map