@joynt/foundry 0.0.0-stage → 0.1.51

package/dist/lib/review.d.ts

@@ -0,0 +1,38 @@
+import * as verifyLib from './verify.js';
+import type { FoundryConfig } from '../types.js';
+export interface ReviewTarget {
+    pr_number: number;
+    branch: string;
+    base: string;
+    /** Who approved, for the PR comment. */
+    reviewer?: string;
+}
+export type ReviewOutcome = {
+    merged: true;
+    sha: string;
+    rebased: boolean;
+    rebuild?: verifyLib.VerifyResult | null;
+} | {
+    merged: false;
+    reason: 'conflicting' | 'rebase_failed' | 'verify_failed' | 'checks_failed' | 'checks_timeout' | 'merge_failed';
+    detail: string;
+};
+export interface ChecksResult {
+    state: 'success' | 'failure' | 'pending';
+    failed: string[];
+    pending: string[];
+}
+/** Summarise the check runs on a commit; our own run's job is ignored, it is never finished while we look. */
+export declare function summariseChecks(runs: Array<{
+    name: string;
+    status: string;
+    conclusion: string | null;
+}>, ignore?: string[]): ChecksResult;
+/** Poll the checks on `sha` until none is pending, or the timeout passes. */
+export declare function awaitChecks(repo: string, sha: string, opts: {
+    timeoutMs: number;
+    pollMs?: number;
+    ignore?: string[];
+}): Promise<ChecksResult>;
+export declare function reviewAndMerge(config: FoundryConfig, repoDir: string, target: ReviewTarget): Promise<ReviewOutcome>;
+//# sourceMappingURL=review.d.ts.map

package/dist/lib/review.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"review.d.ts","sourceRoot":"","sources":["../../src/lib/review.ts"],"names":[],"mappings":"AAuBA,OAAO,KAAK,SAAS,MAAM,aAAa,CAAC;AAEzC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAMjD,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,wCAAwC;IACxC,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,MAAM,aAAa,GACrB;IAAE,MAAM,EAAE,IAAI,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,SAAS,CAAC,YAAY,GAAG,IAAI,CAAA;CAAE,GACxF;IAAE,MAAM,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,aAAa,GAAG,eAAe,GAAG,eAAe,GAAG,eAAe,GAAG,gBAAgB,GAAG,cAAc,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEvJ,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC;IACzC,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,8GAA8G;AAC9G,wBAAgB,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC,EAAE,MAAM,GAAE,MAAM,EAAO,GAAG,YAAY,CAW7I;AAED,6EAA6E;AAC7E,wBAAsB,WAAW,CAC/B,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,MAAM,EACX,IAAI,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,GAC9D,OAAO,CAAC,YAAY,CAAC,CASvB;AAqED,wBAAsB,cAAc,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC,CAqGzH"}

package/dist/lib/review.js

