@cestoliv/wt 0.5.0-pr22.gbb5b3fa → 0.5.0-pr24.g2e0b1ed

package/README.md

@@ -16,7 +16,10 @@ prompt.
 npm install -g @cestoliv/wt   # also the update command
 ```
 
-Requires Node.js 20+ and Git. The command is `wt`.
+Requires Node.js 20+ and Git. The command is `wt`. Optionally install the
+[`gh`](https://cli.github.com/) and/or [`glab`](https://gitlab.com/gitlab-org/cli)
+CLIs (authenticated) to let `wt prune` confirm merges via merged PRs/MRs — see
+[Prune](#prune--wt-prune).
 
 ## Let your AI assistant set it up
 
@@ -37,7 +40,7 @@ infer from this project. Write the result to the config file (find its path with
 wt                                        # Browse worktrees (interactive TUI)
 wt create my-feat                         # New worktree, opens your IDE
 wt agent my-feat "Plan the feature"       # New worktree + AI agent in Zed (macOS)
-wt agent fix-bug "Fix bug" --mode auto    # Use auto mode instead of plan
+wt agent fix-bug "Fix bug" --mode auto    # Use auto mode instead of the default
 wt prune                                  # Remove merged worktrees (per-branch confirm)
 wt config                                 # Edit config in $EDITOR
 wt skill                                  # Print the skill file (for AI agents)
@@ -52,14 +55,15 @@ wt agent refactor "Refactor API layer" --mode default
 ```
 
 Creates a worktree exactly like `wt create`, then auto-starts your agent
-(default `claude --permission-mode plan`) in Zed's integrated terminal —
-pre-filled with your prompt and left interactive for you to take over.
+(default `claude`, run with `--permission-mode default`) in Zed's integrated
+terminal — pre-filled with your prompt and left interactive for you to take over.
 
-**Available modes** (`--mode`, defaults to `plan`):
+**Available modes** (`--mode`, defaults to `default`; change the default with
+the `agent_mode` config key):
 
-- `default` — Standard interactive mode with approval for each action
+- `default` — Standard interactive mode with approval for each action (default)
 - `acceptEdits` — Allow file changes but keep command execution controlled
-- `plan` — Architecture-first mode with no surprise mutations (default)
+- `plan` — Architecture-first mode with no surprise mutations
 - `auto` — Claude's safety model makes decisions instead of prompting
 - `dontAsk` — Minimal interruptions in trusted environments
 - `bypassPermissions` — Skip all permission checks (dangerous, CI/sandbox only)
@@ -139,8 +143,16 @@ and force-confirming when git refuses (submodules or uncommitted changes), just
 like a manual `D` delete. The branch itself stays; only the worktree is removed.
 Your `teardown_commands` run before each removal.
 
