@ricsam/r5dctl 0.0.121 → 0.0.122

package/README.md

@@ -59,6 +59,8 @@ r5dctl -p <project> create branch <branch> --source worktree:<branch> [--working
 r5dctl -p <project> describe branch-operation <operation-id>
 r5dctl -p <project> delete branch <branch> [<branch>...]            # preview the sessions that would be deleted, exit 1
 r5dctl -p <project> delete branch <branch> [<branch>...] --confirm  # delete the branches and their sessions through the platform
+r5dctl -p <project> delete branch <branch> --confirm --no-wait      # accept the deletion and print its branch id instead of waiting
+r5dctl -p <project> describe branch-deletion <branch-id>            # pending, failed, or completed
 r5dctl -p <project> get envs
 r5dctl -p <project> get envs --show-values
 r5dctl -p <project> get env API_KEY
@@ -127,7 +129,7 @@ pull requests.
 
 `create branch` creates a linked worktree branch through the platform from an existing branch's checkout, with the same `--source worktree:<branch>` and `--working-tree carry|clean` semantics as `session start --new-worktree` (carry is the default) and no session prompt. `--worker <label>` selects the connected worker that cuts the checkout; omitted, the platform chooses one, and an r5d worker shell's temporary credential is always bound to its own worker. The command returns as soon as the operation is accepted and prints its id; `describe branch-operation <operation-id>` reports `provisioning`, `ready`, or `failed` with the worker and any error. Neither prints a commit hash: read the branch with git in its checkout once it is ready.
 
-`delete branch` removes one or more branches and every session on them through the platform, which is the only supported way to remove a linked worktree: the platform owns those checkouts, so never run `git worktree remove`, `git worktree prune`, or `git branch -D` inside a project checkout. Without `--confirm` it prints each branch and its sessions and exits non-zero without deleting anything. With `--confirm` the branches are deleted one after another, each prints its own result line, a failure does not stop the remaining deletions, and the exit status is non-zero if any branch failed. The primary branch `main` is refused before anything is deleted, as is a branch with a running agent or active process (stop them first). A worker that is still applying a configuration refresh makes a deletion wait on the server for up to 45 seconds; if the refresh is still running after that, the result line says so and the branch can be retried. On a server that predates the route, the command explains that the server does not support `delete branch` yet instead of reporting a missing branch.
+`delete branch` removes one or more branches and every session on them through the platform, which is the only supported way to remove a linked worktree: the platform owns those checkouts, so never run `git worktree remove`, `git worktree prune`, or `git branch -D` inside a project checkout. Without `--confirm` it prints each branch and its sessions and exits non-zero without deleting anything. With `--confirm` each branch is resolved to the exact managed branch it names today, its deletion is accepted at once by the platform, and the command waits (polling every 2 seconds, up to 10 minutes) until the platform reports it completed before requesting the next one; a failure does not stop the remaining deletions, and the exit status is non-zero if any branch failed. `--no-wait` prints the accepted branch id instead of waiting; `describe branch-deletion <branch-id>` reports `pending` (with the retry reason when the worker has not answered yet), `failed` with the platform's error, or `completed`, and answers `completed` for a branch id that no longer exists. The deletion stays bound to that branch id: a same-name branch created afterwards is never deleted by an old request, and re-running the command for a branch whose deletion failed retries it. The primary branch `main` is refused before anything is deleted, as is a branch with a running agent or active process (stop them first); a name that only has sessions and no managed branch is refused too (delete those sessions with `delete session`). On a server that predates the route, the command explains that the server does not support `delete branch` yet instead of reporting a missing branch.
 
 `get branches` lists every branch the project knows about, including managed branches without sessions. A worker whose workspace sync found a configured branch's checkout directory missing, or present but not a linked worktree of the project, skips that branch and reports it; the listing then shows `checkout=missing on <worker>` or `checkout=not_a_worktree on <worker>`, and `workspace status` prints a `Missing checkouts on <worker>` line. Recover either by deleting the branch with `delete branch <branch> --confirm` or by reconnecting that worker, which recreates the checkout without snapshotting the project's other checkouts.
 

package/dist/cjs/cli.cjs

@@ -28,6 +28,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var cli_exports = {};
 __export(cli_exports, {
+  BRANCH_DELETION_POLL_INTERVAL_MS: () => BRANCH_DELETION_POLL_INTERVAL_MS,
+  BRANCH_DELETION_WAIT_TIMEOUT_MS: () => BRANCH_DELETION_WAIT_TIMEOUT_MS,
   advanceTransientDevicePollBackoff: () => advanceTransientDevicePollBackoff,
   branchDeletionConfirmationMessage: () => branchDeletionConfirmationMessage,
   branchDeletionsConfirmationMessage: () => branchDeletionsConfirmationMessage,
@@ -77,6 +79,7 @@ __export(cli_exports, {
   renderBranchDeletion: () => renderBranchDeletion,
   renderBranchDeletionPreview: () => renderBranchDeletionPreview,
   renderBranchDeletionResult: () => renderBranchDeletionResult,
+  renderBranchDeletionStatus: () => renderBranchDeletionStatus,
   renderBranchList: () => renderBranchList,
   renderBranchOperation: () => renderBranchOperation,
   renderConversationForkResponse: () => renderConversationForkResponse,
@@ -102,6 +105,7 @@ __export(cli_exports, {
   resolveCommandExecution: () => resolveCommandExecution,
   runR5dctlCli: () => runR5dctlCli,
   summarizeEnvData: () => summarizeEnvData,
+  waitForBranchDeletion: () => waitForBranchDeletion,
   waitForSessionProvisioning: () => waitForSessionProvisioning,
   writeConfig: () => writeConfig
 });
@@ -247,8 +251,13 @@ const SHARED_HELP_ENTRIES = [
   },
   {
     section: "branches",
-    usage: "-p <project> delete branch <branch> [<branch>...] [--confirm]",
-    description: "Delete one or more branches and their sessions through the platform; without --confirm, only preview what would be deleted."
+    usage: "-p <project> delete branch <branch> [<branch>...] [--confirm] [--no-wait]",
+    description: "Delete one or more branches and their sessions through the platform; without --confirm, only preview what would be deleted. Each deletion is accepted at once and awaited until the platform finishes it; --no-wait prints the accepted branch ids instead."
+  },
+  {
+    section: "branches",
+    usage: "-p <project> describe branch-deletion <branch-id>",
+    description: "Show whether an accepted branch deletion is pending, failed, or completed."
   },
   {
     section: "envs",
@@ -656,16 +665,21 @@ function parseBranchCreateArgs(args) {
 function parseBranchDeleteArgs(args) {
   const branchNames = [];
   let confirmed = false;
+  let noWait = false;
   for (const arg of args) {
     if (arg === "--confirm") {
       confirmed = true;
       continue;
     }
+    if (arg === "--no-wait") {
+      noWait = true;
+      continue;
+    }
     if (arg.startsWith("-")) throw new Error(`Unknown delete branch flag: ${arg}`);
     if (branchNames.includes(arg)) throw new Error(`Branch ${arg} was given more than once`);
     branchNames.push(arg);
   }
-  return { branchNames, confirmed };
+  return { branchNames, confirmed, noWait };
 }
 const PRIMARY_BRANCH_NAME = "main";
 function isUnsupportedServerRoute(error) {
@@ -693,12 +707,66 @@ async function createBranchThroughPlatform(client, projectRef, input) {
     })
   );
 }
+const BRANCH_DELETION_POLL_INTERVAL_MS = 2e3;
+const BRANCH_DELETION_WAIT_TIMEOUT_MS = 10 * 60 * 1e3;
+async function waitForBranchDeletion(client, projectRef, branchId, options = {}) {
+  const pollIntervalMs = options.pollIntervalMs ?? BRANCH_DELETION_POLL_INTERVAL_MS;
+  const timeoutMs = options.timeoutMs ?? BRANCH_DELETION_WAIT_TIMEOUT_MS;
+  const wait = options.sleep ?? ((ms) => (0, import_promises.setTimeout)(ms));
+  const deadline = Date.now() + timeoutMs;
+  for (; ; ) {
+    const status = await client.projects.branches.describeDeletion(projectRef, branchId);
+    if (status.status === "completed") return;
+    if (status.status === "failed") throw new Error(status.error ?? "Branch deletion failed");
+    if (Date.now() >= deadline) {
+      throw new Error(
+        `Branch deletion ${branchId} is still pending after ${Math.round(timeoutMs / 1e3)}s${status.retryReason ? ` (${status.retryReason})` : ""}; it continues on the platform, re-run to keep waiting`
+      );
+    }
+    await wait(pollIntervalMs);
+  }
+}
+async function resolveUncertainAcceptance(client, projectRef, branchId, error) {
+  if (error.status !== 503) return null;
+  try {
+    const status = await client.projects.branches.describeDeletion(projectRef, branchId);
+    return { status: status.status };
+  } catch {
+    return null;
+  }
+}
 async function deleteBranchThroughPlatform(client, projectRef, branchName, options) {
   if (branchName === PRIMARY_BRANCH_NAME) throw new Error(`The primary branch ${branchName} cannot be deleted`);
   const branch = await client.projects.branches.describe(projectRef, branchName);
   if (!options.confirmed) return { kind: "preview", branch };
-  const result = await requireServerRouteSupport("delete branch", () => client.projects.branches.delete(projectRef, branchName));
-  return { kind: "deleted", result };
+  if (!branch.branchId) {
+    throw new Error(
+      `Branch ${branchName} has no managed checkout, only ${branch.sessions.length} session(s); delete those with \`delete session <id>\``
+    );
+  }
+  const branchId = branch.branchId;
+  let accepted;
+  try {
+    accepted = await requireServerRouteSupport("delete branch", () => client.projects.branches.delete(projectRef, branchName, { branchId }));
+  } catch (error) {
+    const landed = error instanceof import_r5d_api.R5dctlApiError ? await resolveUncertainAcceptance(client, projectRef, branchId, error) : null;
+    if (!landed) throw error;
+    const sessionIds = branch.sessions.map((session) => session.id);
+    accepted = landed.status === "completed" ? { status: "completed", branchId, branchName, sessionIds } : { status: "pending", branchId, branchName, workerLabel: "", sessionIds };
+  }
+  if (accepted.status === "completed" && accepted.sessionIds.length > 0) {
+    return { kind: "deleted", result: { branchName, branchId, deletedSessionIds: accepted.sessionIds } };
+  }
+  if (accepted.status === "completed") return { kind: "deleted", result: { branchName, branchId, deletedSessionIds: [] } };
+  if (options.noWait) {
+    return { kind: "accepted", result: { branchName, branchId, sessionIds: accepted.sessionIds, workerLabel: accepted.workerLabel } };
+  }
+  await waitForBranchDeletion(client, projectRef, branchId, {
+    ...options.pollIntervalMs !== void 0 ? { pollIntervalMs: options.pollIntervalMs } : {},
+    ...options.timeoutMs !== void 0 ? { timeoutMs: options.timeoutMs } : {},
+    ...options.sleep ? { sleep: options.sleep } : {}
+  });
+  return { kind: "deleted", result: { branchName, branchId, deletedSessionIds: accepted.sessionIds } };
 }
 async function deleteBranchesThroughPlatform(client, projectRef, branchNames, options) {
   if (branchNames.length === 0) throw new Error("Missing branch name");
@@ -716,9 +784,15 @@ async function deleteBranchesThroughPlatform(client, projectRef, branchNames, op
   for (const branchName of branchNames) {
     let result;
     try {
-      const deletion = await deleteBranchThroughPlatform(client, projectRef, branchName, { confirmed: true });
-      if (deletion.kind !== "deleted") throw new Error(`Branch ${branchName} was only previewed`);
-      result = { branchName, deleted: true, deletedSessionIds: deletion.result.deletedSessionIds };
+      const deletion = await deleteBranchThroughPlatform(client, projectRef, branchName, {
+        confirmed: true,
+        ...options.noWait !== void 0 ? { noWait: options.noWait } : {},
+        ...options.pollIntervalMs !== void 0 ? { pollIntervalMs: options.pollIntervalMs } : {},
+        ...options.timeoutMs !== void 0 ? { timeoutMs: options.timeoutMs } : {},
+        ...options.sleep ? { sleep: options.sleep } : {}
+      });
+      if (deletion.kind === "preview") throw new Error(`Branch ${branchName} was only previewed`);
+      result = deletion.kind === "deleted" ? { branchName, deleted: true, deletedSessionIds: deletion.result.deletedSessionIds } : { branchName, deleted: false, accepted: true, branchId: deletion.result.branchId, sessionIds: deletion.result.sessionIds };
     } catch (error) {
       result = {
         branchName,
@@ -732,7 +806,21 @@ async function deleteBranchesThroughPlatform(client, projectRef, branchNames, op
   return { kind: "deleted", results };
 }
 function renderBranchDeletionResult(result) {
-  return result.deleted ? renderBranchDeletion(result) : `Failed to delete branch ${result.branchName}: ${result.error}
+  if (result.deleted) return renderBranchDeletion(result);
+  if (result.accepted) {
+    return `Accepted deletion of branch ${result.branchName} (${result.sessionIds.length} session(s)); it continues on the platform. Check with \`describe branch-deletion ${result.branchId}\`.
+`;
+  }
+  return `Failed to delete branch ${result.branchName}: ${result.error}
+`;
+}
+function renderBranchDeletionStatus(status) {
+  const lines = [`Branch: ${status.branchName ?? "(deleted)"}`, `Branch id: ${status.branchId}`, `Status: ${status.status}`];
+  if (status.workerLabel) lines.push(`Worker: ${status.workerLabel}`);
+  if (status.attempts !== void 0) lines.push(`Attempts: ${status.attempts}`);
+  if (status.retryReason) lines.push(`Retrying: ${status.retryReason}`);
+  if (status.error) lines.push(`Error: ${status.error}`);
+  return `${lines.join("\n")}
 `;
 }
 function branchDeletionsConfirmationMessage(branches) {
@@ -742,7 +830,7 @@ function branchDeletionsConfirmationMessage(branches) {
   return `Nothing was deleted. Re-run with --confirm to delete ${branches.length} branches and their ${sessionCount} session(s).`;
 }
 function branchDeletionsFailureMessage(results) {
-  return `Failed to delete ${results.filter((result) => !result.deleted).length} of ${results.length} branch(es).`;
+  return `Failed to delete ${results.filter((result) => !result.deleted && !result.accepted).length} of ${results.length} branch(es).`;
 }
 function renderBranchDeletionPreview(branch) {
   const count = branch.sessions.length;
@@ -1830,7 +1918,8 @@ function renderBranchList(branches) {
   if (branches.length === 0) return "No branches found.\n";
   const lines = branches.map((branch) => {
     const checkout = branch.checkoutState ? `  checkout=${branch.checkoutState}${branch.checkoutStateWorkerLabel ? ` on ${branch.checkoutStateWorkerLabel}` : ""}` : "";
-    return `${branch.branchName}  sessions=${branch.sessionCount}${checkout}`;
+    const deletion = branch.deletion ? `  deletion=${branch.deletion.status}${branch.deletion.error ? ` (${branch.deletion.error})` : ""}` : "";
+    return `${branch.branchName}  sessions=${branch.sessionCount}${checkout}${deletion}`;
   });
   if (branches.some((branch) => branch.checkoutState)) {
     lines.push(`Workspace sync skips a branch whose checkout is missing or not a worktree; ${CHECKOUT_RECOVERY_HINT}.`);
@@ -3091,10 +3180,15 @@ async function executeR5dctlCommand(client, json, args) {
       requireValue(args[offset], "Missing project reference"),
       requireValue(args[offset + 1], "Missing branch name")
     );
-    write(result, `Project: ${result.project.path}
+    write(
+      result,
+      `Project: ${result.project.path}
 Branch: ${result.branchName}
-Sessions: ${result.sessions.length}
-`);
+Branch id: ${result.branchId ?? "(no managed branch)"}
+${result.deletion ? `Deletion: ${result.deletion.status}${result.deletion.error ? ` (${result.deletion.error})` : ""}
+` : ""}Sessions: ${result.sessions.length}
+`
+    );
     return;
   }
   if (first === "projects" && second === "branches" && third === "create" || first === "create" && second === "branch") {
@@ -3122,9 +3216,10 @@ Sessions: ${result.sessions.length}
   if (first === "projects" && second === "branches" && third === "delete" || first === "delete" && second === "branch") {
     const offset = first === "delete" ? 2 : 3;
     const projectRef = requireValue(args[offset], "Missing project reference");
-    const { branchNames, confirmed } = parseBranchDeleteArgs(args.slice(offset + 1));
+    const { branchNames, confirmed, noWait } = parseBranchDeleteArgs(args.slice(offset + 1));
     const deletion = await deleteBranchesThroughPlatform(client, projectRef, branchNames, {
       confirmed,
+      noWait,
       // Each deletion is its own round trip, so a reader sees results as they land.
       onResult: (result) => {
         if (!json) process.stdout.write(renderBranchDeletionResult(result));
@@ -3135,7 +3230,15 @@ Sessions: ${result.sessions.length}
       throw new Error(branchDeletionsConfirmationMessage(deletion.branches));
     }
     if (json) write({ results: deletion.results }, "");
-    if (deletion.results.some((result) => !result.deleted)) throw new Error(branchDeletionsFailureMessage(deletion.results));
+    if (deletion.results.some((result) => !result.deleted && !result.accepted)) throw new Error(branchDeletionsFailureMessage(deletion.results));
+    return;
+  }
+  if (first === "projects" && second === "branches" && third === "describe-deletion" || first === "describe" && second === "branch-deletion") {
+    const offset = first === "describe" ? 2 : 3;
+    const projectRef = requireValue(args[offset], "Missing project reference");
+    const branchId = requireValue(args[offset + 1], "Missing branch id");
+    const status = await requireServerRouteSupport("describe branch-deletion", () => client.projects.branches.describeDeletion(projectRef, branchId));
+    write(status, renderBranchDeletionStatus(status));
     return;
   }
   if (first === "get" && second === "envs") {
@@ -3928,6 +4031,8 @@ async function main(argv = process.argv.slice(2)) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  BRANCH_DELETION_POLL_INTERVAL_MS,
+  BRANCH_DELETION_WAIT_TIMEOUT_MS,
   advanceTransientDevicePollBackoff,
   branchDeletionConfirmationMessage,
   branchDeletionsConfirmationMessage,
@@ -3977,6 +4082,7 @@ async function main(argv = process.argv.slice(2)) {
   renderBranchDeletion,
   renderBranchDeletionPreview,
   renderBranchDeletionResult,
+  renderBranchDeletionStatus,
   renderBranchList,
   renderBranchOperation,
   renderConversationForkResponse,
@@ -4002,6 +4108,7 @@ async function main(argv = process.argv.slice(2)) {
   resolveCommandExecution,
   runR5dctlCli,
   summarizeEnvData,
+  waitForBranchDeletion,
   waitForSessionProvisioning,
   writeConfig
 });

package/dist/cjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5dctl",
-  "version": "0.0.121",
+  "version": "0.0.122",
   "type": "commonjs"
 }

package/dist/mjs/cli.mjs

@@ -142,8 +142,13 @@ const SHARED_HELP_ENTRIES = [
   },
   {
     section: "branches",
-    usage: "-p <project> delete branch <branch> [<branch>...] [--confirm]",
-    description: "Delete one or more branches and their sessions through the platform; without --confirm, only preview what would be deleted."
+    usage: "-p <project> delete branch <branch> [<branch>...] [--confirm] [--no-wait]",
+    description: "Delete one or more branches and their sessions through the platform; without --confirm, only preview what would be deleted. Each deletion is accepted at once and awaited until the platform finishes it; --no-wait prints the accepted branch ids instead."
+  },
+  {
+    section: "branches",
+    usage: "-p <project> describe branch-deletion <branch-id>",
+    description: "Show whether an accepted branch deletion is pending, failed, or completed."
   },
   {
     section: "envs",
@@ -551,16 +556,21 @@ function parseBranchCreateArgs(args) {
 function parseBranchDeleteArgs(args) {
   const branchNames = [];
   let confirmed = false;
+  let noWait = false;
   for (const arg of args) {
     if (arg === "--confirm") {
       confirmed = true;
       continue;
     }
+    if (arg === "--no-wait") {
+      noWait = true;
+      continue;
+    }
     if (arg.startsWith("-")) throw new Error(`Unknown delete branch flag: ${arg}`);
     if (branchNames.includes(arg)) throw new Error(`Branch ${arg} was given more than once`);
     branchNames.push(arg);
   }
-  return { branchNames, confirmed };
+  return { branchNames, confirmed, noWait };
 }
 const PRIMARY_BRANCH_NAME = "main";
 function isUnsupportedServerRoute(error) {
@@ -588,12 +598,66 @@ async function createBranchThroughPlatform(client, projectRef, input) {
     })
   );
 }
+const BRANCH_DELETION_POLL_INTERVAL_MS = 2e3;
+const BRANCH_DELETION_WAIT_TIMEOUT_MS = 10 * 60 * 1e3;
+async function waitForBranchDeletion(client, projectRef, branchId, options = {}) {
+  const pollIntervalMs = options.pollIntervalMs ?? BRANCH_DELETION_POLL_INTERVAL_MS;
+  const timeoutMs = options.timeoutMs ?? BRANCH_DELETION_WAIT_TIMEOUT_MS;
+  const wait = options.sleep ?? ((ms) => sleep(ms));
+  const deadline = Date.now() + timeoutMs;
+  for (; ; ) {
+    const status = await client.projects.branches.describeDeletion(projectRef, branchId);
+    if (status.status === "completed") return;
+    if (status.status === "failed") throw new Error(status.error ?? "Branch deletion failed");
+    if (Date.now() >= deadline) {
+      throw new Error(
+        `Branch deletion ${branchId} is still pending after ${Math.round(timeoutMs / 1e3)}s${status.retryReason ? ` (${status.retryReason})` : ""}; it continues on the platform, re-run to keep waiting`
+      );
+    }
+    await wait(pollIntervalMs);
+  }
+}
+async function resolveUncertainAcceptance(client, projectRef, branchId, error) {
+  if (error.status !== 503) return null;
+  try {
+    const status = await client.projects.branches.describeDeletion(projectRef, branchId);
+    return { status: status.status };
+  } catch {
+    return null;
+  }
+}
 async function deleteBranchThroughPlatform(client, projectRef, branchName, options) {
   if (branchName === PRIMARY_BRANCH_NAME) throw new Error(`The primary branch ${branchName} cannot be deleted`);
   const branch = await client.projects.branches.describe(projectRef, branchName);
   if (!options.confirmed) return { kind: "preview", branch };
-  const result = await requireServerRouteSupport("delete branch", () => client.projects.branches.delete(projectRef, branchName));
-  return { kind: "deleted", result };
+  if (!branch.branchId) {
+    throw new Error(
+      `Branch ${branchName} has no managed checkout, only ${branch.sessions.length} session(s); delete those with \`delete session <id>\``
+    );
+  }
+  const branchId = branch.branchId;
+  let accepted;
+  try {
+    accepted = await requireServerRouteSupport("delete branch", () => client.projects.branches.delete(projectRef, branchName, { branchId }));
+  } catch (error) {
+    const landed = error instanceof R5dctlApiError ? await resolveUncertainAcceptance(client, projectRef, branchId, error) : null;
+    if (!landed) throw error;
+    const sessionIds = branch.sessions.map((session) => session.id);
+    accepted = landed.status === "completed" ? { status: "completed", branchId, branchName, sessionIds } : { status: "pending", branchId, branchName, workerLabel: "", sessionIds };
+  }
+  if (accepted.status === "completed" && accepted.sessionIds.length > 0) {
+    return { kind: "deleted", result: { branchName, branchId, deletedSessionIds: accepted.sessionIds } };
+  }
+  if (accepted.status === "completed") return { kind: "deleted", result: { branchName, branchId, deletedSessionIds: [] } };
+  if (options.noWait) {
+    return { kind: "accepted", result: { branchName, branchId, sessionIds: accepted.sessionIds, workerLabel: accepted.workerLabel } };
+  }
+  await waitForBranchDeletion(client, projectRef, branchId, {
+    ...options.pollIntervalMs !== void 0 ? { pollIntervalMs: options.pollIntervalMs } : {},
+    ...options.timeoutMs !== void 0 ? { timeoutMs: options.timeoutMs } : {},
+    ...options.sleep ? { sleep: options.sleep } : {}
+  });
+  return { kind: "deleted", result: { branchName, branchId, deletedSessionIds: accepted.sessionIds } };
 }
 async function deleteBranchesThroughPlatform(client, projectRef, branchNames, options) {
   if (branchNames.length === 0) throw new Error("Missing branch name");
@@ -611,9 +675,15 @@ async function deleteBranchesThroughPlatform(client, projectRef, branchNames, op
   for (const branchName of branchNames) {
     let result;
     try {
-      const deletion = await deleteBranchThroughPlatform(client, projectRef, branchName, { confirmed: true });
-      if (deletion.kind !== "deleted") throw new Error(`Branch ${branchName} was only previewed`);
-      result = { branchName, deleted: true, deletedSessionIds: deletion.result.deletedSessionIds };
+      const deletion = await deleteBranchThroughPlatform(client, projectRef, branchName, {
+        confirmed: true,
+        ...options.noWait !== void 0 ? { noWait: options.noWait } : {},
+        ...options.pollIntervalMs !== void 0 ? { pollIntervalMs: options.pollIntervalMs } : {},
+        ...options.timeoutMs !== void 0 ? { timeoutMs: options.timeoutMs } : {},
+        ...options.sleep ? { sleep: options.sleep } : {}
+      });
+      if (deletion.kind === "preview") throw new Error(`Branch ${branchName} was only previewed`);
+      result = deletion.kind === "deleted" ? { branchName, deleted: true, deletedSessionIds: deletion.result.deletedSessionIds } : { branchName, deleted: false, accepted: true, branchId: deletion.result.branchId, sessionIds: deletion.result.sessionIds };
     } catch (error) {
       result = {
         branchName,
@@ -627,7 +697,21 @@ async function deleteBranchesThroughPlatform(client, projectRef, branchNames, op
   return { kind: "deleted", results };
 }
 function renderBranchDeletionResult(result) {
-  return result.deleted ? renderBranchDeletion(result) : `Failed to delete branch ${result.branchName}: ${result.error}
+  if (result.deleted) return renderBranchDeletion(result);
+  if (result.accepted) {
+    return `Accepted deletion of branch ${result.branchName} (${result.sessionIds.length} session(s)); it continues on the platform. Check with \`describe branch-deletion ${result.branchId}\`.
+`;
+  }
+  return `Failed to delete branch ${result.branchName}: ${result.error}
+`;
+}
+function renderBranchDeletionStatus(status) {
+  const lines = [`Branch: ${status.branchName ?? "(deleted)"}`, `Branch id: ${status.branchId}`, `Status: ${status.status}`];
+  if (status.workerLabel) lines.push(`Worker: ${status.workerLabel}`);
+  if (status.attempts !== void 0) lines.push(`Attempts: ${status.attempts}`);
+  if (status.retryReason) lines.push(`Retrying: ${status.retryReason}`);
+  if (status.error) lines.push(`Error: ${status.error}`);
+  return `${lines.join("\n")}
 `;
 }
 function branchDeletionsConfirmationMessage(branches) {
@@ -637,7 +721,7 @@ function branchDeletionsConfirmationMessage(branches) {
   return `Nothing was deleted. Re-run with --confirm to delete ${branches.length} branches and their ${sessionCount} session(s).`;
 }
 function branchDeletionsFailureMessage(results) {
-  return `Failed to delete ${results.filter((result) => !result.deleted).length} of ${results.length} branch(es).`;
+  return `Failed to delete ${results.filter((result) => !result.deleted && !result.accepted).length} of ${results.length} branch(es).`;
 }
 function renderBranchDeletionPreview(branch) {
   const count = branch.sessions.length;
@@ -1725,7 +1809,8 @@ function renderBranchList(branches) {
   if (branches.length === 0) return "No branches found.\n";
   const lines = branches.map((branch) => {
     const checkout = branch.checkoutState ? `  checkout=${branch.checkoutState}${branch.checkoutStateWorkerLabel ? ` on ${branch.checkoutStateWorkerLabel}` : ""}` : "";
-    return `${branch.branchName}  sessions=${branch.sessionCount}${checkout}`;
+    const deletion = branch.deletion ? `  deletion=${branch.deletion.status}${branch.deletion.error ? ` (${branch.deletion.error})` : ""}` : "";
+    return `${branch.branchName}  sessions=${branch.sessionCount}${checkout}${deletion}`;
   });
   if (branches.some((branch) => branch.checkoutState)) {
     lines.push(`Workspace sync skips a branch whose checkout is missing or not a worktree; ${CHECKOUT_RECOVERY_HINT}.`);
@@ -2986,10 +3071,15 @@ async function executeR5dctlCommand(client, json, args) {
       requireValue(args[offset], "Missing project reference"),
       requireValue(args[offset + 1], "Missing branch name")
     );
-    write(result, `Project: ${result.project.path}
+    write(
+      result,
+      `Project: ${result.project.path}
 Branch: ${result.branchName}
-Sessions: ${result.sessions.length}
-`);
+Branch id: ${result.branchId ?? "(no managed branch)"}
+${result.deletion ? `Deletion: ${result.deletion.status}${result.deletion.error ? ` (${result.deletion.error})` : ""}
+` : ""}Sessions: ${result.sessions.length}
+`
+    );
     return;
   }
   if (first === "projects" && second === "branches" && third === "create" || first === "create" && second === "branch") {
@@ -3017,9 +3107,10 @@ Sessions: ${result.sessions.length}
   if (first === "projects" && second === "branches" && third === "delete" || first === "delete" && second === "branch") {
     const offset = first === "delete" ? 2 : 3;
     const projectRef = requireValue(args[offset], "Missing project reference");
-    const { branchNames, confirmed } = parseBranchDeleteArgs(args.slice(offset + 1));
+    const { branchNames, confirmed, noWait } = parseBranchDeleteArgs(args.slice(offset + 1));
     const deletion = await deleteBranchesThroughPlatform(client, projectRef, branchNames, {
       confirmed,
+      noWait,
       // Each deletion is its own round trip, so a reader sees results as they land.
       onResult: (result) => {
         if (!json) process.stdout.write(renderBranchDeletionResult(result));
@@ -3030,7 +3121,15 @@ Sessions: ${result.sessions.length}
       throw new Error(branchDeletionsConfirmationMessage(deletion.branches));
     }
     if (json) write({ results: deletion.results }, "");
-    if (deletion.results.some((result) => !result.deleted)) throw new Error(branchDeletionsFailureMessage(deletion.results));
+    if (deletion.results.some((result) => !result.deleted && !result.accepted)) throw new Error(branchDeletionsFailureMessage(deletion.results));
+    return;
+  }
+  if (first === "projects" && second === "branches" && third === "describe-deletion" || first === "describe" && second === "branch-deletion") {
+    const offset = first === "describe" ? 2 : 3;
+    const projectRef = requireValue(args[offset], "Missing project reference");
+    const branchId = requireValue(args[offset + 1], "Missing branch id");
+    const status = await requireServerRouteSupport("describe branch-deletion", () => client.projects.branches.describeDeletion(projectRef, branchId));
+    write(status, renderBranchDeletionStatus(status));
     return;
   }
   if (first === "get" && second === "envs") {
@@ -3822,6 +3921,8 @@ async function main(argv = process.argv.slice(2)) {
   }
 }
 export {
+  BRANCH_DELETION_POLL_INTERVAL_MS,
+  BRANCH_DELETION_WAIT_TIMEOUT_MS,
   advanceTransientDevicePollBackoff,
   branchDeletionConfirmationMessage,
   branchDeletionsConfirmationMessage,
@@ -3871,6 +3972,7 @@ export {
   renderBranchDeletion,
   renderBranchDeletionPreview,
   renderBranchDeletionResult,
+  renderBranchDeletionStatus,
   renderBranchList,
   renderBranchOperation,
   renderConversationForkResponse,
@@ -3896,6 +3998,7 @@ export {
   resolveCommandExecution,
   runR5dctlCli,
   summarizeEnvData,
+  waitForBranchDeletion,
   waitForSessionProvisioning,
   writeConfig
 };

package/dist/mjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5dctl",
-  "version": "0.0.121",
+  "version": "0.0.122",
   "type": "module"
 }

package/dist/types/cli.d.ts

@@ -1,4 +1,4 @@
-import { R5dctlApiError, R5dctlClient, type R5dctlConversationForkResponse, type R5dctlConversationHeadResponse, type R5dctlConversationRenderOptions, type R5dctlConversationResponse, type R5dctlConversationNodeResponse, type R5dctlConversationOverviewResponse, type R5dctlConversationWorkDetail, type R5dctlConversationWorkResponse, type R5dctlEnvData, type R5dctlK8sResourceHistory, type R5dctlK8sUsage, type R5dctlK8sWorkload, type R5dctlProcessInspection, type R5dctlProcessListInput, type R5dctlProcessLog, type R5dctlProcessRun, type R5dctlBranch, type R5dctlBranchDeleteResponse, type R5dctlBranchDescription, type R5dctlBranchOperation, type R5dctlSessionSummary, type R5dctlSessionClaim, type R5dctlSessionClaimListResponse, type R5dctlSessionEvent, type R5dctlSessionStartInput, type R5dctlWorkspaceStatus, type R5dctlWorkspaceSyncResult, type R5dctlWorkingTreeMode, type R5dctlWorktreeSource, type R5dctlPromptDelivery, type R5dctlSessionMode, type ChatMode, type ModelTier } from "@ricsam/r5d-api";
+import { R5dctlApiError, R5dctlClient, type R5dctlConversationForkResponse, type R5dctlConversationHeadResponse, type R5dctlConversationRenderOptions, type R5dctlConversationResponse, type R5dctlConversationNodeResponse, type R5dctlConversationOverviewResponse, type R5dctlConversationWorkDetail, type R5dctlConversationWorkResponse, type R5dctlEnvData, type R5dctlK8sResourceHistory, type R5dctlK8sUsage, type R5dctlK8sWorkload, type R5dctlProcessInspection, type R5dctlProcessListInput, type R5dctlProcessLog, type R5dctlProcessRun, type R5dctlBranch, type R5dctlBranchDeletionStatus, type R5dctlBranchDescription, type R5dctlBranchOperation, type R5dctlSessionSummary, type R5dctlSessionClaim, type R5dctlSessionClaimListResponse, type R5dctlSessionEvent, type R5dctlSessionStartInput, type R5dctlWorkspaceStatus, type R5dctlWorkspaceSyncResult, type R5dctlWorkingTreeMode, type R5dctlWorktreeSource, type R5dctlPromptDelivery, type R5dctlSessionMode, type ChatMode, type ModelTier } from "@ricsam/r5d-api";
 export type GlobalOptions = {
     baseUrl?: string;
     json: boolean;
@@ -90,6 +90,7 @@ export declare function parseBranchCreateArgs(args: string[]): R5dctlBranchCreat
 export declare function parseBranchDeleteArgs(args: string[]): {
     branchNames: string[];
     confirmed: boolean;
+    noWait: boolean;
 };
 /** An older server strips unknown routes and answers with this generic 404; a route's own not-found carries a specific message. */
 export declare function isUnsupportedServerRoute(error: unknown): error is R5dctlApiError;
@@ -101,10 +102,39 @@ export type R5dctlBranchDeletionOutcome = {
     branch: R5dctlBranchDescription;
 } | {
     kind: "deleted";
-    result: R5dctlBranchDeleteResponse;
+    result: {
+        branchName: string;
+        branchId: string;
+        deletedSessionIds: string[];
+    };
+} | {
+    kind: "accepted";
+    result: {
+        branchName: string;
+        branchId: string;
+        sessionIds: string[];
+        workerLabel: string;
+    };
 };
+/** The platform answers an accepted deletion at once; the checkout and chats disappear behind this poll. */
+export declare const BRANCH_DELETION_POLL_INTERVAL_MS = 2000;
+export declare const BRANCH_DELETION_WAIT_TIMEOUT_MS: number;
+/**
+ * Wait for one accepted deletion, keyed by its exact branch incarnation. A
+ * `completed` status is the terminal success; a `failed` status carries the
+ * platform's reason and is not retried here (re-run the command to retry).
+ */
+export declare function waitForBranchDeletion(client: R5dctlClient, projectRef: string, branchId: string, options?: {
+    pollIntervalMs?: number;
+    timeoutMs?: number;
+    sleep?: (ms: number) => Promise<void>;
+}): Promise<void>;
 export declare function deleteBranchThroughPlatform(client: R5dctlClient, projectRef: string, branchName: string, options: {
     confirmed: boolean;
+    noWait?: boolean;
+    pollIntervalMs?: number;
+    timeoutMs?: number;
+    sleep?: (ms: number) => Promise<void>;
 }): Promise<R5dctlBranchDeletionOutcome>;
 export type R5dctlBranchDeletionResult = {
     branchName: string;
@@ -113,6 +143,13 @@ export type R5dctlBranchDeletionResult = {
 } | {
     branchName: string;
     deleted: false;
+    accepted: true;
+    branchId: string;
+    sessionIds: string[];
+} | {
+    branchName: string;
+    deleted: false;
+    accepted?: false;
     error: string;
 };
 export type R5dctlBranchDeletionsOutcome = {
@@ -126,18 +163,29 @@ export type R5dctlBranchDeletionsOutcome = {
  * Delete several branches one request at a time: the server route stays
  * one-branch-per-request. Every name is checked before the first request, a
  * preview describes each branch, and a confirmed run continues past a failed
- * branch so one refused deletion does not strand the rest of the list.
+ * branch so one refused deletion does not strand the rest of the list. Each
+ * accepted deletion is awaited before the next is requested, so the worker
+ * handles them in order and a failure is reported where it happened.
  */
 export declare function deleteBranchesThroughPlatform(client: R5dctlClient, projectRef: string, branchNames: readonly string[], options: {
     confirmed: boolean;
+    noWait?: boolean;
+    pollIntervalMs?: number;
+    timeoutMs?: number;
+    sleep?: (ms: number) => Promise<void>;
     onResult?: (result: R5dctlBranchDeletionResult) => void;
 }): Promise<R5dctlBranchDeletionsOutcome>;
 export declare function renderBranchDeletionResult(result: R5dctlBranchDeletionResult): string;
+/** Operation facts of one deletion, keyed by its branch incarnation. */
+export declare function renderBranchDeletionStatus(status: R5dctlBranchDeletionStatus): string;
 export declare function branchDeletionsConfirmationMessage(branches: readonly R5dctlBranchDescription[]): string;
 export declare function branchDeletionsFailureMessage(results: readonly R5dctlBranchDeletionResult[]): string;
 export declare function renderBranchDeletionPreview(branch: R5dctlBranchDescription): string;
 export declare function branchDeletionConfirmationMessage(branch: R5dctlBranchDescription): string;
-export declare function renderBranchDeletion(result: R5dctlBranchDeleteResponse): string;
+export declare function renderBranchDeletion(result: {
+    branchName: string;
+    deletedSessionIds: string[];
+}): string;
 /** Operation facts only: no commit hash, because a hash is stale as soon as the branch commits. */
 export declare function renderBranchOperation(operation: R5dctlBranchOperation, projectRef: string): string;
 export declare function parseSessionRunCommand(options: Pick<GlobalOptions, "project" | "branch" | "session">, args: string[], env?: Record<string, string | undefined>): R5dctlSessionRunCommand;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ricsam/r5dctl",
-  "version": "0.0.121",
+  "version": "0.0.122",
   "type": "module",
   "main": "./dist/cjs/cli.cjs",
   "module": "./dist/mjs/cli.mjs",
@@ -26,7 +26,7 @@
     "r5dctl": "dist/cjs/main.cjs"
   },
   "dependencies": {
-    "@ricsam/r5d-api": "^0.0.121",
+    "@ricsam/r5d-api": "^0.0.122",
     "dotenv": "^17",
     "qrcode": "^1.5.4",
     "ws": "^8.18.3"