@@ -0,0 +1,284 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.summariseChecks = summariseChecks;
+exports.awaitChecks = awaitChecks;
+exports.reviewAndMerge = reviewAndMerge;
+/**
+ * Review and merge — what happens when a pull request is approved.
+ *
+ * The flow a careful maintainer follows by hand, done by the approve button:
+ *
+ *   1. Make sure the PR merges cleanly. GitHub computes that lazily, so wait.
+ *   2. Rebase the branch onto its base so history stays linear, and push
+ *      with --force-with-lease (the lease is the ref we just fetched).
+ *   3. When the rebase changed the head, run `verify` on it and publish the
+ *      result as a fresh "Foundry Verification" check run. The agent's run
+ *      is on the old head; a branch rule that requires the check needs one
+ *      on the commit being merged. A failure stops here.
+ *   4. Wait for the PR's checks on the rebased head. A red check stops here.
+ *   5. Merge with the rebase method.
+ *   6. Run `integration_rebuild` on the merged base, when configured.
+ *
+ * Every step reports on the PR. Used by `foundry review` from a checkout and
+ * by the pr_approved event under the Action; they must not diverge.
+ */
+const path = __importStar(require("node:path"));
+const github = __importStar(require("./github.js"));
+const git = __importStar(require("./git.js"));
+const log = __importStar(require("./log.js"));
+const verifyLib = __importStar(require("./verify.js"));
+const stale_prs_js_1 = require("./stale-prs.js");
+const REVIEW_MARKER = '<!-- foundry-review -->';
+const CHECKS_POLL_MS = 15_000;
+const DEFAULT_CHECKS_TIMEOUT_S = 900;
+/** Summarise the check runs on a commit; our own run's job is ignored, it is never finished while we look. */
+function summariseChecks(runs, ignore = []) {
+    const failed = [];
+    const pending = [];
+    for (const r of runs) {
+        if (ignore.includes(r.name))
+            continue;
+        if (r.status !== 'completed') {
+            pending.push(r.name);
+            continue;
+        }
+        if (r.conclusion && !['success', 'neutral', 'skipped'].includes(r.conclusion))
+            failed.push(r.name);
+    }
+    if (failed.length > 0)
+        return { state: 'failure', failed, pending };
+    if (pending.length > 0)
+        return { state: 'pending', failed, pending };
+    return { state: 'success', failed, pending };
+}
+/** Poll the checks on `sha` until none is pending, or the timeout passes. */
+async function awaitChecks(repo, sha, opts) {
+    const deadline = Date.now() + opts.timeoutMs;
+    while (true) {
+        const runs = await github.listCheckRuns(repo, sha);
+        const result = summariseChecks(runs, opts.ignore ?? []);
+        if (result.state !== 'pending' || Date.now() >= deadline)
+            return result;
+        // Never sleep past the deadline; a 1s timeout must not take a 15s poll to notice.
+        await new Promise(r => setTimeout(r, Math.min(opts.pollMs ?? CHECKS_POLL_MS, Math.max(0, deadline - Date.now()))));
+    }
+}
+async function postReviewComment(repo, pr, body) {
+    const text = `${REVIEW_MARKER}\n${body}`;
+    try {
+        const comments = await github.getComments(repo, pr);
+        const existing = comments.find(c => c.body.includes(REVIEW_MARKER));
+        if (existing)
+            await github.updateComment(repo, existing.id, text);
+        else
+            await github.commentOnPR(repo, pr, text);
+    }
+    catch (err) {
+        log.warn(`Could not post review status on PR #${pr}: ${err.message}`);
+    }
+}
+/**
+ * Rebase `branch` onto `origin/<base>` in a worktree and push. Returns the new
+ * head and the worktree, which the caller removes once it is done with it
+ * (verification runs there when the head changed). On error the worktree is
+ * removed here.
+ */
+function rebaseAndPush(config, repoDir, branch, base, pr) {
+    const wt = path.resolve(repoDir, config.worktree_base, `review-${pr}`);
+    git.fetchAll(repoDir);
+    git.pruneWorktrees(repoDir);
+    if (git.worktreeExists(wt, repoDir))
+        git.removeWorktree(wt, repoDir);
+    git.addWorktreeTracking(wt, branch, repoDir);
+    try {
+        const before = git.headSha(wt);
+        git.rebase(`origin/${base}`, wt);
+        const after = git.headSha(wt);
+        if (after !== before)
+            git.push(branch, wt, true);
+        return { sha: after, changed: after !== before, worktree: wt };
+    }
+    catch (err) {
+        try {
+            git.removeWorktree(wt, repoDir);
+        }
+        catch { }
+        throw err;
+    }
+}
+/**
+ * Run `verify` on the rebased head and publish a check run for it. The check
+ * run is created after the push (GitHub refuses one for a commit it has not
+ * seen) and is best-effort: a failure to create it is logged, not fatal, as
+ * in the agent path. Returns whether it passed and, when not, the failing
+ * steps' tails for the PR comment.
+ */
+async function verifyRebasedHead(config, worktree, sha) {
+    const result = verifyLib.runVerifyPipeline(config, worktree);
+    const stepSummary = result.results.map(r => `- \`${r.command}\`: ${r.success ? 'passed' : 'FAILED'} (${r.duration_ms}ms)`).join('\n');
+    const failed = result.results.filter(r => !r.success);
+    const annotations = verifyLib.parseAnnotations(result.results);
+    try {
+        await github.createCheckRun(config.repo, {
+            name: verifyLib.VERIFY_CHECK_NAME,
+            head_sha: sha,
+            status: 'completed',
+            conclusion: result.passed ? 'success' : 'failure',
+            output: {
+                title: result.passed ? 'Verification passed (rebased head)' : 'Verification failed (rebased head)',
+                summary: stepSummary,
+                annotations: annotations.length > 0 ? annotations : undefined,
+            },
+        });
+    }
+    catch (err) {
+        log.warn(`Failed to create check run for ${sha.slice(0, 7)}: ${err.message}`);
+    }
+    const detail = failed.map(r => `\`${r.command}\`\n\`\`\`\n${r.output.slice(-800)}\n\`\`\``).join('\n');
+    return { passed: result.passed, detail };
+}
+async function reviewAndMerge(config, repoDir, target) {
+    const { pr_number: pr, branch, base } = target;
+    const repo = config.repo;
+    const who = target.reviewer ? ` by @${target.reviewer}` : '';
+    const lines = [`**Foundry review**: approved${who}.`];
+    // 1. Mergeable?
+    const mergeability = await (0, stale_prs_js_1.awaitMergeability)(repo, pr);
+    if (mergeability === 'conflicting') {
+        lines.push(`- Not merged: this branch conflicts with \`${base}\`.`);
+        await postReviewComment(repo, pr, lines.join('\n'));
+        return { merged: false, reason: 'conflicting', detail: `conflicts with ${base}` };
+    }
+    // 2. Rebase for linear history.
+    let sha;
+    let rebased = false;
+    let worktree;
+    try {
+        const r = rebaseAndPush(config, repoDir, branch, base, pr);
+        sha = r.sha;
+        rebased = r.changed;
+        worktree = r.worktree;
+        lines.push(rebased ? `- Rebased onto \`${base}\` and pushed (${sha.slice(0, 7)}).` : `- Already up to date with \`${base}\` (${sha.slice(0, 7)}).`);
+    }
+    catch (err) {
+        const detail = (err.stderr ?? err.message ?? String(err)).toString().slice(-800);
+        lines.push(`- Not merged: rebase onto \`${base}\` failed.\n\`\`\`\n${detail}\n\`\`\``);
+        await postReviewComment(repo, pr, lines.join('\n'));
+        return { merged: false, reason: 'rebase_failed', detail };
+    }
+    // 3. The rebased head is a set of commits nobody has verified: the agent's
+    //    check run is on the old head. Verify this one and publish the result,
+    //    so a branch rule that requires "Foundry Verification" sees it on the
+    //    commit being merged. An unchanged head keeps the agent's run.
+    try {
+        if (rebased && config.verify.length > 0) {
+            await postReviewComment(repo, pr, [...lines, '- Verifying the rebased head…'].join('\n'));
+            const v = await verifyRebasedHead(config, worktree, sha);
+            if (!v.passed) {
+                lines.push(`- Not merged: verification failed on the rebased head.\n${v.detail}`);
+                await postReviewComment(repo, pr, lines.join('\n'));
+                return { merged: false, reason: 'verify_failed', detail: v.detail };
+            }
+            lines.push('- Verification passed on the rebased head.');
+        }
+    }
+    finally {
+        try {
+            git.removeWorktree(worktree, repoDir);
+        }
+        catch { }
+    }
+    await postReviewComment(repo, pr, [...lines, '- Waiting for checks…'].join('\n'));
+    // 4. Checks on the (possibly new) head.
+    const timeoutMs = (config.review?.checks_timeout_seconds ?? DEFAULT_CHECKS_TIMEOUT_S) * 1000;
+    const checks = await awaitChecks(repo, sha, { timeoutMs, ignore: [process.env.GITHUB_JOB ?? ''] });
+    if (checks.state === 'failure') {
+        lines.push(`- Not merged: failing checks: ${checks.failed.map(n => `\`${n}\``).join(', ')}.`);
+        await postReviewComment(repo, pr, lines.join('\n'));
+        return { merged: false, reason: 'checks_failed', detail: checks.failed.join(', ') };
+    }
+    if (checks.state === 'pending') {
+        lines.push(`- Not merged: checks still pending after ${timeoutMs / 1000}s: ${checks.pending.map(n => `\`${n}\``).join(', ')}. Approve again once they finish.`);
+        await postReviewComment(repo, pr, lines.join('\n'));
+        return { merged: false, reason: 'checks_timeout', detail: checks.pending.join(', ') };
+    }
+    lines.push('- Checks passed.');
+    // 5. Merge. If the rebase changed the head, GitHub recomputes mergeability; wait for it.
+    if (rebased)
+        await (0, stale_prs_js_1.awaitMergeability)(repo, pr);
+    try {
+        await github.mergePR(repo, pr, 'rebase');
+        lines.push(`- Merged into \`${base}\`.`);
+    }
+    catch (err) {
+        const detail = (err.message ?? String(err)).slice(-500);
+        lines.push(`- Not merged: GitHub refused the merge: ${detail}`);
+        await postReviewComment(repo, pr, lines.join('\n'));
+        return { merged: false, reason: 'merge_failed', detail };
+    }
+    // 6. Integration rebuild on the merged base.
+    let rebuild = null;
+    if (config.integration_rebuild) {
+        const wt = path.resolve(repoDir, config.worktree_base, `rebuild-${pr}`);
+        try {
+            git.fetchAll(repoDir);
+            git.pruneWorktrees(repoDir);
+            if (git.worktreeExists(wt, repoDir))
+                git.removeWorktree(wt, repoDir);
+            git.addWorktreeTracking(wt, base, repoDir);
+            rebuild = verifyLib.runIntegrationRebuild(config, wt);
+            if (rebuild && !rebuild.success) {
+                lines.push(`- **Integration rebuild FAILED** on \`${base}\` after the merge:\n\`\`\`\n${rebuild.output.slice(-800)}\n\`\`\``);
+            }
+            else {
+                lines.push(`- Integration rebuild passed.`);
+            }
+        }
+        catch (err) {
+            lines.push(`- Integration rebuild could not run: ${err.message}`);
+        }
+        finally {
+            try {
+                git.removeWorktree(wt, repoDir);
+            }
+            catch { }
+        }
+    }
+    await postReviewComment(repo, pr, lines.join('\n'));
+    log.success(`PR #${pr} merged into ${base}${rebased ? ' after rebase' : ''}.`);
+    return { merged: true, sha, rebased, rebuild };
+}
+//# sourceMappingURL=review.js.map

