workshell 0.0.5 → 0.0.7

package/README.md

@@ -20,23 +20,28 @@
 ## Install
 
 ```bash
-$ npm i -g workshell
+$ npm i -g workshell  # aliases to `wk`
+$ wk --help
+wk v0.0.6 - Open branches in ephemeral subshells
+
+Usage: wk <command> [options]
+# ...
 ```
 
 <br/>
 
 ## How `workshell` works
 
-There have been many attempts to nail a DX for parallel work in the agentic coding era. Most are thin wrappers over `git worktree`. Instead `wksh` introduces a new paradigm: the *workshell*. 
+There have been many attempts to nail a DX for parallel work in the agentic coding era. Most are thin wrappers over `git worktree`. Instead `wk` introduces a new paradigm: the *workshell*. 
 
 **A _workshell_ is an ephemeral worktree whose lifecycle is bound to a subshell.**
 
 Here's how it works (key points in **bold**).
 
-- You open a Git branch with `wksh open <branch>` or create a new one with `wksh new <branch>`.
-- An ephemeral worktree is created for this branch (in `.git/workshell/worktrees`) and **opened in a fresh subshell**.
+- You open a Git branch with `wk open <branch>` or create a new one with `wk new <branch>`.
+- An ephemeral worktree is created for this branch (in `~/.workshell/worktrees`) and **opened in a fresh subshell**.
 - You are now in an fresh checkout of your repo that is isolated on disk. Make changes with your agent/editor of choice and commit them.
-- You close the subshell with `wksh close`. **The associated worktree is auto-pruned**.
+- You close the subshell with `wk close`. **The associated worktree is auto-pruned**.
 - Your changes still exist on the associated branch, as Git commits/branches are shared among all worktrees. The worktree is destroyed—but your commits aren't.
 
 <!-- That's it. **Ephemeral worktrees whose lifecycle is bound to a subshell.** When the subshell exits, the worktree is destroyed—but your commits aren't. -->
@@ -44,14 +49,14 @@ Here's how it works (key points in **bold**).
 <!-- 
 ## How does it work
 
-There have been many attempts to nail a DX for parallel work in the agentic coding era. Most are thin wrappers over `git worktree`. That's not what `wksh` is (though worktrees are used internally).
+There have been many attempts to nail a DX for parallel work in the agentic coding era. Most are thin wrappers over `git worktree`. That's not what `wk` is (though worktrees are used internally).
 
 Here's how it works (key points in **bold**).
 
-- **A fresh worktree is created** — The `wksh` utility a) creates a new worktree in `.git/workshell/worktrees` and b) opens it in a *subshell*.
+- **A fresh worktree is created** — The `wk` utility a) creates a new worktree in `~/.workshell/worktrees` and b) opens it in a *subshell*.
 - **Make edits and commit** — From the worksh your preferred IDE/agent.
 - **Commit your changes** — Though your file system is isolated, Git commit history (including branches) is still shared among all worktrees. 
-- **Exit the subshell** — Run `wksh close` to exit the subshell. As with `git switch`, `wksh close` won't let you close the subshell if you have unstaged/uncommitted changes.
+- **Exit the subshell** — Run `wk close` to exit the subshell. As with `git switch`, `wk close` won't let you close the subshell if you have unstaged/uncommitted changes.
 - **The worktree is auto-pruned** — This is key. The lifecycle of the worktree is tied to the subshell. When the subshell is closed, the worktree is destroyed. But *the commits you made inside the subshell* still exist.
 - **Merge in your changes** — Merge/rebase your branch as you normally would, or push to GitHub to open a PR. -->
 
@@ -63,15 +68,15 @@ This approach has some nice properties.
 
 - 🖥️ **Tab-local workspaces** — Normally a `git checkout`/`git switch` changes your active branch for all terminals. With workshells, you can functionality open branches *in the current tab only*.
 - 🌳 **Full isolation** — Each workshell is isolated on disk, so the changes you make don't interfere anything else you're doing.
-- 🙅‍♂️ **Never stash again** — You can `wksh open` a branch even with uncommitted changes. When you exit the subshell, things will be exactly the same as they were. ☕️
-- 🪾 **Consistent with branch semantics** — As with regular `git switch`, `wksh close` won't let you close the subshell if you have unstaged/uncommitted changes. This is a feature, not a bug! Regular worktrees make it easy to lose your work in a forgotten corner of your file system.
+- 🙅‍♂️ **Never stash again** — You can `wk open` a branch even with uncommitted changes. When you exit the subshell, things will be exactly the same as they were. ☕️
+- 🪾 **Consistent with branch semantics** — As with regular `git switch`, `wk close` won't let you close the subshell if you have unstaged/uncommitted changes. This is a feature, not a bug! Regular worktrees make it easy to lose your work in a forgotten corner of your file system.
 - 🤖 **Agent-ready** — Spin up parallel workshells so multiple agents can work simultaneously without conflicts.
 
 <br/>
 
 ## Quickstart
 
