@tokenfactory/acc-runner 0.25.0 → 0.27.0

package/dist/prompt.js

@@ -1,78 +0,0 @@
-/**
- * renderTaskPrompt — duplicated slim copy of src/lib/promptTemplate.ts.
- *
- * Adds the two RUNNER_PROTOCOL §3.2 mandatory header lines (Branch + PR
- * title + base branch) so the agent emits a PR ACC can match by webhook.
- *
- * v0.3 dedupes via a shared workspace package; for now we keep the small
- * function here so the CLI stays a single-package install.
- */
-function slug(title) {
-    return title
-        .toLowerCase()
-        .replace(/[^a-z0-9]+/g, "-")
-        .replace(/^-+|-+$/g, "")
-        .slice(0, 40) || "task";
-}
-export function branchForTask(taskId, title, branch) {
-    if (branch && branch.trim())
-        return branch.trim();
-    return `acc/${taskId}-${slug(title)}`;
-}
-export function prTitleForTask(taskId, title) {
-    return `[${taskId}] ${title}`;
-}
-export function renderTaskPrompt(input) {
-    const { task, agent, model } = input;
-    const integrationBranch = input.integrationBranch ?? "acc/integration";
-    const targetRepo = input.targetRepo ?? "tokenfactory-pvt-ltd/TechArch";
-    const branch = branchForTask(task.id, task.title, task.branch);
-    const prTitle = prTitleForTask(task.id, task.title);
-    const lines = [];
-    // Mandatory protocol header — RUNNER_PROTOCOL §3.2.
-    lines.push(`**Branch:** ${branch}`);
-    lines.push(`**PR title:** ${prTitle}`);
-    lines.push(`**Open the PR against:** ${integrationBranch} on ${targetRepo}.`);
-    lines.push("");
-    lines.push(`# Task ${task.id}: ${task.title}`);
-    lines.push("");
-    if (agent?.name || model?.name) {
-        lines.push(`You are ${agent?.name ?? "an AI agent"}. You will be running this task on ${model?.name ?? "a model"}.`);
-        lines.push("");
-    }
-    if (task.description) {
-        lines.push("## Description");
-        lines.push(task.description);
-        lines.push("");
-    }
-    lines.push("## Allowed file scope");
-    lines.push(...(task.allowed.length ? task.allowed.map((f) => `- ${f}`) : ["- (no scope restrictions)"]));
-    lines.push("");
-    lines.push("## Forbidden files (DO NOT TOUCH)");
-    lines.push(...(task.forbidden.length ? task.forbidden.map((f) => `- ${f}`) : ["- (none)"]));
-    lines.push("");
-    if (input.contracts?.length) {
-        lines.push("## Contracts in force");
-        lines.push(...input.contracts.map((c) => `- ${c.name}${c.version ? ` ${c.version}` : ""}${c.status ? ` (${c.status})` : ""}`));
-        lines.push("");
-    }
-    lines.push("## Acceptance criteria");
-    lines.push(...(task.acceptance.length ? task.acceptance.map((a) => `- ${a}`) : ["- (none)"]));
-    lines.push("");
-    lines.push("## Required report format (PR body)");
-    lines.push("- Summary (3 sentences)");
-    lines.push("- Files changed (path, +added/-removed)");
-    lines.push("- Implemented");
-    lines.push("- Not implemented");
-    lines.push("- Risks");
-    lines.push("- Follow-ups");
-    lines.push("- Verification (typecheck/lint/build/test/manual)");
-    lines.push("");
-    if (task.typecheck_cmd) {
-        lines.push("## Typecheck");
-        lines.push(`Run \`${task.typecheck_cmd}\` after edits and include the result in the report.`);
-        lines.push("");
-    }
-    return lines.join("\n");
-}
-//# sourceMappingURL=prompt.js.map

package/dist/prompt.js.map

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

package/dist/runtime/cache-dir.d.ts

@@ -1,2 +0,0 @@
-export declare function cacheDir(): string;
-//# sourceMappingURL=cache-dir.d.ts.map