package/dist/lib/review.js.map

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

package/dist/lib/stale-prs.d.ts

@@ -0,0 +1,31 @@
+import type { FoundryConfig } from '../types.js';
+export interface StalePR {
+    pr_number: number;
+    branch: string;
+    issue: number;
+}
+/** The instruction the agent receives. Rebase is allowed: relaunch pushes use --force-with-lease. */
+export declare function conflictInstruction(base: string, mergedPR: number): string;
+/** Resolve mergeability, polling while GitHub still says "unknown". */
+export declare function awaitMergeability(repo: string, pr: number, timeoutMs?: number, pollMs?: number): Promise<'mergeable' | 'conflicting' | 'unknown'>;
+/**
+ * Open Foundry PRs into `base` that no longer merge cleanly, excluding
+ * `exceptPR` (the one that just merged).
+ */
+export declare function findStalePRs(config: FoundryConfig, base: string, exceptPR?: number): Promise<StalePR[]>;
+/** The workflow file this job is running from, e.g. `foundry.yml`. */
+export declare function currentWorkflowFile(): string | null;
+/**
+ * Start a Foundry job for `issue` with a command, through workflow_dispatch.
+ * Needs `actions: write`. Returns false when dispatch is not possible.
+ */
+export declare function dispatchCommand(issue: number, command: string, message: string, opts?: {
+    workflowFile?: string | null;
+    ref?: string;
+}): boolean;
+/**
+ * After `mergedPR` landed in `base`: find conflicting Foundry PRs, tell each
+ * issue, and dispatch the agent to resolve them. Never throws.
+ */
+export declare function handleStalePRs(config: FoundryConfig, base: string, mergedPR?: number): Promise<StalePR[]>;
+//# sourceMappingURL=stale-prs.d.ts.map

