@gw-tools/gw 0.20.14 → 0.21.0-beta.2

package/README.md

@@ -234,7 +234,7 @@ gw sync feat-existing-branch .env
 - **Auto-copy files**: Configure once, automatically copy `.env`, secrets, and config files to every new worktree
 - **Hooks support**: Run commands before/after worktree creation (install dependencies, validate setup, etc.)
 - **Copy files between worktrees**: Easily copy secrets, environment files, and configurations from one worktree to another
-- **Automatic shell integration**: Shell function installs automatically on npm install for seamless `gw cd` navigation
+- **Automatic shell integration**: Eval-based shell integration keeps `gw cd` navigation always up-to-date
 - **Auto-configured per repository**: Each repository gets its own local config file, automatically created on first use
 - **Dry-run mode**: Preview what would be copied without making changes
 - **Standalone binary**: Compiles to a single executable with no runtime dependencies
@@ -556,13 +556,13 @@ gw cd api
 
 #### How It Works
 
-The `cd` command integrates with your shell through an automatically installed function (see [install-shell](#install-shell)). When you run `gw cd <worktree>`:
+The `cd` command integrates with your shell through an eval-based function (see [install-shell](#install-shell)). When you run `gw cd <worktree>`:
 
 1. The command finds the matching worktree path
 2. The shell function intercepts the call and navigates you there
 3. All other `gw` commands pass through normally
 
-**Note**: Shell integration is automatically installed when you install via npm. If needed, you can manually install or remove it using `gw install-shell`.
+**Note**: Shell integration is set up automatically when you install via npm. You can also add it manually by adding `eval "$(gw install-shell)"` to your shell config.
 
 ### pr
 
@@ -722,9 +722,7 @@ If not configured, defaults to "main" branch and "merge" strategy.
 
 ### install-shell
 
-Install or remove shell integration for the `gw cd` command and enable real-time streaming output. This is automatically run during `npm install`, but can be run manually if needed.
-
-The installation creates an integration script in `~/.gw/shell/` and adds a single line to your shell configuration to source it, keeping your shell config clean and minimal.
+Output shell integration code for the `gw cd` command and enable real-time streaming output. The shell code is always generated from the current binary, so updates happen automatically.
 
 Shell integration provides:
 
@@ -734,42 +732,44 @@ Shell integration provides:
 - **Multi-alias support**: Install for different command names (e.g., `gw-dev` for development)
 
 ```bash
-gw install-shell [options]
+# Add to ~/.zshrc or ~/.bashrc
+eval "$(gw install-shell)"
+
+# Add to ~/.config/fish/config.fish
+gw install-shell | source
 ```
 
 #### Options
 
-- `--name, -n NAME`: Install under a different command name (default: `gw`)
+- `--name, -n NAME`: Output for a different command name (default: `gw`)
 - `--command, -c CMD`: Actual command to run (use with `--name` for aliases/dev)
-- `--remove`: Remove shell integration
-- `--quiet, -q`: Suppress output messages
+- `--remove`: Remove shell integration from config files
+- `--quiet, -q`: Suppress output messages (for `--remove`)
 - `-h, --help`: Show help message
 
 #### Examples
 
 ```bash
-# Install shell integration (usually not needed - auto-installed)
+# Preview the shell function output
 gw install-shell
 
-# Install for development (with Deno)
-# Note: Remove any 'alias gw-dev=...' from .zshrc first!
-gw install-shell --name gw-dev \
-  --command "deno run --allow-all ~/path/to/gw-tools/packages/gw-tool/src/main.ts"
+# Add to your shell config (zsh/bash)
+echo 'eval "$(gw install-shell)"' >> ~/.zshrc
 
-# Remove shell integration for 'gw-dev'
-gw install-shell --name gw-dev --remove
+# Add for development (with Deno)
+echo 'eval "$(gw install-shell --name gw-dev --command \"deno run --allow-all ~/path/to/main.ts\")"' >> ~/.zshrc
 
-# Install quietly (for automation)
-gw install-shell --quiet
+# Remove shell integration (legacy files + eval lines)
+gw install-shell --remove
 ```
 
 **Supported Shells:**
 
-- **Zsh** (~/.zshrc sources ~/.gw/shell/integration[-NAME].zsh)
-- **Bash** (~/.bashrc sources ~/.gw/shell/integration[-NAME].bash)
-- **Fish** (~/.config/fish/functions/[NAME].fish)
+- **Zsh**: `eval "$(gw install-shell)"` in `~/.zshrc`
+- **Bash**: `eval "$(gw install-shell)"` in `~/.bashrc`
+- **Fish**: `gw install-shell | source` in `~/.config/fish/config.fish`
 
-The command is idempotent - running it multiple times won't create duplicate entries. It will also automatically migrate old inline installations to the new format.
+The `--remove` flag cleans up both the new eval-based format and any legacy file-based installations.
 
 ### root
 

package/install.js

@@ -134,10 +134,10 @@ async function install() {
     // Try to install shell integration, but don't fail if it errors
     console.log('\n⚙️  Setting up shell integration...');
     try {
-      await installShellIntegration(binaryPath);
+      installShellIntegration();
     } catch (error) {
       console.log('  Shell integration setup encountered an issue.');
-      console.log('  You can install it manually later with: gw install-shell');
+      console.log('  You can add it manually: eval \'"$(gw install-shell)"\' in your shell config');
     }
 
     console.log('\nRun "gw --help" to get started.');
@@ -154,79 +154,62 @@ async function install() {
 }
 
 /**
- * Install shell integration
+ * Install shell integration by appending eval line to shell config
  */
-async function installShellIntegration(binaryPath, retries = 3) {
-  const { spawn } = require('child_process');
+function installShellIntegration() {
+  const { existsSync: fsExists, readFileSync: fsRead, writeFileSync: fsWrite, mkdirSync: fsMkdir } = require('fs');
 
-  // Check environment before attempting shell integration
-  const hasRequiredEnv = process.env.HOME || process.env.USERPROFILE;
-  const hasShell = process.env.SHELL;
+  const home = process.env.HOME || process.env.USERPROFILE;
+  const shell = process.env.SHELL || '';
+  const shellName = shell.split('/').pop() || '';
 
-  if (!hasRequiredEnv) {
+  if (!home) {
     console.log('  Skipping shell integration: HOME environment variable not set');
-    console.log('  Run "gw install-shell" manually after installation');
+    console.log('  Add eval \'"$(gw install-shell)"\' to your shell config manually');
     return;
   }
 
-  if (!hasShell) {
+  if (!shellName) {
     console.log('  Skipping shell integration: SHELL environment variable not set');
-    console.log('  Run "gw install-shell" manually after installation');
+    console.log('  Add eval \'"$(gw install-shell)"\' to your shell config manually');
     return;
   }
 
-  return new Promise((resolve) => {
-    let child;
+  let configFile;
+  let evalLine;
+
+  if (shellName === 'zsh') {
+    configFile = join(home, '.zshrc');
+    evalLine = 'eval "$(gw install-shell)"';
+  } else if (shellName === 'bash') {
+    configFile = join(home, '.bashrc');
+    evalLine = 'eval "$(gw install-shell)"';
+  } else if (shellName === 'fish') {
+    const configDir = join(home, '.config', 'fish');
+    if (!fsExists(configDir)) {
+      fsMkdir(configDir, { recursive: true });
+    }
+    configFile = join(configDir, 'config.fish');
+    evalLine = 'gw install-shell | source';
+  } else {
+    console.log(`  Unsupported shell: ${shellName}`);
+    console.log('  Add eval \'"$(gw install-shell)"\' to your shell config manually');
+    return;
+  }
 
-    try {
-      child = spawn(binaryPath, ['install-shell'], {
-        stdio: ['inherit', 'inherit', 'pipe'], // stdin, stdout, stderr
-      });
-    } catch (err) {
-      // Catch synchronous spawn errors (e.g., ETXTBSY thrown immediately)
-      if (err.code === 'ETXTBSY' && retries > 0) {
-        setTimeout(() => {
-          installShellIntegration(binaryPath, retries - 1).then(resolve);
-        }, 200);
-        return;
-      }
-      console.log('  Shell integration setup encountered an issue.');
-      console.log('  You can install it manually later with: gw install-shell');
-      resolve();
+  // Check if already present
+  if (fsExists(configFile)) {
+    const content = fsRead(configFile, 'utf8');
+    if (content.includes('gw install-shell')) {
+      console.log('✓ Shell integration already configured!');
       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 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();
-    });
-
-    child.on('error', async (err) => {
-      // Retry on ETXTBSY (text file busy) error
-      if (err.code === 'ETXTBSY' && retries > 0) {
-        await new Promise((r) => setTimeout(r, 200));
-        return installShellIntegration(binaryPath, retries - 1).then(resolve);
-      }
-      console.log('  Shell integration setup encountered an issue.');
-      console.log('  You can install it manually later with: gw install-shell');
-      resolve();
-    });
-  });
+  // Append eval line
+  fsWrite(configFile, '\n' + evalLine + '\n', { flag: 'a' });
+  console.log(`✓ Shell integration added to ${configFile}`);
+  console.log('  Restart your terminal or source your shell config to activate.');
 }
 
 // Run installation

package/package.json

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

package/uninstall.js

@@ -18,47 +18,57 @@ function manualRemoval() {
   const shell = process.env.SHELL || '';
   const shellName = shell.split('/').pop() || '';
 
-  let configFile;
-  let scriptFile;
   let removed = false;
 
+  // Remove legacy integration script files
+  const legacyFiles = [
+    join(home, '.gw', 'shell', 'integration.zsh'),
+    join(home, '.gw', 'shell', 'integration.bash'),
+    join(home, '.config', 'fish', 'functions', 'gw.fish'),
+  ];
+
+  for (const scriptFile of legacyFiles) {
+    if (existsSync(scriptFile)) {
+      try {
+        unlinkSync(scriptFile);
+        console.log(`  Removed: ${scriptFile}`);
+        removed = true;
+      } catch (error) {
+        console.log(`  Could not remove: ${scriptFile}`);
+      }
+    }
+  }
+
+  // Determine config files to clean up
+  const configFiles = [];
   if (shellName === 'zsh') {
-    configFile = join(home, '.zshrc');
-    scriptFile = join(home, '.gw', 'shell', 'integration.zsh');
+    configFiles.push(join(home, '.zshrc'));
   } else if (shellName === 'bash') {
-    configFile = join(home, '.bashrc');
-    scriptFile = join(home, '.gw', 'shell', 'integration.bash');
+    configFiles.push(join(home, '.bashrc'));
   } else if (shellName === 'fish') {
-    scriptFile = join(home, '.config', 'fish', 'functions', 'gw.fish');
-    configFile = null; // Fish doesn't need config file cleanup
+    configFiles.push(join(home, '.config', 'fish', 'config.fish'));
   } else {
-    console.log('  Could not detect shell for manual cleanup');
-    return false;
+    // Try all common config files
+    configFiles.push(join(home, '.zshrc'));
+    configFiles.push(join(home, '.bashrc'));
+    configFiles.push(join(home, '.config', 'fish', 'config.fish'));
   }
 
-  // Remove the integration script file
-  if (existsSync(scriptFile)) {
-    try {
-      unlinkSync(scriptFile);
-      console.log(`  Removed: ${scriptFile}`);
-      removed = true;
-    } catch (error) {
-      console.log(`  Could not remove: ${scriptFile}`);
-    }
-  }
+  for (const configFile of configFiles) {
+    if (!existsSync(configFile)) continue;
 
-  // Remove source line from config file (for bash/zsh)
-  if (configFile && existsSync(configFile)) {
     try {
       const content = readFileSync(configFile, 'utf8');
       const lines = content.split('\n');
       const filtered = [];
       let skipNext = false;
+      let fileModified = false;
 
       for (const line of lines) {
+        // Remove old format: comment + source line
         if (line.includes('# gw-tools shell integration')) {
           skipNext = true;
-          removed = true;
+          fileModified = true;
           continue;
         }
         if (skipNext && line.includes('source ~/.gw/shell/integration')) {
@@ -66,12 +76,20 @@ function manualRemoval() {
           continue;
         }
         skipNext = false;
+
+        // Remove new eval-based format and fish source format
+        if (line.includes('gw install-shell')) {
+          fileModified = true;
+          continue;
+        }
+
         filtered.push(line);
       }
 
-      if (removed) {
+      if (fileModified) {
         writeFileSync(configFile, filtered.join('\n'));
         console.log(`  Updated: ${configFile}`);
+        removed = true;
       }
     } catch (error) {
       console.log(`  Could not update: ${configFile}`);