@tokenfactory/acc-runner 0.6.0 → 0.6.2

package/dist/runtime/reviewer.js

@@ -0,0 +1,279 @@
+/**
+ * v0.12-REVIEW-LOCAL — Runner-side reviewer-agent runtime.
+ *
+ * Triggered by a `review_assigned` realtime broadcast on
+ * `runner:<id>`. Spawns `claude --print` with the reviewer prompt
+ * (mirrors v0.11-B's spawnClaude for task-runner.ts) against the
+ * operator's CLI subscription, parses the JSON decision, and posts
+ * it back via acc.submit_review. Cost-cap enforcement is identical
+ * to api/_lib/reviewer-agent.ts so the cron's downstream merge
+ * gate sees consistent ReviewerOutcome shape across the queue and
+ * fallback paths.
+ *
+ * Never throws. Every failure surfaces through acc.submit_review
+ * with decision='reviewer_error' so the queue row settles and the
+ * cron's poll-merge loop can advance.
+ */
+import { execa } from "execa";
+import { parseClaudeJson, priceUsdCents, normalizeUsage, } from "../cost-pricing.js";
+// Same template as prompts/reviewer-agent.md. The runner does not have
+// the markdown file at runtime (the package ships without prompts/) so
+// the prompt is embedded. Keep this string in sync with the markdown
+// version on every prompt edit; tests/integration/v0.12-REVIEW-LOCAL
+// asserts both render the same outline.
+const REVIEWER_PROMPT_TEMPLATE = [
+    "You are reviewing a pull request opened by another Claude (an ACC",
+    "task runner). Be skeptical. Bias toward rejecting when in doubt.",
+    "",
+    "Task spec:",
+    "{{task_description}}",
+    "",
+    "Acceptance criteria:",
+    "{{acceptance_criteria}}",
+    "",
+    "PR title: {{pr_title}}",
+    "PR body:",
+    "{{pr_body}}",
+    "",
+    "PR diff:",
+    "{{pr_diff}}",
+    "",
+    "Answer in this exact JSON shape, no surrounding prose:",
+    '{"decision":"approve"|"reject","reasons":["..."],"confidence":0.0}',
+].join("\n");
+const MAX_DIFF_CHARS = 60_000;
+export function renderReviewerPrompt(args) {
+    const diff = args.pr_diff.length > MAX_DIFF_CHARS
+        ? args.pr_diff.slice(0, MAX_DIFF_CHARS) +
+            `\n\n... [diff truncated at ${MAX_DIFF_CHARS} chars; full length ${args.pr_diff.length}] ...\n`
+        : args.pr_diff;
+    const acceptance = (args.acceptance_criteria ?? [])
+        .map((a, i) => `${i + 1}. ${a}`)
+        .join("\n");
+    return REVIEWER_PROMPT_TEMPLATE
+        .replace("{{task_description}}", args.task_description ?? "")
+        .replace("{{acceptance_criteria}}", acceptance)
+        .replace("{{pr_title}}", args.pr_title ?? "")
+        .replace("{{pr_body}}", args.pr_body ?? "")
+        .replace("{{pr_diff}}", diff);
+}
+export function extractReviewerDecision(text) {
+    if (!text)
+        return null;
+    const first = text.indexOf("{");
+    const last = text.lastIndexOf("}");
+    if (first === -1 || last <= first)
+        return null;
+    const candidates = [text.slice(first, last + 1), text.trim()];
+    for (const candidate of candidates) {
+        try {
+            const obj = JSON.parse(candidate);
+            if (obj.decision !== "approve" && obj.decision !== "reject")
+                continue;
+            const reasons = Array.isArray(obj.reasons)
+                ? obj.reasons.filter((r) => typeof r === "string")
+                : [];
+            const confidence = typeof obj.confidence === "number" &&
+                obj.confidence >= 0 && obj.confidence <= 1
+                ? obj.confidence
+                : 0;
+            return { decision: obj.decision, reasons, confidence };
+        }
+        catch { /* try next candidate */ }
+    }
+    return null;
+}
+async function defaultFetchPRMeta(repo, prNumber) {
+    const { stdout } = await execa("gh", ["pr", "view", String(prNumber), "-R", repo, "--json", "title,body"], { env: process.env });
+    const parsed = JSON.parse(stdout);
+    return { title: parsed.title ?? "", body: parsed.body ?? "" };
+}
+async function defaultFetchPRDiff(repo, prNumber) {
+    const { stdout } = await execa("gh", ["pr", "diff", String(prNumber), "-R", repo], { env: process.env });
+    return stdout;
+}
+function defaultSpawnClaude(modelId) {
+    const args = ["--print", "--dangerously-skip-permissions", "--output-format=json"];
+    const trimmed = (modelId ?? "").trim();
+    if (trimmed)
+        args.push("--model", trimmed);
+    return execa("claude", args, {
+        stdin: "pipe",
+        stdout: "pipe",
+        stderr: "pipe",
+        reject: false,
+        env: process.env,
+    });
+}
+function parseEnvelope(stdout, fallbackModel) {
+    const parsed = parseClaudeJson(stdout);
+    if (!parsed) {
+        return { result: stdout.trim(), session_id: null, cost_usd: 0, model: fallbackModel };
+    }
+    const model = parsed.model ?? fallbackModel;
+    const usage = normalizeUsage(parsed.usage);
+    const cents = priceUsdCents(model, usage);
+    return {
+        result: parsed.result ?? "",
+        // any-allowed: parseClaudeJson keeps additional fields on the
+        // record; session_id isn't on the typed shape but appears in
+        // every observed `--output-format=json` envelope from Claude CLI.
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        session_id: parsed.session_id ?? null,
+        cost_usd: cents / 100,
+        model,
+    };
+}
+/**
+ * Drive one review end-to-end: fetch task spec + PR meta + diff →
+ * render prompt → spawn claude → parse decision → submit_review.
+ * Always submits a row even on internal failure (reviewer_error) so
+ * the cron's poll-merge loop can advance.
+ */
+export async function runReview(assignment, deps) {
+    const fetchMeta = deps.fetchPRMeta ?? defaultFetchPRMeta;
+    const fetchDiff = deps.fetchPRDiff ?? defaultFetchPRDiff;
+    const spawnFn = deps.spawnClaude ?? defaultSpawnClaude;
+    let outcome;
+    try {
+        outcome = await driveReview(assignment, deps, fetchMeta, fetchDiff, spawnFn);
+    }
+    catch (err) {
+        outcome = {
+            decision: "reviewer_error",
+            reasons: [`runtime_threw: ${err.message?.slice(0, 200)}`],
+            confidence: 0,
+            session_id: null,
+            cost_usd: 0,
+        };
+    }
+    const { error } = await deps.supabase.rpc("submit_review", {
+        p_review_id: assignment.review_id,
+        p_decision: outcome.decision,
+        p_reasons: outcome.reasons,
+        p_confidence: outcome.confidence,
+        p_session_id: outcome.session_id,
+        p_cost_usd: outcome.cost_usd,
+    });
+    if (error) {
+        process.stderr.write(`[acc-runner] submit_review(${assignment.review_id}) failed: ${error.message}\n`);
+    }
+    return outcome;
+}
+async function driveReview(assignment, deps, fetchMeta, fetchDiff, spawnFn) {
+    const { data, error } = await deps.supabase.rpc("fetch_task_for_runner", {
+        p_task_id: assignment.task_id,
+    });
+    if (error || !data) {
+        return {
+            decision: "reviewer_error",
+            reasons: [`fetch_task_failed: ${error?.message ?? "no data"}`],
+            confidence: 0,
+            session_id: null,
+            cost_usd: 0,
+        };
+    }
+    const result = data;
+    const task = result.task;
+    const repo = task.repo?.trim();
+    if (!repo) {
+        return {
+            decision: "reviewer_error",
+            reasons: ["task has no repo to target gh against"],
+            confidence: 0,
+            session_id: null,
+            cost_usd: 0,
+        };
+    }
+    // Look up the org's reviewer policy. The runner-side reviewer needs
+    // confidence_threshold + max_cost_usd_per_review to stay consistent
+    // with the cron-side gate, since the cron now just lifts the decision
+    // out of the queue row without re-checking the cap.
+    const policy = deps.loadPolicy
+        ? await deps.loadPolicy("")
+        : await loadReviewerPolicy(deps.supabase);
+    const [meta, diff] = await Promise.all([
+        fetchMeta(repo, assignment.pr_number),
+        fetchDiff(repo, assignment.pr_number),
+    ]);
+    const prompt = renderReviewerPrompt({
+        task_description: task.description ?? "",
+        acceptance_criteria: task.acceptance ?? [],
+        pr_title: meta.title,
+        pr_body: meta.body,
+        pr_diff: diff,
+    });
+    const child = spawnFn(policy?.model_id ?? "claude-sonnet-4-6");
+    if (child.stdin) {
+        child.stdin.write(prompt);
+        child.stdin.end();
+    }
+    const stdout = await collectStream(child.stdout);
+    const exit = await child;
+    if (exit.exitCode !== 0) {
+        return {
+            decision: "reviewer_error",
+            reasons: [`claude exited ${exit.exitCode}`],
+            confidence: 0,
+            session_id: null,
+            cost_usd: 0,
+        };
+    }
+    const envelope = parseEnvelope(stdout, policy?.model_id ?? "claude-sonnet-4-6");
+    // Cost cap parity with api/_lib/reviewer-agent.ts. A cap of 0
+    // disables the gate.
+    if (policy &&
+        policy.max_cost_usd_per_review > 0 &&
+        envelope.cost_usd > policy.max_cost_usd_per_review) {
+        return {
+            decision: "cost_cap_exceeded",
+            reasons: [
+                `reviewer cost $${envelope.cost_usd.toFixed(4)} exceeded cap $${policy.max_cost_usd_per_review.toFixed(2)}`,
+            ],
+            confidence: 0,
+            session_id: envelope.session_id,
+            cost_usd: envelope.cost_usd,
+        };
+    }
+    const decision = extractReviewerDecision(envelope.result);
+    if (!decision) {
+        return {
+            decision: "reviewer_error",
+            reasons: [
+                "could not parse reviewer JSON from claude output",
+                `output_head: ${envelope.result.slice(0, 200)}`,
+            ],
+            confidence: 0,
+            session_id: envelope.session_id,
+            cost_usd: envelope.cost_usd,
+        };
+    }
+    return {
+        decision: decision.decision,
+        reasons: decision.reasons,
+        confidence: decision.confidence,
+        session_id: envelope.session_id,
+        cost_usd: envelope.cost_usd,
+    };
+}
+async function loadReviewerPolicy(supabase) {
+    // any-allowed: org_settings rows aren't in the runner's generated
+    // Database type yet — same pattern as task-runner.ts cost-event sink.
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const { data } = await supabase.from("org_settings")
+        .select("automerge_policy")
+        .limit(1)
+        .maybeSingle();
+    const row = data;
+    return row?.automerge_policy?.reviewer ?? null;
+}
+async function collectStream(stream) {
+    if (!stream)
+        return "";
+    let captured = "";
+    for await (const raw of stream) {
+        captured += typeof raw === "string" ? raw : raw.toString("utf8");
+    }
+    return captured;
+}
+//# sourceMappingURL=reviewer.js.map

