git-worktree-utils 1.0.3 → 1.1.0

package/dist/add.js

@@ -2,26 +2,58 @@
 import { execSync } from "child_process";
 import { p as parseArgs, e as exitWithError, i as isBranchCheckedOut, g as getMainRepoRoot, c as copyEnvFiles } from "./utils-D1mQhe1g.js";
 const args = parseArgs(process.argv.slice(2));
-const dirName = args["dirName"];
 const branchName = args["branchName"];
-if (!dirName) {
-  exitWithError("Missing --dirName=...");
+const dirName = args["dirName"];
+if (!branchName) {
+  exitWithError("Missing --branchName=...");
 }
-const branch = branchName || dirName;
+const branch = branchName;
+const dir = dirName || branchName;
 const { checkedOut, location } = isBranchCheckedOut(branch);
 if (checkedOut) {
   console.error(`Branch '${branch}' is already checked out at:`);
   console.error(location);
   process.exit(1);
 }
-const targetPath = `../${dirName}`;
+console.log("Fetching latest from remote...");
+try {
+  execSync("git fetch", { stdio: "inherit" });
+} catch {
+  console.warn("Warning: git fetch failed, continuing anyway...");
+}
+function branchExistsLocally(branchName2) {
+  try {
+    const result = execSync(`git branch --list ${branchName2}`, { encoding: "utf-8" });
+    return result.trim().length > 0;
+  } catch {
+    return false;
+  }
+}
+function branchExistsOnRemote(branchName2) {
+  try {
+    const result = execSync(`git branch -r --list origin/${branchName2}`, { encoding: "utf-8" });
+    return result.trim().length > 0;
+  } catch {
+    return false;
+  }
+}
+const targetPath = `../${dir}`;
 try {
   console.log(`Creating worktree at ${targetPath} for branch ${branch}...`);
-  execSync(`git worktree add ${targetPath} ${branch}`, { stdio: "inherit" });
+  if (branchExistsLocally(branch)) {
+    execSync(`git worktree add ${targetPath} ${branch}`, { stdio: "inherit" });
+  } else if (branchExistsOnRemote(branch)) {
+    execSync(`git worktree add -b ${branch} ${targetPath} origin/${branch}`, { stdio: "inherit" });
+  } else {
+    console.log(`Branch '${branch}' not found locally or on remote, creating new branch...`);
+    execSync(`git worktree add -b ${branch} ${targetPath}`, { stdio: "inherit" });
+    console.log(`
+Tip: Run \`git push -u origin ${branch}\` to push and set up tracking, otherwise you'll get an error about setting upstream on first push.`);
+  }
 } catch {
   exitWithError("Failed to create worktree");
 }
 console.log("\nCopying .env files...");
 const mainRoot = getMainRepoRoot();
-const count = copyEnvFiles(mainRoot, `../${dirName}`);
+const count = copyEnvFiles(mainRoot, `../${dir}`);
 console.log(`Done copying ${count} .env file(s)`);

package/dist/cli.js

@@ -32,8 +32,8 @@ Commands:
   sync-env    Sync .env files to other worktrees
 
 Options for 'add':
-  --dirName=<name>      Directory name for the worktree (required)
-  --branchName=<name>   Branch name (defaults to dirName)
+  --branchName=<name>   Branch name (required)
+  --dirName=<name>      Directory name for the worktree (defaults to branchName)
 
 Options for 'find':
   --search=<term>       Search term (case-insensitive)
@@ -57,8 +57,8 @@ Safety Features:
   - Automatically copies .env files when creating worktrees
 
 Examples:
-  wt add --dirName=my-feature --branchName=feature/my-feature
-  wt add --dirName=bugfix-123
+  wt add --branchName=feature/my-feature
+  wt add --branchName=feature/my-feature --dirName=my-feature
   wt find --search=feature
   wt sync-env --all
   wt remove --dirName=old-feature

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-worktree-utils",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "type": "module",
   "description": "Safe git worktree management CLI with environment file syncing",
   "keywords": [