workshell 0.0.2 → 0.0.4

package/README.md

@@ -27,16 +27,16 @@ $ npm i -g workshell
 
 ## 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 `wsh` 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 `wksh` 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 `wsh open <branch>` or create a new one with `wsh new <branch>`.
-- An ephemeral worktree is created for this branch (in `.git/wsh/worktrees`) and **opened in a fresh subshell**.
+- 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 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 `wsh close`. **The associated worktree is auto-pruned**.
+- You close the subshell with `wksh 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 +44,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 `wsh` 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 `wksh` is (though worktrees are used internally).
 
 Here's how it works (key points in **bold**).
 
-- **A fresh worktree is created** — The `wsh` utility a) creates a new worktree in `.git/wsh/worktrees` and b) opens it in a *subshell*.
+- **A fresh worktree is created** — The `wksh` utility a) creates a new worktree in `.git/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 `wsh close` to exit the subshell. As with `git switch`, `wsh close` won't let you close the subshell if you have unstaged/uncommitted changes.
+- **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.
 - **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 +63,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 `wsh 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`, `wsh 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 `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.
 - 🤖 **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 `wsh` works. First, install `wsh`.
+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`.
 
 ```bash
 $ npm i -g workshell
@@ -79,7 +79,19 @@ $ npm i -g workshell
 
 <br/>
 
-Then clone a repo (any repo works):
+This installs the `workshell` CLI. For convenience, it's also aliased to `wksh`. We'll use `wksh` throughout the quickstart.
+
+```sh
+$ wksh status
+
+branch:    main (root)
+worktree:  /Users/colinmcd94/Documents/projects/pf
+status:    clean
+```
+
+<br/>
+
+Clone a repo (any repo works):
 
 ```bash
 $ git clone git@github.com:colinhacks/zod.git
@@ -91,11 +103,11 @@ $ cd zod
 After cloning, the `main` branch is checked out. Let's say we want to start work on a new feature:
 
 ```bash
-$ wsh new feat-1
+$ wksh new feat-1
 
 ✓ feat-1 (from main)
-Opened branch in ephemeral subshell at .git/wsh/worktrees/zod@feat-1
-Type 'wsh close' to return.
+Opened branch in ephemeral subshell at .git/workshell/worktrees/zod@feat-1
+Type 'wksh close' to return.
 ```
 
 <br/>
@@ -104,7 +116,7 @@ You're now in a workshell. Check where you are:
 
 ```bash
 $ pwd
-/Users/colinmcd94/Documents/repos/zod/.git/wsh/worktrees/zod@feat-1
+/Users/colinmcd94/Documents/repos/zod/.git/workshell/worktrees/zod@feat-1
 
 $ git branch --show-current
 feat-1
@@ -123,10 +135,10 @@ $ touch a.txt
 Now let's try to close the workshell.
 
 ```bash
-$ wsh close
+$ wksh close
 ⚠ Uncommitted changes found. Commit, stash, or reset your changes first.
   Or use --force/-f to discard changes
-    wsh close -f
+    wksh close -f
 ```
 
 <br/>
@@ -139,10 +151,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, `wsh` offers to auto-merge the changes.
+Now we can try closing again. Since our changes can be fast-forwarded from the base branch, `wksh` offers to auto-merge the changes.
 
 ```bash
-$ wsh close
+$ wksh close
 ✓ Back in main
   Pruned worktree. Your changes are still in the 'feat-1' branch.
   To merge your changes:
@@ -158,9 +170,9 @@ $ wsh close
 ## CLI
 
 ```sh
-wsh v0.x.y - Human- and agent-friendly Git multitasking
+wksh v0.x.y - Human- and agent-friendly Git multitasking
 
-Usage: wsh <command> [options]
+Usage: wksh <command> [options]
 
 Commands:
   new [branch]    Create a branch and open it [--from <branch>]
@@ -180,10 +192,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 `wsh 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 `wksh ls`.
 
 ```sh
-$ wsh ls
+$ wksh ls
 ┌────────┬───────────┬───────────────┐
 │ branch │ status    │ created       │
 ├────────┼───────────┼───────────────┤