-This section is entirely linear and self-contained. Try running all these commands in order to get a feel for how `wksh` works. First, install `wksh`.
+This section is entirely linear and self-contained. Try running all these commands in order to get a feel for how `wk` works. First, install `wk`.
 
 ```bash
 $ npm i -g workshell
@@ -79,10 +84,10 @@ $ npm i -g workshell
 
 <br/>
 
-This installs the `workshell` CLI. For convenience, it's also aliased to `wksh`. We'll use `wksh` throughout the quickstart.
+This installs the `workshell` CLI. For convenience, it's also aliased to `wk`. We'll use `wk` throughout the quickstart.
 
 ```sh
-$ wksh status
+$ wk status
 
 branch:    main (root)
 worktree:  /Users/colinmcd94/Documents/projects/pf
@@ -103,11 +108,11 @@ $ cd zod
 After cloning, the `main` branch is checked out. Let's say we want to start work on a new feature:
 
 ```bash
-$ wksh new feat-1
+$ wk new feat-1
 
 ✓ feat-1 (from main)
-Opened branch in ephemeral subshell at .git/workshell/worktrees/zod@feat-1
-Type 'wksh close' to return.
+Opened branch in ephemeral subshell
+Type 'wk close' to return.
 ```
 
 <br/>
@@ -116,7 +121,7 @@ You're now in a workshell. Check where you are:
 
 ```bash
 $ pwd
-/Users/colinmcd94/Documents/repos/zod/.git/workshell/worktrees/zod@feat-1
+~/.workshell/worktrees/{repo-id}/zod@feat-1
 
 $ git branch --show-current
 feat-1
@@ -135,10 +140,10 @@ $ touch a.txt
 Now let's try to close the workshell.
 
 ```bash
-$ wksh close
+$ wk close
 ⚠ Uncommitted changes found. Commit, stash, or reset your changes first.
   Or use --force/-f to discard changes
-    wksh close -f
+    wk close -f
 ```
 
 <br/>
@@ -151,10 +156,10 @@ $ git add -A && git commit -am "Add a.txt"
 
 <br/>
 
-Now we can try closing again. Since our changes can be fast-forwarded from the base branch, `wksh` offers to auto-merge the changes.
+Now we can try closing again. Since our changes can be fast-forwarded from the base branch, `wk` offers to auto-merge the changes.
 
 ```bash
-$ wksh close
+$ wk close
 ✓ Back in main
   Pruned worktree. Your changes are still in the 'feat-1' branch.
   To merge your changes:
@@ -170,9 +175,9 @@ $ wksh close
 ## CLI
 
 ```sh
-wksh v0.x.y - Human- and agent-friendly Git multitasking
+wk v0.x.y - Human- and agent-friendly Git multitasking
 
-Usage: wksh <command> [options]
+Usage: wk <command> [options]
 
 Commands:
   new [branch]    Create a branch and open it [--from <branch>]
@@ -192,10 +197,10 @@ Options:
 
 ### List orphaned worktrees
 
-Normally the worktree will be auto-pruned when you close its associated workshell. If a worktree is left behind for some reason, you can list them with `wksh ls`.
+Normally the worktree will be auto-pruned when you close its associated workshell. If a worktree is left behind for some reason, you can list them with `wk ls`.
 
 ```sh
-$ wksh ls
+$ wk ls
 ┌────────┬───────────┬───────────────┐
 │ branch │ status    │ created       │
 ├────────┼───────────┼───────────────┤
@@ -212,10 +217,10 @@ $ wksh ls
 You can open any existing Git branch in a workshell. 
 
 ```sh
-$ wksh open feat-1
+$ wk open feat-1
 
 ✓ feat-1 (existing worktree)
-Type 'wksh close' to return.
+Type 'wk close' to return.
 ```
 
 <br />
@@ -223,7 +228,7 @@ Type 'wksh close' to return.
 ### Show current branch status
 
 ```sh
-$ wksh status
+$ wk status
 branch:    main (root)
 worktree:  /path/to/zod
 status:    clean
@@ -236,7 +241,7 @@ status:    clean
 Remove the worktree for a branch (the branch itself is kept):
 
 ```sh
-$ wksh rm feat-1
+$ wk rm feat-1
 
 ✓ Pruned worktree for feat-1
 ```
@@ -248,7 +253,7 @@ $ wksh rm feat-1
 This closes the current workshell and auto-prunes the associated worktree. Your changes survive in your branch commits. 
 
 ```sh
-$ wksh close
+$ wk close
 ✓ Back in main
   Pruned worktree. Your changes are still in the 'feat-1' branch.
   To merge your changes:
