@gw-tools/gw 0.12.24 → 0.12.27

package/README.md

@@ -274,6 +274,9 @@ When `gw add` creates a new branch, it automatically configures the branch to tr
 **Git Ref Conflict Detection:**
 The command automatically detects and prevents Git ref naming conflicts. For example, you cannot have both a branch named `test` and `test/foo` because Git stores branches as files in `.git/refs/heads/`, and `test` cannot be both a file and a directory. If a conflict is detected, you'll receive a helpful error message with suggestions for resolving it.
 
+**Automatic Navigation:**
+After successfully creating a new worktree, the command automatically navigates to the new worktree directory. This requires shell integration to be installed (see [install-shell](#install-shell)). Use the `--no-cd` flag to skip automatic navigation.
+
 **Existing Worktree Navigation:**
 If you try to add a worktree that already exists, the command will prompt you to navigate to it instead. Press Enter (default: Yes) to navigate, or type 'n' to cancel. This requires shell integration to be installed (see [install-shell](#install-shell)).
 
@@ -284,6 +287,8 @@ If you try to add a worktree that already exists, the command will prompt you to
 
 #### Options
 
+- `--no-cd`: Don't navigate to the new worktree after creation
+
 All `git worktree add` options are supported:
 
 - `-b <branch>`: Create a new branch
@@ -297,8 +302,12 @@ All `git worktree add` options are supported:
 
 ```bash
 # Create worktree (auto-copies files if autoCopyFiles is configured)
+# Automatically navigates to new worktree
 gw add feat/new-feature
 
+# Create worktree without navigating to it
+gw add feat/new-feature --no-cd
+
 # Create worktree with new branch
 gw add feat/new-feature -b my-branch
 

package/install.js

@@ -176,12 +176,28 @@ async function install() {
 async function installShellIntegration(binaryPath, retries = 3) {
   const { spawn } = require('child_process');
 
+  // Check environment before attempting shell integration
+  const hasRequiredEnv = process.env.HOME || process.env.USERPROFILE;
+  const hasShell = process.env.SHELL;
+
+  if (!hasRequiredEnv) {
+    console.log('  Skipping shell integration: HOME environment variable not set');
+    console.log('  Run "gw install-shell" manually after installation');
+    return;
+  }
+
+  if (!hasShell) {
+    console.log('  Skipping shell integration: SHELL environment variable not set');
+    console.log('  Run "gw install-shell" manually after installation');
+    return;
+  }
+
   return new Promise((resolve) => {
     let child;
 
     try {
-      child = spawn(binaryPath, ['install-shell', '--quiet'], {
-        stdio: 'inherit',
+      child = spawn(binaryPath, ['install-shell'], {
+        stdio: ['inherit', 'inherit', 'pipe'],  // stdin, stdout, stderr
       });
     } catch (err) {
       // Catch synchronous spawn errors (e.g., ETXTBSY thrown immediately)
@@ -191,20 +207,28 @@ async function installShellIntegration(binaryPath, retries = 3) {
         }, 200);
         return;
       }
-      console.log(
-        '  (Shell integration can be installed later with: gw install-shell)',
-      );
+      console.log('  Shell integration setup encountered an issue.');
+      console.log('  You can install it manually later with: gw install-shell');
       resolve();
       return;
     }
 
+    let stderrOutput = '';
+    child.stderr.on('data', (data) => {
+      stderrOutput += data.toString();
+      // Also display it immediately
+      process.stderr.write(data);
+    });
+
     child.on('close', (code) => {
       if (code === 0) {
         console.log('✓ Shell integration installed!');
       } else {
-        console.log(
-          '  (Shell integration can be installed later with: gw install-shell)',
-        );
+        console.log('  Shell integration failed with exit code:', code);
+        if (stderrOutput) {
+          console.log('  Error:', stderrOutput.trim());
+        }
+        console.log('  You can install it manually later with: gw install-shell');
       }
       resolve();
     });
@@ -215,9 +239,8 @@ async function installShellIntegration(binaryPath, retries = 3) {
         await new Promise((r) => setTimeout(r, 200));
         return installShellIntegration(binaryPath, retries - 1).then(resolve);
       }
-      console.log(
-        '  (Shell integration can be installed later with: gw install-shell)',
-      );
+      console.log('  Shell integration setup encountered an issue.');
+      console.log('  You can install it manually later with: gw install-shell');
       resolve();
     });
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gw-tools/gw",
-  "version": "0.12.24",
+  "version": "0.12.27",
   "description": "A command-line tool for managing git worktrees - copy files between worktrees with ease",
   "keywords": [
     "git",