yggtree 1.1.0 → 1.1.1

package/dist/commands/wt/create-branch.js

@@ -1,7 +1,7 @@
 import chalk from 'chalk';
 import inquirer from 'inquirer';
 import path from 'path';
-import { getRepoRoot, getRepoName, verifyRef, fetchAll, getCurrentBranch } from '../../lib/git.js';
+import { getRepoRoot, getRepoName, verifyRef, fetchAll, getCurrentBranch, ensureCorrectUpstream } from '../../lib/git.js';
 import { runBootstrap } from '../../lib/config.js';
 import { WORKTREES_ROOT } from '../../lib/paths.js';
 import { log, ui, createSpinner } from '../../lib/ui.js';
@@ -110,7 +110,6 @@ export async function createCommandNew(options) {
             else {
                 await execa('git', ['worktree', 'add', '-b', branchName, wtPath, baseRef]);
             }
-            spinner.succeed('Worktree created.');
         }
         catch (e) {
             spinner.fail('Failed to create worktree.');
@@ -125,6 +124,21 @@ export async function createCommandNew(options) {
             ]);
             return;
         }
+        try {
+            // Strong Safety Mode: Ensure upstream is origin/<branchName> and publish
+            spinner.text = 'Safely publishing branch...';
+            await ensureCorrectUpstream(wtPath, branchName);
+            spinner.succeed('Worktree created and branch published.');
+        }
+        catch (e) {
+            spinner.fail('Worktree created, but branch publication failed.');
+            log.actionableError(e.message, 'git push -u origin HEAD', wtPath, [
+                `cd ${wtPath}`,
+                'Attempt to push manually: git push -u origin HEAD',
+                'Check if the remote branch already exists or if you have push permissions'
+            ]);
+            // We don't return here because the worktree IS created, we just failed to publish
+        }
         if (shouldBootstrap) {
             await runBootstrap(wtPath, repoRoot);
         }

package/dist/commands/wt/create-multi.js

@@ -1,7 +1,7 @@
 import chalk from 'chalk';
 import inquirer from 'inquirer';
 import path from 'path';
-import { getRepoRoot, getRepoName, verifyRef, fetchAll, getCurrentBranch } from '../../lib/git.js';
+import { getRepoRoot, getRepoName, verifyRef, fetchAll, getCurrentBranch, ensureCorrectUpstream } from '../../lib/git.js';
 import { runBootstrap } from '../../lib/config.js';
 import { WORKTREES_ROOT } from '../../lib/paths.js';
 import { log, ui, createSpinner } from '../../lib/ui.js';
@@ -84,12 +84,6 @@ export async function createCommandMulti(options) {
                 else {
                     await execa('git', ['worktree', 'add', '-b', branchName, wtPath, baseRef]);
                 }
-                wtSpinner.succeed(`Worktree for ${chalk.cyan(branchName)} created.`);
-                createdWorktrees.push(wtPath);
-                // 4. Bootstrap
-                if (shouldBootstrap) {
-                    await runBootstrap(wtPath, repoRoot);
-                }
             }
             catch (error) {
                 wtSpinner.fail(`Failed to create worktree for ${branchName}.`);
@@ -102,6 +96,27 @@ export async function createCommandMulti(options) {
                     'Try pruning stale worktrees: yggtree wt prune',
                     `Run manually: ${cmd}`
                 ]);
+                continue;
+            }
+            try {
+                // Strong Safety Mode: Ensure upstream is origin/<branchName> and publish
+                wtSpinner.text = `Safely publishing branch ${branchName}...`;
+                await ensureCorrectUpstream(wtPath, branchName);
+                wtSpinner.succeed(`Worktree for ${chalk.cyan(branchName)} created and published.`);
+                createdWorktrees.push(wtPath);
+            }
+            catch (error) {
+                wtSpinner.fail(`Worktree for ${branchName} created, but publication failed.`);
+                log.actionableError(error.message, 'git push -u origin HEAD', wtPath, [
+                    `cd ${wtPath}`,
+                    'Attempt to push manually: git push -u origin HEAD',
+                    'Check if the remote branch already exists or if you have push permissions'
+                ]);
+                createdWorktrees.push(wtPath); // Still added to list since wt exists
+            }
+            // 4. Bootstrap
+            if (shouldBootstrap) {
+                await runBootstrap(wtPath, repoRoot);
             }
         }
         // 5. Final Output

package/dist/index.js

@@ -31,7 +31,7 @@ program
                 { name: '🌳 Create multiple worktrees', value: 'create-multi' },
                 { name: '🌱 Create new worktree (Manual Slug)', value: 'create-slug' },
                 { name: '📋 List worktrees', value: 'list' },
-                { name: '🗑️  Delete worktree', value: 'delete' },
+                { name: '🗑️ Delete worktree', value: 'delete' },
                 { name: '🚀 Bootstrap worktree', value: 'bootstrap' },
                 { name: '🧹 Prune stale worktrees', value: 'prune' },
                 { name: '🐚 Exec command', value: 'exec' },

package/dist/lib/git.js

@@ -1,6 +1,8 @@
 import { execa } from 'execa';
 import fs from 'fs-extra';
 import path from 'path';
+import { log } from './ui.js';
+import chalk from 'chalk';
 export async function getRepoRoot() {
     try {
         const { stdout } = await execa('git', ['rev-parse', '--show-toplevel']);
@@ -83,3 +85,34 @@ export async function isGitClean(cwd) {
         return false;
     }
 }
+/**
+ * Ensures the branch in the given worktree path tracks origin/<branchName>.
+ * If it tracks a different base branch (e.g. origin/main), it unsets it and publishes to origin.
+ * Fails if origin/<branchName> already exists on remote and is not already the upstream.
+ */
+export async function ensureCorrectUpstream(wtPath, branchName) {
+    const desiredUpstream = `origin/${branchName}`;
+    let currentUpstream = '';
+    try {
+        const { stdout } = await execa('git', ['rev-parse', '--abbrev-ref', '--symbolic-full-name', '@{u}'], { cwd: wtPath });
+        currentUpstream = stdout.trim();
+    }
+    catch {
+        // No upstream set
+    }
+    if (currentUpstream === desiredUpstream) {
+        return; // Already correct
+    }
+    // If it's set to something else, unset it
+    if (currentUpstream) {
+        log.info(`Incorrect upstream detected: ${currentUpstream}. Unsetting...`);
+        await execa('git', ['branch', '--unset-upstream'], { cwd: wtPath });
+    }
+    // Check if remote branch already exists
+    const remoteExists = await verifyRef(desiredUpstream);
+    if (remoteExists) {
+        throw new Error(`Remote branch '${desiredUpstream}' already exists. Cannot publish safely without more info. Use 'git push -u origin HEAD' manually if you want to link them.`);
+    }
+    log.info(`Publishing branch ${chalk.cyan(branchName)} to ${chalk.cyan(desiredUpstream)}...`);
+    await execa('git', ['push', '-u', 'origin', 'HEAD'], { cwd: wtPath });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yggtree",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Interactive CLI for managing git worktrees and configs",
   "main": "dist/index.js",
   "type": "module",