package/dist/lib/stale-prs.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"stale-prs.d.ts","sourceRoot":"","sources":["../../src/lib/stale-prs.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAKjD,MAAM,WAAW,OAAO;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf;AAED,qGAAqG;AACrG,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAM1E;AAED,uEAAuE;AACvE,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,MAAM,EACV,SAAS,GAAE,MAAgC,EAC3C,MAAM,GAAE,MAA6B,GACpC,OAAO,CAAC,WAAW,GAAG,aAAa,GAAG,SAAS,CAAC,CAOlD;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAAC,MAAM,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAY7G;AAED,sEAAsE;AACtE,wBAAgB,mBAAmB,IAAI,MAAM,GAAG,IAAI,CAInD;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,IAAI,GAAE;IAAE,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAO,GACxD,OAAO,CAeT;AAED;;;GAGG;AACH,wBAAsB,cAAc,CAAC,MAAM,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAyB/G"}

package/dist/lib/stale-prs.js

@@ -0,0 +1,161 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.conflictInstruction = conflictInstruction;
+exports.awaitMergeability = awaitMergeability;
+exports.findStalePRs = findStalePRs;
+exports.currentWorkflowFile = currentWorkflowFile;
+exports.dispatchCommand = dispatchCommand;
+exports.handleStalePRs = handleStalePRs;
+/**
+ * Stale pull requests — when `integration` moves, other open Foundry PRs may
+ * no longer merge cleanly. Nobody should have to notice that by hand.
+ *
+ * After a PR merges, every other open PR into the same base that belongs to
+ * a Foundry task is checked. GitHub computes mergeability lazily after the
+ * base changes, so each check polls until the answer is known. For each PR
+ * that now conflicts, Foundry dispatches its own workflow with a `go`
+ * command for the owning issue. `workflow_dispatch` is one of the two event
+ * types GitHub still delivers when the job's own token causes them, and the
+ * dispatched job runs under that issue's concurrency group like any other
+ * command, so nothing here runs an agent outside its lane.
+ */
+const node_child_process_1 = require("node:child_process");
+const github = __importStar(require("./github.js"));
+const log = __importStar(require("./log.js"));
+const task_recovery_js_1 = require("./task-recovery.js");
+const MERGEABILITY_POLL_MS = 3_000;
+const MERGEABILITY_TIMEOUT_MS = 90_000;
+/** The instruction the agent receives. Rebase is allowed: relaunch pushes use --force-with-lease. */
+function conflictInstruction(base, mergedPR) {
+    return [
+        `\`${base}\` has moved (PR #${mergedPR} merged) and this branch now conflicts with it.`,
+        `Rebase onto \`origin/${base}\` (or merge it in if the history is messy), resolve every conflict in favour of this issue's intent while keeping what landed in \`${base}\`, make sure the result builds, and commit.`,
+        'Do not change anything unrelated to the conflict.',
+    ].join(' ');
+}
+/** Resolve mergeability, polling while GitHub still says "unknown". */
+async function awaitMergeability(repo, pr, timeoutMs = MERGEABILITY_TIMEOUT_MS, pollMs = MERGEABILITY_POLL_MS) {
+    const deadline = Date.now() + timeoutMs;
+    while (true) {
+        const state = await github.getPRMergeability(repo, pr);
+        if (state !== 'unknown' || Date.now() >= deadline)
+            return state;
+        await new Promise(r => setTimeout(r, pollMs));
+    }
+}
+/**
+ * Open Foundry PRs into `base` that no longer merge cleanly, excluding
+ * `exceptPR` (the one that just merged).
+ */
+async function findStalePRs(config, base, exceptPR) {
+    const open = await github.listOpenPRs(config.repo, base);
+    const stale = [];
+    for (const pr of open) {
+        if (pr.number === exceptPR)
+            continue;
+        const issue = (0, task_recovery_js_1.issueNumberFromBranch)(config.branch_template, pr.head);
+        if (issue === null)
+            continue;
+        const state = await awaitMergeability(config.repo, pr.number);
+        if (state === 'conflicting')
+            stale.push({ pr_number: pr.number, branch: pr.head, issue });
+        else if (state === 'unknown')
+            log.warn(`Mergeability of PR #${pr.number} still unknown; skipping.`);
+    }
+    return stale;
+}
+/** The workflow file this job is running from, e.g. `foundry.yml`. */
+function currentWorkflowFile() {
+    const ref = process.env.GITHUB_WORKFLOW_REF ?? '';
+    const m = ref.match(/\.github\/workflows\/([^@]+)@/);
+    return m ? m[1] : null;
+}
+/**
+ * Start a Foundry job for `issue` with a command, through workflow_dispatch.
+ * Needs `actions: write`. Returns false when dispatch is not possible.
+ */
+function dispatchCommand(issue, command, message, opts = {}) {
+    const file = opts.workflowFile ?? currentWorkflowFile();
+    if (!file) {
+        log.warn('Cannot dispatch: GITHUB_WORKFLOW_REF is not set (not running in GitHub Actions?).');
+        return false;
+    }
+    const args = ['workflow', 'run', file, '-f', `issue=${issue}`, '-f', `command=${command}`, '-f', `message=${message}`];
+    if (opts.ref)
+        args.push('--ref', opts.ref);
+    try {
+        (0, node_child_process_1.execFileSync)('gh', args, { encoding: 'utf-8', timeout: 60_000, stdio: ['ignore', 'pipe', 'pipe'] });
+        return true;
+    }
+    catch (err) {
+        log.warn(`Dispatch failed for #${issue}: ${(err.stderr ?? err.message ?? '').toString().trim()}`);
+        return false;
+    }
+}
+/**
+ * After `mergedPR` landed in `base`: find conflicting Foundry PRs, tell each
+ * issue, and dispatch the agent to resolve them. Never throws.
+ */
+async function handleStalePRs(config, base, mergedPR) {
+    let stale = [];
+    try {
+        stale = await findStalePRs(config, base, mergedPR);
+    }
+    catch (err) {
+        log.warn(`Stale PR check failed: ${err.message}`);
+        return [];
+    }
+    if (stale.length === 0) {
+        log.info(`No open Foundry PRs into ${base} conflict after the merge.`);
+        return [];
+    }
+    for (const s of stale) {
+        log.info(`PR #${s.pr_number} (#${s.issue}) conflicts with ${base}; sending the agent to resolve it.`);
+        const instruction = conflictInstruction(base, mergedPR ?? 0);
+        const dispatched = dispatchCommand(s.issue, 'go', instruction);
+        const note = dispatched
+            ? `**${base} moved** (PR #${mergedPR ?? '?'} merged) and PR #${s.pr_number} now conflicts with it. Foundry has sent the agent to rebase and resolve.`
+            : `**${base} moved** (PR #${mergedPR ?? '?'} merged) and PR #${s.pr_number} now conflicts with it. Foundry could not start the agent automatically; comment \`@foundry go\` with the instruction below.\n\n> ${instruction}`;
+        try {
+            await github.addComment(config.repo, s.issue, note);
+        }
+        catch (err) {
+            log.warn(`Could not note the conflict on #${s.issue}: ${err.message}`);
+        }
+    }
+    return stale;
+}
+//# sourceMappingURL=stale-prs.js.map

