@cestoliv/wt 0.2.0 → 0.3.0

package/dist/{agent-PKCZHGN7.js → agent-3N6CSK7A.js}

@@ -3,8 +3,8 @@ import {
   openConfiguredIde,
   prepareWorktree,
   promptExistingWorktree
-} from "./chunk-BYWCGKUP.js";
-import "./chunk-FSARWOCW.js";
+} from "./chunk-B6EPGPXW.js";
+import "./chunk-DKFHAASV.js";
 import "./chunk-IQWENLPW.js";
 
 // src/commands/agent.ts

package/dist/{chunk-BYWCGKUP.js → chunk-B6EPGPXW.js}

@@ -10,8 +10,9 @@ import {
   registerRepo,
   resolveWorktreePath,
   runBranchInput,
-  runRepoPicker
-} from "./chunk-FSARWOCW.js";
+  runRepoPicker,
+  setUpstreamTracking
+} from "./chunk-DKFHAASV.js";
 import {
   createStore,
   getEffectiveConfig
@@ -118,8 +119,8 @@ async function prepareWorktree(branch, options = {}) {
     return { status: "exists", repoRoot, worktreePath, config };
   }
   const parts = config.base_branch.split("/", 2);
+  const remote = parts[0] || "origin";
   if (parts.length === 2) {
-    const remote = parts[0];
     try {
       fetchRemote(repoRoot, remote);
     } catch (err) {
@@ -136,6 +137,7 @@ async function prepareWorktree(branch, options = {}) {
   } else {
     addWorktree(repoRoot, worktreePath, branch, config.base_branch);
   }
+  setUpstreamTracking(worktreePath, branch, remote);
   console.log(pc.green(`\u2713 Created worktree at ${worktreePath}`));
   if (config.setup_commands.length > 0) {
     console.log(pc.dim("Running setup commands..."));

package/dist/{chunk-FSARWOCW.js → chunk-DKFHAASV.js}

@@ -124,6 +124,16 @@ function branchExists(repoRoot, branch) {
     return false;
   }
 }
+function setUpstreamTracking(worktreePath, branch, remote = "origin") {
+  try {
+    execFileSync(
+      "git",
+      ["branch", "--set-upstream-to", `${remote}/${branch}`, branch],
+      { cwd: worktreePath, stdio: "pipe" }
+    );
+  } catch {
+  }
+}
 function fetchRemote(repoRoot, remote = "origin") {
   execFileSync("git", ["fetch", remote], {
     cwd: repoRoot,
@@ -498,6 +508,7 @@ export {
   removeWorktree,
   listWorktreeDirtyFiles,
   branchExists,
+  setUpstreamTracking,
   fetchRemote,
   resolveWorktreePath,
   openIde,

package/dist/cli.js

@@ -3,16 +3,16 @@
 // src/cli.ts
 import { Command } from "commander";
 var program = new Command();
-program.name("wt").description("Git worktree manager").version("0.2.0").action(async () => {
-  const { runList } = await import("./list-7UDMSJOS.js");
+program.name("wt").description("Git worktree manager").version("0.3.0").action(async () => {
+  const { runList } = await import("./list-FOLV77ET.js");
   await runList();
 });
 program.command("create [branch]").description("Create a new worktree").action(async (branch) => {
-  const { createWorktree } = await import("./create-5J5NGGGM.js");
+  const { createWorktree } = await import("./create-5BZUA7QH.js");
   await createWorktree(branch);
 });
 program.command("agent <branch> <plan_prompt>").description("Create a worktree and auto-start an AI agent in Zed (macOS)").action(async (branch, planPrompt) => {
-  const { createAgentWorktree } = await import("./agent-PKCZHGN7.js");
+  const { createAgentWorktree } = await import("./agent-3N6CSK7A.js");
   await createAgentWorktree(branch, planPrompt);
 });
 program.command("config").description("Open the config file in $EDITOR").option("--path", "Print the config file path and exit").action(async (options) => {

package/dist/{create-5J5NGGGM.js → create-5BZUA7QH.js}

@@ -4,8 +4,8 @@ import {
   openConfiguredIde,
   prepareWorktree,
   promptExistingWorktree
-} from "./chunk-BYWCGKUP.js";
-import "./chunk-FSARWOCW.js";
+} from "./chunk-B6EPGPXW.js";
+import "./chunk-DKFHAASV.js";
 import "./chunk-IQWENLPW.js";
 export {
   createWorktree,

package/dist/{list-7UDMSJOS.js → list-FOLV77ET.js}

@@ -8,7 +8,7 @@ import {
   registerRepo,
   removeWorktree,
   runInteractiveList
-} from "./chunk-FSARWOCW.js";
+} from "./chunk-DKFHAASV.js";
 import {
   createStore,
   getEffectiveConfig
@@ -66,6 +66,23 @@ async function runList(options = {}) {
         return true;
       } catch (err) {
         const msg = String(err);
+        if (msg.includes("cannot be moved or removed")) {
+          clack.log.warn(
+            "Worktree contains git submodules, which prevent standard removal."
+          );
+          const force = await clack.confirm({
+            message: `Force delete ${pc.bold(item.branch)}? The worktree directory will be removed directly.`
+          });
+          if (clack.isCancel(force) || !force) return false;
+          try {
+            removeWorktree(item.repoRoot, item.path, true);
+            console.log(pc.green(`\u2713 Force-removed ${item.branch}`));
+            return true;
+          } catch (err2) {
+            console.error(pc.red(`\u2717 Failed to force-remove: ${String(err2)}`));
+            return false;
+          }
+        }
         if (msg.includes("modified or untracked files")) {
           const dirty = listWorktreeDirtyFiles(item.path);
           if (dirty.length > 0) {
@@ -93,7 +110,7 @@ ${dirty.map((f) => `  ${f}`).join("\n")}`
     },
     onCreate: async () => {
       if (repoRoot) {
-        const { createWorktree } = await import("./create-5J5NGGGM.js");
+        const { createWorktree } = await import("./create-5BZUA7QH.js");
         await createWorktree(void 0, { cwd: repoRoot, store });
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cestoliv/wt",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Fast, interactive TUI to browse, create, open, and delete git worktrees across repos.",
   "repository": {
     "type": "git",
@@ -44,6 +44,6 @@
     "tsup": "^8.0.0",
     "tsx": "^4.19.0",
     "typescript": "^5.0.0",
-    "vitest": "^3.0.0"
+    "vitest": "^4.1.0"
   }
 }