@@ -200,10 +212,10 @@ $ wsh ls
 You can open any existing Git branch in a workshell. 
 
 ```sh
-$ wsh open feat-1
+$ wksh open feat-1
 
 ✓ feat-1 (existing worktree)
-Type 'wsh close' to return.
+Type 'wksh close' to return.
 ```
 
 <br />
@@ -211,7 +223,7 @@ Type 'wsh close' to return.
 ### Show current branch status
 
 ```sh
-$ wsh status
+$ wksh status
 branch:    main (root)
 worktree:  /path/to/zod
 status:    clean
@@ -224,7 +236,7 @@ status:    clean
 Remove the worktree for a branch (the branch itself is kept):
 
 ```sh
-$ wsh rm feat-1
+$ wksh rm feat-1
 
 ✓ Pruned worktree for feat-1
 ```
@@ -236,7 +248,7 @@ $ wsh rm feat-1
 This closes the current workshell and auto-prunes the associated worktree. Your changes survive in your branch commits. 
 
 ```sh
-$ wsh close
+$ wksh close
 ✓ Back in main
   Pruned worktree. Your changes are still in the 'feat-1' branch.
   To merge your changes:
@@ -256,19 +268,19 @@ 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
-$ wsh close --force
+$ wksh close --force
 ```
 
 <br />
 
-### Print or create a `wsh.toml`
+### Print or create a `workshell.toml`
 
 To print or create a config file:
 
 ```sh
-$ wsh config
+$ wksh config
 
-✓ Config file: /path/to/repo/.git/wsh.toml
+✓ Config file: /path/to/repo/.git/workshell.toml
 
 ────────────────────────────────────────────────────────────
 setup = "npm install"
@@ -278,44 +290,41 @@ setup = "npm install"
 If no config exists, you'll be prompted to create one.
 
 ```sh
-$ wsh config
+$ wksh config
 
 No config file found.
 
 Where would you like to create one?
-  1. .git/wsh.toml (local only, not committed)
-  2. wsh.toml (project root, can be committed)
+  1. .git/workshell.toml (local only, not committed)
+  2. workshell.toml (project root, can be committed)
 
 Choice (1/2): 1
 
-✓ Created /path/to/repo/.git/wsh.toml
+✓ Created /path/to/repo/.git/workshell.toml
 ```
 
 <br />
 
-## `wsh.toml`
+## `workshell.toml`
 
-You can configure `wsh` with a `wsh.toml` file. This is useful for running setup scripts when opening a workshell (e.g., `npm install`).
+You can configure `wksh` with a `workshell.toml` file. This is useful for running setup scripts when opening a workshell (e.g., `npm install`).
 
-`wsh` looks for config files in the following order:
+`wksh` looks for config files in the following order:
 
 | Path | Description |
 |------|-------------|
-| `.git/wsh.toml` | Local only, not committed (highest precedence) |
-| `wsh.toml` | Project root, can be committed |
+| `.git/workshell.toml` | Local only, not committed (highest precedence) |
+| `workshell.toml` | Project root, can be committed |
 
 <br />
 
