@ogpoyraz/wtx 0.9.4 → 0.9.6

package/dist/cli.mjs

@@ -25519,6 +25519,14 @@ async function fetchWorktreeData(opts, scope) {
     let hasMain = false;
     try {
       mainBranch = await resolveMainBranch(repo, config2);
+      if (!opts.dryRun) {
+        try {
+          await gitExec(["-C", repo.mainPath, "pull", "--ff-only"], { dryRun: opts.dryRun });
+        } catch (err) {
+          warnings.push({ repoName: repo.name, message: `Failed to pull main for ${repo.name}: ${errorMessage3(err).split(`
+`)[0]}` });
+        }
+      }
       const wts = await getWorktreeList(repo.mainPath);
       let stackMetadata = { version: 1, branches: {} };
       try {
@@ -28216,7 +28224,7 @@ var init_HelpOverlay = __esm(() => {
         ["T (shift+t)", "Cycle theme presets"],
         ["c", "Open configuration"],
         ["e", "View data warnings (when count > 0)"],
-        ["r", "Refresh data"],
+        ["r", "Refresh data (pull main)"],
         ["H", "Action history"],
         ["?", "Toggle help"],
         ["mouse drag", "Select text — copied to clipboard automatically"],
@@ -34492,15 +34500,21 @@ function registerPullBranchCommand(program2) {
           continue;
         }
       }
-      const candidatePath = getWorktreePath(repo, branchToPull);
-      const list = await getWorktreeList(repo.mainPath);
-      const target = findWorktreeForBranch(list, branchToPull, repo.mainPath, candidatePath);
-      if (!target) {
-        stepError(`No worktree found for branch '${branchToPull}'`, candidatePath);
-        failCount++;
-        continue;
+      const mainBranch = await resolveMainBranch(repo, config2);
+      let wtPath;
+      if (branchToPull === mainBranch) {
+        wtPath = repo.mainPath;
+      } else {
+        const candidatePath = getWorktreePath(repo, branchToPull);
+        const list = await getWorktreeList(repo.mainPath);
+        const target = findWorktreeForBranch(list, branchToPull, repo.mainPath, candidatePath);
+        if (!target) {
+          stepError(`No worktree found for branch '${branchToPull}'`, candidatePath);
+          failCount++;
+          continue;
+        }
+        wtPath = target.path;
       }
-      const wtPath = target.path;
       try {
         stepProgress(`Pulling ${branchToPull}...`);
         await gitExec(["-C", wtPath, "pull", "--ff-only"], opts);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ogpoyraz/wtx",
-  "version": "0.9.4",
+  "version": "0.9.6",
   "description": "Multi-repo git worktree manager",
   "type": "module",
   "bin": {