workshell 0.0.3 → 0.0.5

package/README.md

@@ -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
@@ -306,16 +318,13 @@ You can configure `wksh` with a `workshell.toml` file. This is useful for runnin
 
 <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/workshell/worktrees/repo@feat` |
-

package/dist/index.js

@@ -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" });
 }
@@ -6903,7 +6909,7 @@ ${setupCommand}
     try {
       writeFileSync2(join2(tmpDir, ".zshrc"), `[[ -f "$HOME/.zshrc" ]] && source "$HOME/.zshrc"
 ${zshScript}${setupSection}`);
-      spawnSync(shell, [], { cwd, stdio: "inherit", env: { ...process.env, ZDOTDIR: tmpDir } });
+      spawnSync(shell, ["-l"], { cwd, stdio: "inherit", env: { ...process.env, ZDOTDIR: tmpDir } });
     } finally {
       rmSync(tmpDir, { recursive: true, force: true });
     }
@@ -6914,7 +6920,7 @@ ${zshScript}${setupSection}`);
       const rcFile = join2(tmpDir, ".bashrc");
       writeFileSync2(rcFile, `[[ -f "$HOME/.bashrc" ]] && source "$HOME/.bashrc"
 ${bashScript}${setupSection}`);
-      spawnSync(shell, ["--rcfile", rcFile, "-i"], { cwd, stdio: "inherit" });
+      spawnSync(shell, ["--rcfile", rcFile, "-il"], { cwd, stdio: "inherit" });
     } finally {
       rmSync(tmpDir, { recursive: true, force: true });
     }
@@ -7029,6 +7035,7 @@ function newCommand(branchName, fromBranch) {
   const worktreePath = join3(getWorktreesDir(), worktreeId);
   mkdirSync3(dirname3(worktreePath), { recursive: true });
   createWorktree(branch, worktreePath, fromBranch);
+  initSubmodules(worktreePath);
   setWorktreeMeta(store, worktreeId, {
     created_at: (/* @__PURE__ */ new Date()).toISOString()
   });
@@ -7098,6 +7105,7 @@ function openCommand(branch) {
   const worktreePath = join4(getWorktreesDir(), worktreeId);
   mkdirSync4(dirname4(worktreePath), { recursive: true });
   createWorktreeForExistingBranch(branch, worktreePath);
+  initSubmodules(worktreePath);
   setWorktreeMeta(store, worktreeId, {
     created_at: (/* @__PURE__ */ new Date()).toISOString()
   });
@@ -8100,7 +8108,9 @@ 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);
@@ -8173,7 +8183,7 @@ function promptChoice() {
 }
 
 // index.ts
-var VERSION = "0.0.3";
+var VERSION = "0.0.5";
 function printHelp() {
   const dim2 = import_picocolors4.default.dim;
   const cyan2 = import_picocolors4.default.cyan;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "workshell",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "Agent- and human-friendly Git multitasking, powered by worktrees",
   "type": "module",
   "license": "MIT",