+Currently only one setting is supported: `setup`.
+
 ```toml
 # setup script executed in subshell after initialization
+# 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`
 setup = "npm install && cp {{ repo_path }}/.env {{ worktree_path }}/.env"
 ```
-
-The following variable substitutions are supported in `setup`.
-
-| Variable | Description | Example |
-|----------|-------------|---------|
-| `{{ branch }}` | Branch name | `feature/auth` |
-| `{{ repo_path }}` | Absolute path to main repo | `/path/to/repo` |
-| `{{ worktree_path }}` | Absolute path to worktree | `/path/to/repo/.git/wsh/worktrees/repo@feat` |
-

package/dist/index.js

@@ -6494,10 +6494,10 @@ function getMainWorktree() {
   return dirname(getGitCommonDir());
 }
 function getWorktreesDir() {
-  return join(getGitCommonDir(), "wsh", "worktrees");
+  return join(getGitCommonDir(), "workshell", "worktrees");
 }
 function getStorePath() {
-  return join(getGitCommonDir(), "wsh");
+  return join(getGitCommonDir(), "workshell");
 }
 function loadStore() {
   const storePath = getStorePath();
@@ -6537,7 +6537,7 @@ function getWorktreeId(path) {
 function getWorktreePath(id) {
   return join(getWorktreesDir(), id);
 }
-var CONFIG_FILENAME = "wsh.toml";
+var CONFIG_FILENAME = "workshell.toml";
 function getConfigPath() {
   const gitConfigPath = join(getGitCommonDir(), CONFIG_FILENAME);
   if (existsSync(gitConfigPath)) {
@@ -6594,7 +6594,7 @@ function getCommandName() {
   }
   const scriptName = basename2(scriptPath, ".js");
   if (scriptName === "index" || scriptName === "dist") {
-    return "wsh";
+    return "wksh";
   }
   return scriptName;
 }
@@ -6722,6 +6722,12 @@ function createWorktree(name, path, baseBranch) {
   const baseArg = baseBranch ? ` "${baseBranch}"` : "";
   execSync2(`git worktree add -b "${name}" "${path}"${baseArg}`, { stdio: "ignore" });
 }
+function initSubmodules(worktreePath) {
+  try {
+    execSync2("git submodule update --init --recursive", { cwd: worktreePath, stdio: "ignore" });
+  } catch {
+  }
+}
 function createWorktreeForExistingBranch(branch, path) {
   execSync2(`git worktree add "${path}" "${branch}"`, { stdio: "ignore" });
 }
@@ -6760,22 +6766,11 @@ function canFastForward(baseBranch, targetBranch) {
     return false;
   }
 }
-function inferBaseBranch(branch) {
-  const candidates = ["main", "master"];
-  for (const candidate of candidates) {
-    try {
-      execSync2(`git show-ref --verify --quiet refs/heads/${candidate}`);
-      return candidate;
-    } catch {
-    }
-  }
-  return "HEAD";
-}
 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 `wsh-${hex}`;
+  return `wksh-${hex}`;
 }
 function slugify(name) {
   return name.replace(/[^a-zA-Z0-9-]/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "");
@@ -6802,9 +6797,9 @@ exit() {
     builtin exit "$@"
   fi
   # Support: exit -f / exit --force (strip before calling builtin exit)
-  local wsh_force=""
+  local wksh_force=""
   if [[ "\${1:-}" == "-f" || "\${1:-}" == "--force" ]]; then
-    wsh_force="\${1:-}"
+    wksh_force="\${1:-}"
     shift
   fi
   # Fail open if ${cmd2} not in PATH
@@ -6812,30 +6807,30 @@ exit() {
     builtin exit "$@"
   fi
   # Run preclose - exit code 1 means dirty, block exit
-  command ${cmd2} __preclose $wsh_force
+  command ${cmd2} __preclose $wksh_force
   if [[ $? -eq 1 ]]; then
     return
   fi
   builtin exit "$@"
 }
 
-__wsh_wrapper() {
+__wksh_wrapper() {
   case "$1" in
     close) shift; exit "$@" ;;
     *) command ${cmd2} "$@" ;;
   esac
 }
-alias wsh='__wsh_wrapper'
-${cmd2.endsWith("-dev") ? `alias wsh-dev='__wsh_wrapper'` : ""}
+alias wksh='__wksh_wrapper'
+${cmd2.endsWith("-dev") ? `alias wksh-dev='__wksh_wrapper'` : ""}
 `;
   const zshScript = `
 exit() {
   if [[ \${ZSH_SUBSHELL:-0} -gt 0 ]]; then
     builtin exit "$@"
   fi
-  local wsh_force=""
+  local wksh_force=""
   if [[ "\${1:-}" == "-f" || "\${1:-}" == "--force" ]]; then
-    wsh_force="\${1:-}"
+    wksh_force="\${1:-}"
     shift
   fi
   # Fail open if ${cmd2} not in PATH
@@ -6843,21 +6838,21 @@ exit() {
     builtin exit "$@"
   fi
   # Run preclose - exit code 1 means dirty, block exit
-  command ${cmd2} __preclose $wsh_force
+  command ${cmd2} __preclose $wksh_force
   if [[ $? -eq 1 ]]; then
     return
   fi
   builtin exit "$@"
 }
 
-__wsh_wrapper() {
+__wksh_wrapper() {
   case "$1" in
     close) shift; exit "$@" ;;
     *) command ${cmd2} "$@" ;;
   esac
 }
-alias wsh='__wsh_wrapper'
-${cmd2.endsWith("-dev") ? `alias wsh-dev='__wsh_wrapper'` : ""}
+alias wksh='__wksh_wrapper'
+${cmd2.endsWith("-dev") ? `alias wksh-dev='__wksh_wrapper'` : ""}
 `;
   const fishScript = `
 function exit --wraps=exit
@@ -6865,11 +6860,11 @@ function exit --wraps=exit
   if not status is-interactive
     builtin exit $argv
   end
-  set wsh_force
+  set wksh_force
   set args $argv
   if test (count $args) -gt 0
     if test "$args[1]" = "-f"; or test "$args[1]" = "--force"
-      set wsh_force $args[1]
+      set wksh_force $args[1]
       set -e args[1]
     end
   end
@@ -6878,14 +6873,14 @@ function exit --wraps=exit
     builtin exit $args
   end
   # Run preclose - exit code 1 means dirty, block exit
-  command ${cmd2} __preclose $wsh_force
+  command ${cmd2} __preclose $wksh_force
   if test $status -eq 1
     return
   end
   builtin exit $args
 end
 
-function __wsh_wrapper
+function __wksh_wrapper
   if test "$argv[1]" = "close"
     set args $argv
     set -e args[1]
@@ -6895,21 +6890,21 @@ function __wsh_wrapper
   end
 end
 
-function wsh --wraps=${cmd2}
-  __wsh_wrapper $argv
+function wksh --wraps=${cmd2}
+  __wksh_wrapper $argv
 end
 ${cmd2.endsWith("-dev") ? `
