@ricsam/r5dctl 0.0.104 → 0.0.105

package/README.md

@@ -57,8 +57,8 @@ r5dctl -p <project> get branches
 r5dctl -p <project> describe branch <branch>
 r5dctl -p <project> create branch <branch> --source worktree:<branch> [--working-tree carry|clean] [--worker <label>]
 r5dctl -p <project> describe branch-operation <operation-id>
-r5dctl -p <project> delete branch <branch>              # preview the sessions that would be deleted, exit 1
-r5dctl -p <project> delete branch <branch> --confirm    # delete the branch and its sessions through the platform
+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> get envs
 r5dctl -p <project> get envs --show-values
 r5dctl -p <project> get env API_KEY
@@ -125,7 +125,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 a branch and every session on it 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 the branch and its sessions and exits non-zero without deleting anything. The primary branch `main` is refused, as is a branch with a running agent or active process (stop them first). 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` 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.
 
 `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

@@ -30,9 +30,12 @@ var cli_exports = {};
 __export(cli_exports, {
   advanceTransientDevicePollBackoff: () => advanceTransientDevicePollBackoff,
   branchDeletionConfirmationMessage: () => branchDeletionConfirmationMessage,
+  branchDeletionsConfirmationMessage: () => branchDeletionsConfirmationMessage,
+  branchDeletionsFailureMessage: () => branchDeletionsFailureMessage,
   collectK8sUsage: () => collectK8sUsage,
   createBranchThroughPlatform: () => createBranchThroughPlatform,
   deleteBranchThroughPlatform: () => deleteBranchThroughPlatform,
+  deleteBranchesThroughPlatform: () => deleteBranchesThroughPlatform,
   dispatchSessionRunCommand: () => dispatchSessionRunCommand,
   followR5dctlSession: () => followR5dctlSession,
   formatK8sCpu: () => formatK8sCpu,
@@ -70,6 +73,7 @@ __export(cli_exports, {
   readDotenvFile: () => readDotenvFile,
   renderBranchDeletion: () => renderBranchDeletion,
   renderBranchDeletionPreview: () => renderBranchDeletionPreview,
+  renderBranchDeletionResult: () => renderBranchDeletionResult,
   renderBranchList: () => renderBranchList,
   renderBranchOperation: () => renderBranchOperation,
   renderConversationForkResponse: () => renderConversationForkResponse,
@@ -221,8 +225,8 @@ const SHARED_HELP_ENTRIES = [
   },
   {
     section: "branches",
-    usage: "-p <project> delete branch <branch> [--confirm]",
-    description: "Delete a branch and its sessions through the platform; without --confirm, only preview what would be deleted."
+    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."
   },
   {
     section: "envs",
@@ -610,15 +614,18 @@ function parseBranchCreateArgs(args) {
   };
 }
 function parseBranchDeleteArgs(args) {
+  const branchNames = [];
   let confirmed = false;
   for (const arg of args) {
     if (arg === "--confirm") {
       confirmed = true;
       continue;
     }
-    throw new Error(arg.startsWith("-") ? `Unknown delete branch flag: ${arg}` : `Unexpected delete branch argument: ${arg}`);
+    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 { confirmed };
+  return { branchNames, confirmed };
 }
 const PRIMARY_BRANCH_NAME = "main";
 function isUnsupportedServerRoute(error) {
@@ -653,6 +660,50 @@ async function deleteBranchThroughPlatform(client, projectRef, branchName, optio
   const result = await requireServerRouteSupport("delete branch", () => client.projects.branches.delete(projectRef, branchName));
   return { kind: "deleted", result };
 }
+async function deleteBranchesThroughPlatform(client, projectRef, branchNames, options) {
+  if (branchNames.length === 0) throw new Error("Missing branch name");
+  for (const branchName of branchNames) {
+    if (branchName === PRIMARY_BRANCH_NAME) throw new Error(`The primary branch ${branchName} cannot be deleted`);
+  }
+  if (!options.confirmed) {
+    const branches = [];
+    for (const branchName of branchNames) {
+      branches.push(await client.projects.branches.describe(projectRef, branchName));
+    }
+    return { kind: "preview", branches };
+  }
+  const results = [];
+  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 };
+    } catch (error) {
+      result = {
+        branchName,
+        deleted: false,
+        error: error instanceof import_r5d_api.R5dctlApiError ? extractApiErrorMessage(error) : error instanceof Error ? error.message : String(error)
+      };
+    }
+    results.push(result);
+    options.onResult?.(result);
+  }
+  return { kind: "deleted", results };
+}
+function renderBranchDeletionResult(result) {
+  return result.deleted ? renderBranchDeletion(result) : `Failed to delete branch ${result.branchName}: ${result.error}
+`;
+}
+function branchDeletionsConfirmationMessage(branches) {
+  const [only] = branches;
+  if (branches.length === 1 && only) return branchDeletionConfirmationMessage(only);
+  const sessionCount = branches.reduce((count, branch) => count + branch.sessions.length, 0);
+  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).`;
+}
 function renderBranchDeletionPreview(branch) {
   const count = branch.sessions.length;
   const lines = [
@@ -2846,13 +2897,20 @@ 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 branchName = requireValue(args[offset + 1], "Missing branch name");
-    const deletion = await deleteBranchThroughPlatform(client, projectRef, branchName, parseBranchDeleteArgs(args.slice(offset + 2)));
+    const { branchNames, confirmed } = parseBranchDeleteArgs(args.slice(offset + 1));
+    const deletion = await deleteBranchesThroughPlatform(client, projectRef, branchNames, {
+      confirmed,
+      // Each deletion is its own round trip, so a reader sees results as they land.
+      onResult: (result) => {
+        if (!json) process.stdout.write(renderBranchDeletionResult(result));
+      }
+    });
     if (deletion.kind === "preview") {
-      write({ ...deletion.branch, confirmed: false }, renderBranchDeletionPreview(deletion.branch));
-      throw new Error(branchDeletionConfirmationMessage(deletion.branch));
+      write({ branches: deletion.branches, confirmed: false }, deletion.branches.map(renderBranchDeletionPreview).join("\n"));
+      throw new Error(branchDeletionsConfirmationMessage(deletion.branches));
     }
-    write(deletion.result, renderBranchDeletion(deletion.result));
+    if (json) write({ results: deletion.results }, "");
+    if (deletion.results.some((result) => !result.deleted)) throw new Error(branchDeletionsFailureMessage(deletion.results));
     return;
   }
   if (first === "get" && second === "envs") {
@@ -3387,17 +3445,14 @@ function resolveCommandExecution(options, rest) {
       if (!options.project) {
         throw new Error("--project/-p is required for `delete branch`");
       }
-      const rawArgs = commandArgs.slice(1);
-      const positionalBranch = rawArgs[0] && !rawArgs[0].startsWith("-") ? rawArgs[0] : void 0;
-      const branch = positionalBranch ?? options.branch;
-      if (!branch) {
+      const parsed = parseBranchDeleteArgs(commandArgs.slice(1));
+      const branchNames = parsed.branchNames.length > 0 ? parsed.branchNames : options.branch ? [options.branch] : [];
+      if (branchNames.length === 0) {
         throw new Error("Branch name is required for `delete branch`");
       }
-      const flagArgs = positionalBranch ? rawArgs.slice(1) : rawArgs;
-      parseBranchDeleteArgs(flagArgs);
       return {
         kind: "plugin",
-        pluginArgs: ["delete", "branch", options.project, branch, ...flagArgs]
+        pluginArgs: ["delete", "branch", options.project, ...branchNames, ...parsed.confirmed ? ["--confirm"] : []]
       };
     }
     throw new Error("Unknown delete command");
@@ -3628,9 +3683,12 @@ async function main(argv = process.argv.slice(2)) {
 0 && (module.exports = {
   advanceTransientDevicePollBackoff,
   branchDeletionConfirmationMessage,
+  branchDeletionsConfirmationMessage,
+  branchDeletionsFailureMessage,
   collectK8sUsage,
   createBranchThroughPlatform,
   deleteBranchThroughPlatform,
+  deleteBranchesThroughPlatform,
   dispatchSessionRunCommand,
   followR5dctlSession,
   formatK8sCpu,
@@ -3668,6 +3726,7 @@ async function main(argv = process.argv.slice(2)) {
   readDotenvFile,
   renderBranchDeletion,
   renderBranchDeletionPreview,
+  renderBranchDeletionResult,
   renderBranchList,
   renderBranchOperation,
   renderConversationForkResponse,

package/dist/cjs/package.json

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

package/dist/mjs/cli.mjs

@@ -126,8 +126,8 @@ const SHARED_HELP_ENTRIES = [
   },
   {
     section: "branches",
-    usage: "-p <project> delete branch <branch> [--confirm]",
-    description: "Delete a branch and its sessions through the platform; without --confirm, only preview what would be deleted."
+    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."
   },
   {
     section: "envs",
@@ -515,15 +515,18 @@ function parseBranchCreateArgs(args) {
   };
 }
 function parseBranchDeleteArgs(args) {
+  const branchNames = [];
   let confirmed = false;
   for (const arg of args) {
     if (arg === "--confirm") {
       confirmed = true;
       continue;
     }
-    throw new Error(arg.startsWith("-") ? `Unknown delete branch flag: ${arg}` : `Unexpected delete branch argument: ${arg}`);
+    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 { confirmed };
+  return { branchNames, confirmed };
 }
 const PRIMARY_BRANCH_NAME = "main";
 function isUnsupportedServerRoute(error) {
@@ -558,6 +561,50 @@ async function deleteBranchThroughPlatform(client, projectRef, branchName, optio
   const result = await requireServerRouteSupport("delete branch", () => client.projects.branches.delete(projectRef, branchName));
   return { kind: "deleted", result };
 }
+async function deleteBranchesThroughPlatform(client, projectRef, branchNames, options) {
+  if (branchNames.length === 0) throw new Error("Missing branch name");
+  for (const branchName of branchNames) {
+    if (branchName === PRIMARY_BRANCH_NAME) throw new Error(`The primary branch ${branchName} cannot be deleted`);
+  }
+  if (!options.confirmed) {
+    const branches = [];
+    for (const branchName of branchNames) {
+      branches.push(await client.projects.branches.describe(projectRef, branchName));
+    }
+    return { kind: "preview", branches };
+  }
+  const results = [];
+  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 };
+    } catch (error) {
+      result = {
+        branchName,
+        deleted: false,
+        error: error instanceof R5dctlApiError ? extractApiErrorMessage(error) : error instanceof Error ? error.message : String(error)
+      };
+    }
+    results.push(result);
+    options.onResult?.(result);
+  }
+  return { kind: "deleted", results };
+}
+function renderBranchDeletionResult(result) {
+  return result.deleted ? renderBranchDeletion(result) : `Failed to delete branch ${result.branchName}: ${result.error}
+`;
+}
+function branchDeletionsConfirmationMessage(branches) {
+  const [only] = branches;
+  if (branches.length === 1 && only) return branchDeletionConfirmationMessage(only);
+  const sessionCount = branches.reduce((count, branch) => count + branch.sessions.length, 0);
+  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).`;
+}
 function renderBranchDeletionPreview(branch) {
   const count = branch.sessions.length;
   const lines = [
@@ -2751,13 +2798,20 @@ 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 branchName = requireValue(args[offset + 1], "Missing branch name");
-    const deletion = await deleteBranchThroughPlatform(client, projectRef, branchName, parseBranchDeleteArgs(args.slice(offset + 2)));
+    const { branchNames, confirmed } = parseBranchDeleteArgs(args.slice(offset + 1));
+    const deletion = await deleteBranchesThroughPlatform(client, projectRef, branchNames, {
+      confirmed,
+      // Each deletion is its own round trip, so a reader sees results as they land.
+      onResult: (result) => {
+        if (!json) process.stdout.write(renderBranchDeletionResult(result));
+      }
+    });
     if (deletion.kind === "preview") {
-      write({ ...deletion.branch, confirmed: false }, renderBranchDeletionPreview(deletion.branch));
-      throw new Error(branchDeletionConfirmationMessage(deletion.branch));
+      write({ branches: deletion.branches, confirmed: false }, deletion.branches.map(renderBranchDeletionPreview).join("\n"));
+      throw new Error(branchDeletionsConfirmationMessage(deletion.branches));
     }
-    write(deletion.result, renderBranchDeletion(deletion.result));
+    if (json) write({ results: deletion.results }, "");
+    if (deletion.results.some((result) => !result.deleted)) throw new Error(branchDeletionsFailureMessage(deletion.results));
     return;
   }
   if (first === "get" && second === "envs") {
@@ -3292,17 +3346,14 @@ function resolveCommandExecution(options, rest) {
       if (!options.project) {
         throw new Error("--project/-p is required for `delete branch`");
       }
-      const rawArgs = commandArgs.slice(1);
-      const positionalBranch = rawArgs[0] && !rawArgs[0].startsWith("-") ? rawArgs[0] : void 0;
-      const branch = positionalBranch ?? options.branch;
-      if (!branch) {
+      const parsed = parseBranchDeleteArgs(commandArgs.slice(1));
+      const branchNames = parsed.branchNames.length > 0 ? parsed.branchNames : options.branch ? [options.branch] : [];
+      if (branchNames.length === 0) {
         throw new Error("Branch name is required for `delete branch`");
       }
-      const flagArgs = positionalBranch ? rawArgs.slice(1) : rawArgs;
-      parseBranchDeleteArgs(flagArgs);
       return {
         kind: "plugin",
-        pluginArgs: ["delete", "branch", options.project, branch, ...flagArgs]
+        pluginArgs: ["delete", "branch", options.project, ...branchNames, ...parsed.confirmed ? ["--confirm"] : []]
       };
     }
     throw new Error("Unknown delete command");
@@ -3532,9 +3583,12 @@ async function main(argv = process.argv.slice(2)) {
 export {
   advanceTransientDevicePollBackoff,
   branchDeletionConfirmationMessage,
+  branchDeletionsConfirmationMessage,
+  branchDeletionsFailureMessage,
   collectK8sUsage,
   createBranchThroughPlatform,
   deleteBranchThroughPlatform,
+  deleteBranchesThroughPlatform,
   dispatchSessionRunCommand,
   followR5dctlSession,
   formatK8sCpu,
@@ -3572,6 +3626,7 @@ export {
   readDotenvFile,
   renderBranchDeletion,
   renderBranchDeletionPreview,
+  renderBranchDeletionResult,
   renderBranchList,
   renderBranchOperation,
   renderConversationForkResponse,

package/dist/mjs/package.json

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

package/dist/types/cli.d.ts

@@ -86,6 +86,7 @@ export type R5dctlBranchCreateArgs = {
 };
 export declare function parseBranchCreateArgs(args: string[]): R5dctlBranchCreateArgs;
 export declare function parseBranchDeleteArgs(args: string[]): {
+    branchNames: string[];
     confirmed: boolean;
 };
 /** An older server strips unknown routes and answers with this generic 404; a route's own not-found carries a specific message. */
@@ -103,6 +104,35 @@ export type R5dctlBranchDeletionOutcome = {
 export declare function deleteBranchThroughPlatform(client: R5dctlClient, projectRef: string, branchName: string, options: {
     confirmed: boolean;
 }): Promise<R5dctlBranchDeletionOutcome>;
+export type R5dctlBranchDeletionResult = {
+    branchName: string;
+    deleted: true;
+    deletedSessionIds: string[];
+} | {
+    branchName: string;
+    deleted: false;
+    error: string;
+};
+export type R5dctlBranchDeletionsOutcome = {
+    kind: "preview";
+    branches: R5dctlBranchDescription[];
+} | {
+    kind: "deleted";
+    results: R5dctlBranchDeletionResult[];
+};
+/**
+ * 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.
+ */
+export declare function deleteBranchesThroughPlatform(client: R5dctlClient, projectRef: string, branchNames: readonly string[], options: {
+    confirmed: boolean;
+    onResult?: (result: R5dctlBranchDeletionResult) => void;
+}): Promise<R5dctlBranchDeletionsOutcome>;
+export declare function renderBranchDeletionResult(result: R5dctlBranchDeletionResult): 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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ricsam/r5dctl",
-  "version": "0.0.104",
+  "version": "0.0.105",
   "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.104",
+    "@ricsam/r5d-api": "^0.0.105",
     "dotenv": "^17",
     "qrcode": "^1.5.4",
     "ws": "^8.18.3"