package/dist/runtime/cache-dir.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"cache-dir.d.ts","sourceRoot":"","sources":["../../src/runtime/cache-dir.ts"],"names":[],"mappings":"AAWA,wBAAgB,QAAQ,IAAI,MAAM,CAKjC"}

package/dist/runtime/cache-dir.js

@@ -1,15 +0,0 @@
-/**
- * v0.14.0 (T-54-2): single source of truth for the runner cache root.
- *
- * `quarantine.ts` already honoured ACC_RUNNER_CACHE_DIR inline; the
- * singleton-lock and last-task-env modules added in this release reuse the
- * same resolution so tests can point all cache state at a tmpdir with one
- * env var. Defaults to ~/.cache/acc-runner (unchanged from prior releases).
- */
-import os from "node:os";
-import path from "node:path";
-export function cacheDir() {
-    return (process.env.ACC_RUNNER_CACHE_DIR?.trim() ||
-        path.join(os.homedir(), ".cache", "acc-runner"));
-}
-//# sourceMappingURL=cache-dir.js.map

package/dist/runtime/cache-dir.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"cache-dir.js","sourceRoot":"","sources":["../../src/runtime/cache-dir.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,MAAM,UAAU,QAAQ;IACtB,OAAO,CACL,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,IAAI,EAAE;QACxC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,YAAY,CAAC,CAChD,CAAC;AACJ,CAAC"}

package/dist/runtime/conflict-resolver.d.ts

@@ -1,65 +0,0 @@
-import type { RunnerSupabaseClient } from "../supabase.js";
-export interface ConflictMeta {
-    pr_number: number;
-    repo: string;
-    head_ref: string;
-    base_ref: string;
-}
-export interface ConflictResolutionOutcome {
-    action: "resolved" | "unresolvable" | "policy_disabled" | "escalated";
-    reason?: string;
-    files_resolved?: string[];
-    files_skipped?: string[];
-}
-export interface ConflictResolutionDeps {
-    supabase: RunnerSupabaseClient;
-    /** Override for tests — defaults to using gh CLI. */
-    ghApi?: <T>(endpoint: string, opts?: GhApiOptions) => Promise<T>;
-    /** Override for tests — defaults to querying acc.tasks directly. */
-    countPriorAttempts?: (prNumber: number) => Promise<number>;
-    /** Override for tests — defaults to org_settings query. */
-    loadConflictPolicy?: () => Promise<{
-        enabled: boolean;
-    }>;
-}
-export interface GhApiOptions {
-    method?: "GET" | "PUT" | "POST";
-    fields?: Record<string, string>;
-    jq?: string;
-}
-export declare const MAX_CONFLICT_ATTEMPTS = 3;
-export type FileClass = "vercel.json" | "planning" | "current-cycle" | "min-version" | "package-version";
-/**
- * Extract conflict metadata from the task description.
- * Sweep C embeds: <!-- acc-conflict: {"pr_number":N,"repo":"owner/repo","head_ref":"...","base_ref":"..."} -->
- *
- * Fallback: accept a plain JSON description (used in tests and by early
- * versions of Sweep C that didn't wrap in an HTML comment).
- */
-export declare function parseConflictMeta(description: string | null | undefined, fallback?: {
-    pr_number?: number | null;
-    repo?: string | null;
-    integration_branch?: string | null;
-}): ConflictMeta | null;
-export declare function classifyFile(filename: string): FileClass | null;
-export declare function hasConflictMarkers(...sides: string[]): boolean;
-export declare function mergeVercelCrons(baseStr: string, headStr: string): string | null;
-export declare function resolvePlanning(base: string | null, head: string | null): {
-    write: boolean;
-    content: string;
-} | null;
-export declare function mergeCurrentCycle(baseStr: string, headStr: string): string | null;
-export declare function mergeMinVersion(baseStr: string, headStr: string): string | null;
-export declare function mergePackageVersion(baseStr: string, headStr: string): string | null;
-declare function defaultGhApi<T>(endpoint: string, opts?: GhApiOptions): Promise<T>;
-/** Two-call base∩head intersection: files changed on BOTH sides since the merge base. */
-export declare function computeConflictSet(repo: string, baseRef: string, headRef: string, ghApi: typeof defaultGhApi): Promise<string[]>;
-/**
- * Attempt to resolve conflicts for the PR referenced in `meta`.
- *
- * Returns a structured outcome that task-runner.ts uses to decide the
- * final task transition (done / failed / escalated).
- */
-export declare function resolveConflict(meta: ConflictMeta, deps: ConflictResolutionDeps): Promise<ConflictResolutionOutcome>;
-export {};
-//# sourceMappingURL=conflict-resolver.d.ts.map

