cortex-agents 4.0.8 → 4.1.0

package/.opencode/agents/architect.md

@@ -23,6 +23,8 @@ tools:
   session_list: true
   branch_status: true
   branch_create: true
+  worktree_create: true
+  worktree_list: true
   docs_list: true
   github_status: true
   github_issues: true
@@ -141,8 +143,9 @@ After committing the plan, use the **question tool** with these exact options:
 **Only after the user selects an option**, execute the corresponding action:
 
 - **User chose "Create a worktree"**:
-  - Use `worktree_create` with `name` derived from the suggested branch slug and `type` from the plan type
-  - Report the worktree path so the user can navigate to it
+  - Use `worktree_create` with `name` derived from the suggested branch slug, `type` from the plan type, and `fromBranch` set to the suggested branch name from `plan_commit`
+  - The tool auto-deduplicates if the branch already exists (appends `-2`, `-3`, etc.)
+  - Report the worktree path and **actual branch name** (may differ from suggestion if deduplicated)
   - Suggest: "Navigate to the worktree and run OpenCode with the Implement agent to begin implementation"
 
 - **User chose "Create a branch"**:
@@ -329,6 +332,8 @@ sequenceDiagram
 - `session_save` - Save session summary
 - `branch_status` - Check current git state
 - `branch_create` - Create a new branch (used during handoff to implementation)