package/dist/lib/stale-prs.js.map

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

package/dist/lib/state-store.d.ts

@@ -0,0 +1,23 @@
+/**
+ * StateStore — abstract interface for task/runner state persistence.
+ *
+ * The default implementation is FileStateStore (file-based, ~/.joynt-foundry/).
+ * Future implementations may use SQLite, PostgreSQL, etc.
+ */
+import type { RunnerState, TaskState, TaskStatus } from '../types.js';
+export interface StateStore {
+    getRunnerId(): string;
+    getStateDir(): string;
+    loadState(repo: string): RunnerState;
+    saveState(state: RunnerState): void;
+    upsertTask(repo: string, task: TaskState): void;
+    updateTaskStatus(repo: string, issue: number, status: TaskStatus, extra?: Partial<TaskState>): void;
+    removeTask(repo: string, issue: number): void;
+    getActiveTaskCount(repo: string): number;
+    getAllTasks(repo: string): TaskState[];
+    getTask(repo: string, issue: number): TaskState | undefined;
+    listTaskIssueNumbers(repo: string): number[];
+    getLogDir(repo: string, issue: number): string;
+    getTaskStateDir(repo: string, issue: number): string;
+}
+//# sourceMappingURL=state-store.d.ts.map

package/dist/lib/state-store.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"state-store.d.ts","sourceRoot":"","sources":["../../src/lib/state-store.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEtE,MAAM,WAAW,UAAU;IACzB,WAAW,IAAI,MAAM,CAAC;IACtB,WAAW,IAAI,MAAM,CAAC;IACtB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC;IACrC,SAAS,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI,CAAC;IACpC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,IAAI,CAAC;IAChD,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC;IACpG,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9C,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IACzC,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,EAAE,CAAC;IACvC,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,CAAC;IAC5D,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC7C,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;IAC/C,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;CACtD"}