-Merge detection is patch-id based (via `git cherry`), so a single-commit branch
-**squash-merged** through a PR is still detected. `wt prune` best-effort fetches
+Merge detection is tiered. Patch-id matches (via `git cherry`) catch a
+single-commit branch **squash-merged** through a PR, offline. For the ambiguous
+case — the branch tip is an ancestor of base but 0 commits ahead, which both a
+**fast-forward / merge-commit** merge and a worktree holding only *uncommitted*
+work produce — it consults the **forge**: a merged PR/MR (via `gh` for GitHub or
+`glab` for GitLab, including self-hosted, auto-detected from the remote) is the
+only reliable signal, so a branch with unmerged work-in-progress is never
+mistaken for merged. If no forge CLI is available (or you're offline) such
+branches are simply left alone. A worktree still sitting exactly on the base
+commit is never offered. `wt prune` best-effort fetches
 the remote first; if the base ref can't be resolved (offline, missing), it
 removes nothing. The TUI exposes the same action under the `P` key. Works in
 repo mode and across all registered repos in global mode (each against its own
@@ -159,7 +171,8 @@ Edit with `wt config` (`wt config --path` prints the file location —
 | `worktree_path`       | `"../"`                           | Where worktrees are placed (relative to repo)                                       |
 | `setup_commands`      | `[]`                              | Commands to run in new worktrees                                                    |
 | `teardown_commands`   | `[]`                              | Commands to run in a worktree just before it is deleted (e.g. `["docker compose down -v"]`) |
-| `agent_command`       | `"claude --permission-mode plan"` | Base command; `--permission-mode` replaced by `--mode` option, then prompt appended |
+| `agent_command`       | `"claude"`                        | Base command; `--permission-mode <mode>` injected, then prompt appended             |
+| `agent_mode`          | `"default"`                       | Default permission mode for `wt agent` (overridden by `--mode`)                     |
 | `agent_trigger_chord` | `"ctrl-shift-cmd-c"`              | Zed keymap chord `wt agent` installs and presses                                    |
 | `auto_refresh_minutes`| `5`                               | How often the interactive list re-fetches worktrees (shows a "last refreshed" header); `0` disables it |
 | `repo_overrides`      | `{}`                              | Per-repo overrides for any key above                                                |

package/SKILL.md

@@ -66,11 +66,12 @@ wt agent feature/fix 'Fix the bug in payment processing' --mode auto
 wt agent refactor/api 'Refactor the API layer' --mode default
 ```
 
-The `--mode` flag sets Claude Code's permission mode (defaults to `plan`):
+The `--mode` flag sets Claude Code's permission mode (defaults to `default`;
+change the default with the `agent_mode` config key):
 
-- `default` — Standard interactive mode with approval for each action
+- `default` — Standard interactive mode with approval for each action (default)
 - `acceptEdits` — Allow file changes but keep command execution controlled
-- `plan` — Architecture-first mode with no surprise mutations (default)
+- `plan` — Architecture-first mode with no surprise mutations
 - `auto` — Claude's safety model makes decisions instead of prompting
 - `dontAsk` — Minimal interruptions in trusted environments
 - `bypassPermissions` — Skip all permission checks (dangerous, CI/sandbox only)
@@ -110,9 +111,17 @@ only the worktree is removed.
 wt prune   # review and remove merged worktrees, one prompt per branch
 ```
 
-Merge detection is patch-id based (via `git cherry`), so a single-commit branch
-that was **squash-merged** through a PR is still recognized as merged. It also
-best-effort fetches the remote first so detection sees up-to-date refs; if the
+Merge detection works in tiers. A branch whose diff already exists in base by
+patch id (via `git cherry`, so a single-commit branch **squash-merged** through a
+PR is recognized offline) is merged. For the ambiguous case — the branch tip is
+an ancestor of base but 0 commits ahead, which a **fast-forward / merge-commit**
+merge and a worktree holding only *uncommitted* work both produce — it consults
+the **forge**: a merged PR/MR (via `gh` for GitHub, `glab` for GitLab incl.
+self-hosted, auto-detected from the remote) is the only reliable signal. If the
+forge can't answer (CLI missing, offline, branch unpushed, no merged PR/MR) the
+branch is left alone. A worktree still sitting exactly on the base commit is
+never offered. `wt prune` also best-effort fetches the remote first so detection
+sees up-to-date refs; if the
 base ref can't be resolved (e.g. offline), nothing is removed. Works in repo
 mode (current repo) and global mode (all registered repos, each against its own
 `base_branch`). The TUI exposes the same action under the `p` key.
@@ -144,7 +153,8 @@ Config is stored as JSON. Get the path with `wt config --path`.
 | `teardown_commands`   | `string[]` | `[]`                              | Commands to run in a worktree just before it is deleted (e.g. `["docker compose down -v"]`); on failure you are prompted whether to delete anyway                         |
 | `ide`                 | `string`   | `"zed"`                           | IDE command to open worktrees with                                                                                                                                        |
 | `ide_open_args`       | `string[]` | `["-n"]`                          | Arguments passed to the IDE command                                                                                                                                       |
-| `agent_command`       | `string`   | `"claude --permission-mode plan"` | Base command `wt agent` runs in Zed; any `--permission-mode` flag is replaced by the `--mode` option (defaults to `plan`), then `<plan_prompt>` is appended single-quoted |
+| `agent_command`       | `string`   | `"claude"`                        | Base command `wt agent` runs in Zed; `--permission-mode <mode>` is injected (any existing one replaced), then `<plan_prompt>` is appended single-quoted                   |
+| `agent_mode`          | `string`   | `"default"`                       | Default Claude Code permission mode for `wt agent`; the `--mode` flag overrides it. One of `default`, `acceptEdits`, `plan`, `auto`, `dontAsk`, `bypassPermissions`        |
 | `agent_trigger_chord` | `string`   | `"ctrl-shift-cmd-c"`              | Zed keymap chord `wt agent` installs/presses to spawn the agent task                                                                                                      |
 | `auto_refresh_minutes`| `number`   | `5`                               | How often the interactive list (`wt`) re-fetches worktrees and updates the "last refreshed" header; `0` disables auto-refresh                                             |
 | `repos`               | `string[]` | `[]`                              | Registered repo paths (auto-populated on first use)                                                                                                                       |
@@ -152,7 +162,7 @@ Config is stored as JSON. Get the path with `wt config --path`.
 
 ### Per-repo overrides
 
-Override any field (`worktree_path`, `base_branch`, `setup_commands`, `teardown_commands`, `ide`, `ide_open_args`, `agent_command`, `agent_trigger_chord`, `auto_refresh_minutes`) for a specific repo:
+Override any field (`worktree_path`, `base_branch`, `setup_commands`, `teardown_commands`, `ide`, `ide_open_args`, `agent_command`, `agent_mode`, `agent_trigger_chord`, `auto_refresh_minutes`) for a specific repo:
 
 ```json
 {

package/dist/{agent-575QKWIG.js → agent-A5EP5ZPW.js}

@@ -3,9 +3,9 @@ import {
   openConfiguredIde,
   prepareWorktree,
   promptExistingWorktree
-} from "./chunk-Q6NNNYDJ.js";
-import "./chunk-YXA6CZ2L.js";
-import "./chunk-QVYSEMSL.js";
+} from "./chunk-DA4PICTI.js";
+import "./chunk-HHCUDNDE.js";
+import "./chunk-OUWQ6NIV.js";
 
 // src/commands/agent.ts
 import * as clack from "@clack/prompts";
@@ -424,19 +424,30 @@ var VALID_MODES = [
   "dontAsk",
   "bypassPermissions"
 ];
+var isValidMode = (mode) => VALID_MODES.includes(mode);
 var CLEANUP_DELAY_MS = 2e4;
 var delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 async function createAgentWorktree(branch, planPrompt, options = {}) {
-  const mode = options.mode ?? "plan";
-  if (!VALID_MODES.includes(mode)) {
+  if (options.mode !== void 0 && !isValidMode(options.mode)) {
     console.error(
-      pc.red(`Invalid mode "${mode}". Valid modes: ${VALID_MODES.join(", ")}`)
+      pc.red(
+        `Invalid mode "${options.mode}". Valid modes: ${VALID_MODES.join(", ")}`
+      )
     );
     process.exit(1);
   }
   const prepared = await prepareWorktree(branch, options);
   if (!prepared) return;
   const { status, config, worktreePath } = prepared;
+  let mode = options.mode ?? config.agent_mode ?? "default";
+  if (!isValidMode(mode)) {
+    console.warn(
+      pc.yellow(
+        `\u26A0 Invalid agent_mode "${mode}" in config; using "default". Valid modes: ${VALID_MODES.join(", ")}`
+      )
+    );
+    mode = "default";
+  }
   if (status === "exists") {
     const prompt = options.existingWorktreePrompt ?? promptExistingWorktree;
     const action = await prompt(worktreePath, { allowAgent: true });

package/dist/{chunk-QHNOUX63.js → chunk-C4MR7ZNK.js}

@@ -14,12 +14,12 @@ import {
   runInteractiveList,
   runRepoPicker,
   runWizard
-} from "./chunk-YXA6CZ2L.js";
+} from "./chunk-HHCUDNDE.js";
 import {
   createStore,
   getEffectiveConfig,
   getGlobalConfig
-} from "./chunk-QVYSEMSL.js";
+} from "./chunk-OUWQ6NIV.js";
 
 // src/commands/list.ts
 import * as clack from "@clack/prompts";
@@ -96,14 +96,13 @@ async function runList(options = {}) {
         if (!await runWizard(steps)) return;
         if (state.pickedRepo === void 0 || state.branch === void 0)
           return;
-        const { createWorktree } = await import("./create-DYM7QWI5.js");
+        const { createWorktree } = await import("./create-7MZPUETI.js");
         await createWorktree(state.branch, { cwd: state.pickedRepo, store });
       },
       onAgent: async () => {
-        const { createAgentWorktree, VALID_MODES } = await import("./agent-575QKWIG.js");
+        const { createAgentWorktree, VALID_MODES } = await import("./agent-A5EP5ZPW.js");
         const state = {
-          pickedRepo: repoRoot ?? void 0,
-          mode: "plan"
+          pickedRepo: repoRoot ?? void 0
         };
         const steps = buildWorktreeSteps(repoRoot, store, state);
         steps.push(async () => {
@@ -117,9 +116,10 @@ async function runList(options = {}) {
           return true;
         });
         steps.push(async () => {
+          const configuredMode = state.pickedRepo ? getEffectiveConfig(state.pickedRepo, store).agent_mode : void 0;
           const chosen = await clack.select({
             message: "Permission mode:",
-            initialValue: state.mode,
+            initialValue: state.mode ?? configuredMode,
             options: VALID_MODES.map((m) => ({ value: String(m), label: m }))
           });
           if (clack.isCancel(chosen)) return false;

package/dist/{chunk-Q6NNNYDJ.js → chunk-DA4PICTI.js}

@@ -13,11 +13,11 @@ import {
   runCommands,
   runRepoPicker,
   setUpstreamTracking
-} from "./chunk-YXA6CZ2L.js";
+} from "./chunk-HHCUDNDE.js";
 import {
   createStore,
   getEffectiveConfig
-} from "./chunk-QVYSEMSL.js";
+} from "./chunk-OUWQ6NIV.js";
 
 // src/commands/create.ts
 import { existsSync } from "fs";

package/dist/{chunk-YXA6CZ2L.js → chunk-HHCUDNDE.js}

@@ -2,16 +2,89 @@
 import {
   createStore,
   getGlobalConfig
-} from "./chunk-QVYSEMSL.js";
+} from "./chunk-OUWQ6NIV.js";
 
 // src/lib/git.ts
-import { execFileSync } from "child_process";
+import { execFileSync as execFileSync2 } from "child_process";
 import { existsSync, realpathSync, rmSync } from "fs";
 import path from "path";
+
+// src/lib/forge.ts
+import { execFileSync } from "child_process";
+function parseRemoteHost(url) {
+  const u = url.trim();
+  if (!u) return null;
+  const scp = u.match(/^(?:[^@/]+@)?([^:/]+):(?!\/\/)/);
+  if (scp) return scp[1].toLowerCase();
+  const schemed = u.match(/^[a-z][a-z0-9+.-]*:\/\/(?:[^@/]+@)?([^:/]+)/i);
+  if (schemed) return schemed[1].toLowerCase();
+  return null;
+}
+function selectForgeTool(host) {
+  if (!host) return null;
+  if (host === "github.com" || host.endsWith(".github.com")) return "gh";
+  if (host.includes("github")) return "gh";
+  return "glab";
+}
+function buildMergedQuery(tool, branch) {
+  if (tool === "gh") {
+    return [
+      "pr",
+      "list",
+      "--head",
+      branch,
+      "--state",
+      "merged",
+      "--json",
+      "number"
+    ];
+  }
+  return ["mr", "list", "--merged", "--source-branch", branch, "-F", "json"];
+}
+function parseMergedResult(stdout) {
+  try {
+    const data = JSON.parse(stdout);
+    return Array.isArray(data) && data.length > 0;
+  } catch {
+    return false;
+  }
+}
+var defaultRunner = {
+  remoteUrl(repoRoot, remote) {
+    return execFileSync("git", ["remote", "get-url", remote], {
+      cwd: repoRoot,
+      encoding: "utf8",
+      stdio: "pipe"
+    }).trim();
+  },
+  query(repoRoot, tool, args) {
+    return execFileSync(tool, args, {
+      cwd: repoRoot,
+      encoding: "utf8",
+      stdio: "pipe",
+      timeout: 15e3
+    });
+  }
+};
+function hasMergedPullRequest(repoRoot, branch, remote = "origin", runner = defaultRunner) {
+  try {
+    const tool = selectForgeTool(
+      parseRemoteHost(runner.remoteUrl(repoRoot, remote))
+    );
+    if (!tool) return false;
+    return parseMergedResult(
+      runner.query(repoRoot, tool, buildMergedQuery(tool, branch))
+    );
+  } catch {
+    return false;
+  }
+}
+
+// src/lib/git.ts
 function getRepoRoot(cwd = process.cwd()) {
   try {
     const realCwd = realpathSync(cwd);
-    const output = execFileSync("git", ["worktree", "list", "--porcelain"], {
+    const output = execFileSync2("git", ["worktree", "list", "--porcelain"], {
       cwd: realCwd,
       encoding: "utf8",
       stdio: "pipe"
@@ -25,7 +98,7 @@ function getRepoRoot(cwd = process.cwd()) {
 function listWorktrees(repoRoot, cwd = process.cwd()) {
   const realRepoRoot = realpathSync(repoRoot);
   const realCwd = realpathSync(cwd);
-  const output = execFileSync("git", ["worktree", "list", "--porcelain"], {
+  const output = execFileSync2("git", ["worktree", "list", "--porcelain"], {
     cwd: realRepoRoot,
     encoding: "utf8"
   });
@@ -35,7 +108,7 @@ function listWorktrees(repoRoot, cwd = process.cwd()) {
   ).join('; echo "---SEP---"; ');
   let commits = [];
   try {
-    const batchOutput = execFileSync("sh", ["-c", script], {
+    const batchOutput = execFileSync2("sh", ["-c", script], {
       encoding: "utf8",
       timeout: 8e3
     });
@@ -65,7 +138,7 @@ function parseWorktreeList(output, repoRoot, cwd) {
 }
 function addWorktree(repoRoot, worktreePath, branch, baseBranch) {
   if (baseBranch) {
-    execFileSync(
+    execFileSync2(
       "git",
       ["worktree", "add", "-b", branch, worktreePath, baseBranch],
       {
@@ -73,7 +146,7 @@ function addWorktree(repoRoot, worktreePath, branch, baseBranch) {
       }
     );
   } else {
-    execFileSync("git", ["worktree", "add", worktreePath, branch], {
+    execFileSync2("git", ["worktree", "add", worktreePath, branch], {
       cwd: repoRoot
     });
   }
@@ -90,7 +163,7 @@ function removeWorktree(repoRoot, worktreePath, force = false) {
     throw new Error("Refusing to remove the main worktree");
   }
   try {
-    execFileSync(
+    execFileSync2(
       "git",
       ["worktree", "remove", ...force ? ["--force"] : [], worktreePath],
       { cwd: repoRoot, stdio: "pipe" }
@@ -100,7 +173,7 @@ function removeWorktree(repoRoot, worktreePath, force = false) {
     if (existsSync(worktreePath)) {
       rmSync(worktreePath, { recursive: true, force: true });
     }
-    execFileSync("git", ["worktree", "prune"], {
+    execFileSync2("git", ["worktree", "prune"], {
       cwd: repoRoot,
       stdio: "pipe"
     });
@@ -108,7 +181,7 @@ function removeWorktree(repoRoot, worktreePath, force = false) {
 }
 function listWorktreeDirtyFiles(worktreePath) {
   try {
-    const out = execFileSync("git", ["status", "--short"], {
+    const out = execFileSync2("git", ["status", "--short"], {
       cwd: worktreePath,
       encoding: "utf8"
     });
@@ -119,12 +192,12 @@ function listWorktreeDirtyFiles(worktreePath) {
 }
 function branchExists(repoRoot, branch) {
   try {
-    const local = execFileSync("git", ["branch", "--list", branch], {
+    const local = execFileSync2("git", ["branch", "--list", branch], {
       cwd: repoRoot,
       encoding: "utf8"
     }).trim();
     if (local) return true;
-    const remote = execFileSync(
+    const remote = execFileSync2(
       "git",
       ["ls-remote", "--heads", "origin", branch],
       {
@@ -138,22 +211,45 @@ function branchExists(repoRoot, branch) {
     return false;
   }
 }
-function isBranchMerged(repoRoot, branch, baseBranch) {
+function isAncestor(repoRoot, ancestor, descendant) {
   try {
-    const out = execFileSync("git", ["cherry", baseBranch, branch], {
+    execFileSync2("git", ["merge-base", "--is-ancestor", ancestor, descendant], {
+      cwd: repoRoot,
+      stdio: "pipe"
+    });
+    return true;
+  } catch {
+    return false;
+  }
+}
+function isBranchMerged(repoRoot, branch, baseBranch, forgeCheck = hasMergedPullRequest) {
+  try {
+    const revParse = (ref) => execFileSync2("git", ["rev-parse", ref], {
+      cwd: repoRoot,
+      encoding: "utf8",
+      stdio: "pipe"
+    }).trim();
+    const baseTip = revParse(baseBranch);
+    const tip = revParse(branch);
+    const out = execFileSync2("git", ["cherry", baseBranch, branch], {
       cwd: repoRoot,
       encoding: "utf8",
       stdio: "pipe"
     });
     const lines = out.split("\n").filter((l) => l.trim().length > 0);
-    return lines.length > 0 && lines.every((l) => l.startsWith("-"));
+    if (lines.length > 0 && lines.every((l) => l.startsWith("-"))) return true;
+    if (tip !== baseTip && isAncestor(repoRoot, branch, baseBranch)) {
+      const remote = baseBranch.includes("/") ? baseBranch.split("/", 1)[0] : "origin";
+      return forgeCheck(repoRoot, branch, remote);
+    }
+    return false;
   } catch {
     return false;
   }
 }
 function setUpstreamTracking(worktreePath, branch, remote = "origin") {
   try {
-    execFileSync(
+    execFileSync2(
       "git",
       ["branch", "--set-upstream-to", `${remote}/${branch}`, branch],
       { cwd: worktreePath, stdio: "pipe" }
@@ -162,7 +258,7 @@ function setUpstreamTracking(worktreePath, branch, remote = "origin") {
   }
 }
 function fetchRemote(repoRoot, remote = "origin") {
-  execFileSync("git", ["fetch", remote], {
+  execFileSync2("git", ["fetch", remote], {
     cwd: repoRoot,
     stdio: "pipe",
     timeout: 3e4

package/dist/{chunk-QVYSEMSL.js → chunk-OUWQ6NIV.js}

@@ -68,9 +68,10 @@ var DEFAULT_CONFIG = {
   teardown_commands: [],
   ide: "zed",
   ide_open_args: ["-n"],
-  agent_command: "claude --permission-mode plan",
+  agent_command: "claude",
   agent_trigger_chord: "ctrl-shift-cmd-c",
   auto_refresh_minutes: 5,
+  agent_mode: "default",
   repos: [],
   repo_overrides: {}
 };

package/dist/cli.js

@@ -3,41 +3,40 @@
 // src/cli.ts
 import { Command } from "commander";
 var program = new Command();
-program.name("wt").description("Git worktree manager").version("0.5.0-pr22.gbb5b3fa").action(async () => {
-  const { runList } = await import("./list-XRECVEUI.js");
+program.name("wt").description("Git worktree manager").version("0.5.0-pr24.g2e0b1ed").action(async () => {
+  const { runList } = await import("./list-VACQ5XDH.js");
   await runList();
 });
 program.command("create [branch]").description("Create a new worktree").action(async (branch) => {
-  const { createWorktree } = await import("./create-DYM7QWI5.js");
+  const { createWorktree } = await import("./create-7MZPUETI.js");
   await createWorktree(branch);
 });
 program.command("agent <branch> <plan_prompt>").description("Create a worktree and auto-start an AI agent in Zed (macOS)").option(
   "--mode <mode>",
-  "Claude Code permission mode (default, plan, auto, etc.)",
-  "plan"
+  "Claude Code permission mode (default, plan, auto, etc.); overrides the configured agent_mode"
 ).action(
   async (branch, planPrompt, options) => {
-    const { createAgentWorktree } = await import("./agent-575QKWIG.js");
+    const { createAgentWorktree } = await import("./agent-A5EP5ZPW.js");
     await createAgentWorktree(branch, planPrompt, { mode: options.mode });
   }
 );
 program.command("prune").description(
   "Remove worktrees whose branch has been merged into the base branch"
 ).action(async () => {
-  const { runPrune } = await import("./prune-LOO5KMBU.js");
+  const { runPrune } = await import("./prune-ZKL3TFIH.js");
   await runPrune();
 });
 program.command("config").description("Open the config file in $EDITOR").option("--path", "Print the config file path and exit").action(async (options) => {
   if (options.path) {
-    const { printConfigPath } = await import("./config-QLWPW2UZ.js");
+    const { printConfigPath } = await import("./config-QSYG3JDC.js");
     printConfigPath();
   } else {
-    const { openConfig } = await import("./config-QLWPW2UZ.js");
+    const { openConfig } = await import("./config-QSYG3JDC.js");
     openConfig();
   }
 });
 program.command("skill").description("Print the wt skill file to stdout").action(async () => {
-  const { printSkill } = await import("./skill-5JFC6Q33.js");
+  const { printSkill } = await import("./skill-T5VOI4ZB.js");
   printSkill();
 });
 await program.parseAsync(process.argv);

package/dist/{config-QLWPW2UZ.js → config-QSYG3JDC.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   getConfigFilePath
-} from "./chunk-QVYSEMSL.js";
+} from "./chunk-OUWQ6NIV.js";
 
 // src/commands/config.ts
 import { spawn } from "child_process";

package/dist/{create-DYM7QWI5.js → create-7MZPUETI.js}

@@ -4,9 +4,9 @@ import {
   openConfiguredIde,
   prepareWorktree,
   promptExistingWorktree
-} from "./chunk-Q6NNNYDJ.js";
-import "./chunk-YXA6CZ2L.js";
-import "./chunk-QVYSEMSL.js";
+} from "./chunk-DA4PICTI.js";
+import "./chunk-HHCUDNDE.js";
+import "./chunk-OUWQ6NIV.js";
 export {
   createWorktree,
   openConfiguredIde,

package/dist/{list-XRECVEUI.js → list-VACQ5XDH.js}

@@ -6,9 +6,9 @@ import {
   runList,
   selectWipeCandidates,
   wipeWorktrees
-} from "./chunk-QHNOUX63.js";
-import "./chunk-YXA6CZ2L.js";
-import "./chunk-QVYSEMSL.js";
+} from "./chunk-C4MR7ZNK.js";
+import "./chunk-HHCUDNDE.js";
+import "./chunk-OUWQ6NIV.js";
 export {
   buildMergedPredicate,
   deleteWorktree,

package/dist/{prune-LOO5KMBU.js → prune-ZKL3TFIH.js}

@@ -2,11 +2,11 @@
 import {
   prepareListItems,
   wipeWorktrees
-} from "./chunk-QHNOUX63.js";
-import "./chunk-YXA6CZ2L.js";
+} from "./chunk-C4MR7ZNK.js";
+import "./chunk-HHCUDNDE.js";
 import {
   createStore
-} from "./chunk-QVYSEMSL.js";
+} from "./chunk-OUWQ6NIV.js";
 
 // src/commands/prune.ts
 import pc from "picocolors";

package/dist/skill-T5VOI4ZB.js

@@ -0,0 +1,9 @@
+#!/usr/bin/env node
+
+// src/commands/skill.ts
+function printSkill() {
+  console.log('---\nname: wt-worktree-manager\ndescription: Use the wt CLI to create, browse, open, and delete git worktrees across repos. Use when the user asks to manage worktrees, create isolated branches, or configure worktree defaults.\n---\n\n# wt \u2014 Git Worktree Manager\n\n`wt` is a CLI for managing git worktrees. It provides an interactive TUI to browse, create, open in your IDE, and delete worktrees across multiple repos.\n\n## Commands\n\n### `wt` (no subcommand)\n\nLaunch the interactive TUI. Shows worktrees for the current repo (repo mode) or all registered repos (global mode, when run outside a repo).\n\n**Keybindings in the TUI:**\n\n- Arrow keys \u2014 navigate\n- `Enter` \u2014 open worktree in IDE (exits the TUI)\n- `D` \u2014 delete worktree (the main worktree is tagged `(main)` and cannot be deleted \u2014 only linked worktrees can)\n- `P` \u2014 prune all merged worktrees (per-branch confirmation)\n- `C` \u2014 create a new worktree (works in both repo and global mode)\n- `A` \u2014 create a worktree and start an AI agent in it (works in both modes)\n- type to search \xB7 `Backspace` \u2014 edit search\n- `Q` / `Esc` \u2014 quit\n\n`C` and `A` are step-by-step wizards. In global mode (run from outside a repo /\n"home") they start by prompting for the repo (picker), then the branch; in repo\nmode the repo is fixed so they start at the branch. `A` then adds two more\nsteps:\n\n- `C` \u2014 **worktree (repo \u2192 branch)**\n- `A` \u2014 **worktree (repo \u2192 branch) \u2192 plan prompt \u2192 permission mode**\n\nPressing `Esc` at any step goes back to the previous step (your earlier answers\nare preserved); pressing `Esc` on the first step returns to the list.\n\nAfter a create or agent action the TUI **refreshes and stays open** on the list\n(your search and cursor are preserved) rather than exiting \u2014 only `Enter` (open)\nand `Q`/`Esc` exit.\n\nBecause `a`/`A`, `c`/`C`, `d`/`D`, and `p`/`P` are reserved as command keys,\nthose letters can\'t be typed into the search box.\n\n### `wt create [branch]`\n\nCreate a new worktree. If `branch` is omitted, prompts interactively.\n\nThe worktree is created as a sibling directory to the repo: `<parent>/<repo-name>-<branch-name>`.\n\nAfter creation, `wt` runs any configured `setup_commands` and opens the worktree in your IDE.\n\nIf the worktree path already exists, `wt create` doesn\'t error \u2014 it prompts you\nto **open it in the IDE** or **quit**. (In a non-interactive shell it errors\nwith a non-zero exit instead of prompting.)\n\n### `wt agent <branch> <plan_prompt> [--mode <mode>]`\n\nCreate a worktree (same as `wt create`) **and** auto-start an AI agent in Zed\'s\nintegrated terminal, pre-filled with `<plan_prompt>` and left interactive for\nyou to take over.\n\n```bash\nwt agent feature/login \'Read the codebase, then propose a plan for login.\'\nwt agent feature/fix \'Fix the bug in payment processing\' --mode auto\nwt agent refactor/api \'Refactor the API layer\' --mode default\n```\n\nThe `--mode` flag sets Claude Code\'s permission mode (defaults to `default`;\nchange the default with the `agent_mode` config key):\n\n- `default` \u2014 Standard interactive mode with approval for each action (default)\n- `acceptEdits` \u2014 Allow file changes but keep command execution controlled\n- `plan` \u2014 Architecture-first mode with no surprise mutations\n- `auto` \u2014 Claude\'s safety model makes decisions instead of prompting\n- `dontAsk` \u2014 Minimal interruptions in trusted environments\n- `bypassPermissions` \u2014 Skip all permission checks (dangerous, CI/sandbox only)\n\nIt writes a temporary `.zed/tasks.json` running\n`<agent_command> --permission-mode <mode> \'<plan_prompt>\'`, ensures a global Zed keymap chord\n(`agent_trigger_chord`) spawns that task, opens Zed, presses the chord via\n`osascript`, then removes the temporary task so the repo is left clean.\n\n**macOS + Zed only.** Requires Accessibility permission for the app that runs\n`wt` (Zed itself, when run from its integrated terminal). If it isn\'t granted,\n`wt agent` opens the _Privacy & Security \u2192 Accessibility_ settings pane and waits\nfor you to grant it and confirm, then retries automatically. On other platforms\n(or when `ide` is not `zed`) the worktree is still created and opened, but the\nagent is not auto-started.\n\nOver SSH it still works, provided the same user has an active graphical login on\nthe Mac: the keystroke is run inside the GUI session via Launch Services\n(`open -a Terminal` briefly flashes a Terminal window). Grant Accessibility to\nTerminal (not Zed) the first time. With no one logged in graphically there is\nnothing to drive, so it falls back to the manual "press the chord in Zed"\nmessage.\n\nIf the worktree path already exists, `wt agent` prompts you to **open it in the\nIDE**, **open it and start the agent**, or **quit** \u2014 instead of erroring. (In a\nnon-interactive shell it errors with a non-zero exit instead of prompting.)\n\n### `wt prune`\n\nRemove every worktree whose branch has already been merged into the base\nbranch (`base_branch`, default `origin/main`). Each candidate is confirmed\nindividually \u2014 and force-confirmed when git refuses (submodules / uncommitted\nchanges), exactly like a manual `d` delete. The branch itself is left intact;\nonly the worktree is removed.\n\n```bash\nwt prune   # review and remove merged worktrees, one prompt per branch\n```\n\nMerge detection works in tiers. A branch whose diff already exists in base by\npatch id (via `git cherry`, so a single-commit branch **squash-merged** through a\nPR is recognized offline) is merged. For the ambiguous case \u2014 the branch tip is\nan ancestor of base but 0 commits ahead, which a **fast-forward / merge-commit**\nmerge and a worktree holding only *uncommitted* work both produce \u2014 it consults\nthe **forge**: a merged PR/MR (via `gh` for GitHub, `glab` for GitLab incl.\nself-hosted, auto-detected from the remote) is the only reliable signal. If the\nforge can\'t answer (CLI missing, offline, branch unpushed, no merged PR/MR) the\nbranch is left alone. A worktree still sitting exactly on the base commit is\nnever offered. `wt prune` also best-effort fetches the remote first so detection\nsees up-to-date refs; if the\nbase ref can\'t be resolved (e.g. offline), nothing is removed. Works in repo\nmode (current repo) and global mode (all registered repos, each against its own\n`base_branch`). The TUI exposes the same action under the `p` key.\n\n### `wt config`\n\nOpen the global config file in `$EDITOR` (defaults to `nano`).\n\n```bash\nwt config          # open in editor\nwt config --path   # print config file path only\n```\n\n### `wt skill`\n\nPrint this skill file to stdout. Useful for piping to agents or copying to a project.\n\n## Configuration\n\nConfig is stored as JSON. Get the path with `wt config --path`.\n\n### Schema\n\n| Key                   | Type       | Default                           | Description                                                                                                                                                               |\n| --------------------- | ---------- | --------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |\n| `worktree_path`       | `string`   | `"../"`                           | Where to place new worktrees, relative to the repo root                                                                                                                   |\n| `base_branch`         | `string`   | `"origin/main"`                   | Branch to base new worktrees on                                                                                                                                           |\n| `setup_commands`      | `string[]` | `[]`                              | Commands to run in a new worktree after creation (e.g. `["npm install"]`)                                                                                                 |\n| `teardown_commands`   | `string[]` | `[]`                              | Commands to run in a worktree just before it is deleted (e.g. `["docker compose down -v"]`); on failure you are prompted whether to delete anyway                         |\n| `ide`                 | `string`   | `"zed"`                           | IDE command to open worktrees with                                                                                                                                        |\n| `ide_open_args`       | `string[]` | `["-n"]`                          | Arguments passed to the IDE command                                                                                                                                       |\n| `agent_command`       | `string`   | `"claude"`                        | Base command `wt agent` runs in Zed; `--permission-mode <mode>` is injected (any existing one replaced), then `<plan_prompt>` is appended single-quoted                   |\n| `agent_mode`          | `string`   | `"default"`                       | Default Claude Code permission mode for `wt agent`; the `--mode` flag overrides it. One of `default`, `acceptEdits`, `plan`, `auto`, `dontAsk`, `bypassPermissions`        |\n| `agent_trigger_chord` | `string`   | `"ctrl-shift-cmd-c"`              | Zed keymap chord `wt agent` installs/presses to spawn the agent task                                                                                                      |\n| `auto_refresh_minutes`| `number`   | `5`                               | How often the interactive list (`wt`) re-fetches worktrees and updates the "last refreshed" header; `0` disables auto-refresh                                             |\n| `repos`               | `string[]` | `[]`                              | Registered repo paths (auto-populated on first use)                                                                                                                       |\n| `repo_overrides`      | `object`   | `{}`                              | Per-repo config overrides (see below)                                                                                                                                     |\n\n### Per-repo overrides\n\nOverride any field (`worktree_path`, `base_branch`, `setup_commands`, `teardown_commands`, `ide`, `ide_open_args`, `agent_command`, `agent_mode`, `agent_trigger_chord`, `auto_refresh_minutes`) for a specific repo:\n\n```json\n{\n  "base_branch": "origin/main",\n  "ide": "zed",\n  "repo_overrides": {\n    "/path/to/my-repo": {\n      "base_branch": "origin/develop",\n      "setup_commands": ["npm install", "npm run build"]\n    }\n  }\n}\n```\n\n## Common workflows\n\n### Create a worktree for a new feature\n\n```bash\ncd /path/to/repo\nwt create feature/my-branch\n```\n\n### Configure setup commands for a repo\n\n```bash\nwt config\n# Then add to the JSON:\n# "repo_overrides": {\n#   "/path/to/repo": {\n#     "setup_commands": ["npm install"]\n#   }\n# }\n```\n\n### Browse all worktrees across repos\n\nRun `wt` from any directory outside a git repo to see worktrees from all registered repos.\n');
+}
+export {
+  printSkill
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cestoliv/wt",
-  "version": "0.5.0-pr22.gbb5b3fa",
+  "version": "0.5.0-pr24.g2e0b1ed",
   "description": "Fast, interactive TUI to browse, create, open, and delete git worktrees across repos.",
   "repository": {
     "type": "git",

package/dist/skill-5JFC6Q33.js

@@ -1,9 +0,0 @@
-#!/usr/bin/env node
-
-// src/commands/skill.ts
-function printSkill() {
-  console.log('---\nname: wt-worktree-manager\ndescription: Use the wt CLI to create, browse, open, and delete git worktrees across repos. Use when the user asks to manage worktrees, create isolated branches, or configure worktree defaults.\n---\n\n# wt \u2014 Git Worktree Manager\n\n`wt` is a CLI for managing git worktrees. It provides an interactive TUI to browse, create, open in your IDE, and delete worktrees across multiple repos.\n\n## Commands\n\n### `wt` (no subcommand)\n\nLaunch the interactive TUI. Shows worktrees for the current repo (repo mode) or all registered repos (global mode, when run outside a repo).\n\n**Keybindings in the TUI:**\n\n- Arrow keys \u2014 navigate\n- `Enter` \u2014 open worktree in IDE (exits the TUI)\n- `D` \u2014 delete worktree (the main worktree is tagged `(main)` and cannot be deleted \u2014 only linked worktrees can)\n- `P` \u2014 prune all merged worktrees (per-branch confirmation)\n- `C` \u2014 create a new worktree (works in both repo and global mode)\n- `A` \u2014 create a worktree and start an AI agent in it (works in both modes)\n- type to search \xB7 `Backspace` \u2014 edit search\n- `Q` / `Esc` \u2014 quit\n\n`C` and `A` are step-by-step wizards. In global mode (run from outside a repo /\n"home") they start by prompting for the repo (picker), then the branch; in repo\nmode the repo is fixed so they start at the branch. `A` then adds two more\nsteps:\n\n- `C` \u2014 **worktree (repo \u2192 branch)**\n- `A` \u2014 **worktree (repo \u2192 branch) \u2192 plan prompt \u2192 permission mode**\n\nPressing `Esc` at any step goes back to the previous step (your earlier answers\nare preserved); pressing `Esc` on the first step returns to the list.\n\nAfter a create or agent action the TUI **refreshes and stays open** on the list\n(your search and cursor are preserved) rather than exiting \u2014 only `Enter` (open)\nand `Q`/`Esc` exit.\n\nBecause `a`/`A`, `c`/`C`, `d`/`D`, and `p`/`P` are reserved as command keys,\nthose letters can\'t be typed into the search box.\n\n### `wt create [branch]`\n\nCreate a new worktree. If `branch` is omitted, prompts interactively.\n\nThe worktree is created as a sibling directory to the repo: `<parent>/<repo-name>-<branch-name>`.\n\nAfter creation, `wt` runs any configured `setup_commands` and opens the worktree in your IDE.\n\nIf the worktree path already exists, `wt create` doesn\'t error \u2014 it prompts you\nto **open it in the IDE** or **quit**. (In a non-interactive shell it errors\nwith a non-zero exit instead of prompting.)\n\n### `wt agent <branch> <plan_prompt> [--mode <mode>]`\n\nCreate a worktree (same as `wt create`) **and** auto-start an AI agent in Zed\'s\nintegrated terminal, pre-filled with `<plan_prompt>` and left interactive for\nyou to take over.\n\n```bash\nwt agent feature/login \'Read the codebase, then propose a plan for login.\'\nwt agent feature/fix \'Fix the bug in payment processing\' --mode auto\nwt agent refactor/api \'Refactor the API layer\' --mode default\n```\n\nThe `--mode` flag sets Claude Code\'s permission mode (defaults to `plan`):\n\n- `default` \u2014 Standard interactive mode with approval for each action\n- `acceptEdits` \u2014 Allow file changes but keep command execution controlled\n- `plan` \u2014 Architecture-first mode with no surprise mutations (default)\n- `auto` \u2014 Claude\'s safety model makes decisions instead of prompting\n- `dontAsk` \u2014 Minimal interruptions in trusted environments\n- `bypassPermissions` \u2014 Skip all permission checks (dangerous, CI/sandbox only)\n\nIt writes a temporary `.zed/tasks.json` running\n`<agent_command> --permission-mode <mode> \'<plan_prompt>\'`, ensures a global Zed keymap chord\n(`agent_trigger_chord`) spawns that task, opens Zed, presses the chord via\n`osascript`, then removes the temporary task so the repo is left clean.\n\n**macOS + Zed only.** Requires Accessibility permission for the app that runs\n`wt` (Zed itself, when run from its integrated terminal). If it isn\'t granted,\n`wt agent` opens the _Privacy & Security \u2192 Accessibility_ settings pane and waits\nfor you to grant it and confirm, then retries automatically. On other platforms\n(or when `ide` is not `zed`) the worktree is still created and opened, but the\nagent is not auto-started.\n\nOver SSH it still works, provided the same user has an active graphical login on\nthe Mac: the keystroke is run inside the GUI session via Launch Services\n(`open -a Terminal` briefly flashes a Terminal window). Grant Accessibility to\nTerminal (not Zed) the first time. With no one logged in graphically there is\nnothing to drive, so it falls back to the manual "press the chord in Zed"\nmessage.\n\nIf the worktree path already exists, `wt agent` prompts you to **open it in the\nIDE**, **open it and start the agent**, or **quit** \u2014 instead of erroring. (In a\nnon-interactive shell it errors with a non-zero exit instead of prompting.)\n\n### `wt prune`\n\nRemove every worktree whose branch has already been merged into the base\nbranch (`base_branch`, default `origin/main`). Each candidate is confirmed\nindividually \u2014 and force-confirmed when git refuses (submodules / uncommitted\nchanges), exactly like a manual `d` delete. The branch itself is left intact;\nonly the worktree is removed.\n\n```bash\nwt prune   # review and remove merged worktrees, one prompt per branch\n```\n\nMerge detection is patch-id based (via `git cherry`), so a single-commit branch\nthat was **squash-merged** through a PR is still recognized as merged. It also\nbest-effort fetches the remote first so detection sees up-to-date refs; if the\nbase ref can\'t be resolved (e.g. offline), nothing is removed. Works in repo\nmode (current repo) and global mode (all registered repos, each against its own\n`base_branch`). The TUI exposes the same action under the `p` key.\n\n### `wt config`\n\nOpen the global config file in `$EDITOR` (defaults to `nano`).\n\n```bash\nwt config          # open in editor\nwt config --path   # print config file path only\n```\n\n### `wt skill`\n\nPrint this skill file to stdout. Useful for piping to agents or copying to a project.\n\n## Configuration\n\nConfig is stored as JSON. Get the path with `wt config --path`.\n\n### Schema\n\n| Key                   | Type       | Default                           | Description                                                                                                                                                               |\n| --------------------- | ---------- | --------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |\n| `worktree_path`       | `string`   | `"../"`                           | Where to place new worktrees, relative to the repo root                                                                                                                   |\n| `base_branch`         | `string`   | `"origin/main"`                   | Branch to base new worktrees on                                                                                                                                           |\n| `setup_commands`      | `string[]` | `[]`                              | Commands to run in a new worktree after creation (e.g. `["npm install"]`)                                                                                                 |\n| `teardown_commands`   | `string[]` | `[]`                              | Commands to run in a worktree just before it is deleted (e.g. `["docker compose down -v"]`); on failure you are prompted whether to delete anyway                         |\n| `ide`                 | `string`   | `"zed"`                           | IDE command to open worktrees with                                                                                                                                        |\n| `ide_open_args`       | `string[]` | `["-n"]`                          | Arguments passed to the IDE command                                                                                                                                       |\n| `agent_command`       | `string`   | `"claude --permission-mode plan"` | Base command `wt agent` runs in Zed; any `--permission-mode` flag is replaced by the `--mode` option (defaults to `plan`), then `<plan_prompt>` is appended single-quoted |\n| `agent_trigger_chord` | `string`   | `"ctrl-shift-cmd-c"`              | Zed keymap chord `wt agent` installs/presses to spawn the agent task                                                                                                      |\n| `auto_refresh_minutes`| `number`   | `5`                               | How often the interactive list (`wt`) re-fetches worktrees and updates the "last refreshed" header; `0` disables auto-refresh                                             |\n| `repos`               | `string[]` | `[]`                              | Registered repo paths (auto-populated on first use)                                                                                                                       |\n| `repo_overrides`      | `object`   | `{}`                              | Per-repo config overrides (see below)                                                                                                                                     |\n\n### Per-repo overrides\n\nOverride any field (`worktree_path`, `base_branch`, `setup_commands`, `teardown_commands`, `ide`, `ide_open_args`, `agent_command`, `agent_trigger_chord`, `auto_refresh_minutes`) for a specific repo:\n\n```json\n{\n  "base_branch": "origin/main",\n  "ide": "zed",\n  "repo_overrides": {\n    "/path/to/my-repo": {\n      "base_branch": "origin/develop",\n      "setup_commands": ["npm install", "npm run build"]\n    }\n  }\n}\n```\n\n## Common workflows\n\n### Create a worktree for a new feature\n\n```bash\ncd /path/to/repo\nwt create feature/my-branch\n```\n\n### Configure setup commands for a repo\n\n```bash\nwt config\n# Then add to the JSON:\n# "repo_overrides": {\n#   "/path/to/repo": {\n#     "setup_commands": ["npm install"]\n#   }\n# }\n```\n\n### Browse all worktrees across repos\n\nRun `wt` from any directory outside a git repo to see worktrees from all registered repos.\n');
-}
-export {
-  printSkill
-};