+- `worktree_create` - Create an isolated worktree for parallel development (used during handoff)
+- `worktree_list` - List existing worktrees (check before creating)
 - `github_status` - Check GitHub CLI availability, auth, and detect projects
 - `github_issues` - List/filter GitHub issues for work item selection
 - `github_projects` - List GitHub Project boards and their work items

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;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"}
+{"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;;;;;;;;;;;;;;;;;;;;EAgJ1C;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,7 +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";
+import { detectWorktreeInfo, deduplicateBranch } from "../utils/worktree-detect.js";
 const WORKTREE_ROOT = ".worktrees";
 /**
  * Factory function that creates the worktree_create tool with access
@@ -26,7 +26,9 @@ export function createCreate(client) {
         },
         async execute(args, context) {
             const { name, type, fromBranch } = args;
-            const branchName = fromBranch || `${type}/${name}`;
+            let branchName = fromBranch || `${type}/${name}`;
+            const originalBranch = branchName;
+            let deduplicated = false;
             const worktreePath = path.join(context.worktree, WORKTREE_ROOT, name);
             const absoluteWorktreePath = path.resolve(worktreePath);
             // Check if we're in a git repository
@@ -58,21 +60,30 @@ Use worktree_list to see existing worktrees.`;
                     try {
                         await git(context.worktree, "worktree", "add", "-b", fromBranch, absoluteWorktreePath);
                     }
-                    catch (error2) {
+                    catch {
+                        // Both failed — try deduplication
                         try {
-                            await client.tui.showToast({
-                                body: {
-                                    title: `Worktree: ${name}`,
-                                    message: `Failed to create from branch '${fromBranch}': ${error2.message || error2}`,
-                                    variant: "error",
-                                    duration: 8000,
-                                },
-                            });
+                            const uniqueBranch = await deduplicateBranch(context.worktree, fromBranch);
+                            await git(context.worktree, "worktree", "add", "-b", uniqueBranch, absoluteWorktreePath);
+                            branchName = uniqueBranch;
+                            deduplicated = true;
                         }
-                        catch {
-                            // Toast failure is non-fatal
+                        catch (error3) {
+                            try {
+                                await client.tui.showToast({
+                                    body: {
+                                        title: `Worktree: ${name}`,
+                                        message: `Failed to create from branch '${fromBranch}': ${error3.message || error3}`,
+                                        variant: "error",
+                                        duration: 8000,
+                                    },
+                                });
+                            }
+                            catch {
+                                // Toast failure is non-fatal
+                            }
+                            return `\u2717 Error creating worktree from branch '${fromBranch}': ${error3.message || error3}`;
                         }
-                        return `\u2717 Error creating worktree from branch '${fromBranch}': ${error2.message || error2}`;
                     }
                 }
             }
@@ -86,21 +97,30 @@ Use worktree_list to see existing worktrees.`;
                     try {
                         await git(context.worktree, "worktree", "add", absoluteWorktreePath, branchName);
                     }
-                    catch (error2) {
+                    catch {
+                        // Both failed — try deduplication
                         try {
-                            await client.tui.showToast({
-                                body: {
-                                    title: `Worktree: ${name}`,
-                                    message: `Failed to create: ${error2.message || error2}`,
-                                    variant: "error",
-                                    duration: 8000,
-                                },
-                            });
+                            const uniqueBranch = await deduplicateBranch(context.worktree, branchName);
+                            await git(context.worktree, "worktree", "add", "-b", uniqueBranch, absoluteWorktreePath);
+                            branchName = uniqueBranch;
+                            deduplicated = true;
                         }
-                        catch {
-                            // Toast failure is non-fatal
+                        catch (error3) {
+                            try {
+                                await client.tui.showToast({
+                                    body: {
+                                        title: `Worktree: ${name}`,
+                                        message: `Failed to create: ${error3.message || error3}`,
+                                        variant: "error",
+                                        duration: 8000,
+                                    },
+                                });
+                            }
+                            catch {
+                                // Toast failure is non-fatal
+                            }
+                            return `\u2717 Error creating worktree: ${error3.message || error3}`;
                         }
-                        return `\u2717 Error creating worktree: ${error2.message || error2}`;
                     }
                 }
             }
@@ -119,10 +139,13 @@ Use worktree_list to see existing worktrees.`;
             catch {
                 // Toast failure is non-fatal
             }
+            const dedupeNote = deduplicated
+                ? `\n\nNote: Branch '${originalBranch}' was unavailable. Using '${branchName}' instead.`
+                : "";
             return `\u2713 Created worktree successfully
 
 Branch: ${branchName}${fromLabel}
-Path: ${absoluteWorktreePath}
+Path: ${absoluteWorktreePath}${dedupeNote}
 
 To work in this worktree:
   cd ${absoluteWorktreePath}

package/dist/utils/worktree-detect.d.ts

@@ -1,3 +1,8 @@
+/**
+ * Finds a unique branch name by appending -2, -3, etc. if the base name exists.
+ * Returns the first available candidate from baseName-2 through baseName-10.
+ */
+export declare function deduplicateBranch(cwd: string, baseName: string): Promise<string>;
 /**
  * Information about the current worktree context.
  */

package/dist/utils/worktree-detect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worktree-detect.d.ts","sourceRoot":"","sources":["../../src/utils/worktree-detect.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,qFAAqF;IACrF,UAAU,EAAE,OAAO,CAAC;IACpB,8BAA8B;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,2EAA2E;IAC3E,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC;AAED;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAqC3E"}
+{"version":3,"file":"worktree-detect.d.ts","sourceRoot":"","sources":["../../src/utils/worktree-detect.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAOtF;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,qFAAqF;IACrF,UAAU,EAAE,OAAO,CAAC;IACpB,8BAA8B;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,2EAA2E;IAC3E,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC;AAED;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAqC3E"}

package/dist/utils/worktree-detect.js

@@ -1,5 +1,18 @@
 import * as path from "path";
 import { git } from "./shell.js";
+/**
+ * Finds a unique branch name by appending -2, -3, etc. if the base name exists.
+ * Returns the first available candidate from baseName-2 through baseName-10.
+ */
+export async function deduplicateBranch(cwd, baseName) {
+    for (let i = 2; i <= 10; i++) {
+        const candidate = `${baseName}-${i}`;
+        const { stdout } = await git(cwd, "branch", "--list", candidate);
+        if (!stdout.trim())
+            return candidate;
+    }
+    throw new Error(`Could not find unique branch name after 10 attempts (base: ${baseName})`);
+}
 /**
  * Detect whether the current git directory is a linked worktree.
  *

package/package.json

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