-function wsh-dev --wraps=${cmd2}
-  __wsh_wrapper $argv
+function wksh-dev --wraps=${cmd2}
+  __wksh_wrapper $argv
 end
 ` : ""}
 `;
   const setupSection = setupCommand ? `
-# wsh setup script
+# wksh setup script
 ${setupCommand}
 ` : "";
   if (shell.endsWith("zsh")) {
-    const tmpDir = join2(tmpdir(), `wsh-${process.pid}`);
+    const tmpDir = join2(tmpdir(), `wksh-${process.pid}`);
     mkdirSync2(tmpDir, { recursive: true });
     try {
       writeFileSync2(join2(tmpDir, ".zshrc"), `[[ -f "$HOME/.zshrc" ]] && source "$HOME/.zshrc"
@@ -6919,7 +6914,7 @@ ${zshScript}${setupSection}`);
       rmSync(tmpDir, { recursive: true, force: true });
     }
   } else if (shell.endsWith("bash")) {
-    const tmpDir = join2(tmpdir(), `wsh-${process.pid}`);
+    const tmpDir = join2(tmpdir(), `wksh-${process.pid}`);
     mkdirSync2(tmpDir, { recursive: true });
     try {
       const rcFile = join2(tmpDir, ".bashrc");
@@ -6931,12 +6926,12 @@ ${bashScript}${setupSection}`);
     }
   } else if (shell.endsWith("fish")) {
     const fishInit = setupCommand ? `${fishScript}
-# wsh setup script
+# wksh setup script
 ${setupCommand}` : fishScript;
     spawnSync(shell, ["--init-command", fishInit], { cwd, stdio: "inherit" });
   } else {
     console.error(`Error: Unsupported shell '${shell}'`);
-    console.error("wsh requires bash, zsh, or fish.");
+    console.error("wksh requires bash, zsh, or fish.");
     process.exit(1);
   }
 }
@@ -6954,20 +6949,19 @@ 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(`wsh open ${branch}`));
+    console.log(dim(`      To reopen: `) + cyan(`wksh open ${branch}`));
     return;
   }
-  const meta = getWorktreeMeta(store, worktreeId);
-  const baseBranch = meta?.base_branch;
+  const currentBranch = getCurrentBranch();
+  console.log("  Pruning worktree...");
   try {
     removeGitWorktree(path);
   } catch {
   }
-  console.log("  Pruning worktree...");
   pruneWorktrees();
   removeWorktreeMeta(store, worktreeId);
   saveStore2(store);
-  const canMergeBranch = branch !== "[missing]" && branch !== "[detached]" && baseBranch;
+  const canMergeBranch = branch !== "[missing]" && branch !== "[detached]" && currentBranch !== "HEAD";
   if (!canMergeBranch) {
     console.log(`  Pruned '${branch}' worktree`);
     return;
@@ -6976,19 +6970,14 @@ 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(`wsh open ${branch}`));
+    console.log(dim(`    `) + cyan(`wksh open ${branch}`));
     return;
   }
   console.log(`  Pruned worktree. Your changes are still in the '${cyan(branch)}' branch.`);
   console.log(`  To merge your changes:`);
-  const currentBranch = getCurrentBranch();
-  if (currentBranch === baseBranch) {
-    console.log(dim(`    git merge ${cyan(branch)}`));
-  } else {
-    console.log(dim(`    git checkout ${cyan(baseBranch)} && git merge ${cyan(branch)}`));
-  }
+  console.log(dim(`    git merge ${cyan(branch)}`));
   console.log();
-  if (!canFastForward(baseBranch, branch)) {
+  if (!canFastForward(currentBranch, branch)) {
     return;
   }
   if (store.auto_merge_prompt === false) {
@@ -7005,7 +6994,7 @@ function autoCleanupWorktree(worktreeId, path, store, saveStore2) {
       execSync2(`git merge "${branch}"`, { stdio: "inherit" });
       deleteBranch(branch);
       console.log();
-      console.log(success(`Merged '${cyan(branch)}' into '${cyan(baseBranch)}'`));
+      console.log(success(`Merged '${cyan(branch)}' into '${cyan(currentBranch)}'`));
     } catch {
       console.log();
       console.log(warn(`Merge failed. Resolve conflicts manually, then delete branch with:`));
@@ -7031,12 +7020,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(`wsh open ${branch}`));
+    console.error(dim(`  Try: `) + cyan(`wksh open ${branch}`));
     process.exit(1);
   }
   if (branchExists(branch)) {
     console.error(`Error: branch '${branch}' already exists`);
-    console.error(dim(`  Try: `) + cyan(`wsh open ${branch}`));
+    console.error(dim(`  Try: `) + cyan(`wksh open ${branch}`));
     process.exit(1);
   }
   const store = loadStore();
@@ -7046,8 +7035,8 @@ function newCommand(branchName, fromBranch) {
   const worktreePath = join3(getWorktreesDir(), worktreeId);
   mkdirSync3(dirname3(worktreePath), { recursive: true });
   createWorktree(branch, worktreePath, fromBranch);
+  initSubmodules(worktreePath);
   setWorktreeMeta(store, worktreeId, {
-    base_branch: baseBranch,
     created_at: (/* @__PURE__ */ new Date()).toISOString()
   });
   saveStore(store);
@@ -7055,7 +7044,7 @@ function newCommand(branchName, fromBranch) {
   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 'wsh close' to return."));
+  console.log(dim("Type 'wksh close' to return."));
   console.log();
   spawnShell(worktreePath, {
     branch,
@@ -7095,7 +7084,7 @@ function openCommand(branch) {
     const mainWorktree2 = getMainWorktree();
     console.log();
     console.log(success(bold(branch)), dim(`(existing worktree)`));
-    console.log(dim("Type 'wsh close' to return."));
+    console.log(dim("Type 'wksh close' to return."));
     console.log();
     spawnShell(existingWorktreePath, {
       branch,
@@ -7116,16 +7105,15 @@ function openCommand(branch) {
   const worktreePath = join4(getWorktreesDir(), worktreeId);
   mkdirSync4(dirname4(worktreePath), { recursive: true });
   createWorktreeForExistingBranch(branch, worktreePath);
-  const baseBranch = inferBaseBranch(branch);
+  initSubmodules(worktreePath);
   setWorktreeMeta(store, worktreeId, {
-    base_branch: baseBranch,
     created_at: (/* @__PURE__ */ new Date()).toISOString()
   });
   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 'wsh close' to return."));
+  console.log(dim("Type 'exit' or 'wksh close' to return."));
   console.log();
   spawnShell(worktreePath, {
     branch,
@@ -8007,14 +7995,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(`wsh close`));
+    console.error(dim(`  Try: `) + cyan(`wksh 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(`wsh rm ${branch} -f`));
+    console.error(dim(`  Or run: `) + cyan(`wksh rm ${branch} -f`));
     process.exit(1);
   }
   if (isDirty && force) {
@@ -8120,14 +8108,16 @@ function precloseCommand(force) {
   if (force) {
     try {
       execSync5("git reset --hard HEAD", { stdio: "ignore" });
-      execSync5("git clean -fd", { stdio: "ignore" });
+      execSync5("git clean -ffd", { stdio: "ignore" });
+      execSync5("git submodule foreach --recursive 'git reset --hard HEAD; git clean -ffd'", { stdio: "ignore" });
+      execSync5("git submodule update --init --recursive --force", { stdio: "ignore" });
     } catch {
     }
     process.exit(0);
   }
   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("wsh close -f"));
+  console.error("    " + cyan("wksh close -f"));
   process.exit(1);
 }
 
