worktree-add 1.2.0 → 1.2.1

package/README.md

@@ -8,18 +8,19 @@ Running `worktree-add <branch>` from inside a repo:
 
 1. Normalizes `<branch>` (supports `origin/foo`, `refs/heads/foo`, etc.).
 2. Refuses if that branch is already checked out in any worktree.
-3. Picks a destination next to your current repo: `../<repo>-<safe-branch>`.
-4. If the destination exists, asks before moving it to the system trash.
-5. Fetches `origin/<branch>` when needed and creates a git worktree:
+3. Warns if local and `origin/<branch>` heads differ and asks how to resolve.
+4. Picks a destination next to your current repo: `../<repo>-<safe-branch>`.
+5. If the destination exists, asks before moving it to the system trash.
+6. Fetches `origin/<branch>` when needed and creates a git worktree:
    - reuses an existing local branch
    - or creates a tracking branch from `origin/<branch>`
    - or creates a new branch from the current `HEAD`
-6. Copies untracked / ignored files into the new worktree, skipping heavy stuff
+7. Copies untracked / ignored files into the new worktree, skipping heavy stuff
    (`node_modules`, `dist`, `.next`, caches, virtualenvs, etc.).
-7. Detects your package manager and installs dependencies with lockfile‑safe flags
+8. Detects your package manager and installs dependencies with lockfile‑safe flags
    (`npm ci`, `pnpm install --frozen-lockfile`, `yarn install --immutable`, etc.).
-8. If the project uses Next.js and supports it, runs `next typegen`.
-9. Opens the new worktree in your editor.
+9. If the project uses Next.js and supports it, runs `next typegen`.
+10. Opens the new worktree in your editor.
 
 Your original checkout is left untouched.
 

package/dist/cli.js

@@ -13,6 +13,7 @@ import packageJson from "../package.json" with { type: "json" };
 import { git, getRepositoryName, normalizeBranchName, toSafePathSegment, findWorktreeByBranchName, exitWithMessage, } from "./git/git.js";
 import { copyUntrackedFiles } from "./worktree/untracked-file-copy.js";
 import { fetchRemoteBranch, createWorktree } from "./git/worktree-creation.js";
+import { resolveBranchHeadMismatch } from "./git/resolve-branch-head-mismatch.js";
 import { handleExistingDirectory } from "./worktree/destination-directory.js";
 import { setupProject } from "./project/setup.js";
 export function resolveEditor({ optionEditor, environmentEditor, } = {}) {
@@ -40,6 +41,11 @@ async function main(branchRaw, options) {
             "You cannot add another worktree for the same branch.\n" +
             "Open that worktree instead or remove it before retrying.");
     }
+    const shouldContinue = await resolveBranchHeadMismatch(branch);
+    if (!shouldContinue) {
+        process.exitCode = 1;
+        return;
+    }
     // Determine destination directory for the new worktree
     const repoRoot = git("rev-parse", "--show-toplevel");
     const repoName = getRepositoryName();

package/dist/git/git.d.ts

@@ -23,6 +23,18 @@ export declare function localBranchExists(branch: string): boolean;
  * Check if a remote branch exists on origin.
  */
 export declare function remoteBranchExists(branch: string): boolean;
+/**
+ * Fetch a branch from origin.
+ */
+export declare function fetchOriginBranch(branch: string): void;
+/**
+ * Get the current head commit for a local branch.
+ */
+export declare function getLocalBranchHead(branch: string): string | undefined;
+/**
+ * Get the current head commit for a remote-tracking branch.
+ */
+export declare function getRemoteBranchHead(branch: string): string | undefined;
 /**
  * Convert an arbitrary string to a filesystem-safe single path segment.
  *
@@ -38,6 +50,10 @@ export declare function fileExists(p: string): Promise<boolean>;
  * Print an error message and exit the process with status 1.
  */
 export declare function exitWithMessage(message: string): never;