package/dist/runtime/conflict-resolver.d.ts.map

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

package/dist/runtime/conflict-resolver.js

@@ -1,477 +0,0 @@
-/**
- * v0.48 T-48-5: Autonomous conflict-resolution runner path.
- *
- * Called from task-runner.ts when it detects task.type === 'conflict_resolution'.
- * Resolves conflicts on the real base∩head file set (two compare calls so only
- * files changed on BOTH sides are treated as conflicted — the #412 class fix),
- * pushes the resolution to the PR head branch via `gh api`, and escalates to
- * conflict_unresolvable after ≤3 attempts.
- *
- * Policy gate: org_settings.conflict_policy.enabled === false → skip (detect-and-skip mode).
- * Retry bound: after 3 failed conflict_resolution tasks for the same PR, the runner
- * escalates by setting block_reason='conflict_unresolvable' and transitioning to 'done'.
- */
-import { execa } from "execa";
-// ─────────────────────────────────────────────────────────────────────────────
-// Constants
-// ─────────────────────────────────────────────────────────────────────────────
-export const MAX_CONFLICT_ATTEMPTS = 3;
-// Sentinel that Sweep C embeds in task descriptions so the runner knows
-// which PR to target and which branches to compare.
-const META_RE = /<!--\s*acc-conflict:\s*(\{[^}]*\})\s*-->/;
-const PLANNING_RE = /^planning\/V0_\d+(_[A-Z_]+)?\.md$/;
-// ─────────────────────────────────────────────────────────────────────────────
-// Metadata parsing
-// ─────────────────────────────────────────────────────────────────────────────
-/**
- * Extract conflict metadata from the task description.
- * Sweep C embeds: <!-- acc-conflict: {"pr_number":N,"repo":"owner/repo","head_ref":"...","base_ref":"..."} -->
- *
- * Fallback: accept a plain JSON description (used in tests and by early
- * versions of Sweep C that didn't wrap in an HTML comment).
- */
-export function parseConflictMeta(description, fallback) {
-    if (description) {
-        const match = META_RE.exec(description);
-        if (match) {
-            try {
-                const parsed = JSON.parse(match[1]);
-                if (typeof parsed.pr_number === "number" &&
-                    typeof parsed.repo === "string" &&
-                    typeof parsed.head_ref === "string" &&
-                    typeof parsed.base_ref === "string") {
-                    return parsed;
-                }
-            }
-            catch {
-                // fall through to plain-JSON attempt
-            }
-        }
-        // Plain JSON fallback (test convenience + early Sweep C format).
-        try {
-            const parsed = JSON.parse(description);
-            if (typeof parsed.pr_number === "number" &&
-                typeof parsed.repo === "string" &&
-                typeof parsed.head_ref === "string" &&
-                typeof parsed.base_ref === "string") {
-                return parsed;
-            }
-        }
-        catch {
-            // fall through
-        }
-    }
-    // Last resort: reconstruct from task fields when description has no JSON.
-    const prNumber = fallback?.pr_number;
-    const repo = fallback?.repo;
-    if (typeof prNumber === "number" && typeof repo === "string" && repo.includes("/")) {
-        return {
-            pr_number: prNumber,
-            repo,
-            // head_ref is not available from the task row alone; caller must provide or
-            // we derive it from the PR via the GitHub API at resolution time.
-            head_ref: "",
-            base_ref: fallback?.integration_branch ?? "acc/integration",
-        };
-    }
-    return null;
-}
-// ─────────────────────────────────────────────────────────────────────────────
-// File-class resolution (mirrors api/scheduled/conflict-resolver.ts)
-// ─────────────────────────────────────────────────────────────────────────────
-export function classifyFile(filename) {
-    if (filename === "vercel.json")
-        return "vercel.json";
-    if (filename === "api/runner/min-version.ts")
-        return "min-version";
-    if (filename === "packages/acc-runner/package.json")
-        return "package-version";
-    if (filename.endsWith("CURRENT_CYCLE.md"))
-        return "current-cycle";
-    return PLANNING_RE.test(filename) ? "planning" : null;
-}
-function cmpSemver(a, b) {
-    const parts = (s) => s.split(/[.+-]/).map((x) => Number(x) || 0);
-    const [pa, pb] = [parts(a), parts(b)];
-    const len = Math.max(pa.length, pb.length);
-    for (let i = 0; i < len; i++) {
-        if ((pa[i] ?? 0) !== (pb[i] ?? 0))
-            return (pa[i] ?? 0) - (pb[i] ?? 0);
-    }
-    return 0;
-}
-const CONFLICT_MARKER_RE = /^(<{7}|={7}|>{7})/m;
-export function hasConflictMarkers(...sides) {
-    return sides.some((s) => CONFLICT_MARKER_RE.test(s));
-}
-export function mergeVercelCrons(baseStr, headStr) {
-    let base, head;
-    try {
-        base = JSON.parse(baseStr);
-        head = JSON.parse(headStr);
-    }
-    catch {
-        return null;
-    }
-    for (const k of new Set([...Object.keys(base), ...Object.keys(head)])) {
-        if (k !== "crons" && JSON.stringify(base[k]) !== JSON.stringify(head[k]))
-            return null;
-    }
-    const arr = (v) => (Array.isArray(v) ? v : []);
-    const seen = new Set();
-    const crons = [...arr(base.crons), ...arr(head.crons)]
-        .filter((c) => {
-        const p = c?.path;
-        return typeof p === "string" && !seen.has(p) && (seen.add(p), true);
-    })
-        .sort((a, b) => String(a.path ?? "").localeCompare(String(b.path ?? "")));
-    return JSON.stringify({ ...head, crons }, null, 2) + "\n";
-}
-export function resolvePlanning(base, head) {
-    if (base !== null && head === null)
-        return { write: true, content: base };
-    if (head !== null && (base === null || base === head))
-        return { write: false, content: head };
-    if (base !== null && head !== null)
-        return { write: true, content: base };
-    return null;
-}
-export function mergeCurrentCycle(baseStr, headStr) {
-    if (hasConflictMarkers(baseStr, headStr))
-        return null;
-    const headLines = headStr.split("\n");
-    const seen = new Set(headLines);
-    const additions = baseStr.split("\n").filter((l) => !seen.has(l) && (seen.add(l), true));
-    if (additions.length === 0)
-        return null;
-    return [...headLines, ...additions].join("\n");
-}
-const MIN_VERSION_RE = /(export const MIN_VERSION\s*=\s*")([^"]+)(")/;
-const CURRENT_VERSION_RE = /(export const CURRENT_VERSION\s*=\s*")([^"]+)(")/;
-export function mergeMinVersion(baseStr, headStr) {
-    const bMin = MIN_VERSION_RE.exec(baseStr), hMin = MIN_VERSION_RE.exec(headStr);
-    const bCur = CURRENT_VERSION_RE.exec(baseStr), hCur = CURRENT_VERSION_RE.exec(headStr);
-    if (!bMin || !hMin || !bCur || !hCur)
-        return null;
-    const setVer = (re, value) => (s) => s.replace(re, (_m, pre, _v, post) => `${pre}${value}${post}`);
-    const neutralise = (s) => setVer(CURRENT_VERSION_RE, "@")(setVer(MIN_VERSION_RE, "@")(s));
-    if (neutralise(baseStr) !== neutralise(headStr))
-        return null;
-    const min = cmpSemver(bMin[2], hMin[2]) >= 0 ? bMin[2] : hMin[2];
-    const cur = cmpSemver(bCur[2], hCur[2]) >= 0 ? bCur[2] : hCur[2];
-    return setVer(CURRENT_VERSION_RE, cur)(setVer(MIN_VERSION_RE, min)(headStr));
-}
-export function mergePackageVersion(baseStr, headStr) {
-    let base, head;
-    try {
-        base = JSON.parse(baseStr);
-        head = JSON.parse(headStr);
-    }
-    catch {
-        return null;
-    }
-    const bv = base.version, hv = head.version;
-    if (typeof bv !== "string" || typeof hv !== "string")
-        return null;
-    if (JSON.stringify({ ...base, version: 0 }) !==
-        JSON.stringify({ ...head, version: 0 }))
-        return null;
-    const version = cmpSemver(bv, hv) >= 0 ? bv : hv;
-    return JSON.stringify({ ...base, version }, null, 2) + "\n";
-}
-// ─────────────────────────────────────────────────────────────────────────────
-// GitHub API helpers (gh CLI)
-// ─────────────────────────────────────────────────────────────────────────────
-async function defaultGhApi(endpoint, opts = {}) {
-    const args = ["api", endpoint];
-    if (opts.method && opts.method !== "GET") {
-        args.push("-X", opts.method);
-    }
-    if (opts.fields) {
-        for (const [k, v] of Object.entries(opts.fields)) {
-            args.push("-f", `${k}=${v}`);
-        }
-    }
-    if (opts.jq) {
-        args.push("--jq", opts.jq);
-    }
-    const { stdout } = await execa("gh", args, {
-        env: process.env,
-        reject: false,
-        // gh api exits non-zero on 4xx/5xx; capture stdout to parse the error.
-    });
-    const text = stdout.trim();
-    if (!text)
-        return null;
-    // When --jq returns a simple string, it may not be valid JSON.
-    if (opts.jq) {
-        try {
-            return JSON.parse(text);
-        }
-        catch {
-            return text;
-        }
-    }
-    return JSON.parse(text);
-}
-/** Two-call base∩head intersection: files changed on BOTH sides since the merge base. */
-export async function computeConflictSet(repo, baseRef, headRef, ghApi) {
-    const [owner, repoName] = repo.split("/");
-    const base = `repos/${owner}/${repoName}`;
-    // Files changed on head branch since fork (three-dot = relative to merge base)
-    const headCompare = await ghApi(`${base}/compare/${encodeURIComponent(baseRef)}...${encodeURIComponent(headRef)}`);
-    const headFiles = new Set((headCompare?.files ?? []).map((f) => f.filename));
-    // Files changed on base branch since fork
-    const baseCompare = await ghApi(`${base}/compare/${encodeURIComponent(headRef)}...${encodeURIComponent(baseRef)}`);
-    const baseFiles = (baseCompare?.files ?? []).map((f) => f.filename);
-    // Intersection = files both sides changed = truly conflicted
-    return baseFiles.filter((f) => headFiles.has(f));
-}
-async function fetchPRDetail(repo, prNumber, ghApi) {
-    const [owner, repoName] = repo.split("/");
-    const pr = await ghApi(`repos/${owner}/${repoName}/pulls/${prNumber}`);
-    return pr;
-}
-async function fetchFileContent(repo, path, ref, ghApi) {
-    const [owner, repoName] = repo.split("/");
-    try {
-        const r = await ghApi(`repos/${owner}/${repoName}/contents/${path}?ref=${encodeURIComponent(ref)}`);
-        if (!r || !r.content)
-            return null;
-        const raw = r.encoding === "base64" || !r.encoding
-            ? Buffer.from(r.content.replace(/\n/g, ""), "base64").toString("utf8")
-            : r.content;
-        return { content: raw, sha: r.sha };
-    }
-    catch {
-        return null;
-    }
-}
-async function putFileContent(repo, path, content, branch, sha, ghApi) {
-    const [owner, repoName] = repo.split("/");
-    const fields = {
-        message: `chore(acc): auto-resolve conflict in ${path} (T-48-5)`,
-        content: Buffer.from(content, "utf8").toString("base64"),
-        branch,
-    };
-    if (sha)
-        fields.sha = sha;
-    await ghApi(`repos/${owner}/${repoName}/contents/${path}`, {
-        method: "PUT",
-        fields,
-    });
-}
-// ─────────────────────────────────────────────────────────────────────────────
-// Policy + retry count helpers
-// ─────────────────────────────────────────────────────────────────────────────
-async function defaultLoadConflictPolicy(supabase) {
-    try {
-        // any-allowed: org_settings shape isn't typed in the runner
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const { data } = await supabase.from("org_settings")
-            .select("conflict_policy")
-            .limit(1)
-            .maybeSingle();
-        const row = data;
-        // Missing key or null → default to enabled=true (opt-out model).
-        if (row?.conflict_policy?.enabled === false)
-            return { enabled: false };
-    }
-    catch {
-        // Network error → assume enabled so the runner still attempts resolution.
-    }
-    return { enabled: true };
-}
-async function defaultCountPriorAttempts(supabase, prNumber) {
-    try {
-        // any-allowed: tasks shape isn't fully typed in the runner
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const { data, error } = await supabase.from("tasks")
-            .select("id")
-            .eq("type", "conflict_resolution")
-            .eq("pr_number", prNumber)
-            .eq("status", "failed");
-        if (error)
-            return 0;
-        return (data ?? []).length;
-    }
-    catch {
-        return 0;
-    }
-}
-// ─────────────────────────────────────────────────────────────────────────────
-// Main resolution entry point
-// ─────────────────────────────────────────────────────────────────────────────
-/**
- * Attempt to resolve conflicts for the PR referenced in `meta`.
- *
- * Returns a structured outcome that task-runner.ts uses to decide the
- * final task transition (done / failed / escalated).
- */
-export async function resolveConflict(meta, deps) {
-    const ghApi = deps.ghApi ?? defaultGhApi;
-    // ── 1. Policy gate ──────────────────────────────────────────────────────────
-    const policy = deps.loadConflictPolicy
-        ? await deps.loadConflictPolicy()
-        : await defaultLoadConflictPolicy(deps.supabase);
-    if (!policy.enabled) {
-        return { action: "policy_disabled", reason: "conflict_policy.enabled=false" };
-    }
-    // ── 2. Retry bound ──────────────────────────────────────────────────────────
-    const priorAttempts = deps.countPriorAttempts
-        ? await deps.countPriorAttempts(meta.pr_number)
-        : await defaultCountPriorAttempts(deps.supabase, meta.pr_number);
-    if (priorAttempts >= MAX_CONFLICT_ATTEMPTS) {
-        return {
-            action: "escalated",
-            reason: `max attempts (${MAX_CONFLICT_ATTEMPTS}) reached for PR #${meta.pr_number}`,
-        };
-    }
-    // ── 3. Resolve head_ref from GitHub if not present in meta ──────────────────
-    let { head_ref, base_ref } = meta;
-    if (!head_ref) {
-        try {
-            const pr = await fetchPRDetail(meta.repo, meta.pr_number, ghApi);
-            head_ref = pr.head.ref;
-            base_ref = pr.base.ref;
-        }
-        catch (err) {
-            return {
-                action: "unresolvable",
-                reason: `failed to fetch PR detail: ${err.message?.slice(0, 200)}`,
-            };
-        }
-    }
-    // ── 4. Compute real conflict set (base∩head) ────────────────────────────────
-    let conflictFiles;
-    try {
-        conflictFiles = await computeConflictSet(meta.repo, base_ref, head_ref, ghApi);
-    }
-    catch (err) {
-        return {
-            action: "unresolvable",
-            reason: `compare API failed: ${err.message?.slice(0, 200)}`,
-        };
-    }
-    if (conflictFiles.length === 0) {
-        // PR was already resolved or had no real file overlap — mark as resolved.
-        return { action: "resolved", reason: "no conflicted files in base∩head", files_resolved: [] };
-    }
-    // ── 5. Check every conflicted file is resolvable ────────────────────────────
-    const unresolvable = conflictFiles.filter((f) => classifyFile(f) === null);
-    if (unresolvable.length > 0) {
-        return {
-            action: "unresolvable",
-            reason: `non-resolvable files in conflict set: ${unresolvable.join(", ")}`,
-            files_skipped: unresolvable,
-        };
-    }
-    // ── 6. Fetch content + compute writes ──────────────────────────────────────
-    const writes = [];
-    const filesResolved = [];
-    const filesSkipped = [];
-    for (const filePath of conflictFiles) {
-        const cls = classifyFile(filePath);
-        const baseContent = await fetchFileContent(meta.repo, filePath, base_ref, ghApi);
-        const headContent = await fetchFileContent(meta.repo, filePath, head_ref, ghApi);
-        let merged = null;
-        let shouldWrite = true;
-        if (cls === "vercel.json") {
-            if (!baseContent || !headContent) {
-                filesSkipped.push(filePath);
-                continue;
-            }
-            merged = mergeVercelCrons(baseContent.content, headContent.content);
-            if (merged === null) {
-                filesSkipped.push(filePath);
-                continue;
-            }
-            if (merged === headContent.content)
-                shouldWrite = false;
-        }
-        else if (cls === "current-cycle") {
-            if (!baseContent || !headContent) {
-                filesSkipped.push(filePath);
-                continue;
-            }
-            if (hasConflictMarkers(baseContent.content, headContent.content)) {
-                filesSkipped.push(filePath);
-                continue;
-            }
-            merged = mergeCurrentCycle(baseContent.content, headContent.content);
-            if (merged === null) {
-                shouldWrite = false;
-                merged = headContent.content;
-            }
-        }
-        else if (cls === "min-version") {
-            if (!baseContent || !headContent) {
-                filesSkipped.push(filePath);
-                continue;
-            }
-            merged = mergeMinVersion(baseContent.content, headContent.content);
-            if (merged === null) {
-                filesSkipped.push(filePath);
-                continue;
-            }
-            if (merged === headContent.content)
-                shouldWrite = false;
-        }
-        else if (cls === "package-version") {
-            if (!baseContent || !headContent) {
-                filesSkipped.push(filePath);
-                continue;
-            }
-            merged = mergePackageVersion(baseContent.content, headContent.content);
-            if (merged === null) {
-                filesSkipped.push(filePath);
-                continue;
-            }
-            if (merged === headContent.content)
-                shouldWrite = false;
-        }
-        else {
-            // planning
-            const r = resolvePlanning(baseContent?.content ?? null, headContent?.content ?? null);
-            if (r === null) {
-                filesSkipped.push(filePath);
-                continue;
-            }
-            merged = r.content;
-            shouldWrite = r.write;
-        }
-        if (shouldWrite && merged !== null) {
-            writes.push({ path: filePath, content: merged, sha: headContent?.sha });
-        }
-        filesResolved.push(filePath);
-    }
-    if (filesSkipped.length > 0) {
-        return {
-            action: "unresolvable",
-            reason: `could not merge: ${filesSkipped.join(", ")}`,
-            files_skipped: filesSkipped,
-            files_resolved: filesResolved,
-        };
-    }
-    // ── 7. Push merged content ─────────────────────────────────────────────────
-    for (const w of writes) {
-        try {
-            await putFileContent(meta.repo, w.path, w.content, head_ref, w.sha, ghApi);
-        }
-        catch (err) {
-            return {
-                action: "unresolvable",
-                reason: `put content ${w.path} failed: ${err.message?.slice(0, 200)}`,
-                files_resolved: filesResolved,
-            };
-        }
-    }
-    return {
-        action: "resolved",
-        files_resolved: filesResolved,
-        reason: writes.length > 0
-            ? `pushed ${writes.length} file(s): ${writes.map((w) => w.path).join(", ")}`
-            : "conflict already resolved (no writes needed)",
-    };
-}
-//# sourceMappingURL=conflict-resolver.js.map