workshell 0.0.6 → 0.0.7

package/README.md

@@ -20,7 +20,12 @@
 ## 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/>
@@ -34,7 +39,7 @@ There have been many attempts to nail a DX for parallel work in the agentic codi
 Here's how it works (key points in **bold**).
 
 - 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 `.git/workshell/worktrees`) and **opened in a fresh subshell**.
+- 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 `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.
@@ -48,7 +53,7 @@ There have been many attempts to nail a DX for parallel work in the agentic codi
 
 Here's how it works (key points in **bold**).
 
-- **A fresh worktree is created** — The `wk` 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 `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.
@@ -106,7 +111,7 @@ After cloning, the `main` branch is checked out. Let's say we want to start work
 $ wk new feat-1
 
 ✓ feat-1 (from main)
-Opened branch in ephemeral subshell at .git/workshell/worktrees/zod@feat-1
+Opened branch in ephemeral subshell
 Type 'wk close' to return.
 ```
 
@@ -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
@@ -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];
@@ -7043,7 +7082,7 @@ 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(`Opened branch in ephemeral subshell`));
   console.log(dim("Type 'wk close' to return."));
   console.log();
   spawnShell(worktreePath, {
@@ -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();
@@ -7112,7 +7151,7 @@ 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(`Opened branch in ephemeral subshell`));
   console.log(dim("Type 'exit' or 'wk close' to return."));
   console.log();
   spawnShell(worktreePath, {
@@ -8183,7 +8222,7 @@ function promptChoice() {
 }
 
 // index.ts
-var VERSION = "0.0.6";
+var VERSION = "0.0.7";
 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.6",
+  "version": "0.0.7",
   "description": "Agent- and human-friendly Git multitasking, powered by worktrees",
   "type": "module",
   "license": "MIT",