+/**
+ * Prompt for input and return the user's response.
+ */
+export declare function prompt(message: string): Promise<string>;
 /**
  * Prompts user for yes/no confirmation
  * @param message The message to display to the user

package/dist/git/git.js

@@ -73,6 +73,45 @@ export function remoteBranchExists(branch) {
         return false;
     }
 }
+/**
+ * Fetch a branch from origin.
+ */
+export function fetchOriginBranch(branch) {
+    const normalized = normalizeBranchName(branch);
+    const refspec = `+refs/heads/${normalized}:refs/remotes/origin/${normalized}`;
+    const result = spawnSync("git", ["fetch", "origin", "--", refspec], {
+        stdio: "inherit",
+    });
+    if (result.error)
+        throw result.error;
+    if (result.status !== 0) {
+        throw new Error(`git fetch origin ${refspec} failed`);
+    }
+}
+/**
+ * Get the current head commit for a local branch.
+ */
+export function getLocalBranchHead(branch) {
+    try {
+        const normalized = normalizeBranchName(branch);
+        return git("rev-parse", `refs/heads/${normalized}`);
+    }
+    catch {
+        return undefined;
+    }
+}
+/**
+ * Get the current head commit for a remote-tracking branch.
+ */
+export function getRemoteBranchHead(branch) {
+    try {
+        const normalized = normalizeBranchName(branch);
+        return git("rev-parse", `refs/remotes/origin/${normalized}`);
+    }
+    catch {
+        return undefined;
+    }
+}
 /**
  * Convert an arbitrary string to a filesystem-safe single path segment.
  *
@@ -108,22 +147,29 @@ export function exitWithMessage(message) {
     process.exit(1);
 }
 /**
- * Prompts user for yes/no confirmation
- * @param message The message to display to the user
- * @returns Promise<boolean> - true if user confirms, false otherwise
+ * Prompt for input and return the user's response.
  */
