@joshuafolkken/kit 1.1136.0 → 1.1178.0

package/dist/hooks/{chunk-JKKTVDAG.js → chunk-GDS5N2KB.js}

@@ -1,20 +1,33 @@
 import {
   lane_child_marker,
   run_issue_number
-} from "./chunk-NFZGFGOR.js";
+} from "./chunk-32GQTL4F.js";
 import {
+  CHECK_STATUS_FAIL,
+  CHECK_STATUS_PENDING,
   PLATFORM_TEMP_ROOT,
+  PrConflictError,
+  blocking_issue_schema,
   cost_blocks,
   cost_transcript,
   cost_usage,
+  describe_pr_failure,
+  evaluate_pr_state,
   file_reader,
+  is_coderabbit_check,
+  is_merge_conflict,
+  is_required_check,
+  is_review_decision_decisive,
   json_value,
   lane_paths,
+  parse_pr_state_snapshot,
+  read_string,
+  rest_comment_schema,
   stamp_file,
   time_density_hook,
   time_shell,
   time_transcript_line
-} from "./chunk-GDU26K3J.js";
+} from "./chunk-S6X6WYKR.js";
 import {
   ENV_FILE_NAME,
   LANE_SEAT_KEY,
@@ -147,7 +160,7 @@ function turn_filing_count(tail) {
 function decide(_call, run3) {
   return prior_filing_count(time_density_hook.read_tail(run3.transcript)) >= CAP_REACHED;
 }
-var FILING_CAP_REASON = `\u26D4 filing cap: this run has already filed ${String(FILING_CAP)} Issues, the per-run ceiling \u2014 on reaching it, stop and report rather than filing more. Automatic filing is capped so a run cannot manufacture Issues faster than they can be closed (\`.claude/skills/workflow-commands/SKILL.md\` \u2192 \xA72d, \`observation-filing.md\`). A further Issue that genuinely must exist is a person's call, not this run's. **This rule fires on every filing past the cap, not once per run**, so reissuing the same filing will be refused again.`;
+var FILING_CAP_REASON = `\u26D4 filing cap: this run has already filed ${String(FILING_CAP)} Issues, the per-run ceiling \u2014 on reaching it, stop and report rather than filing more. Automatic filing is capped so a run cannot manufacture Issues faster than they can be closed (\`.claude/skills/workflow-commands/SKILL.md\` \u2192 \`prerequisite.md\`, \`observation-filing.md\`). A further Issue that genuinely must exist is a person's call, not this run's. **This rule fires on every filing past the cap, not once per run**, so reissuing the same filing will be refused again.`;
 var ROW = {
   id: "filing-cap",
   is_trigger: bash_triggers.on_bash_command(bash_triggers.is_issue_filing),
@@ -168,6 +181,7 @@ import { platform } from "node:os";
 var GIT_COMMAND_UNIX = "/usr/bin/git";
 var PORCELAIN_FLAG = "--porcelain";
 var UNTRACKED_FILES_FLAG = "--untracked-files=all";
+var GIT_BINARY_KEY = "JOSH_GIT_BINARY";
 function get_git_command() {
   if (platform() === "win32") {
     return String.raw`"C:\Program Files\Git\cmd\git.exe"`;
@@ -175,6 +189,8 @@ function get_git_command() {
   return GIT_COMMAND_UNIX;
 }
 function get_git_command_for_spawn() {
+  const binary = process.env[GIT_BINARY_KEY];
+  if (binary !== void 0 && binary !== "") return binary;
   if (platform() === "win32") {
     return String.raw`C:\Program Files\Git\cmd\git.exe`;
   }
@@ -1319,7 +1335,6 @@ var context_cut_payback = {
 
 // scripts/cost-runtime/context-cut-threshold.ts
 var CONTEXT_CUT_THRESHOLD = context_cut_payback.break_even_context();
-var RECENT_REQUEST_WINDOW = 10;
 
 // scripts/git/git-common-directory.ts
 import { execFileSync } from "node:child_process";
@@ -1415,6 +1430,7 @@ var STAGE = {
   PREFLIGHT: "preflight",
   REVIEW: "review",
   GATE: "gate",
+  SYNC: "sync",
   COMMIT: "commit",
   ROUND_TWO: "round-2",
   FOLLOWUP: "followup",
@@ -1464,6 +1480,9 @@ var DONE_BY = {
   // the recorded round, and only a commit pins the tree that round read.
   [STAGE.REVIEW]: (_done, state) => state.is_merged || state.is_committed,
   [STAGE.GATE]: (_done, state) => state.is_merged || state.is_committed,
+  // The merge of the default branch before the commit (joshuafolkken/kit#3221): once committed, a
+  // conflicting pull request is the followup's to merge again.
+  [STAGE.SYNC]: (_done, state) => state.is_merged || state.is_committed,
   [STAGE.COMMIT]: (done, state) => state.is_merged || done.has(STAGE.COMMIT) && is_shipped(state),
   // The round-2 pass (joshuafolkken/kit#2489) reads the pushed fix delta, so its record is honored only
   // while that push still stands — new work pushed on top reruns it.
@@ -1484,6 +1503,10 @@ function commit_flags(state) {
 function event_text(issue, stage, phase) {
   return `#${issue} ${stage} ${phase}`;
 }
+var CONFLICT = "conflict";
+function stop_reason2(stage, conflicts = []) {
+  return conflicts.length > 0 ? CONFLICT : stage;
+}
 var run_ship_stage = {
   PHASE,
   STAGE,
@@ -1493,7 +1516,8 @@ var run_ship_stage = {
   is_done,
   mark_done,
   read_done,
-  record_path
+  record_path,
+  stop_reason: stop_reason2
 };
 
 // scripts/run/run-ship-next.ts
@@ -1534,12 +1558,18 @@ var AFTER_FIX = {
   [STAGE2.PREFLIGHT]: detach_as_started,
   [STAGE2.REVIEW]: detach_as_started,
   [STAGE2.GATE]: detach_as_started,
+  [STAGE2.SYNC]: detach_as_started,
   [STAGE2.COMMIT]: detach_as_started,
   [STAGE2.ROUND_TWO]: detach_again,
   [STAGE2.FOLLOWUP]: detach_again,
   [STAGE2.REPORT]: detach_again
 };
+function conflict_step(conflicts) {
+  return `Resolve the conflict with origin/main in ${conflicts.join(", ")} (the merge is left in progress: remove the conflict markers in those files), then`;
+}
 function next_step(issue, stage, resume) {
+  const conflicts = resume.conflicts ?? [];
+  if (conflicts.length > 0) return `${conflict_step(conflicts)} ${AFTER_FIX[stage](resume)}`;
   return `Read the stopped report with \`${COMMAND.LOG} ${issue}\`, fix the ${stage} failure, then ${AFTER_FIX[stage](resume)}`;
 }
 var run_ship_next = { COMMAND, next_step, quoted, resume_of };
@@ -1594,6 +1624,11 @@ var REMAINING_LABEL = "Remaining";
 var UNTOUCHED_LABEL = "Deliberately untouched";
 var INSTRUCTION_LABEL = "Instruction (verbatim)";
 var EMPTY_LIST_NOTE = "(none)";
+function describe_key(key2) {
+  const value = handoff_schema.shape[key2] instanceof z4.ZodArray ? '["\u2026"]' : '"\u2026"';
+  return `"${key2}": ${value}`;
+}
+var HANDOFF_FORMAT = `a JSON object {${handoff_schema.keyof().options.map((key2) => describe_key(key2)).join(", ")}}`;
 function parse_handoff(raw) {
   try {
     const parsed = handoff_schema.safeParse(JSON.parse(raw));
@@ -1619,7 +1654,10 @@ function load_handoff(handoff_path, max_bytes) {
   if (handoff_path === void 0) return { kind: "ok", handoff: void 0 };
   const handoff = read_handoff_file(handoff_path);
   if (handoff === void 0) {
-    return { kind: "bad", note: `--handoff ${handoff_path} is not a readable handoff file` };
+    return {
+      kind: "bad",
+      note: `--handoff ${handoff_path} is not a readable handoff file \u2014 write ${HANDOFF_FORMAT}`
+    };
   }
   if (!is_within_bound(handoff, max_bytes)) {
     return { kind: "bad", note: `--handoff ${handoff_path} is too large to carry across the cut` };
@@ -1642,6 +1680,7 @@ ${handoff.instruction}`,
   ].join("\n\n");
 }
 var run_cut_handoff = {
+  HANDOFF_FORMAT,
   describe_handoff,
   handoff_schema,
   is_complete_handoff,
@@ -1899,24 +1938,47 @@ var run_tail = {
 };
 
 // scripts/rules/lane-background.ts
-var LONG_RUNNING_COMMANDS = new Set(
-  ["gate", "git", "followup", "ship"].map((name) => `${time_shell.JOSH_PREFIX}${name}`)
-);
+var SHIP_COMMAND = `${time_shell.JOSH_PREFIX}ship`;
+var LONG_RUNNING_COMMANDS = /* @__PURE__ */ new Set([
+  ...["gate", "git", "followup"].map((name) => `${time_shell.JOSH_PREFIX}${name}`),
+  SHIP_COMMAND
+]);
 var BACKGROUND_KEY2 = "run_in_background";
+var TIMEOUT_KEY = "timeout";
+var FOREGROUND_TIMEOUT_MS = 6e5;
 function is_backgrounded2(input) {
   return json_value.is_record(input) && input[BACKGROUND_KEY2] === true;
 }
-function runs_long_command(command) {
-  return time_shell.josh_commands_of(command).some((name) => LONG_RUNNING_COMMANDS.has(name));
+function long_commands_of(command) {
+  return time_shell.josh_commands_of(command).filter((name) => LONG_RUNNING_COMMANDS.has(name));
+}
+function ships_alone(command) {
+  const names = long_commands_of(command);
+  return names.length > 0 && names.every((name) => name === SHIP_COMMAND);
+}
+function backgrounded_bash_command(call) {
+  if (call.name !== cost_blocks.BASH_TOOL || !is_backgrounded2(call.input)) return void 0;
+  return time_shell.bash_command(call.input);
+}
+function is_backgrounded_ship(call) {
+  const command = backgrounded_bash_command(call);
+  return command !== void 0 && ships_alone(command);
 }
 function is_candidate(call) {
   if (run_tail.is_push_step_call(call)) return true;
-  if (call.name !== cost_blocks.BASH_TOOL || !is_backgrounded2(call.input)) return false;
-  return runs_long_command(time_shell.bash_command(call.input));
+  const command = backgrounded_bash_command(call);
+  if (command === void 0 || is_backgrounded_ship(call)) return false;
+  return long_commands_of(command).length > 0;
 }
 function is_background_long_run(call, is_lane_child = () => lane_child_marker.is_child_of(process.cwd())) {
   return is_candidate(call) && is_lane_child();
 }
+function foreground_input(call, is_lane_child = () => lane_child_marker.is_child_of(process.cwd())) {
+  if (!is_backgrounded_ship(call) || !json_value.is_record(call.input)) return void 0;
+  if (!is_lane_child()) return void 0;
+  return { ...call.input, [BACKGROUND_KEY2]: false, [TIMEOUT_KEY]: FOREGROUND_TIMEOUT_MS };
+}
+var FOREGROUND_NOTE = "lane background: this lane child backgrounded `josh ship`, which would die with the headless turn before its supervisor exists \u2014 so it was run in the foreground instead, where it detaches itself after the preflight. End the turn on `launched` / `busy` (joshuafolkken/kit#3154).";
 function unfinished_ids(tail, launched_ids) {
   const lines = tail.split("\n").map((line) => time_transcript_line.parse_line(line));
   const finished = new Set(lines.map((line) => line?.finished_background ?? ""));
@@ -1930,7 +1992,7 @@ function pending_background_ids(tail) {
 function pending_agent_ids(tail) {
   return unfinished_ids(tail, (block) => [block.agent_id]);
 }
-var LANE_BACKGROUND_REASON = '\u26D4 lane background: this session is a dispatched lane child (`JOSH_LANE_CHILD`), a headless `claude -p` process whose background Bash tasks are killed when the turn ends \u2014 so a backgrounded `josh gate` / `josh git` / `josh followup` / `josh ship` never re-invokes you; it dies at `exit code 143` (joshuafolkken/kit#2704, measured on the #2606 child: implementation, review and live verification done, the run parked instead of merged). Hand the gate-to-merge region to the detached supervisor instead: `pnpm josh ship --detach --review "<title> #<N>"` (add `--cite <N>`) issued in the foreground \u2014 its preflight runs in this process before the supervisor exists, so a backgrounded `ship` dies with the turn (joshuafolkken/kit#3027) \u2014 then end the turn on `launched` / `busy`. `.claude/skills/workflow-commands/chain-rule.md` step 0 is the single source. A single check you must read before continuing runs in the foreground within the tool timeout; the commit-push step does not \u2014 in a child it too belongs to the detached ship, in either spelling. This rule fires on every occurrence, not once per run.';
+var LANE_BACKGROUND_REASON = '\u26D4 lane background: this session is a dispatched lane child (`JOSH_LANE_CHILD`), a headless `claude -p` process whose background Bash tasks are killed when the turn ends \u2014 so a backgrounded `josh gate` / `josh git` / `josh followup` / `josh ship` never re-invokes you; it dies at `exit code 143` (joshuafolkken/kit#2704, measured on the #2606 child: implementation, review and live verification done, the run parked instead of merged). Hand the gate-to-merge region to the detached supervisor instead: `pnpm josh ship --detach --review "<title> #<N>"` (add `--cite <N>`) issued in the foreground \u2014 its preflight runs in this process before the supervisor exists, so a backgrounded `ship` dies with the turn (joshuafolkken/kit#3027; a backgrounded `ship` issued alone is moved to the foreground for you, joshuafolkken/kit#3154) \u2014 then end the turn on `launched` / `busy`. `.claude/skills/workflow-commands/chain-rule.md` step 0 is the single source. A single check you must read before continuing runs in the foreground within the tool timeout; the commit-push step does not \u2014 in a child it too belongs to the detached ship, in either spelling. This rule fires on every occurrence, not once per run.';
 var LANE_BACKGROUND_STOP_REASON = "\u26D4 lane background stop: this is a dispatched lane child (`JOSH_LANE_CHILD`) and a background task it launched has not finished \u2014 ending this headless turn kills it, and nothing re-invokes you afterwards (joshuafolkken/kit#2704). Do not send a notification and do not stop: wait for the task in the foreground and act on its result, or re-issue the work through `pnpm josh ship --detach`, whose supervisor outlives the turn (`.claude/skills/workflow-commands/chain-rule.md` step 0). Do not repeat your previous reply.";
 var ROW2 = {
   id: "lane-background",
@@ -1939,9 +2001,11 @@ var ROW2 = {
   decide: () => true
 };
 var lane_background = {
+  FOREGROUND_NOTE,
   LANE_BACKGROUND_REASON,
   LANE_BACKGROUND_STOP_REASON,
   ROW: ROW2,
+  foreground_input,
   is_background_long_run,
   pending_agent_ids,
   pending_background_ids
@@ -2724,8 +2788,11 @@ function mismatch_message(carry, invocation) {
 function busy_message2(carry) {
   return `A live run holds this budget \u2014 ${describe_carry(carry)}, owner pid ${String(carry.owner_pid)} still running. Nothing was established. Wait for that run, or end its record with \`${END_COMMAND2}\` once you know it is over.`;
 }
+function claim_command(invocation) {
+  return `${RESUME_COMMAND} "${invocation}" ${OWNER_ARGUMENT}`;
+}
 function standing_message(carry) {
-  return `A run record is standing here that no cut handed off \u2014 ${describe_carry(carry)}. Nothing was established. Carry that budget with \`${RESUME_COMMAND} "${carry.invocation}" ${OWNER_ARGUMENT}\`, or discard it with \`${END_COMMAND2}\` and begin again.`;
+  return `A run record is standing here that no cut handed off \u2014 ${describe_carry(carry)}. Nothing was established. Carry that budget with \`${claim_command(carry.invocation)}\`, or discard it with \`${END_COMMAND2}\` and begin again.`;
 }
 function count_refused_message(carry) {
   if (carry.is_handed_off === true) {
@@ -2757,6 +2824,7 @@ var run_carry = {
   begin_carry,
   busy_message: busy_message2,
   carry_path,
+  claim_command,
   classify: classify3,
   classify_claim,
   count_refused_message,
@@ -3559,17 +3627,17 @@ var DEPTH_LABELS = [
   {
     name: DEPTH_0_LABEL,
     color: "0e8a16",
-    description: "Depth 0 \u2014 what a consumer of this package touches (SKILL.md \xA72i)"
+    description: "Depth 0 \u2014 what a consumer of this package touches (observation-filing.md)"
   },
   {
     name: DEPTH_1_LABEL,
     color: "fbc02d",
-    description: "Depth 1 \u2014 the run orchestration that executes an Issue (SKILL.md \xA72i)"
+    description: "Depth 1 \u2014 the run orchestration that executes an Issue (observation-filing.md)"
   },
   {
     name: DEPTH_2_LABEL,
     color: "c5def5",
-    description: "Depth 2 \u2014 what measures a run (SKILL.md \xA72i)"
+    description: "Depth 2 \u2014 what measures a run (observation-filing.md)"
   }
 ];
 var WORKFLOW_LABELS = [
@@ -3687,6 +3755,7 @@ var REPO_PATH_SEGMENTS = 2;
 var NOT_FOUND3 = -1;
 var SECTION_PREFIX = "[";
 var ORIGIN_SECTION = /^\[remote\s+"origin"\]$/u;
+var REMOTE_SECTION = /^\[remote\s+"[^"]+"\]$/u;
 var URL_KEY = "url";
 function is_github_hostname(host) {
   return host.toLowerCase() === GITHUB_HOST;
@@ -3746,6 +3815,18 @@ function parse_origin_from_config(content) {
   const lines = content.split("\n").map((line) => line.trim());
   return origin_section_lines(lines).map((line) => entry_value(line, URL_KEY)).find((url) => url !== void 0);
 }
+function section_groups(lines) {
+  const groups = [];
+  for (const line of lines) {
+    if (is_section_header(line)) groups.push([line]);
+    else groups.at(-1)?.push(line);
+  }
+  return groups;
+}
+function parse_remote_urls_from_config(content) {
+  const lines = content.split("\n").map((line) => line.trim());
+  return section_groups(lines).filter((group) => REMOTE_SECTION.test(group[0] ?? "")).flatMap((group) => group.map((line) => entry_value(line, URL_KEY))).filter((url) => url !== void 0);
+}
 function format_identity(identity) {
   return `${identity.owner}${PATH_SEPARATOR2}${identity.repo}`.toLowerCase();
 }
@@ -3755,6 +3836,7 @@ var repo_origin = {
   is_github_ssh_host,
   parse_origin_from_config,
   parse_origin_url,
+  parse_remote_urls_from_config,
   format_identity
 };
 
@@ -3829,17 +3911,23 @@ function resolve_git_directory(repository_path) {
     return void 0;
   }
 }
-function read_origin_url(repository_path) {
+function read_config(repository_path) {
   const git_directory = resolve_git_directory(repository_path);
   if (git_directory === void 0) return void 0;
   try {
-    return repo_origin.parse_origin_from_config(
-      readFileSync3(path5.join(git_directory, GIT_CONFIG), "utf8")
-    );
+    return readFileSync3(path5.join(git_directory, GIT_CONFIG), "utf8");
   } catch {
     return void 0;
   }
 }
+function read_origin_url(repository_path) {
+  const config = read_config(repository_path);
+  return config === void 0 ? void 0 : repo_origin.parse_origin_from_config(config);
+}
+function read_remote_urls(repository_path) {
+  const config = read_config(repository_path);
+  return config === void 0 ? [] : repo_origin.parse_remote_urls_from_config(config);
+}
 function sibling_directories(parent) {
   try {
     return readdirSync(parent, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => path5.join(parent, entry.name)).toSorted((left, right) => left.localeCompare(right));
@@ -3878,6 +3966,7 @@ var repo_discovery = {
   OVERRIDE_ENV_KEY,
   main_worktree,
   read_origin_url,
+  read_remote_urls,
   resolve_current_owner,
   scan_siblings,
   discover_repositories
@@ -3887,6 +3976,8 @@ var repo_discovery = {
 var FIRST_PARTY = "first-party";
 var THIRD_PARTY = "third-party";
 var UNKNOWN = "unknown";
+var GH_REPO_ENV_KEY = "GH_REPO";
+var GH_REPO_PATH_SEGMENTS = 2;
 function classify4(session_owner, target) {
   if (session_owner === void 0 || target === void 0) return UNKNOWN;
   return session_owner.toLowerCase() === target.toLowerCase() ? FIRST_PARTY : THIRD_PARTY;
@@ -3897,7 +3988,25 @@ function target_owner(owner_repo) {
 function current_owner(repository_path = process.cwd()) {
   return repo_discovery.resolve_current_owner(repository_path);
 }
-var repo_party = { FIRST_PARTY, THIRD_PARTY, UNKNOWN, classify: classify4, current_owner, target_owner };
+function gh_repo_owners(gh_repo) {
+  return [target_owner(gh_repo.split("/").slice(-GH_REPO_PATH_SEGMENTS).join("/"))];
+}
+function remote_owners(repository_path) {
+  return repo_discovery.read_remote_urls(repository_path).map((url) => repo_origin.parse_origin_url(url)?.owner);
+}
+function placeholder_owners(repository_path = process.cwd(), environment2 = process.env) {
+  const gh_repo = environment2[GH_REPO_ENV_KEY];
+  return gh_repo === void 0 || gh_repo === "" ? remote_owners(repository_path) : gh_repo_owners(gh_repo);
+}
+var repo_party = {
+  FIRST_PARTY,
+  THIRD_PARTY,
+  UNKNOWN,
+  classify: classify4,
+  current_owner,
+  placeholder_owners,
+  target_owner
+};
 
 // scripts/lane/lane-reap.ts
 import { execFileSync as execFileSync3 } from "node:child_process";
@@ -4494,10 +4603,14 @@ function commit_status_api_path(commit_sha, repo) {
 function tag_reference_api_path(tag, repo) {
   return `${repo_api_path(repo)}/git/ref/tags/${tag}`;
 }
+function release_by_tag_api_path(tag, repo) {
+  return `${repo_api_path(repo)}/releases/tags/${tag}`;
+}
 var git_gh_api_path = {
   FULL_PAGE_QUERY,
   repo_api_path,
   tag_ref_api_path: tag_reference_api_path,
+  release_by_tag_api_path,
   issues_api_path,
   issue_api_path,
   blocked_by_api_path,
@@ -4772,77 +4885,8 @@ var git_gh_helpers = {
   handle_pr_create_error
 };
 
-// scripts/git/schemas.ts
-import { z as z11 } from "zod";
-var package_name_schema = z11.object({ name: z11.string().min(1) });
-var rollup_item_schema = z11.looseObject({
-  // eslint-disable-next-line @typescript-eslint/naming-convention -- GraphQL field name from GitHub API
-  __typename: z11.string().optional(),
-  state: z11.string().optional(),
-  status: z11.string().optional(),
-  conclusion: z11.string().optional(),
-  name: z11.string().optional(),
-  context: z11.string().optional()
-});
-var pr_raw_schema = z11.object({
-  statusCheckRollup: z11.array(rollup_item_schema).optional(),
-  mergeStateStatus: z11.string().optional(),
-  reviewDecision: z11.string().optional()
-});
-var pull_comment_schema = z11.object({
-  body: z11.string().optional(),
-  html_url: z11.string().optional(),
-  user: z11.object({ login: z11.string().optional() }).optional()
-});
-var ai_review_pull_comment_schema = z11.object({
-  body: z11.string().optional(),
-  url: z11.string().optional(),
-  author: z11.object({ login: z11.string().optional() }).optional()
-});
-var pr_info_schema = z11.object({
-  mergeable: z11.union([z11.boolean(), z11.string()]).nullable().optional(),
-  mergeStateStatus: z11.string().nullable().optional(),
-  state: z11.string().optional()
-});
-var epic_issue_schema = z11.object({
-  number: z11.number(),
-  body: z11.string().optional()
-});
-var blocking_issue_schema = z11.object({
-  number: z11.number(),
-  state: z11.string().optional(),
-  repository_url: z11.string().optional()
-});
-var blocked_by_schema = z11.object({
-  nodes: z11.array(blocking_issue_schema).default([]),
-  totalCount: z11.number().optional()
-}).optional();
-var epic_child_schema = z11.object({
-  state: z11.string().optional(),
-  blockedBy: blocked_by_schema
-});
-var rest_comment_schema = z11.looseObject({
-  body: z11.string().nullish(),
-  html_url: z11.string().optional(),
-  user: z11.looseObject({ login: z11.string().optional() }).nullish()
-});
-var issue_label_schema = z11.object({ name: z11.string() });
-var epic_subject_schema = z11.object({
-  number: z11.number(),
-  state: z11.string().optional(),
-  labels: z11.array(issue_label_schema).optional(),
-  body: z11.string().optional()
-});
-var open_issue_schema = z11.object({
-  number: z11.number(),
-  title: z11.string(),
-  labels: z11.array(issue_label_schema).optional(),
-  createdAt: z11.string(),
-  blockedBy: blocked_by_schema
-});
-
 // scripts/gh/git-gh-issue-rest.ts
-import { z as z12 } from "zod";
+import { z as z11 } from "zod";
 
 // scripts/gh/git-gh-rest-state.ts
 var MERGED_STATE = "MERGED";
@@ -4851,11 +4895,11 @@ function to_gh_state(state) {
 }
 
 // scripts/gh/git-gh-issue-rest.ts
-var rest_issue_schema = z12.looseObject({
-  number: z12.number(),
-  issue_dependencies_summary: z12.looseObject({ total_blocked_by: z12.number().optional() }).nullish(),
+var rest_issue_schema = z11.looseObject({
+  number: z11.number(),
+  issue_dependencies_summary: z11.looseObject({ total_blocked_by: z11.number().optional() }).nullish(),
   // Present only on a pull request, which this endpoint serves as readily as an issue.
-  pull_request: z12.looseObject({ merged_at: z12.string().nullish() }).nullish()
+  pull_request: z11.looseObject({ merged_at: z11.string().nullish() }).nullish()
 });
 var REPOSITORY_URL = /\/repos\/([\w.-]+\/[\w.-]+)$/u;
 var REPOSITORY_URL_GROUP = 1;
@@ -5340,7 +5384,7 @@ var NUMBER_AND_BODY_FIELDS = "number,body";
 var BACKLOG_SCAN_FIELDS = `number,title,body,${BLOCKED_BY_COUNT_FIELD}`;
 var NUMBER_TITLE_AND_LABELS_FIELDS = "number,title,labels";
 var SUMMARY_FIELDS = "number,title,labels,createdAt";
-var PICKUP_FIELDS = `${SUMMARY_FIELDS},blockedBy`;
+var PICKUP_FIELDS = `${SUMMARY_FIELDS},blockedBy,body`;
 var { issue_list: issue_list2 } = git_gh_issue_list;
 async function issue_list_recent(limit) {
   return await issue_list2({ json_fields: SUMMARY_FIELDS, limit });
@@ -5391,18 +5435,18 @@ var git_gh_issue = {
 // scripts/ci/pr-classification.ts
 import { readFileSync as readFileSync4 } from "node:fs";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
-import { z as z13 } from "zod";
+import { z as z12 } from "zod";
 var CLASSIFICATION_SET = new Set(RELEASE_CLASSIFICATION_NAMES);
 var ISSUE_BUG_LABEL = "bug";
 var DECLARATION_PREFIX = "- \u30EA\u30EA\u30FC\u30B9\u5206\u985E: ";
 var DECLARATION = new RegExp(`^${DECLARATION_PREFIX}(.+)$`, "gmu");
 var LEGACY_LABELS = /* @__PURE__ */ new Set(["semver-major", "semver-minor"]);
-var LABEL = z13.object({ name: z13.string() });
-var USER = z13.object({ login: z13.string() });
-var PULL_REQUEST = z13.object({ number: z13.number(), user: USER });
-var EVENT = z13.object({
+var LABEL = z12.object({ name: z12.string() });
+var USER = z12.object({ login: z12.string() });
+var PULL_REQUEST = z12.object({ number: z12.number(), user: USER });
+var EVENT = z12.object({
   pull_request: PULL_REQUEST,
-  repository: z13.object({ full_name: z13.string() })
+  repository: z12.object({ full_name: z12.string() })
 });
 function classification_error(labels, author) {
   const legacy = labels.filter((label2) => LEGACY_LABELS.has(label2.toLowerCase()));
@@ -5425,7 +5469,7 @@ function release_candidates(candidates) {
   return candidates.filter((candidate) => candidate !== ENHANCEMENT_LABEL);
 }
 function issue_candidates(issue_json) {
-  const issue = z13.object({ labels: z13.array(LABEL), body: z13.string().nullable() }).parse(JSON.parse(issue_json));
+  const issue = z12.object({ labels: z12.array(LABEL), body: z12.string().nullable() }).parse(JSON.parse(issue_json));
   const names = issue.labels.map((label2) => label2.name.toLowerCase());
   const declared = [...(issue.body ?? "").matchAll(DECLARATION)].map((match) => match[1] ?? "");
   const candidates = [...release_candidates([...names, ...declared].filter(is_classification))];
@@ -5500,31 +5544,31 @@ async function poll_until(is_done2, options) {
 var poll = { poll_until, sleep: sleep3 };
 
 // scripts/gh/git-gh-pr.ts
-import { z as z17 } from "zod";
+import { z as z16 } from "zod";
 
 // scripts/gh/git-gh-pr-rest.ts
-import { z as z14 } from "zod";
-var rest_repo_schema = z14.looseObject({ full_name: z14.string().optional() }).nullish();
-var rest_pull_side_schema = z14.looseObject({ repo: rest_repo_schema });
-var rest_pull_schema = z14.looseObject({
-  number: z14.number(),
-  html_url: z14.string().optional(),
-  body: z14.string().nullish(),
-  state: z14.string().optional(),
-  merged: z14.boolean().nullish(),
-  merged_at: z14.string().nullish(),
-  mergeable: z14.boolean().nullish(),
-  mergeable_state: z14.string().optional(),
+import { z as z13 } from "zod";
+var rest_repo_schema = z13.looseObject({ full_name: z13.string().optional() }).nullish();
+var rest_pull_side_schema = z13.looseObject({ repo: rest_repo_schema });
+var rest_pull_schema = z13.looseObject({
+  number: z13.number(),
+  html_url: z13.string().optional(),
+  body: z13.string().nullish(),
+  state: z13.string().optional(),
+  merged: z13.boolean().nullish(),
+  merged_at: z13.string().nullish(),
+  mergeable: z13.boolean().nullish(),
+  mergeable_state: z13.string().optional(),
   // `sha` is the head commit, which is what both halves of the merge-gate rollup are keyed by —
   // REST hangs the check runs and the status contexts off the commit rather than off the pull
   // request (joshuafolkken/kit#1028).
-  head: z14.looseObject({ ref: z14.string().optional(), sha: z14.string().optional(), repo: rest_repo_schema }).nullish(),
+  head: z13.looseObject({ ref: z13.string().optional(), sha: z13.string().optional(), repo: rest_repo_schema }).nullish(),
   base: rest_pull_side_schema.nullish(),
   // `node_id` is what the GraphQL auto-merge mutation addresses a pull request by, and `auto_merge`
   // is `null` until auto-merge is enabled — both read by `git-gh-pr-auto-merge.ts`
   // (joshuafolkken/kit#2497).
-  node_id: z14.string().optional(),
-  auto_merge: z14.looseObject({}).nullish()
+  node_id: z13.string().optional(),
+  auto_merge: z13.looseObject({}).nullish()
 });
 var NOT_A_PULL_MESSAGE = "gh api answered something other than a pull request object";
 var NOT_A_PULL_LISTING_MESSAGE = "gh api answered something other than a pull request listing";
@@ -5677,7 +5721,8 @@ async function pr_get_merge_state(branch_name) {
   return {
     is_merged: git_gh_pr_rest.is_merged(pull),
     merged_at: pull.merged_at ?? void 0,
-    head_sha: pull.head?.sha
+    head_sha: pull.head?.sha,
+    merge_state_status: to_gh_state(pull.mergeable_state)
   };
 }
 async function pr_get_body(branch_name) {
@@ -5724,14 +5769,14 @@ var git_gh_pr_read = {
 };
 
 // scripts/gh/git-gh-pr-review.ts
-import { z as z15 } from "zod";
+import { z as z14 } from "zod";
 var REVIEW_APPROVED = "APPROVED";
 var REVIEW_CHANGES_REQUESTED = "CHANGES_REQUESTED";
 var REVIEW_NONE = "";
 var STATE_CHANGING_REVIEWS = /* @__PURE__ */ new Set([REVIEW_APPROVED, REVIEW_CHANGES_REQUESTED]);
-var rest_review_schema = z15.looseObject({
-  state: z15.string().optional(),
-  user: z15.looseObject({ login: z15.string().optional() }).nullish()
+var rest_review_schema = z14.looseObject({
+  state: z14.string().optional(),
+  user: z14.looseObject({ login: z14.string().optional() }).nullish()
 });
 var NOT_A_REVIEW_LISTING = "gh api answered something other than a review listing";
 function parse_rest_reviews(reviews_json) {
@@ -5764,18 +5809,18 @@ function to_review_decision(reviews_json) {
 var git_gh_pr_review = { to_review_decision };
 
 // scripts/gh/git-gh-pr-rollup.ts
-import { z as z16 } from "zod";
+import { z as z15 } from "zod";
 var STATUS_CONTEXT_TYPE_NAME = "StatusContext";
 var TYPE_NAME_KEY = "__typename";
-var rollup_element_schema = z16.looseObject({});
-var check_runs_page_schema = z16.looseObject({
+var rollup_element_schema = z15.looseObject({});
+var check_runs_page_schema = z15.looseObject({
   // Required, not optional: GitHub always names the key, and accepting a page without one would
   // answer an empty rollup — which `git-pr-followup.ts` reports as "this branch has no checks".
-  check_runs: z16.array(rollup_element_schema)
+  check_runs: z15.array(rollup_element_schema)
 });
-var id_holder_schema = z16.object({ id: z16.number() });
-var status_page_schema = z16.looseObject({
-  statuses: z16.array(rollup_element_schema)
+var id_holder_schema = z15.object({ id: z15.number() });
+var status_page_schema = z15.looseObject({
+  statuses: z15.array(rollup_element_schema)
 });
 var NOT_A_CHECK_RUNS_LISTING = "gh api answered something other than a check run listing";
 var NOT_A_STATUS_LISTING = "gh api answered something other than a commit status listing";
@@ -5909,7 +5954,7 @@ var MERGE_READ_BACK_ATTEMPTS = 3;
 var MERGE_READ_BACK_INTERVAL_MS = 1e3;
 var PR_NUMBER_PATTERN = /\/pull\/([1-9]\d*)$/u;
 var LABELS_SEGMENT2 = "/labels";
-var PR_LABELS = z17.array(z17.object({ name: z17.string() }));
+var PR_LABELS = z16.array(z16.object({ name: z16.string() }));
 async function add_pr_classification(number, label2) {
   await git_gh_exec.exec_gh_api({
     path: `${git_gh_api_path.issue_api_path(number)}${LABELS_SEGMENT2}`,
@@ -6077,178 +6122,6 @@ var git_gh_repo = {
   repo_get_name_with_owner
 };
 
-// scripts/gh/git-pr-checks-parse.ts
-var CHECK_STATUS_PASS = "pass";
-var CHECK_STATUS_PENDING = "pending";
-var CHECK_STATUS_FAIL = "fail";
-var CHECK_STATUS_MISSING = "missing";
-var PASSING_CONCLUSIONS = /* @__PURE__ */ new Set(["success", "skipped", "neutral"]);
-var KEY_TYPE_NAME = "__typename";
-var KEY_STATE = "state";
-var KEY_STATUS = "status";
-var KEY_CONCLUSION = "conclusion";
-var KEY_NAME = "name";
-var KEY_CONTEXT = "context";
-function read_string(value) {
-  if (typeof value !== "string") return void 0;
-  const trimmed2 = value.trim();
-  if (trimmed2.length === 0) return void 0;
-  return trimmed2;
-}
-var PENDING_STATUS_STATES = /* @__PURE__ */ new Set(["pending", "expected"]);
-function parse_status_context(item) {
-  const state = read_string(item[KEY_STATE])?.toLowerCase();
-  if (state === "success") return CHECK_STATUS_PASS;
-  if (state !== void 0 && PENDING_STATUS_STATES.has(state)) return CHECK_STATUS_PENDING;
-  return CHECK_STATUS_FAIL;
-}
-function is_passing_conclusion(item) {
-  const conclusion = read_string(item[KEY_CONCLUSION])?.toLowerCase();
-  return conclusion !== void 0 && PASSING_CONCLUSIONS.has(conclusion);
-}
-function parse_check_run(item) {
-  const status2 = read_string(item[KEY_STATUS])?.toLowerCase();
-  if (status2 !== "completed") return CHECK_STATUS_PENDING;
-  return is_passing_conclusion(item) ? CHECK_STATUS_PASS : CHECK_STATUS_FAIL;
-}
-function parse_rollup_status(item) {
-  const type_name = read_string(item[KEY_TYPE_NAME]);
-  if (type_name === "StatusContext") return parse_status_context(item);
-  return parse_check_run(item);
-}
-function read_rollup_array(parsed) {
-  const result = pr_raw_schema.safeParse(parsed);
-  if (!result.success) return [];
-  return result.data.statusCheckRollup ?? [];
-}
-function parse_rollup_item(item) {
-  const name = read_string(item[KEY_NAME]) ?? read_string(item[KEY_CONTEXT]);
-  if (name === void 0) return void 0;
-  return { name, status: parse_rollup_status(item) };
-}
-function parse_rollup_checks(raw_json) {
-  const parsed = json_value.parse_or_undefined(raw_json);
-  const rollup = read_rollup_array(parsed);
-  const checks = [];
-  for (const item of rollup) {
-    const parsed_item = parse_rollup_item(item);
-    if (parsed_item !== void 0) checks.push(parsed_item);
-  }
-  return checks;
-}
-function parse_pr_state_snapshot(raw_json) {
-  const parsed = json_value.parse_or_undefined(raw_json);
-  const result = pr_raw_schema.safeParse(parsed);
-  const data = result.success ? result.data : void 0;
-  return {
-    rollup: parse_rollup_checks(raw_json),
-    merge_state_status: read_string(data?.mergeStateStatus),
-    review_decision: read_string(data?.reviewDecision)
-  };
-}
-
-// scripts/gh/git-pr-checks-eval.ts
-var DEFAULT_REQUIRED_CHECKS = ["SonarQube"];
-var CODERABBIT_CHECK_NAME = "CodeRabbit";
-var REQUIRED_CHECKS_ENV_VAR = "JOSH_REQUIRED_CHECKS";
-function parse_required_checks() {
-  const raw = process.env[REQUIRED_CHECKS_ENV_VAR];
-  if (!raw) return DEFAULT_REQUIRED_CHECKS;
-  return raw.split(",").map((check) => check.trim()).filter((check) => check.length > 0);
-}
-var REQUIRED_CHECKS = parse_required_checks();
-var MERGE_STATE_CLEAN = "CLEAN";
-var MERGE_STATE_UNSTABLE = "UNSTABLE";
-var MERGE_STATE_DIRTY = "DIRTY";
-var REVIEW_CHANGES_REQUESTED2 = "CHANGES_REQUESTED";
-var CHECK_SUITE_SEPARATOR = " / ";
-var FAILURE_MESSAGE_PREFIX = "PR checks failed";
-var FAILURE_REASON_REVIEW = "review requested changes";
-var FAILURE_REASON_CHECKS = "failed checks";
-var FAILURE_REASON_CONFLICT = "merge conflict";
-function is_required_match(check_name, required_name) {
-  if (check_name === required_name) return true;
-  return check_name.startsWith(`${required_name}${CHECK_SUITE_SEPARATOR}`);
-}
-function find_required_check(checks, required_name) {
-  return checks.find((check) => is_required_match(check.name, required_name));
-}
-function read_required_statuses(checks) {
-  return REQUIRED_CHECKS.map(
-    (name) => find_required_check(checks, name)?.status ?? CHECK_STATUS_MISSING
-  );
-}
-function is_review_blocked(review_decision) {
-  return review_decision === REVIEW_CHANGES_REQUESTED2;
-}
-function is_merge_conflict(merge_state_status) {
-  return merge_state_status === MERGE_STATE_DIRTY;
-}
-function evaluate_failure_state(input) {
-  if (is_merge_conflict(input.merge_state_status) || is_review_blocked(input.review_decision) || input.failed_checks.length > 0) {
-    return "failure";
-  }
-  return void 0;
-}
-function is_merge_state_clean(merge_state_status) {
-  return merge_state_status === MERGE_STATE_CLEAN;
-}
-function is_every_required_passing(statuses) {
-  return statuses.every((status2) => status2 === CHECK_STATUS_PASS);
-}
-function is_coderabbit_check(check_name) {
-  return is_required_match(check_name, CODERABBIT_CHECK_NAME);
-}
-function is_unstable_only_from_coderabbit(snapshot) {
-  if (snapshot.merge_state_status !== MERGE_STATE_UNSTABLE) return false;
-  const non_passing = snapshot.rollup.filter((check) => check.status !== CHECK_STATUS_PASS);
-  if (non_passing.length === 0) return false;
-  return non_passing.every((check) => is_coderabbit_check(check.name));
-}
-function is_required_check(check_name) {
-  return REQUIRED_CHECKS.some((required) => is_required_match(check_name, required));
-}
-function is_blocking_failure(check) {
-  if (check.status !== CHECK_STATUS_FAIL) return false;
-  return !is_coderabbit_check(check.name) || is_required_check(check.name);
-}
-function collect_blocking_failures(snapshot) {
-  return snapshot.rollup.filter((check) => is_blocking_failure(check)).map((check) => check.name);
-}
-function is_mergeable_state(snapshot) {
-  if (is_merge_state_clean(snapshot.merge_state_status)) return true;
-  return is_unstable_only_from_coderabbit(snapshot);
-}
-function collect_failure_reasons(snapshot) {
-  const reasons = [];
-  if (is_merge_conflict(snapshot.merge_state_status)) reasons.push(FAILURE_REASON_CONFLICT);
-  if (is_review_blocked(snapshot.review_decision)) reasons.push(FAILURE_REASON_REVIEW);
-  const failed = collect_blocking_failures(snapshot);
-  if (failed.length > 0) reasons.push(`${FAILURE_REASON_CHECKS}: ${failed.join(", ")}`);
-  return reasons;
-}
-function describe_pr_failure(snapshot) {
-  const reasons = collect_failure_reasons(snapshot);
-  if (reasons.length === 0) return `${FAILURE_MESSAGE_PREFIX}.`;
-  return `${FAILURE_MESSAGE_PREFIX} (${reasons.join("; ")}).`;
-}
-function evaluate_pr_state(snapshot) {
-  const statuses = read_required_statuses(snapshot.rollup);
-  const failure = evaluate_failure_state({
-    review_decision: snapshot.review_decision,
-    failed_checks: collect_blocking_failures(snapshot),
-    merge_state_status: snapshot.merge_state_status
-  });
-  if (failure !== void 0) return failure;
-  if (is_mergeable_state(snapshot) && is_every_required_passing(statuses)) {
-    return "success";
-  }
-  return "pending";
-}
-function is_review_decision_decisive(snapshot) {
-  return evaluate_pr_state(snapshot) !== "pending";
-}
-
 // scripts/gh/git-pr-checks.ts
 var SECONDS_TO_MS = 1e3;
 var CHECK_WAIT_INTERVAL_MS = 1e4;
@@ -6277,9 +6150,14 @@ var MERGE_GATE_EVALUATOR = {
 function advance_stable_count(previous, state) {
   return state === "success" ? previous + 1 : 0;
 }
+function failure_error(message, snapshot) {
+  return is_merge_conflict(snapshot.merge_state_status) ? new PrConflictError(message) : new Error(message);
+}
 function classify_poll_result(input) {
   const state = input.evaluator.evaluate(input.snapshot);
-  if (state === "failure") throw new Error(input.evaluator.describe(input.snapshot));
+  if (state === "failure") {
+    throw failure_error(input.evaluator.describe(input.snapshot), input.snapshot);
+  }
   const next_stable_count = advance_stable_count(input.stable_count, state);
   return {
     is_done: next_stable_count >= input.required_stable_reads,
@@ -6430,11 +6308,11 @@ export {
   tail_commands,
   filing_cap,
   CONTEXT_CUT_THRESHOLD,
-  RECENT_REQUEST_WINDOW,
   agent_role_profile,
   cli_flags,
   own_session,
   backlog_budget,
+  run_cut_handoff,
   run_hold,
   run_cut,
   run_tail,
@@ -6464,7 +6342,6 @@ export {
   read_json_listing,
   parse_json_object_safe,
   git_gh_exec,
-  open_issue_schema,
   git_gh_issue_read,
   git_gh_pr_read,
   git_gh_command