package/dist/lib/state-store.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=state-store.js.map

package/dist/lib/state-store.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"state-store.js","sourceRoot":"","sources":["../../src/lib/state-store.ts"],"names":[],"mappings":""}

package/dist/lib/state.d.ts

@@ -0,0 +1,23 @@
+/**
+ * Local state management — ~/.joynt-foundry/
+ *
+ * All operations are idempotent and crash-safe (atomic writes).
+ *
+ * This module now delegates to a FileStateStore singleton, preserving the
+ * original function-based API for backwards compatibility.
+ */
+import type { RunnerState, TaskState } from '../types.js';
+export declare function getStateDir(): string;
+export declare function getLogDir(repo: string, issue: number): string;
+export declare function getTaskStateDir(repo: string, issue: number): string;
+export declare function getRunnerId(): string;
+export declare function loadRunnerState(repo: string): RunnerState;
+export declare function saveRunnerState(state: RunnerState): void;
+export declare function upsertTask(repo: string, task: TaskState): void;
+export declare function updateTaskStatus(repo: string, issue: number, status: TaskState['status'], extra?: Partial<TaskState>): void;
+export declare function removeTask(repo: string, issue: number): void;
+export declare function getActiveTaskCount(repo: string): number;
+export declare function getAllTasks(repo: string): TaskState[];
+export declare function listTaskIssueNumbers(repo: string): number[];
+export declare function getTask(repo: string, issue: number): TaskState | undefined;
+//# sourceMappingURL=state.d.ts.map

package/dist/lib/state.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../../src/lib/state.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAK1D,wBAAgB,WAAW,IAAI,MAAM,CAEpC;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAE7D;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAEnE;AAED,wBAAgB,WAAW,IAAI,MAAM,CAEpC;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,CAEzD;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI,CAExD;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,IAAI,CAE9D;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,IAAI,CAE3H;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAE5D;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEvD;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,EAAE,CAErD;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAE3D;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,CAE1E"}