workshell 0.5.0 → 0.5.1

package/README.md

@@ -112,7 +112,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
+Opening branch in ephemeral subshell
 Type 'wk close' to return.
 ```
 

package/dist/index.js

@@ -8052,7 +8052,8 @@ function loadGlobalStore() {
       return raw;
     }
     return { repos: {} };
-  } catch {
+  } catch (err) {
+    console.error(`Warning: failed to load store: ${err instanceof Error ? err.message : String(err)}`);
     return { repos: {} };
   }
 }
@@ -8116,7 +8117,8 @@ function loadConfig() {
     const content = readFileSync(configPath, "utf-8");
     const parsed = parse(content);
     return parsed;
-  } catch {
+  } catch (err) {
+    console.error(`Warning: failed to load ${configPath}: ${err instanceof Error ? err.message : String(err)}`);
     return null;
   }
 }
@@ -8256,7 +8258,8 @@ function getWorktreeForBranch(branch) {
       }
     }
     return null;
-  } catch {
+  } catch (err) {
+    console.error(warn(`git worktree list failed: ${err instanceof Error ? err.message : String(err)}`));
     return null;
   }
 }
@@ -8299,7 +8302,8 @@ function removeGitWorktree(path) {
 function pruneWorktrees() {
   try {
     execSync2("git worktree prune", { stdio: "ignore" });
-  } catch {
+  } catch (err) {
+    console.error(warn(`git worktree prune failed: ${err instanceof Error ? err.message : String(err)}`));
   }
 }
 function deleteBranch(name) {
@@ -8315,6 +8319,16 @@ function branchHasRemote(name) {
     return false;
   }
 }
+function branchHasCommitsAheadOf(baseBranch, branch) {
+  try {
+    const count = execSync2(`git rev-list --count "${baseBranch}".."${branch}"`, {
+      encoding: "utf-8"
+    }).trim();
+    return parseInt(count, 10) > 0;
+  } catch {
+    return false;
+  }
+}
 function canFastForward(baseBranch, targetBranch) {
   try {
     const baseCommit = execSync2(`git rev-parse "${baseBranch}"`, { encoding: "utf-8" }).trim();
@@ -8532,8 +8546,19 @@ var installCmds = {
   pipenv: "pipenv install",
   pdm: "pdm install"
 };
+var lockfileNames = {
+  npm: "package-lock.json",
+  yarn: "yarn.lock",
+  pnpm: "pnpm-lock.yaml",
+  bun: "bun.lock",
+  uv: "uv.lock",
+  poetry: "poetry.lock",
+  pipenv: "Pipfile.lock",
+  pdm: "pdm.lock"
+};
 function runPackageManagerInstall(pm, cwd) {
   const cmd2 = installCmds[pm];
+  console.log(dim(`Detected ${lockfileNames[pm]}`));
   console.log(dim(`Running ${cmd2}...`));
   try {
     execSync2(cmd2, { cwd, stdio: "inherit" });
@@ -8590,11 +8615,12 @@ function getIgnoredFiles(repoPath) {
   try {
     const output = execFileSync(
       "git",
-      ["ls-files", "--others", "--ignored", "--exclude-standard"],
-      { cwd: repoPath, encoding: "utf-8" }
+      ["ls-files", "--others", "--ignored", "--exclude-standard", "--directory"],
+      { cwd: repoPath, encoding: "utf-8", maxBuffer: 10 * 1024 * 1024 }
     );
-    return output.split("\n").filter((p) => p.length > 0 && !p.startsWith(".git/"));
-  } catch {
+    return output.split("\n").map((p) => p.replace(/\/$/, "")).filter((p) => p.length > 0 && p !== ".git");
+  } catch (err) {
+    console.error(warn(`Failed to list ignored files: ${err instanceof Error ? err.message : String(err)}`));
     return [];
   }
 }
@@ -8626,14 +8652,20 @@ function autoCleanupWorktree(worktreeId, path, store, saveStore2) {
   console.log("  Pruning worktree...");
   try {
     removeGitWorktree(path);
-  } catch {
+  } catch (err) {
+    console.error(dim(`  git worktree remove failed: ${err instanceof Error ? err.message : String(err)}`));
   }
   pruneWorktrees();
   removeWorktreeMeta(store, worktreeId);
   saveStore2(store);
   const canMergeBranch = branch !== "[missing]" && branch !== "[detached]" && currentBranch !== "HEAD";
   if (!canMergeBranch) {
-    console.log(`  Pruned '${branch}' worktree`);
+    const branchNote = branch !== "[missing]" && branch !== "[detached]" ? ` Branch '${cyan(branch)}' still exists.` : "";
+    console.log(`  Pruned '${branch}' worktree.${branchNote}`);
+    return;
+  }
+  if (!branchHasCommitsAheadOf(currentBranch, branch)) {
+    console.log(`  Pruned worktree. Branch '${cyan(branch)}' still exists.`);
     return;
   }
   if (branchHasRemote(branch)) {
@@ -8704,6 +8736,7 @@ function newCommand(branchName, fromBranch) {
   const worktreeId = `${repoName}@${slugify(branch)}`;
   const worktreePath = join3(getWorktreesDir(), worktreeId);
   mkdirSync3(dirname3(worktreePath), { recursive: true });
+  console.log(dim(`Creating worktree for ${cyan(branch)}...`));
   createWorktree(branch, worktreePath, fromBranch);
   initSubmodules(worktreePath);
   const config = loadConfig();
@@ -8719,7 +8752,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`));
+  console.log(dim(worktreePath));
+  console.log(dim(`Opening branch in ephemeral subshell`));
   console.log(dim("Type 'wk close' to return."));
   console.log();
   spawnShell(worktreePath, {
@@ -8776,7 +8810,8 @@ function fetchPRBranch(prRef, prInfo) {
     execSync3(`gh pr checkout ${prRef}`, { stdio: "pipe" });
     execSync3(`git checkout "${currentBranch}"`, { stdio: "pipe" });
     return true;
-  } catch {
+  } catch (err) {
+    console.error(`Warning: gh pr checkout failed: ${err instanceof Error ? err.message : String(err)}`);
     try {
       execSync3(`git checkout "${currentBranch}"`, { stdio: "pipe" });
     } catch {
@@ -8835,10 +8870,10 @@ function openBranch(branch, prNumber) {
   console.log();
   if (prNumber) {
     console.log(success(bold(`PR #${prNumber}`)), dim(`branch: ${cyan(branch)}`));
-    console.log(dim(`Opened PR in ephemeral subshell`));
+    console.log(dim(`Opening PR in ephemeral subshell`));
   } else {
     console.log(success(bold(branch)));
-    console.log(dim(`Opened branch in ephemeral subshell`));
+    console.log(dim(`Opening branch in ephemeral subshell`));
   }
   console.log(dim("Type 'exit' or 'wk close' to return."));
   console.log();
@@ -9785,12 +9820,14 @@ function rmCommand(branch, force = false) {
     try {
       execSync4(`git -C "${worktreePath}" reset --hard HEAD`, { stdio: "ignore" });
       execSync4(`git -C "${worktreePath}" clean -fd`, { stdio: "ignore" });
-    } catch {
+    } catch (err) {
+      console.error(warn(`Failed to discard changes: ${err instanceof Error ? err.message : String(err)}`));
     }
   }
   try {
     removeGitWorktree(worktreePath);
-  } catch {
+  } catch (err) {
+    console.error(dim(`git worktree remove failed: ${err instanceof Error ? err.message : String(err)}`));
   }
   pruneWorktrees();
   const store = loadStore();
@@ -9887,7 +9924,8 @@ function precloseCommand(force) {
       execSync6("git clean -ffd", { stdio: "ignore" });
       execSync6("git submodule foreach --recursive 'git reset --hard HEAD; git clean -ffd'", { stdio: "ignore" });
       execSync6("git submodule update --init --recursive --force", { stdio: "ignore" });
-    } catch {
+    } catch (err) {
+      console.error(`Warning: failed to discard changes: ${err instanceof Error ? err.message : String(err)}`);
     }
     process.exit(0);
   }
@@ -9959,7 +9997,7 @@ function promptChoice() {
 }
 
 // index.ts
-var VERSION = "0.5.0";
+var VERSION = "0.5.1";
 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.5.0",
+  "version": "0.5.1",
   "description": "Agent- and human-friendly Git multitasking, powered by worktrees",
   "type": "module",
   "license": "MIT",