agent-dealer 0.1.2 → 0.1.3

package/bundle/server/dist/queue/answers.test.js

@@ -0,0 +1,117 @@
+import { test, before } from "node:test";
+import assert from "node:assert/strict";
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+process.env.AGENT_DEALER_HOME = fs.mkdtempSync(path.join(os.tmpdir(), "dealer-answers-"));
+process.env.MAX_CONCURRENT_RUNS = "0";
+const { migrate } = await import("../db/index.js");
+const { BUILTIN_AGENT_CLAUDE_ID } = await import("@agent-dealer/shared");
+const { updateAgent } = await import("../repository/agents.js");
+const { addArtifact, createRun, getLatestArtifact, getRun, markPlanTriageConsumed, updateRunFields } = await import("../repository/runs.js");
+const { submitPlanAnswers } = await import("./dispatcher.js");
+const QUESTIONS = [
+    { id: "q1", question: "Which approach?", options: [{ label: "A" }, { label: "B" }] },
+    { id: "q2", question: "Ship docs too?", options: [{ label: "Yes" }, { label: "No" }] },
+];
+before(() => {
+    migrate();
+    updateAgent(BUILTIN_AGENT_CLAUDE_ID, { workspaceRoot: process.env.AGENT_DEALER_HOME });
+});
+function seedQuestionRun() {
+    const run = createRun({
+        title: "Answers test",
+        taskCategory: "other",
+        status: "plan_pending",
+        agentId: BUILTIN_AGENT_CLAUDE_ID,
+    });
+    addArtifact(run.id, "draft_plan", { markdown: "# Plan", sessionId: "sess-1" }, "agent");
+    addArtifact(run.id, "plan_triage", { verdict: "needs_review", rationale: "r", questions: QUESTIONS, sessionId: "sess-1", parseFallback: false, consumed: false }, "agent");
+    return getRun(run.id);
+}
+test("all-structured answers approve and mark plan_answers approved", () => {
+    const run = seedQuestionRun();
+    const res = submitPlanAnswers(run.id, {
+        answers: [
+            { questionId: "q1", selectedLabel: "A" },
+            { questionId: "q2", selectedLabel: "No" },
+        ],
+    });
+    assert.equal(res.ok, true);
+    assert.equal(res.ok && res.outcome, "approved");
+    assert.equal(getRun(run.id).status, "plan_approved");
+    const ans = getLatestArtifact(run.id, "plan_answers");
+    assert.match(ans.contentJson, /"outcome":"approved"/);
+    assert.equal(getLatestArtifact(run.id, "approved_plan").author, "human");
+    const triage = getLatestArtifact(run.id, "plan_triage");
+    assert.match(triage.contentJson, /"consumed":true/);
+});
+test("executeModel null does not wipe seeded execute_model", () => {
+    const run = seedQuestionRun();
+    updateRunFields(run.id, { execute_model: "claude-sonnet-4" });
+    const res = submitPlanAnswers(run.id, {
+        answers: [
+            { questionId: "q1", selectedLabel: "A" },
+            { questionId: "q2", selectedLabel: "No" },
+        ],
+        executeModel: null,
+    });
+    assert.equal(res.ok, true);
+    assert.equal(getRun(run.id).executeModel, "claude-sonnet-4");
+});
+test("free-form answer schedules a redraft instead of approving", () => {
+    const run = seedQuestionRun();
+    let redrafted = false;
+    const res = submitPlanAnswers(run.id, {
+        answers: [
+            { questionId: "q1", freeText: "Do it a third way" },
+            { questionId: "q2", selectedLabel: "Yes" },
+        ],
+    }, { onRedraft: () => { redrafted = true; } });
+    assert.equal(res.ok && res.outcome, "redraft");
+    assert.equal(redrafted, true);
+    assert.equal(getRun(run.id).status, "plan_pending");
+});
+test("answers must cover every open question exactly once", () => {
+    const run = seedQuestionRun();
+    const res = submitPlanAnswers(run.id, { answers: [{ questionId: "q1", selectedLabel: "A" }] });
+    assert.equal(res.ok, false);
+    assert.equal(!res.ok && res.code, 400);
+});
+test("double submit returns 409", () => {
+    const run = seedQuestionRun();
+    submitPlanAnswers(run.id, {
+        answers: [
+            { questionId: "q1", selectedLabel: "A" },
+            { questionId: "q2", selectedLabel: "Yes" },
+        ],
+    });
+    const again = submitPlanAnswers(run.id, {
+        answers: [
+            { questionId: "q1", selectedLabel: "B" },
+            { questionId: "q2", selectedLabel: "No" },
+        ],
+    });
+    assert.equal(!again.ok && again.code, 409);
+});
+test("run without open questions returns 409", () => {
+    const run = createRun({
+        title: "No questions",
+        taskCategory: "other",
+        status: "plan_pending",
+        agentId: BUILTIN_AGENT_CLAUDE_ID,
+    });
+    const res = submitPlanAnswers(run.id, { answers: [{ questionId: "q1", selectedLabel: "A" }] });
+    assert.equal(!res.ok && res.code, 409);
+});
+test("consumed triage rejects answers", () => {
+    const run = seedQuestionRun();
+    markPlanTriageConsumed(run.id);
+    const res = submitPlanAnswers(run.id, {
+        answers: [
+            { questionId: "q1", selectedLabel: "A" },
+            { questionId: "q2", selectedLabel: "Yes" },
+        ],
+    });
+    assert.equal(!res.ok && res.code, 409);
+});