package/dist/runtime/reviewer.js.map

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

package/dist/runtime/worktree.d.ts

@@ -0,0 +1,63 @@
+export declare function workDir(): string;
+export interface PreparedWorktree {
+    path: string;
+    /**
+     * v0.12-RESUME — true when a pre-existing registered worktree on
+     * the expected branch was reused instead of force-recreated. The
+     * caller logs this so an operator can audit how often the resume
+     * path actually fires vs. force-recreate (which is the path taken
+     * on every fresh task and on every stale/mismatched leftover).
+     * Optional so v0.11-F-era test stubs that omit the flag remain
+     * valid; absent or false both mean "fresh-recreate path".
+     */
+    resumed?: boolean;
+    cleanup(): Promise<void>;
+}
+export type GitExec = (args: string[], cwd: string) => Promise<void>;
+export type WorktreeInspector = (repoPath: string, taskId: string) => Promise<WorktreeInspection | null>;
+export interface PrepareWorktreeOptions {
+    repoPath: string;
+    taskId: string;
+    branch: string;
+    baseBranch: string;
+    git?: GitExec;
+    /**
+     * v0.12-RESUME — override worktree-state inspection for tests.
+     * Defaults to the real `inspectExistingWorktree` which shells out
+     * via `execa`. Tests inject a stub so the resume-vs-fresh branch is
+     * exercisable without standing up a real git repo on disk.
+     */
+    inspect?: WorktreeInspector;
+}
+export declare function worktreePath(taskId: string): string;
+/**
+ * v0.12-RESUME — capture the state of `worktreePath(taskId)` so the
+ * caller can decide between resume (reuse the dir + branch) and
+ * force-recreate (the legacy v0.11-F behaviour). Returns null when
+ * the directory does not exist.
+ *
+ * `dirty` is set when `git status --porcelain` inside the worktree
+ * lists at least one entry — meaning the prior (crashed) runner left
+ * uncommitted edits Claude can pick up from. `branch` is the result
+ * of `git rev-parse --abbrev-ref HEAD` — when it matches the
+ * task's expected branch the worktree is a valid resume candidate.
+ *
+ * Best-effort: failures (corrupt worktree, missing .git/worktrees
+ * entry, etc.) return `registered: false, branch: null` so the
+ * caller falls back to force-recreate rather than crashing.
+ */
+export interface WorktreeInspection {
+    path: string;
+    registered: boolean;
+    branch: string | null;
+    dirty: boolean;
+}
+export declare function inspectExistingWorktree(repoPath: string, taskId: string): Promise<WorktreeInspection | null>;
+export declare function prepareTaskWorktree(opts: PrepareWorktreeOptions): Promise<PreparedWorktree>;
+export interface OrphanWorktree {
+    path: string;
+    taskId: string;
+}
+/** Doctor helper: dirs under workDir() not registered in `git worktree list`. */
+export declare function listOrphanWorktrees(repoPath: string): Promise<OrphanWorktree[]>;
+//# sourceMappingURL=worktree.d.ts.map

