@kitman-sh/software-engineering 0.10.57 → 0.10.59

package/dist/bundle.js

@@ -13996,7 +13996,7 @@ var StepOutputSubmissionResult = Union2([
   }),
   Struct({ status: Literal2("failed"), message: String5 })
 ]);
-var HarnessHoldReasons = ["out_of_quota", "failed_to_start"];
+var HarnessHoldReasons = ["out_of_quota", "rate_limited", "login_refused", "failed_to_start"];
 var SkippedChoiceReasons = ["not_on_runner", ...HarnessHoldReasons];
 var SkippedChoice = Struct({
   harness: optionalKey2(String5),
@@ -19011,12 +19011,15 @@ var ask = (name, question) => takeStep(name, "ask", "ask", gen2(function* () {
   const fallback = question.default === undefined ? recommendedDefault(recommended) : question.default ?? undefined;
   if (fallback !== undefined && options !== undefined && !options.includes(fallback))
     return yield* new QuestionRefused({ step: name, answer: fallback, options });
+  if (question.auto !== undefined && options !== undefined && !options.includes(question.auto))
+    return yield* new QuestionRefused({ step: name, answer: question.auto, options });
   yield* launch(deferred, (host, token2) => host.putQuestion({
     step: name,
     prompt: question.prompt,
     ...options === undefined ? undefined : { options },
     ...advice,
     ...fallback === undefined ? undefined : { default: fallback },
+    ...question.auto === undefined ? undefined : { auto: question.auto },
     ...question.timeout === undefined ? undefined : { timeoutMillis: toMillis(fromInputUnsafe2(question.timeout)) },
     token: token2
   }));
@@ -20257,7 +20260,7 @@ var scriptedHost = (script, engine, agentLaunches, childLaunches, waits) => {
       ...launch.mergeTarget === undefined ? undefined : { mergeTarget: launch.mergeTarget }
     })), resolve(agentDeferredNamed(launch.deferredName), launch.token, scriptedExit(script.outputs?.[launch.step], (reason) => new StepFailed({ step: launch.step, reason })))),
     putQuestion: (launch) => {
-      const answer = script.answers?.[launch.step] ?? launch.default;
+      const answer = script.answers?.[launch.step] ?? (script.fullAuto === true ? launch.auto : undefined) ?? launch.default;
       return resolve(answerDeferred(launch.step), launch.token, answer === undefined ? fail5(new StepFailed({ step: launch.step, reason: "no answer was scripted" })) : succeed4(answer));
     },
     admitChild: (launch) => andThen2(sync2(() => childLaunches.push({ step: launch.step, loop: launch.loop, input: launch.input })), resolve(childDeferred(launch.step), launch.token, scriptedExit(script.children?.[launch.step], (reason) => new ChildFailed({ step: launch.step, loop: launch.loop, reason })))),
@@ -20763,18 +20766,27 @@ var review_default = defineLoop({
     }).pipe(map8((output) => [seat, output])), { concurrency: "unbounded" });
     const earlier = input.earlier ?? [];
     const earlierIds = new Set(earlier.map((finding) => finding.id));
-    const followUps = followUpsOf(earlier, outputs.flatMap(([, output]) => output.followUps ?? []));
-    const standing = new Set(followUps.flatMap((entry) => entry.status === "fixed" ? [] : [entry.id]));
-    const carried = earlier.filter((finding) => standing.has(finding.id));
+    const answered = followUpsOf(earlier, outputs.flatMap(([, output]) => output.followUps ?? []));
+    const standing = new Set(answered.flatMap((entry) => entry.status === "fixed" ? [] : [entry.id]));
+    const verdicts = outputs.flatMap(([, output]) => output.verdicts ?? []);
+    const rebutted = new Set((input.rebuttals ?? []).map((rebuttal) => rebuttal.findingId));
+    const withdrawn = (id) => {
+      const on = verdicts.filter((verdict) => verdict.findingId === id);
+      return rebutted.has(id) && on.length > 0 && on.every((verdict) => verdict.accepted);
+    };
+    const carried = earlier.filter((finding) => standing.has(finding.id) && !withdrawn(finding.id));
+    const followUps = answered.filter((entry) => !withdrawn(entry.id));
     const fresh = mergeFindings(Object.fromEntries(outputs.map(([seat, output]) => [
       seat,
       output.findings.filter((finding) => !earlierIds.has(`${finding.file}:${finding.line}`))
     ])));
     const findings = [...carried, ...fresh];
-    const summary = findings.length === 0 ? "No findings: nothing stands in the way of merging." : outputs.map(([, output]) => output.summary).join(" ");
+    const blockers = findings.filter(isBlocking);
+    const scope = input.files === undefined ? outputs.find(([seat]) => seat === scopeSeat)?.[1].scope : undefined;
+    const failing = input.failing ?? [];
+    const summary = blockers.length > 0 ? `Blocking: fix ${blockers.map((finding) => finding.id).join(", ")} before merging.` : scope?.met === false ? "Not ready: the change does not yet do what was asked." : failing.length > 0 ? `Not ready: ${failing.join(", ")} fails on this head.` : findings.length === 0 ? "No findings: nothing stands in the way of merging." : ["Can merge: nothing blocks it.", ...outputs.map(([, output]) => output.summary)].join(" ");
     const freshIds = new Set(fresh.map((finding) => finding.id));
     const text = reviewText(summary, findings, followUps);
-    const scope = input.files === undefined ? outputs.find(([seat]) => seat === scopeSeat)?.[1].scope : undefined;
     const stored = yield* artifact("findings", {
       kind: "review-findings",
       title: "Review findings",
@@ -20785,7 +20797,7 @@ var review_default = defineLoop({
       summary,
       findings,
       followUps,
-      verdicts: outputs.flatMap(([, output]) => output.verdicts ?? []),
+      verdicts,
       blocking: findings.some(isBlocking),
       artifactId: stored.artifactId,
       ...scope === undefined ? undefined : { scope }
@@ -20793,7 +20805,7 @@ var review_default = defineLoop({
     const changeRequestId = input.changeRequestId;
     if (changeRequestId === undefined || head === undefined)
       return reviewed;
-    const approval = reviewed.blocking || scope?.met === false || (input.failing?.length ?? 0) > 0 ? undefined : yield* approveChangeRequest("approve", { changeRequestId, head, summary }).pipe(map8((result) => result.approved ? { head, approved: true } : { head, approved: false, reason: result.reason }));
+    const approval = reviewed.blocking || scope?.met === false || failing.length > 0 ? undefined : yield* approveChangeRequest("approve", { changeRequestId, head, summary }).pipe(map8((result) => result.approved ? { head, approved: true } : { head, approved: false, reason: result.reason }));
     const answer = input.next ?? (yield* ask("next", {
       prompt: `${summary}
 
@@ -20836,2010 +20848,2088 @@ What next?`,
   })
 });
 
-// src/shepherd-output.ts
-var ShepherdOutput = Struct({
-  status: Literals(["merged", "ready", "needs_you"]),
-  reason: String5,
-  fixRounds: Int,
-  replies: Int
-});
-
-// src/shepherd.ts
-var reviewLoop = () => ({ id: "review", input: Input, output: Output });
-var stepBudget = "45 minutes";
+// src/release.ts
 var Input2 = Struct({
-  changeRequestId: String5,
-  taskId: optional2(String5),
-  merge: optional2(Boolean3),
-  branch: optional2(String5),
-  continuing: optional2(Continuing),
-  maxFixRounds: optional2(Int),
-  maxCycles: optional2(Int)
+  tag: optional2(String5),
+  revision: optional2(String5),
+  changeRequestId: optional2(String5),
+  deployTarget: optional2(String5),
+  deployEvent: optional2(String5),
+  deployTimeoutMinutes: optional2(Int)
 });
-var Output2 = ShepherdOutput;
-var CiFix = Struct({
-  verdict: Literals(["fixed", "pre_existing", "flaky"]),
-  summary: String5
+var Drafted = Struct({
+  tag: String5,
+  previousTag: optional2(String5),
+  title: String5,
+  notes: String5,
+  changeRequests: ArraySchema(String5)
 });
-var Replies = Struct({
-  replies: ArraySchema(Struct({
-    threadId: String5,
-    reply: String5,
-    changed: Boolean3
-  }))
+var Deployed = Struct({
+  status: Literals(["deployed", "failed", "rolled_back", "rollback_failed", "none"]),
+  detail: String5
 });
-var failedJobs = (pipeline) => pipeline.jobs.flatMap((job) => job.status === "failed" ? [`### ${job.name}${job.url === undefined ? "" : ` (${job.url})`}
-
-${job.logTail ?? "No log was served."}`] : []);
-var ciFixPrompt = (pipeline, target) => [
-  `The pipeline at ${pipeline.head} failed. These jobs failed, with the end of each log:`,
-  ...failedJobs(pipeline),
-  "Run the failing job once more here to rule out a flake; if it passes, change nothing and answer flaky.",
-  `Then run it on the target branch (a worktree of \`origin/${target}\`, which Kitman fetched just before this Step; do not fetch). If it fails there too, the branch did not cause it: change nothing and answer pre_existing.`,
-  "Otherwise it is this branch's own failure: write or fix a test that shows it first, then fix it, and answer fixed. Kitman pushes what you leave."
+var deployPrompt = (tag, previousTag) => [
+  `Deploy the release ${tag}, which Kitman has just tagged and pushed.`,
+  `If the repository has no executable \`.kitman/deploy\` at ${tag}, change nothing and answer status none.`,
+  `Otherwise run \`.kitman/deploy ${tag}${previousTag === undefined ? "" : ` ${previousTag}`}\` from the checkout of ${tag} (\`git fetch --tags\` first), and do nothing else: it backs up, publishes, deploys, verifies and rolls back by itself, and may take an hour. Run it in the background with its output in a log file, and wait for it to exit, checking every few minutes; never start it twice.`,
+  "Answer with the status its last line `kitman-deploy: <status> <detail>` names, and that detail. If it exited without that line, answer failed with its exit code and the end of its log.",
+  "Never print, copy or summarise the variables or secrets it pulls."
 ].join(`
 
 `);
-var threadLine = (thread) => [
-  `### Thread ${thread.id}${thread.path === undefined ? "" : ` on ${thread.path}${thread.line === undefined ? "" : `:${thread.line}`}`}`,
-  ...thread.comments.map((entry) => `${entry.author ?? "someone"}: ${entry.body}`)
-].join(`
-`);
-var ReviewFix = Struct({ summary: String5 });
-var reviewFixPrompt = (findings) => [
-  "A review of the files the catch-up merge changed found these. Fix each blocker and major finding, with a test that shows it where one can. Kitman pushes what you leave.",
-  ...findings.map((finding) => `- ${finding.id} (${finding.severity}): ${finding.detail}`)
+var Output2 = Struct({
+  status: Literals([
+    "gate_failed",
+    "not_mergeable",
+    "rejected",
+    "deployed",
+    "rolled_back",
+    "deploy_failed",
+    "rollback_failed",
+    "timed_out"
+  ]),
+  reason: String5,
+  tag: optional2(String5),
+  notesArtifactId: optional2(String5),
+  revision: optional2(String5),
+  url: optional2(String5)
+});
+var draftPrompt = (tag, changeRequestId) => [
+  "Draft the release notes for the ChangeRequests merged since the last release tag on the base branch, including those with no linked Task.",
+  ...changeRequestId === undefined ? [] : [`The release ChangeRequest ${changeRequestId} is part of it.`],
+  "Group them by what a user of the software notices, and name each ChangeRequest you cover.",
+  tag === undefined ? "Propose the next version tag, following the scheme earlier tags use. With no earlier tag, propose v0.1.0 and say so in the notes." : `The release is tagged ${tag}.`,
+  "Give the latest earlier release tag as previousTag, or leave it out when there is none."
 ].join(`
+
 `);
-var catchUpVerdict = (catchUp) => {
-  if (catchUp.truncated)
-    return { kind: "changed", why: "it changed more files than the Runner compares" };
-  const files = [...new Set([...catchUp.conflicted, ...catchUp.rewritten])];
-  const elsewhere = catchUp.changed.filter((file) => !files.includes(file));
-  if (elsewhere.length > 0)
-    return { kind: "changed", why: `the branch's own diff changed in ${elsewhere.join(", ")}` };
-  return files.length === 0 ? { kind: "carry" } : { kind: "review", files };
-};
-var repliesPrompt = (threads) => [
-  "Reviewers left these comments on the ChangeRequest. For each thread, apply what you agree with and give the reply to post on it: what you changed, or why you did not. A comment that asks a question gets an answer and no change.",
-  "Never mark a thread resolved: whether a disputed point is settled is the reviewer's call.",
-  ...threads.map(threadLine)
+var redraftPrompt = (drafted, edit) => [
+  "Redraft these release notes as asked, keeping the tag and everything not mentioned.",
+  `Asked: ${edit}`,
+  "```json",
+  JSON.stringify(drafted, null, 2),
+  "```"
 ].join(`
 
 `);
-var threadKey = (thread) => `${thread.id}:${thread.comments.length}`;
-var shepherd_default = defineLoop({
-  id: "shepherd",
-  version: "1.1.0",
-  title: "Shepherd",
+var readyToMerge = (changeRequestId, round = 1) => gen2(function* () {
+  for (let pass = 1;; pass++) {
+    const at = (name) => {
+      const named = pass === 1 ? name : `${name}:moved:${pass}`;
+      return round === 1 ? named : `${named}:${round}`;
+    };
+    let read = yield* pipelineStatus(at("gate"), { changeRequestId });
+    for (let look = 1;look <= 10 && (read.status === "running" || read.status === "none"); look++) {
+      const again = (name) => at(look === 1 ? name : `${name}:${look}`);
+      yield* pipelineMoved(again("gate:pipeline"), changeRequestId, read);
+      read = yield* pipelineStatus(again("gate:after"), { changeRequestId });
+    }
+    if (read.status !== "success") {
+      const failing = read.jobs.filter((job) => job.status === "failed").map((job) => job.name);
+      return {
+        status: "gate_failed",
+        reason: `The pipeline at ${read.head} is ${read.status}${failing.length === 0 ? "" : `: ${failing.join(", ")}`}`,
+        revision: read.head
+      };
+    }
+    const approved = yield* waitFor(at("approved"), {
+      event: "change_request.approval",
+      filter: { changeRequestId, approved: true, head: read.head },
+      timeout: "7 days",
+      or: read.readAt === undefined ? [] : [{ event: "change_request.pipeline", filter: { changeRequestId }, since: read.readAt }]
+    });
+    if (approved.type !== "change_request.approval") {
+      if (pass >= 10)
+        return {
+          status: "not_mergeable",
+          reason: `ChangeRequest ${changeRequestId} kept moving while it awaited approval`
+        };
+      continue;
+    }
+    const mergeable = yield* waitFor(at("mergeable"), {
+      event: "change_request.mergeable",
+      filter: { changeRequestId },
+      timeout: "1 hour"
+    });
+    if (mergeable.payload.mergeable === false)
+      return {
+        status: "not_mergeable",
+        reason: `ChangeRequest ${changeRequestId} does not merge cleanly; bring it up to date first`
+      };
+    return { passed: read.head };
+  }
+}).pipe(catchTags2({
+  WaitTimedOut: (timedOut) => succeed7({
+    status: "not_mergeable",
+    reason: `Nothing happened on ChangeRequest ${changeRequestId} while waiting for ${timedOut.event}`
+  }),
+  ChangeRequestClosed: (closed) => succeed7({
+    status: "not_mergeable",
+    reason: `ChangeRequest ${changeRequestId} was ${closed.merged ? "merged" : "closed"} before Kitman released it`
+  })
+}));
+var recovery = (previous) => previous === undefined ? ["Retry the deploy", "Leave it"] : ["Retry the deploy", `Roll back to ${previous}`, "Leave it"];
+var release_default = defineLoop({
+  id: "release",
+  version: "2.0.0",
+  title: "Release",
   input: Input2,
   output: Output2,
-  agents: { implementer: "implementer" },
-  checkout: "write",
+  agents: { releaser: "releaser", deployer: "deployer" },
+  checkout: "read",
   capabilities: [
     "agent_work",
-    "read_change_request",
-    "post_comment",
-    "merge_change_request",
-    "approve_change_request",
-    "call",
-    "write_back",
     "ask",
-    "verify"
+    "verify",
+    "claim",
+    "publish_release",
+    "read_change_request",
+    "merge_change_request"
   ],
-  calls: () => [review_default],
-  run: (input) => {
+  run: (input) => gen2(function* () {
     const changeRequestId = input.changeRequestId;
-    const target = input.continuing?.targetBranch ?? input.branch ?? "HEAD";
-    const answered = new Set;
-    const reranHeads = new Set;
-    const ranOnRunner = new Set;
-    let fixRounds = 0;
-    let replies = 0;
-    let stalledAt;
-    let stalls = 0;
-    let unreviewed;
-    let notCarried;
-    const done = (status, reason) => ({ status, reason, fixRounds, replies });
-    const runOnRunner = (step, cycle, head, checks) => gen2(function* () {
-      const verification = `pipeline-${step}:${cycle}`;
-      const failed = yield* verify(verification, { revision: head, checks }).pipe(as2(undefined), catchTag2("StepFailed", (error) => succeed7(error.reason)));
-      if (failed === undefined)
-        yield* reportPipeline(`pipeline-${step === "run" ? "report" : "rereport"}:${cycle}`, {
-          changeRequestId,
-          verification
-        });
-      return failed;
+    let gated;
+    if (changeRequestId === undefined) {
+      const gate = yield* verify("gate", input.revision === undefined ? {} : { revision: input.revision });
+      if (!gate.passed) {
+        const failing = gate.checks.filter((check) => check.status !== "passed").map((check) => check.name);
+        return {
+          status: "gate_failed",
+          reason: `The checks fail at ${gate.revision}: ${failing.join(", ")}`,
+          revision: gate.revision
+        };
+      }
+      gated = gate.revision;
+    } else {
+      const ready = yield* readyToMerge(changeRequestId);
+      if (!("passed" in ready))
+        return ready;
+      gated = ready.passed;
+    }
+    let drafted = yield* agentWork("draft-notes", {
+      agent: "releaser",
+      prompt: draftPrompt(input.tag, changeRequestId),
+      output: Drafted
     });
-    return gen2(function* () {
-      for (let cycle = 1;; cycle++) {
-        if (cycle > (input.maxCycles ?? 20)) {
-          const goOn = yield* ask(`continue:${cycle}`, {
-            prompt: `Shepherd has looked at this ChangeRequest ${cycle - 1} times without landing it. Keep going?`,
-            options: ["Keep going", "Stop"],
-            recommended: "Stop",
-            recommendationReason: `${cycle - 1} looks have not landed it, so something needs a person rather than another look.`,
-            default: "Stop",
-            timeout: "1 hour"
-          });
-          if (goOn === "Stop")
-            return done("needs_you", `Stopped after ${cycle - 1} looks without landing it`);
-        }
-        const pipeline = yield* pipelineStatus(`pipeline:${cycle}`, { changeRequestId });
-        if (pipeline.status === "none" && pipeline.runnerChecks !== undefined) {
-          if (ranOnRunner.has(pipeline.head))
-            return done("needs_you", `The pipeline ran on the Runner at ${pipeline.head}, but no result was recorded`);
-          ranOnRunner.add(pipeline.head);
-          const failed = yield* runOnRunner("run", cycle, pipeline.head, pipeline.runnerChecks);
-          if (failed !== undefined)
-            return done("needs_you", `The pipeline could not run on the Runner: ${failed}`);
-          continue;
-        }
-        if (pipeline.status === "none" || pipeline.status === "running") {
-          yield* pipelineMoved(`wait:${cycle}`, changeRequestId, pipeline);
-          continue;
-        }
-        if (pipeline.status === "failed" || pipeline.status === "canceled") {
-          if (stalledAt === pipeline.head)
-            stalls++;
-          else
-            stalls = 0;
-          if (stalls >= 2)
-            return done("needs_you", `Two fixes pushed nothing new; the pipeline at ${pipeline.head} still fails`);
-          if (fixRounds >= (input.maxFixRounds ?? 3))
-            return done("needs_you", `The pipeline still fails after ${fixRounds} fix rounds`);
-          fixRounds++;
-          stalledAt = pipeline.head;
-          const fixed = yield* agentWork(`ci-fix:${cycle}`, {
-            agent: "implementer",
-            prompt: ciFixPrompt(pipeline, target),
-            output: CiFix,
-            timeout: stepBudget
-          });
-          if (fixed.verdict === "pre_existing")
-            return done("needs_you", `The failure is pre-existing on the target branch: ${fixed.summary}`);
-          if (fixed.verdict === "flaky") {
-            if (pipeline.source === "reported") {
-              if (pipeline.runnerChecks === undefined)
-                return done("needs_you", `The failing job passed when run again, outside the forge: ${fixed.summary}`);
-              if (reranHeads.has(pipeline.head))
-                return done("needs_you", `The failing job failed again when run again on the Runner: ${fixed.summary}`);
-              reranHeads.add(pipeline.head);
-              const failed = yield* runOnRunner("rerun", cycle, pipeline.head, pipeline.runnerChecks);
-              if (failed !== undefined)
-                return done("needs_you", `The pipeline could not run on the Runner: ${failed}`);
-              continue;
-            }
-            if (reranHeads.has(pipeline.head))
-              return done("needs_you", `The failing job failed again when run again on the forge: ${fixed.summary}`);
-            reranHeads.add(pipeline.head);
-            yield* rerunPipeline(`rerun:${cycle}`, { changeRequestId });
-            yield* pipelineMoved(`rerun-wait:${cycle}`, changeRequestId, pipeline).pipe(catchTag2("WaitTimedOut", () => void_3));
-          }
-          continue;
-        }
-        const threads = (yield* reviewThreads(`threads:${cycle}`, { changeRequestId })).threads.filter((thread) => !answered.has(threadKey(thread)));
-        if (threads.length > 0) {
-          const answers = yield* agentWork(`comments:${cycle}`, {
-            agent: "implementer",
-            prompt: repliesPrompt(threads),
-            output: Replies,
-            timeout: stepBudget
-          });
-          for (const answer of answers.replies) {
-            yield* comment(`reply:${cycle}:${answer.threadId}`, {
-              changeRequestId,
-              threadId: answer.threadId,
-              body: answer.reply
-            });
-            replies++;
-          }
-          for (const thread of threads)
-            answered.add(`${thread.id}:${thread.comments.length + 1}`);
-          if (answers.replies.some((answer) => answer.changed))
-            continue;
-        }
-        const commented = {
-          event: "change_request.comment",
-          filter: { changeRequestId },
-          ...pipeline.readAt === undefined ? undefined : { since: pipeline.readAt }
-        };
-        const mergeable = yield* waitFor(`mergeable:${cycle}`, {
-          event: "change_request.mergeable",
-          filter: { changeRequestId },
-          timeout: "1 hour",
-          or: [commented]
-        });
-        if (mergeable.type === commented.event)
-          continue;
-        if (mergeable.payload.mergeable === false) {
-          const synced = yield* syncBase(`sync:${cycle}`, { agent: "implementer", target });
-          if (synced.status === "conflict")
-            return done("needs_you", `Merging ${target} in conflicts on ${synced.files.join(", ")}: ${synced.reason}`);
-          if (synced.status === "merged") {
-            const caught = synced.catchUp;
-            const verdict = caught === undefined ? { kind: "changed", why: "its Runner did not report what it did to the branch" } : catchUpVerdict(caught);
-            if (verdict.kind === "changed") {
-              unreviewed = undefined;
-              notCarried = `merging ${target} in changed it: ${verdict.why}`;
-            } else if (caught !== undefined && unreviewed !== undefined) {
-              const files = [...new Set([...unreviewed.files, ...verdict.kind === "review" ? verdict.files : []])];
-              unreviewed = caught.from === unreviewed.synced ? { ...unreviewed, files, synced: caught.head } : { ...unreviewed, files };
-            } else if (caught !== undefined && verdict.kind === "review") {
-              notCarried = undefined;
-              unreviewed = { files: verdict.files, synced: caught.head, sync: `sync:${cycle}`, earlier: [] };
-            } else if (caught !== undefined) {
-              notCarried = undefined;
-              const carried = yield* approveChangeRequest(`carry:${cycle}`, {
-                changeRequestId,
-                head: caught.head,
-                summary: `Merging ${target} in left the branch's own diff as it was approved.`,
-                carries: `sync:${cycle}`
-              }).pipe(catchTag2("StepFailed", (error) => succeed7({ approved: false, reason: error.reason })));
-              if (!carried.approved)
-                notCarried = `the approval was not carried: ${carried.reason}`;
-            }
-          }
-          continue;
-        }
-        let reviewedHere = false;
-        if (unreviewed !== undefined) {
-          const files = unreviewed;
-          const head = pipeline.head;
-          const reviewed = yield* call(`review:${cycle}`, reviewLoop(), {
-            base: `origin/${target}`,
-            head,
-            files: files.files,
-            ...head === files.synced ? undefined : { since: files.synced },
-            ...files.earlier.length === 0 ? undefined : { earlier: files.earlier }
-          });
-          if (reviewed.blocking) {
-            const blocking = reviewed.findings.filter(isBlocking);
-            if (fixRounds >= (input.maxFixRounds ?? 3))
-              return done("needs_you", `The review of the catch-up merge's files still finds ${blocking.map((finding) => finding.id).join(", ")} after ${fixRounds} fix rounds`);
-            fixRounds++;
-            yield* agentWork(`review-fix:${cycle}`, {
-              agent: "implementer",
-              prompt: reviewFixPrompt(blocking),
-              output: ReviewFix,
-              timeout: stepBudget
-            });
-            unreviewed = { ...files, earlier: reviewed.findings };
-            continue;
-          }
-          const approval = yield* approveChangeRequest(`approve:${cycle}`, {
-            changeRequestId,
-            head,
-            summary: `A review of the files merging ${target} in changed (${files.files.join(", ")}) passed with nothing blocking.`,
-            review: `review:${cycle}`,
-            carries: files.sync
-          }).pipe(catchTag2("StepFailed", (error) => succeed7({ approved: false, reason: error.reason })));
-          unreviewed = undefined;
-          if (approval.approved)
-            reviewedHere = true;
-          else
-            notCarried = `merging ${target} in, whose files' review passed but did not approve it: ${approval.reason}`;
-        }
-        const moved = pipeline.readAt === undefined ? [] : [
-          { event: "change_request.pipeline", filter: { changeRequestId }, since: pipeline.readAt },
-          ...pipeline.source === "reported" ? [
-            {
-              event: "change_request.approval",
-              filter: { changeRequestId, approved: true },
-              since: pipeline.readAt
-            }
-          ] : []
-        ];
-        const approved = reviewedHere ? undefined : yield* waitFor(`approved:${cycle}`, {
-          event: "change_request.approval",
-          filter: { changeRequestId, approved: true, head: pipeline.head },
-          timeout: "7 days",
-          or: [commented, ...moved]
+    const tag = input.tag ?? drafted.tag;
+    for (let round = 1;; round++) {
+      const answer = yield* ask(round === 1 ? "approve" : `approve:${round}`, {
+        prompt: `Release ${tag} with these notes?
+
+${drafted.notes}`,
+        options: [
+          { value: "Approve", description: "Tags, publishes and deploys it." },
+          { value: "Edit notes", description: "Say what to change; the notes are redrafted." },
+          { value: "Reject", description: "Keeps the draft and releases nothing." }
+        ],
+        recommended: "Approve",
+        recommendationReason: "The release is proved: its checks pass, or its ChangeRequest is green, approved and mergeable.",
+        default: null,
+        auto: "Approve"
+      });
+      if (answer === "Approve")
+        break;
+      if (answer === "Reject") {
+        const why = yield* ask("reject-why", {
+          prompt: `Why not release ${tag}? The draft is kept.`,
+          freeText: true,
+          informationOnly: true,
+          recommendationReason: "Only you know why you rejected it.",
+          default: "No reason given",
+          timeout: "1 day"
         });
-        if (approved !== undefined && approved.type !== "change_request.approval")
-          continue;
-        if (pipeline.source === "reported" && approved !== undefined && approved.payload.head !== pipeline.head)
-          continue;
-        const merge = input.merge === true ? "Merge" : yield* ask(`merge:${cycle}`, {
-          prompt: "The ChangeRequest is approved, green and mergeable. Merge now?",
-          options: [
-            { value: "Merge", description: "Merges the head whose pipeline passed." },
-            { value: "Wait", description: "Leaves the merge to a person." }
-          ],
-          recommended: "Merge",
-          recommendationReason: "It is approved, green and mergeable, which is everything a merge waits for.",
-          default: "Wait",
-          timeout: "1 hour"
+        const kept = yield* artifact("notes", {
+          kind: "release_notes",
+          title: drafted.title,
+          text: drafted.notes,
+          data: { tag, changeRequests: drafted.changeRequests }
         });
-        if (merge === "Wait")
-          return done("ready", "Approved, green and mergeable; left for a person to merge");
-        const merged = yield* mergeChangeRequest(`merge-change-request:${cycle}`, {
+        return { status: "rejected", reason: why, tag, notesArtifactId: kept.artifactId };
+      }
+      const edit = yield* ask(`edit:${round}`, {
+        prompt: "What should change in the notes?",
+        freeText: true,
+        informationOnly: true,
+        recommendationReason: "You chose to edit them, so only you know what should change.",
+        default: "",
+        timeout: "1 day"
+      });
+      if (edit.trim() === "")
+        continue;
+      drafted = yield* agentWork(`redraft:${round}`, {
+        agent: "releaser",
+        prompt: redraftPrompt(drafted, edit),
+        output: Drafted
+      });
+    }
+    const notes = yield* artifact("notes", {
+      kind: "release_notes",
+      title: drafted.title,
+      text: drafted.notes,
+      data: { tag, changeRequests: drafted.changeRequests }
+    });
+    let revision = gated;
+    if (changeRequestId !== undefined) {
+      for (let round = 1;; round++) {
+        const merged = yield* mergeChangeRequest(round === 1 ? "merge" : `merge:${round}`, {
           changeRequestId,
-          head: pipeline.head
+          head: gated
         });
-        if (merged.status !== "merged")
-          continue;
-        yield* writeBack("write-back", { milestone: "merged" });
-        return done("merged", `Merged at ${merged.revision}`);
-      }
-    }).pipe(catchIf2((error) => error._tag === "StepFailed" && error.reason.includes("time budget"), (error) => succeed7(done("needs_you", `Step "${error.step}" ran past its ${stepBudget} budget`))), catchTags2({
-      WaitTimedOut: (timedOut) => succeed7(done("needs_you", timedOut.event === "change_request.approval" && notCarried !== undefined ? `Nobody approved the head after ${notCarried}` : `Nothing happened on the ChangeRequest while waiting for ${timedOut.event}`)),
-      ChangeRequestClosed: (ended) => succeed7(ended.merged ? done("merged", "Someone else merged the ChangeRequest") : done("needs_you", "The ChangeRequest was closed"))
-    }));
-  }
-});
-
-// src/build.ts
-var BuildInput = Struct({
-  words: optional2(String5),
-  taskId: optional2(String5),
-  repoBindingId: optional2(String5),
-  branch: optional2(String5),
-  revision: optional2(String5),
-  outcome: optional2(LoopOutcome),
-  maxRounds: optional2(Int),
-  continuing: optional2(Continuing),
-  land: optional2(Boolean3),
-  changeRequestId: optional2(String5)
-});
-var CriterionAnswer = Struct({
-  criterion: String5,
-  status: Literals(["met", "after_merge", "not_met"]),
-  detail: String5
+        if (merged.status === "conflict")
+          return {
+            status: "not_mergeable",
+            reason: `ChangeRequest ${changeRequestId} no longer merges cleanly`,
+            tag,
+            notesArtifactId: notes.artifactId
+          };
+        if (merged.status === "merged") {
+          revision = merged.revision;
+          break;
+        }
+        if (round >= 3)
+          return {
+            status: "not_mergeable",
+            reason: `ChangeRequest ${changeRequestId} kept moving while it was gated; it is at ${merged.head}`,
+            tag,
+            notesArtifactId: notes.artifactId
+          };
+        const ready = yield* readyToMerge(changeRequestId, round + 1);
+        if (!("passed" in ready))
+          return { ...ready, tag, notesArtifactId: notes.artifactId };
+        gated = ready.passed;
+      }
+    }
+    const deployEvent = input.deployEvent ?? "deploy";
+    yield* claim("deploy-target", { resource: `deploy:${input.deployTarget ?? deployEvent}` });
+    const released = yield* release2("tag", {
+      tag,
+      revision,
+      title: drafted.title,
+      notes: drafted.notes
+    });
+    const deployed = (step, deployTag) => waitFor(step, {
+      event: deployEvent,
+      filter: { tag: deployTag },
+      timeout: `${input.deployTimeoutMinutes ?? 60} minutes`
+    }).pipe(map8((deploy) => deploy.payload.status === "failed" ? "deploy_failed" : "deployed"), catchTag2("WaitTimedOut", () => succeed7("timed_out")));
+    const settled = { tag, notesArtifactId: notes.artifactId, revision: released.revision, url: released.url };
+    const ran = yield* agentWork("run-deploy", {
+      agent: "deployer",
+      prompt: deployPrompt(tag, drafted.previousTag),
+      output: Deployed,
+      timeout: "3 hours"
+    });
+    if (ran.status !== "none") {
+      const status = ran.status === "failed" ? "deploy_failed" : ran.status;
+      const outcome = {
+        deployed: "deployed",
+        rolled_back: "rolled back",
+        deploy_failed: "failed to deploy",
+        rollback_failed: "failed to deploy, and the rollback failed too"
+      }[status];
+      yield* artifact("report", {
+        kind: "release_report",
+        title: `${tag} ${outcome}`,
+        text: `${tag} at ${released.revision}: ${ran.detail}. ${released.url}`,
+        data: { tag, status, revision: released.revision, url: released.url, detail: ran.detail }
+      });
+      return { status, reason: ran.detail, ...settled };
+    }
+    let status = yield* deployed("deploy", tag);
+    for (let round = 1;status !== "deployed"; round++) {
+      const options = recovery(drafted.previousTag);
+      const answer = yield* ask(`recover:${round}`, {
+        prompt: `${tag} ${status === "timed_out" ? "did not report a deploy in time" : "failed to deploy"}. What now?`,
+        options,
+        recommended: "Retry the deploy",
+        recommendationReason: "A failed or late deploy is often passing, and a retry runs only the failed jobs of the same tag.",
+        default: "Leave it",
+        timeout: "1 hour"
+      });
+      if (answer === "Leave it")
+        return { status, reason: `${tag} at ${released.revision} was left undeployed`, ...settled };
+      if (answer === "Retry the deploy") {
+        yield* rerunPipeline(`deploy:rerun-${round}`, { ref: tag });
+        status = yield* deployed(`deploy:retry-${round}`, tag);
+        continue;
+      }
+      const previous = drafted.previousTag ?? tag;
+      yield* rerunPipeline(`deploy:redeploy-${round}`, { ref: previous, all: true });
+      const back = yield* deployed(`deploy:rollback-${round}`, previous);
+      if (back === "deployed")
+        return { status: "rolled_back", reason: `Rolled back to ${previous}`, ...settled };
+      status = back;
+    }
+    yield* artifact("report", {
+      kind: "release_report",
+      title: `${tag} deployed`,
+      text: `${tag} at ${released.revision} deployed. ${released.url}`,
+      data: { tag, status, revision: released.revision, url: released.url }
+    });
+    return { status: "deployed", reason: `${tag} deployed`, ...settled };
+  })
 });
-var Criteria = Struct({ criteria: ArraySchema(CriterionAnswer) });
-var SuggestedCheck = Struct({
-  name: CheckName,
-  command: String5,
-  workingDirectory: optionalKey2(String5)
+
+// src/shepherd-output.ts
+var ShepherdOutput = Struct({
+  status: Literals(["merged", "ready", "needs_you"]),
+  reason: String5,
+  fixRounds: Int,
+  replies: Int,
+  release: optional2(Struct({ runStatus: String5, reason: String5, tag: optional2(String5) }))
 });
-var Implemented = Struct({
-  title: String5,
-  summary: String5,
-  claims: ArraySchema(String5),
-  documented: optional2(ArraySchema(String5)),
-  rollback: optional2(String5),
-  criteria: optional2(ArraySchema(CriterionAnswer)),
-  checks: optional2(ArraySchema(SuggestedCheck))
+
+// src/shepherd.ts
+var reviewLoop = () => ({ id: "review", input: Input, output: Output });
+var stepBudget = "45 minutes";
+var Input3 = Struct({
+  changeRequestId: String5,
+  taskId: optional2(String5),
+  merge: optional2(Boolean3),
+  branch: optional2(String5),
+  continuing: optional2(Continuing),
+  maxFixRounds: optional2(Int),
+  maxCycles: optional2(Int)
 });
-var Reproduced = Struct({
-  check: String5,
+var Output3 = ShepherdOutput;
+var CiFix = Struct({
+  verdict: Literals(["fixed", "pre_existing", "flaky"]),
   summary: String5
 });
-var ReproducedOnBranch = Struct({
-  ...Reproduced.fields,
-  revision: optional2(String5)
-});
-var Fixed = Struct({
-  summary: String5,
-  claims: ArraySchema(String5),
-  rebuttals: ArraySchema(Rebuttal)
-});
-var BuildOutput = Struct({
-  changeRequest: ChangeRequestResult,
-  revision: String5,
-  tree: String5,
-  settled: Boolean3,
-  unsettled: ArraySchema(String5),
-  rounds: Int,
-  stopped: Literals(["settled", "dispute_stands", "findings_returned", "round_cap"]),
-  criteria: ArraySchema(CriterionAnswer),
-  approval: optional2(ApproveChangeRequestResult),
-  landed: optional2(ShepherdOutput),
-  next: Struct({ changeRequestId: String5 })
+var Replies = Struct({
+  replies: ArraySchema(Struct({
+    threadId: String5,
+    reply: String5,
+    changed: Boolean3
+  }))
 });
+var failedJobs = (pipeline) => pipeline.jobs.flatMap((job) => job.status === "failed" ? [`### ${job.name}${job.url === undefined ? "" : ` (${job.url})`}
 
-class BuildTargetMissing extends TaggedError3()("BuildTargetMissing", {
-  message: String5
-}) {
-}
-var outcomeGuidance = {
-  feature: "Deliver the whole scope; review checks it was met.",
-  bug: "Your failing test is already in place: make it pass.",
-  refactor: "Keep behaviour exactly as it is; the approved verifications must pass before and after.",
-  investigation: "Investigate and report what you found, with its sources.",
-  docs: "Name, in `documented`, the approved checks that run the commands you documented.",
-  migration: "Name, in `rollback`, the approved check that rolls the migration back.",
-  performance: "Make it faster without changing behaviour."
-};
-
-class BuildOutcomeRefused extends TaggedError3()("BuildOutcomeRefused", {
-  message: String5
-}) {
-}
-var criteriaGuidance = "If your brief has a Task, answer each of its acceptance criteria in `criteria`: met, with the test or file that shows it; after_merge, with why it can only be seen once merged; or not_met, with why. Give an empty `criteria` when the Task has none.";
-var checksGuidance = "If your brief lists no approved verifications for this repository, name in `checks` the commands from its package scripts or CI config that test, lint and typecheck it, each with a `name` of letters, digits, `.`, `_`, `:` and `-` only, such as `unit-tests`; Kitman runs them and labels them as suggested by you.";
-var implementAdaptation = "You run the implement skill as a Kitman Step. The work is in this prompt and your brief, so fetch no ticket. Leave your changes uncommitted: the Run owns the branch. Skip its final code-review: a Review run or a person reviews the change.";
-var implementPrompt = (task, outcome, continuing) => [
-  ...continuing === undefined ? [] : [continuingBrief(continuing), "Fix forward from there."],
-  `Build ${task}`,
-  implementAdaptation,
-  ...outcome === undefined ? [] : [outcomeGuidance[outcome]],
-  'Commit nothing yourself: Kitman pushes what you leave in the workspace. Give the ChangeRequest a title and a summary, and list as claims what you believe but Kitman has not checked, such as "the tests pass".',
-  criteriaGuidance,
-  checksGuidance
+${job.logTail ?? "No log was served."}`] : []);
+var ciFixPrompt = (pipeline, target) => [
+  `The pipeline at ${pipeline.head} failed. These jobs failed, with the end of each log:`,
+  ...failedJobs(pipeline),
+  "Run the failing job once more here to rule out a flake; if it passes, change nothing and answer flaky.",
+  `Then run it on the target branch (a worktree of \`origin/${target}\`, which Kitman fetched just before this Step; do not fetch). If it fails there too, the branch did not cause it: change nothing and answer pre_existing.`,
+  "Otherwise it is this branch's own failure: write or fix a test that shows it first, then fix it, and answer fixed. Kitman pushes what you leave."
 ].join(`
 
 `);
-var criteriaPrompt = (unanswered, unmet) => [
-  unanswered ? "You did not answer the Task's acceptance criteria. Answer each one before anyone reviews the change." : "These acceptance criteria are not met yet. Meet them, or say why they cannot be met here:",
-  ...unmet.map((answer) => `- ${answer.criterion}: ${answer.detail}`),
-  criteriaGuidance
+var threadLine = (thread) => [
+  `### Thread ${thread.id}${thread.path === undefined ? "" : ` on ${thread.path}${thread.line === undefined ? "" : `:${thread.line}`}`}`,
+  ...thread.comments.map((entry) => `${entry.author ?? "someone"}: ${entry.body}`)
 ].join(`
-
 `);
-var answerLine = (answer) => `${answer.criterion}: ${answer.status.replaceAll("_", " ")}, ${answer.detail}`;
-var reproducePrompt = (task) => [
-  `Reproduce the bug in ${task} before anyone fixes it.`,
-  "Add a test that fails because of the bug, and change nothing else. Name the approved check that runs it; it must fail now and pass once the bug is fixed."
+var ReviewFix = Struct({ summary: String5 });
+var reviewFixPrompt = (findings) => [
+  "A review of the files the catch-up merge changed found these. Fix each blocker and major finding, with a test that shows it where one can. Kitman pushes what you leave.",
+  ...findings.map((finding) => `- ${finding.id} (${finding.severity}): ${finding.detail}`)
 ].join(`
-
 `);
-var reproducedOnBranchPrompt = (task) => [
-  `An earlier Run already worked on fixing the bug in ${task}, on this branch.`,
-  "Find the commit on this branch where the test reproducing the bug was in place and the fix was not yet, and give it as `revision`; name the approved check that runs that test. Change nothing.",
-  "If no commit on the branch has the reproducing test without the fix, add a test that fails on the branch head now, change nothing else, and give no `revision`."
+var catchUpVerdict = (catchUp) => {
+  if (catchUp.truncated)
+    return { kind: "changed", why: "it changed more files than the Runner compares" };
+  const files = [...new Set([...catchUp.conflicted, ...catchUp.rewritten])];
+  const elsewhere = catchUp.changed.filter((file) => !files.includes(file));
+  if (elsewhere.length > 0)
+    return { kind: "changed", why: `the branch's own diff changed in ${elsewhere.join(", ")}` };
+  return files.length === 0 ? { kind: "carry" } : { kind: "review", files };
+};
+var repliesPrompt = (threads) => [
+  "Reviewers left these comments on the ChangeRequest. For each thread, apply what you agree with and give the reply to post on it: what you changed, or why you did not. A comment that asks a question gets an answer and no change.",
+  "Never mark a thread resolved: whether a disputed point is settled is the reviewer's call.",
+  ...threads.map(threadLine)
 ].join(`
 
 `);
-var findingLine = (finding) => `- **${finding.severity}** \`${finding.id}\` ${finding.detail}`;
-var disputeLine = ({ finding, rebuttal }) => `${findingLine(finding)}
-  You rebutted: ${rebuttal.reason}`;
-var fixPrompt = (settled) => {
-  const checks = settled.open.filter((finding) => isCheckFinding(finding.id));
-  const findings = settled.open.filter((finding) => !isCheckFinding(finding.id));
-  return [
-    ...checks.length === 0 ? [] : [
-      "These checks fail on your head and pass on the base. Only the check passing closes one. If you are sure the change did not cause it, such as a flaky test, rebut it with your reason: the ChangeRequest reports that as your claim and the check stays open. A check does not run again on an unchanged tree, so if you change nothing and only these are open, the rally ends.",
-      ...checks.map(findingLine)
-    ],
-    ...findings.length === 0 ? [] : [
-      "The review found these. Fix each, or rebut it with your reason if it is wrong; reviewers judge the rebuttals next round.",
-      ...findings.map(findingLine)
-    ],
-    ...settled.standing.length === 0 ? [] : [
-      "The reviewers rejected your rebuttal of these. Fix each, or rebut it again with a better reason; one you leave stays a dispute for a person to settle.",
-      ...settled.standing.map(disputeLine)
-    ]
-  ].join(`
-`);
-};
-var blockingIds = (settled) => settled.open.filter(isBlocking).map((finding) => finding.id);
-var onlyChecksBlock = (settled) => blockingIds(settled).every(isCheckFinding) && !settled.standing.some((entry) => isBlocking(entry.finding));
-var rally = (input) => gen2(function* () {
-  const claims = [...input.claims];
-  const conflicts = [];
-  let rebuttals = [];
-  let earlier = [];
-  let previous;
-  let last;
-  const shown = new Set;
-  for (let round = 1;; round++) {
-    const synced = yield* syncBase(`sync:${round}`, {
-      agent: "implementer",
-      ...input.target === undefined ? undefined : { target: input.target }
-    });
-    if (synced.status === "conflict")
-      conflicts.push(`Could not merge the target branch in round ${round}: ${synced.files.join(", ")} (${synced.reason})`);
-    const head = yield* verify(`verify:${round}`, { suggested: input.suggested });
-    if (last !== undefined && last.head.tree === head.tree && rebuttals.length === 0 && onlyChecksBlock(last.settled))
-      return {
-        ...last,
-        round: round - 1,
-        head,
-        decision: { stop: true, reason: "findings_returned", unsettled: blockingIds(last.settled) },
-        claims,
-        conflicts
-      };
-    const failing = brokenChecks(head).map((check) => check.name);
-    const reviewed = yield* call(`review:${round}`, review_default, {
-      base: input.base,
-      head: head.revision,
-      ...rebuttals.length === 0 ? undefined : { rebuttals },
-      ...earlier.length === 0 ? undefined : { earlier },
-      ...input.outcome === undefined ? undefined : { outcome: input.outcome },
-      ...failing.length === 0 ? undefined : { failing },
-      claims: [...claims]
-    });
-    const checks = checkFindings(head);
-    const settled = settleRound({
-      findings: [...reviewed.findings, ...scopeFindings(reviewed.scope), ...checks],
-      rebuttals,
-      verdicts: reviewed.verdicts
-    });
-    earlier = [...settled.open, ...settled.standing.map((entry) => entry.finding)].filter((finding) => !finding.id.startsWith("scope: ") && !isCheckFinding(finding.id));
-    const unseen = checks.some((finding) => !shown.has(finding.detail));
-    const decision = rallyStop({
-      round,
-      maxRounds: input.maxRounds,
-      settled,
-      ...previous === undefined || unseen ? undefined : { previous }
-    });
-    if (decision.stop && (!unseen || round >= input.maxRounds))
-      return { round, head, settled, decision, claims, scope: reviewed.scope, conflicts };
-    for (const finding of checks)
-      shown.add(finding.detail);
-    const fixed = yield* agentWork(`fix:${round}`, {
-      agent: "implementer",
-      prompt: fixPrompt(settled),
-      output: Fixed
-    });
-    claims.push(...fixed.claims, ...fixed.rebuttals.flatMap((rebuttal) => isCheckFinding(rebuttal.findingId) ? [`Rebutted ${rebuttal.findingId}: ${rebuttal.reason}`] : []));
-    const rebutted = fixed.rebuttals.filter((rebuttal) => !isCheckFinding(rebuttal.findingId));
-    rebuttals = [
-      ...rebutted,
-      ...settled.standing.filter((entry) => isBlocking(entry.finding)).map((entry) => entry.rebuttal).filter((rebuttal) => !rebutted.some((entry) => entry.findingId === rebuttal.findingId))
-    ];
-    previous = blockingIds(settled);
-    last = { head, settled, scope: reviewed.scope };
-  }
-});
-var build_default = defineLoop({
-  id: "build",
-  version: "2.2.0",
-  title: "Build",
-  input: BuildInput,
-  output: BuildOutput,
+var threadKey = (thread) => `${thread.id}:${thread.comments.length}`;
+var shepherd_default = defineLoop({
+  id: "shepherd",
+  version: "1.1.0",
+  title: "Shepherd",
+  input: Input3,
+  output: Output3,
   agents: { implementer: "implementer" },
   checkout: "write",
-  offers: [
-    { id: "shepherd", title: "Shepherd it to merge", loop: "shepherd", from: "next" },
-    { id: "review", title: "Review again", loop: "review", from: "next" },
-    { id: "tidy", title: "Tidy", loop: "tidy" },
-    { id: "retry", title: "Retry with a steer", loop: "build" }
+  capabilities: [
+    "agent_work",
+    "read_change_request",
+    "post_comment",
+    "merge_change_request",
+    "approve_change_request",
+    "call",
+    "write_back",
+    "ask",
+    "verify"
   ],
-  capabilities: ["agent_work", "verify", "change_request", "write_back", "post_comment", "approve_change_request"],
-  calls: () => [review_default, shepherd_default],
-  run: (input) => gen2(function* () {
-    if (input.words === undefined && input.taskId === undefined)
-      return yield* new BuildTargetMissing({ message: "Give the words to build, or a Task" });
-    if (input.outcome === "performance")
-      return yield* new BuildOutcomeRefused({
-        message: "Build cannot prove a performance gain; start Hillclimb, which commits a benchmark and keeps only the changes Kitman measures faster"
-      });
-    yield* writeBack("write-back:started", { milestone: "started" });
-    const task = input.words === undefined ? "the Task your brief describes." : `this: ${input.words}`;
-    const outcome = input.outcome;
-    const target = input.branch ?? input.continuing?.targetBranch;
-    if (input.changeRequestId !== undefined && input.continuing?.changeRequestId !== input.changeRequestId)
-      return yield* new BuildTargetMissing({
-        message: `Kitman did not put this Run on ChangeRequest ${input.changeRequestId}'s branch`
-      });
-    const reproduced = outcome === "bug" ? yield* agentWork("reproduce", {
-      agent: "implementer",
-      prompt: input.continuing === undefined ? reproducePrompt(task) : reproducedOnBranchPrompt(task),
-      output: ReproducedOnBranch
-    }) : undefined;
-    const base = reproduced !== undefined ? yield* verify("verify:reproduction", reproduced.revision === undefined ? {} : { revision: reproduced.revision }) : outcome === "refactor" ? yield* verify("verify:base", {}) : undefined;
-    const implemented = yield* agentWorkOnce("implement", {
-      agent: "implementer",
-      skill: "implement",
-      prompt: implementPrompt(task, outcome, input.continuing),
-      output: Implemented
-    });
-    const unanswered = input.taskId !== undefined && implemented.criteria === undefined;
-    const unmet = (implemented.criteria ?? []).filter((answer) => answer.status === "not_met");
-    const criteria = unanswered || unmet.length > 0 ? (yield* agentWorkOnce("criteria", {
-      agent: "implementer",
-      prompt: criteriaPrompt(unanswered, unmet),
-      output: Criteria
-    })).criteria : implemented.criteria ?? [];
-    const last = yield* rally({
-      maxRounds: input.maxRounds ?? 3,
-      base: `origin/${target ?? "HEAD"}`,
-      target,
-      outcome,
-      claims: [...implemented.claims, ...criteria.map((answer) => `Criterion ${answerLine(answer)}`)],
-      suggested: implemented.checks ?? []
-    });
-    const verdict = evidenceGate({
-      ...outcome === undefined ? undefined : { outcome },
-      head: last.head,
-      ...base === undefined ? undefined : { base },
-      ...last.scope === undefined ? undefined : { review: last.scope },
-      ...reproduced === undefined ? undefined : { reproducing: reproduced.check },
-      ...implemented.documented === undefined ? undefined : { documented: implemented.documented },
-      ...implemented.rollback === undefined ? undefined : { rollback: implemented.rollback }
-    });
-    const unsettled = [
-      ...new Set([
-        ...verdict.settled ? [] : verdict.reasons,
-        ...brokenChecks(last.head).map((check) => failsOn("head", check.name, last.head.tree)),
-        ...unsettledItems(last.settled, last.decision),
-        ...last.conflicts,
-        ...criteria.flatMap((answer) => answer.status === "not_met" ? [`Criterion not met: ${answer.criterion} (${answer.detail})`] : [])
-      ])
-    ];
-    const body = changeRequestBody({
-      summary: implemented.summary,
-      head: last.head,
-      claims: last.claims,
-      unsettled,
-      criteria: criteria.map(answerLine),
-      later: last.settled.open.filter((finding) => !isBlocking(finding)).map((finding) => `${finding.id}: ${finding.detail}`),
-      rounds: last.round,
-      stopped: last.decision.reason
+  calls: () => [review_default, release_default],
+  run: (input) => {
+    const changeRequestId = input.changeRequestId;
+    const target = input.continuing?.targetBranch ?? input.branch ?? "HEAD";
+    const answered = new Set;
+    const reranHeads = new Set;
+    const ranOnRunner = new Set;
+    let fixRounds = 0;
+    let replies = 0;
+    let stalledAt;
+    let stalls = 0;
+    let unreviewed;
+    let notCarried;
+    const done = (status, reason) => ({ status, reason, fixRounds, replies });
+    const runOnRunner = (step, cycle, head, checks) => gen2(function* () {
+      const verification = `pipeline-${step}:${cycle}`;
+      const failed = yield* verify(verification, { revision: head, checks }).pipe(as2(undefined), catchTag2("StepFailed", (error) => succeed7(error.reason)));
+      if (failed === undefined)
+        yield* reportPipeline(`pipeline-${step === "run" ? "report" : "rereport"}:${cycle}`, {
+          changeRequestId,
+          verification
+        });
+      return failed;
     });
-    const named = input.changeRequestId === undefined ? undefined : input.continuing;
-    const opened = named === undefined ? yield* changeRequest("change-request", { title: implemented.title, body }) : yield* comment("report", { changeRequestId: named.changeRequestId, body, summary: "kitman-build" }).pipe(as2({ id: named.changeRequestId, number: named.number, url: named.url }));
-    if (named === undefined)
-      yield* writeBack("write-back", { milestone: "change_request_opened", changeRequestUrl: opened.url });
-    const approval = unsettled.length === 0 ? yield* approveChangeRequest("approve", {
-      changeRequestId: opened.id,
-      head: last.head.revision,
-      summary: `Review round ${last.round} passed with nothing blocking.`,
-      review: `review:${last.round}`
-    }).pipe(catchTag2("StepFailed", (error) => succeed7({ approved: false, reason: error.reason }))) : undefined;
-    const landed = input.land !== false ? yield* call("land", shepherd_default, {
-      changeRequestId: opened.id,
-      ...input.taskId === undefined ? undefined : { taskId: input.taskId },
-      ...input.branch === undefined ? undefined : { branch: input.branch }
-    }) : undefined;
-    return {
-      changeRequest: opened,
-      revision: last.head.revision,
-      tree: last.head.tree,
-      settled: unsettled.length === 0,
-      unsettled,
-      rounds: last.round,
-      stopped: last.decision.reason,
-      criteria,
-      ...approval === undefined ? undefined : { approval },
-      ...landed === undefined ? undefined : { landed },
-      next: { changeRequestId: opened.id }
-    };
-  }).pipe(tapError2(() => ignore2(writeBack("write-back:failed", { milestone: "failed" }))))
+    return gen2(function* () {
+      for (let cycle = 1;; cycle++) {
+        if (cycle > (input.maxCycles ?? 20)) {
+          const goOn = yield* ask(`continue:${cycle}`, {
+            prompt: `Shepherd has looked at this ChangeRequest ${cycle - 1} times without landing it. Keep going?`,
+            options: ["Keep going", "Stop"],
+            recommended: "Stop",
+            recommendationReason: `${cycle - 1} looks have not landed it, so something needs a person rather than another look.`,
+            default: "Stop",
+            timeout: "1 hour"
+          });
+          if (goOn === "Stop")
+            return done("needs_you", `Stopped after ${cycle - 1} looks without landing it`);
+        }
+        const pipeline = yield* pipelineStatus(`pipeline:${cycle}`, { changeRequestId });
+        if (pipeline.status === "none" && pipeline.runnerChecks !== undefined) {
+          if (ranOnRunner.has(pipeline.head))
+            return done("needs_you", `The pipeline ran on the Runner at ${pipeline.head}, but no result was recorded`);
+          ranOnRunner.add(pipeline.head);
+          const failed = yield* runOnRunner("run", cycle, pipeline.head, pipeline.runnerChecks);
+          if (failed !== undefined)
+            return done("needs_you", `The pipeline could not run on the Runner: ${failed}`);
+          continue;
+        }
+        if (pipeline.status === "none" || pipeline.status === "running") {
+          yield* pipelineMoved(`wait:${cycle}`, changeRequestId, pipeline);
+          continue;
+        }
+        if (pipeline.status === "failed" || pipeline.status === "canceled") {
+          if (stalledAt === pipeline.head)
+            stalls++;
+          else
+            stalls = 0;
+          if (stalls >= 2)
+            return done("needs_you", `Two fixes pushed nothing new; the pipeline at ${pipeline.head} still fails`);
+          if (fixRounds >= (input.maxFixRounds ?? 3))
+            return done("needs_you", `The pipeline still fails after ${fixRounds} fix rounds`);
+          fixRounds++;
+          stalledAt = pipeline.head;
+          const fixed = yield* agentWork(`ci-fix:${cycle}`, {
+            agent: "implementer",
+            prompt: ciFixPrompt(pipeline, target),
+            output: CiFix,
+            timeout: stepBudget
+          });
+          if (fixed.verdict === "pre_existing")
+            return done("needs_you", `The failure is pre-existing on the target branch: ${fixed.summary}`);
+          if (fixed.verdict === "flaky") {
+            if (pipeline.source === "reported") {
+              if (pipeline.runnerChecks === undefined)
+                return done("needs_you", `The failing job passed when run again, outside the forge: ${fixed.summary}`);
+              if (reranHeads.has(pipeline.head))
+                return done("needs_you", `The failing job failed again when run again on the Runner: ${fixed.summary}`);
+              reranHeads.add(pipeline.head);
+              const failed = yield* runOnRunner("rerun", cycle, pipeline.head, pipeline.runnerChecks);
+              if (failed !== undefined)
+                return done("needs_you", `The pipeline could not run on the Runner: ${failed}`);
+              continue;
+            }
+            if (reranHeads.has(pipeline.head))
+              return done("needs_you", `The failing job failed again when run again on the forge: ${fixed.summary}`);
+            reranHeads.add(pipeline.head);
+            yield* rerunPipeline(`rerun:${cycle}`, { changeRequestId });
+            yield* pipelineMoved(`rerun-wait:${cycle}`, changeRequestId, pipeline).pipe(catchTag2("WaitTimedOut", () => void_3));
+          }
+          continue;
+        }
+        const threads = (yield* reviewThreads(`threads:${cycle}`, { changeRequestId })).threads.filter((thread) => !answered.has(threadKey(thread)));
+        if (threads.length > 0) {
+          const answers = yield* agentWork(`comments:${cycle}`, {
+            agent: "implementer",
+            prompt: repliesPrompt(threads),
+            output: Replies,
+            timeout: stepBudget
+          });
+          for (const answer of answers.replies) {
+            yield* comment(`reply:${cycle}:${answer.threadId}`, {
+              changeRequestId,
+              threadId: answer.threadId,
+              body: answer.reply
+            });
+            replies++;
+          }
+          for (const thread of threads)
+            answered.add(`${thread.id}:${thread.comments.length + 1}`);
+          if (answers.replies.some((answer) => answer.changed))
+            continue;
+        }
+        const commented = {
+          event: "change_request.comment",
+          filter: { changeRequestId },
+          ...pipeline.readAt === undefined ? undefined : { since: pipeline.readAt }
+        };
+        const mergeable = yield* waitFor(`mergeable:${cycle}`, {
+          event: "change_request.mergeable",
+          filter: { changeRequestId },
+          timeout: "1 hour",
+          or: [commented]
+        });
+        if (mergeable.type === commented.event)
+          continue;
+        if (mergeable.payload.mergeable === false) {
+          const synced = yield* syncBase(`sync:${cycle}`, { agent: "implementer", target });
+          if (synced.status === "conflict")
+            return done("needs_you", `Merging ${target} in conflicts on ${synced.files.join(", ")}: ${synced.reason}`);
+          if (synced.status === "merged") {
+            const caught = synced.catchUp;
+            const verdict = caught === undefined ? { kind: "changed", why: "its Runner did not report what it did to the branch" } : catchUpVerdict(caught);
+            if (verdict.kind === "changed") {
+              unreviewed = undefined;
+              notCarried = `merging ${target} in changed it: ${verdict.why}`;
+            } else if (caught !== undefined && unreviewed !== undefined) {
+              const files = [...new Set([...unreviewed.files, ...verdict.kind === "review" ? verdict.files : []])];
+              unreviewed = caught.from === unreviewed.synced ? { ...unreviewed, files, synced: caught.head } : { ...unreviewed, files };
+            } else if (caught !== undefined && verdict.kind === "review") {
+              notCarried = undefined;
+              unreviewed = { files: verdict.files, synced: caught.head, sync: `sync:${cycle}`, earlier: [] };
+            } else if (caught !== undefined) {
+              notCarried = undefined;
+              const carried = yield* approveChangeRequest(`carry:${cycle}`, {
+                changeRequestId,
+                head: caught.head,
+                summary: `Merging ${target} in left the branch's own diff as it was approved.`,
+                carries: `sync:${cycle}`
+              }).pipe(catchTag2("StepFailed", (error) => succeed7({ approved: false, reason: error.reason })));
+              if (!carried.approved)
+                notCarried = `the approval was not carried: ${carried.reason}`;
+            }
+          }
+          continue;
+        }
+        let reviewedHere = false;
+        if (unreviewed !== undefined) {
+          const files = unreviewed;
+          const head = pipeline.head;
+          const reviewed = yield* call(`review:${cycle}`, reviewLoop(), {
+            base: `origin/${target}`,
+            head,
+            files: files.files,
+            ...head === files.synced ? undefined : { since: files.synced },
+            ...files.earlier.length === 0 ? undefined : { earlier: files.earlier }
+          });
+          if (reviewed.blocking) {
+            const blocking = reviewed.findings.filter(isBlocking);
+            if (fixRounds >= (input.maxFixRounds ?? 3))
+              return done("needs_you", `The review of the catch-up merge's files still finds ${blocking.map((finding) => finding.id).join(", ")} after ${fixRounds} fix rounds`);
+            fixRounds++;
+            yield* agentWork(`review-fix:${cycle}`, {
+              agent: "implementer",
+              prompt: reviewFixPrompt(blocking),
+              output: ReviewFix,
+              timeout: stepBudget
+            });
+            unreviewed = { ...files, earlier: reviewed.findings };
+            continue;
+          }
+          const approval = yield* approveChangeRequest(`approve:${cycle}`, {
+            changeRequestId,
+            head,
+            summary: `A review of the files merging ${target} in changed (${files.files.join(", ")}) passed with nothing blocking.`,
+            review: `review:${cycle}`,
+            carries: files.sync
+          }).pipe(catchTag2("StepFailed", (error) => succeed7({ approved: false, reason: error.reason })));
+          unreviewed = undefined;
+          if (approval.approved)
+            reviewedHere = true;
+          else
+            notCarried = `merging ${target} in, whose files' review passed but did not approve it: ${approval.reason}`;
+        }
+        const moved = pipeline.readAt === undefined ? [] : [
+          { event: "change_request.pipeline", filter: { changeRequestId }, since: pipeline.readAt },
+          ...pipeline.source === "reported" ? [
+            {
+              event: "change_request.approval",
+              filter: { changeRequestId, approved: true },
+              since: pipeline.readAt
+            }
+          ] : []
+        ];
+        const approved = reviewedHere ? undefined : yield* waitFor(`approved:${cycle}`, {
+          event: "change_request.approval",
+          filter: { changeRequestId, approved: true, head: pipeline.head },
+          timeout: "7 days",
+          or: [commented, ...moved]
+        });
+        if (approved !== undefined && approved.type !== "change_request.approval")
+          continue;
+        if (pipeline.source === "reported" && approved !== undefined && approved.payload.head !== pipeline.head)
+          continue;
+        const merge = input.merge === true ? "Merge" : yield* ask(`merge:${cycle}`, {
+          prompt: "The ChangeRequest is approved, green and mergeable. Merge now?",
+          options: [
+            { value: "Merge", description: "Merges the head whose pipeline passed." },
+            { value: "Wait", description: "Leaves the merge to a person." }
+          ],
+          recommended: "Merge",
+          recommendationReason: "It is approved, green and mergeable, which is everything a merge waits for.",
+          default: "Wait",
+          auto: "Merge",
+          timeout: "1 hour"
+        });
+        if (merge === "Wait")
+          return done("ready", "Approved, green and mergeable; left for a person to merge");
+        const merged = yield* mergeChangeRequest(`merge-change-request:${cycle}`, {
+          changeRequestId,
+          head: pipeline.head
+        });
+        if (merged.status !== "merged")
+          continue;
+        yield* writeBack("write-back", { milestone: "merged" });
+        const ship = yield* ask("ship", {
+          prompt: `Merged at ${merged.revision}. Release it now?`,
+          options: [
+            { value: "Release", description: "Starts Release on the merge: it gates, tags, publishes and deploys it." },
+            { value: "Not now", description: "Leaves the release to a person or a later Release." }
+          ],
+          recommended: "Release",
+          recommendationReason: "The merge is approved and green, so it is ready to ship.",
+          default: "Not now",
+          auto: "Release",
+          timeout: "1 hour"
+        });
+        if (ship === "Not now")
+          return done("merged", `Merged at ${merged.revision}`);
+        const released = yield* call("release", release_default, { revision: merged.revision });
+        if (released.status !== "deployed" && released.status !== "rejected")
+          yield* ask("release-failed", {
+            prompt: `Merged at ${merged.revision}, but its Release ended ${released.status}: ${released.reason}`,
+            options: [{ value: "Taken over", description: "A person looks at the release and production from here." }],
+            recommended: "Taken over",
+            recommendationReason: "The merge is in, but production may not run it, or may be broken.",
+            default: null
+          });
+        return {
+          ...done("merged", `Merged at ${merged.revision}; Release: ${released.reason}`),
+          release: {
+            runStatus: released.status,
+            reason: released.reason,
+            ...released.tag === undefined ? undefined : { tag: released.tag }
+          }
+        };
+      }
+    }).pipe(catchIf2((error) => error._tag === "StepFailed" && error.reason.includes("time budget"), (error) => succeed7(done("needs_you", `Step "${error.step}" ran past its ${stepBudget} budget`))), catchTags2({
+      WaitTimedOut: (timedOut) => succeed7(done("needs_you", timedOut.event === "change_request.approval" && notCarried !== undefined ? `Nobody approved the head after ${notCarried}` : `Nothing happened on the ChangeRequest while waiting for ${timedOut.event}`)),
+      ChangeRequestClosed: (ended) => succeed7(ended.merged ? done("merged", "Someone else merged the ChangeRequest") : done("needs_you", "The ChangeRequest was closed"))
+    }));
+  }
 });
 
-// src/errand.ts
-var Input3 = Struct({
-  words: String5,
+// src/build.ts
+var BuildInput = Struct({
+  words: optional2(String5),
   taskId: optional2(String5),
   repoBindingId: optional2(String5),
-  branch: optional2(String5)
-});
-var Done3 = Struct({
-  status: Literals(["done", "blocked", "too_big"]),
-  summary: String5,
-  changed: Boolean3,
-  title: optional2(String5),
-  checks: optional2(ArraySchema(SuggestedCheck))
-});
-var budget = "1 hour";
-var Output3 = Struct({
-  status: Literals(["done", "blocked", "too_big", "opened", "handed_to_build", "discarded"]),
-  summary: String5,
-  changeRequest: optional2(ChangeRequestResult)
-});
-var prompt2 = (words) => [
-  `Just do this: ${words}`,
-  implementAdaptation,
-  "It is an errand: a rename, a bump, regenerated fixtures, an answer to a question. Do it directly, run the tests of what you touch, and commit nothing you were not asked for.",
-  "If it turns out to be a feature (several parts, design choices, or more than an hour of work), change nothing and answer too_big with why: a Build will do it with a full review. If something stops you, answer blocked with what.",
-  "Answer with a summary for the person who asked, whether you changed files, a ChangeRequest title if you did, and checks to run if the repository has none approved."
-].join(`
-
-`);
-var errand_default = defineLoop({
-  id: "errand",
-  version: "1.0.0",
-  title: "Errand",
-  input: Input3,
-  output: Output3,
-  agents: { implementer: "implementer" },
-  checkout: "write",
-  offers: [{ id: "build", title: "Build it with a full review", loop: "build" }],
-  capabilities: ["agent_work", "verify", "change_request", "write_back", "ask"],
-  calls: () => [build_default],
-  run: (input) => gen2(function* () {
-    const done = yield* agentWorkOnce("errand", {
-      agent: "implementer",
-      skill: "implement",
-      prompt: prompt2(input.words),
-      output: Done3,
-      timeout: budget
-    }).pipe(catchIf2((error) => error._tag === "StepFailed" && error.reason.includes("time budget"), () => succeed7({
-      status: "too_big",
-      summary: `It took longer than an errand's ${budget}, so it is a feature: Build can do it with a full review.`,
-      changed: false
-    })));
-    if (done.status !== "done" || !done.changed)
-      return { status: done.status, summary: done.summary };
-    const head = yield* verify("verify", { suggested: done.checks ?? [] });
-    const answer = yield* ask("next", {
-      prompt: `${done.summary}
-
-The checks ${head.passed ? "pass" : "fail"}. What next?`,
-      options: [
-        { value: "Open a ChangeRequest", description: "Deliver it as it is, unreviewed." },
-        { value: "Hand to Build for a full review", description: "Build reviews and verifies it before delivering." },
-        { value: "Discard", description: "Drop the change." }
-      ],
-      recommended: head.passed ? "Open a ChangeRequest" : "Hand to Build for a full review",
-      recommendationReason: head.passed ? "The checks pass, and an errand is small enough to review on the ChangeRequest." : "The checks fail, so it needs the fixes and review a Build gives before anyone merges it.",
-      default: "Open a ChangeRequest",
-      timeout: "1 hour"
-    });
-    if (answer === "Discard")
-      return { status: "discarded", summary: done.summary };
-    if (answer === "Hand to Build for a full review") {
-      const built = yield* call("build", build_default, {
-        words: input.words,
-        revision: head.revision,
-        ...input.taskId === undefined ? undefined : { taskId: input.taskId },
-        ...input.branch === undefined ? undefined : { branch: input.branch }
-      });
-      return { status: "handed_to_build", summary: done.summary, changeRequest: built.changeRequest };
-    }
-    const opened = yield* changeRequest("change-request", {
-      title: done.title ?? input.words.slice(0, 120),
-      body: [
-        done.summary,
-        "> **Unreviewed errand.** One agent did this with no review; ask for a Build or a Review if it needs one.",
-        "## Evidence",
-        evidenceTable(head)
-      ].join(`
-
-`)
-    });
-    yield* writeBack("write-back", { milestone: "change_request_opened", changeRequestUrl: opened.url });
-    return { status: "opened", summary: done.summary, changeRequest: opened };
-  })
-});
-
-// src/file-tasks.ts
-var FileTasksInput = Struct({
-  tickets: PlanTickets,
-  projectId: optional2(String5)
-});
-var Output4 = Struct({
-  tasks: ArraySchema(Struct({ key: String5, taskId: String5 }))
+  branch: optional2(String5),
+  revision: optional2(String5),
+  outcome: optional2(LoopOutcome),
+  maxRounds: optional2(Int),
+  continuing: optional2(Continuing),
+  land: optional2(Boolean3),
+  changeRequestId: optional2(String5)
 });
-var file_tasks_default = defineLoop({
-  id: "file-tasks",
-  version: "1.0.0",
-  title: "File Tasks",
-  input: FileTasksInput,
-  output: Output4,
-  agents: {},
-  checkout: "none",
-  capabilities: ["create_tasks"],
-  run: (input) => createTasks("tasks", {
-    tickets: input.tickets,
-    ...input.projectId === undefined ? undefined : { projectId: input.projectId }
-  }).pipe(map8(({ tasks }) => ({ tasks })))
+var CriterionAnswer = Struct({
+  criterion: String5,
+  status: Literals(["met", "after_merge", "not_met"]),
+  detail: String5
 });
-
-// src/hillclimb.ts
-var Input4 = Struct({
-  focus: optional2(String5),
-  taskId: optional2(String5),
-  repoBindingId: optional2(String5),
-  branch: optional2(String5),
-  cycles: optional2(Int),
-  threshold: optional2(Finite),
-  tolerance: optional2(Finite)
+var Criteria = Struct({ criteria: ArraySchema(CriterionAnswer) });
+var SuggestedCheck = Struct({
+  name: CheckName,
+  command: String5,
+  workingDirectory: optionalKey2(String5)
 });
-var Opportunity = Struct({
+var Implemented = Struct({
   title: String5,
-  detail: String5,
-  evidence: Literals(["measured", "telemetry", "hypothesis"]),
-  external: optional2(Boolean3)
+  summary: String5,
+  claims: ArraySchema(String5),
+  documented: optional2(ArraySchema(String5)),
+  rollback: optional2(String5),
+  criteria: optional2(ArraySchema(CriterionAnswer)),
+  checks: optional2(ArraySchema(SuggestedCheck))
 });
-var Discovery = Struct({
-  stack: String5,
-  journeys: ArraySchema(Struct({ name: String5, objective: String5 })),
-  telemetry: ArraySchema(Struct({ source: String5, status: Literals(["used", "unavailable"]), why: String5 })),
-  opportunities: ArraySchema(Opportunity)
+var Reproduced = Struct({
+  check: String5,
+  summary: String5
+});
+var ReproducedOnBranch = Struct({
+  ...Reproduced.fields,
+  revision: optional2(String5)
 });
-var Harness = Struct({
+var Fixed = Struct({
   summary: String5,
-  plan: MeasurePlan
-});
-var Change = Struct({
-  status: Literals(["changed", "exhausted", "unsafe"]),
-  summary: String5
+  claims: ArraySchema(String5),
+  rebuttals: ArraySchema(Rebuttal)
 });
-var Kept = Struct({ summary: String5, verdict: String5, reason: String5 });
-var Output5 = Struct({
-  status: Literals(["improved", "no_gain", "gain_gone", "checks_failed", "too_noisy"]),
-  reason: String5,
-  kept: ArraySchema(Kept),
-  cycles: Int,
-  reportArtifactId: String5,
-  changeRequest: optional2(ChangeRequestResult),
-  external: ArraySchema(String5),
-  unsettled: optional2(ArraySchema(String5))
+var BuildOutput = Struct({
+  changeRequest: ChangeRequestResult,
+  revision: String5,
+  tree: String5,
+  settled: Boolean3,
+  unsettled: ArraySchema(String5),
+  rounds: Int,
+  stopped: Literals(["settled", "dispute_stands", "findings_returned", "round_cap"]),
+  criteria: ArraySchema(CriterionAnswer),
+  approval: optional2(ApproveChangeRequestResult),
+  landed: optional2(ShepherdOutput),
+  next: Struct({ changeRequestId: String5 })
 });
-var discoverPrompt = (focus) => [
-  `Find where this repository is slow${focus === undefined ? ", for the journeys that matter most" : `: ${focus}`}. Change nothing.`,
-  "Read the stack, the user journeys and the objective each has, the docs and earlier performance work. Read whatever telemetry you can reach, read-only and with bounded queries; list each source as used or unavailable, with why.",
-  "Rank the opportunities, most promising first, each marked measured, telemetry or hypothesis. Mark one that only another repository can make as external."
-].join(`
 
-`);
-var harnessPrompt = (discovery) => [
-  "Commit a local benchmark for these journeys, and change no product code:",
-  ...discovery.journeys.map((journey) => `- ${journey.name}: ${journey.objective}`),
-  "It runs on this Runner alone: never call a service, database or URL outside it. Each run prints one JSON line of numbers by metric name as its last line; wall time is measured for you as wall_ms. Keep it under a minute a run.",
-  "Give the measurement plan: the command, any prepare command, and the metrics with one primary and the rest guardrails. Add a low-variance counter (instructions, allocations, queries) where you can, marked lowVariance."
-].join(`
+class BuildTargetMissing extends TaggedError3()("BuildTargetMissing", {
+  message: String5
+}) {
+}
+var outcomeGuidance = {
+  feature: "Deliver the whole scope; review checks it was met.",
+  bug: "Your failing test is already in place: make it pass.",
+  refactor: "Keep behaviour exactly as it is; the approved verifications must pass before and after.",
+  investigation: "Investigate and report what you found, with its sources.",
+  docs: "Name, in `documented`, the approved checks that run the commands you documented.",
+  migration: "Name, in `rollback`, the approved check that rolls the migration back.",
+  performance: "Make it faster without changing behaviour."
+};
 
-`);
-var changePrompt = (discovery, plan, tried, cycle) => [
-  `Cycle ${cycle}: make one bounded change that should improve ${plan.metrics.find((metric) => metric.role === "primary")?.name ?? "the primary metric"} without making a guardrail worse, and commit it. Kitman measures it; do not report numbers of your own.`,
-  "Opportunities, most promising first:",
-  ...discovery.opportunities.flatMap((entry) => entry.external === true ? [] : [`- ${entry.title} (${entry.evidence}): ${entry.detail}`]),
-  ...tried.length === 0 ? [] : ["Already tried:", ...tried.map((entry) => `- ${entry}`)],
-  "Keep behaviour exactly as it is and run the tests you touch. Answer exhausted when nothing is left worth trying, or unsafe when the gain would cost correctness; either way change nothing."
+class BuildOutcomeRefused extends TaggedError3()("BuildOutcomeRefused", {
+  message: String5
+}) {
+}
+var criteriaGuidance = "If your brief has a Task, answer each of its acceptance criteria in `criteria`: met, with the test or file that shows it; after_merge, with why it can only be seen once merged; or not_met, with why. Give an empty `criteria` when the Task has none.";
+var checksGuidance = "If your brief lists no approved verifications for this repository, name in `checks` the commands from its package scripts or CI config that test, lint and typecheck it, each with a `name` of letters, digits, `.`, `_`, `:` and `-` only, such as `unit-tests`; Kitman runs them and labels them as suggested by you.";
+var implementAdaptation = "You run the implement skill as a Kitman Step. The work is in this prompt and your brief, so fetch no ticket. Leave your changes uncommitted: the Run owns the branch. Skip its final code-review: a Review run or a person reviews the change.";
+var implementPrompt = (task, outcome, continuing) => [
+  ...continuing === undefined ? [] : [continuingBrief(continuing), "Fix forward from there."],
+  `Build ${task}`,
+  implementAdaptation,
+  ...outcome === undefined ? [] : [outcomeGuidance[outcome]],
+  'Commit nothing yourself: Kitman pushes what you leave in the workspace. Give the ChangeRequest a title and a summary, and list as claims what you believe but Kitman has not checked, such as "the tests pass".',
+  criteriaGuidance,
+  checksGuidance
 ].join(`
 
 `);
-var revertPrompt = (start, cycle) => `Cycle ${cycle}'s change did not prove faster. Revert its commits, and only those: run \`git revert --no-edit ${start}..HEAD\`. Touch no commit at or before ${start}, never reset or force-push, and change nothing else.`;
-var fixPrompt2 = (findings) => [
-  "The review of the climb found these. Fix each, keep behaviour exactly as it is and keep the gain, and commit. Kitman verifies and measures again; a fix that costs the gain ends the climb.",
-  ...findings.map((finding) => `- ${finding.id}: ${finding.detail}`)
+var criteriaPrompt = (unanswered, unmet) => [
+  unanswered ? "You did not answer the Task's acceptance criteria. Answer each one before anyone reviews the change." : "These acceptance criteria are not met yet. Meet them, or say why they cannot be met here:",
+  ...unmet.map((answer) => `- ${answer.criterion}: ${answer.detail}`),
+  criteriaGuidance
 ].join(`
 
 `);
-var percent = (fraction) => `${(fraction * 100).toFixed(1)}%`;
-var numbers = (measured) => [
-  "| Metric | Role | Base median | Head median | Change | Noise |",
-  "|---|---|---|---|---|---|",
-  ...measured.metrics.map((metric) => `| ${metric.name} | ${metric.role} | ${metric.base.median} | ${metric.head.median} | ${percent(metric.change)} | ${percent(metric.noise)} |`)
+var answerLine = (answer) => `${answer.criterion}: ${answer.status.replaceAll("_", " ")}, ${answer.detail}`;
+var reproducePrompt = (task) => [
+  `Reproduce the bug in ${task} before anyone fixes it.`,
+  "Add a test that fails because of the bug, and change nothing else. Name the approved check that runs it; it must fail now and pass once the bug is fixed."
 ].join(`
-`);
-var report = (input) => [
-  `# Hillclimb findings
-
-${input.reason}`,
-  `## Stack
-
-${input.discovery.stack}`,
-  `## Telemetry
-
-${input.discovery.telemetry.map((entry) => `- ${entry.source}: ${entry.status}, ${entry.why}`).join(`
-`) || "- None reached"}`,
-  `## Benchmark
-
-${input.harness.summary}`,
-  `## Tried
 
-${input.tried.map((entry) => `- ${entry}`).join(`
-`) || "- Nothing"}`,
-  ...input.kept.length === 0 ? [] : [`## Kept
-
-${input.kept.map((entry) => `- ${entry.summary}: ${entry.reason}`).join(`
-`)}`],
-  ...input.final === undefined ? [] : [`## Final measurement
-
-${input.final.reason}
-
-${numbers(input.final)}`],
-  `## Opportunities
-
-${input.discovery.opportunities.map((entry) => `- ${entry.title} (${entry.evidence}${entry.external === true ? ", external" : ""}): ${entry.detail}`).join(`
-`)}`
+`);
+var reproducedOnBranchPrompt = (task) => [
+  `An earlier Run already worked on fixing the bug in ${task}, on this branch.`,
+  "Find the commit on this branch where the test reproducing the bug was in place and the fix was not yet, and give it as `revision`; name the approved check that runs that test. Change nothing.",
+  "If no commit on the branch has the reproducing test without the fix, add a test that fails on the branch head now, change nothing else, and give no `revision`."
 ].join(`
 
 `);
-var steadier = (plan) => {
-  const counter = plan.metrics.find((metric) => metric.lowVariance === true && metric.role !== "primary");
-  return counter === undefined ? undefined : {
-    ...plan,
-    metrics: plan.metrics.map((metric) => ({
-      ...metric,
-      role: metric.name === counter.name ? "primary" : "guardrail"
-    }))
-  };
+var findingLine = (finding) => `- **${finding.severity}** \`${finding.id}\` ${finding.detail}`;
+var disputeLine = ({ finding, rebuttal }) => `${findingLine(finding)}
+  You rebutted: ${rebuttal.reason}`;
+var fixPrompt = (settled) => {
+  const checks = settled.open.filter((finding) => isCheckFinding(finding.id));
+  const findings = settled.open.filter((finding) => !isCheckFinding(finding.id));
+  return [
+    ...checks.length === 0 ? [] : [
+      "These checks fail on your head and pass on the base. Only the check passing closes one. If you are sure the change did not cause it, such as a flaky test, rebut it with your reason: the ChangeRequest reports that as your claim and the check stays open. A check does not run again on an unchanged tree, so if you change nothing and only these are open, the rally ends.",
+      ...checks.map(findingLine)
+    ],
+    ...findings.length === 0 ? [] : [
+      "The review found these. Fix each, or rebut it with your reason if it is wrong; reviewers judge the rebuttals next round.",
+      ...findings.map(findingLine)
+    ],
+    ...settled.standing.length === 0 ? [] : [
+      "The reviewers rejected your rebuttal of these. Fix each, or rebut it again with a better reason; one you leave stays a dispute for a person to settle.",
+      ...settled.standing.map(disputeLine)
+    ]
+  ].join(`
+`);
 };
-var hillclimb_default = defineLoop({
-  id: "hillclimb",
-  version: "1.3.0",
-  title: "Hillclimb",
-  outcome: "performance",
-  input: Input4,
-  output: Output5,
-  agents: { investigator: "climber", implementer: "implementer" },
+var blockingIds = (settled) => settled.open.filter(isBlocking).map((finding) => finding.id);
+var onlyChecksBlock = (settled) => blockingIds(settled).every(isCheckFinding) && !settled.standing.some((entry) => isBlocking(entry.finding));
+var rally = (input) => gen2(function* () {
+  const claims = [...input.claims];
+  const conflicts = [];
+  let rebuttals = [];
+  let earlier = [];
+  let previous;
+  let last;
+  const shown = new Set;
+  for (let round = 1;; round++) {
+    const synced = yield* syncBase(`sync:${round}`, {
+      agent: "implementer",
+      ...input.target === undefined ? undefined : { target: input.target }
+    });
+    if (synced.status === "conflict")
+      conflicts.push(`Could not merge the target branch in round ${round}: ${synced.files.join(", ")} (${synced.reason})`);
+    const head = yield* verify(`verify:${round}`, { suggested: input.suggested });
+    if (last !== undefined && last.head.tree === head.tree && rebuttals.length === 0 && onlyChecksBlock(last.settled))
+      return {
+        ...last,
+        round: round - 1,
+        head,
+        decision: { stop: true, reason: "findings_returned", unsettled: blockingIds(last.settled) },
+        claims,
+        conflicts
+      };
+    const failing = brokenChecks(head).map((check) => check.name);
+    const reviewed = yield* call(`review:${round}`, review_default, {
+      base: input.base,
+      head: head.revision,
+      ...rebuttals.length === 0 ? undefined : { rebuttals },
+      ...earlier.length === 0 ? undefined : { earlier },
+      ...input.outcome === undefined ? undefined : { outcome: input.outcome },
+      ...failing.length === 0 ? undefined : { failing },
+      claims: [...claims]
+    });
+    const checks = checkFindings(head);
+    const settled = settleRound({
+      findings: [...reviewed.findings, ...scopeFindings(reviewed.scope), ...checks],
+      rebuttals,
+      verdicts: reviewed.verdicts
+    });
+    earlier = [...settled.open, ...settled.standing.map((entry) => entry.finding)].filter((finding) => !finding.id.startsWith("scope: ") && !isCheckFinding(finding.id));
+    const unseen = checks.some((finding) => !shown.has(finding.detail));
+    const decision = rallyStop({
+      round,
+      maxRounds: input.maxRounds,
+      settled,
+      ...previous === undefined || unseen ? undefined : { previous }
+    });
+    if (decision.stop && (!unseen || round >= input.maxRounds))
+      return { round, head, settled, decision, claims, scope: reviewed.scope, conflicts };
+    for (const finding of checks)
+      shown.add(finding.detail);
+    const fixed = yield* agentWork(`fix:${round}`, {
+      agent: "implementer",
+      prompt: fixPrompt(settled),
+      output: Fixed
+    });
+    claims.push(...fixed.claims, ...fixed.rebuttals.flatMap((rebuttal) => isCheckFinding(rebuttal.findingId) ? [`Rebutted ${rebuttal.findingId}: ${rebuttal.reason}`] : []));
+    const rebutted = fixed.rebuttals.filter((rebuttal) => !isCheckFinding(rebuttal.findingId));
+    rebuttals = [
+      ...rebutted,
+      ...settled.standing.filter((entry) => isBlocking(entry.finding)).map((entry) => entry.rebuttal).filter((rebuttal) => !rebutted.some((entry) => entry.findingId === rebuttal.findingId))
+    ];
+    previous = blockingIds(settled);
+    last = { head, settled, scope: reviewed.scope };
+  }
+});
+var build_default = defineLoop({
+  id: "build",
+  version: "2.2.0",
+  title: "Build",
+  input: BuildInput,
+  output: BuildOutput,
+  agents: { implementer: "implementer" },
   checkout: "write",
-  capabilities: ["agent_work", "verify", "measure", "change_request", "write_back", "ask", "create_tasks"],
-  calls: () => [review_default],
-  offers: [{ id: "retry", title: "Climb again", loop: "hillclimb" }],
+  offers: [
+    { id: "shepherd", title: "Shepherd it to merge", loop: "shepherd", from: "next" },
+    { id: "review", title: "Review again", loop: "review", from: "next" },
+    { id: "tidy", title: "Tidy", loop: "tidy" },
+    { id: "retry", title: "Retry with a steer", loop: "build" }
+  ],
+  capabilities: ["agent_work", "verify", "change_request", "write_back", "post_comment", "approve_change_request"],
+  calls: () => [review_default, shepherd_default],
   run: (input) => gen2(function* () {
-    const limits = {
-      ...input.threshold === undefined ? undefined : { threshold: input.threshold },
-      ...input.tolerance === undefined ? undefined : { tolerance: input.tolerance }
-    };
-    const discovery = yield* agentWork("discover", {
-      agent: "investigator",
-      prompt: discoverPrompt(input.focus),
-      output: Discovery
-    });
-    const external = discovery.opportunities.flatMap((entry) => entry.external === true ? [entry.title] : []);
-    yield* syncBase("sync:start", {
+    if (input.words === undefined && input.taskId === undefined)
+      return yield* new BuildTargetMissing({ message: "Give the words to build, or a Task" });
+    if (input.outcome === "performance")
+      return yield* new BuildOutcomeRefused({
+        message: "Build cannot prove a performance gain; start Hillclimb, which commits a benchmark and keeps only the changes Kitman measures faster"
+      });
+    yield* writeBack("write-back:started", { milestone: "started" });
+    const task = input.words === undefined ? "the Task your brief describes." : `this: ${input.words}`;
+    const outcome = input.outcome;
+    const target = input.branch ?? input.continuing?.targetBranch;
+    if (input.changeRequestId !== undefined && input.continuing?.changeRequestId !== input.changeRequestId)
+      return yield* new BuildTargetMissing({
+        message: `Kitman did not put this Run on ChangeRequest ${input.changeRequestId}'s branch`
+      });
+    const reproduced = outcome === "bug" ? yield* agentWork("reproduce", {
       agent: "implementer",
-      ...input.branch === undefined ? undefined : { target: input.branch }
-    });
-    const harness = yield* agentWorkOnce("harness", {
+      prompt: input.continuing === undefined ? reproducePrompt(task) : reproducedOnBranchPrompt(task),
+      output: ReproducedOnBranch
+    }) : undefined;
+    const base = reproduced !== undefined ? yield* verify("verify:reproduction", reproduced.revision === undefined ? {} : { revision: reproduced.revision }) : outcome === "refactor" ? yield* verify("verify:base", {}) : undefined;
+    const implemented = yield* agentWorkOnce("implement", {
       agent: "implementer",
-      prompt: harnessPrompt(discovery),
-      output: Harness
-    });
-    const baseline = (yield* verify("verify:harness", {})).revision;
-    let plan = harness.plan;
-    const calibrated = yield* measure("calibrate", { plan, base: baseline, head: baseline, ...limits });
-    const kept = [];
-    const tried = [];
-    let cycles = 0;
-    const ending = (status, reason, final) => gen2(function* () {
-      const stored = yield* artifact("report", {
-        kind: "hillclimb-report",
-        title: "Hillclimb findings",
-        text: report({ discovery, harness, reason, kept, tried, final })
-      });
-      return { status, reason, kept, cycles, reportArtifactId: stored.artifactId, external };
+      skill: "implement",
+      prompt: implementPrompt(task, outcome, input.continuing),
+      output: Implemented
     });
-    if (calibrated.verdict === "too_noisy") {
-      const switched = steadier(plan);
-      if (switched === undefined)
-        return yield* ending("too_noisy", `${calibrated.reason}. ${calibrated.suggestion ?? ""}`.trim());
-      plan = switched;
-    }
-    let start = baseline;
-    let unkept = 0;
-    for (let cycle = 1;cycle <= (input.cycles ?? 5) && unkept < 2; cycle++) {
-      const change = yield* agentWorkOnce(`change:${cycle}`, {
-        agent: "implementer",
-        prompt: changePrompt(discovery, plan, tried, cycle),
-        output: Change
-      });
-      if (change.status !== "changed") {
-        tried.push(`Cycle ${cycle}: ${change.status}, ${change.summary}`);
-        break;
-      }
-      cycles = cycle;
-      const head = yield* verify(`verify:${cycle}`, {});
-      const measured = head.passed ? yield* measure(`measure:${cycle}`, { plan, base: start, head: head.revision, ...limits }) : undefined;
-      if (measured?.verdict === "gain") {
-        kept.push({ summary: change.summary, verdict: measured.verdict, reason: measured.reason });
-        tried.push(`Cycle ${cycle}, kept: ${change.summary} (${measured.reason})`);
-        start = head.revision;
-        unkept = 0;
-        continue;
-      }
-      tried.push(`Cycle ${cycle}, reverted: ${change.summary} (${measured === undefined ? "its checks failed" : measured.reason})`);
-      yield* agentWork(`revert:${cycle}`, {
-        agent: "implementer",
-        prompt: revertPrompt(start, cycle),
-        output: Struct({ reverted: Boolean3 })
-      });
-      unkept++;
-    }
-    if (external.length > 0) {
-      const file = yield* ask("external", {
-        prompt: `Only other repositories can make these improvements: ${external.join("; ")}. File them as Tasks?`,
-        options: ["File as Tasks", "Leave them"],
-        recommended: "File as Tasks",
-        recommendationReason: "Filed as Tasks, the improvements wait in the repositories that can make them instead of being lost.",
-        default: "Leave them",
-        timeout: "1 hour"
-      });
-      if (file === "File as Tasks")
-        yield* createTasks("external-tasks", {
-          tickets: discovery.opportunities.flatMap((entry, index) => entry.external === true ? [
-            {
-              key: `external-${index + 1}`,
-              title: entry.title,
-              body: entry.detail,
-              acceptanceCriteria: [],
-              blockedBy: [],
-              outcome: "performance"
-            }
-          ] : [])
-        });
-    }
-    if (kept.length === 0)
-      return yield* ending("no_gain", "No change proved faster than the noise allows");
-    const synced = yield* syncBase("sync:final", {
+    const unanswered = input.taskId !== undefined && implemented.criteria === undefined;
+    const unmet = (implemented.criteria ?? []).filter((answer) => answer.status === "not_met");
+    const criteria = unanswered || unmet.length > 0 ? (yield* agentWorkOnce("criteria", {
       agent: "implementer",
-      ...input.branch === undefined ? undefined : { target: input.branch }
+      prompt: criteriaPrompt(unanswered, unmet),
+      output: Criteria
+    })).criteria : implemented.criteria ?? [];
+    const last = yield* rally({
+      maxRounds: input.maxRounds ?? 3,
+      base: `origin/${target ?? "HEAD"}`,
+      target,
+      outcome,
+      claims: [...implemented.claims, ...criteria.map((answer) => `Criterion ${answerLine(answer)}`)],
+      suggested: implemented.checks ?? []
     });
-    const checked = yield* verify("verify:final", {});
-    if (!checked.passed) {
-      const failing = checked.checks.filter((check) => check.status === "failed").map((check) => check.name);
-      return yield* ending("checks_failed", `The final tree fails ${failing.join(", ") || "its checks"}`);
-    }
-    let final = yield* measure("measure:final", { plan, base: baseline, head: checked.revision, ...limits });
-    if (final.verdict !== "gain")
-      return yield* ending("gain_gone", `The final tree no longer proves the gain: ${final.reason}`, final);
-    const claims = [
-      "Behaviour is preserved: every kept change leaves what the code does exactly as it was.",
-      `The measurement is valid: ${harness.summary}`,
-      ...kept.map((entry) => entry.summary)
-    ];
-    let reviewed = yield* call("review", review_default, {
-      base: baseline,
-      head: checked.revision,
-      outcome: "performance",
-      claims
+    const verdict = evidenceGate({
+      ...outcome === undefined ? undefined : { outcome },
+      head: last.head,
+      ...base === undefined ? undefined : { base },
+      ...last.scope === undefined ? undefined : { review: last.scope },
+      ...reproduced === undefined ? undefined : { reproducing: reproduced.check },
+      ...implemented.documented === undefined ? undefined : { documented: implemented.documented },
+      ...implemented.rollback === undefined ? undefined : { rollback: implemented.rollback }
     });
-    for (let round = 1;round <= 2 && reviewed.findings.some(isBlocking); round++) {
-      const blocking = reviewed.findings.filter(isBlocking);
-      yield* agentWork(`fix:${round}`, {
-        agent: "implementer",
-        prompt: fixPrompt2(blocking),
-        output: Struct({ summary: String5 })
-      });
-      const fixed = yield* verify(`verify:fix:${round}`, {});
-      if (!fixed.passed) {
-        const failing = fixed.checks.filter((check) => check.status === "failed").map((check) => check.name);
-        return yield* ending("checks_failed", `The review's fixes fail ${failing.join(", ") || "the checks"}`);
-      }
-      final = yield* measure(`measure:fix:${round}`, { plan, base: baseline, head: fixed.revision, ...limits });
-      if (final.verdict !== "gain")
-        return yield* ending("gain_gone", `The review's fixes cost the gain: ${final.reason}`, final);
-      reviewed = yield* call(`review:${round + 1}`, review_default, {
-        base: baseline,
-        head: fixed.revision,
-        outcome: "performance",
-        claims,
-        earlier: blocking
-      });
-    }
     const unsettled = [
-      ...[...reviewed.findings, ...scopeFindings(reviewed.scope)].flatMap((finding) => isBlocking(finding) ? [`${finding.id}: ${finding.detail}`] : []),
-      ...synced.status === "conflict" ? [`Merging the base in conflicts on ${synced.files.join(", ")}`] : []
+      ...new Set([
+        ...verdict.settled ? [] : verdict.reasons,
+        ...brokenChecks(last.head).map((check) => failsOn("head", check.name, last.head.tree)),
+        ...unsettledItems(last.settled, last.decision),
+        ...last.conflicts,
+        ...criteria.flatMap((answer) => answer.status === "not_met" ? [`Criterion not met: ${answer.criterion} (${answer.detail})`] : [])
+      ])
     ];
-    const caveats = synced.status === "merged" ? ["The base moved during the climb; the final measurement includes its changes too."] : [];
-    const opened = yield* changeRequest("change-request", {
-      title: `Faster: ${kept.map((entry) => entry.summary).join("; ")}`.slice(0, 240),
-      body: [
-        `${final.reason}, measured by Kitman against the benchmark on the base.`,
-        numbers(final),
-        `## Kept
-
-${kept.map((entry) => `- ${entry.summary}: ${entry.reason}`).join(`
-`)}`,
-        `## Benchmark
-
-${harness.summary}
-
-\`${plan.command}\``,
-        ...unsettled.length + caveats.length === 0 ? [] : [`## Unsettled
-
-${[...unsettled, ...caveats].map((entry) => `- ${entry}`).join(`
-`)}`]
-      ].join(`
-
-`)
+    const body = changeRequestBody({
+      summary: implemented.summary,
+      head: last.head,
+      claims: last.claims,
+      unsettled,
+      criteria: criteria.map(answerLine),
+      later: last.settled.open.filter((finding) => !isBlocking(finding)).map((finding) => `${finding.id}: ${finding.detail}`),
+      rounds: last.round,
+      stopped: last.decision.reason
     });
-    yield* writeBack("write-back", { milestone: "change_request_opened", changeRequestUrl: opened.url });
-    return { ...yield* ending("improved", final.reason, final), changeRequest: opened, unsettled };
-  })
+    const named = input.changeRequestId === undefined ? undefined : input.continuing;
+    const opened = named === undefined ? yield* changeRequest("change-request", { title: implemented.title, body }) : yield* comment("report", { changeRequestId: named.changeRequestId, body, summary: "kitman-build" }).pipe(as2({ id: named.changeRequestId, number: named.number, url: named.url }));
+    if (named === undefined)
+      yield* writeBack("write-back", { milestone: "change_request_opened", changeRequestUrl: opened.url });
+    const approval = unsettled.length === 0 ? yield* approveChangeRequest("approve", {
+      changeRequestId: opened.id,
+      head: last.head.revision,
+      summary: `Review round ${last.round} passed with nothing blocking.`,
+      review: `review:${last.round}`
+    }).pipe(catchTag2("StepFailed", (error) => succeed7({ approved: false, reason: error.reason }))) : undefined;
+    const landed = input.land !== false && unsettled.length === 0 ? yield* call("land", shepherd_default, {
+      changeRequestId: opened.id,
+      ...input.taskId === undefined ? undefined : { taskId: input.taskId },
+      ...input.branch === undefined ? undefined : { branch: input.branch }
+    }) : undefined;
+    if (input.land !== false && unsettled.length > 0)
+      yield* ask("unsettled", {
+        prompt: `The ChangeRequest ${opened.url} is open, but these still stand: ${unsettled.join("; ")}. Build will not land it.`,
+        options: [{ value: "Taken over", description: "A person fixes, rebuts or steers it from here." }],
+        recommended: "Taken over",
+        recommendationReason: "Build stopped with these unsettled, so the next step is a person\u2019s.",
+        default: null
+      });
+    return {
+      changeRequest: opened,
+      revision: last.head.revision,
+      tree: last.head.tree,
+      settled: unsettled.length === 0,
+      unsettled,
+      rounds: last.round,
+      stopped: last.decision.reason,
+      criteria,
+      ...approval === undefined ? undefined : { approval },
+      ...landed === undefined ? undefined : { landed },
+      next: { changeRequestId: opened.id }
+    };
+  }).pipe(tapError2(() => ignore2(writeBack("write-back:failed", { milestone: "failed" }))))
 });
 
-// src/firewatch.ts
-var Input5 = Struct({
-  alert: Record(String5, Json2),
+// src/errand.ts
+var Input4 = Struct({
+  words: String5,
+  taskId: optional2(String5),
   repoBindingId: optional2(String5),
-  windowHours: optional2(Int.check(isGreaterThanOrEqualTo2(0), isLessThanOrEqualTo3(720))),
-  autoFix: optional2(Boolean3)
+  branch: optional2(String5)
 });
-var Conclusion = Struct({
+var Done3 = Struct({
+  status: Literals(["done", "blocked", "too_big"]),
   summary: String5,
-  cause: String5,
-  confidence: Literals(["high", "medium", "low"]),
-  sources: NonEmptyArray(String5),
-  telemetry: ArraySchema(Struct({ source: String5, reached: Boolean3, tried: optional2(String5) })),
-  inCode: Boolean3,
-  fix: optional2(String5)
+  changed: Boolean3,
+  title: optional2(String5),
+  checks: optional2(ArraySchema(SuggestedCheck))
 });
-var FixRequest = Struct({ words: String5, outcome: Literal2("bug") });
-var Output6 = Struct({
-  status: Literals(["folded", "resolved", "concluded"]),
-  taskId: optional2(String5),
-  joinedRunId: optional2(String5),
-  conclusionArtifactId: optional2(String5),
-  resolvedDuring: Boolean3,
-  fix: Literals(["none", "declined", "started", "failed"]),
-  changeRequestUrl: optional2(String5),
-  fixRequest: optional2(FixRequest)
+var budget = "1 hour";
+var Output4 = Struct({
+  status: Literals(["done", "blocked", "too_big", "opened", "handed_to_build", "discarded"]),
+  summary: String5,
+  changeRequest: optional2(ChangeRequestResult)
 });
-var firstText = (alert, ...keys) => keys.flatMap((key) => {
-  const value = alert[key];
-  return isString(value) && value.trim() !== "" ? [value] : [];
-})[0];
-var alertTitle = (alert) => firstText(alert, "title", "name", "summary") ?? "Alert";
-var fingerprintOf = (alert) => firstText(alert, "fingerprint", "groupKey") ?? alertTitle(alert);
-var isResolved = (alert) => firstText(alert, "status", "state")?.toLowerCase() === "resolved";
-var priorities = new Map(Object.entries({
-  critical: "urgent",
-  p1: "urgent",
-  urgent: "urgent",
-  high: "high",
-  error: "high",
-  p2: "high",
-  warning: "medium",
-  medium: "medium",
-  p3: "medium",
-  low: "low",
-  info: "low",
-  p4: "low"
-}));
-var priorityOf = (alert) => {
-  const severity = firstText(alert, "severity", "priority", "level")?.toLowerCase();
-  return (severity === undefined ? undefined : priorities.get(severity)) ?? "high";
-};
-var investigatePrompt = (alert) => [
-  "Investigate this alert and conclude what happened and why.",
-  "```json",
-  JSON.stringify(alert, null, 2),
-  "```",
-  "Cite as sources the logs, metrics, commits or code that support your conclusion. List every telemetry source you tried and whether you could read it, with what you tried for one you could not; say how confident you are, lower when a source was out of reach.",
-  "Say whether the cause is in code Kitman can change, and propose a fix only then."
+var prompt2 = (words) => [
+  `Just do this: ${words}`,
+  implementAdaptation,
+  "It is an errand: a rename, a bump, regenerated fixtures, an answer to a question. Do it directly, run the tests of what you touch, and commit nothing you were not asked for.",
+  "If it turns out to be a feature (several parts, design choices, or more than an hour of work), change nothing and answer too_big with why: a Build will do it with a full review. If something stops you, answer blocked with what.",
+  "Answer with a summary for the person who asked, whether you changed files, a ChangeRequest title if you did, and checks to run if the repository has none approved."
 ].join(`
 
 `);
-var conclusionText = (conclusion, resolvedDuring) => [
-  conclusion.summary,
-  ...resolvedDuring ? ["It resolved on its own while it was being investigated."] : [],
-  `Cause: ${conclusion.cause} (confidence ${conclusion.confidence})`,
-  "Sources:",
-  ...conclusion.sources.map((source) => `- ${source}`),
-  ...conclusion.telemetry.some((source) => !source.reached) ? [
-    "Out of reach:",
-    ...conclusion.telemetry.filter((source) => !source.reached).map((source) => `- ${source.source}${source.tried === undefined ? "" : `: ${source.tried}`}`)
-  ] : [],
-  ...conclusion.fix === undefined ? [] : [`Fix: ${conclusion.fix}`]
-].join(`
-`);
-var firewatch_default = defineLoop({
-  id: "firewatch",
+var errand_default = defineLoop({
+  id: "errand",
   version: "1.0.0",
-  title: "Firewatch",
-  input: Input5,
-  output: Output6,
-  outcome: "investigation",
-  agents: { investigator: "investigator" },
-  checkout: "read",
-  when: [{ event: "monitoring.alert", input: { alert: "alert" } }],
-  offers: [{ id: "build-fix", title: "Build the fix", loop: "build", from: "fixRequest" }],
-  capabilities: ["agent_work", "ask", "create_tasks"],
+  title: "Errand",
+  input: Input4,
+  output: Output4,
+  agents: { implementer: "implementer" },
+  checkout: "write",
+  offers: [{ id: "build", title: "Build it with a full review", loop: "build" }],
+  capabilities: ["agent_work", "verify", "change_request", "write_back", "ask"],
   calls: () => [build_default],
   run: (input) => gen2(function* () {
-    const fingerprint = fingerprintOf(input.alert);
-    const resolved = isResolved(input.alert);
-    const windowHours = input.windowHours ?? 6;
-    const request = { fingerprint, title: alertTitle(input.alert), windowHours, priority: priorityOf(input.alert) };
-    const placed = yield* alertTask("task", { ...request, ...resolved ? { resolved } : undefined });
-    const taskId = placed.taskId === undefined ? undefined : { taskId: placed.taskId };
-    if (placed.joined !== undefined)
-      return {
-        status: "folded",
-        ...taskId,
-        joinedRunId: placed.joined.runId,
-        resolvedDuring: false,
-        fix: "none"
-      };
-    if (resolved)
-      return { status: "resolved", ...taskId, resolvedDuring: false, fix: "none" };
-    const conclusion = yield* agentWork("investigate", {
-      agent: "investigator",
-      prompt: investigatePrompt(input.alert),
-      output: Conclusion
-    });
-    const resolvedDuring = (yield* alertTask("task:check", request)).resolved === true;
-    const stored = yield* artifact("conclusion", {
-      kind: "investigation_conclusion",
-      title: request.title,
-      text: conclusionText(conclusion, resolvedDuring),
-      data: { alert: input.alert, sources: conclusion.sources, confidence: conclusion.confidence }
-    });
-    yield* note("summary", { text: conclusion.summary, artifactId: stored.artifactId });
-    const concluded = {
-      status: "concluded",
-      ...taskId,
-      conclusionArtifactId: stored.artifactId,
-      resolvedDuring
-    };
-    if (conclusion.fix === undefined || !conclusion.inCode)
-      return { ...concluded, fix: "none" };
-    const fixRequest = {
-      words: `${conclusion.fix}
-
-${conclusionText(conclusion, resolvedDuring)}`,
-      outcome: "bug"
-    };
-    const confident = conclusion.confidence === "high" && !resolvedDuring;
-    const answer = yield* ask("start-fix", {
-      prompt: `${conclusion.summary}
+    const done = yield* agentWorkOnce("errand", {
+      agent: "implementer",
+      skill: "implement",
+      prompt: prompt2(input.words),
+      output: Done3,
+      timeout: budget
+    }).pipe(catchIf2((error) => error._tag === "StepFailed" && error.reason.includes("time budget"), () => succeed7({
+      status: "too_big",
+      summary: `It took longer than an errand's ${budget}, so it is a feature: Build can do it with a full review.`,
+      changed: false
+    })));
+    if (done.status !== "done" || !done.changed)
+      return { status: done.status, summary: done.summary };
+    const head = yield* verify("verify", { suggested: done.checks ?? [] });
+    const answer = yield* ask("next", {
+      prompt: `${done.summary}
 
-Start a Build that fixes it as a bug: ${conclusion.fix}?`,
+The checks ${head.passed ? "pass" : "fail"}. What next?`,
       options: [
-        { value: "Start a fix", description: "A Build fixes it as a bug and opens a ChangeRequest." },
-        { value: "Not now", description: "Keeps the finding on the Task." }
+        { value: "Open a ChangeRequest", description: "Deliver it as it is, unreviewed." },
+        { value: "Hand to Build for a full review", description: "Build reviews and verifies it before delivering." },
+        { value: "Discard", description: "Drop the change." }
       ],
-      recommended: confident ? "Start a fix" : "Not now",
-      recommendationReason: confident ? "Firewatch is confident of the cause and the alert is still firing." : resolvedDuring ? "The alert resolved while Firewatch looked, so a fix can wait for a person to judge." : "Firewatch is not confident of the cause, so a fix could aim at the wrong thing.",
-      default: input.autoFix === true && confident ? "Start a fix" : "Not now",
+      recommended: head.passed ? "Open a ChangeRequest" : "Hand to Build for a full review",
+      recommendationReason: head.passed ? "The checks pass, and an errand is small enough to review on the ChangeRequest." : "The checks fail, so it needs the fixes and review a Build gives before anyone merges it.",
+      default: "Open a ChangeRequest",
       timeout: "1 hour"
     });
-    if (answer === "Not now")
-      return { ...concluded, fix: "declined", fixRequest };
-    return yield* call("fix", build_default, {
-      ...fixRequest,
-      ...taskId,
-      ...input.repoBindingId === undefined ? undefined : { repoBindingId: input.repoBindingId }
-    }).pipe(map8((fixed) => ({ ...concluded, fix: "started", changeRequestUrl: fixed.changeRequest.url })), catchTag2("ChildFailed", () => succeed7({ ...concluded, fix: "failed", fixRequest })));
+    if (answer === "Discard")
+      return { status: "discarded", summary: done.summary };
+    if (answer === "Hand to Build for a full review") {
+      const built = yield* call("build", build_default, {
+        words: input.words,
+        revision: head.revision,
+        ...input.taskId === undefined ? undefined : { taskId: input.taskId },
+        ...input.branch === undefined ? undefined : { branch: input.branch }
+      });
+      return { status: "handed_to_build", summary: done.summary, changeRequest: built.changeRequest };
+    }
+    const opened = yield* changeRequest("change-request", {
+      title: done.title ?? input.words.slice(0, 120),
+      body: [
+        done.summary,
+        "> **Unreviewed errand.** One agent did this with no review; ask for a Build or a Review if it needs one.",
+        "## Evidence",
+        evidenceTable(head)
+      ].join(`
+
+`)
+    });
+    yield* writeBack("write-back", { milestone: "change_request_opened", changeRequestUrl: opened.url });
+    return { status: "opened", summary: done.summary, changeRequest: opened };
   })
 });
 
-// src/plan.ts
-var Input6 = Struct({
-  words: String5,
+// src/file-tasks.ts
+var FileTasksInput = Struct({
+  tickets: PlanTickets,
+  projectId: optional2(String5)
+});
+var Output5 = Struct({
+  tasks: ArraySchema(Struct({ key: String5, taskId: String5 }))
+});
+var file_tasks_default = defineLoop({
+  id: "file-tasks",
+  version: "1.0.0",
+  title: "File Tasks",
+  input: FileTasksInput,
+  output: Output5,
+  agents: {},
+  checkout: "none",
+  capabilities: ["create_tasks"],
+  run: (input) => createTasks("tasks", {
+    tickets: input.tickets,
+    ...input.projectId === undefined ? undefined : { projectId: input.projectId }
+  }).pipe(map8(({ tasks }) => ({ tasks })))
+});
+
+// src/hillclimb.ts
+var Input5 = Struct({
+  focus: optional2(String5),
+  taskId: optional2(String5),
   repoBindingId: optional2(String5),
   branch: optional2(String5),
-  projectId: optional2(String5),
-  implement: optional2(Boolean3)
+  cycles: optional2(Int),
+  threshold: optional2(Finite),
+  tolerance: optional2(Finite)
+});
+var Opportunity = Struct({
+  title: String5,
+  detail: String5,
+  evidence: Literals(["measured", "telemetry", "hypothesis"]),
+  external: optional2(Boolean3)
+});
+var Discovery = Struct({
+  stack: String5,
+  journeys: ArraySchema(Struct({ name: String5, objective: String5 })),
+  telemetry: ArraySchema(Struct({ source: String5, status: Literals(["used", "unavailable"]), why: String5 })),
+  opportunities: ArraySchema(Opportunity)
 });
-var Plan = Struct({
-  title: String5,
-  spec: String5,
-  tickets: PlanTickets,
-  outOfScope: ArraySchema(String5),
-  afterMerge: ArraySchema(String5),
-  docs: optional2(Struct({ title: String5, summary: String5 }))
+var Harness = Struct({
+  summary: String5,
+  plan: MeasurePlan
 });
-var CriteriaCheck = Struct({
-  alreadyMet: ArraySchema(Struct({ key: String5, criterion: String5 }))
+var Change = Struct({
+  status: Literals(["changed", "exhausted", "unsafe"]),
+  summary: String5
 });
-var Rejected = Struct({ key: String5, reason: String5 });
-var Opinion = Struct({ summary: String5, concerns: ArraySchema(String5) });
-var TicketResult = Struct({
-  key: String5,
-  title: String5,
-  status: Literals(["merged", "failed", "skipped"]),
-  repoBindingId: optional2(String5),
+var Kept = Struct({ summary: String5, verdict: String5, reason: String5 });
+var Output6 = Struct({
+  status: Literals(["improved", "no_gain", "gain_gone", "checks_failed", "too_noisy"]),
+  reason: String5,
+  kept: ArraySchema(Kept),
+  cycles: Int,
+  reportArtifactId: String5,
   changeRequest: optional2(ChangeRequestResult),
-  reason: optional2(String5)
-});
-var Output7 = Struct({
-  title: String5,
-  outOfScope: ArraySchema(String5),
-  afterMerge: ArraySchema(String5),
-  rejected: ArraySchema(Rejected),
-  stopped: optional2(String5),
-  implemented: Boolean3,
-  tickets: ArraySchema(TicketResult),
-  deliveries: ArraySchema(ChangeRequestResult),
-  tasks: optional2(CreateTasksResult.fields.tasks),
-  docs: optional2(ChangeRequestResult)
+  external: ArraySchema(String5),
+  unsettled: optional2(ArraySchema(String5))
 });
-var menu = ["Implement now", "File as Tasks", "Second opinion", "Refine", "Finish"];
-var maxRounds = 6;
-var maxOpinionsPerPlan = 2;
-var menuDescriptions = {
-  "Implement now": "Builds the tickets in dependency order and delivers them.",
-  "File as Tasks": "Makes a Task of each ticket, to build later.",
-  "Second opinion": "Another Agent reviews the plan.",
-  Refine: "You say what to change and the planner rewrites it.",
-  Finish: "Ends the Run with the plan as it is."
-};
-var onFailure = ["Retry with a steer", "Skip it and its dependents", "Stop here"];
-var ticketRules = [
-  "Each ticket is one Build: a vertical slice an agent can implement, review and deliver as one ChangeRequest. Give it a short unique key, and list in blockedBy the keys of the tickets whose code it needs; tickets never block each other in a cycle. Set repoBindingId only when it changes another repository than the plan, keep one repository per ticket, and no cycle across repositories. Set outcome to the kind of change: feature, bug, refactor, docs, migration, investigation or performance.",
-  "Each acceptance criterion is something a Build can show before its ChangeRequest: a behaviour a test or a check proves. A text search is never a criterion, nor is something the code already does. Outcomes only visible after merge go under afterMerge, not under a ticket's criteria."
+var discoverPrompt = (focus) => [
+  `Find where this repository is slow${focus === undefined ? ", for the journeys that matter most" : `: ${focus}`}. Change nothing.`,
+  "Read the stack, the user journeys and the objective each has, the docs and earlier performance work. Read whatever telemetry you can reach, read-only and with bounded queries; list each source as used or unavailable, with why.",
+  "Rank the opportunities, most promising first, each marked measured, telemetry or hypothesis. Mark one that only another repository can make as external."
 ].join(`
 
 `);
-var planPrompt = (words) => [
-  `Plan this: ${words}`,
-  "You run the grill-with-docs skill as a Kitman Step. Interview the person with the Kitman MCP ask tool, one question at a time, and ask only what changes what gets built: a clear goal needs no interview. Write the ADR and glossary changes the grilling settles in the checkout, and no other files.",
-  "Then write the spec and the tickets from the goal, the code and the answers.",
-  ticketRules,
-  "List in outOfScope what the plan deliberately leaves out, one item each; each holds the Builds of its tickets.",
-  "If you left ADR or glossary changes, give docs a ChangeRequest title and a summary of the decisions; Kitman opens it. Your Output is the plan, and Kitman stores it."
+var harnessPrompt = (discovery) => [
+  "Commit a local benchmark for these journeys, and change no product code:",
+  ...discovery.journeys.map((journey) => `- ${journey.name}: ${journey.objective}`),
+  "It runs on this Runner alone: never call a service, database or URL outside it. Each run prints one JSON line of numbers by metric name as its last line; wall time is measured for you as wall_ms. Keep it under a minute a run.",
+  "Give the measurement plan: the command, any prepare command, and the metrics with one primary and the rest guardrails. Add a low-variance counter (instructions, allocations, queries) where you can, marked lowVariance."
 ].join(`
 
 `);
-var planText = (plan) => [
-  `# ${plan.title}`,
-  plan.spec,
-  ...plan.outOfScope.length === 0 ? [] : ["## Out of scope", plan.outOfScope.map((item) => `- ${item}`).join(`
-`)],
-  ...plan.afterMerge.length === 0 ? [] : ["## After merge", plan.afterMerge.map((item) => `- ${item}`).join(`
-`)],
-  "## Tickets",
-  ...plan.tickets.map(ticketText)
+var changePrompt = (discovery, plan, tried, cycle) => [
+  `Cycle ${cycle}: make one bounded change that should improve ${plan.metrics.find((metric) => metric.role === "primary")?.name ?? "the primary metric"} without making a guardrail worse, and commit it. Kitman measures it; do not report numbers of your own.`,
+  "Opportunities, most promising first:",
+  ...discovery.opportunities.flatMap((entry) => entry.external === true ? [] : [`- ${entry.title} (${entry.evidence}): ${entry.detail}`]),
+  ...tried.length === 0 ? [] : ["Already tried:", ...tried.map((entry) => `- ${entry}`)],
+  "Keep behaviour exactly as it is and run the tests you touch. Answer exhausted when nothing is left worth trying, or unsafe when the gain would cost correctness; either way change nothing."
 ].join(`
 
 `);
-var ticketText = (ticket) => [
-  `### ${ticket.key}: ${ticket.title}`,
-  ticket.body,
-  ...ticket.acceptanceCriteria.map((criterion) => `- [ ] ${criterion}`),
-  ...ticket.blockedBy.length === 0 ? [] : [`Blocked by: ${ticket.blockedBy.join(", ")}`]
+var revertPrompt = (start, cycle) => `Cycle ${cycle}'s change did not prove faster. Revert its commits, and only those: run \`git revert --no-edit ${start}..HEAD\`. Touch no commit at or before ${start}, never reset or force-push, and change nothing else.`;
+var fixPrompt2 = (findings) => [
+  "The review of the climb found these. Fix each, keep behaviour exactly as it is and keep the gain, and commit. Kitman verifies and measures again; a fix that costs the gain ends the climb.",
+  ...findings.map((finding) => `- ${finding.id}: ${finding.detail}`)
 ].join(`
 
 `);
-var opinionPrompt = (plan) => [
-  "Review this plan as a second opinion. Look for missing scope, tickets too big to review, wrong blockers and risks. Change nothing.",
-  planText(plan)
+var percent = (fraction) => `${(fraction * 100).toFixed(1)}%`;
+var numbers = (measured) => [
+  "| Metric | Role | Base median | Head median | Change | Noise |",
+  "|---|---|---|---|---|---|",
+  ...measured.metrics.map((metric) => `| ${metric.name} | ${metric.role} | ${metric.base.median} | ${metric.head.median} | ${percent(metric.change)} | ${percent(metric.noise)} |`)
 ].join(`
-
 `);
-var refinePrompt = (plan, words) => [`Change the plan as the user asks: ${words}`, ticketRules, planText(plan)].join(`
+var report = (input) => [
+  `# Hillclimb findings
 
-`);
-var criteriaPrompt2 = (plan) => [
-  "Check each ticket's acceptance criteria against the base branch as it is now. List under alreadyMet each criterion the code already meets, with its ticket's key and the criterion word for word. Change nothing.",
-  planText(plan)
-].join(`
+${input.reason}`,
+  `## Stack
 
-`);
-var guard2 = " (guard: the base already does this)";
-var guarded = (plan, check) => {
-  const met = (ticket, criterion) => check.alreadyMet.some((entry) => entry.key === ticket.key && entry.criterion === criterion);
-  const rejected = plan.tickets.flatMap((ticket) => ticket.acceptanceCriteria.length > 0 && ticket.acceptanceCriteria.every((criterion) => met(ticket, criterion)) ? [{ key: ticket.key, reason: "The base branch already meets every one of its criteria" }] : []);
-  const gone = new Set(rejected.map((entry) => entry.key));
-  const tickets = plan.tickets.flatMap((ticket) => gone.has(ticket.key) ? [] : [
-    {
-      ...ticket,
-      acceptanceCriteria: ticket.acceptanceCriteria.map((criterion) => met(ticket, criterion) ? `${criterion}${guard2}` : criterion),
-      blockedBy: ticket.blockedBy.filter((key) => !gone.has(key))
-    }
-  ]);
-  return { plan: { ...plan, tickets }, rejected };
-};
-var checked = (plan, revision) => map8(agentWork(`criteria-check:${revision}`, { agent: "reviewer", prompt: criteriaPrompt2(plan), output: CriteriaCheck }), (check) => guarded(plan, check));
-var storePlan = (plan, suffix) => gen2(function* () {
-  yield* artifact(`spec${suffix}`, {
-    kind: "plan_spec",
-    title: plan.title,
-    text: plan.spec,
-    data: { outOfScope: [...plan.outOfScope] }
-  });
-  yield* artifact(`tickets${suffix}`, {
-    kind: "plan_tickets",
-    title: `Tickets for ${plan.title}`,
-    text: plan.tickets.map(ticketText).join(`
+${input.discovery.stack}`,
+  `## Telemetry
 
-`),
-    data: plan.tickets.map(({ repoBindingId, outcome, ...ticket }) => ({
-      ...ticket,
-      acceptanceCriteria: [...ticket.acceptanceCriteria],
-      blockedBy: [...ticket.blockedBy],
-      ...repoBindingId === undefined ? undefined : { repoBindingId },
-      ...outcome === undefined ? undefined : { outcome }
-    }))
-  });
-});
-var changelog = (before, after, words) => {
-  const was = new Map(before.tickets.map((ticket) => [ticket.key, ticketText(ticket)]));
-  const now = new Map(after.tickets.map((ticket) => [ticket.key, ticketText(ticket)]));
-  const lines = [
-    ...after.tickets.filter((ticket) => !was.has(ticket.key)).map((ticket) => `- Added ${ticket.key}: ${ticket.title}`),
-    ...before.tickets.filter((ticket) => !now.has(ticket.key)).map((ticket) => `- Removed ${ticket.key}: ${ticket.title}`),
-    ...after.tickets.filter((ticket) => was.has(ticket.key) && was.get(ticket.key) !== now.get(ticket.key)).map((ticket) => `- Changed ${ticket.key}: ${ticket.title}`),
-    ...before.spec === after.spec ? [] : ["- Changed the spec"],
-    ...before.title === after.title ? [] : [`- Renamed the plan from "${before.title}"`]
-  ];
-  return [`Asked: ${words}`, ...lines.length === 0 ? ["Nothing changed."] : lines].join(`
-`);
-};
-var buildWords = (ticket) => [
-  ticket.title,
-  ticket.body,
-  ...ticket.acceptanceCriteria.length === 0 ? [] : ["Acceptance criteria:", ...ticket.acceptanceCriteria.map((criterion) => `- ${criterion}`)]
-].join(`
+${input.discovery.telemetry.map((entry) => `- ${entry.source}: ${entry.status}, ${entry.why}`).join(`
+`) || "- None reached"}`,
+  `## Benchmark
 
-`);
-var settled = (ticket, result) => ({
-  key: ticket.key,
-  title: ticket.title,
-  ...result
-});
-var buildTicket = (ticket, start, taskId, retry) => gen2(function* () {
-  let head = start;
-  const name = retry === undefined ? ticket.key : `${ticket.key}:${retry.label}`;
-  for (let attempt = 1;; attempt++) {
-    const suffix = attempt === 1 ? "" : `:${attempt}`;
-    const words = retry === undefined ? taskId === undefined ? { words: buildWords(ticket) } : undefined : { words: `${buildWords(ticket)}
+${input.harness.summary}`,
+  `## Tried
 
-An earlier Build of this failed. ${retry.steer}` };
-    const built = yield* call(`build:${name}${suffix}`, build_default, {
-      ...words,
-      ...taskId === undefined ? undefined : { taskId },
-      repoBindingId: head.repoBindingId,
-      branch: head.branch,
-      revision: head.revision
-    }).pipe(catchTag2("ChildFailed", (failure) => succeed7(failure)));
-    if (built instanceof ChildFailed)
-      return settled(ticket, { status: "failed", repoBindingId: head.repoBindingId, reason: built.reason });
-    const merged = yield* mergeChangeRequest(`merge:${name}${suffix}`, {
-      changeRequestId: built.changeRequest.id,
-      head: built.revision
-    });
-    const delivered = { repoBindingId: head.repoBindingId, changeRequest: built.changeRequest };
-    if (merged.status === "merged")
-      return settled(ticket, { status: "merged", ...delivered });
-    const choice = yield* ask(`conflict:${name}${suffix}`, {
-      prompt: `The ChangeRequest for ${ticket.key} (${built.changeRequest.url}) ${merged.status === "moved" ? "changed after it was built" : `conflicts with ${head.branch}`}. Rebuild ${ticket.key} on the integration branch as it is now, or skip it and the tickets it blocks?`,
-      options: [
-        {
-          value: "Rebuild on the integration branch",
-          description: "Builds the ticket again from the branch as it is now."
-        },
-        { value: "Skip", description: "Leaves it and the tickets it blocks undelivered." }
-      ],
-      recommended: "Rebuild on the integration branch",
-      recommendationReason: "A rebuild on the current branch usually resolves a conflict, and skipping also drops every ticket it blocks.",
-      default: "Skip",
-      timeout: "1 hour"
-    });
-    if (choice === "Skip")
-      return settled(ticket, { status: "failed", ...delivered, reason: `It conflicted with ${head.branch}` });
-    head = yield* integrationBranch(`rebuild-from:${name}:${attempt + 1}`, {
-      repoBindingId: head.repoBindingId
-    });
-  }
-});
-var deliveryBody = (plan, results) => {
-  const line = (result) => result.status === "merged" && result.changeRequest !== undefined ? `- **${result.key}** [${result.title}](${result.changeRequest.url}); its evidence is on that ChangeRequest` : `- **${result.key}** ${result.title}: ${result.reason ?? result.status}`;
-  const section = (title, status) => {
-    const lines = results.flatMap((result) => result.status === status ? [line(result)] : []);
-    return lines.length === 0 ? [] : [`## ${title}`, lines.join(`
-`)];
-  };
-  return [
-    `Delivers the plan "${plan.title}".`,
-    ...section("Merged", "merged"),
-    ...section("Failed", "failed"),
-    ...section("Skipped", "skipped")
-  ].join(`
+${input.tried.map((entry) => `- ${entry}`).join(`
+`) || "- Nothing"}`,
+  ...input.kept.length === 0 ? [] : [`## Kept
+
+${input.kept.map((entry) => `- ${entry.summary}: ${entry.reason}`).join(`
+`)}`],
+  ...input.final === undefined ? [] : [`## Final measurement
+
+${input.final.reason}
+
+${numbers(input.final)}`],
+  `## Opportunities
+
+${input.discovery.opportunities.map((entry) => `- ${entry.title} (${entry.evidence}${entry.external === true ? ", external" : ""}): ${entry.detail}`).join(`
+`)}`
+].join(`
 
 `);
+var steadier = (plan) => {
+  const counter = plan.metrics.find((metric) => metric.lowVariance === true && metric.role !== "primary");
+  return counter === undefined ? undefined : {
+    ...plan,
+    metrics: plan.metrics.map((metric) => ({
+      ...metric,
+      role: metric.name === counter.name ? "primary" : "guardrail"
+    }))
+  };
 };
-var implement = (input, plan, revision, filed) => gen2(function* () {
-  const tasks = filed?.revision === revision ? filed.tasks : (yield* createTasks("tasks", {
-    tickets: plan.tickets,
-    ...input.projectId === undefined ? undefined : { projectId: input.projectId }
-  })).tasks;
-  const taskOf = new Map(tasks.map((task) => [task.key, task.taskId]));
-  const results = new Map;
-  const waves = yield* planWaves(plan.tickets);
-  let stopped;
-  for (const [index, wave] of waves.entries()) {
-    const ready = [];
-    for (const ticket of wave) {
-      const unmerged = ticket.blockedBy.find((key) => results.get(key)?.status !== "merged");
-      if (stopped !== undefined)
-        results.set(ticket.key, settled(ticket, { status: "skipped", reason: stopped }));
-      else if (unmerged === undefined)
-        ready.push(ticket);
-      else
-        results.set(ticket.key, settled(ticket, { status: "skipped", reason: `blocked by ${unmerged}, which was not merged` }));
+var hillclimb_default = defineLoop({
+  id: "hillclimb",
+  version: "1.3.0",
+  title: "Hillclimb",
+  outcome: "performance",
+  input: Input5,
+  output: Output6,
+  agents: { investigator: "climber", implementer: "implementer" },
+  checkout: "write",
+  capabilities: ["agent_work", "verify", "measure", "change_request", "write_back", "ask", "create_tasks"],
+  calls: () => [review_default],
+  offers: [{ id: "retry", title: "Climb again", loop: "hillclimb" }],
+  run: (input) => gen2(function* () {
+    const limits = {
+      ...input.threshold === undefined ? undefined : { threshold: input.threshold },
+      ...input.tolerance === undefined ? undefined : { tolerance: input.tolerance }
+    };
+    const discovery = yield* agentWork("discover", {
+      agent: "investigator",
+      prompt: discoverPrompt(input.focus),
+      output: Discovery
+    });
+    const external = discovery.opportunities.flatMap((entry) => entry.external === true ? [entry.title] : []);
+    yield* syncBase("sync:start", {
+      agent: "implementer",
+      ...input.branch === undefined ? undefined : { target: input.branch }
+    });
+    const harness = yield* agentWorkOnce("harness", {
+      agent: "implementer",
+      prompt: harnessPrompt(discovery),
+      output: Harness
+    });
+    const baseline = (yield* verify("verify:harness", {})).revision;
+    let plan = harness.plan;
+    const calibrated = yield* measure("calibrate", { plan, base: baseline, head: baseline, ...limits });
+    const kept = [];
+    const tried = [];
+    let cycles = 0;
+    const ending = (status, reason, final) => gen2(function* () {
+      const stored = yield* artifact("report", {
+        kind: "hillclimb-report",
+        title: "Hillclimb findings",
+        text: report({ discovery, harness, reason, kept, tried, final })
+      });
+      return { status, reason, kept, cycles, reportArtifactId: stored.artifactId, external };
+    });
+    if (calibrated.verdict === "too_noisy") {
+      const switched = steadier(plan);
+      if (switched === undefined)
+        return yield* ending("too_noisy", `${calibrated.reason}. ${calibrated.suggestion ?? ""}`.trim());
+      plan = switched;
     }
-    const repoOf = (ticket) => ticket.repoBindingId ?? input.repoBindingId;
-    const heads = new Map;
-    for (const repo of new Set(ready.map(repoOf)))
-      heads.set(repo, yield* integrationBranch(`integration:wave-${index + 1}:${repo ?? "default"}`, repo === undefined ? {} : { repoBindingId: repo }));
-    const built = yield* forEach2(ready.flatMap((ticket) => {
-      const head = heads.get(repoOf(ticket));
-      return head === undefined ? [] : [buildTicket(ticket, head, taskOf.get(ticket.key))];
-    }), (building) => building, { concurrency: "unbounded" });
-    for (const first of built) {
-      const ticket = ready.find((entry) => entry.key === first.key);
-      let result = first;
-      for (let retry = 1;ticket !== undefined && result.status === "failed" && stopped === undefined; retry++) {
-        const choice = yield* ask(`failed:${ticket.key}:${retry}`, {
-          prompt: `The Build of ${ticket.key} failed: ${result.reason ?? "no reason given"}. Retry it with a steer, skip it and the tickets it blocks, or stop here?`,
-          options: onFailure,
-          recommended: "Retry with a steer",
-          recommendationReason: "The reason it failed is above, so a steer can aim the retry at it; skipping also drops the tickets it blocks.",
-          default: "Skip it and its dependents",
-          timeout: "1 hour"
-        });
-        if (choice === "Skip it and its dependents")
-          break;
-        if (choice === "Stop here") {
-          stopped = `Stopped after ${ticket.key} failed`;
-          break;
-        }
-        const steer = yield* ask(`steer:${ticket.key}:${retry}`, {
-          prompt: `What should the retry of ${ticket.key} do differently?`,
-          freeText: true,
-          recommended: `Address the failure: ${result.reason ?? "find out why it failed first"}`,
-          recommendationReason: "Pointing the retry at the reason it failed is the least a steer should do.",
-          default: null
-        });
-        const head = yield* integrationBranch(`integration:${ticket.key}:retry-${retry}`, {
-          ...repoOf(ticket) === undefined ? undefined : { repoBindingId: repoOf(ticket) }
+    let start = baseline;
+    let unkept = 0;
+    for (let cycle = 1;cycle <= (input.cycles ?? 5) && unkept < 2; cycle++) {
+      const change = yield* agentWorkOnce(`change:${cycle}`, {
+        agent: "implementer",
+        prompt: changePrompt(discovery, plan, tried, cycle),
+        output: Change
+      });
+      if (change.status !== "changed") {
+        tried.push(`Cycle ${cycle}: ${change.status}, ${change.summary}`);
+        break;
+      }
+      cycles = cycle;
+      const head = yield* verify(`verify:${cycle}`, {});
+      const measured = head.passed ? yield* measure(`measure:${cycle}`, { plan, base: start, head: head.revision, ...limits }) : undefined;
+      if (measured?.verdict === "gain") {
+        kept.push({ summary: change.summary, verdict: measured.verdict, reason: measured.reason });
+        tried.push(`Cycle ${cycle}, kept: ${change.summary} (${measured.reason})`);
+        start = head.revision;
+        unkept = 0;
+        continue;
+      }
+      tried.push(`Cycle ${cycle}, reverted: ${change.summary} (${measured === undefined ? "its checks failed" : measured.reason})`);
+      yield* agentWork(`revert:${cycle}`, {
+        agent: "implementer",
+        prompt: revertPrompt(start, cycle),
+        output: Struct({ reverted: Boolean3 })
+      });
+      unkept++;
+    }
+    if (external.length > 0) {
+      const file = yield* ask("external", {
+        prompt: `Only other repositories can make these improvements: ${external.join("; ")}. File them as Tasks?`,
+        options: ["File as Tasks", "Leave them"],
+        recommended: "File as Tasks",
+        recommendationReason: "Filed as Tasks, the improvements wait in the repositories that can make them instead of being lost.",
+        default: "Leave them",
+        timeout: "1 hour"
+      });
+      if (file === "File as Tasks")
+        yield* createTasks("external-tasks", {
+          tickets: discovery.opportunities.flatMap((entry, index) => entry.external === true ? [
+            {
+              key: `external-${index + 1}`,
+              title: entry.title,
+              body: entry.detail,
+              acceptanceCriteria: [],
+              blockedBy: [],
+              outcome: "performance"
+            }
+          ] : [])
         });
-        result = yield* buildTicket(ticket, head, taskOf.get(ticket.key), { label: `retry-${retry}`, steer });
+    }
+    if (kept.length === 0)
+      return yield* ending("no_gain", "No change proved faster than the noise allows");
+    const synced = yield* syncBase("sync:final", {
+      agent: "implementer",
+      ...input.branch === undefined ? undefined : { target: input.branch }
+    });
+    const checked = yield* verify("verify:final", {});
+    if (!checked.passed) {
+      const failing = checked.checks.filter((check) => check.status === "failed").map((check) => check.name);
+      return yield* ending("checks_failed", `The final tree fails ${failing.join(", ") || "its checks"}`);
+    }
+    let final = yield* measure("measure:final", { plan, base: baseline, head: checked.revision, ...limits });
+    if (final.verdict !== "gain")
+      return yield* ending("gain_gone", `The final tree no longer proves the gain: ${final.reason}`, final);
+    const claims = [
+      "Behaviour is preserved: every kept change leaves what the code does exactly as it was.",
+      `The measurement is valid: ${harness.summary}`,
+      ...kept.map((entry) => entry.summary)
+    ];
+    let reviewed = yield* call("review", review_default, {
+      base: baseline,
+      head: checked.revision,
+      outcome: "performance",
+      claims
+    });
+    for (let round = 1;round <= 2 && reviewed.findings.some(isBlocking); round++) {
+      const blocking = reviewed.findings.filter(isBlocking);
+      yield* agentWork(`fix:${round}`, {
+        agent: "implementer",
+        prompt: fixPrompt2(blocking),
+        output: Struct({ summary: String5 })
+      });
+      const fixed = yield* verify(`verify:fix:${round}`, {});
+      if (!fixed.passed) {
+        const failing = fixed.checks.filter((check) => check.status === "failed").map((check) => check.name);
+        return yield* ending("checks_failed", `The review's fixes fail ${failing.join(", ") || "the checks"}`);
       }
-      results.set(result.key, result);
+      final = yield* measure(`measure:fix:${round}`, { plan, base: baseline, head: fixed.revision, ...limits });
+      if (final.verdict !== "gain")
+        return yield* ending("gain_gone", `The review's fixes cost the gain: ${final.reason}`, final);
+      reviewed = yield* call(`review:${round + 1}`, review_default, {
+        base: baseline,
+        head: fixed.revision,
+        outcome: "performance",
+        claims,
+        earlier: blocking
+      });
     }
-  }
-  const ordered = plan.tickets.flatMap((ticket) => results.get(ticket.key) ?? []);
-  const repos = [
-    ...new Set(ordered.flatMap((result) => result.status === "merged" ? result.repoBindingId ?? [] : []))
-  ];
-  const deliveries = yield* forEach2(repos, (repo) => changeRequest(`deliver:${repo}`, {
-    title: plan.title,
-    body: deliveryBody(plan, ordered.filter((result) => result.repoBindingId === repo || result.repoBindingId === undefined)),
-    integration: repo
-  }));
-  return { tickets: ordered, deliveries, tasks, ...stopped === undefined ? undefined : { stopped } };
+    const unsettled = [
+      ...[...reviewed.findings, ...scopeFindings(reviewed.scope)].flatMap((finding) => isBlocking(finding) ? [`${finding.id}: ${finding.detail}`] : []),
+      ...synced.status === "conflict" ? [`Merging the base in conflicts on ${synced.files.join(", ")}`] : []
+    ];
+    const caveats = synced.status === "merged" ? ["The base moved during the climb; the final measurement includes its changes too."] : [];
+    const opened = yield* changeRequest("change-request", {
+      title: `Faster: ${kept.map((entry) => entry.summary).join("; ")}`.slice(0, 240),
+      body: [
+        `${final.reason}, measured by Kitman against the benchmark on the base.`,
+        numbers(final),
+        `## Kept
+
+${kept.map((entry) => `- ${entry.summary}: ${entry.reason}`).join(`
+`)}`,
+        `## Benchmark
+
+${harness.summary}
+
+\`${plan.command}\``,
+        ...unsettled.length + caveats.length === 0 ? [] : [`## Unsettled
+
+${[...unsettled, ...caveats].map((entry) => `- ${entry}`).join(`
+`)}`]
+      ].join(`
+
+`)
+    });
+    yield* writeBack("write-back", { milestone: "change_request_opened", changeRequestUrl: opened.url });
+    return { ...yield* ending("improved", final.reason, final), changeRequest: opened, unsettled };
+  })
 });
-var plan_default = defineLoop({
-  id: "plan",
-  version: "2.0.0",
-  title: "Plan",
+
+// src/firewatch.ts
+var Input6 = Struct({
+  alert: Record(String5, Json2),
+  repoBindingId: optional2(String5),
+  windowHours: optional2(Int.check(isGreaterThanOrEqualTo2(0), isLessThanOrEqualTo3(720))),
+  autoFix: optional2(Boolean3)
+});
+var Conclusion = Struct({
+  summary: String5,
+  cause: String5,
+  confidence: Literals(["high", "medium", "low"]),
+  sources: NonEmptyArray(String5),
+  telemetry: ArraySchema(Struct({ source: String5, reached: Boolean3, tried: optional2(String5) })),
+  inCode: Boolean3,
+  fix: optional2(String5)
+});
+var FixRequest = Struct({ words: String5, outcome: Literal2("bug") });
+var Output7 = Struct({
+  status: Literals(["folded", "resolved", "concluded"]),
+  taskId: optional2(String5),
+  joinedRunId: optional2(String5),
+  conclusionArtifactId: optional2(String5),
+  resolvedDuring: Boolean3,
+  fix: Literals(["none", "declined", "started", "failed"]),
+  changeRequestUrl: optional2(String5),
+  fixRequest: optional2(FixRequest)
+});
+var firstText = (alert, ...keys) => keys.flatMap((key) => {
+  const value = alert[key];
+  return isString(value) && value.trim() !== "" ? [value] : [];
+})[0];
+var alertTitle = (alert) => firstText(alert, "title", "name", "summary") ?? "Alert";
+var fingerprintOf = (alert) => firstText(alert, "fingerprint", "groupKey") ?? alertTitle(alert);
+var isResolved = (alert) => firstText(alert, "status", "state")?.toLowerCase() === "resolved";
+var priorities = new Map(Object.entries({
+  critical: "urgent",
+  p1: "urgent",
+  urgent: "urgent",
+  high: "high",
+  error: "high",
+  p2: "high",
+  warning: "medium",
+  medium: "medium",
+  p3: "medium",
+  low: "low",
+  info: "low",
+  p4: "low"
+}));
+var priorityOf = (alert) => {
+  const severity = firstText(alert, "severity", "priority", "level")?.toLowerCase();
+  return (severity === undefined ? undefined : priorities.get(severity)) ?? "high";
+};
+var investigatePrompt = (alert) => [
+  "Investigate this alert and conclude what happened and why.",
+  "```json",
+  JSON.stringify(alert, null, 2),
+  "```",
+  "Cite as sources the logs, metrics, commits or code that support your conclusion. List every telemetry source you tried and whether you could read it, with what you tried for one you could not; say how confident you are, lower when a source was out of reach.",
+  "Say whether the cause is in code Kitman can change, and propose a fix only then."
+].join(`
+
+`);
+var conclusionText = (conclusion, resolvedDuring) => [
+  conclusion.summary,
+  ...resolvedDuring ? ["It resolved on its own while it was being investigated."] : [],
+  `Cause: ${conclusion.cause} (confidence ${conclusion.confidence})`,
+  "Sources:",
+  ...conclusion.sources.map((source) => `- ${source}`),
+  ...conclusion.telemetry.some((source) => !source.reached) ? [
+    "Out of reach:",
+    ...conclusion.telemetry.filter((source) => !source.reached).map((source) => `- ${source.source}${source.tried === undefined ? "" : `: ${source.tried}`}`)
+  ] : [],
+  ...conclusion.fix === undefined ? [] : [`Fix: ${conclusion.fix}`]
+].join(`
+`);
+var firewatch_default = defineLoop({
+  id: "firewatch",
+  version: "1.0.0",
+  title: "Firewatch",
   input: Input6,
   output: Output7,
-  agents: { planner: "planner", reviewer: "reviewer" },
-  checkout: "write",
-  capabilities: [
-    "agent_work",
-    "ask",
-    "call",
-    "verify",
-    "change_request",
-    "write_back",
-    "create_tasks",
-    "merge_change_request",
-    "read_change_request",
-    "post_comment"
-  ],
+  outcome: "investigation",
+  agents: { investigator: "investigator" },
+  checkout: "read",
+  when: [{ event: "monitoring.alert", input: { alert: "alert" } }],
+  offers: [{ id: "build-fix", title: "Build the fix", loop: "build", from: "fixRequest" }],
+  capabilities: ["agent_work", "ask", "create_tasks"],
   calls: () => [build_default],
   run: (input) => gen2(function* () {
-    const drafted = yield* agentWorkOnce("plan", {
-      agent: "planner",
-      skill: "grill-with-docs",
-      prompt: planPrompt(input.words),
-      output: Plan
+    const fingerprint = fingerprintOf(input.alert);
+    const resolved = isResolved(input.alert);
+    const windowHours = input.windowHours ?? 6;
+    const request = { fingerprint, title: alertTitle(input.alert), windowHours, priority: priorityOf(input.alert) };
+    const placed = yield* alertTask("task", { ...request, ...resolved ? { resolved } : undefined });
+    const taskId = placed.taskId === undefined ? undefined : { taskId: placed.taskId };
+    if (placed.joined !== undefined)
+      return {
+        status: "folded",
+        ...taskId,
+        joinedRunId: placed.joined.runId,
+        resolvedDuring: false,
+        fix: "none"
+      };
+    if (resolved)
+      return { status: "resolved", ...taskId, resolvedDuring: false, fix: "none" };
+    const conclusion = yield* agentWork("investigate", {
+      agent: "investigator",
+      prompt: investigatePrompt(input.alert),
+      output: Conclusion
     });
-    const docs = drafted.docs === undefined ? undefined : yield* changeRequest("docs", { title: drafted.docs.title, body: drafted.docs.summary });
-    let revision = 1;
-    let { plan, rejected } = yield* checked(drafted, revision);
-    let filed;
-    let opinions = 0;
-    yield* storePlan(plan, "");
-    const project = input.projectId === undefined ? undefined : { projectId: input.projectId };
-    const ended = (rest) => ({
-      title: plan.title,
-      outOfScope: plan.outOfScope,
-      afterMerge: plan.afterMerge,
-      rejected,
-      tickets: [],
-      deliveries: [],
-      ...filed === undefined ? undefined : { tasks: filed.tasks },
-      ...docs === undefined ? undefined : { docs },
-      ...rest
+    const resolvedDuring = (yield* alertTask("task:check", request)).resolved === true;
+    const stored = yield* artifact("conclusion", {
+      kind: "investigation_conclusion",
+      title: request.title,
+      text: conclusionText(conclusion, resolvedDuring),
+      data: { alert: input.alert, sources: conclusion.sources, confidence: conclusion.confidence }
     });
-    for (let round = 1;round <= maxRounds; round++) {
-      const isFiled = filed?.revision === revision;
-      const options = menu.filter((option) => !(option === "File as Tasks" && isFiled) && !(option === "Second opinion" && opinions >= maxOpinionsPerPlan));
-      const fallback = input.implement === true ? "Implement now" : isFiled ? "Finish" : "File as Tasks";
-      const answer = yield* ask(`next:${round}`, {
-        prompt: `What next for the plan "${plan.title}"?`,
-        options: options.map((option) => ({ value: option, description: menuDescriptions[option] })),
-        recommended: fallback,
-        recommendationReason: fallback === "Implement now" ? "You asked for the plan to be implemented." : fallback === "Finish" ? "The plan is filed as Tasks, so nothing is lost by finishing." : "Filing keeps the plan as Tasks a person or a Build can pick up later.",
-        default: fallback,
-        timeout: "1 hour"
-      });
-      const choice = menu.find((option) => option === answer) ?? fallback;
-      switch (choice) {
-        case "Finish":
-          return ended({ implemented: false });
-        case "Implement now": {
-          const delivered = yield* implement(input, plan, revision, filed);
-          return { ...ended({ implemented: true }), ...delivered };
-        }
-        case "File as Tasks": {
-          const made = yield* createTasks(`file-tasks:${round}`, { tickets: plan.tickets, ...project });
-          filed = { revision, tasks: made.tasks };
-          break;
-        }
-        case "Second opinion": {
-          opinions++;
-          const opinion = yield* agentWork(`second-opinion:${round}`, {
-            agent: "reviewer",
-            prompt: opinionPrompt(plan),
-            output: Opinion
-          });
-          yield* artifact(`opinion:${round}`, {
-            kind: "plan_review",
-            title: `Second opinion on ${plan.title}`,
-            text: [opinion.summary, ...opinion.concerns.map((concern) => `- ${concern}`)].join(`
+    yield* note("summary", { text: conclusion.summary, artifactId: stored.artifactId });
+    const concluded = {
+      status: "concluded",
+      ...taskId,
+      conclusionArtifactId: stored.artifactId,
+      resolvedDuring
+    };
+    if (conclusion.fix === undefined || !conclusion.inCode)
+      return { ...concluded, fix: "none" };
+    const fixRequest = {
+      words: `${conclusion.fix}
 
-`)
-          });
-          break;
-        }
-        case "Refine": {
-          const words = yield* ask(`refine:${round}`, {
-            prompt: "What should change in the plan?",
-            freeText: true,
-            informationOnly: true,
-            recommendationReason: "You chose to refine it, so only you know what should change."
-          });
-          const refined = yield* agentWorkOnce(`refine-plan:${round}`, {
-            agent: "planner",
-            prompt: refinePrompt(plan, words),
-            output: Plan
-          });
-          const before = plan;
-          revision++;
-          ({ plan, rejected } = yield* checked(refined, revision));
-          yield* storePlan(plan, `:${round}`);
-          yield* artifact(`changes:${round}`, {
-            kind: "plan_changes",
-            title: `Revision ${revision} of ${plan.title}`,
-            text: changelog(before, plan, words)
-          });
-          break;
-        }
-      }
-    }
-    if (filed?.revision !== revision)
-      filed = {
-        revision,
-        tasks: (yield* createTasks("file-tasks:last", { tickets: plan.tickets, ...project })).tasks
-      };
-    return ended({
-      implemented: false,
-      stopped: `No decision after ${maxRounds} rounds, so the tickets are filed as Tasks for a person to pick up`
+${conclusionText(conclusion, resolvedDuring)}`,
+      outcome: "bug"
+    };
+    const confident = conclusion.confidence === "high" && !resolvedDuring;
+    const answer = yield* ask("start-fix", {
+      prompt: `${conclusion.summary}
+
+Start a Build that fixes it as a bug: ${conclusion.fix}?`,
+      options: [
+        { value: "Start a fix", description: "A Build fixes it as a bug and opens a ChangeRequest." },
+        { value: "Not now", description: "Keeps the finding on the Task." }
+      ],
+      recommended: confident ? "Start a fix" : "Not now",
+      recommendationReason: confident ? "Firewatch is confident of the cause and the alert is still firing." : resolvedDuring ? "The alert resolved while Firewatch looked, so a fix can wait for a person to judge." : "Firewatch is not confident of the cause, so a fix could aim at the wrong thing.",
+      default: input.autoFix === true && confident ? "Start a fix" : "Not now",
+      timeout: "1 hour"
     });
+    if (answer === "Not now")
+      return { ...concluded, fix: "declined", fixRequest };
+    return yield* call("fix", build_default, {
+      ...fixRequest,
+      ...taskId,
+      ...input.repoBindingId === undefined ? undefined : { repoBindingId: input.repoBindingId }
+    }).pipe(map8((fixed) => ({ ...concluded, fix: "started", changeRequestUrl: fixed.changeRequest.url })), catchTag2("ChildFailed", () => succeed7({ ...concluded, fix: "failed", fixRequest })));
   })
 });
 
-// src/project-update.ts
-var Health2 = Literals(["on_track", "at_risk", "off_track"]);
-var Input7 = Struct({ projectId: String5 });
-var Output8 = Struct({
-  draftId: optional2(String5),
-  health: optional2(Health2)
+// src/plan.ts
+var Input7 = Struct({
+  words: String5,
+  repoBindingId: optional2(String5),
+  branch: optional2(String5),
+  projectId: optional2(String5),
+  implement: optional2(Boolean3)
 });
-var Written = Struct({
-  health: Health2,
-  note: String5,
-  healthReason: optional2(String5)
+var Plan = Struct({
+  title: String5,
+  spec: String5,
+  tickets: PlanTickets,
+  outOfScope: ArraySchema(String5),
+  afterMerge: ArraySchema(String5),
+  docs: optional2(Struct({ title: String5, summary: String5 }))
 });
-var label2 = { on_track: "on track", at_risk: "at risk", off_track: "off track" };
-var day = (iso) => new Date(iso).toLocaleDateString("en-US", { month: "short", day: "numeric", timeZone: "UTC" });
-var prompt3 = (read) => [
-  `Write a Project Update for ${read.project.name} from what happened ${read.since === undefined ? "so far" : `since its last Update on ${day(read.since)}`}.`,
-  "```json",
-  JSON.stringify({ health: read.health, runs: read.runs, taskChanges: read.taskChanges }, null, 2),
-  "```",
-  "Say in a few short paragraphs what moved, what is stuck and what comes next, naming Tasks by key. Suggest a health: on_track, at_risk or off_track.",
-  ...read.health === undefined ? [] : [
-    `The last Update said ${read.health}. If your health differs, give in healthReason one sentence on why, naming the Runs or Tasks that moved it.`
-  ],
-  "A person reviews and posts it, so claim nothing the Runs and Task changes do not show."
+var CriteriaCheck = Struct({
+  alreadyMet: ArraySchema(Struct({ key: String5, criterion: String5 }))
+});
+var Rejected = Struct({ key: String5, reason: String5 });
+var Opinion = Struct({ summary: String5, concerns: ArraySchema(String5) });
+var TicketResult = Struct({
+  key: String5,
+  title: String5,
+  status: Literals(["merged", "failed", "skipped"]),
+  repoBindingId: optional2(String5),
+  changeRequest: optional2(ChangeRequestResult),
+  reason: optional2(String5)
+});
+var Output8 = Struct({
+  title: String5,
+  outOfScope: ArraySchema(String5),
+  afterMerge: ArraySchema(String5),
+  rejected: ArraySchema(Rejected),
+  stopped: optional2(String5),
+  implemented: Boolean3,
+  tickets: ArraySchema(TicketResult),
+  deliveries: ArraySchema(ChangeRequestResult),
+  tasks: optional2(CreateTasksResult.fields.tasks),
+  docs: optional2(ChangeRequestResult)
+});
+var menu = ["Implement now", "File as Tasks", "Second opinion", "Refine", "Finish"];
+var maxRounds = 6;
+var maxOpinionsPerPlan = 2;
+var menuDescriptions = {
+  "Implement now": "Builds the tickets in dependency order and delivers them.",
+  "File as Tasks": "Makes a Task of each ticket, to build later.",
+  "Second opinion": "Another Agent reviews the plan.",
+  Refine: "You say what to change and the planner rewrites it.",
+  Finish: "Ends the Run with the plan as it is."
+};
+var onFailure = ["Retry with a steer", "Skip it and its dependents", "Stop here"];
+var ticketRules = [
+  "Each ticket is one Build: a vertical slice an agent can implement, review and deliver as one ChangeRequest. Give it a short unique key, and list in blockedBy the keys of the tickets whose code it needs; tickets never block each other in a cycle. Set repoBindingId only when it changes another repository than the plan, keep one repository per ticket, and no cycle across repositories. Set outcome to the kind of change: feature, bug, refactor, docs, migration, investigation or performance.",
+  "Each acceptance criterion is something a Build can show before its ChangeRequest: a behaviour a test or a check proves. A text search is never a criterion, nor is something the code already does. Outcomes only visible after merge go under afterMerge, not under a ticket's criteria."
 ].join(`
+
 `);
-var noteOf = (read, written) => {
-  if (read.health === undefined || read.health === written.health)
-    return written.note;
-  const moved = `Health moved from ${label2[read.health]} to ${label2[written.health]}`;
-  return `${written.healthReason === undefined ? `${moved}.` : `${moved}: ${written.healthReason}`}
+var planPrompt = (words) => [
+  `Plan this: ${words}`,
+  "You run the grill-with-docs skill as a Kitman Step. Interview the person with the Kitman MCP ask tool, one question at a time, and ask only what changes what gets built: a clear goal needs no interview. Write the ADR and glossary changes the grilling settles in the checkout, and no other files.",
+  "Then write the spec and the tickets from the goal, the code and the answers.",
+  ticketRules,
+  "List in outOfScope what the plan deliberately leaves out, one item each; each holds the Builds of its tickets.",
+  "If you left ADR or glossary changes, give docs a ChangeRequest title and a summary of the decisions; Kitman opens it. Your Output is the plan, and Kitman stores it."
+].join(`
 
-${written.note}`;
+`);
+var planText = (plan) => [
+  `# ${plan.title}`,
+  plan.spec,
+  ...plan.outOfScope.length === 0 ? [] : ["## Out of scope", plan.outOfScope.map((item) => `- ${item}`).join(`
+`)],
+  ...plan.afterMerge.length === 0 ? [] : ["## After merge", plan.afterMerge.map((item) => `- ${item}`).join(`
+`)],
+  "## Tickets",
+  ...plan.tickets.map(ticketText)
+].join(`
+
+`);
+var ticketText = (ticket) => [
+  `### ${ticket.key}: ${ticket.title}`,
+  ticket.body,
+  ...ticket.acceptanceCriteria.map((criterion) => `- [ ] ${criterion}`),
+  ...ticket.blockedBy.length === 0 ? [] : [`Blocked by: ${ticket.blockedBy.join(", ")}`]
+].join(`
+
+`);
+var opinionPrompt = (plan) => [
+  "Review this plan as a second opinion. Look for missing scope, tickets too big to review, wrong blockers and risks. Change nothing.",
+  planText(plan)
+].join(`
+
+`);
+var refinePrompt = (plan, words) => [`Change the plan as the user asks: ${words}`, ticketRules, planText(plan)].join(`
+
+`);
+var criteriaPrompt2 = (plan) => [
+  "Check each ticket's acceptance criteria against the base branch as it is now. List under alreadyMet each criterion the code already meets, with its ticket's key and the criterion word for word. Change nothing.",
+  planText(plan)
+].join(`
+
+`);
+var guard2 = " (guard: the base already does this)";
+var guarded = (plan, check) => {
+  const met = (ticket, criterion) => check.alreadyMet.some((entry) => entry.key === ticket.key && entry.criterion === criterion);
+  const rejected = plan.tickets.flatMap((ticket) => ticket.acceptanceCriteria.length > 0 && ticket.acceptanceCriteria.every((criterion) => met(ticket, criterion)) ? [{ key: ticket.key, reason: "The base branch already meets every one of its criteria" }] : []);
+  const gone = new Set(rejected.map((entry) => entry.key));
+  const tickets = plan.tickets.flatMap((ticket) => gone.has(ticket.key) ? [] : [
+    {
+      ...ticket,
+      acceptanceCriteria: ticket.acceptanceCriteria.map((criterion) => met(ticket, criterion) ? `${criterion}${guard2}` : criterion),
+      blockedBy: ticket.blockedBy.filter((key) => !gone.has(key))
+    }
+  ]);
+  return { plan: { ...plan, tickets }, rejected };
 };
-var project_update_default = defineLoop({
-  id: "project-update",
-  version: "2.0.1",
-  title: "Project update",
-  input: Input7,
-  output: Output8,
-  agents: { writer: "writer" },
-  checkout: "none",
-  capabilities: ["read_project", "agent_work", "draft_update"],
-  run: ({ projectId }) => gen2(function* () {
-    const read = yield* projectActivity("read", { projectId });
-    if (read.runs.length === 0 && read.taskChanges.length === 0)
-      return {};
-    const written = yield* agentWork("write", { agent: "writer", prompt: prompt3(read), output: Written });
-    const draft = yield* draftUpdate("draft", {
-      projectId,
-      health: written.health,
-      note: noteOf(read, written),
-      writtenFrom: {
-        runs: read.runs.length,
-        taskChanges: read.taskChanges.length,
-        ...read.since === undefined ? undefined : { since: read.since }
-      }
-    });
-    return { draftId: draft.id, health: written.health };
-  })
-});
+var checked = (plan, revision) => map8(agentWork(`criteria-check:${revision}`, { agent: "reviewer", prompt: criteriaPrompt2(plan), output: CriteriaCheck }), (check) => guarded(plan, check));
+var storePlan = (plan, suffix) => gen2(function* () {
+  yield* artifact(`spec${suffix}`, {
+    kind: "plan_spec",
+    title: plan.title,
+    text: plan.spec,
+    data: { outOfScope: [...plan.outOfScope] }
+  });
+  yield* artifact(`tickets${suffix}`, {
+    kind: "plan_tickets",
+    title: `Tickets for ${plan.title}`,
+    text: plan.tickets.map(ticketText).join(`
 
-// src/release.ts
-var Input8 = Struct({
-  tag: optional2(String5),
-  revision: optional2(String5),
-  changeRequestId: optional2(String5),
-  deployTarget: optional2(String5),
-  deployEvent: optional2(String5),
-  deployTimeoutMinutes: optional2(Int)
-});
-var Drafted = Struct({
-  tag: String5,
-  previousTag: optional2(String5),
-  title: String5,
-  notes: String5,
-  changeRequests: ArraySchema(String5)
-});
-var Output9 = Struct({
-  status: Literals([
-    "gate_failed",
-    "not_mergeable",
-    "rejected",
-    "deployed",
-    "rolled_back",
-    "deploy_failed",
-    "timed_out"
-  ]),
-  reason: String5,
-  tag: optional2(String5),
-  notesArtifactId: optional2(String5),
-  revision: optional2(String5),
-  url: optional2(String5)
+`),
+    data: plan.tickets.map(({ repoBindingId, outcome, ...ticket }) => ({
+      ...ticket,
+      acceptanceCriteria: [...ticket.acceptanceCriteria],
+      blockedBy: [...ticket.blockedBy],
+      ...repoBindingId === undefined ? undefined : { repoBindingId },
+      ...outcome === undefined ? undefined : { outcome }
+    }))
+  });
 });
-var draftPrompt = (tag, changeRequestId) => [
-  "Draft the release notes for the ChangeRequests merged since the last release tag on the base branch, including those with no linked Task.",
-  ...changeRequestId === undefined ? [] : [`The release ChangeRequest ${changeRequestId} is part of it.`],
-  "Group them by what a user of the software notices, and name each ChangeRequest you cover.",
-  tag === undefined ? "Propose the next version tag, following the scheme earlier tags use. With no earlier tag, propose v0.1.0 and say so in the notes." : `The release is tagged ${tag}.`,
-  "Give the latest earlier release tag as previousTag, or leave it out when there is none."
+var changelog = (before, after, words) => {
+  const was = new Map(before.tickets.map((ticket) => [ticket.key, ticketText(ticket)]));
+  const now = new Map(after.tickets.map((ticket) => [ticket.key, ticketText(ticket)]));
+  const lines = [
+    ...after.tickets.filter((ticket) => !was.has(ticket.key)).map((ticket) => `- Added ${ticket.key}: ${ticket.title}`),
+    ...before.tickets.filter((ticket) => !now.has(ticket.key)).map((ticket) => `- Removed ${ticket.key}: ${ticket.title}`),
+    ...after.tickets.filter((ticket) => was.has(ticket.key) && was.get(ticket.key) !== now.get(ticket.key)).map((ticket) => `- Changed ${ticket.key}: ${ticket.title}`),
+    ...before.spec === after.spec ? [] : ["- Changed the spec"],
+    ...before.title === after.title ? [] : [`- Renamed the plan from "${before.title}"`]
+  ];
+  return [`Asked: ${words}`, ...lines.length === 0 ? ["Nothing changed."] : lines].join(`
+`);
+};
+var buildWords = (ticket) => [
+  ticket.title,
+  ticket.body,
+  ...ticket.acceptanceCriteria.length === 0 ? [] : ["Acceptance criteria:", ...ticket.acceptanceCriteria.map((criterion) => `- ${criterion}`)]
 ].join(`
 
 `);
-var redraftPrompt = (drafted, edit) => [
-  "Redraft these release notes as asked, keeping the tag and everything not mentioned.",
-  `Asked: ${edit}`,
-  "```json",
-  JSON.stringify(drafted, null, 2),
-  "```"
-].join(`
+var settled = (ticket, result) => ({
+  key: ticket.key,
+  title: ticket.title,
+  ...result
+});
+var buildTicket = (ticket, start, taskId, retry) => gen2(function* () {
+  let head = start;
+  const name = retry === undefined ? ticket.key : `${ticket.key}:${retry.label}`;
+  for (let attempt = 1;; attempt++) {
+    const suffix = attempt === 1 ? "" : `:${attempt}`;
+    const words = retry === undefined ? taskId === undefined ? { words: buildWords(ticket) } : undefined : { words: `${buildWords(ticket)}
 
-`);
-var readyToMerge = (changeRequestId, round = 1) => gen2(function* () {
-  for (let pass = 1;; pass++) {
-    const at = (name) => {
-      const named = pass === 1 ? name : `${name}:moved:${pass}`;
-      return round === 1 ? named : `${named}:${round}`;
-    };
-    let read = yield* pipelineStatus(at("gate"), { changeRequestId });
-    for (let look = 1;look <= 10 && (read.status === "running" || read.status === "none"); look++) {
-      const again = (name) => at(look === 1 ? name : `${name}:${look}`);
-      yield* pipelineMoved(again("gate:pipeline"), changeRequestId, read);
-      read = yield* pipelineStatus(again("gate:after"), { changeRequestId });
-    }
-    if (read.status !== "success") {
-      const failing = read.jobs.filter((job) => job.status === "failed").map((job) => job.name);
-      return {
-        status: "gate_failed",
-        reason: `The pipeline at ${read.head} is ${read.status}${failing.length === 0 ? "" : `: ${failing.join(", ")}`}`,
-        revision: read.head
-      };
-    }
-    const approved = yield* waitFor(at("approved"), {
-      event: "change_request.approval",
-      filter: { changeRequestId, approved: true, head: read.head },
-      timeout: "7 days",
-      or: read.readAt === undefined ? [] : [{ event: "change_request.pipeline", filter: { changeRequestId }, since: read.readAt }]
+An earlier Build of this failed. ${retry.steer}` };
+    const built = yield* call(`build:${name}${suffix}`, build_default, {
+      ...words,
+      ...taskId === undefined ? undefined : { taskId },
+      repoBindingId: head.repoBindingId,
+      branch: head.branch,
+      revision: head.revision,
+      land: false
+    }).pipe(catchTag2("ChildFailed", (failure) => succeed7(failure)));
+    if (built instanceof ChildFailed)
+      return settled(ticket, { status: "failed", repoBindingId: head.repoBindingId, reason: built.reason });
+    const merged = yield* mergeChangeRequest(`merge:${name}${suffix}`, {
+      changeRequestId: built.changeRequest.id,
+      head: built.revision
     });
-    if (approved.type !== "change_request.approval") {
-      if (pass >= 10)
-        return {
-          status: "not_mergeable",
-          reason: `ChangeRequest ${changeRequestId} kept moving while it awaited approval`
-        };
-      continue;
-    }
-    const mergeable = yield* waitFor(at("mergeable"), {
-      event: "change_request.mergeable",
-      filter: { changeRequestId },
+    const delivered = { repoBindingId: head.repoBindingId, changeRequest: built.changeRequest };
+    if (merged.status === "merged")
+      return settled(ticket, { status: "merged", ...delivered });
+    const choice = yield* ask(`conflict:${name}${suffix}`, {
+      prompt: `The ChangeRequest for ${ticket.key} (${built.changeRequest.url}) ${merged.status === "moved" ? "changed after it was built" : `conflicts with ${head.branch}`}. Rebuild ${ticket.key} on the integration branch as it is now, or skip it and the tickets it blocks?`,
+      options: [
+        {
+          value: "Rebuild on the integration branch",
+          description: "Builds the ticket again from the branch as it is now."
+        },
+        { value: "Skip", description: "Leaves it and the tickets it blocks undelivered." }
+      ],
+      recommended: "Rebuild on the integration branch",
+      recommendationReason: "A rebuild on the current branch usually resolves a conflict, and skipping also drops every ticket it blocks.",
+      default: "Skip",
       timeout: "1 hour"
     });
-    if (mergeable.payload.mergeable === false)
-      return {
-        status: "not_mergeable",
-        reason: `ChangeRequest ${changeRequestId} does not merge cleanly; bring it up to date first`
-      };
-    return { passed: read.head };
-  }
-}).pipe(catchTags2({
-  WaitTimedOut: (timedOut) => succeed7({
-    status: "not_mergeable",
-    reason: `Nothing happened on ChangeRequest ${changeRequestId} while waiting for ${timedOut.event}`
-  }),
-  ChangeRequestClosed: (closed) => succeed7({
-    status: "not_mergeable",
-    reason: `ChangeRequest ${changeRequestId} was ${closed.merged ? "merged" : "closed"} before Kitman released it`
-  })
-}));
-var recovery = (previous) => previous === undefined ? ["Retry the deploy", "Leave it"] : ["Retry the deploy", `Roll back to ${previous}`, "Leave it"];
-var release_default = defineLoop({
-  id: "release",
-  version: "2.0.0",
-  title: "Release",
-  input: Input8,
-  output: Output9,
-  agents: { releaser: "releaser" },
-  checkout: "read",
-  capabilities: [
-    "agent_work",
-    "ask",
-    "verify",
-    "claim",
-    "publish_release",
-    "read_change_request",
-    "merge_change_request"
-  ],
-  run: (input) => gen2(function* () {
-    const changeRequestId = input.changeRequestId;
-    let gated;
-    if (changeRequestId === undefined) {
-      const gate = yield* verify("gate", input.revision === undefined ? {} : { revision: input.revision });
-      if (!gate.passed) {
-        const failing = gate.checks.filter((check) => check.status !== "passed").map((check) => check.name);
-        return {
-          status: "gate_failed",
-          reason: `The checks fail at ${gate.revision}: ${failing.join(", ")}`,
-          revision: gate.revision
-        };
-      }
-      gated = gate.revision;
-    } else {
-      const ready = yield* readyToMerge(changeRequestId);
-      if (!("passed" in ready))
-        return ready;
-      gated = ready.passed;
-    }
-    let drafted = yield* agentWork("draft-notes", {
-      agent: "releaser",
-      prompt: draftPrompt(input.tag, changeRequestId),
-      output: Drafted
+    if (choice === "Skip")
+      return settled(ticket, { status: "failed", ...delivered, reason: `It conflicted with ${head.branch}` });
+    head = yield* integrationBranch(`rebuild-from:${name}:${attempt + 1}`, {
+      repoBindingId: head.repoBindingId
     });
-    const tag = input.tag ?? drafted.tag;
-    for (let round = 1;; round++) {
-      const answer = yield* ask(round === 1 ? "approve" : `approve:${round}`, {
-        prompt: `Release ${tag} with these notes?
+  }
+});
+var deliveryBody = (plan, results) => {
+  const line = (result) => result.status === "merged" && result.changeRequest !== undefined ? `- **${result.key}** [${result.title}](${result.changeRequest.url}); its evidence is on that ChangeRequest` : `- **${result.key}** ${result.title}: ${result.reason ?? result.status}`;
+  const section = (title, status) => {
+    const lines = results.flatMap((result) => result.status === status ? [line(result)] : []);
+    return lines.length === 0 ? [] : [`## ${title}`, lines.join(`
+`)];
+  };
+  return [
+    `Delivers the plan "${plan.title}".`,
+    ...section("Merged", "merged"),
+    ...section("Failed", "failed"),
+    ...section("Skipped", "skipped")
+  ].join(`
 
-${drafted.notes}`,
-        options: [
-          { value: "Approve", description: "Tags, publishes and deploys it." },
-          { value: "Edit notes", description: "Say what to change; the notes are redrafted." },
-          { value: "Reject", description: "Keeps the draft and releases nothing." }
-        ],
-        recommended: "Approve",
-        recommendationReason: "The release is proved: its checks pass, or its ChangeRequest is green, approved and mergeable.",
-        default: null
-      });
-      if (answer === "Approve")
-        break;
-      if (answer === "Reject") {
-        const why = yield* ask("reject-why", {
-          prompt: `Why not release ${tag}? The draft is kept.`,
-          freeText: true,
-          informationOnly: true,
-          recommendationReason: "Only you know why you rejected it.",
-          default: "No reason given",
-          timeout: "1 day"
-        });
-        const kept = yield* artifact("notes", {
-          kind: "release_notes",
-          title: drafted.title,
-          text: drafted.notes,
-          data: { tag, changeRequests: drafted.changeRequests }
-        });
-        return { status: "rejected", reason: why, tag, notesArtifactId: kept.artifactId };
-      }
-      const edit = yield* ask(`edit:${round}`, {
-        prompt: "What should change in the notes?",
-        freeText: true,
-        informationOnly: true,
-        recommendationReason: "You chose to edit them, so only you know what should change.",
-        default: "",
-        timeout: "1 day"
-      });
-      if (edit.trim() === "")
-        continue;
-      drafted = yield* agentWork(`redraft:${round}`, {
-        agent: "releaser",
-        prompt: redraftPrompt(drafted, edit),
-        output: Drafted
-      });
+`);
+};
+var implement = (input, plan, revision, filed) => gen2(function* () {
+  const tasks = filed?.revision === revision ? filed.tasks : (yield* createTasks("tasks", {
+    tickets: plan.tickets,
+    ...input.projectId === undefined ? undefined : { projectId: input.projectId }
+  })).tasks;
+  const taskOf = new Map(tasks.map((task) => [task.key, task.taskId]));
+  const results = new Map;
+  const waves = yield* planWaves(plan.tickets);
+  let stopped;
+  for (const [index, wave] of waves.entries()) {
+    const ready = [];
+    for (const ticket of wave) {
+      const unmerged = ticket.blockedBy.find((key) => results.get(key)?.status !== "merged");
+      if (stopped !== undefined)
+        results.set(ticket.key, settled(ticket, { status: "skipped", reason: stopped }));
+      else if (unmerged === undefined)
+        ready.push(ticket);
+      else
+        results.set(ticket.key, settled(ticket, { status: "skipped", reason: `blocked by ${unmerged}, which was not merged` }));
     }
-    const notes = yield* artifact("notes", {
-      kind: "release_notes",
-      title: drafted.title,
-      text: drafted.notes,
-      data: { tag, changeRequests: drafted.changeRequests }
-    });
-    let revision = gated;
-    if (changeRequestId !== undefined) {
-      for (let round = 1;; round++) {
-        const merged = yield* mergeChangeRequest(round === 1 ? "merge" : `merge:${round}`, {
-          changeRequestId,
-          head: gated
+    const repoOf = (ticket) => ticket.repoBindingId ?? input.repoBindingId;
+    const heads = new Map;
+    for (const repo of new Set(ready.map(repoOf)))
+      heads.set(repo, yield* integrationBranch(`integration:wave-${index + 1}:${repo ?? "default"}`, repo === undefined ? {} : { repoBindingId: repo }));
+    const built = yield* forEach2(ready.flatMap((ticket) => {
+      const head = heads.get(repoOf(ticket));
+      return head === undefined ? [] : [buildTicket(ticket, head, taskOf.get(ticket.key))];
+    }), (building) => building, { concurrency: "unbounded" });
+    for (const first of built) {
+      const ticket = ready.find((entry) => entry.key === first.key);
+      let result = first;
+      for (let retry = 1;ticket !== undefined && result.status === "failed" && stopped === undefined; retry++) {
+        const choice = yield* ask(`failed:${ticket.key}:${retry}`, {
+          prompt: `The Build of ${ticket.key} failed: ${result.reason ?? "no reason given"}. Retry it with a steer, skip it and the tickets it blocks, or stop here?`,
+          options: onFailure,
+          recommended: "Retry with a steer",
+          recommendationReason: "The reason it failed is above, so a steer can aim the retry at it; skipping also drops the tickets it blocks.",
+          default: "Skip it and its dependents",
+          timeout: "1 hour"
         });
-        if (merged.status === "conflict")
-          return {
-            status: "not_mergeable",
-            reason: `ChangeRequest ${changeRequestId} no longer merges cleanly`,
-            tag,
-            notesArtifactId: notes.artifactId
-          };
-        if (merged.status === "merged") {
-          revision = merged.revision;
+        if (choice === "Skip it and its dependents")
+          break;
+        if (choice === "Stop here") {
+          stopped = `Stopped after ${ticket.key} failed`;
           break;
         }
-        if (round >= 3)
-          return {
-            status: "not_mergeable",
-            reason: `ChangeRequest ${changeRequestId} kept moving while it was gated; it is at ${merged.head}`,
-            tag,
-            notesArtifactId: notes.artifactId
-          };
-        const ready = yield* readyToMerge(changeRequestId, round + 1);
-        if (!("passed" in ready))
-          return { ...ready, tag, notesArtifactId: notes.artifactId };
-        gated = ready.passed;
+        const steer = yield* ask(`steer:${ticket.key}:${retry}`, {
+          prompt: `What should the retry of ${ticket.key} do differently?`,
+          freeText: true,
+          recommended: `Address the failure: ${result.reason ?? "find out why it failed first"}`,
+          recommendationReason: "Pointing the retry at the reason it failed is the least a steer should do.",
+          default: null
+        });
+        const head = yield* integrationBranch(`integration:${ticket.key}:retry-${retry}`, {
+          ...repoOf(ticket) === undefined ? undefined : { repoBindingId: repoOf(ticket) }
+        });
+        result = yield* buildTicket(ticket, head, taskOf.get(ticket.key), { label: `retry-${retry}`, steer });
       }
+      results.set(result.key, result);
     }
-    const deployEvent = input.deployEvent ?? "deploy";
-    yield* claim("deploy-target", { resource: `deploy:${input.deployTarget ?? deployEvent}` });
-    const released = yield* release2("tag", {
-      tag,
-      revision,
-      title: drafted.title,
-      notes: drafted.notes
+  }
+  const ordered = plan.tickets.flatMap((ticket) => results.get(ticket.key) ?? []);
+  const repos = [
+    ...new Set(ordered.flatMap((result) => result.status === "merged" ? result.repoBindingId ?? [] : []))
+  ];
+  const deliveries = yield* forEach2(repos, (repo) => changeRequest(`deliver:${repo}`, {
+    title: plan.title,
+    body: deliveryBody(plan, ordered.filter((result) => result.repoBindingId === repo || result.repoBindingId === undefined)),
+    integration: repo
+  }));
+  return { tickets: ordered, deliveries, tasks, ...stopped === undefined ? undefined : { stopped } };
+});
+var plan_default = defineLoop({
+  id: "plan",
+  version: "2.0.0",
+  title: "Plan",
+  input: Input7,
+  output: Output8,
+  agents: { planner: "planner", reviewer: "reviewer" },
+  checkout: "write",
+  capabilities: [
+    "agent_work",
+    "ask",
+    "call",
+    "verify",
+    "change_request",
+    "write_back",
+    "create_tasks",
+    "merge_change_request",
+    "read_change_request",
+    "post_comment"
+  ],
+  calls: () => [build_default],
+  run: (input) => gen2(function* () {
+    const drafted = yield* agentWorkOnce("plan", {
+      agent: "planner",
+      skill: "grill-with-docs",
+      prompt: planPrompt(input.words),
+      output: Plan
     });
-    const deployed = (step, deployTag) => waitFor(step, {
-      event: deployEvent,
-      filter: { tag: deployTag },
-      timeout: `${input.deployTimeoutMinutes ?? 60} minutes`
-    }).pipe(map8((deploy) => deploy.payload.status === "failed" ? "deploy_failed" : "deployed"), catchTag2("WaitTimedOut", () => succeed7("timed_out")));
-    const settled = { tag, notesArtifactId: notes.artifactId, revision: released.revision, url: released.url };
-    let status = yield* deployed("deploy", tag);
-    for (let round = 1;status !== "deployed"; round++) {
-      const options = recovery(drafted.previousTag);
-      const answer = yield* ask(`recover:${round}`, {
-        prompt: `${tag} ${status === "timed_out" ? "did not report a deploy in time" : "failed to deploy"}. What now?`,
-        options,
-        recommended: "Retry the deploy",
-        recommendationReason: "A failed or late deploy is often passing, and a retry runs only the failed jobs of the same tag.",
-        default: "Leave it",
+    const docs = drafted.docs === undefined ? undefined : yield* changeRequest("docs", { title: drafted.docs.title, body: drafted.docs.summary });
+    let revision = 1;
+    let { plan, rejected } = yield* checked(drafted, revision);
+    let filed;
+    let opinions = 0;
+    yield* storePlan(plan, "");
+    const project = input.projectId === undefined ? undefined : { projectId: input.projectId };
+    const ended = (rest) => ({
+      title: plan.title,
+      outOfScope: plan.outOfScope,
+      afterMerge: plan.afterMerge,
+      rejected,
+      tickets: [],
+      deliveries: [],
+      ...filed === undefined ? undefined : { tasks: filed.tasks },
+      ...docs === undefined ? undefined : { docs },
+      ...rest
+    });
+    for (let round = 1;round <= maxRounds; round++) {
+      const isFiled = filed?.revision === revision;
+      const options = menu.filter((option) => !(option === "File as Tasks" && isFiled) && !(option === "Second opinion" && opinions >= maxOpinionsPerPlan));
+      const fallback = input.implement === true ? "Implement now" : isFiled ? "Finish" : "File as Tasks";
+      const answer = yield* ask(`next:${round}`, {
+        prompt: `What next for the plan "${plan.title}"?`,
+        options: options.map((option) => ({ value: option, description: menuDescriptions[option] })),
+        recommended: fallback,
+        recommendationReason: fallback === "Implement now" ? "You asked for the plan to be implemented." : fallback === "Finish" ? "The plan is filed as Tasks, so nothing is lost by finishing." : "Filing keeps the plan as Tasks a person or a Build can pick up later.",
+        default: fallback,
         timeout: "1 hour"
       });
-      if (answer === "Leave it")
-        return { status, reason: `${tag} at ${released.revision} was left undeployed`, ...settled };
-      if (answer === "Retry the deploy") {
-        yield* rerunPipeline(`deploy:rerun-${round}`, { ref: tag });
-        status = yield* deployed(`deploy:retry-${round}`, tag);
-        continue;
+      const choice = menu.find((option) => option === answer) ?? fallback;
+      switch (choice) {
+        case "Finish":
+          return ended({ implemented: false });
+        case "Implement now": {
+          const delivered = yield* implement(input, plan, revision, filed);
+          return { ...ended({ implemented: true }), ...delivered };
+        }
+        case "File as Tasks": {
+          const made = yield* createTasks(`file-tasks:${round}`, { tickets: plan.tickets, ...project });
+          filed = { revision, tasks: made.tasks };
+          break;
+        }
+        case "Second opinion": {
+          opinions++;
+          const opinion = yield* agentWork(`second-opinion:${round}`, {
+            agent: "reviewer",
+            prompt: opinionPrompt(plan),
+            output: Opinion
+          });
+          yield* artifact(`opinion:${round}`, {
+            kind: "plan_review",
+            title: `Second opinion on ${plan.title}`,
+            text: [opinion.summary, ...opinion.concerns.map((concern) => `- ${concern}`)].join(`
+
+`)
+          });
+          break;
+        }
+        case "Refine": {
+          const words = yield* ask(`refine:${round}`, {
+            prompt: "What should change in the plan?",
+            freeText: true,
+            informationOnly: true,
+            recommendationReason: "You chose to refine it, so only you know what should change."
+          });
+          const refined = yield* agentWorkOnce(`refine-plan:${round}`, {
+            agent: "planner",
+            prompt: refinePrompt(plan, words),
+            output: Plan
+          });
+          const before = plan;
+          revision++;
+          ({ plan, rejected } = yield* checked(refined, revision));
+          yield* storePlan(plan, `:${round}`);
+          yield* artifact(`changes:${round}`, {
+            kind: "plan_changes",
+            title: `Revision ${revision} of ${plan.title}`,
+            text: changelog(before, plan, words)
+          });
+          break;
+        }
       }
-      const previous = drafted.previousTag ?? tag;
-      yield* rerunPipeline(`deploy:redeploy-${round}`, { ref: previous, all: true });
-      const back = yield* deployed(`deploy:rollback-${round}`, previous);
-      if (back === "deployed")
-        return { status: "rolled_back", reason: `Rolled back to ${previous}`, ...settled };
-      status = back;
     }
-    yield* artifact("report", {
-      kind: "release_report",
-      title: `${tag} deployed`,
-      text: `${tag} at ${released.revision} deployed. ${released.url}`,
-      data: { tag, status, revision: released.revision, url: released.url }
+    if (filed?.revision !== revision)
+      filed = {
+        revision,
+        tasks: (yield* createTasks("file-tasks:last", { tickets: plan.tickets, ...project })).tasks
+      };
+    return ended({
+      implemented: false,
+      stopped: `No decision after ${maxRounds} rounds, so the tickets are filed as Tasks for a person to pick up`
     });
-    return { status: "deployed", reason: `${tag} deployed`, ...settled };
+  })
+});
+
+// src/project-update.ts
+var Health2 = Literals(["on_track", "at_risk", "off_track"]);
+var Input8 = Struct({ projectId: String5 });
+var Output9 = Struct({
+  draftId: optional2(String5),
+  health: optional2(Health2)
+});
+var Written = Struct({
+  health: Health2,
+  note: String5,
+  healthReason: optional2(String5)
+});
+var label2 = { on_track: "on track", at_risk: "at risk", off_track: "off track" };
+var day = (iso) => new Date(iso).toLocaleDateString("en-US", { month: "short", day: "numeric", timeZone: "UTC" });
+var prompt3 = (read) => [
+  `Write a Project Update for ${read.project.name} from what happened ${read.since === undefined ? "so far" : `since its last Update on ${day(read.since)}`}.`,
+  "```json",
+  JSON.stringify({ health: read.health, runs: read.runs, taskChanges: read.taskChanges }, null, 2),
+  "```",
+  "Say in a few short paragraphs what moved, what is stuck and what comes next, naming Tasks by key. Suggest a health: on_track, at_risk or off_track.",
+  ...read.health === undefined ? [] : [
+    `The last Update said ${read.health}. If your health differs, give in healthReason one sentence on why, naming the Runs or Tasks that moved it.`
+  ],
+  "A person reviews and posts it, so claim nothing the Runs and Task changes do not show."
+].join(`
+`);
+var noteOf = (read, written) => {
+  if (read.health === undefined || read.health === written.health)
+    return written.note;
+  const moved = `Health moved from ${label2[read.health]} to ${label2[written.health]}`;
+  return `${written.healthReason === undefined ? `${moved}.` : `${moved}: ${written.healthReason}`}
+
+${written.note}`;
+};
+var project_update_default = defineLoop({
+  id: "project-update",
+  version: "2.0.1",
+  title: "Project update",
+  input: Input8,
+  output: Output9,
+  agents: { writer: "writer" },
+  checkout: "none",
+  capabilities: ["read_project", "agent_work", "draft_update"],
+  run: ({ projectId }) => gen2(function* () {
+    const read = yield* projectActivity("read", { projectId });
+    if (read.runs.length === 0 && read.taskChanges.length === 0)
+      return {};
+    const written = yield* agentWork("write", { agent: "writer", prompt: prompt3(read), output: Written });
+    const draft = yield* draftUpdate("draft", {
+      projectId,
+      health: written.health,
+      note: noteOf(read, written),
+      writtenFrom: {
+        runs: read.runs.length,
+        taskChanges: read.taskChanges.length,
+        ...read.since === undefined ? undefined : { since: read.since }
+      }
+    });
+    return { draftId: draft.id, health: written.health };
   })
 });
 
@@ -23638,6 +23728,11 @@ var kitman_config_default = defineKit({
       skills: ["git-workflow-and-versioning", "shipping-and-launch"],
       instructions: { file: "agents/releaser.md" }
     },
+    deployer: {
+      effort: "low",
+      fallbacks,
+      instructions: { file: "agents/deployer.md" }
+    },
     investigator: {
       effort: "high",
       fallbacks,
@@ -26265,6 +26360,7 @@ class RunnerCapabilityRpcs extends make30(make29("PutQuestion", {
     informationOnly: optional2(Boolean3),
     verification: optional2(SuggestedVerification),
     default: optional2(String5),
+    auto: optional2(String5),
     timeoutMillis: optional2(Finite),
     deferredName: String5
   },
@@ -26776,6 +26872,7 @@ var runnerHost = (capabilities) => ({
     ...launch.options === undefined ? undefined : { options: launch.options },
     ...launch.verification === undefined ? undefined : { verification: launch.verification },
     ...launch.default === undefined ? undefined : { default: launch.default },
+    ...launch.auto === undefined ? undefined : { auto: launch.auto },
     ...launch.timeoutMillis === undefined ? undefined : { timeoutMillis: launch.timeoutMillis }
   })).pipe(asVoid2),
   startVerification: (launch) => requested(launch.step, capabilities.startVerification({
@@ -26997,6 +27094,7 @@ var rpcProgramPorts = (rpc, work) => {
       ...question.options === undefined ? undefined : { options: [...question.options] },
       ...question.verification === undefined ? undefined : { verification: question.verification },
       ...question.default === undefined ? undefined : { default: question.default },
+      ...question.auto === undefined ? undefined : { auto: question.auto },
       ...question.timeoutMillis === undefined ? undefined : { timeoutMillis: question.timeoutMillis }
     }),
     startVerification: (verification) => rpc.startVerification({
@@ -29298,4 +29396,4 @@ var runKit = (config, identity, packages) => {
   runMain2(program.pipe(flatMap3((code) => sync2(() => process.exit(code)))));
 };
 // .kitman-build-entry.ts
-runKit(kitman_config_default, { name: "@kitman-sh/software-engineering", version: "0.10.57" }, []);
+runKit(kitman_config_default, { name: "@kitman-sh/software-engineering", version: "0.10.59" }, []);