@cleocode/cleo 2026.5.94 → 2026.5.96

package/dist/cli/index.js

@@ -26843,7 +26843,8 @@ async function orchestrateSpawnOp(params) {
     params.protocolType,
     getProjectRoot10(),
     params.tier,
-    params.noWorktree
+    params.noWorktree,
+    params.spawnScope
   );
 }
 async function orchestrateHandoffOp(params) {
@@ -27684,7 +27685,8 @@ var init_orchestrate2 = __esm({
                 taskId: params.taskId,
                 protocolType: params.protocolType,
                 tier,
-                noWorktree: params.noWorktree
+                noWorktree: params.noWorktree,
+                spawnScope: params.spawnScope
               };
               return wrapResult(await coreOps2.spawn(p), "mutate", "orchestrate", operation, startTime);
             }
@@ -31602,12 +31604,14 @@ var init_upgrade = __esm({
 
 // packages/cleo/src/dispatch/domains/worktree.ts
 import {
+  adoptWorktree,
   forceUnlockWorktree,
   getLogger as getLogger18,
   getProjectRoot as getProjectRoot20,
   listWorktrees,
   pruneOrphanedWorktreesByStatus
 } from "@cleocode/core/internal";
+import { destroyWorktree } from "@cleocode/worktree";
 function coerceStatusFilter(value) {
   if (value === void 0 || value === null) return void 0;
   const raw = Array.isArray(value) ? value.filter((v) => typeof v === "string") : typeof value === "string" ? value.split(",").map((s) => s.trim()) : [];
@@ -31680,23 +31684,100 @@ var init_worktree2 = __esm({
        * Handle worktree mutations.
        *
        * Supported operations:
+       *  - `adopt` — register an externally-created worktree in the SSoT. Params:
+       *              `{ worktreePath, source?, taskId?, actor? }`. Returns an
+       *              {@link AdoptWorktreeResult} envelope. (T9804)
+       *  - `destroy` — explicitly destroy a single agent worktree. Params:
+       *                `{ taskId, force?, deleteBranch?, reason? }`. Returns a
+       *                {@link DestroyWorktreeResult} envelope (T9805).
        *  - `prune` — remove orphan/merged worktrees. Params:
-       *              `{ dryRun?, staleDays?, paths?, actor? }`. Returns a
+       *              `{ dryRun?, staleDays?, idleDays?, paths?, actor? }`. Returns a
        *              {@link PruneOrphanedWorktreesResult} envelope.
        *  - `forceUnlock` — clear wedge state for a single worktree. Params:
        *              `{ taskId, actor? }`. Returns a {@link ForceUnlockWorktreeResult}.
        *
        * @task T9547
+       * @task T9804
+       * @task T9805
        */
       async mutate(operation, params) {
         const startTime = Date.now();
         try {
           switch (operation) {
+            case "adopt": {
+              const worktreePath = params?.["worktreePath"];
+              if (typeof worktreePath !== "string" || worktreePath.length === 0) {
+                return errorResult(
+                  "mutate",
+                  "worktree",
+                  operation,
+                  "E_VALIDATION",
+                  "Missing required param: worktreePath (pass the path to the worktree directory).",
+                  startTime
+                );
+              }
+              const rawSource = params?.["source"];
+              const validSources = ["claude-agent", "manual", "adopted"];
+              const source = typeof rawSource === "string" && validSources.includes(rawSource) ? rawSource : void 0;
+              const rawTaskId = params?.["taskId"];
+              const taskId = rawTaskId === null ? null : typeof rawTaskId === "string" && rawTaskId.length > 0 ? rawTaskId : void 0;
+              const opts = {
+                projectRoot: getProjectRoot20(),
+                worktreePath,
+                ...source !== void 0 ? { source } : {},
+                ...taskId !== void 0 ? { taskId } : {},
+                ...typeof params?.["actor"] === "string" && params["actor"].length > 0 ? { actor: params["actor"] } : {}
+              };
+              const result = await adoptWorktree(opts);
+              return wrapResult(
+                result,
+                "mutate",
+                "worktree",
+                operation,
+                startTime
+              );
+            }
+            case "destroy": {
+              const taskId = params?.["taskId"];
+              if (typeof taskId !== "string" || taskId.length === 0) {
+                return errorResult(
+                  "mutate",
+                  "worktree",
+                  operation,
+                  "E_VALIDATION",
+                  "Missing required param: taskId (e.g. T9805).",
+                  startTime
+                );
+              }
+              const opts = {
+                taskId,
+                force: params?.["force"] === true,
+                deleteBranch: params?.["deleteBranch"] !== false,
+                ...typeof params?.["reason"] === "string" && params["reason"].length > 0 ? { reason: params["reason"] } : {}
+              };
+              const result = await destroyWorktree(getProjectRoot20(), opts);
+              const engineResult = result.error !== void 0 ? {
+                success: false,
+                error: {
+                  code: "E_DESTROY_FAILED",
+                  message: result.error,
+                  fix: "Check worktree state with `cleo worktree list`."
+                }
+              } : { success: true, data: result };
+              return wrapResult(
+                engineResult,
+                "mutate",
+                "worktree",
+                operation,
+                startTime
+              );
+            }
             case "prune": {
               const opts = {
                 projectRoot: getProjectRoot20(),
                 dryRun: params?.["dryRun"] === true,
                 ...typeof params?.["staleDays"] === "number" ? { staleDays: params["staleDays"] } : {},
+                ...typeof params?.["idleDays"] === "number" ? { staleDays: params["idleDays"] } : {},
                 ...coerceStringList(params?.["paths"]) !== void 0 ? { paths: coerceStringList(params?.["paths"]) } : {},
                 ...typeof params?.["actor"] === "string" && params["actor"].length > 0 ? { actor: params["actor"] } : {}
               };
@@ -31752,7 +31833,7 @@ var init_worktree2 = __esm({
       getSupportedOperations() {
         return {
           query: ["list"],
-          mutate: ["prune", "forceUnlock"]
+          mutate: ["adopt", "destroy", "prune", "forceUnlock"]
         };
       }
     };
@@ -45771,16 +45852,27 @@ var init_doctor = __esm({
               process.exitCode = 2;
             }
           } else if (args["audit-worktree-orphans"]) {
-            progress.step(0, "Scanning for worktree-orphan .cleo/ directories");
-            const { scanWorktreeOrphans } = await import("@cleocode/core/doctor/worktree-orphans.js");
+            progress.step(0, "Comprehensive worktree anomaly audit (T9808 / council D009)");
+            const { auditWorktreeOrphansComprehensive, scanWorktreeOrphans } = await import("@cleocode/core/doctor/worktree-orphans.js");
             const projectRoot = getProjectRoot32();
-            const orphans = await scanWorktreeOrphans(projectRoot);
-            progress.complete(`Found ${orphans.length} orphan${orphans.length === 1 ? "" : "s"}`);
+            const [comprehensive, legacyOrphans] = await Promise.all([
+              auditWorktreeOrphansComprehensive(projectRoot),
+              scanWorktreeOrphans(projectRoot)
+            ]);
+            const totalAnomalies = comprehensive.count;
+            progress.complete(
+              `Found ${totalAnomalies} anomal${totalAnomalies === 1 ? "y" : "ies"}` + (legacyOrphans.length > 0 ? ` (${legacyOrphans.length} legacy orphan(s))` : "")
+            );
             cliOutput(
-              { projectRoot, orphans, count: orphans.length },
+              {
+                projectRoot,
+                comprehensive,
+                legacyOrphans,
+                count: totalAnomalies
+              },
               { command: "doctor", operation: "doctor.audit-worktree-orphans" }
             );
-            if (orphans.length > 0 && (process.exitCode === void 0 || process.exitCode === 0)) {
+            if (totalAnomalies > 0 && (process.exitCode === void 0 || process.exitCode === 0)) {
               process.exitCode = 2;
             }
           } else if (args["prune-worktree-orphans"]) {
@@ -55587,6 +55679,10 @@ var init_orchestrate3 = __esm({
         "no-worktree": {
           type: "boolean",
           description: "Skip worktree provisioning for this spawn. The opt-out is logged to the audit log (T1140)."
+        },
+        scope: {
+          type: "string",
+          description: "T9807 sparse-checkout scope: directory prefix to check out in the worktree (cone mode). Example: --scope packages/cleo creates a worktree with only that subtree checked out. Reduces disk usage and checkout time for tasks scoped to a single package."
         }
       },
       async run({ args }) {
@@ -55605,7 +55701,8 @@ var init_orchestrate3 = __esm({
             taskId: args.taskId,
             protocolType: args.protocol,
             tier,
-            noWorktree: args["no-worktree"] === true
+            noWorktree: args["no-worktree"] === true,
+            ...args.scope ? { spawnScope: args.scope } : {}
           },
           { command: "orchestrate" }
         );
@@ -66247,7 +66344,7 @@ function renderOrphanPreamble(wt) {
     ""
   ].join("\n");
 }
-var VALID_STATUS_VALUES, listCommand27, pruneCommand3, forceUnlockCommand, worktreeCommand;
+var VALID_STATUS_VALUES, listCommand27, pruneCommand3, destroyCommand, forceUnlockCommand, VALID_ADOPT_SOURCES, adoptCommand, worktreeCommand;
 var init_worktree3 = __esm({
   "packages/cleo/src/cli/commands/worktree.ts"() {
     "use strict";
@@ -66310,6 +66407,10 @@ var init_worktree3 = __esm({
         days: {
           type: "string",
           description: "Override staleness threshold passed through to the listing (default: 7)."
+        },
+        "idle-days": {
+          type: "string",
+          description: "Abandonment-timeout threshold in days (T9805 AC2). Worktrees whose last commit is older than this value AND have no open PR are also pruned."
         }
       },
       async run({ args }) {
@@ -66325,6 +66426,8 @@ var init_worktree3 = __esm({
         const yes = args["yes"] === true;
         const staleDaysRaw = typeof args["days"] === "string" ? args["days"] : void 0;
         const staleDays = staleDaysRaw !== void 0 ? Number.parseInt(staleDaysRaw, 10) : void 0;
+        const idleDaysRaw = typeof args["idle-days"] === "string" ? args["idle-days"] : void 0;
+        const idleDays = idleDaysRaw !== void 0 ? Number.parseInt(idleDaysRaw, 10) : void 0;
         const projectRoot = getProjectRoot42();
         const listResult = await listWorktrees2({
           projectRoot,
@@ -66398,12 +66501,61 @@ var init_worktree3 = __esm({
           {
             dryRun,
             paths: confirmedPaths,
-            ...staleDays !== void 0 && !Number.isNaN(staleDays) ? { staleDays } : {}
+            ...staleDays !== void 0 && !Number.isNaN(staleDays) ? { staleDays } : {},
+            ...idleDays !== void 0 && !Number.isNaN(idleDays) ? { idleDays } : {}
           },
           { command: "worktree-prune", operation: "worktree.prune" }
         );
       }
     });
+    destroyCommand = defineCommand({
+      meta: {
+        name: "destroy",
+        description: "Destroy the XDG worktree for a task, update audit log and sentinel index (T9805)."
+      },
+      args: {
+        taskId: {
+          type: "positional",
+          description: "The task ID whose worktree to destroy (e.g. T9805).",
+          required: true
+        },
+        force: {
+          type: "boolean",
+          description: "Force removal even when the worktree has uncommitted changes.",
+          default: false
+        },
+        reason: {
+          type: "string",
+          description: "Reason string recorded in the audit log (e.g. pr-merged, manual, idle-timeout)."
+        },
+        "keep-branch": {
+          type: "boolean",
+          description: "Do not delete the task branch after removing the worktree.",
+          default: false
+        }
+      },
+      async run({ args }) {
+        const rawTaskId = typeof args["taskId"] === "string" ? args["taskId"] : "";
+        if (rawTaskId.length === 0) {
+          cliError("Missing required positional: <taskId>.", 2);
+          process.exit(2);
+          return;
+        }
+        const reason = typeof args["reason"] === "string" && args["reason"].length > 0 ? args["reason"] : "manual";
+        await dispatchFromCli(
+          "mutate",
+          "worktree",
+          "destroy",
+          {
+            taskId: rawTaskId,
+            force: args["force"] === true,
+            deleteBranch: args["keep-branch"] !== true,
+            reason
+          },
+          { command: "worktree-destroy", operation: "worktree.destroy" }
+        );
+      }
+    });
     forceUnlockCommand = defineCommand({
       meta: {
         name: "force-unlock",
@@ -66432,6 +66584,56 @@ var init_worktree3 = __esm({
         );
       }
     });
+    VALID_ADOPT_SOURCES = ["claude-agent", "manual", "adopted"];
+    adoptCommand = defineCommand({
+      meta: {
+        name: "adopt",
+        description: "Register an externally-created worktree (e.g. Claude Code Agent isolation:worktree) in the CLEO SSoT so it surfaces in `cleo worktree list`."
+      },
+      args: {
+        path: {
+          type: "positional",
+          description: "Absolute or relative path to the worktree directory to adopt. For Claude Code Agent worktrees this is typically `.claude/worktrees/<sessionId>/`.",
+          required: true
+        },
+        source: {
+          type: "string",
+          description: `Source classification for this worktree (${VALID_ADOPT_SOURCES.join("|")}). Defaults to \`claude-agent\` for paths under \`.claude/worktrees/\`, else \`manual\`.`
+        },
+        "task-id": {
+          type: "string",
+          description: "Optional task ID to associate with this worktree. When omitted the command attempts to extract it from the branch name."
+        },
+        actor: {
+          type: "string",
+          description: "Override actor name written to the audit log."
+        }
+      },
+      async run({ args }) {
+        const rawPath = typeof args["path"] === "string" ? args["path"] : "";
+        if (rawPath.length === 0) {
+          cliError("Missing required positional: <path>.", 2);
+          process.exit(2);
+          return;
+        }
+        const rawSource = typeof args["source"] === "string" ? args["source"] : void 0;
+        const source = rawSource !== void 0 && VALID_ADOPT_SOURCES.includes(rawSource) ? rawSource : void 0;
+        const rawTaskId = typeof args["task-id"] === "string" ? args["task-id"] : void 0;
+        const rawActor = typeof args["actor"] === "string" ? args["actor"] : void 0;
+        await dispatchFromCli(
+          "mutate",
+          "worktree",
+          "adopt",
+          {
+            worktreePath: rawPath,
+            ...source !== void 0 ? { source } : {},
+            ...rawTaskId !== void 0 ? { taskId: rawTaskId } : {},
+            ...rawActor !== void 0 ? { actor: rawActor } : {}
+          },
+          { command: "worktree-adopt", operation: "worktree.adopt" }
+        );
+      }
+    });
     worktreeCommand = defineCommand({
       meta: {
         name: "worktree",
@@ -66439,7 +66641,9 @@ var init_worktree3 = __esm({
       },
       subCommands: {
         list: listCommand27,
+        adopt: adoptCommand,
         prune: pruneCommand3,
+        destroy: destroyCommand,
         "force-unlock": forceUnlockCommand
       },
       // Early-return when a subcommand was matched; citty still invokes the
@@ -67086,7 +67290,7 @@ var COMMAND_MANIFEST = [
   {
     exportName: "reqCommand",
     name: "req",
-    description: "Manage REQ-ID-addressable acceptance gates on tasks",
+    description: "Manage REQ-ID-addressable acceptance gates on tasks (in-task gates only). For cross-task dependency edges, use ",
     load: async () => (await Promise.resolve().then(() => (init_req(), req_exports))).reqCommand
   },
   {
@@ -67254,7 +67458,7 @@ var COMMAND_MANIFEST = [
   {
     exportName: "updateCommand",
     name: "update",
-    description: "Update a task",
+    description: "Update a task. Safe under concurrent invocation \u2014 retries on SQLITE_BUSY up to 4 attempts (gh#391).",
     load: async () => (await Promise.resolve().then(() => (init_update(), update_exports))).updateCommand
   },
   {