gwqadd 0.3.3 → 0.3.5

package/README.md

@@ -45,15 +45,19 @@ Then add the shell integration:
 
 ```sh
 # zsh  — ~/.zshrc
-eval "$(gwqadd --init zsh)"
+eval "$(command gwqadd --init zsh)"
 
 # bash — ~/.bashrc
-eval "$(gwqadd --init bash)"
+eval "$(command gwqadd --init bash)"
 
 # fish — ~/.config/fish/config.fish
-gwqadd --init fish | source
+command gwqadd --init fish | source
 ```
 
+`command` matters: each tool defines a shell function with its own name, so on a
+second `source ~/.zshrc` the *function* would answer, capture the `--init` output
+and try to `cd` into it. `command` skips functions and goes to the binary.
+
 Reload the shell and `gwqadd` moves it.
 
 Prefer a different name? `eval "$(gwqadd --init zsh --cmd gwa)"` gives you `gwa`.

package/bin/gwqadd.mjs

@@ -25,7 +25,7 @@ const HELP = `${PKG} ${VERSION} — create a branch and its gwq worktree here, a
 
 USAGE
   ${PKG} [options] [<branch>]
-  eval "$(${PKG} --init zsh)"        # then \`${PKG}\` moves the shell itself
+  eval "$(command ${PKG} --init zsh)"   # then \`${PKG}\` moves the shell itself
 
 OPTIONS
   --init <shell>     print shell integration for zsh | bash | fish, then exit
@@ -247,7 +247,7 @@ function shellInit(shell, fnName) {
 
   if (shell === 'zsh') {
     return `# ${PKG} ${VERSION} — zsh integration
-# Add to ~/.zshrc:  eval "$(${PKG} --init zsh)"
+# Add to ~/.zshrc:  eval "$(command ${PKG} --init zsh)"
 
 __${slug}_fallback=${shq(SELF)}
 
@@ -290,7 +290,7 @@ ${fnName}() {
 
   if (shell === 'bash') {
     return `# ${PKG} ${VERSION} — bash integration
-# Add to ~/.bashrc:  eval "$(${PKG} --init bash)"
+# Add to ~/.bashrc:  eval "$(command ${PKG} --init bash)"
 
 __${slug}_fallback=${shq(SELF)}
 
@@ -330,7 +330,7 @@ ${fnName}() {
 
   if (shell === 'fish') {
     return `# ${PKG} ${VERSION} — fish integration
-# Add to ~/.config/fish/config.fish:  ${PKG} --init fish | source
+# Add to ~/.config/fish/config.fish:  command ${PKG} --init fish | source
 
 set -g __${slug}_fallback ${fishq(SELF)}
 
@@ -479,8 +479,6 @@ process.on('uncaughtException', (err) => {
 });
 
 async function waitForKey() {
-  process.stdin.removeAllListeners('data');
-  process.stdin.removeAllListeners('keypress');
   try {
     process.stdin.setRawMode(true);
     rawModeEngaged = true;
@@ -519,6 +517,9 @@ async function askLine(question, initial = '') {
     const answer = rl.question(question);
     if (initial) rl.write(initial);
     return (await answer).trim();
+  } catch (err) {
+    if (err?.code === 'ABORT_ERR') die('E_INTERRUPTED', 'cancelled');
+    throw err;
   } finally {
     rl.close();
   }
@@ -1202,7 +1203,7 @@ async function finish({ repo, branch, base, path, created }) {
   stderr.write('\n');
   stderr.write(renderBox(cdCommand) + '\n');
   stderr.write(
-    `   ${dim('tip:')} ${dim(`eval "$(${PKG} --init zsh)"`)} ${dim('lets')} ` +
+    `   ${dim('tip:')} ${dim(`eval "$(command ${PKG} --init zsh)"`)} ${dim('lets')} ` +
     `${bold(PKG)} ${dim('cd for you')}\n`,
   );
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gwqadd",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "description": "Create a branch and its gwq worktree in the repository you are in, and cd there.",
   "type": "module",
   "bin": {