@ferueda/grove-cli 0.2.0 → 0.3.0

package/dist/cli.js

@@ -1,11 +1,13 @@
 #!/usr/bin/env node
 import { Command } from "commander";
 import pc from "picocolors";
-import { handleError, setDebug } from "./error-handler.js";
+import { handleError, setDebug, setJson } from "./error-handler.js";
 import { acquireCmd } from "./commands/acquire.js";
 import { releaseCmd } from "./commands/release.js";
 import { statusCmd } from "./commands/status.js";
 import { destroyCmd, destroyAllCmd } from "./commands/destroy.js";
+import { inspectCmd } from "./commands/inspect.js";
+import { repairCmd } from "./commands/repair.js";
 process.on("uncaughtException", (err) => {
     console.error(pc.red(`Fatal: ${err.message}`));
     process.exitCode = 1;
@@ -20,16 +22,20 @@ program
     .description("CLI for Grove - A programmatic git worktree pool manager")
     .version("0.1.0")
     .option("--debug", "Show verbose error output including stack traces")
-    .hook("preAction", (thisCommand) => {
-    const opts = thisCommand.optsWithGlobals();
+    .hook("preAction", (thisCommand, actionCommand) => {
+    const opts = actionCommand.optsWithGlobals();
     if (opts.debug)
         setDebug(true);
+    if (opts.json)
+        setJson(true);
 });
 program.addCommand(acquireCmd);
 program.addCommand(releaseCmd);
 program.addCommand(statusCmd);
 program.addCommand(destroyCmd);
 program.addCommand(destroyAllCmd);
+program.addCommand(inspectCmd);
+program.addCommand(repairCmd);
 try {
     await program.parseAsync(process.argv);
 }

package/dist/commands/acquire.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"acquire.d.ts","sourceRoot":"","sources":["../../src/commands/acquire.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAMpC,eAAO,MAAM,UAAU,SA4CnB,CAAC"}
+{"version":3,"file":"acquire.d.ts","sourceRoot":"","sources":["../../src/commands/acquire.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAOpC,eAAO,MAAM,UAAU,SA6FnB,CAAC"}

package/dist/commands/acquire.js

@@ -7,9 +7,51 @@ export const acquireCmd = new Command("acquire")
     .description("Acquire a worktree from the pool")
     .option("--shell", "Drop into an interactive subshell inside the worktree")
     .option("-r, --repo <path>", "Path to repository root")
+    .option("--lease <id>", "Lease ID to acquire")
+    .option("--owner <id>", "Owner ID for the lease")
+    .option("--branch <name>", "Branch to check out")
+    .option("--ref <sha>", "Ref to check out detached")
+    .option("--create-branch-from <ref>", "Create branch from this ref")
+    .option("--fail-if-exists", "Fail if branch already exists")
+    .option("--json", "Output result as JSON")
     .action(async (options) => {
     try {
         const grove = await loadGrove({ repo: options.repo });
+        if (options.lease) {
+            let modeOpts = {};
+            if (options.branch) {
+                modeOpts = { mode: "branch", branch: options.branch };
+                if (options.createBranchFrom) {
+                    modeOpts.createBranch = {
+                        from: options.createBranchFrom,
+                        ifExists: options.failIfExists ? "fail" : "reuse",
+                    };
+                }
+            }
+            else if (options.ref) {
+                modeOpts = { mode: "detached", ref: options.ref };
+            }
+            else {
+                // fallback to default branch logic if nothing specified?
+                modeOpts = { mode: "branch", branch: "main" }; // or we can just let SDK handle it, wait SDK requires mode.
+                // Since SDK requires mode, if not specified let's default to branch "main" or what SDK would do
+                // actually let's throw
+                throw new Error("Lease mode requires either --branch or --ref");
+            }
+            const acquireOpts = {
+                leaseId: options.lease,
+                ownerId: options.owner,
+                ...modeOpts,
+            };
+            const lease = await grove.acquire(acquireOpts);
+            if (options.json) {
+                process.stdout.write(JSON.stringify(lease, null, 2) + "\n");
+                return;
+            }
+            console.error(pc.green(`🌳 Acquired lease ${lease.leaseId} at ${lease.path}`));
+            return;
+        }
+        // Legacy flow
         const slot = await grove.acquire();
         if (options.shell) {
             console.error(pc.green(`🌳 Entered worktree at ${slot.path}. Type 'exit' to return.`));
@@ -38,8 +80,12 @@ export const acquireCmd = new Command("acquire")
             });
         }
         else {
-            // Output raw path to stdout for pipeability
-            process.stdout.write(slot.path + "\n");
+            if (options.json) {
+                process.stdout.write(JSON.stringify(slot, null, 2) + "\n");
+            }
+            else {
+                process.stdout.write(slot.path + "\n");
+            }
         }
     }
     catch (err) {

package/dist/commands/destroy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"destroy.d.ts","sourceRoot":"","sources":["../../src/commands/destroy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC,eAAO,MAAM,UAAU,SAanB,CAAC;AAEL,eAAO,MAAM,aAAa,SAYtB,CAAC"}
+{"version":3,"file":"destroy.d.ts","sourceRoot":"","sources":["../../src/commands/destroy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC,eAAO,MAAM,UAAU,SAoBnB,CAAC;AAEL,eAAO,MAAM,aAAa,SAkBtB,CAAC"}

package/dist/commands/destroy.js

@@ -4,14 +4,21 @@ import { handleError } from "../error-handler.js";
 import pc from "picocolors";
 export const destroyCmd = new Command("destroy")
     .description("Destroy a specific worktree from the pool")
-    .argument("<path>", "Path to the worktree to destroy")
+    .argument("<pathOrLeaseId>", "Path or lease ID to destroy")
     .option("-f, --force", "Force destroy even if in use")
+    .option("--delete-branch", "Also delete the branch associated with this lease")
     .option("-r, --repo <path>", "Path to repository root")
-    .action(async (worktreePath, options) => {
+    .option("--json", "Output result as JSON")
+    .action(async (pathOrLeaseId, options) => {
     try {
         const grove = await loadGrove({ repo: options.repo });
-        await grove.destroy(worktreePath, { force: options.force });
-        console.error(pc.green(`🌳 Destroyed worktree at ${worktreePath}`));
+        await grove.destroy(pathOrLeaseId, { force: options.force, deleteBranch: options.deleteBranch });
+        if (options.json) {
+            process.stdout.write(JSON.stringify({ success: true, target: pathOrLeaseId }) + "\n");
+        }
+        else {
+            console.error(pc.green(`🌳 Destroyed worktree/lease ${pathOrLeaseId}`));
+        }
     }
     catch (err) {
         handleError(err);
@@ -21,11 +28,17 @@ export const destroyAllCmd = new Command("destroy-all")
     .description("Destroy all worktrees in the pool")
     .option("-f, --force", "Force destroy even if in use")
     .option("-r, --repo <path>", "Path to repository root")
+    .option("--json", "Output result as JSON")
     .action(async (options) => {
     try {
         const grove = await loadGrove({ repo: options.repo });
         await grove.destroyAll({ force: options.force });
-        console.error(pc.green("🌳 Destroyed all worktrees in the pool."));
+        if (options.json) {
+            process.stdout.write(JSON.stringify({ success: true }) + "\n");
+        }
+        else {
+            console.error(pc.green("🌳 Destroyed all worktrees in the pool."));
+        }
     }
     catch (err) {
         handleError(err);

package/dist/commands/inspect.d.ts

@@ -0,0 +1,3 @@
+import { Command } from "commander";
+export declare const inspectCmd: Command;
+//# sourceMappingURL=inspect.d.ts.map

package/dist/commands/inspect.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"inspect.d.ts","sourceRoot":"","sources":["../../src/commands/inspect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC,eAAO,MAAM,UAAU,SA6BnB,CAAC"}

package/dist/commands/inspect.js

@@ -0,0 +1,34 @@
+import { Command } from "commander";
+import { loadGrove } from "../utils.js";
+import { handleError } from "../error-handler.js";
+import pc from "picocolors";
+export const inspectCmd = new Command("inspect")
+    .description("Inspect a specific lease or worktree")
+    .argument("<pathOrLeaseId>", "Path or lease ID to inspect")
+    .option("-r, --repo <path>", "Path to repository root")
+    .option("--json", "Output result as JSON")
+    .action(async (pathOrLeaseId, options) => {
+    try {
+        const grove = await loadGrove({ repo: options.repo });
+        const lease = await grove.inspect(pathOrLeaseId);
+        if (!lease) {
+            throw new Error(`Lease not found: ${pathOrLeaseId}`);
+        }
+        if (options.json) {
+            process.stdout.write(JSON.stringify(lease, null, 2) + "\n");
+        }
+        else {
+            console.log(pc.bold(`Lease: ${lease.leaseId}`));
+            console.log(`Path: ${lease.path}`);
+            console.log(`State: ${lease.state}`);
+            console.log(`Branch: ${lease.branch || "-"}`);
+            console.log(`Safety: ${lease.processSafety}`);
+            if (lease.pendingCleanup) {
+                console.log(`Pending Cleanup: ${JSON.stringify(lease.pendingCleanup)}`);
+            }
+        }
+    }
+    catch (err) {
+        handleError(err);
+    }
+});

package/dist/commands/release.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"release.d.ts","sourceRoot":"","sources":["../../src/commands/release.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC,eAAO,MAAM,UAAU,SAcnB,CAAC"}
+{"version":3,"file":"release.d.ts","sourceRoot":"","sources":["../../src/commands/release.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAMpC,eAAO,MAAM,UAAU,SAqDnB,CAAC"}

package/dist/commands/release.js

@@ -4,14 +4,51 @@ import { handleError } from "../error-handler.js";
 import pc from "picocolors";
 export const releaseCmd = new Command("release")
     .description("Release a worktree back to the pool")
-    .argument("[path]", "Path to the worktree to release (defaults to CWD)")
+    .argument("[pathOrLeaseId]", "Path or lease ID to release (defaults to CWD)")
     .option("-r, --repo <path>", "Path to repository root")
-    .action(async (worktreePath, options) => {
+    .option("--cleanup <action>", "Cleanup action (preserve, reset, quarantine)")
+    .option("--reset-to <ref>", "Branch/ref to reset to")
+    .option("-f, --force", "Force cleanup even if in use")
+    .option("--json", "Output result as JSON")
+    .action(async (pathOrLeaseId, options) => {
     try {
-        const targetPath = worktreePath || process.cwd();
+        const targetPath = pathOrLeaseId || process.cwd();
         const grove = await loadGrove({ repo: options.repo });
+        if (options.cleanup) {
+            if (!["preserve", "reset", "quarantine"].includes(options.cleanup)) {
+                throw new Error("Invalid cleanup action");
+            }
+            let releaseOpts;
+            if (options.cleanup === "preserve") {
+                releaseOpts = { cleanup: "preserve" };
+            }
+            else if (options.cleanup === "quarantine") {
+                releaseOpts = { cleanup: "quarantine" };
+            }
+            else {
+                releaseOpts = {
+                    cleanup: "reset",
+                    force: options.force
+                };
+                if (options.resetTo) {
+                    releaseOpts.resetTo = options.resetTo;
+                }
+            }
+            const lease = await grove.release(targetPath, releaseOpts);
+            if (options.json) {
+                process.stdout.write(JSON.stringify(lease, null, 2) + "\n");
+                return;
+            }
+            console.error(pc.green(`🌳 Lease ${lease.leaseId} released with action ${options.cleanup}.`));
+            return;
+        }
         await grove.release(targetPath);
-        console.error(pc.green("🌳 Worktree returned to pool."));
+        if (options.json) {
+            process.stdout.write(JSON.stringify({ success: true, path: targetPath }) + "\n");
+        }
+        else {
+            console.error(pc.green("🌳 Worktree returned to pool."));
+        }
     }
     catch (err) {
         handleError(err);

package/dist/commands/repair.d.ts

@@ -0,0 +1,3 @@
+import { Command } from "commander";
+export declare const repairCmd: Command;
+//# sourceMappingURL=repair.d.ts.map

package/dist/commands/repair.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"repair.d.ts","sourceRoot":"","sources":["../../src/commands/repair.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC,eAAO,MAAM,SAAS,SAoClB,CAAC"}

package/dist/commands/repair.js

@@ -0,0 +1,42 @@
+import { Command } from "commander";
+import { loadGrove } from "../utils.js";
+import { handleError } from "../error-handler.js";
+import pc from "picocolors";
+export const repairCmd = new Command("repair")
+    .description("Repair a stuck or broken lease")
+    .argument("<leaseId>", "Lease ID to repair")
+    .requiredOption("--action <action>", "Action to take: quarantine, resume-cleanup, or force-destroy")
+    .option("-f, --force", "Force action even if processes are running")
+    .option("-r, --repo <path>", "Path to repository root")
+    .option("--json", "Output result as JSON")
+    .action(async (leaseId, options) => {
+    try {
+        if (!["quarantine", "resume-cleanup", "force-destroy"].includes(options.action)) {
+            throw new Error("Invalid action. Must be quarantine, resume-cleanup, or force-destroy.");
+        }
+        const grove = await loadGrove({ repo: options.repo });
+        const lease = await grove.repair({
+            leaseId,
+            action: options.action,
+            force: options.force,
+        });
+        if (!lease) {
+            if (options.json) {
+                process.stdout.write(JSON.stringify({ status: "destroyed", leaseId }) + "\n");
+            }
+            else {
+                console.error(pc.green(`🌳 Lease ${leaseId} was successfully force-destroyed.`));
+            }
+            return;
+        }
+        if (options.json) {
+            process.stdout.write(JSON.stringify(lease, null, 2) + "\n");
+        }
+        else {
+            console.error(pc.green(`🌳 Lease ${lease.leaseId} repaired with action ${options.action}. New state: ${lease.state}`));
+        }
+    }
+    catch (err) {
+        handleError(err);
+    }
+});

package/dist/commands/status.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../src/commands/status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC,eAAO,MAAM,SAAS,SAqDlB,CAAC"}
+{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../src/commands/status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC,eAAO,MAAM,SAAS,SA+ElB,CAAC"}

package/dist/commands/status.js

@@ -5,10 +5,32 @@ import pc from "picocolors";
 export const statusCmd = new Command("status")
     .description("Show the status of all worktrees in the pool")
     .option("-r, --repo <path>", "Path to repository root")
+    .option("--leases", "Show lease metadata instead of ephemeral slots")
     .option("--json", "Output status as JSON")
     .action(async (options) => {
     try {
         const grove = await loadGrove({ repo: options.repo });
+        if (options.leases) {
+            const leases = await grove.listLeases();
+            if (options.json) {
+                process.stdout.write(JSON.stringify(leases, null, 2) + "\n");
+                return;
+            }
+            if (leases.length === 0) {
+                console.log("🌳 No leases in pool.");
+                return;
+            }
+            console.log(pc.bold("Lease ID\tState\t\tBranch\t\tPath"));
+            console.log("------------------------------------------------------------------");
+            for (const l of leases) {
+                const stateStr = l.state === "leased" ? pc.green(l.state) :
+                    l.state === "quarantined" ? pc.red(l.state) :
+                        pc.yellow(l.state);
+                console.log(`${l.leaseId}\t${stateStr}\t\t${l.branch || "-"}\t\t${l.path}`);
+            }
+            return;
+        }
+        // Legacy
         const trees = await grove.list();
         if (options.json) {
             process.stdout.write(JSON.stringify(trees, null, 2) + "\n");

package/dist/error-handler.d.ts

@@ -1,3 +1,4 @@
 export declare function setDebug(enabled: boolean): void;
+export declare function setJson(enabled: boolean): void;
 export declare function handleError(err: unknown): never;
 //# sourceMappingURL=error-handler.d.ts.map

package/dist/error-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"error-handler.d.ts","sourceRoot":"","sources":["../src/error-handler.ts"],"names":[],"mappings":"AAKA,wBAAgB,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAE/C;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,KAAK,CAsB/C"}
+{"version":3,"file":"error-handler.d.ts","sourceRoot":"","sources":["../src/error-handler.ts"],"names":[],"mappings":"AAMA,wBAAgB,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAE/C;AAED,wBAAgB,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAE9C;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,KAAK,CA+B/C"}

package/dist/error-handler.js

@@ -1,10 +1,22 @@
 import pc from "picocolors";
 import { GroveError, GitCommandError } from "@ferueda/grove";
 let debugEnabled = false;
+let jsonEnabled = false;
 export function setDebug(enabled) {
     debugEnabled = enabled;
 }
+export function setJson(enabled) {
+    jsonEnabled = enabled;
+}
 export function handleError(err) {
+    if (jsonEnabled) {
+        const errorObj = { error: err instanceof Error ? err.message : String(err) };
+        if (err instanceof GroveError) {
+            errorObj.code = err.code;
+        }
+        process.stdout.write(JSON.stringify(errorObj, null, 2) + "\n");
+        process.exit(1);
+    }
     if (err instanceof GroveError) {
         console.error(pc.red(`[${err.code}] ${err.message}`));
         if (debugEnabled) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ferueda/grove-cli",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ferueda/grove.git"
@@ -19,7 +19,7 @@
     "commander": "^13.0.0",
     "execa": "^9.6.0",
     "picocolors": "^1.1.0",
-    "@ferueda/grove": "0.2.0"
+    "@ferueda/grove": "0.3.0"
   },
   "scripts": {
     "build": "tsgo -p tsconfig.json"