@@ -268,7 +273,7 @@ If the branch hasn't been pushed to a remote, you'll be prompted to auto-merge:
 That command will fail if you have unstaged/uncommited changes. Use the `--force`/`-f` flag to force close the workshell; **this will discard uncommitted changes**.
 
 ```sh
-$ wksh close --force
+$ wk close --force
 ```
 
 <br />
@@ -278,7 +283,7 @@ $ wksh close --force
 To print or create a config file:
 
 ```sh
-$ wksh config
+$ wk config
 
 ✓ Config file: /path/to/repo/.git/workshell.toml
 
@@ -290,7 +295,7 @@ setup = "npm install"
 If no config exists, you'll be prompted to create one.
 
 ```sh
-$ wksh config
+$ wk config
 
 No config file found.
 
@@ -307,9 +312,9 @@ Choice (1/2): 1
 
 ## `workshell.toml`
 
-You can configure `wksh` with a `workshell.toml` file. This is useful for running setup scripts when opening a workshell (e.g., `npm install`).
+You can configure `wk` with a `workshell.toml` file. This is useful for running setup scripts when opening a workshell (e.g., `npm install`).
 
-`wksh` looks for config files in the following order:
+`wk` looks for config files in the following order:
 
 | Path | Description |
 |------|-------------|
@@ -325,6 +330,6 @@ Currently only one setting is supported: `setup`.
 # the following variable substitutions are supported
 #   `{{ branch }}` — The name of the opened branch, e.g. `feature/auth` 
 #   `{{ repo_path }}` — The absolute path to main repo, e.g. `/path/to/repo`