-export async function confirm(message) {
+export async function prompt(message) {
     const rl = readline.createInterface({
         input: process.stdin,
-        output: process.stdout,
+        output: process.stderr,
     });
     try {
-        const answer = await rl.question(`${message} [y/N] `);
-        return answer.toLowerCase() === "y" || answer.toLowerCase() === "yes";
+        return await rl.question(message);
     }
     finally {
         rl.close();
     }
 }
+/**
+ * Prompts user for yes/no confirmation
+ * @param message The message to display to the user
+ * @returns Promise<boolean> - true if user confirms, false otherwise
+ */
+export async function confirm(message) {
+    const answer = await prompt(`${message} [y/N] `);
+    const normalized = answer.trim().toLowerCase();
+    return normalized === "y" || normalized === "yes";
+}
 // Re-export worktree parsing functions for backward compatibility
 export { getRepositoryName, findWorktreeByBranchName, } from "./worktree-discovery.js";

package/dist/git/parse-branch-head-mismatch-choice.d.ts

@@ -0,0 +1,7 @@
+/**
+ * parse-branch-head-mismatch-choice.ts
+ *
+ * Pure helpers for parsing interactive choices in the branch-head mismatch flow.
+ */
+export type ResolutionChoice = "keep-local" | "update-local" | "abort";
+export declare function parseResolutionChoice(input: string, defaultChoice: ResolutionChoice): ResolutionChoice | undefined;

package/dist/git/parse-branch-head-mismatch-choice.js

@@ -0,0 +1,26 @@
+/**
+ * parse-branch-head-mismatch-choice.ts
+ *
+ * Pure helpers for parsing interactive choices in the branch-head mismatch flow.
+ */
+export function parseResolutionChoice(input, defaultChoice) {
+    const normalized = input.trim().toLowerCase();
+    if (normalized === "")
+        return defaultChoice;
+    if (normalized === "1" || normalized === "keep" || normalized === "local") {
+        return "keep-local";
+    }
+    if (normalized === "2" ||
+        normalized === "update" ||
+        normalized === "remote") {
+        return "update-local";
+    }
+    if (normalized === "3" ||
+        normalized === "abort" ||
+        normalized === "a" ||
+        normalized === "q" ||
+        normalized === "quit") {
+        return "abort";
+    }
+    return undefined;
+}

package/dist/git/resolve-branch-head-mismatch.d.ts

@@ -0,0 +1,6 @@
+/**
+ * resolve-branch-head-mismatch.ts
+ *
+ * Warn and resolve mismatched local/remote branch heads.
+ */
+export declare function resolveBranchHeadMismatch(branch: string): Promise<boolean>;

package/dist/git/resolve-branch-head-mismatch.js

@@ -0,0 +1,79 @@
+/**
+ * resolve-branch-head-mismatch.ts
+ *
+ * Warn and resolve mismatched local/remote branch heads.
+ */
+import { confirm, fetchOriginBranch, getLocalBranchHead, getRemoteBranchHead, git, localBranchExists, normalizeBranchName, prompt, remoteBranchExists, } from "./git.js";
+import { parseResolutionChoice } from "./parse-branch-head-mismatch-choice.js";
+const shortHash = (value) => value.slice(0, 7);
+const getAheadBehindCounts = (localHead, remoteHead) => {
+    const output = git("rev-list", "--left-right", "--count", `${localHead}...${remoteHead}`);
+    const [aheadRaw, behindRaw] = output.split(/\s+/u);
+    const ahead = Number.parseInt(aheadRaw ?? "0");
+    const behind = Number.parseInt(behindRaw ?? "0");
+    return {
+        ahead: Number.isNaN(ahead) ? 0 : ahead,
+        behind: Number.isNaN(behind) ? 0 : behind,
+    };
+};
+const promptResolution = async (branch, localHead, remoteHead, ahead, behind) => {
+    const updateLabel = ahead > 0
+        ? `Update local branch to match origin (drops ${ahead} local commit${ahead === 1 ? "" : "s"})`
+        : "Update local branch to match origin (fast-forward)";
+    const defaultChoice = ahead === 0 && behind > 0 ? "update-local" : "keep-local";
+    const defaultIndex = defaultChoice === "update-local" ? "2" : "1";
+    console.warn(`⚠️  Local branch '${branch}' and origin/${branch} point to different commits.`);
+    console.warn(`  local:  ${shortHash(localHead)}`);
+    console.warn(`  origin: ${shortHash(remoteHead)}`);
+    if (ahead > 0 || behind > 0) {
+        const descriptors = [];
+        if (ahead > 0)
+            descriptors.push(`ahead by ${ahead}`);
+        if (behind > 0)
+            descriptors.push(`behind by ${behind}`);
+        console.warn(`  local is ${descriptors.join(" and ")} relative to origin`);
+    }
+    console.warn("Choose how to proceed:");
+    console.warn("  1) Keep local branch (use local head for the worktree)");
+    console.warn(`  2) ${updateLabel}`);
+    console.warn("  3) Abort");
+    for (;;) {
+        const answer = await prompt(`Select an option (default: ${defaultIndex}): `);
+        const choice = parseResolutionChoice(answer, defaultChoice);
+        if (choice)
+            return choice;
+        console.warn("Please enter 1, 2, or 3.");
+    }
+};
+export async function resolveBranchHeadMismatch(branch) {
+    const normalized = normalizeBranchName(branch);
+    if (!localBranchExists(normalized) || !remoteBranchExists(normalized)) {
+        return true;
+    }
+    console.warn(`➤ Fetching origin/${normalized} to check for divergence …`);
+    fetchOriginBranch(normalized);
+    const localHead = getLocalBranchHead(normalized);
+    const remoteHead = getRemoteBranchHead(normalized);
+    if (!localHead || !remoteHead || localHead === remoteHead) {
+        return true;
+    }
+    const { ahead, behind } = getAheadBehindCounts(localHead, remoteHead);
+    const resolution = await promptResolution(normalized, localHead, remoteHead, ahead, behind);
+    if (resolution === "abort") {
+        console.warn("Operation cancelled.");
+        return false;
+    }
+    if (resolution === "keep-local") {
+        return true;
+    }
+    if (ahead > 0) {
+        const confirmed = await confirm(`Updating local '${normalized}' will discard ${ahead} local commit${ahead === 1 ? "" : "s"} not on origin. Continue?`);
+        if (!confirmed) {
+            console.warn("Operation cancelled.");
+            return false;
+        }
+    }
+    console.warn(`➤ Updating local branch '${normalized}' to origin/${normalized} …`);
+    git("branch", "-f", "--", normalized, `origin/${normalized}`);
+    return true;
+}

package/dist/git/worktree-creation.d.ts

@@ -4,7 +4,7 @@
  * Utilities for creating Git worktrees
  */
 /**
- * Fetch a remote branch if it exists locally but not remotely
+ * Fetch a remote branch if it exists remotely but not locally.
  */
 export declare function fetchRemoteBranch(branch: string): void;
 /**

package/dist/git/worktree-creation.js

@@ -3,17 +3,14 @@
  *
  * Utilities for creating Git worktrees
  */
-import { spawnSync } from "node:child_process";
-import { git, localBranchExists, remoteBranchExists } from "./git.js";
+import { fetchOriginBranch, git, localBranchExists, remoteBranchExists, } from "./git.js";
 /**
- * Fetch a remote branch if it exists locally but not remotely
+ * Fetch a remote branch if it exists remotely but not locally.
  */
 export function fetchRemoteBranch(branch) {
     if (!localBranchExists(branch) && remoteBranchExists(branch)) {
         console.log(`➤ Fetching origin/${branch} …`);
-        spawnSync("git", ["fetch", "origin", branch], {
-            stdio: "inherit",
-        });
+        fetchOriginBranch(branch);
     }
 }
 /**

package/package.json

@@ -2,7 +2,7 @@
   "name": "worktree-add",
   "author": "Łukasz Jerciński",
   "license": "MIT",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Create a Git worktree next to your current repo for a branch, copy useful local files, install deps, and open it in your editor.",
   "repository": {
     "type": "git",
@@ -23,21 +23,21 @@
     "LICENSE"
   ],
   "scripts": {
-    "start": "pnpm run rebuild && node bin/worktree-add",
+    "prepare": "git config core.hooksPath .githooks",
+    "prepublishOnly": "pnpm run rebuild",
     "build": "tsc -p tsconfig.app.json",
     "clean": "rm -rf dist *.tsbuildinfo",
-    "rebuild": "pnpm run clean && pnpm run build",
-    "prepare": "husky",
-    "prepublishOnly": "pnpm run rebuild",
-    "typecheck": "tsc -b --noEmit",
     "format": "prettier --write .",
     "format:check": "prettier --check .",
+    "fta": "fta-check",
+    "knip": "knip",
     "lint": "eslint",
+    "rebuild": "pnpm run clean && pnpm run build",
+    "start": "pnpm run rebuild && node bin/worktree-add",
     "test": "vitest run",
-    "test:watch": "vitest",
     "test:coverage": "vitest run --coverage",
-    "knip": "knip",
-    "fta:check": "fta-check --threshold 55"
+    "test:watch": "vitest",
+    "typecheck": "tsc -b --noEmit"
   },
   "keywords": [
     "git",
@@ -47,36 +47,27 @@
     "git-worktree",
     "development"
   ],
-  "packageManager": "pnpm@10.22.0",
+  "packageManager": "pnpm@10.25.0",
   "engines": {
     "node": ">=22.14.0"
   },
   "dependencies": {
     "commander": "^14.0.2",
-    "package-manager-detector": "^1.5.0",
-    "trash": "^10.0.0"
+    "package-manager-detector": "^1.6.0",
+    "trash": "^10.0.1"
   },
   "devDependencies": {
-    "@commitlint/cli": "^20.1.0",
-    "@commitlint/config-conventional": "^20.0.0",
-    "@eslint/compat": "^1.3.2",
-    "@eslint/js": "^9.31.0",
     "@total-typescript/ts-reset": "^0.6.1",
-    "@types/node": "^24.0.15",
-    "@vitest/coverage-v8": "^3.2.4",
-    "@vitest/eslint-plugin": "^1.3.4",
-    "eslint": "^9.31.0",
-    "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-unicorn": "^62.0.0",
-    "fta-check": "^1.1.0",
+    "@types/node": "^25.0.10",
+    "@vitest/coverage-v8": "^4.0.18",
+    "eslint": "^9.39.2",
+    "eslint-config-axkit": "^1.1.0",
+    "fta-check": "^1.5.1",
     "fta-cli": "^3.0.0",
-    "globals": "^16.5.0",
-    "husky": "^9.1.7",
-    "knip": "^5.66.4",
-    "prettier": "3.6.2",
+    "knip": "^5.82.1",
+    "prettier": "3.7.4",
     "semantic-release": "^25.0.2",
-    "typescript": "^5.8.3",
-    "typescript-eslint": "^8.37.0",
-    "vitest": "^3.2.4"
+    "typescript": "^5.9.3",
+    "vitest": "^4.0.18"
   }
 }