cortex-agents 4.0.6 → 4.0.7

package/dist/tools/worktree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worktree.d.ts","sourceRoot":"","sources":["../../src/tools/worktree.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAQvD,KAAK,MAAM,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;AAEpC;;;GAGG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;EA0H1C;AAED,eAAO,MAAM,IAAI;;;;CAiCf,CAAC;AAEH;;;GAGG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM;;;;;;;;;;EA0F1C;AAED,eAAO,MAAM,IAAI;;;;;;;;CAgDf,CAAC"}
+{"version":3,"file":"worktree.d.ts","sourceRoot":"","sources":["../../src/tools/worktree.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AASvD,KAAK,MAAM,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;AAEpC;;;GAGG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;EA0H1C;AAED,eAAO,MAAM,IAAI;;;;CAiCf,CAAC;AAEH;;;GAGG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM;;;;;;;;;;EAyG1C;AAED,eAAO,MAAM,IAAI;;;;;;;;CAgDf,CAAC"}

package/dist/tools/worktree.js

@@ -2,6 +2,7 @@ import { tool } from "@opencode-ai/plugin";
 import * as fs from "fs";
 import * as path from "path";
 import { git } from "../utils/shell.js";
+import { detectWorktreeInfo } from "../utils/worktree-detect.js";
 const WORKTREE_ROOT = ".worktrees";
 /**
  * Factory function that creates the worktree_create tool with access
@@ -175,7 +176,20 @@ export function createRemove(client) {
         },
         async execute(args, context) {
             const { name, deleteBranch = false } = args;
-            const worktreePath = path.join(context.worktree, WORKTREE_ROOT, name);
+            // Resolve the main repo root — if we're inside a worktree, context.worktree
+            // points to the worktree itself, not the main repo. We need the main repo
+            // to construct the correct .worktrees/ path and to run git commands from outside.
+            let mainRepoRoot = context.worktree;
+            try {
+                const info = await detectWorktreeInfo(context.worktree);
+                if (info.isWorktree && info.mainWorktreePath) {
+                    mainRepoRoot = info.mainWorktreePath;
+                }
+            }
+            catch {
+                // Fall back to context.worktree
+            }
+            const worktreePath = path.join(mainRepoRoot, WORKTREE_ROOT, name);
             const absoluteWorktreePath = path.resolve(worktreePath);
             // Check if worktree exists
             if (!fs.existsSync(absoluteWorktreePath)) {
@@ -192,14 +206,15 @@ Use worktree_list to see existing worktrees.`;
             catch {
                 // Ignore error, branch detection is optional
             }
-            // Remove the worktree
+            // Remove the worktree — must run from the main repo, not from inside
+            // the worktree being removed (git rejects that).
             try {
-                await git(context.worktree, "worktree", "remove", absoluteWorktreePath);
+                await git(mainRepoRoot, "worktree", "remove", absoluteWorktreePath);
             }
             catch {
                 // Try force remove if there are changes
                 try {
-                    await git(context.worktree, "worktree", "remove", "--force", absoluteWorktreePath);
+                    await git(mainRepoRoot, "worktree", "remove", "--force", absoluteWorktreePath);
                 }
                 catch (error2) {
                     try {
@@ -224,7 +239,7 @@ The worktree may have uncommitted changes. Commit or stash them first.`;
             // Delete branch if requested
             if (deleteBranch && branchName) {
                 try {
-                    await git(context.worktree, "branch", "-d", branchName);
+                    await git(mainRepoRoot, "branch", "-d", branchName);
                     output += `\n\u2713 Deleted branch ${branchName}`;
                 }
                 catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cortex-agents",
-  "version": "4.0.6",
+  "version": "4.0.7",
   "description": "Supercharge OpenCode with structured workflows, intelligent agents, and automated development practices",
   "type": "module",
   "main": "dist/index.js",