-#   `{{ worktree_path }}` — The absolute path to worktree, e.g. `/path/to/repo/.git/workshell/worktrees/repo@feat`
+#   `{{ worktree_path }}` — The absolute path to worktree, e.g. `~/.workshell/worktrees/.../repo@feat`
 setup = "npm install && cp {{ repo_path }}/.env {{ worktree_path }}/.env"
 ```

package/dist/index.js

@@ -5785,13 +5785,15 @@ var require_src = __commonJS({
 var import_picocolors4 = __toESM(require_picocolors(), 1);
 
 // commands/new.ts
-import { basename as basename3, dirname as dirname3, join as join3, relative } from "path";
+import { basename as basename3, dirname as dirname3, join as join3 } from "path";
 import { mkdirSync as mkdirSync3 } from "fs";
 
 // store.ts
 import { execSync } from "child_process";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
 import { basename, dirname, isAbsolute, join } from "path";
+import { homedir } from "os";
+import { randomUUID } from "crypto";
 
 // node_modules/.pnpm/smol-toml@1.6.0/node_modules/smol-toml/dist/error.js
 function getLineColFromPtr(string, ptr) {
@@ -6480,6 +6482,25 @@ function parse(toml, { maxDepth = 1e3, integersAsBigInt } = {}) {
 
 // store.ts
 var STORE_FILE = "store.json";
+function getWorkshellRoot() {
+  const xdgDataHome = process.env.XDG_DATA_HOME;
+  if (xdgDataHome) {
+    return join(xdgDataHome, "workshell");
+  }
+  return join(homedir(), ".workshell");
+}
+function getRepoId() {
+  try {
+    const id = execSync("git config --local workshell.id", { encoding: "utf-8" }).trim();
+    if (id) {
+      return id;
+    }
+  } catch {
+  }
+  const newId = randomUUID().replace(/-/g, "").slice(0, 8);
+  execSync(`git config --local workshell.id "${newId}"`, { encoding: "utf-8" });
+  return newId;
+}
 function getGitRoot() {
   return execSync("git rev-parse --show-toplevel", { encoding: "utf-8" }).trim();
 }
@@ -6494,33 +6515,51 @@ function getMainWorktree() {
   return dirname(getGitCommonDir());
 }
 function getWorktreesDir() {
-  return join(getGitCommonDir(), "workshell", "worktrees");
+  return join(getWorkshellRoot(), "worktrees", getRepoId());
 }
 function getStorePath() {
-  return join(getGitCommonDir(), "workshell");
+  return getWorkshellRoot();
 }
-function loadStore() {
+function loadGlobalStore() {
   const storePath = getStorePath();
   const filePath = join(storePath, STORE_FILE);
   if (!existsSync(filePath)) {
-    return { worktrees: {} };
+    return { repos: {} };
   }
   try {
     const data = readFileSync(filePath, "utf-8");
     const raw = JSON.parse(data);
-    if (Array.isArray(raw.worktrees) || typeof raw.worktrees !== "object") {
-      return { worktrees: {}, auto_merge_prompt: raw.auto_merge_prompt };
+    if (raw.repos && typeof raw.repos === "object") {
+      return raw;
     }
-    return raw;
+    return { repos: {} };
   } catch {
-    return { worktrees: {} };
+    return { repos: {} };
   }
 }
-function saveStore(store) {
+function saveGlobalStore(globalStore) {
   const storePath = getStorePath();
   mkdirSync(storePath, { recursive: true });
   const filePath = join(storePath, STORE_FILE);
-  writeFileSync(filePath, JSON.stringify(store, null, 2));
+  writeFileSync(filePath, JSON.stringify(globalStore, null, 2));
+}
+function loadStore() {
+  const globalStore = loadGlobalStore();
+  const repoId = getRepoId();
+  const repoData = globalStore.repos[repoId];
+  if (!repoData) {
+    return { worktrees: {} };
+  }
+  if (Array.isArray(repoData.worktrees) || typeof repoData.worktrees !== "object") {
+    return { worktrees: {}, auto_merge_prompt: repoData.auto_merge_prompt };
+  }
+  return repoData;
+}
+function saveStore(store) {
+  const globalStore = loadGlobalStore();
+  const repoId = getRepoId();
+  globalStore.repos[repoId] = store;
+  saveGlobalStore(globalStore);
 }
 function getWorktreeMeta(store, id) {
   return store.worktrees[id];
@@ -6594,7 +6633,7 @@ function getCommandName() {
   }
   const scriptName = basename2(scriptPath, ".js");
   if (scriptName === "index" || scriptName === "dist") {
-    return "wksh";
+    return "wk";
   }
   return scriptName;
 }
@@ -6770,7 +6809,7 @@ function generateName() {
   const bytes = new Uint8Array(4);
   crypto.getRandomValues(bytes);
   const hex = Array.from(bytes).map((b) => b.toString(16).padStart(2, "0")).join("");
-  return `wksh-${hex}`;
+  return `wk-${hex}`;
 }
 function slugify(name) {
   return name.replace(/[^a-zA-Z0-9-]/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "");
@@ -6797,9 +6836,9 @@ exit() {
     builtin exit "$@"
   fi
   # Support: exit -f / exit --force (strip before calling builtin exit)
-  local wksh_force=""
+  local wk_force=""
   if [[ "\${1:-}" == "-f" || "\${1:-}" == "--force" ]]; then
-    wksh_force="\${1:-}"
+    wk_force="\${1:-}"
     shift
   fi
   # Fail open if ${cmd2} not in PATH
@@ -6807,30 +6846,30 @@ exit() {
     builtin exit "$@"
   fi
   # Run preclose - exit code 1 means dirty, block exit
-  command ${cmd2} __preclose $wksh_force
+  command ${cmd2} __preclose $wk_force
   if [[ $? -eq 1 ]]; then
     return
   fi
   builtin exit "$@"
 }
 
-__wksh_wrapper() {
+__wk_wrapper() {
   case "$1" in
     close) shift; exit "$@" ;;
     *) command ${cmd2} "$@" ;;
   esac
 }
-alias wksh='__wksh_wrapper'
-${cmd2.endsWith("-dev") ? `alias wksh-dev='__wksh_wrapper'` : ""}
+alias wk='__wk_wrapper'
+${cmd2.endsWith("-dev") ? `alias wk-dev='__wk_wrapper'` : ""}
 `;
   const zshScript = `
 exit() {
   if [[ \${ZSH_SUBSHELL:-0} -gt 0 ]]; then
     builtin exit "$@"
   fi
-  local wksh_force=""
+  local wk_force=""
   if [[ "\${1:-}" == "-f" || "\${1:-}" == "--force" ]]; then
-    wksh_force="\${1:-}"
+    wk_force="\${1:-}"
     shift
   fi
   # Fail open if ${cmd2} not in PATH
@@ -6838,21 +6877,21 @@ exit() {
     builtin exit "$@"
   fi
   # Run preclose - exit code 1 means dirty, block exit
-  command ${cmd2} __preclose $wksh_force
+  command ${cmd2} __preclose $wk_force
   if [[ $? -eq 1 ]]; then
     return
   fi
   builtin exit "$@"
 }
 
-__wksh_wrapper() {
+__wk_wrapper() {
   case "$1" in
     close) shift; exit "$@" ;;
     *) command ${cmd2} "$@" ;;
   esac
 }
-alias wksh='__wksh_wrapper'
-${cmd2.endsWith("-dev") ? `alias wksh-dev='__wksh_wrapper'` : ""}
+alias wk='__wk_wrapper'
+${cmd2.endsWith("-dev") ? `alias wk-dev='__wk_wrapper'` : ""}
 `;
   const fishScript = `
 function exit --wraps=exit
@@ -6860,11 +6899,11 @@ function exit --wraps=exit
   if not status is-interactive
     builtin exit $argv
   end
-  set wksh_force
+  set wk_force
   set args $argv
   if test (count $args) -gt 0
     if test "$args[1]" = "-f"; or test "$args[1]" = "--force"
-      set wksh_force $args[1]
+      set wk_force $args[1]
       set -e args[1]
     end
   end
@@ -6873,14 +6912,14 @@ function exit --wraps=exit
     builtin exit $args
   end
   # Run preclose - exit code 1 means dirty, block exit
-  command ${cmd2} __preclose $wksh_force
+  command ${cmd2} __preclose $wk_force
   if test $status -eq 1
     return
   end
   builtin exit $args
 end
 
-function __wksh_wrapper
+function __wk_wrapper
   if test "$argv[1]" = "close"
     set args $argv
     set -e args[1]
@@ -6890,21 +6929,21 @@ function __wksh_wrapper
   end
 end
 
-function wksh --wraps=${cmd2}
-  __wksh_wrapper $argv
+function wk --wraps=${cmd2}
+  __wk_wrapper $argv
 end
 ${cmd2.endsWith("-dev") ? `
