@lsst/pik-plugin-worktree 0.5.0 → 0.5.2

package/dist/index.d.ts

@@ -1,4 +1,4 @@
 export { worktreePlugin } from './lib/plugin.js';
 export type { WorktreeConfig } from './lib/types.js';
-export { git, getRepoRoot, getCurrentBranch, isClean, listWorktrees, createWorktree, removeWorktree, listBranches, branchExists, type Worktree, } from './lib/git.js';
+export { getGit, getRepoRoot, getCurrentBranch, isClean, listWorktrees, createWorktree, removeWorktree, listBranches, branchExists, deleteBranch, isWorktree, type Worktree, } from './lib/git.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAGjD,YAAY,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGrD,OAAO,EACL,GAAG,EACH,WAAW,EACX,gBAAgB,EAChB,OAAO,EACP,aAAa,EACb,cAAc,EACd,cAAc,EACd,YAAY,EACZ,YAAY,EACZ,KAAK,QAAQ,GACd,MAAM,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAGjD,YAAY,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGrD,OAAO,EACL,MAAM,EACN,WAAW,EACX,gBAAgB,EAChB,OAAO,EACP,aAAa,EACb,cAAc,EACd,cAAc,EACd,YAAY,EACZ,YAAY,EACZ,YAAY,EACZ,UAAU,EACV,KAAK,QAAQ,GACd,MAAM,cAAc,CAAC"}

package/dist/index.js

@@ -1,39 +1,31 @@
-import { Command } from "commander";
-import { select, input, confirm } from "@inquirer/prompts";
+import { select, input, confirm, Separator } from "@inquirer/prompts";
 import pc from "picocolors";
+import { Command } from "commander";
 import { basename, resolve, relative } from "path";
 import { execSync } from "child_process";
 import { existsSync, mkdirSync, copyFileSync } from "fs";
 import { glob } from "glob";
 import { loadConfig } from "@lsst/pik-core";
