worktree-add 1.2.0 → 1.3.0

package/dist/worktree/untracked-file-copy.js

@@ -7,29 +7,71 @@ import * as fs from "node:fs/promises";
 import path from "node:path";
 import { git } from "../git/git.js";
 import { EXTRA_IGNORED_PATTERNS, globToRegExp, toPosixPath, } from "./file-patterns.js";
+import { getStatusLogger } from "../output/get-status-logger.js";
 /**
  * Copy untracked files from source to destination, excluding ignored patterns
  */
-export async function copyUntrackedFiles(repoRoot, destinationDirectory) {
+export async function copyUntrackedFiles(repoRoot, destinationDirectory, options) {
+    const logger = getStatusLogger(options?.logger);
+    const dryRun = options?.dryRun ?? false;
     const extraIgnoredRegexes = EXTRA_IGNORED_PATTERNS.map((pattern) => globToRegExp(pattern));
-    const untrackedEntries = git("ls-files", "--others", // untracked files
-    "--ignored", // ignored files
-    "--exclude-standard", // respect .gitignore rules
-    "-z")
-        .split("\0")
-        .filter(Boolean);
+    const untrackedEntries = new Set();
+    // Combine untracked-not-ignored (`--others`) and untracked-ignored (`--others --ignored`) entries.
+    // These sets should be disjoint, but we dedupe defensively.
+    const untrackedPaths = [
+        ...git("ls-files", "--others", "--exclude-standard", "--full-name", "-z", // null-separated output for safe parsing
+        { cwd: repoRoot })
+            .split("\0")
+            .filter(Boolean),
+        ...git("ls-files", "--others", "--ignored", "--exclude-standard", "--full-name", "-z", // null-separated output for safe parsing
+        { cwd: repoRoot })
+            .split("\0")
+            .filter(Boolean),
+    ];
+    for (const entry of untrackedPaths) {
+        untrackedEntries.add(entry);
+    }
     for (const relativePath of untrackedEntries) {
+        const resolvedSourcePath = path.resolve(repoRoot, relativePath);
+        const relativeToRoot = path.relative(repoRoot, resolvedSourcePath);
+        const escapesRepoRoot = path.isAbsolute(relativeToRoot) ||
+            relativeToRoot === ".." ||
+            relativeToRoot.startsWith(`..${path.sep}`);
+        if (escapesRepoRoot) {
+            logger.warn(`Skipping ${relativePath} (path escapes repo root).`);
+            continue;
+        }
         const posixPath = toPosixPath(relativePath);
         if (extraIgnoredRegexes.some((regex) => regex.test(posixPath))) {
             continue;
         }
-        const sourcePath = path.resolve(repoRoot, relativePath);
+        const sourcePath = resolvedSourcePath;
         const destinationPath = path.join(destinationDirectory, relativePath);
+        const destinationExists = await fs
+            .stat(destinationPath)
+            .then(() => true)
+            .catch((error) => {
+            if (error &&
+                typeof error === "object" &&
+                "code" in error &&
+                error.code === "ENOENT") {
+                return false;
+            }
+            throw error;
+        });
+        if (destinationExists) {
+            logger.detail(`Skipped ${relativePath} (destination already exists).`);
+            continue;
+        }
+        if (dryRun) {
+            logger.detail(`Would copy ${relativePath}`);
+            continue;
+        }
         await fs.mkdir(path.dirname(destinationPath), { recursive: true });
         await fs.cp(sourcePath, destinationPath, {
             recursive: true,
             errorOnExist: false,
         });
-        console.log(`  • copied ${relativePath}`);
+        logger.detail(`Copied ${relativePath}`);
     }
 }

package/package.json

@@ -2,8 +2,8 @@
   "name": "worktree-add",
   "author": "Łukasz Jerciński",
   "license": "MIT",
-  "version": "1.2.0",
-  "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.",
+  "version": "1.3.0",
+  "description": "Create a Git worktree next to your current repo for a branch, copy useful local files, install deps, and open it in your apps.",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Jercik/worktree-add.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,29 @@
     "git-worktree",
     "development"
   ],
-  "packageManager": "pnpm@10.22.0",
+  "packageManager": "pnpm@10.25.0",
   "engines": {
     "node": ">=22.14.0"
   },
   "dependencies": {
+    "@commander-js/extra-typings": "^14.0.0",
     "commander": "^14.0.2",
-    "package-manager-detector": "^1.5.0",
-    "trash": "^10.0.0"
+    "open": "^11.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"
   }
 }

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

@@ -1,13 +0,0 @@
-/**
- * worktree-creation.ts
- *
- * Utilities for creating Git worktrees
- */
-/**
- * Fetch a remote branch if it exists locally but not remotely
- */
-export declare function fetchRemoteBranch(branch: string): void;
-/**
- * Create a worktree for the given branch at the specified destination
- */
-export declare function createWorktree(branch: string, destinationDirectory: string): void;

package/dist/git/worktree-creation.js

@@ -1,38 +0,0 @@
-/**
- * worktree-creation.ts
- *
- * Utilities for creating Git worktrees
- */
-import { spawnSync } from "node:child_process";
-import { git, localBranchExists, remoteBranchExists } from "./git.js";
-/**
- * Fetch a remote branch if it exists locally but not remotely
- */
-export function fetchRemoteBranch(branch) {
-    if (!localBranchExists(branch) && remoteBranchExists(branch)) {
-        console.log(`➤ Fetching origin/${branch} …`);
-        spawnSync("git", ["fetch", "origin", branch], {
-            stdio: "inherit",
-        });
-    }
-}
-/**
- * Create a worktree for the given branch at the specified destination
- */
-export function createWorktree(branch, destinationDirectory) {
-    if (localBranchExists(branch)) {
-        // Reuse existing local branch
-        console.log(`➤ git worktree add ${destinationDirectory} ${branch}`);
-        git("worktree", "add", destinationDirectory, branch);
-    }
-    else if (remoteBranchExists(branch)) {
-        // Create new local branch tracking the remote branch
-        console.log(`➤ git worktree add --track -b ${branch} ${destinationDirectory} origin/${branch}`);
-        git("worktree", "add", "--track", "-b", branch, destinationDirectory, `origin/${branch}`);
-    }
-    else {
-        // Create new branch in the worktree from current HEAD
-        console.log(`➤ git worktree add -b ${branch} ${destinationDirectory}`);
-        git("worktree", "add", "-b", branch, destinationDirectory);
-    }
-}