@@ -8135,7 +8125,7 @@ function precloseCommand(force) {
 var import_picocolors3 = __toESM(require_picocolors(), 1);
 import { readFileSync as readFileSync2, writeFileSync as writeFileSync3, openSync as openSync2, readSync as readSync2 } from "fs";
 import { join as join5 } from "path";
-var CONFIG_TEMPLATE = `# wsh configuration
+var CONFIG_TEMPLATE = `# workshell configuration
 # https://github.com/colinhacks/workshell
 
 # Initialization script to run when opening a worktree.
@@ -8165,15 +8155,15 @@ function configCommand() {
   console.log("No config file found.");
   console.log();
   console.log("Where would you like to create one?");
-  console.log(`  ${import_picocolors3.default.bold("1.")} ${cyan(".git/wsh.toml")} ${dim("(local only, not committed)")}`);
-  console.log(`  ${import_picocolors3.default.bold("2.")} ${cyan("wsh.toml")} ${dim("(project root, can be committed)")}`);
+  console.log(`  ${import_picocolors3.default.bold("1.")} ${cyan(".git/workshell.toml")} ${dim("(local only, not committed)")}`);
+  console.log(`  ${import_picocolors3.default.bold("2.")} ${cyan("workshell.toml")} ${dim("(project root, can be committed)")}`);
   console.log();
   const choice = promptChoice();
   if (!choice) {
     console.log(dim("Cancelled."));
     return;
   }
-  const targetPath = choice === 1 ? join5(getGitCommonDir(), "wsh.toml") : join5(getMainWorktree(), "wsh.toml");
+  const targetPath = choice === 1 ? join5(getGitCommonDir(), "workshell.toml") : join5(getMainWorktree(), "workshell.toml");
   writeFileSync3(targetPath, CONFIG_TEMPLATE);
   console.log();
   console.log(success(`Created ${cyan(targetPath)}`));
@@ -8193,14 +8183,14 @@ function promptChoice() {
 }
 
 // index.ts
-var VERSION = "0.0.2";
+var VERSION = "0.0.4";
 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("wsh")} ${dim2(`v${VERSION}`)} - Open branches in ephemeral subshells
+  console.log(`${import_picocolors4.default.bold("wksh")} ${dim2(`v${VERSION}`)} - Open branches in ephemeral subshells
 
-${import_picocolors4.default.bold("Usage:")} ${cyan2("wsh")} ${dim2("<command>")} ${dim2("[options]")}
+${import_picocolors4.default.bold("Usage:")} ${cyan2("wksh")} ${dim2("<command>")} ${dim2("[options]")}
 
 ${import_picocolors4.default.bold("Commands:")}
   ${green2("new")} ${dim2("[branch]")}    Create a branch and open it ${dim2("[--from <branch>]")}
@@ -8217,15 +8207,15 @@ ${import_picocolors4.default.bold("Options:")}
 
 ${dim2("\u2500".repeat(60))}
 
-${import_picocolors4.default.bold("Why wsh?")}
+${import_picocolors4.default.bold("Why wksh?")}
 
 In agentic development, you often want to spin up isolated workspaces for
-specific tasks\u2014without stashing or committing your current changes. wsh makes
+specific tasks\u2014without stashing or committing your current changes. wksh makes
 this effortless.
 
 Open a new branch in an ephemeral subshell:
 
-  ${dim2("$")} ${cyan2("wsh new add-login-button")}
+  ${dim2("$")} ${cyan2("wksh 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
@@ -8239,24 +8229,24 @@ Or merge directly back into main:
 
   ${dim2("$")} ${cyan2("git checkout main && git merge add-login-button")}
 
-Then just ${cyan2("wsh close")} to return to your main repo. The worktree is ephemeral\u2014
+Then just ${cyan2("wksh close")} to return to your main repo. The worktree is ephemeral\u2014
 it gets cleaned up automatically.
 
-Use ${cyan2("wsh ls")} to see branches with open worktrees, and ${cyan2("wsh open <branch>")} to
+Use ${cyan2("wksh ls")} to see branches with open worktrees, and ${cyan2("wksh open <branch>")} to
 reopen one later.`);
 }
 function printVersion() {
-  console.log(`wsh v${VERSION}`);
+  console.log(`wksh v${VERSION}`);
 }
 function printNewHelp() {
   const dim2 = import_picocolors4.default.dim;
   const cyan2 = import_picocolors4.default.cyan;
-  console.log(`${import_picocolors4.default.bold("wsh new")} - Create a branch and open it in an ephemeral subshell
+  console.log(`${import_picocolors4.default.bold("wksh new")} - Create a branch and open it in an ephemeral subshell
 
-${import_picocolors4.default.bold("Usage:")} ${cyan2("wsh new")} ${dim2("[branch]")} ${dim2("[--from <branch>]")}
+${import_picocolors4.default.bold("Usage:")} ${cyan2("wksh new")} ${dim2("[branch]")} ${dim2("[--from <branch>]")}
 
 ${import_picocolors4.default.bold("Arguments:")}
-  ${dim2("[branch]")}  Branch name ${dim2('(default: "wsh-[hash]")')}
+  ${dim2("[branch]")}  Branch name ${dim2('(default: "wksh-[hash]")')}
 
 ${import_picocolors4.default.bold("Options:")}
   ${cyan2("--from")} ${dim2("<branch>")}  Base branch to fork from ${dim2("(default: current branch)")}
@@ -8264,14 +8254,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 'wsh close' to return.`);
+  Type 'wksh close' to return.`);
 }
 function printOpenHelp() {
   const dim2 = import_picocolors4.default.dim;
   const cyan2 = import_picocolors4.default.cyan;
-  console.log(`${import_picocolors4.default.bold("wsh open")} - Open a branch in an ephemeral subshell
+  console.log(`${import_picocolors4.default.bold("wksh open")} - Open a branch in an ephemeral subshell
 
-${import_picocolors4.default.bold("Usage:")} ${cyan2("wsh open")} ${dim2("<branch>")}
+${import_picocolors4.default.bold("Usage:")} ${cyan2("wksh open")} ${dim2("<branch>")}
 
 ${import_picocolors4.default.bold("Arguments:")}
   ${dim2("<branch>")}  Branch name ${dim2("(required)")}
@@ -8280,14 +8270,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 'wsh close' to return.`);
+  Type 'wksh close' to return.`);
 }
 function printLsHelp() {
   const dim2 = import_picocolors4.default.dim;
   const cyan2 = import_picocolors4.default.cyan;
-  console.log(`${import_picocolors4.default.bold("wsh ls")} - List branches with open worktrees
+  console.log(`${import_picocolors4.default.bold("wksh ls")} - List branches with open worktrees
 
-${import_picocolors4.default.bold("Usage:")} ${cyan2("wsh ls")} ${dim2("[options]")}
+${import_picocolors4.default.bold("Usage:")} ${cyan2("wksh ls")} ${dim2("[options]")}
 
 ${import_picocolors4.default.bold("Options:")}
   ${cyan2("--plain")}  Output in plain tab-separated format
@@ -8300,9 +8290,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("wsh rm")} - Remove a branch's worktree
+  console.log(`${import_picocolors4.default.bold("wksh rm")} - Remove a branch's worktree
 
-${import_picocolors4.default.bold("Usage:")} ${cyan2("wsh rm")} ${dim2("<branch>")} ${dim2("[options]")}
+${import_picocolors4.default.bold("Usage:")} ${cyan2("wksh rm")} ${dim2("<branch>")} ${dim2("[options]")}
 
 ${import_picocolors4.default.bold("Arguments:")}
   ${dim2("<branch>")}  Branch whose worktree to remove ${dim2("(required)")}
@@ -8317,9 +8307,9 @@ ${import_picocolors4.default.bold("Description:")}
 }
 function printStatusHelp() {
   const cyan2 = import_picocolors4.default.cyan;
-  console.log(`${import_picocolors4.default.bold("wsh status")} - Show current branch status
+  console.log(`${import_picocolors4.default.bold("wksh status")} - Show current branch status
 
-${import_picocolors4.default.bold("Usage:")} ${cyan2("wsh status")}
+${import_picocolors4.default.bold("Usage:")} ${cyan2("wksh status")}
 
 ${import_picocolors4.default.bold("Description:")}
   Shows the current branch, worktree path, and git status.`);
@@ -8327,9 +8317,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("wsh close")} - Exit current subshell
+  console.log(`${import_picocolors4.default.bold("wksh close")} - Exit current subshell
 
-${import_picocolors4.default.bold("Usage:")} ${cyan2("wsh close")} ${dim2("[options]")}
+${import_picocolors4.default.bold("Usage:")} ${cyan2("wksh close")} ${dim2("[options]")}
 
 ${import_picocolors4.default.bold("Options:")}
   ${cyan2("-f")}, ${cyan2("--force")}  Discard uncommitted changes and exit
@@ -8348,17 +8338,17 @@ ${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("wsh config")} - Show or create config file
+  console.log(`${import_picocolors4.default.bold("wksh config")} - Show or create config file
 
-${import_picocolors4.default.bold("Usage:")} ${cyan2("wsh config")}
+${import_picocolors4.default.bold("Usage:")} ${cyan2("wksh config")}
 
 ${import_picocolors4.default.bold("Description:")}
-  Shows the path and contents of your wsh config file.
+  Shows the path and contents of your workshell config file.
   If no config exists, prompts to create one.
   
 ${import_picocolors4.default.bold("Config locations")} ${dim2("(in precedence order)")}${import_picocolors4.default.bold(":")}
-  ${cyan2(".git/wsh.toml")}  Local only, not committed
-  ${cyan2("wsh.toml")}       Project root, can be committed`);
+  ${cyan2(".git/workshell.toml")}  Local only, not committed
+  ${cyan2("workshell.toml")}       Project root, can be committed`);
 }
 function isHelp(arg) {
   return arg === "--help" || arg === "-h";
@@ -8401,7 +8391,7 @@ switch (cmd) {
       process.exit(0);
     }
     if (!args[1]) {
-      console.error("Usage: wsh open <branch>");
+      console.error("Usage: wksh open <branch>");
       process.exit(1);
     }
     openCommand(args[1]);
@@ -8426,7 +8416,7 @@ switch (cmd) {
       process.exit(0);
     }
     if (!args[1]) {
-      console.error("Usage: wsh rm <branch>");
+      console.error("Usage: wksh rm <branch>");
       process.exit(1);
     }
     rmCommand(args[1], args.includes("-f") || args.includes("--force"));
@@ -8443,7 +8433,7 @@ switch (cmd) {
       printCloseHelp();
       process.exit(0);
     }
-    console.error(fail("'wsh close' only works inside a wsh subshell."));
+    console.error(fail("'wksh close' only works inside a wksh subshell."));
     process.exit(1);
     break;
   case "__preclose":
@@ -8451,7 +8441,7 @@ switch (cmd) {
     break;
   default:
     console.error(`Unknown command: ${cmd}`);
-    console.error("Run 'wsh --help' for usage.");
+    console.error("Run 'wksh --help' for usage.");
     process.exit(1);
 }
 /*! Bundled license information:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "workshell",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "Agent- and human-friendly Git multitasking, powered by worktrees",
   "type": "module",
   "license": "MIT",
@@ -22,7 +22,7 @@
     "isolation"
   ],
   "bin": {
-    "wsh": "dist/index.js",
+    "wksh": "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/wsh-dev",
+    "postbuild": "ln -sf $(pwd)/dist/index.js /usr/local/bin/wksh-dev",
     "dev": "node build.ts --watch",
     "prepare": "husky && node build.ts",
     "typecheck": "tsc",