-function git(args, cwd) {
-  try {
-    return execSync(`git ${args.join(" ")}`, {
-      cwd,
-      encoding: "utf-8",
-      stdio: ["pipe", "pipe", "pipe"]
-    }).trim();
-  } catch (error) {
-    const err = error;
-    const gitError = new Error(
-      err.stderr?.toString().trim() || err.message
-    );
-    gitError.stderr = err.stderr?.toString();
-    throw gitError;
-  }
+import { simpleGit } from "simple-git";
+function getGit(cwd) {
+  return simpleGit(cwd);
 }
-function getRepoRoot(cwd) {
-  return git(["rev-parse", "--show-toplevel"], cwd);
+async function getRepoRoot(cwd) {
+  const git = getGit(cwd);
+  return (await git.revparse(["--show-toplevel"])).trim();
 }
-function getCurrentBranch(cwd) {
-  return git(["rev-parse", "--abbrev-ref", "HEAD"], cwd);
+async function getCurrentBranch(cwd) {
+  const git = getGit(cwd);
+  return (await git.revparse(["--abbrev-ref", "HEAD"])).trim();
 }
-function isClean(cwd) {
-  const status = git(["status", "--porcelain"], cwd);
-  return status === "";
+async function isClean(cwd) {
+  const git = getGit(cwd);
+  const status = await git.status();
+  return status.isClean();
 }
-function listWorktrees(cwd) {
-  const output = git(["worktree", "list", "--porcelain"], cwd);
+async function listWorktrees(cwd) {
+  const git = getGit(cwd);
+  const output = await git.raw(["worktree", "list", "--porcelain"]);
   if (!output) return [];
   const worktrees = [];
   let current = {};
@@ -63,7 +55,8 @@ function listWorktrees(cwd) {
   }
   return worktrees;
 }
-function createWorktree(path, branch, options, cwd) {
+async function createWorktree(path, branch, options, cwd) {
+  const git = getGit(cwd);
   const args = ["worktree", "add"];
   if (options?.newBranch) {
     args.push("-b", branch);
@@ -74,36 +67,56 @@ function createWorktree(path, branch, options, cwd) {
   } else {
     args.push(path, branch);
   }
-  git(args, cwd);
+  await git.raw(args);
 }
-function removeWorktree(path, force, cwd) {
+async function removeWorktree(path, force, cwd) {
+  const git = getGit(cwd);
   const args = ["worktree", "remove"];
   if (force) {
     args.push("--force");
   }
   args.push(path);
-  git(args, cwd);
+  await git.raw(args);
 }
-function listBranches(cwd) {
-  const output = git(["branch", "--format=%(refname:short)"], cwd);
-  return output.split("\n").filter(Boolean);
+async function listBranches(cwd) {
+  const git = getGit(cwd);
+  const result = await git.branchLocal();
+  return result.all;
 }
-function branchExists(branch, cwd) {
+async function branchExists(branch, cwd) {
+  const git = getGit(cwd);
   try {
-    git(["rev-parse", "--verify", branch], cwd);
+    await git.revparse(["--verify", branch]);
     return true;
   } catch {
     return false;
   }
 }
+async function deleteBranch(branch, force, cwd) {
+  const git = getGit(cwd);
+  if (force) {
+    await git.branch(["-D", branch]);
+  } else {
+    await git.branch(["-d", branch]);
+  }
+}
+async function isWorktree(path) {
+  const git = getGit(path);
+  try {
+    const gitDir = await git.revparse(["--git-dir"]);
+    return gitDir.includes(".git/worktrees/");
+  } catch {
+    return false;
+  }
+}
 const createCommand = new Command("create").alias("add").description("Create a new worktree").argument("[name]", "Name for the worktree directory").option("-b, --branch <branch>", "Branch to checkout (or create with -n)").option("-n, --new", "Create a new branch").action(async (name, options) => {
   try {
-    const repoRoot = getRepoRoot();
+    const repoRoot = await getRepoRoot();
     const config = await loadConfig(repoRoot);
     const worktreeConfig = config?.worktree ?? {};
-    const currentBranch = getCurrentBranch(repoRoot);
-    const branches = listBranches(repoRoot);
-    const existingWorktrees = listWorktrees(repoRoot);
+    const currentBranch = await getCurrentBranch(repoRoot);
+    const branches = await listBranches(repoRoot);
+    const existingWorktrees = await listWorktrees(repoRoot);
     const existingPaths = new Set(existingWorktrees.map((w) => w.path));
     let branch = options.branch;
     let isNewBranch = options.new ?? false;
@@ -119,9 +132,9 @@ const createCommand = new Command("create").alias("add").description("Create a n
         isNewBranch = true;
         branch = await input({
           message: "New branch name:",
-          validate: (value) => {
+          validate: async (value) => {
             if (!value.trim()) return "Branch name is required";
-            if (branchExists(value, repoRoot)) return "Branch already exists";
+            if (await branchExists(value, repoRoot)) return "Branch already exists";
             return true;
           }
         });
@@ -165,7 +178,7 @@ const createCommand = new Command("create").alias("add").description("Create a n
       process.exit(1);
     }
     console.log(pc.dim(`Creating worktree at ${worktreePath}...`));
-    createWorktree(
+    await createWorktree(
       worktreePath,
       branch,
       { newBranch: isNewBranch, baseBranch: currentBranch },
@@ -223,8 +236,8 @@ const createCommand = new Command("create").alias("add").description("Create a n
 });
 const listCommand = new Command("list").alias("ls").description("List all worktrees").option("--json", "Output in JSON format").action(async (options) => {
   try {
-    const repoRoot = getRepoRoot();
-    const worktrees = listWorktrees(repoRoot);
+    const repoRoot = await getRepoRoot();
+    const worktrees = await listWorktrees(repoRoot);
     if (options.json) {
       console.log(JSON.stringify(worktrees, null, 2));
       return;
@@ -252,8 +265,8 @@ const listCommand = new Command("list").alias("ls").description("List all worktr
 });
 const removeCommand = new Command("remove").alias("rm").description("Remove a worktree").argument("[path]", "Path to the worktree to remove").option("-f, --force", "Force removal even if worktree is dirty").option("-D, --delete-branch", "Also delete the branch").action(async (pathArg, options) => {
   try {
-    const repoRoot = getRepoRoot();
-    const worktrees = listWorktrees(repoRoot);
+    const repoRoot = await getRepoRoot();
+    const worktrees = await listWorktrees(repoRoot);
     const removableWorktrees = worktrees.filter((w) => !w.isMain);
     if (removableWorktrees.length === 0) {
       console.log(pc.yellow("No removable worktrees found"));
@@ -295,7 +308,7 @@ const removeCommand = new Command("remove").alias("rm").description("Remove a wo
       return;
     }
     console.log(pc.dim("Removing worktree..."));
-    removeWorktree(targetWorktree.path, options.force, repoRoot);
+    await removeWorktree(targetWorktree.path, options.force, repoRoot);
     console.log(pc.green(`✓ Removed worktree ${relativePath}`));
     if (options.deleteBranch && targetWorktree.branch) {
       const shouldDeleteBranch = await confirm({
@@ -304,7 +317,7 @@ const removeCommand = new Command("remove").alias("rm").description("Remove a wo
       });
       if (shouldDeleteBranch) {
         try {
-          git(["branch", "-D", targetWorktree.branch], repoRoot);
+          await deleteBranch(targetWorktree.branch, true, repoRoot);
           console.log(pc.green(`✓ Deleted branch ${targetWorktree.branch}`));
         } catch (error) {
           if (error instanceof Error) {
@@ -323,6 +336,7 @@ const removeCommand = new Command("remove").alias("rm").description("Remove a wo
     process.exit(1);
   }
 });
+const BACK_VALUE = /* @__PURE__ */ Symbol("back");
 const worktreePlugin = {
   name: "Worktree",
   description: "Manage git worktrees",
@@ -334,17 +348,52 @@ const worktreePlugin = {
     worktreeCmd.addCommand(listCommand);
     worktreeCmd.addCommand(removeCommand);
     worktreeCmd.action(async () => {
-      await createCommand.parseAsync([], { from: "user" });
+      while (true) {
+        let action;
+        try {
+          action = await select({
+            message: "Worktree actions",
+            choices: [
+              { name: "Create worktree", value: "create" },
+              { name: "List worktrees", value: "list" },
+              { name: "Remove worktree", value: "remove" },
+              new Separator(),
+              { name: pc.dim("← Back"), value: BACK_VALUE }
+            ]
+          });
+        } catch (error) {
+          if (error instanceof Error && error.name === "ExitPromptError") {
+            return;
+          }
+          throw error;
+        }
+        if (action === BACK_VALUE) {
+          return;
+        }
+        switch (action) {
+          case "create":
+            await createCommand.parseAsync([], { from: "user" });
+            break;
+          case "list":
+            await listCommand.parseAsync([], { from: "user" });
+            break;
+          case "remove":
+            await removeCommand.parseAsync([], { from: "user" });
+            break;
+        }
+      }
     });
   }
 };
 export {
   branchExists,
   createWorktree,
+  deleteBranch,
   getCurrentBranch,
+  getGit,
   getRepoRoot,
-  git,
   isClean,
+  isWorktree,
   listBranches,
   listWorktrees,
   removeWorktree,

package/dist/lib/git.d.ts

@@ -1,3 +1,4 @@
+import { SimpleGit } from 'simple-git';
 export interface Worktree {
     path: string;
     branch: string;
@@ -5,58 +6,51 @@ export interface Worktree {
     isBare: boolean;
     isMain: boolean;
 }
-export interface GitError extends Error {
-    stderr?: string;
-}
-/**
- * Execute a git command and return stdout
- */
-export declare function git(args: string[], cwd?: string): string;
 /**
- * Execute a git command asynchronously with live output
+ * Get a simple-git instance for the given directory
  */
-export declare function gitAsync(args: string[], cwd?: string): Promise<{
-    code: number;
-    stdout: string;
-    stderr: string;
-}>;
+export declare function getGit(cwd?: string): SimpleGit;
 /**
  * Get the root directory of the git repository
  */
-export declare function getRepoRoot(cwd?: string): string;
+export declare function getRepoRoot(cwd?: string): Promise<string>;
 /**
  * Get the current branch name
  */
-export declare function getCurrentBranch(cwd?: string): string;
+export declare function getCurrentBranch(cwd?: string): Promise<string>;
 /**
  * Check if working directory is clean
  */
-export declare function isClean(cwd?: string): boolean;
+export declare function isClean(cwd?: string): Promise<boolean>;
 /**
  * List all worktrees
  */
-export declare function listWorktrees(cwd?: string): Worktree[];
+export declare function listWorktrees(cwd?: string): Promise<Worktree[]>;
 /**
  * Create a new worktree
  */
 export declare function createWorktree(path: string, branch: string, options?: {
     newBranch?: boolean;
     baseBranch?: string;
-}, cwd?: string): void;
+}, cwd?: string): Promise<void>;
 /**
  * Remove a worktree
  */
-export declare function removeWorktree(path: string, force?: boolean, cwd?: string): void;
+export declare function removeWorktree(path: string, force?: boolean, cwd?: string): Promise<void>;
 /**
  * Get list of local branches
  */
-export declare function listBranches(cwd?: string): string[];
+export declare function listBranches(cwd?: string): Promise<string[]>;
 /**
  * Check if a branch exists
  */
-export declare function branchExists(branch: string, cwd?: string): boolean;
+export declare function branchExists(branch: string, cwd?: string): Promise<boolean>;
+/**
+ * Delete a branch
+ */
+export declare function deleteBranch(branch: string, force?: boolean, cwd?: string): Promise<void>;
 /**
  * Check if path is inside a git worktree
  */
-export declare function isWorktree(path: string): boolean;
+export declare function isWorktree(path: string): Promise<boolean>;
 //# sourceMappingURL=git.d.ts.map

package/dist/lib/git.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../../src/lib/git.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,QAAS,SAAQ,KAAK;IACrC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,wBAAgB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAexD;AAED;;GAEG;AACH,wBAAgB,QAAQ,CACtB,IAAI,EAAE,MAAM,EAAE,EACd,GAAG,CAAC,EAAE,MAAM,GACX,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAwB3D;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAErD;AAED;;GAEG;AACH,wBAAgB,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAG7C;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,QAAQ,EAAE,CAmCtD;AAED;;GAEG;AACH,wBAAgB,cAAc,CAC5B,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE;IAAE,SAAS,CAAC,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,EACtD,GAAG,CAAC,EAAE,MAAM,GACX,IAAI,CAcN;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAOhF;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAGnD;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAOlE;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAQhD"}
+{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../../src/lib/git.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,SAAS,EAAE,MAAM,YAAY,CAAC;AAElD,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED;;GAEG;AACH,wBAAgB,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAE9C;AAED;;GAEG;AACH,wBAAsB,WAAW,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAG/D;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAGpE;AAED;;GAEG;AACH,wBAAsB,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAI5D;AAED;;GAEG;AACH,wBAAsB,aAAa,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAoCrE;AAED;;GAEG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE;IAAE,SAAS,CAAC,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,EACtD,GAAG,CAAC,EAAE,MAAM,GACX,OAAO,CAAC,IAAI,CAAC,CAef;AAED;;GAEG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,OAAO,EACf,GAAG,CAAC,EAAE,MAAM,GACX,OAAO,CAAC,IAAI,CAAC,CAQf;AAED;;GAEG;AACH,wBAAsB,YAAY,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAIlE;AAED;;GAEG;AACH,wBAAsB,YAAY,CAChC,MAAM,EAAE,MAAM,EACd,GAAG,CAAC,EAAE,MAAM,GACX,OAAO,CAAC,OAAO,CAAC,CAQlB;AAED;;GAEG;AACH,wBAAsB,YAAY,CAChC,MAAM,EAAE,MAAM,EACd,KAAK,CAAC,EAAE,OAAO,EACf,GAAG,CAAC,EAAE,MAAM,GACX,OAAO,CAAC,IAAI,CAAC,CAOf;AAED;;GAEG;AACH,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAS/D"}

package/dist/lib/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../src/lib/plugin.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAKhD,eAAO,MAAM,cAAc,EAAE,SAsB5B,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../src/lib/plugin.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAShD,eAAO,MAAM,cAAc,EAAE,SA2D5B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lsst/pik-plugin-worktree",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "Git worktree management plugin for pik CLI",
   "type": "module",
   "license": "MIT",
@@ -27,10 +27,11 @@
     "!**/*.tsbuildinfo"
   ],
   "dependencies": {
-    "@lsst/pik-core": "*",
     "@inquirer/prompts": "^8.1.0",
+    "@lsst/pik-core": "*",
     "commander": "^14.0.2",
     "glob": "^10.5.0",
-    "picocolors": "^1.1.1"
+    "picocolors": "^1.1.1",
+    "simple-git": "^3.30.0"
   }
 }