branch-nexus 1.3.0 → 1.4.1

package/README.md

@@ -1,7 +1,7 @@
 # BranchNexus
 
-[![npm version](https://img.shields.io/npm/v/branchnexus.svg)](https://www.npmjs.com/package/branchnexus)
-[![Node.js Version](https://img.shields.io/node/v/branchnexus.svg)](https://nodejs.org)
+[![npm version](https://img.shields.io/npm/v/branch-nexus.svg)](https://www.npmjs.com/package/branch-nexus)
+[![Node.js Version](https://img.shields.io/node/v/branch-nexus.svg)](https://nodejs.org)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
 **BranchNexus**, birden fazla Git branch'i aynı anda izole worktree'lerde açıp tmux panelleriyle yöneten bir CLI aracıdır.
@@ -25,13 +25,13 @@
 ## Kurulum
 
 ```bash
-npm install -g branchnexus
+npm install -g branch-nexus
 ```
 
 Veya npx ile doğrudan çalıştırın:
 
 ```bash
-npx branchnexus init
+npx branch-nexus init
 ```
 
 ## Hızlı Başlangıç

package/dist/cli.js

@@ -707,11 +707,19 @@ async function runCommand(command, options = {}) {
       stderr: result.stderr
     };
   } catch (error) {
-    const execaError = error;
+    if (error instanceof Error && "exitCode" in error) {
+      const execaError = error;
+      return {
+        exitCode: execaError.exitCode ?? 1,
+        stdout: execaError.stdout ?? "",
+        stderr: execaError.stderr ?? execaError.message
+      };
+    }
+    const message = error instanceof Error ? error.message : String(error);
     return {
-      exitCode: execaError.exitCode ?? 1,
-      stdout: execaError.stdout ?? "",
-      stderr: execaError.stderr ?? execaError.message
+      exitCode: 1,
+      stdout: "",
+      stderr: message
     };
   }
 }
@@ -724,20 +732,38 @@ async function runCommandViaWSL(distribution, command, options = {}) {
 // ts-src/tmux/session.ts
 init_logger();
 init_errors();
+
+// ts-src/utils/validators.ts
+init_esm_shims();
+function hasDistribution(dist) {
+  return dist !== void 0 && dist !== "";
+}
+function normalizePath(path3) {
+  return path3.replace(/\\/g, "/");
+}
+function posixPath(path3) {
+  let normalized = normalizePath(path3);
+  while (normalized.startsWith("//")) {
+    normalized = normalized.slice(1);
+  }
+  return normalized;
+}
+
+// ts-src/tmux/session.ts
 async function startSession(sessionName, commands, distribution) {
   const isWindows = detectPlatform() === "windows" /* WINDOWS */;
   logger.debug(`Starting tmux session: ${sessionName}`);
   for (const command of commands) {
-    const wrappedCommand = isWindows && distribution !== void 0 && distribution !== "" ? buildWslCommand(distribution, command) : command;
+    const wrappedCommand = isWindows && hasDistribution(distribution) ? buildWslCommand(distribution, command) : command;
     logger.debug(`Executing tmux command: ${wrappedCommand.join(" ")}`);
-    const result = isWindows && distribution !== void 0 && distribution !== "" ? await runCommandViaWSL(distribution, command) : await runCommand(wrappedCommand);
+    const result = isWindows && hasDistribution(distribution) ? await runCommandViaWSL(distribution, command) : await runCommand(wrappedCommand);
     if (result.exitCode !== 0) {
       const stderr = result.stderr.trim();
       const isNewSession = command[0] === "tmux" && command[1] === "new-session";
       if (isNewSession && stderr.toLowerCase().includes("duplicate session")) {
         logger.warn(`tmux session already exists: ${sessionName}, replacing`);
         await killSession(sessionName, distribution);
-        const retryResult = isWindows && distribution !== void 0 && distribution !== "" ? await runCommandViaWSL(distribution, command) : await runCommand(wrappedCommand);
+        const retryResult = isWindows && hasDistribution(distribution) ? await runCommandViaWSL(distribution, command) : await runCommand(wrappedCommand);
         if (retryResult.exitCode !== 0) {
           throw new BranchNexusError(
             "Failed to initialize tmux session.",
@@ -760,7 +786,7 @@ async function killSession(sessionName, distribution) {
   const isWindows = detectPlatform() === "windows" /* WINDOWS */;
   const command = ["tmux", "kill-session", "-t", sessionName];
   logger.debug(`Killing tmux session: ${sessionName}`);
-  const result = isWindows && distribution !== void 0 && distribution !== "" ? await runCommandViaWSL(distribution, command) : await runCommand(command);
+  const result = isWindows && hasDistribution(distribution) ? await runCommandViaWSL(distribution, command) : await runCommand(command);
   if (result.exitCode !== 0) {
     logger.warn(`Failed to kill session: ${result.stderr}`);
   }
@@ -769,7 +795,7 @@ async function listSessions(distribution) {
   const isWindows = detectPlatform() === "windows" /* WINDOWS */;
   const command = ["tmux", "list-sessions", "-F", "#{session_name}"];
   try {
-    const result = isWindows && distribution !== void 0 && distribution !== "" ? await runCommandViaWSL(distribution, command) : await runCommand(command);
+    const result = isWindows && hasDistribution(distribution) ? await runCommandViaWSL(distribution, command) : await runCommand(command);
     if (result.exitCode !== 0) {
       return [];
     }
@@ -825,12 +851,15 @@ var WorktreeManager = class {
     const targetPath = this.commandPath(target);
     const pruneCmd = ["git", "-C", repoPath, "worktree", "prune"];
     try {
-      if (distribution !== void 0 && distribution !== "") {
+      if (hasDistribution(distribution)) {
         await runCommandViaWSL(distribution, pruneCmd);
       } else {
         await runCommand(pruneCmd);
       }
-    } catch {
+    } catch (error) {
+      logger.debug(
+        `Prune failed (non-critical): ${error instanceof Error ? error.message : String(error)}`
+      );
     }
     const existingWorktrees = await this.getWorktreesForBranch(
       assignment.repoPath,
@@ -856,15 +885,18 @@ var WorktreeManager = class {
         this.commandPath(existingPath)
       ];
       try {
-        if (distribution !== void 0 && distribution !== "") {
+        if (hasDistribution(distribution)) {
           await runCommandViaWSL(distribution, removeCmd);
         } else {
           await runCommand(removeCmd);
         }
         logger.debug(`Removed stale worktree: ${existingPath}`);
-      } catch {
+      } catch (removeError) {
+        logger.debug(
+          `Remove failed, trying prune: ${removeError instanceof Error ? removeError.message : String(removeError)}`
+        );
         const pruneCmd2 = ["git", "-C", repoPath, "worktree", "prune"];
-        if (distribution !== void 0 && distribution !== "") {
+        if (hasDistribution(distribution)) {
           await runCommandViaWSL(distribution, pruneCmd2);
         } else {
           await runCommand(pruneCmd2);
@@ -874,7 +906,7 @@ var WorktreeManager = class {
     }
     const cmd = ["git", "-C", repoPath, "worktree", "add", targetPath, assignment.branch];
     try {
-      if (distribution !== void 0 && distribution !== "") {
+      if (hasDistribution(distribution)) {
         await runCommandViaWSL(distribution, cmd);
       } else {
         await runCommand(cmd);
@@ -892,15 +924,6 @@ var WorktreeManager = class {
       );
     }
   }
-  async getCurrentBranch(repoPath, distribution) {
-    const cmd = ["git", "-C", repoPath, "branch", "--show-current"];
-    try {
-      const result = distribution !== void 0 && distribution !== "" ? await runCommandViaWSL(distribution, cmd) : await runCommand(cmd);
-      return result.stdout.trim();
-    } catch {
-      return "";
-    }
-  }
   async materialize(assignments, distribution) {
     logger.debug(`Materializing ${assignments.length} worktree assignments`);
     const created = [];
@@ -912,7 +935,7 @@ var WorktreeManager = class {
   async checkDirty(worktree, distribution) {
     const cmd = ["git", "-C", this.commandPath(worktree.path), "status", "--porcelain"];
     try {
-      const result = distribution !== void 0 && distribution !== "" ? await runCommandViaWSL(distribution, cmd) : await runCommand(cmd);
+      const result = hasDistribution(distribution) ? await runCommandViaWSL(distribution, cmd) : await runCommand(cmd);
       const dirty = result.stdout.trim().length > 0;
       logger.debug(`Dirty check path=${worktree.path} dirty=${dirty}`);
       return dirty;
@@ -945,7 +968,7 @@ var WorktreeManager = class {
       }
       cmd.push(worktreePath);
       try {
-        if (options?.distribution !== void 0 && options.distribution !== "") {
+        if (hasDistribution(options?.distribution)) {
           await runCommandViaWSL(options.distribution, cmd);
         } else {
           await runCommand(cmd);
@@ -963,6 +986,14 @@ var WorktreeManager = class {
     }
     return removed;
   }
+  trackExisting(assignment, path3) {
+    logger.debug(
+      `Tracking existing worktree pane=${assignment.pane} branch=${assignment.branch} path=${path3}`
+    );
+    const managed = createManagedWorktree(assignment, path3);
+    this.managed.push(managed);
+    return managed;
+  }
   getManaged() {
     return [...this.managed];
   }
@@ -977,7 +1008,7 @@ var WorktreeManager = class {
   async getWorktreesForBranch(repoPath, branch, distribution) {
     const cmd = ["git", "-C", this.commandPath(repoPath), "worktree", "list", "--porcelain"];
     try {
-      const result = distribution !== void 0 && distribution !== "" ? await runCommandViaWSL(distribution, cmd) : await runCommand(cmd);
+      const result = hasDistribution(distribution) ? await runCommandViaWSL(distribution, cmd) : await runCommand(cmd);
       const worktrees = [];
       let currentWorktree = "";
       const expectedRef = branch.startsWith("refs/heads/") ? branch : `refs/heads/${branch}`;
@@ -994,7 +1025,10 @@ var WorktreeManager = class {
         }
       }
       return worktrees;
-    } catch {
+    } catch (error) {
+      logger.debug(
+        `Failed to list worktrees for branch ${branch}: ${error instanceof Error ? error.message : String(error)}`
+      );
       return [];
     }
   }
@@ -1005,19 +1039,6 @@ init_esm_shims();
 init_logger();
 init_errors();
 
-// ts-src/utils/validators.ts
-init_esm_shims();
-function normalizePath(path3) {
-  return path3.replace(/\\/g, "/");
-}
-function posixPath(path3) {
-  let normalized = normalizePath(path3);
-  while (normalized.startsWith("//")) {
-    normalized = normalized.slice(1);
-  }
-  return normalized;
-}
-
 // ts-src/github/api.ts
 init_esm_shims();
 function parseGitHubUrl(url) {
@@ -1099,7 +1120,7 @@ var GitHubClient = class {
 };
 
 // ts-src/git/clone.ts
-async function materializeRemoteBranch(repoPath, remoteBranch, _distribution) {
+async function materializeRemoteBranch(repoPath, remoteBranch) {
   const normalizedRepo = posixPath(repoPath);
   if (!remoteBranch.includes("/")) {
     throw new BranchNexusError(
@@ -1119,7 +1140,10 @@ async function materializeRemoteBranch(repoPath, remoteBranch, _distribution) {
       logger.debug(`Local branch already exists: ${localBranch}`);
       return localBranch;
     }
-  } catch {
+  } catch (error) {
+    logger.debug(
+      `Branch check failed, continuing with creation: ${error instanceof Error ? error.message : String(error)}`
+    );
   }
   try {
     await git.branch(["--track", localBranch, remoteBranch]);
@@ -1134,8 +1158,24 @@ async function materializeRemoteBranch(repoPath, remoteBranch, _distribution) {
     );
   }
 }
-async function cloneRepository(url, targetPath) {
-  logger.debug(`Cloning repository ${url} to ${targetPath}`);
+async function cloneRepository(url, targetPath, token) {
+  logger.debug(`Cloning repository to ${targetPath}`);
+  if (token !== void 0 && token !== "" && url.startsWith("https://")) {
+    const urlObj = new URL(url);
+    const credentialHelper = `!f() { echo "username=x-access-token"; echo "password=${token}"; }; f`;
+    try {
+      await execa(
+        "git",
+        ["-c", `credential.${urlObj.origin}.helper=${credentialHelper}`, "clone", url, targetPath],
+        { timeout: 12e4, env: { ...process.env, GIT_TERMINAL_PROMPT: "0" } }
+      );
+      logger.debug(`Cloned repository to ${targetPath}`);
+      return;
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      throw new BranchNexusError(`Failed to clone repository: ${url}`, 5 /* GIT_ERROR */, message);
+    }
+  }
   const git = simpleGit2();
   try {
     await git.clone(url, targetPath);
@@ -1440,13 +1480,21 @@ function formatPreview(key, value) {
 
 // ts-src/prompts/github-browser.ts
 init_esm_shims();
+
+// ts-src/utils/ansi.ts
+init_esm_shims();
 var ANSI_RE = /[\u001B\u009B][[\]()#;?]*(?:(?:(?:[a-zA-Z\d]*(?:;[-a-zA-Z\d/#&.:=?%@~_]*)*)?\u0007)|(?:(?:\d{1,4}(?:;\d{0,4})*)?[\dA-PR-TZcf-nq-uy=><~]))/g;
-var CLR = "\x1B[K";
 function stripAnsi(str) {
-  return str.replace(ANSI_RE, "").length;
+  return str.replace(ANSI_RE, "");
+}
+function visibleLength(str) {
+  return stripAnsi(str).length;
 }
+
+// ts-src/prompts/github-browser.ts
+var CLR = "\x1B[K";
 function padToWidth(content, width) {
-  const pad = Math.max(0, width - stripAnsi(content));
+  const pad = Math.max(0, width - visibleLength(content));
   return content + " ".repeat(pad);
 }
 function boxLine(content, width) {
@@ -1691,14 +1739,7 @@ var COLOR_OPTIONS = PALETTE_KEYS.map((key) => ({
   value: key,
   label: COLOR_PALETTES[key].label
 }));
-var ANSI_RE2 = /[\u001B\u009B][[\]()#;?]*(?:(?:(?:[a-zA-Z\d]*(?:;[-a-zA-Z\d/#&.:=?%@~_]*)*)?\u0007)|(?:(?:\d{1,4}(?:;\d{0,4})*)?[\dA-PR-TZcf-nq-uy=><~]))/g;
 var CLR2 = "\x1B[K";
-function stripAnsi2(str) {
-  return str.replace(ANSI_RE2, "");
-}
-function visibleLength(str) {
-  return stripAnsi2(str).length;
-}
 function padToWidth2(content, width) {
   const pad = Math.max(0, width - visibleLength(content));
   return content + " ".repeat(pad);
@@ -2418,7 +2459,7 @@ var HookRunner = class {
         logger.debug(`Executing hook command pane=${pane} command=${command}`);
         const isWindows = detectPlatform() === "windows" /* WINDOWS */;
         const cmd = ["bash", "-lc", command];
-        const finalCmd = isWindows && distribution !== void 0 && distribution !== "" ? buildWslCommand(distribution, cmd) : cmd;
+        const finalCmd = isWindows && hasDistribution(distribution) ? buildWslCommand(distribution, cmd) : cmd;
         const result = await execa(finalCmd[0], finalCmd.slice(1), {
           timeout: this.timeoutSeconds * 1e3,
           reject: false,
@@ -2615,19 +2656,19 @@ async function ensureTmuxInstalled() {
   }
   let installCmd;
   try {
-    await execa("bash", ["-lc", "which apt-get"]);
+    await execa("which", ["apt-get"]);
     installCmd = "apt-get update && apt-get install -y tmux";
   } catch {
     try {
-      await execa("bash", ["-lc", "which dnf"]);
+      await execa("which", ["dnf"]);
       installCmd = "dnf install -y tmux";
     } catch {
       try {
-        await execa("bash", ["-lc", "which pacman"]);
+        await execa("which", ["pacman"]);
         installCmd = "pacman -S --noconfirm tmux";
       } catch {
         try {
-          await execa("bash", ["-lc", "which apk"]);
+          await execa("which", ["apk"]);
           installCmd = "apk add tmux";
         } catch {
           throw new BranchNexusError(
@@ -2641,29 +2682,28 @@ async function ensureTmuxInstalled() {
   }
   try {
     console.log(chalk9.dim(`\xC7al\u0131\u015Ft\u0131r\u0131l\u0131yor: sudo ${installCmd}`));
-    await execa("sudo", ["-n", "bash", "-lc", installCmd], { timeout: 18e4 });
+    await execa("sudo", ["-n", "bash", "-c", installCmd], { timeout: 18e4 });
     console.log(chalk9.green("\u2705 tmux kuruldu!\n"));
     return;
   } catch {
   }
-  console.log(chalk9.cyan("Ba\u015Fka bir terminalde bu komutu \xE7al\u0131\u015Ft\u0131r\u0131n:\n"));
-  console.log(chalk9.bold.white(`  sudo ${installCmd}
-`));
-  console.log(chalk9.dim("tmux kurulumu bekleniyor..."));
-  for (let i = 0; i < 60; i++) {
-    await new Promise((r) => setTimeout(r, 2e3));
+  try {
+    console.log(chalk9.dim("Sudo \u015Fifresi gerekebilir:\n"));
+    await execa("sudo", ["bash", "-c", installCmd], {
+      stdio: "inherit",
+      timeout: 18e4
+    });
     const installed = await hasTmux();
     if (installed) {
-      console.log(chalk9.green("\n\u2705 tmux alg\u0131land\u0131!\n"));
+      console.log(chalk9.green("\n\u2705 tmux kuruldu!\n"));
       return;
     }
-    process.stdout.write(".");
+  } catch {
   }
-  console.log();
   throw new BranchNexusError(
-    "2 dakika i\xE7inde tmux kurulumu alg\u0131lanamad\u0131.",
+    "tmux kurulumu ba\u015Far\u0131s\u0131z oldu.",
     6 /* TMUX_ERROR */,
-    "tmux kurduktan sonra tekrar deneyin."
+    `Manuel kurulum: sudo ${installCmd}`
   );
 }
 async function runCommand2(options) {
@@ -2801,12 +2841,8 @@ async function runCommand2(options) {
         }
       }
       s.start(`Repo klonlan\u0131yor: ${rName}...`);
-      let cloneUrl = url;
-      if (token !== null && token !== "" && url.startsWith("https://")) {
-        cloneUrl = url.replace("https://", `https://${token}@`);
-      }
       try {
-        await cloneRepository(cloneUrl, localPath);
+        await cloneRepository(url, localPath, token ?? void 0);
         s.stop("Klonland\u0131: " + localPath);
       } catch (error) {
         s.stop("Klonlama ba\u015Far\u0131s\u0131z");
@@ -2968,9 +3004,9 @@ async function runCommand2(options) {
     if (cleanup === "session" && result.worktrees.length > 0) {
       const worktreeManager = new WorktreeManager(worktreeBase, cleanup);
       for (const wt of result.worktrees) {
-        await worktreeManager.addWorktree(
+        worktreeManager.trackExisting(
           { pane: wt.pane, repoPath: wt.repoPath, branch: wt.branch },
-          distribution || void 0
+          wt.path
         );
       }
       const cleanupHandler = new SessionCleanupHandler(
@@ -3753,6 +3789,10 @@ async function main() {
     process.exit(4 /* RUNTIME_ERROR */);
   }
 }
-void main();
+main().catch((error) => {
+  const message = error instanceof Error ? error.message : String(error);
+  console.error(chalk9.red(`Fatal error: ${message}`));
+  process.exit(4 /* RUNTIME_ERROR */);
+});
 //# sourceMappingURL=cli.js.map
 //# sourceMappingURL=cli.js.map