halfcycle 0.13.0 → 0.14.0-rc.1

package/bin/pre-tool-use-filter.sh

@@ -10,6 +10,7 @@ halfcycle_pt_skip() {
   hc_pt_live_text= hc_pt_live_sid= hc_pt_live_agent= hc_pt_live_dir=
   hc_pt_own_file= hc_pt_own_agent_id= hc_pt_own_tool_use_id=
   halfcycle_pt_agent "$@" || return 1
+  halfcycle_pt_notes || return 1
   halfcycle_pt_quiet || return 1
   halfcycle_pt_live || return 1
   halfcycle_pt_own_copy || return 1
@@ -24,6 +25,18 @@ halfcycle_pt_agent() {
   [ "$#" -eq 4 ] && [ "$3" = --agent ] && [ "$4" = codex ] && { hc_pt_agent=codex; return 0; }
   return 1
 }
+halfcycle_pt_notes() {
+  local LC_ALL=C hc_val hc_dir hc_re='^[A-Za-z0-9-]{1,128}$'
+  halfcycle_pt_string agent_id
+  case $? in 0) [ -z "$hc_val" ] || return 0 ;; 1) ;; *) return 1 ;; esac
+  halfcycle_pt_string session_id
+  case $? in 0) ;; 1) return 0 ;; *) return 1 ;; esac
+  [[ $hc_val =~ $hc_re ]] || return 0
+  hc_dir=${TMPDIR:-/tmp}
+  while [ "${hc_dir%/}" != "$hc_dir" ]; do hc_dir=${hc_dir%/}; done
+  [ -e "$hc_dir/halfcycle-notes-$hc_val.json" ] && return 1
+  return 0
+}
 halfcycle_pt_own_read() {
   local LC_ALL=C hc_val hc_dir hc_re='^[A-Za-z0-9_-]{1,128}$'
   halfcycle_pt_string tool_name || return 1

package/dist/cli-contract.d.ts

@@ -62,7 +62,7 @@
  * home is the failure mode it exists to prevent.
  */
 /** The verbs the CLI dispatches. Anything else after `halfcycle ` is unknown. */
-export declare const CLI_VERBS: readonly ["install", "check-drift", "build-record", "open-phase", "close-phase", "system", "draw", "plan", "review", "check-tasks", "check-criteria", "check-report", "ready", "uninstall", "change", "pace", "route", "prove", "preview", "doctor", "restore", "request-shapes", "allow", "size", "regression", "crew"];
+export declare const CLI_VERBS: readonly ["install", "check-drift", "build-record", "open-phase", "close-phase", "system", "draw", "plan", "review", "check-tasks", "check-criteria", "check-report", "ready", "uninstall", "change", "pace", "route", "prove", "preview", "doctor", "restore", "request-shapes", "allow", "size", "regression", "crew", "remove-copy"];
 export type CliVerb = (typeof CLI_VERBS)[number];
 /** A flag every invocation of the verb must carry. */
 export interface RequiredFlag {

package/dist/cli-contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli-contract.d.ts","sourceRoot":"","sources":["../src/cli-contract.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8DG;AAKH,iFAAiF;AACjF,eAAO,MAAM,SAAS,0TAA2T,CAAC;AAElV,MAAM,MAAM,OAAO,GAAG,CAAC,OAAO,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC;AAEjD,sDAAsD;AACtD,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB;;;;OAIG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,2DAA2D;IAC3D,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,+EAA+E;IAC/E,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;CACjC;AAED,iDAAiD;AACjD,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;CACjC;AAED;;;;GAIG;AACH,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,SAAS,YAAY,EAAE,CAAC;IAC3C,QAAQ,CAAC,WAAW,EAAE,SAAS,eAAe,EAAE,CAAC;CAClD;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,QAAQ,EAAE,SAAS,YAAY,EAAE,CAAC;IAC3C,QAAQ,CAAC,WAAW,EAAE,SAAS,eAAe,EAAE,CAAC;IACjD,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;CAC1C;AAgMD,6EAA6E;AAC7E,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,CAElE;AAED,iDAAiD;AACjD,MAAM,WAAW,SAAS;IACxB,kEAAkE;IAClE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,oCAAoC;IACpC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAmBD;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,EAAE,CAyBxF;AAuBD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAMtE;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAMvE;AASD;;;;GAIG;AACH,eAAO,MAAM,kBAAkB;;CAErB,CAAC;AA2BX;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,GAAG,IAAI,CAa1F"}
+{"version":3,"file":"cli-contract.d.ts","sourceRoot":"","sources":["../src/cli-contract.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8DG;AAKH,iFAAiF;AACjF,eAAO,MAAM,SAAS,yUAA0U,CAAC;AAEjW,MAAM,MAAM,OAAO,GAAG,CAAC,OAAO,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC;AAEjD,sDAAsD;AACtD,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB;;;;OAIG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,2DAA2D;IAC3D,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,+EAA+E;IAC/E,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;CACjC;AAED,iDAAiD;AACjD,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;CACjC;AAED;;;;GAIG;AACH,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,SAAS,YAAY,EAAE,CAAC;IAC3C,QAAQ,CAAC,WAAW,EAAE,SAAS,eAAe,EAAE,CAAC;CAClD;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,QAAQ,EAAE,SAAS,YAAY,EAAE,CAAC;IAC3C,QAAQ,CAAC,WAAW,EAAE,SAAS,eAAe,EAAE,CAAC;IACjD,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;CAC1C;AAiMD,6EAA6E;AAC7E,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,CAElE;AAED,iDAAiD;AACjD,MAAM,WAAW,SAAS;IACxB,kEAAkE;IAClE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,oCAAoC;IACpC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAmBD;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,EAAE,CAyBxF;AAuBD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAMtE;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAMvE;AASD;;;;GAIG;AACH,eAAO,MAAM,kBAAkB;;CAErB,CAAC;AA2BX;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,GAAG,IAAI,CAa1F"}

package/dist/cli.js

@@ -2394,6 +2394,9 @@ function requestShapeLineText(line) {
   return ordered(`${cut > 0 ? prefix.slice(0, cut) : ""}\u2026`);
 }
 
+// ../core/dist/worker-copy-caches.js
+var WORKER_COPY_CACHE_FOLDERS = ["__pycache__", ".pytest_cache", ".mypy_cache", "node_modules"];
+
 // dist/request-shapes.js
 var folder = join(homedir(), HALFCYCLE_DIR_NAME, REQUEST_SHAPES_DIR_NAME);
 var logPath = join(folder, REQUEST_SHAPES_LOG_FILENAME);
@@ -6408,6 +6411,7 @@ var pacingBasisTaskSchema = z24.object({
   human: z24.boolean(),
   kind: buildTaskKindSchema.optional()
 }).strict();
+var pacingBasisDoneTaskSchema = pacingBasisTaskSchema.extend({ done: z24.boolean() }).strict();
 var pacingBasisSchema = z24.object({
   outcome: z24.literal("basis"),
   claudePlan: z24.string().nullable().optional(),
@@ -6418,6 +6422,7 @@ var pacingBasisSchema = z24.object({
   medianTaskMinutes: z24.number().nonnegative().nullable(),
   medianTaskTokens: z24.number().nonnegative().nullable()
 }).strict();
+var pacingBasisDoneSchema = pacingBasisSchema.extend({ tasks: z24.array(pacingBasisDoneTaskSchema).max(BUILD_SNAPSHOT_TASK_LIMIT) }).strict();
 var paceSuggestionSchema = z24.object({
   number: z24.number().int().min(1).max(PACE_AGENTS_MAX),
   minutes: z24.number().int().nonnegative().nullable(),
@@ -9490,12 +9495,15 @@ var CREW_TIER_WORDS = {
   fast: "You work quickly on clear, well-defined work, and say so when a task needs more thought."
 };
 var CREW_REVIEWER_WORDS = "You check the work you are given and never change it: you read it, run what you need to, and report what you find.";
-var CREW_REVIEWER_TOOLS = "Read, Grep, Glob, Bash";
-var CREW_MEMBER_TOOLS = "Read, Edit, Write, Bash, Grep, Glob";
+var CREW_SHELL_RULE = "Read and search files with your file tools, not the shell. Run one plain shell command per call, on one line: no cd first, and nothing joined to it with &&, ;, a pipe, a loop or a here-document.";
+var CREW_HALFCYCLE_TOOLS = `mcp__${MCP_SERVER_KEY}__*`;
+var CREW_REVIEWER_TOOLS = `Read, Grep, Glob, Bash, ${CREW_HALFCYCLE_TOOLS}`;
+var CREW_MEMBER_TOOLS = `Read, Edit, Write, Bash, Grep, Glob, ${CREW_HALFCYCLE_TOOLS}`;
 function crewProfileBody(role, group, tier) {
   const lines = [`You are a ${CREW_ROLE_WORDS[role]} on this project's build crew.`, CREW_TIER_WORDS[tier]];
   if (group === "reviewer")
     lines.push(CREW_REVIEWER_WORDS);
+  lines.push(CREW_SHELL_RULE);
   return `${lines.join("\n")}
 `;
 }
@@ -10495,8 +10503,8 @@ ${GENERATED_USER_PROMPT_FINDINGS_HEADER} the Halfcycle installer, now also for C
 # whatever Halfcycle's checks found at an earlier turn end, once. Any arguments
 # this script was given (a Codex row passes its agent's name) are handed on.
 #
-# AN ORDINARY PROMPT STARTS NOTHING. With no findings file for this session, this
-# script reads its session id with a bash regex (no node) and exits 0 with no
+# AN ORDINARY PROMPT STARTS NOTHING. With no findings file and no notes file for
+# this session, this script reads its session id with a bash regex (no node) and exits 0 with no
 # output once it finds no file \u2014 node and grep never start.
 trap 'exit 0' ERR
 set -e
@@ -10520,7 +10528,8 @@ fi
 HC_FINDINGS_DIR="\${TMPDIR:-/tmp}"
 HC_FINDINGS_DIR="\${HC_FINDINGS_DIR%/}"    # strip trailing slash (macOS TMPDIR ends in /)
 HC_FINDINGS_FILE="\${HC_FINDINGS_DIR}/halfcycle-findings-\${HC_SESSION_ID}.json"
-if [ ! -f "$HC_FINDINGS_FILE" ]; then
+HC_NOTES_FILE="\${HC_FINDINGS_DIR}/halfcycle-notes-\${HC_SESSION_ID}.json"
+if [ ! -f "$HC_FINDINGS_FILE" ] && [ ! -f "$HC_NOTES_FILE" ]; then
   exit 0
 fi
 
@@ -11796,8 +11805,8 @@ function installSelfBuild(options) {
 // dist/worker-copies.js
 import { spawnSync } from "node:child_process";
 import { existsSync as existsSync7, lstatSync as lstatSync2, readdirSync, realpathSync, rmdirSync, rmSync as rmSync3 } from "node:fs";
-import { isAbsolute as isAbsolute3, join as join9, relative as relative2, resolve as resolve2, sep } from "node:path";
-var WORKER_COPY_CACHE_FOLDERS = ["__pycache__", ".pytest_cache", ".mypy_cache", "node_modules"];
+import { basename, dirname as dirname5, isAbsolute as isAbsolute3, join as join9, relative as relative2, resolve as resolve2, sep } from "node:path";
+var REMOVE_COPY_USAGE = `${ownCommand()} remove-copy <path>`;
 var COPIES_SHOWN = ".claude/worktrees/";
 var CACHE_NAMES = new Set(WORKER_COPY_CACHE_FOLDERS);
 var NOTHING = { removed: 0, kept: [], message: void 0 };
@@ -11837,27 +11846,18 @@ function tidy(projectDir) {
   const mainPath = canonical(main2.path);
   if (!samePath(mainPath, canonical(top.out.trim())))
     return NOTHING;
-  const copiesDir = join9(root, ".claude", "worktrees");
+  const project = { root, mainPath, copiesDir: join9(root, ".claude", "worktrees") };
   let removed = 0;
   const kept = [];
   for (const tree of worktrees.slice(1)) {
     if (tree.bare)
       continue;
     const at = canonical(tree.path);
-    if (samePath(at, mainPath) || !isInside(copiesDir, at))
+    const settled = settleCopy(project, tree, at);
+    if (settled === "not-ours" || settled === "gone")
       continue;
-    if (!existsSync7(at))
-      continue;
-    const shown2 = relative2(root, at).split(sep).join("/");
-    const held = tree.locked ? "work" : holdsWork(at, mainPath);
-    if (held === "work") {
-      kept.push(shown2);
-      continue;
-    }
-    clearCaches(at, at);
-    const remove = held === "duplicates" ? ["worktree", "remove", "--force", at] : ["worktree", "remove", at];
-    if (!git2(root, remove).ok) {
-      kept.push(shown2);
+    if (settled !== "removed") {
+      kept.push(shownPath(root, at));
       continue;
     }
     removed += 1;
@@ -11866,6 +11866,128 @@ function tidy(projectDir) {
   }
   return { removed, kept, message: lineFor(removed, kept) };
 }
+function settleCopy(project, tree, at) {
+  if (samePath(at, project.mainPath) || !isInside(project.copiesDir, at))
+    return "not-ours";
+  if (!existsSync7(at))
+    return "gone";
+  if (tree.locked)
+    return "running";
+  const held = holdsWork(at, project.mainPath);
+  if (held === "work")
+    return "changes";
+  clearCaches(at, at);
+  const remove = held === "duplicates" ? ["worktree", "remove", "--force", at] : ["worktree", "remove", at];
+  return git2(project.root, remove).ok ? "removed" : "changes";
+}
+function shownPath(root, at) {
+  return relative2(root, at).split(sep).join("/");
+}
+var GitSilent = class extends Error {
+};
+var GIT_SILENT = {
+  line: "[halfcycle] The worker copy was not removed, because git did not answer.",
+  exitCode: 1,
+  verdict: false
+};
+function removeWorkerCopy(cwd, given) {
+  try {
+    return removeOne(cwd, given);
+  } catch {
+    return GIT_SILENT;
+  }
+}
+function removeOne(cwd, given) {
+  const at = canonicalLoose(resolve2(cwd, given));
+  const notACopy = {
+    line: `[halfcycle] ${given} is not a worker copy under ${COPIES_SHOWN}, so nothing was removed.`,
+    exitCode: 1,
+    verdict: true
+  };
+  const top = git2(cwd, ["rev-parse", "--show-toplevel"]);
+  if (!top.ran)
+    throw new GitSilent();
+  if (!top.ok)
+    return notACopy;
+  const listed = git2(cwd, ["worktree", "list", "--porcelain"]);
+  if (!listed.ok)
+    throw new GitSilent();
+  const worktrees = parseWorktrees(listed.out);
+  const main2 = worktrees[0];
+  if (main2 === void 0 || main2.bare)
+    throw new GitSilent();
+  const mainPath = canonical(main2.path);
+  if (!samePath(mainPath, canonical(top.out.trim()))) {
+    return {
+      line: `[halfcycle] Run this from the project's main folder, not from inside a worker copy. Nothing was removed.`,
+      exitCode: 1,
+      verdict: true
+    };
+  }
+  const project = { root: mainPath, mainPath, copiesDir: join9(mainPath, ".claude", "worktrees") };
+  if (!samePath(dirname5(at), project.copiesDir) || samePath(at, mainPath))
+    return notACopy;
+  const shown2 = shownPath(mainPath, at);
+  const folder2 = basename(at);
+  const tree = worktrees.slice(1).find((entry) => !entry.bare && samePath(canonicalLoose(entry.path), at));
+  const done = (line) => ({ line, exitCode: 0, verdict: false });
+  const kept = (why) => done(why === "running" ? `[halfcycle] Kept the worker copy ${shown2}: an agent is still working in it. Nothing was removed.` : `[halfcycle] Kept the worker copy ${shown2}: it holds changes that are not saved anywhere else. Nothing was removed.`);
+  const goneLine = `[halfcycle] The worker copy ${shown2} is already gone.`;
+  if (tree === void 0) {
+    if (entryExists(at))
+      return notACopy;
+    return done(withBranch(goneLine, deleteCopyBranch(mainPath, folder2), false));
+  }
+  const settled = settleCopy(project, tree, at);
+  if (settled === "not-ours")
+    return notACopy;
+  if (settled === "running" || settled === "changes")
+    return kept(settled);
+  if (settled === "removed")
+    return done(withBranch(`[halfcycle] Removed the worker copy ${shown2}.`, deleteCopyBranch(mainPath, folder2), true));
+  if (tree.locked)
+    return kept("running");
+  if (tree.detached && (tree.head === void 0 || !onSomeRef(mainPath, tree.head)))
+    return kept("changes");
+  const unlisted = git2(mainPath, ["worktree", "remove", tree.path]);
+  if (!unlisted.ran)
+    throw new GitSilent();
+  if (!unlisted.ok)
+    return kept("changes");
+  return done(withBranch(goneLine, deleteCopyBranch(mainPath, folder2), false));
+}
+function deleteCopyBranch(root, folder2) {
+  const name = `worktree-${folder2}`;
+  if (!git2(root, ["show-ref", "--verify", "--quiet", `refs/heads/${name}`]).ok)
+    return { name, outcome: "none" };
+  return { name, outcome: git2(root, ["branch", "-d", name]).ok ? "deleted" : "kept" };
+}
+function withBranch(line, branch, namesDeleted) {
+  if (branch.outcome === "none")
+    return line;
+  if (branch.outcome === "deleted")
+    return namesDeleted ? `${line.slice(0, -1)} and its branch ${branch.name}.` : line;
+  return `${line} Kept its branch ${branch.name}, which holds commits that are not merged.`;
+}
+function entryExists(path) {
+  try {
+    lstatSync2(path);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function canonicalLoose(path) {
+  const full = resolve2(path);
+  try {
+    return realpathSync(full);
+  } catch {
+    const parent = dirname5(full);
+    if (parent === full)
+      return full;
+    return join9(canonicalLoose(parent), basename(full));
+  }
+}
 function lineFor(removed, kept) {
   if (removed === 0 && kept.length === 0)
     return void 0;
@@ -11890,10 +12012,14 @@ function parseWorktrees(porcelain) {
   let current;
   for (const line of porcelain.split(/\r?\n/)) {
     if (line.startsWith("worktree ")) {
-      current = { path: line.slice("worktree ".length), branch: void 0, locked: false, bare: false };
+      current = { path: line.slice("worktree ".length), head: void 0, branch: void 0, detached: false, locked: false, bare: false };
       trees.push(current);
     } else if (current === void 0) {
       continue;
+    } else if (line.startsWith("HEAD ")) {
+      current.head = line.slice("HEAD ".length);
+    } else if (line === "detached") {
+      current.detached = true;
     } else if (line.startsWith("branch refs/heads/")) {
       current.branch = line.slice("branch refs/heads/".length);
     } else if (line === "locked" || line.startsWith("locked ")) {
@@ -11905,6 +12031,10 @@ function parseWorktrees(porcelain) {
   return trees;
 }
 function holdsWork(copyDir, mainDir) {
+  if (operationInProgress(copyDir))
+    return "work";
+  if (!onSomeRef(copyDir, "HEAD"))
+    return "work";
   const status = git2(copyDir, ["status", "--porcelain", "-z", "--untracked-files=all"]);
   if (!status.ok)
     return "work";
@@ -11926,6 +12056,20 @@ function holdsWork(copyDir, mainDir) {
   }
   return duplicates ? "duplicates" : "clean";
 }
+var IN_PROGRESS_MARKS = ["rebase-merge", "rebase-apply", "MERGE_HEAD", "CHERRY_PICK_HEAD"];
+function operationInProgress(copyDir) {
+  const paths = git2(copyDir, ["rev-parse", ...IN_PROGRESS_MARKS.flatMap((mark) => ["--git-path", mark])]);
+  if (!paths.ok)
+    return true;
+  const lines = paths.out.split(/\r?\n/).filter((line) => line !== "");
+  if (lines.length !== IN_PROGRESS_MARKS.length)
+    return true;
+  return lines.some((line) => entryExists(resolve2(copyDir, line)));
+}
+function onSomeRef(cwd, commit) {
+  const holding = git2(cwd, ["for-each-ref", "--count=1", "--format=%(refname)", "--contains", commit]);
+  return holding.ok && holding.out.trim() !== "";
+}
 function duplicatesMain(copyDir, mainDir, path) {
   if (path === "" || path.endsWith("/"))
     return false;
@@ -13421,7 +13565,7 @@ async function confirmActingIdentity(serviceUrl, credential, act, deps = {}) {
 }
 
 // dist/project-name.js
-import { basename, resolve as resolve3 } from "node:path";
+import { basename as basename2, resolve as resolve3 } from "node:path";
 var MAX_DERIVED_NAME_LEN = 100;
 var EMPTY_SEGMENTS = /* @__PURE__ */ new Set(["", ".", "..", "/", "\\"]);
 function repositoryNameFromRemote(remote) {
@@ -13441,7 +13585,7 @@ function isLocalRemote(remote) {
 function deriveProjectName(targetRepoRoot) {
   const remote = readRemote(targetRepoRoot);
   const fromRemote = remote && !isLocalRemote(remote) ? repositoryNameFromRemote(remote) : void 0;
-  const candidate = fromRemote ?? basename(resolve3(targetRepoRoot));
+  const candidate = fromRemote ?? basename2(resolve3(targetRepoRoot));
   const name = candidate.trim();
   if (EMPTY_SEGMENTS.has(name))
     return void 0;
@@ -13532,7 +13676,7 @@ async function joinPinnedEngagement(serviceUrl, engagementId, targetRepo, deps =
 // dist/pre-create-checks.js
 import { spawnSync as spawnSync2 } from "node:child_process";
 import { existsSync as existsSync8, readFileSync as readFileSync9, realpathSync as realpathSync3 } from "node:fs";
-import { delimiter, dirname as dirname5, join as join11 } from "node:path";
+import { delimiter, dirname as dirname6, join as join11 } from "node:path";
 var KEPT_FOLDER_ID_LINE = `Nothing on the Halfcycle service needs undoing, and this folder keeps its project id, so running "${ownBareCommand()}" again picks up where it left off.`;
 var PreCreateRefused = class extends Error {
   constructor(message) {
@@ -13574,7 +13718,7 @@ function refuseSystemFolder(targetRepo, platform6 = process.platform) {
 }
 function refuseInsideProject(targetRepo) {
   let folder2 = realOrLiteral(targetRepo);
-  for (let parent = dirname5(folder2); parent !== folder2; folder2 = parent, parent = dirname5(parent)) {
+  for (let parent = dirname6(folder2); parent !== folder2; folder2 = parent, parent = dirname6(parent)) {
     if (existsSync8(join11(parent, BUNDLE_PIN_REL))) {
       throw new PreCreateRefused(`${targetRepo} is inside the Halfcycle project at ${parent} \u2014 open that folder in your coding agent instead, or run "${ownBareCommand()}" in a folder outside it.`);
     }
@@ -13702,7 +13846,7 @@ function isSelfBuildInstallForm(engagementIdArg, engagementTypeArg) {
 // dist/local-allow.js
 import { execFileSync as execFileSync3 } from "node:child_process";
 import { existsSync as existsSync9, mkdirSync as mkdirSync7, readFileSync as readFileSync11, rmSync as rmSync5, writeFileSync as writeFileSync7 } from "node:fs";
-import { dirname as dirname6, join as join13 } from "node:path";
+import { dirname as dirname7, join as join13 } from "node:path";
 var LOCAL_SETTINGS_REL2 = ".claude/settings.local.json";
 var LOCAL_ALLOW_RECORD_REL = ".halfcycle/local-allow.json";
 var LOCAL_ALLOW_EDIT_MODE = "acceptEdits";
@@ -13758,6 +13902,7 @@ var LOCAL_ALLOW_RULES = [
   bash("bun add"),
   bash("gh repo view"),
   bash("gh issue create"),
+  bash("gh pr merge"),
   bash("go mod tidy"),
   bash("go get"),
   bash("cargo add"),
@@ -13797,7 +13942,7 @@ var LOCAL_ALLOW_RULES = [
   bash("tr"),
   HALFCYCLE_TOOLS_RULE
 ];
-var LOCAL_ALLOW_QUESTION = "Let your coding agent work without asking on this computer? It would run your tests and builds, install packages, run local tools, make and move files, use git locally, run Halfcycle, and edit files in this project without a permission prompt. Opening a ticket on GitHub does not ask either. Pushing, publishing, deploying to production and deleting still ask. This is saved only on this computer, in .claude/settings.local.json, which is not committed.\nType yes to allow it, or press Enter to keep asking: ";
+var LOCAL_ALLOW_QUESTION = "Let your coding agent work without asking on this computer? It would run your tests and builds, install packages, run local tools, make and move files, use git locally, run Halfcycle, and edit files in this project without a permission prompt. Opening a ticket and merging reviewed work on GitHub do not ask either. Pushing, publishing, deploying to production and deleting still ask. This is saved only on this computer, in .claude/settings.local.json, which is not committed.\nType yes to allow it, or press Enter to keep asking: ";
 var LOCAL_ALLOW_ON_LINE = `Your coding agent can now work without asking on this computer. To undo it, run: ${ownCommand()} allow --remove`;
 var LOCAL_ALLOW_OFF_LINE = `Your coding agent will ask before it runs commands. To stop most of those questions on this computer, run: ${ownCommand()} allow`;
 var LOCAL_ALLOW_TRACKED_LINE = "Your .claude/settings.local.json is committed to git, so Halfcycle will not add rules to it. Remove it from git first if you want them.";
@@ -13837,7 +13982,7 @@ function readRecord2(repo) {
 }
 function writeRecord(repo, record2) {
   const path = join13(repo, LOCAL_ALLOW_RECORD_REL);
-  mkdirSync7(dirname6(path), { recursive: true });
+  mkdirSync7(dirname7(path), { recursive: true });
   writeFileSync7(path, JSON.stringify({ rules: record2.rules, defaultMode: record2.defaultMode, before: record2.before }, null, 2) + "\n");
 }
 function holdsLocalAllowRecord(repo) {
@@ -13888,7 +14033,7 @@ function writeLocalAllow(repo) {
   if (setsMode)
     permissions["defaultMode"] = LOCAL_ALLOW_EDIT_MODE;
   const next = { ...settings, permissions };
-  mkdirSync7(dirname6(path), { recursive: true });
+  mkdirSync7(dirname7(path), { recursive: true });
   writeFileSync7(path, render(next, text));
   const earlier = readRecord2(repo);
   writeRecord(repo, {
@@ -14009,7 +14154,7 @@ function approveOwnServer(repo) {
   const plan = planOwnServerApproval(repo, registersOwnServer(repo));
   if (plan.after !== null) {
     const path = join13(repo, LOCAL_SETTINGS_REL2);
-    mkdirSync7(dirname6(path), { recursive: true });
+    mkdirSync7(dirname7(path), { recursive: true });
     writeFileSync7(path, plan.after);
   }
   return plan.outcome;
@@ -14754,7 +14899,7 @@ function codexInstallLine(codex) {
 
 // dist/build-record/write.js
 import { existsSync as existsSync13, mkdirSync as mkdirSync8, rmSync as rmSync7 } from "node:fs";
-import { basename as basename2, join as join17, resolve as resolve4, relative as relative3, isAbsolute as isAbsolute4 } from "node:path";
+import { basename as basename3, join as join17, resolve as resolve4, relative as relative3, isAbsolute as isAbsolute4 } from "node:path";
 
 // dist/build-record/render-v2.js
 var HIDDEN = /[\p{Cc}\p{Zl}\p{Zp}\p{Default_Ignorable_Code_Point}]/u;
@@ -15426,7 +15571,7 @@ function replaceOne(io, tmp, finalPath, text) {
 var BUILD_RECORD_DIR = join17("docs", "build-records");
 function assertInsideOutDir(outDir, candidate, identity) {
   const rel = relative3(outDir, resolve4(candidate));
-  const isPlainFilename = rel !== "" && rel !== ".." && !isAbsolute4(rel) && rel === basename2(rel);
+  const isPlainFilename = rel !== "" && rel !== ".." && !isAbsolute4(rel) && rel === basename3(rel);
   if (!isPlainFilename) {
     throw new InvalidPhaseIdentityError(identity, BUILD_RECORD_DIR);
   }
@@ -15517,7 +15662,7 @@ import { join as join23 } from "node:path";
 
 // dist/draw/write.js
 import { closeSync as closeSync2, lstatSync as lstatSync4, mkdirSync as mkdirSync9, openSync as openSync2, readFileSync as readFileSync15, readSync, realpathSync as realpathSync7, rmSync as rmSync8 } from "node:fs";
-import { dirname as dirname7, isAbsolute as isAbsolute5, join as join18, relative as relative4, resolve as resolve5, sep as sep2 } from "node:path";
+import { dirname as dirname8, isAbsolute as isAbsolute5, join as join18, relative as relative4, resolve as resolve5, sep as sep2 } from "node:path";
 var DOCS_DIR = "docs";
 var DIAGRAMS_DIR = "diagrams";
 var DIAGRAM_DIR_REL = `${DOCS_DIR}/${DIAGRAMS_DIR}`;
@@ -15610,7 +15755,7 @@ function checkDiagramPlace(paths) {
   }
   let ancestor = paths.dir;
   while (lstatOrNull2(ancestor) === null) {
-    const parent = dirname7(ancestor);
+    const parent = dirname8(ancestor);
     if (parent === ancestor)
       break;
     ancestor = parent;
@@ -15851,7 +15996,7 @@ function isMissingRoute(method, status, body) {
 import { join as join21 } from "node:path";
 
 // dist/cli-contract.js
-var CLI_VERBS = ["install", "check-drift", "build-record", "open-phase", "close-phase", "system", "draw", "plan", "review", "check-tasks", "check-criteria", "check-report", "ready", "uninstall", "change", "pace", "route", "prove", "preview", "doctor", "restore", "request-shapes", "allow", "size", "regression", "crew"];
+var CLI_VERBS = ["install", "check-drift", "build-record", "open-phase", "close-phase", "system", "draw", "plan", "review", "check-tasks", "check-criteria", "check-report", "ready", "uninstall", "change", "pace", "route", "prove", "preview", "doctor", "restore", "request-shapes", "allow", "size", "regression", "crew", "remove-copy"];
 var CONTRACTS = [
   { verb: "install", required: [], conditional: [] },
   { verb: "check-drift", required: [], conditional: [] },
@@ -15871,6 +16016,7 @@ var CONTRACTS = [
   { verb: "doctor", required: [], conditional: [] },
   { verb: "restore", required: [], conditional: [] },
   { verb: "allow", required: [], conditional: [] },
+  { verb: "remove-copy", required: [], conditional: [] },
   {
     verb: "request-shapes",
     required: [],
@@ -16322,7 +16468,7 @@ async function runSystem(repoRoot, deps) {
 
 // dist/build-record/write-change.js
 import { existsSync as existsSync14, mkdirSync as mkdirSync10 } from "node:fs";
-import { basename as basename3, isAbsolute as isAbsolute6, join as join20, relative as relative5, resolve as resolve6 } from "node:path";
+import { basename as basename4, isAbsolute as isAbsolute6, join as join20, relative as relative5, resolve as resolve6 } from "node:path";
 
 // dist/build-record/render-change.js
 function counted2(n, one, many) {
@@ -16478,7 +16624,7 @@ var InvalidChangeIdError = class extends Error {
 };
 function assertInsideChangeDir(outDir, candidate, id) {
   const rel = relative5(outDir, resolve6(candidate));
-  const isPlainFilename = rel !== "" && rel !== ".." && !isAbsolute6(rel) && rel === basename3(rel);
+  const isPlainFilename = rel !== "" && rel !== ".." && !isAbsolute6(rel) && rel === basename4(rel);
   if (!isPlainFilename)
     throw new InvalidChangeIdError(id);
 }
@@ -19568,7 +19714,7 @@ function runProveChild(binary, credential, repoRoot, words, deps = {}) {
 // dist/uninstall.js
 import { existsSync as existsSync17, lstatSync as lstatSync5, readFileSync as readFileSync23, readdirSync as readdirSync2, rmSync as rmSync9, rmdirSync as rmdirSync2, writeFileSync as writeFileSync9 } from "node:fs";
 import { homedir as homedir7 } from "node:os";
-import { dirname as dirname8, join as join28, relative as relative7, sep as sep3 } from "node:path";
+import { dirname as dirname9, join as join28, relative as relative7, sep as sep3 } from "node:path";
 var REMOVE_CREDENTIAL_FLAG = "--remove-credential";
 function parseUninstallArgs(args2) {
   let removeCredential = false;
@@ -19669,7 +19815,7 @@ function validate(options, rules) {
     }
     if (engagementId !== void 0) {
       const expectedParent = join28(home ?? homedir7(), HALFCYCLE_DIR_NAME, ENGAGEMENTS_DIR_NAME);
-      if (dirname8(engagementStateDir(engagementId, home)) !== expectedParent) {
+      if (dirname9(engagementStateDir(engagementId, home)) !== expectedParent) {
         throw new Refusal(`the project id in ${BUNDLE_PIN_REL} does not name a folder under ~/.halfcycle/engagements. Nothing was removed.`);
       }
     }
@@ -20452,7 +20598,7 @@ function filesUnder(root, rel) {
   walk(rel);
   return out;
 }
-function shownPath(path, home) {
+function shownPath2(path, home) {
   const base = home ?? homedir7();
   const rel = relative7(base, path);
   const under = rel !== "" && !rel.startsWith("..") && !rel.startsWith(sep3);
@@ -20483,7 +20629,7 @@ function renderUninstallReport(result, home) {
   const c = result.credential;
   switch (c.kind) {
     case "still-held":
-      out.push(`[halfcycle] This machine still holds this project's credential, at ${shownPath(c.dir, home)}.`);
+      out.push(`[halfcycle] This machine still holds this project's credential, at ${shownPath2(c.dir, home)}.`);
       out.push("  Every checkout and worktree of this project on this machine uses it.");
       out.push(`  To remove it too:  ${ownCommand()} uninstall ${REMOVE_CREDENTIAL_FLAG}`);
       break;
@@ -20491,18 +20637,18 @@ function renderUninstallReport(result, home) {
       out.push(`[halfcycle] This machine may still hold a credential for this project, but the project id in ${BUNDLE_PIN_REL} is not valid, so it is not shown as a path.`);
       break;
     case "removed":
-      out.push(`[halfcycle] Removed this machine's credential for this project, at ${shownPath(c.dir, home)}.`);
+      out.push(`[halfcycle] Removed this machine's credential for this project, at ${shownPath2(c.dir, home)}.`);
       out.push("  Every other checkout and worktree of this project on this machine used it too. Each stops reaching");
       out.push(`  Halfcycle until \`${ownCommand()}\` is run there again.`);
       break;
     case "not-held":
-      out.push(`[halfcycle] This machine holds no credential for this project (nothing at ${shownPath(c.dir, home)}).`);
+      out.push(`[halfcycle] This machine holds no credential for this project (nothing at ${shownPath2(c.dir, home)}).`);
       break;
     case "no-project-id":
       out.push(`[halfcycle] No credential was removed: ${BUNDLE_PIN_REL} is missing, so there is no project id to find it by.`);
       break;
     case "failed":
-      out.push(`[halfcycle] Could not remove this machine's credential for this project, at ${shownPath(c.dir, home)}: ${c.reason}. Run "${ownCommand()} uninstall ${REMOVE_CREDENTIAL_FLAG}" again to finish.`);
+      out.push(`[halfcycle] Could not remove this machine's credential for this project, at ${shownPath2(c.dir, home)}: ${c.reason}. Run "${ownCommand()} uninstall ${REMOVE_CREDENTIAL_FLAG}" again to finish.`);
       break;
     case "nothing-to-say":
       break;
@@ -20512,7 +20658,7 @@ function renderUninstallReport(result, home) {
 }
 
 // dist/banner-facts.js
-import { basename as basename4, resolve as resolve8 } from "node:path";
+import { basename as basename5, resolve as resolve8 } from "node:path";
 var BRAND_URL = "halfcycle.ai";
 var TAGLINE = [
   "Fewer cycles.",
@@ -20632,7 +20778,7 @@ function openingBannerContent(projectDir, env = process.env, probes = REAL_PROBE
 }
 function safeBasename(dir) {
   try {
-    const name = basename4(resolve8(dir)).trim();
+    const name = basename5(resolve8(dir)).trim();
     return name === "" ? "project" : name;
   } catch {
     return "project";
@@ -21910,6 +22056,9 @@ var USAGE = `  ${ownCommand()} [install] [target-repo] [engagement-id] [self-bui
          let your coding agent work without asking on this computer, for tests, builds, installs, local
          tools, files and local git; pushing, publishing, deploying, deleting and GitHub still ask;
          --remove takes out what this added and keeps everything of yours
+  ${REMOVE_COPY_USAGE}
+         remove one worker copy under .claude/worktrees/ and its worktree- branch, from the project's
+         main folder; a copy that may hold work is kept
   ${ownCommand()} uninstall [${REMOVE_CREDENTIAL_FLAG}]
          take out what the installer added to this project, keeping anything you changed
          ${REMOVE_CREDENTIAL_FLAG}: also remove this machine's credential for the project, which every
@@ -22089,6 +22238,22 @@ ${USAGE}`);
     process.exitCode = refused3 ? 1 : 0;
     return;
   }
+  if (cmd === "remove-copy") {
+    const given = rest[0];
+    if (rest.length !== 1 || given === void 0 || given === "" || given.startsWith("-")) {
+      process.stderr.write(`halfcycle remove-copy: usage: ${REMOVE_COPY_USAGE}
+`);
+      process.exitCode = 2;
+      return;
+    }
+    const done = removeWorkerCopy(process.cwd(), given);
+    if (done.verdict)
+      exitIsAVerdict();
+    (done.exitCode === 0 ? process.stdout : process.stderr).write(`${done.line}
+`);
+    process.exitCode = done.exitCode;
+    return;
+  }
   if (installArm) {
     const engagementIdArg = positionals[1];
     const engagementTypeRaw = positionals[2] ?? "client";