-function wksh-dev --wraps=${cmd2}
-  __wksh_wrapper $argv
+function wk-dev --wraps=${cmd2}
+  __wk_wrapper $argv
 end
 ` : ""}
 `;
   const setupSection = setupCommand ? `
-# wksh setup script
+# wk setup script
 ${setupCommand}
 ` : "";
   if (shell.endsWith("zsh")) {
-    const tmpDir = join2(tmpdir(), `wksh-${process.pid}`);
+    const tmpDir = join2(tmpdir(), `wk-${process.pid}`);
     mkdirSync2(tmpDir, { recursive: true });
     try {
       writeFileSync2(join2(tmpDir, ".zshrc"), `[[ -f "$HOME/.zshrc" ]] && source "$HOME/.zshrc"
@@ -6914,7 +6953,7 @@ ${zshScript}${setupSection}`);
       rmSync(tmpDir, { recursive: true, force: true });
     }
   } else if (shell.endsWith("bash")) {
-    const tmpDir = join2(tmpdir(), `wksh-${process.pid}`);
+    const tmpDir = join2(tmpdir(), `wk-${process.pid}`);
     mkdirSync2(tmpDir, { recursive: true });
     try {
       const rcFile = join2(tmpDir, ".bashrc");
@@ -6926,12 +6965,12 @@ ${bashScript}${setupSection}`);
     }
   } else if (shell.endsWith("fish")) {
     const fishInit = setupCommand ? `${fishScript}
-# wksh setup script
+# wk setup script
 ${setupCommand}` : fishScript;
     spawnSync(shell, ["--init-command", fishInit], { cwd, stdio: "inherit" });
   } else {
     console.error(`Error: Unsupported shell '${shell}'`);
-    console.error("wksh requires bash, zsh, or fish.");
+    console.error("wk requires bash, zsh, or fish.");
     process.exit(1);
   }
 }
@@ -6949,7 +6988,7 @@ function autoCleanupWorktree(worktreeId, path, store, saveStore2) {
   const status = getWorktreeStatus(path);
   if (status !== "clean") {
     console.log("  " + warn(`Branch '${branch}' has uncommitted changes. Worktree kept.`));
-    console.log(dim(`      To reopen: `) + cyan(`wksh open ${branch}`));
+    console.log(dim(`      To reopen: `) + cyan(`wk open ${branch}`));
     return;
   }
   const currentBranch = getCurrentBranch();
@@ -6970,7 +7009,7 @@ function autoCleanupWorktree(worktreeId, path, store, saveStore2) {
     console.log(`  Changes have been pushed to a remote.`);
     console.log(`  Pruned worktree. Your changes are still in the '${cyan(branch)}' branch.`);
     console.log(`  To check it out again later:`);
-    console.log(dim(`    `) + cyan(`wksh open ${branch}`));
+    console.log(dim(`    `) + cyan(`wk open ${branch}`));
     return;
   }
   console.log(`  Pruned worktree. Your changes are still in the '${cyan(branch)}' branch.`);
@@ -7020,12 +7059,12 @@ function newCommand(branchName, fromBranch) {
   const existingWorktree = getWorktreeForBranch(branch);
   if (existingWorktree) {
     console.error(`Error: branch '${branch}' already has an active worktree`);
-    console.error(dim(`  Try: `) + cyan(`wksh open ${branch}`));
+    console.error(dim(`  Try: `) + cyan(`wk open ${branch}`));
     process.exit(1);
   }
   if (branchExists(branch)) {
     console.error(`Error: branch '${branch}' already exists`);
-    console.error(dim(`  Try: `) + cyan(`wksh open ${branch}`));
+    console.error(dim(`  Try: `) + cyan(`wk open ${branch}`));
     process.exit(1);
   }
   const store = loadStore();
@@ -7043,8 +7082,8 @@ function newCommand(branchName, fromBranch) {
   const parentBranch = getCurrentBranch();
   console.log();
   console.log(success(bold(branch)), dim(`(from ${cyan(baseBranch)})`));
-  console.log(dim(`Opened branch in ephemeral subshell at ${relative(mainWorktree, worktreePath)}`));
-  console.log(dim("Type 'wksh close' to return."));
+  console.log(dim(`Opened branch in ephemeral subshell`));
+  console.log(dim("Type 'wk close' to return."));
   console.log();
   spawnShell(worktreePath, {
     branch,
@@ -7060,7 +7099,7 @@ function newCommand(branchName, fromBranch) {
 
 // commands/open.ts
 import { mkdirSync as mkdirSync4 } from "fs";
-import { basename as basename4, dirname as dirname4, join as join4, relative as relative2 } from "path";
+import { basename as basename4, dirname as dirname4, join as join4 } from "path";
 function openCommand(branch) {
   if (isInsideWorktree()) {
     const currentBranch = getCurrentBranch();
@@ -7084,7 +7123,7 @@ function openCommand(branch) {
     const mainWorktree2 = getMainWorktree();
     console.log();
     console.log(success(bold(branch)), dim(`(existing worktree)`));
-    console.log(dim("Type 'wksh close' to return."));
+    console.log(dim("Type 'wk close' to return."));
     console.log();
     spawnShell(existingWorktreePath, {
       branch,
@@ -7112,8 +7151,8 @@ function openCommand(branch) {
   saveStore(store);
   console.log();
   console.log(success(bold(branch)));
-  console.log(dim(`Opened branch in ephemeral subshell at ${relative2(mainWorktree, worktreePath)}`));
-  console.log(dim("Type 'exit' or 'wksh close' to return."));
+  console.log(dim(`Opened branch in ephemeral subshell`));
+  console.log(dim("Type 'exit' or 'wk close' to return."));
   console.log();
   spawnShell(worktreePath, {
     branch,
@@ -7995,14 +8034,14 @@ function rmCommand(branch, force = false) {
   const absCwd = resolve2(cwd);
   if (absCwd === absWtPath || absCwd.startsWith(absWtPath + "/")) {
     console.error("Error: cannot remove current worktree");
-    console.error(dim(`  Try: `) + cyan(`wksh close`));
+    console.error(dim(`  Try: `) + cyan(`wk close`));
     process.exit(1);
   }
   const status = getWorktreeStatus(worktreePath);
   const isDirty = status !== "clean" && status !== "";
   if (isDirty && !force) {
     console.error(warn("Uncommitted changes found. Commit, stash, or reset your changes first."));
-    console.error(dim(`  Or run: `) + cyan(`wksh rm ${branch} -f`));
+    console.error(dim(`  Or run: `) + cyan(`wk rm ${branch} -f`));
     process.exit(1);
   }
   if (isDirty && force) {
@@ -8117,7 +8156,7 @@ function precloseCommand(force) {
   }
   console.error(warn("Uncommitted changes found. Commit, stash, or reset your changes first."));
   console.error(dim("  Or use --force/-f to discard changes"));
-  console.error("    " + cyan("wksh close -f"));
+  console.error("    " + cyan("wk close -f"));
   process.exit(1);
 }
 
@@ -8183,14 +8222,14 @@ function promptChoice() {
 }
 
 // index.ts
-var VERSION = "0.0.5";
+var VERSION = "0.0.7";
 function printHelp() {
   const dim2 = import_picocolors4.default.dim;
   const cyan2 = import_picocolors4.default.cyan;
   const green2 = import_picocolors4.default.green;
-  console.log(`${import_picocolors4.default.bold("wksh")} ${dim2(`v${VERSION}`)} - Open branches in ephemeral subshells
+  console.log(`${import_picocolors4.default.bold("wk")} ${dim2(`v${VERSION}`)} - Open branches in ephemeral subshells
 
-${import_picocolors4.default.bold("Usage:")} ${cyan2("wksh")} ${dim2("<command>")} ${dim2("[options]")}
+${import_picocolors4.default.bold("Usage:")} ${cyan2("wk")} ${dim2("<command>")} ${dim2("[options]")}
 
 ${import_picocolors4.default.bold("Commands:")}
   ${green2("new")} ${dim2("[branch]")}    Create a branch and open it ${dim2("[--from <branch>]")}
@@ -8207,15 +8246,15 @@ ${import_picocolors4.default.bold("Options:")}
 
 ${dim2("\u2500".repeat(60))}
 
-${import_picocolors4.default.bold("Why wksh?")}
+${import_picocolors4.default.bold("Why wk?")}
 
 In agentic development, you often want to spin up isolated workspaces for
-specific tasks\u2014without stashing or committing your current changes. wksh makes
+specific tasks\u2014without stashing or committing your current changes. wk makes
 this effortless.
 
 Open a new branch in an ephemeral subshell:
 
-  ${dim2("$")} ${cyan2("wksh new add-login-button")}
+  ${dim2("$")} ${cyan2("wk new add-login-button")}
 
 This creates a branch and worktree, then drops you into a subshell. Open it
 in your editor or point an AI coding agent at it. Your changes are completely
@@ -8229,24 +8268,24 @@ Or merge directly back into main:
 
   ${dim2("$")} ${cyan2("git checkout main && git merge add-login-button")}
 
-Then just ${cyan2("wksh close")} to return to your main repo. The worktree is ephemeral\u2014
+Then just ${cyan2("wk close")} to return to your main repo. The worktree is ephemeral\u2014
 it gets cleaned up automatically.
 
-Use ${cyan2("wksh ls")} to see branches with open worktrees, and ${cyan2("wksh open <branch>")} to
+Use ${cyan2("wk ls")} to see branches with open worktrees, and ${cyan2("wk open <branch>")} to
 reopen one later.`);
 }
 function printVersion() {
-  console.log(`wksh v${VERSION}`);
+  console.log(`wk v${VERSION}`);
 }
 function printNewHelp() {
   const dim2 = import_picocolors4.default.dim;
   const cyan2 = import_picocolors4.default.cyan;
-  console.log(`${import_picocolors4.default.bold("wksh new")} - Create a branch and open it in an ephemeral subshell
+  console.log(`${import_picocolors4.default.bold("wk new")} - Create a branch and open it in an ephemeral subshell
 
-${import_picocolors4.default.bold("Usage:")} ${cyan2("wksh new")} ${dim2("[branch]")} ${dim2("[--from <branch>]")}
+${import_picocolors4.default.bold("Usage:")} ${cyan2("wk new")} ${dim2("[branch]")} ${dim2("[--from <branch>]")}
 
 ${import_picocolors4.default.bold("Arguments:")}
-  ${dim2("[branch]")}  Branch name ${dim2('(default: "wksh-[hash]")')}
+  ${dim2("[branch]")}  Branch name ${dim2('(default: "wk-[hash]")')}
 
 ${import_picocolors4.default.bold("Options:")}
   ${cyan2("--from")} ${dim2("<branch>")}  Base branch to fork from ${dim2("(default: current branch)")}
@@ -8254,14 +8293,14 @@ ${import_picocolors4.default.bold("Options:")}
 ${import_picocolors4.default.bold("Description:")}
   Creates a new Git branch (forked from current or specified branch) and opens
   it in an ephemeral subshell with its own worktree.
-  Type 'wksh close' to return.`);
+  Type 'wk close' to return.`);
 }
 function printOpenHelp() {
   const dim2 = import_picocolors4.default.dim;
   const cyan2 = import_picocolors4.default.cyan;
-  console.log(`${import_picocolors4.default.bold("wksh open")} - Open a branch in an ephemeral subshell
+  console.log(`${import_picocolors4.default.bold("wk open")} - Open a branch in an ephemeral subshell
 
-${import_picocolors4.default.bold("Usage:")} ${cyan2("wksh open")} ${dim2("<branch>")}
+${import_picocolors4.default.bold("Usage:")} ${cyan2("wk open")} ${dim2("<branch>")}
 
 ${import_picocolors4.default.bold("Arguments:")}
   ${dim2("<branch>")}  Branch name ${dim2("(required)")}
@@ -8270,14 +8309,14 @@ ${import_picocolors4.default.bold("Description:")}
   Opens the specified branch in an ephemeral subshell.
   If a worktree already exists for the branch, uses that.
   Otherwise, creates a new worktree automatically.
-  Type 'wksh close' to return.`);
+  Type 'wk close' to return.`);
 }
 function printLsHelp() {
   const dim2 = import_picocolors4.default.dim;
   const cyan2 = import_picocolors4.default.cyan;
-  console.log(`${import_picocolors4.default.bold("wksh ls")} - List branches with open worktrees
+  console.log(`${import_picocolors4.default.bold("wk ls")} - List branches with open worktrees
 
-${import_picocolors4.default.bold("Usage:")} ${cyan2("wksh ls")} ${dim2("[options]")}
+${import_picocolors4.default.bold("Usage:")} ${cyan2("wk ls")} ${dim2("[options]")}
 
 ${import_picocolors4.default.bold("Options:")}
   ${cyan2("--plain")}  Output in plain tab-separated format
@@ -8290,9 +8329,9 @@ ${import_picocolors4.default.bold("Description:")}
 function printRmHelp() {
   const dim2 = import_picocolors4.default.dim;
   const cyan2 = import_picocolors4.default.cyan;
-  console.log(`${import_picocolors4.default.bold("wksh rm")} - Remove a branch's worktree
+  console.log(`${import_picocolors4.default.bold("wk rm")} - Remove a branch's worktree
 
-${import_picocolors4.default.bold("Usage:")} ${cyan2("wksh rm")} ${dim2("<branch>")} ${dim2("[options]")}
+${import_picocolors4.default.bold("Usage:")} ${cyan2("wk rm")} ${dim2("<branch>")} ${dim2("[options]")}
 
 ${import_picocolors4.default.bold("Arguments:")}
   ${dim2("<branch>")}  Branch whose worktree to remove ${dim2("(required)")}
@@ -8307,9 +8346,9 @@ ${import_picocolors4.default.bold("Description:")}
 }
 function printStatusHelp() {
   const cyan2 = import_picocolors4.default.cyan;
-  console.log(`${import_picocolors4.default.bold("wksh status")} - Show current branch status
+  console.log(`${import_picocolors4.default.bold("wk status")} - Show current branch status
 
-${import_picocolors4.default.bold("Usage:")} ${cyan2("wksh status")}
+${import_picocolors4.default.bold("Usage:")} ${cyan2("wk status")}
 
 ${import_picocolors4.default.bold("Description:")}
   Shows the current branch, worktree path, and git status.`);
@@ -8317,9 +8356,9 @@ ${import_picocolors4.default.bold("Description:")}
 function printCloseHelp() {
   const dim2 = import_picocolors4.default.dim;
   const cyan2 = import_picocolors4.default.cyan;
-  console.log(`${import_picocolors4.default.bold("wksh close")} - Exit current subshell
+  console.log(`${import_picocolors4.default.bold("wk close")} - Exit current subshell
 
-${import_picocolors4.default.bold("Usage:")} ${cyan2("wksh close")} ${dim2("[options]")}
+${import_picocolors4.default.bold("Usage:")} ${cyan2("wk close")} ${dim2("[options]")}
 
 ${import_picocolors4.default.bold("Options:")}
   ${cyan2("-f")}, ${cyan2("--force")}  Discard uncommitted changes and exit
@@ -8338,9 +8377,9 @@ ${import_picocolors4.default.bold("Description:")}
 function printConfigHelp() {
   const dim2 = import_picocolors4.default.dim;
   const cyan2 = import_picocolors4.default.cyan;
-  console.log(`${import_picocolors4.default.bold("wksh config")} - Show or create config file
+  console.log(`${import_picocolors4.default.bold("wk config")} - Show or create config file
 
-${import_picocolors4.default.bold("Usage:")} ${cyan2("wksh config")}
+${import_picocolors4.default.bold("Usage:")} ${cyan2("wk config")}
 
 ${import_picocolors4.default.bold("Description:")}
   Shows the path and contents of your workshell config file.
@@ -8391,7 +8430,7 @@ switch (cmd) {
       process.exit(0);
     }
     if (!args[1]) {
-      console.error("Usage: wksh open <branch>");
+      console.error("Usage: wk open <branch>");
       process.exit(1);
     }
     openCommand(args[1]);
@@ -8416,7 +8455,7 @@ switch (cmd) {
       process.exit(0);
     }
     if (!args[1]) {
-      console.error("Usage: wksh rm <branch>");
+      console.error("Usage: wk rm <branch>");
       process.exit(1);
     }
     rmCommand(args[1], args.includes("-f") || args.includes("--force"));
@@ -8433,7 +8472,7 @@ switch (cmd) {
       printCloseHelp();
       process.exit(0);
     }
-    console.error(fail("'wksh close' only works inside a wksh subshell."));
+    console.error(fail("'wk close' only works inside a wk subshell."));
     process.exit(1);
     break;
   case "__preclose":
@@ -8441,7 +8480,7 @@ switch (cmd) {
     break;
   default:
     console.error(`Unknown command: ${cmd}`);
-    console.error("Run 'wksh --help' for usage.");
+    console.error("Run 'wk --help' for usage.");
     process.exit(1);
 }
 /*! Bundled license information:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "workshell",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "description": "Agent- and human-friendly Git multitasking, powered by worktrees",
   "type": "module",
   "license": "MIT",
@@ -22,7 +22,7 @@
     "isolation"
   ],
   "bin": {
-    "wksh": "dist/index.js",
+    "wk": "dist/index.js",
     "workshell": "dist/index.js",
     "git-workshell": "dist/index.js"
   },
@@ -32,7 +32,7 @@
   "sideEffects": false,
   "scripts": {
     "build": "tsc && node build.ts",
-    "postbuild": "ln -sf $(pwd)/dist/index.js /usr/local/bin/wksh-dev",
+    "postbuild": "ln -sf $(pwd)/dist/index.js /usr/local/bin/wk-dev",
     "dev": "node build.ts --watch",
     "prepare": "husky && node build.ts",
     "typecheck": "tsc",