package/bundle/server/dist/queue/dispatcher.js

@@ -1,4 +1,6 @@
-import { addArtifact, countByStatus, getLatestArtifact, getRun, listRuns, transitionRun, } from "../repository/runs.js";
+import { planGateDecision } from "@agent-dealer/shared";
+import { buildPlanRevisePrompt } from "../runners/prompts.js";
+import { addArtifact, countByStatus, getLatestArtifact, getRun, listArtifacts, listRuns, markPlanTriageConsumed, patchRunPhaseBudget, transitionRun, updateRunFields, } from "../repository/runs.js";
 import { runAgent } from "../runners/claude.js";
 import { persistRunOutput, seedDeliverableFromParent } from "../runners/persist.js";
 import { checkAgentDeckHealth } from "../adapters/agent-deck.js";
@@ -42,6 +44,24 @@ function isReadyForPlanReview(run) {
         !!getLatestArtifact(run.id, "draft_plan") &&
         !activePlanDrafts.has(run.id));
 }
+/** Open (unanswered, unconsumed) question count for a plan_pending run. */
+function openQuestionCount(runId) {
+    const tri = getLatestArtifact(runId, "plan_triage");
+    if (!tri?.contentJson)
+        return 0;
+    try {
+        const c = JSON.parse(tri.contentJson);
+        if (c.consumed || !c.questions?.length)
+            return 0;
+        const ans = getLatestArtifact(runId, "plan_answers");
+        if (ans && ans.createdAt > tri.createdAt)
+            return 0;
+        return c.questions.length;
+    }
+    catch {
+        return 0;
+    }
+}
 export function getSnapshot() {
     const all = listRuns();
     const runningRuns = all.filter((r) => r.status === "running");
@@ -57,6 +77,16 @@ export function getSnapshot() {
     const awaitingPlanReview = planningPhase.filter(isReadyForPlanReview);
     const planningActiveRuns = planningPhase.filter((r) => activePlanDrafts.has(r.id));
     const planningQueuedRuns = planningPhase.filter((r) => !activePlanDrafts.has(r.id) && !isReadyForPlanReview(r));
+    const openQuestionCounts = {};
+    for (const run of awaitingPlanReview) {
+        const n = openQuestionCount(run.id);
+        if (n > 0)
+            openQuestionCounts[run.id] = n;
+    }
+    const awaitingAnswerRuns = awaitingPlanReview.filter((r) => openQuestionCounts[r.id]);
+    const autoApprovedRunIds = [...waitingExecution, ...runningRuns]
+        .filter((r) => getLatestArtifact(r.id, "approved_plan")?.author === "system")
+        .map((r) => r.id);
     return {
         planReviewCount: awaitingPlanReview.length,
         resultReviewCount: resultReviewRuns.length,
@@ -68,6 +98,9 @@ export function getSnapshot() {
         resultReviewRuns,
         recentDone,
         awaitingPlanReview,
+        awaitingAnswerRuns,
+        openQuestionCounts,
+        autoApprovedRunIds,
         runs: all,
         agentDeckOnline: false,
         agents: [],
@@ -195,6 +228,49 @@ export async function kickRun(run) {
     }
     await dispatch();
 }
+function priorQuestionRounds(runId, currentTriageArtifactId) {
+    return listArtifacts(runId).filter((a) => {
+        if (a.kind !== "plan_triage" || a.id === currentTriageArtifactId || !a.contentJson)
+            return false;
+        try {
+            const c = JSON.parse(a.contentJson);
+            return (c.questions?.length ?? 0) > 0;
+        }
+        catch {
+            return false;
+        }
+    }).length;
+}
+/** Self-triage gate after a plan draft persists (PRD F2). Exported for tests. */
+export function applyPlanGate(run) {
+    const art = getLatestArtifact(run.id, "plan_triage");
+    if (!art?.contentJson)
+        return "await_review";
+    let triage;
+    try {
+        triage = JSON.parse(art.contentJson);
+    }
+    catch {
+        return "await_review";
+    }
+    const decision = planGateDecision({
+        triage,
+        priorQuestionRounds: priorQuestionRounds(run.id, art.id),
+    });
+    if (decision !== "auto_approve")
+        return decision;
+    const fresh = getRun(run.id);
+    if (!fresh || fresh.status !== "plan_pending")
+        return "await_review";
+    const draft = getLatestArtifact(run.id, "draft_plan");
+    if (!draft?.contentJson)
+        return "await_review";
+    const plan = JSON.parse(draft.contentJson);
+    addArtifact(run.id, "approved_plan", { ...plan, autoApproved: true, rationale: triage.rationale }, "system");
+    transitionRun(run.id, "plan_approved");
+    void forceDispatch();
+    return "auto_approve";
+}
 export async function draftPlan(run, opts) {
     if (run.status === "queued") {
         transitionRun(run.id, "plan_pending");
@@ -208,7 +284,7 @@ export async function draftPlan(run, opts) {
     }
     const rt = runtimeFor(updated);
     try {
-        const result = await runAgent(updated, "plan");
+        const result = await runAgent(updated, "plan", opts?.revise);
         const persisted = persistRunOutput({
             run: updated,
             phase: "plan",
@@ -225,6 +301,18 @@ export async function draftPlan(run, opts) {
         }
         if (persisted.planMarkdown) {
             addArtifact(updated.id, "draft_plan", { markdown: persisted.planMarkdown, sessionId: persisted.sessionId }, "agent", result.logPath);
+            const triage = persisted.planTriage;
+            if (triage) {
+                addArtifact(updated.id, "plan_triage", {
+                    verdict: triage.verdict,
+                    rationale: triage.rationale,
+                    questions: triage.questions,
+                    sessionId: persisted.sessionId,
+                    parseFallback: triage.parseFallback,
+                    consumed: false,
+                }, "agent");
+                applyPlanGate(getRun(run.id));
+            }
         }
         else if (!opts?.replace) {
             addArtifact(updated.id, "feedback", { error: "Agent did not return a plan" }, "system");
@@ -245,6 +333,80 @@ export async function draftPlan(run, opts) {
     await notify();
     return getRun(run.id);
 }
+/** Answer open plan questions (PRD F3). Structured answers approve + dispatch; free-form revises the plan. */
+export function submitPlanAnswers(runId, input, opts) {
+    const run = getRun(runId);
+    if (!run)
+        return { ok: false, code: 404, error: "Not found" };
+    if (run.status !== "plan_pending") {
+        return { ok: false, code: 409, error: `No open questions — run is ${run.status}` };
+    }
+    const triageArt = getLatestArtifact(runId, "plan_triage");
+    if (!triageArt?.contentJson)
+        return { ok: false, code: 409, error: "No open questions" };
+    let triage;
+    try {
+        triage = JSON.parse(triageArt.contentJson);
+    }
+    catch {
+        return { ok: false, code: 409, error: "No open questions" };
+    }
+    if (triage.consumed || triage.questions.length === 0) {
+        return { ok: false, code: 409, error: "No open questions" };
+    }
+    const priorAnswers = getLatestArtifact(runId, "plan_answers");
+    if (priorAnswers && priorAnswers.createdAt > triageArt.createdAt) {
+        return { ok: false, code: 409, error: "Questions already answered" };
+    }
+    const expected = triage.questions.map((q) => q.id).sort().join(",");
+    const got = input.answers.map((a) => a.questionId).sort().join(",");
+    if (expected !== got) {
+        return { ok: false, code: 400, error: "Answers must cover every open question exactly once" };
+    }
+    const freeForm = input.answers.some((a) => a.freeText);
+    const outcome = freeForm ? "redraft" : "approved";
+    addArtifact(runId, "plan_answers", { answers: input.answers, outcome, answeredAt: new Date().toISOString() }, "human");
+    if (!freeForm) {
+        // null/empty = "Default" — do not wipe a seeded execute_model; only set explicit picks
+        if (input.executeModel?.trim()) {
+            updateRunFields(runId, { execute_model: input.executeModel.trim() });
+        }
+        if (input.executeBudget !== undefined) {
+            patchRunPhaseBudget(runId, "execute", input.executeBudget);
+        }
+        markPlanTriageConsumed(runId);
+        try {
+            transitionRun(runId, "plan_approved");
+        }
+        catch (e) {
+            return { ok: false, code: 409, error: String(e) };
+        }
+        const draft = getLatestArtifact(runId, "draft_plan");
+        const plan = draft?.contentJson ? JSON.parse(draft.contentJson) : { markdown: "" };
+        addArtifact(runId, "approved_plan", plan, "human");
+        void forceDispatch();
+        return { ok: true, outcome, run: getRun(runId) };
+    }
+    (opts?.onRedraft ?? scheduleRevisePlan)(getRun(runId), triage, input.answers);
+    return { ok: true, outcome, run: getRun(runId) };
+}
+function scheduleRevisePlan(run, triage, answers) {
+    if (activePlanDrafts.has(run.id))
+        return;
+    activePlanDrafts.add(run.id);
+    void draftPlan(run, {
+        replace: true,
+        revise: {
+            resumeSessionId: triage.sessionId,
+            prompt: buildPlanRevisePrompt(run, triage.questions, answers),
+        },
+    })
+        .catch((e) => console.error("[plan-revise]", run.id, e))
+        .finally(() => {
+        activePlanDrafts.delete(run.id);
+        notify().catch(console.error);
+    });
+}
 /** Fire-and-forget: human requested a new agent plan (replaces draft). */
 export function scheduleRedraft(run) {
     if (activePlanDrafts.has(run.id))

package/bundle/server/dist/queue/plan-gate.test.js

@@ -0,0 +1,55 @@
+import { test, before } from "node:test";
+import assert from "node:assert/strict";
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+process.env.AGENT_DEALER_HOME = fs.mkdtempSync(path.join(os.tmpdir(), "dealer-gate-"));
+process.env.MAX_CONCURRENT_RUNS = "0";
+const { migrate } = await import("../db/index.js");
+const { BUILTIN_AGENT_CLAUDE_ID } = await import("@agent-dealer/shared");
+const { updateAgent } = await import("../repository/agents.js");
+const { addArtifact, createRun, getLatestArtifact, getRun } = await import("../repository/runs.js");
+const { applyPlanGate, getSnapshot } = await import("./dispatcher.js");
+const QUESTIONS = [
+    { id: "q1", question: "Which approach?", options: [{ label: "A" }, { label: "B" }] },
+];
+before(() => {
+    migrate();
+    updateAgent(BUILTIN_AGENT_CLAUDE_ID, { workspaceRoot: process.env.AGENT_DEALER_HOME });
+});
+function seedRun(triage) {
+    const run = createRun({
+        title: "Gate test",
+        taskCategory: "other",
+        status: "plan_pending",
+        agentId: BUILTIN_AGENT_CLAUDE_ID,
+    });
+    addArtifact(run.id, "draft_plan", { markdown: "# Plan" }, "agent");
+    addArtifact(run.id, "plan_triage", triage, "agent");
+    return getRun(run.id);
+}
+test("trivial triage auto-approves: system approved_plan + plan_approved status", () => {
+    const run = seedRun({ verdict: "trivial", rationale: "tiny", questions: [], parseFallback: false, consumed: false });
+    assert.equal(applyPlanGate(run), "auto_approve");
+    assert.equal(getRun(run.id).status, "plan_approved");
+    const approved = getLatestArtifact(run.id, "approved_plan");
+    assert.equal(approved.author, "system");
+    assert.match(approved.contentJson, /tiny/);
+});
+test("questions await answers and leave status untouched", () => {
+    const run = seedRun({ verdict: "needs_review", rationale: "r", questions: QUESTIONS, parseFallback: false, consumed: false });
+    assert.equal(applyPlanGate(run), "await_answers");
+    assert.equal(getRun(run.id).status, "plan_pending");
+});
+test("third question round goes to manual review", () => {
+    const run = seedRun({ verdict: "needs_review", rationale: "r1", questions: QUESTIONS, parseFallback: false, consumed: false });
+    addArtifact(run.id, "plan_triage", { verdict: "needs_review", rationale: "r2", questions: QUESTIONS, parseFallback: false, consumed: false }, "agent");
+    addArtifact(run.id, "plan_triage", { verdict: "needs_review", rationale: "r3", questions: QUESTIONS, parseFallback: false, consumed: false }, "agent");
+    assert.equal(applyPlanGate(getRun(run.id)), "await_review");
+});
+test("snapshot exposes awaitingAnswerRuns, openQuestionCounts, autoApprovedRunIds", () => {
+    const snap = getSnapshot();
+    assert.equal(Array.isArray(snap.awaitingAnswerRuns), true);
+    assert.equal(typeof snap.openQuestionCounts, "object");
+    assert.equal(Array.isArray(snap.autoApprovedRunIds), true);
+});

package/bundle/server/dist/repository/runs.js

@@ -168,7 +168,8 @@ export function updateRunBudget(id, patch) {
 export function patchRunPhaseBudget(id, phase, budget) {
     if (budget === undefined)
         return getRun(id);
-    return updateRunBudget(id, { [phase]: budget ?? undefined });
+    // null = clear run-level override for this phase (revert to agent defaults)
+    return updateRunBudget(id, { [phase]: budget });
 }
 export function resolveModelForPhase(run, phase) {
     const agent = run.agentId ? getAgent(run.agentId) : null;
@@ -387,6 +388,21 @@ export function getLatestArtifact(runId, kind) {
         createdAt: row.created_at,
     };
 }
+/** Latest plan_triage stops auto-approving / accepting answers once a human takes over the plan. */
+export function markPlanTriageConsumed(runId) {
+    const art = getLatestArtifact(runId, "plan_triage");
+    if (!art?.contentJson)
+        return;
+    try {
+        const content = JSON.parse(art.contentJson);
+        if (content.consumed === true)
+            return;
+        updateArtifactContent(art.id, { ...content, consumed: true });
+    }
+    catch {
+        /* leave malformed triage untouched */
+    }
+}
 const OPS_BOARD_STATUSES = [
     "queued",
     "plan_pending",

package/bundle/server/dist/routes/index.js

@@ -1,10 +1,10 @@
 import fs from "node:fs";
-import { CreateRunInput, AgentConfigInput, AgentDeckConfigPatch, CreateAgentInput, UpdateAgentInput, DraftPlanInput, KickRunInput, LinearIntakeConfigPatch, PromoteLinearInput, RetryRunInput, Runtime, UpdatePlanInput, PlaybookPatchContent, BUILTIN_AGENT_CLAUDE_ID, } from "@agent-dealer/shared";
+import { CreateRunInput, AgentConfigInput, AgentDeckConfigPatch, CreateAgentInput, UpdateAgentInput, DraftPlanInput, KickRunInput, PlanAnswersInput, LinearIntakeConfigPatch, PromoteLinearInput, RetryRunInput, Runtime, UpdatePlanInput, PlaybookPatchContent, BUILTIN_AGENT_CLAUDE_ID, } from "@agent-dealer/shared";
 import { parseRunBudget } from "@agent-dealer/shared";
-import { addArtifact, createRun, findActiveByExternalId, getRun, listArtifacts, listEvents, listRuns, updateRunFields, updateArtifactContent, transitionRun, getLatestArtifact, patchRunPhaseBudget, updateRunBudget, } from "../repository/runs.js";
+import { addArtifact, createRun, findActiveByExternalId, getRun, listArtifacts, listEvents, listRuns, updateRunFields, updateArtifactContent, transitionRun, getLatestArtifact, markPlanTriageConsumed, patchRunPhaseBudget, updateRunBudget, } from "../repository/runs.js";
 import { createAgent, deleteAgent, getAgent, listAgents, updateAgent, } from "../repository/agents.js";
 import { listAgentsWithHealth } from "../adapters/agent-health.js";
-import { forceDispatch, getSnapshotAsync, kickRun, schedulePlanDraft, scheduleRedraft, scheduleReflect, subscribe, } from "../queue/dispatcher.js";
+import { forceDispatch, getSnapshotAsync, kickRun, schedulePlanDraft, scheduleRedraft, scheduleReflect, submitPlanAnswers, subscribe, } from "../queue/dispatcher.js";
 import { fetchAgentDeckDecks, updatePlaybookBody } from "../adapters/agent-deck.js";
 import { testAgentDeckConnection } from "../adapters/agent-deck.js";
 import { getLinearIssue, listLinearCandidates, testLinearConnection, } from "../adapters/linear-inbox.js";
@@ -53,11 +53,12 @@ export async function registerRoutes(app) {
         const run = getRun(id);
         if (!run)
             return reply.status(404).send({ error: "Not found" });
+        const artifacts = listArtifacts(id);
         return {
             run,
-            artifacts: listArtifacts(id),
+            artifacts,
             events: listEvents(id),
-            usageSummary: buildLineageUsageSummary(run),
+            usageSummary: buildLineageUsageSummary(run, { artifactsByRunId: { [id]: artifacts } }),
             traceSummary: buildLineageTraceSummary(run),
         };
     });
@@ -272,8 +273,6 @@ export async function registerRoutes(app) {
         if (!run)
             return reply.status(404).send({ error: "Not found" });
         const input = UpdatePlanInput.parse(req.body);
-        const kind = input.approve ? "approved_plan" : "draft_plan";
-        addArtifact(id, kind, { markdown: input.planMarkdown }, "human");
         if (input.approve) {
             const hasPlan = listArtifacts(id).some((a) => a.kind === "draft_plan") ||
                 input.planMarkdown.trim().length > 0;
@@ -301,16 +300,40 @@ export async function registerRoutes(app) {
             if (input.executeBudget !== undefined) {
                 patchRunPhaseBudget(id, "execute", input.executeBudget);
             }
-            const updated = transitionRun(id, "plan_approved");
+            markPlanTriageConsumed(id);
+            try {
+                transitionRun(id, "plan_approved");
+            }
+            catch (e) {
+                return reply.status(409).send({ error: String(e) });
+            }
+            addArtifact(id, "approved_plan", { markdown: input.planMarkdown }, "human");
+            const updated = getRun(id);
             syncLinearForRun(updated, "plan_approved").catch((e) => console.error("[linear-sync] plan_approved:", e));
             await forceDispatch();
             return updated;
         }
+        addArtifact(id, "draft_plan", { markdown: input.planMarkdown }, "human");
+        markPlanTriageConsumed(id);
         if (run.status === "queued") {
             return transitionRun(id, "plan_pending");
         }
         return getRun(id);
     });
+    app.post("/api/runs/:id/plan/answers", async (req, reply) => {
+        const { id } = req.params;
+        let input;
+        try {
+            input = PlanAnswersInput.parse(req.body);
+        }
+        catch (e) {
+            return reply.status(400).send({ error: String(e) });
+        }
+        const result = submitPlanAnswers(id, input);
+        if (!result.ok)
+            return reply.status(result.code).send({ error: result.error });
+        return { run: result.run, outcome: result.outcome };
+    });
     app.post("/api/runs/:id/kick", async (req, reply) => {
         const { id } = req.params;
         const run = getRun(id);
@@ -394,6 +417,9 @@ export async function registerRoutes(app) {
             runtime: run.runtime,
             execute_model: input.executeModel ?? input.planModel ?? run.executeModel,
         });
+        if (input.executeBudget !== undefined) {
+            patchRunPhaseBudget(retry.id, "execute", input.executeBudget);
+        }
         try {
             addArtifact(retry.id, "approved_plan", JSON.parse(approvedPlan.contentJson), approvedPlan.author);
         }

package/bundle/server/dist/runners/claude.js

@@ -25,14 +25,15 @@ function logPathFor(run, mode) {
     const logDir = getTemporalLogsDir();
     return path.join(logDir, `${run.id}-${mode}-${Date.now()}.ndjson`);
 }
-export async function runClaude(run, mode = "execute", model, promptOverride) {
+export async function runClaude(run, mode = "execute", model, opts) {
     const mcpConfig = process.env.CLAUDE_MCP_CONFIG ?? path.join(process.env.HOME ?? "", ".claude.json");
     if (!fs.existsSync(mcpConfig)) {
         throw new Error(`MCP config not found: ${mcpConfig}. Set CLAUDE_MCP_CONFIG.`);
     }
     const phaseBudget = resolveBudgetForPhase(run, mode);
-    const resumeSessionId = mode === "execute" && humanFeedbackText(run) ? lineageParentExecuteSessionId(run) : null;
-    const prompt = promptOverride ??
+    const resumeSessionId = opts?.resumeSessionId ??
+        (mode === "execute" && humanFeedbackText(run) ? lineageParentExecuteSessionId(run) : null);
+    const prompt = opts?.promptOverride ??
         (mode === "plan"
             ? buildPlanPrompt(run)
             : mode === "reflect"
@@ -54,13 +55,13 @@ export async function runClaude(run, mode = "execute", model, promptOverride) {
         "--verbose",
     ];
     if (mode === "plan") {
-        args.push("--allowedTools", "Read,Glob,Grep,mcp__agent-deck__get_playbook,mcp__agent-deck__get_bound_deck,mcp__agent-deck__bind_workspace");
+        args.push("--allowedTools", "Read,Glob,Grep,Skill,mcp__agent-deck__get_playbook,mcp__agent-deck__get_bound_deck,mcp__agent-deck__bind_workspace");
     }
     else if (mode === "reflect") {
-        args.push("--allowedTools", "Read,Glob,Grep,mcp__agent-deck__get_playbook,mcp__agent-deck__get_bound_deck,mcp__agent-deck__bind_workspace");
+        args.push("--allowedTools", "Read,Glob,Grep,Skill,mcp__agent-deck__get_playbook,mcp__agent-deck__get_bound_deck,mcp__agent-deck__bind_workspace");
     }
     else {
-        args.push("--add-dir", getTemporalOutputDir(), "--allowedTools", "Read,Write,Edit,Glob,Grep,Bash,mcp__agent-deck__get_playbook,mcp__agent-deck__get_bound_deck,mcp__agent-deck__bind_workspace");
+        args.push("--add-dir", getTemporalOutputDir(), "--allowedTools", "Read,Write,Edit,Glob,Grep,Bash,Skill,mcp__agent-deck__get_playbook,mcp__agent-deck__get_bound_deck,mcp__agent-deck__bind_workspace");
     }
     const { exitCode, transcript } = await spawnCli(resolveClaudeBin(), args, workspaceForRun(run));
     if (transcript)
@@ -85,12 +86,12 @@ export async function runCursor(run, mode = "execute", model) {
         fs.writeFileSync(logPath, transcript);
     return { exitCode, transcript, logPath };
 }
-export async function runAgent(run, mode = "execute") {
+export async function runAgent(run, mode = "execute", revise) {
     const fresh = getRun(run.id) ?? run;
     const model = resolveModelForPhase(fresh, mode);
     if (fresh.runtime === "cursor_local")
         return runCursor(fresh, mode, model);
-    return runClaude(fresh, mode, model);
+    return runClaude(fresh, mode, model, revise ? { promptOverride: revise.prompt, resumeSessionId: revise.resumeSessionId } : undefined);
 }
 /** @deprecated use stream-json extractPlanMarkdown via persistRunOutput */
 export function extractPlanFromTranscript(transcript) {

package/bundle/server/dist/runners/persist.js

@@ -1,9 +1,9 @@
 import fs from "node:fs";
 import path from "node:path";
 import { detectExecutionBlocker } from "@agent-dealer/shared";
-import { addArtifact, getLatestArtifact, getLineageParentRun } from "../repository/runs.js";
+import { addArtifact, getLatestArtifact, getLineageParentRun, resolveBudgetForPhase } from "../repository/runs.js";
 import { getTemporalOutputDir } from "../paths.js";
-import { buildStreamTrace, extractPlanMarkdown, extractResultIsError, extractResultText, extractSessionId, extractUsage, parseNdjson, } from "./stream-json.js";
+import { buildStreamTrace, extractPlanMarkdown, extractPlanTriage, extractResultIsError, extractResultText, extractSessionId, extractUsage, parseNdjson, } from "./stream-json.js";
 import { humanFeedbackText } from "./run-context.js";
 export function seedDeliverableFromParent(run) {
     const parent = getLineageParentRun(run);
@@ -49,6 +49,11 @@ export function persistRunOutput(input) {
     const blocker = detectExecutionBlocker(resultText);
     const isError = exitCode !== 0 || streamError || blocker.detected;
     const usage = extractUsage(events, phase, runtime);
+    const caps = resolveBudgetForPhase(run, phase);
+    if (caps?.maxTurns != null)
+        usage.maxTurns = caps.maxTurns;
+    if (caps?.maxBudgetUsd != null)
+        usage.maxBudgetUsd = caps.maxBudgetUsd;
     const trace = buildStreamTrace(events);
     if (sessionId) {
         addArtifact(run.id, "agent_session", { phase, runtime, sessionId }, "agent");
@@ -67,8 +72,16 @@ export function persistRunOutput(input) {
         captureDocumentArtifact(run, resultText);
     }
     if (phase === "plan") {
-        const planMarkdown = extractPlanMarkdown(events);
-        return { planMarkdown, resultText, sessionId, blocked: blocker.detected, blockerSummary: blocker.summary };
+        const rawPlan = extractPlanMarkdown(events);
+        const planTriage = extractPlanTriage(rawPlan);
+        return {
+            planMarkdown: planTriage.markdown,
+            planTriage,
+            resultText,
+            sessionId,
+            blocked: blocker.detected,
+            blockerSummary: blocker.summary,
+        };
     }
     return { resultText, sessionId, blocked: blocker.detected, blockerSummary: blocker.summary };
 }