package/dist/runtime/worktree.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"worktree.d.ts","sourceRoot":"","sources":["../../src/runtime/worktree.ts"],"names":[],"mappings":"AAwBA,wBAAgB,OAAO,IAAI,MAAM,CAEhC;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb;;;;;;;;OAQG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAED,MAAM,MAAM,OAAO,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AACrE,MAAM,MAAM,iBAAiB,GAAG,CAC9B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,KACX,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAAC;AAExC,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd;;;;;OAKG;IACH,OAAO,CAAC,EAAE,iBAAiB,CAAC;CAC7B;AAMD,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAEnD;AAyBD;;;;;;;;;;;;;;;GAeG;AACH,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,OAAO,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,wBAAsB,uBAAuB,CAC3C,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAgDpC;AAED,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,sBAAsB,GAC3B,OAAO,CAAC,gBAAgB,CAAC,CAkD3B;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,iFAAiF;AACjF,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,cAAc,EAAE,CAAC,CA+B3B"}

package/dist/runtime/worktree.js

@@ -0,0 +1,184 @@
+/**
+ * Per-task isolated `git worktree` at `~/.cache/acc-runner/work/<task_id>/`
+ * so parallel runners on the same machine don't race on the shared
+ * clone's branch checkout. Forked off the integration branch's local
+ * tip; cleaned up on every task completion path.
+ *
+ * v0.12-RESUME — when a prior runner crashed mid-task and the
+ * v0.12 stale-running sweep returned the task to queued, a fresh
+ * runner that picks the same task back up will find a leftover
+ * worktree directory + git registration. The pre-v0.12 behaviour
+ * was to force-remove and recreate, throwing away the dead
+ * runner's in-progress edits. We now detect this case
+ * (`inspectExistingWorktree`), preserve the directory when it is
+ * still a valid registration on the expected task branch, and
+ * mark the returned `PreparedWorktree` as `resumed: true` so the
+ * task-runner can log the resume and Claude picks up from the
+ * partially-committed state instead of restarting from baseBranch.
+ */
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import { execa } from "execa";
+// Lazy so tests can override HOME between cases.
+export function workDir() {
+    return path.join(os.homedir(), ".cache", "acc-runner", "work");
+}
+function defaultGitExec(args, cwd) {
+    return execa("git", args, { cwd, env: process.env }).then(() => undefined);
+}
+export function worktreePath(taskId) {
+    return path.join(workDir(), taskId);
+}
+async function pathExists(p) {
+    try {
+        await fs.access(p);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+async function removeWorktree(repoPath, target, git) {
+    if (await pathExists(target)) {
+        // Best-effort: deregister, then nuke residue. Partial cleanup
+        // shouldn't fail the surrounding task lifecycle.
+        try {
+            await git(["worktree", "remove", "--force", target], repoPath);
+        }
+        catch { /* noop */ }
+        await fs.rm(target, { recursive: true, force: true });
+    }
+    try {
+        await git(["worktree", "prune"], repoPath);
+    }
+    catch { /* noop */ }
+}
+export async function inspectExistingWorktree(repoPath, taskId) {
+    const target = worktreePath(taskId);
+    if (!(await pathExists(target)))
+        return null;
+    // `git worktree list --porcelain` runs from the *parent* clone so
+    // the registration check sees the canonical list. A target dir
+    // that exists on disk but is absent here is an orphan — the
+    // caller will treat it as not-registered and force-recreate.
+    let registered = false;
+    try {
+        const { stdout } = await execa("git", ["worktree", "list", "--porcelain"], { cwd: repoPath, env: process.env });
+        for (const line of stdout.split(/\r?\n/)) {
+            const m = /^worktree (.+)$/.exec(line);
+            if (m && path.resolve(m[1]) === path.resolve(target)) {
+                registered = true;
+                break;
+            }
+        }
+    }
+    catch {
+        registered = false;
+    }
+    let branch = null;
+    try {
+        const { stdout } = await execa("git", ["rev-parse", "--abbrev-ref", "HEAD"], { cwd: target, env: process.env });
+        branch = stdout.trim() || null;
+    }
+    catch {
+        branch = null;
+    }
+    let dirty = false;
+    try {
+        const { stdout } = await execa("git", ["status", "--porcelain"], { cwd: target, env: process.env });
+        dirty = stdout.trim().length > 0;
+    }
+    catch {
+        dirty = false;
+    }
+    return { path: target, registered, branch, dirty };
+}
+export async function prepareTaskWorktree(opts) {
+    const git = opts.git ?? defaultGitExec;
+    await fs.mkdir(workDir(), { recursive: true });
+    const target = worktreePath(opts.taskId);
+    // v0.12-RESUME — if a leftover worktree is registered on the
+    // expected branch, preserve it so Claude can pick up where the
+    // dead runner left off. Otherwise (orphan dir, wrong branch,
+    // corrupt state) fall through to the v0.11-F force-recreate
+    // path so the new task starts from a known baseBranch tip.
+    //
+    // We only enter the resume path when the inspector reports
+    // registered=true on the expected branch. The real inspector
+    // shells to `git worktree list --porcelain`; tests inject a stub.
+    // When `opts.repoPath` is not a real git checkout (test fixtures
+    // like "/repo"), the default inspector swallows the `git` error
+    // and returns registered=false, preserving v0.11-F's force-
+    // recreate semantics for the existing test suite.
+    const inspect = opts.inspect ?? inspectExistingWorktree;
+    const existing = await inspect(opts.repoPath, opts.taskId);
+    if (existing && existing.registered && existing.branch === opts.branch) {
+        let cleaned = false;
+        return {
+            path: target,
+            resumed: true,
+            async cleanup() {
+                if (cleaned)
+                    return;
+                cleaned = true;
+                await removeWorktree(opts.repoPath, target, git);
+            },
+        };
+    }
+    await removeWorktree(opts.repoPath, target, git);
+    // `-B <branch> <path> <baseBranch>` force-creates the task branch at
+    // baseBranch's tip, overwriting a stale ref from a prior crashed run.
+    await git(["worktree", "add", "-B", opts.branch, target, opts.baseBranch], opts.repoPath);
+    let cleaned = false;
+    return {
+        path: target,
+        resumed: false,
+        async cleanup() {
+            if (cleaned)
+                return;
+            cleaned = true;
+            await removeWorktree(opts.repoPath, target, git);
+        },
+    };
+}
+/** Doctor helper: dirs under workDir() not registered in `git worktree list`. */
+export async function listOrphanWorktrees(repoPath) {
+    let entries;
+    try {
+        entries = await fs.readdir(workDir());
+    }
+    catch (err) {
+        if (err.code === "ENOENT")
+            return [];
+        throw err;
+    }
+    const registered = new Set();
+    try {
+        const { stdout } = await execa("git", ["worktree", "list", "--porcelain"], { cwd: repoPath, env: process.env });
+        for (const line of stdout.split(/\r?\n/)) {
+            const m = /^worktree (.+)$/.exec(line);
+            if (m)
+                registered.add(path.resolve(m[1]));
+        }
+    }
+    catch {
+        // Without a usable repo we can't distinguish; surface everything.
+    }
+    const orphans = [];
+    for (const name of entries) {
+        const p = path.join(workDir(), name);
+        try {
+            const stat = await fs.stat(p);
+            if (!stat.isDirectory())
+                continue;
+        }
+        catch {
+            continue;
+        }
+        if (!registered.has(p))
+            orphans.push({ path: p, taskId: name });
+    }
+    return orphans;
+}
+//# sourceMappingURL=worktree.js.map

package/dist/runtime/worktree.js.map

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

package/dist/task-runner.d.ts

@@ -4,6 +4,8 @@ import { type NormalizedUsage } from "./cost-pricing.js";
 import { type GitRunner } from "./git.js";
 import { type GhRunner } from "./gh.js";
 import { type McpConfigCleanup, type McpSpawnOptions } from "./mcp-spawn.js";
+import { type TaskLock } from "./runtime/locks.js";
+import { type PreparedWorktree, type PrepareWorktreeOptions } from "./runtime/worktree.js";
 import type { RunnerSupabaseClient } from "./supabase.js";
 export interface CostEventPayload extends NormalizedUsage {
     task_id: string;
@@ -40,11 +42,12 @@ export interface RunTaskDeps {
     postCostEvent?: (event: CostEventPayload) => Promise<void>;
     /**
      * Runner session coordinates threaded down so the per-task
-     * .mcp.json can be authored before Claude Code spawns. When absent,
-     * the MCP server is not provisioned (back-compat for tests + older
-     * watch.ts wiring).
+     * .mcp.json can be authored before Claude Code spawns AND so the
+     * v0.6.1 claim_task_with_locks RPC can attribute the lock to the
+     * caller's runner row. v0.6.1 (REG-309 sibling): required now —
+     * watch.ts has always passed it; tests must stub it.
      */
-    session?: {
+    session: {
         accessToken: string;
         runnerId: string;
     };
@@ -52,6 +55,30 @@ export interface RunTaskDeps {
     publicUrl?: string;
     /** Override for tests; defaults to writing a real .mcp.json. */
     writeMcpConfig?: (opts: McpSpawnOptions) => Promise<McpConfigCleanup>;
+    /**
+     * v0.11-F: per-task PID lock at `~/.cache/acc-runner/locks/<task_id>.pid`.
+     * Throws `TaskLockHeldError` when another live runner holds the lock;
+     * the caller surfaces `phase: "worktree_lock"` and bails before any
+     * worktree side-effect lands.
+     */
+    acquireLock?: (taskId: string) => Promise<TaskLock>;
+    /**
+     * v0.11-F: provision an isolated git worktree at
+     * `~/.cache/acc-runner/work/<task_id>/`. All subsequent git ops +
+     * spawnClaude run with the worktree's path as cwd, never the
+     * operator's shared clone.
+     */
+    prepareWorktree?: (opts: PrepareWorktreeOptions) => Promise<PreparedWorktree>;
+    /**
+     * v0.12-RESUME: cadence (ms) for the periodic
+     * `acc.update_task_signal` RPC that refreshes
+     * `acc.tasks.last_runner_signal_at` while the task is in flight.
+     * The 5-minute cron sweep uses a 5-minute cutoff, so 30s gives
+     * ~10 missed signals of margin before a still-alive runner gets
+     * its task pulled back to queued. Tests override to a sub-second
+     * cadence so the loop is observable without real-time waits.
+     */
+    signalIntervalMs?: number;
 }
 export interface RunTaskController {
     taskId: string;
@@ -63,7 +90,7 @@ export interface RunTaskController {
  * line (REG-294) so an operator can tell whether a multi-minute task
  * died at fetch, git, claude, or push.
  */
-export type RunTaskPhase = "transition_to_running" | "fetch" | "git" | "claude_exit" | "push";
+export type RunTaskPhase = "claim_locks" | "transition_to_running" | "fetch" | "worktree_lock" | "git" | "claude_exit" | "push";
 export interface RunTaskOutcome {
     taskId: string;
     status: "ok" | "failed" | "cancelled";

package/dist/task-runner.d.ts.map

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