cortex-agents 4.0.5 → 4.0.7

package/.opencode/agents/architect.md

@@ -126,24 +126,33 @@ Use `plan_save` with:
 
 **If plan_commit fails** (e.g., nothing to stage), inform the user.
 
-### Step 5: Handoff to Implementation
-**After committing the plan**, offer the user options to proceed. Note the **suggested branch** from plan_commit output.
+### Step 5: Handoff to Implementation (MUST ASK — NEVER skip)
+
+**CRITICAL: You MUST use the question tool to ask the user before creating any branch or worktree. NEVER call `branch_create` or `worktree_create` without explicit user selection. Do NOT assume a choice — always present the options and WAIT for the user's response.**
+
+After committing the plan, use the **question tool** with these exact options:
 
 "Plan committed. Suggested branch: `{suggestedBranch}`. How would you like to proceed?"
 
-1. **Create a worktree (Recommended)** — Create an isolated worktree with the suggested branch, then switch to Implement
-2. **Continue in this session** — Create the branch here, then switch to Implement agent
+1. **Create a worktree (Recommended)** — Isolated copy in `.worktrees/` for parallel development. This is the safest option.
+2. **Create a branch** — Create and switch to `{suggestedBranch}` in this repo
 3. **Stay in Architect mode** — Continue planning or refine the plan
 
-If the user chooses **"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
-- Suggest: "Navigate to the worktree and run OpenCode with the Implement agent to begin implementation"
+**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
+  - Suggest: "Navigate to the worktree and run OpenCode with the Implement agent to begin implementation"
+
+- **User chose "Create a branch"**:
+  - Use `branch_create` with the suggested branch name (type and name from the plan)
+  - This creates and switches to the new branch
+  - Then switch to the Implement agent
 
-If the user chooses **"Continue in this session"**:
-- Use `branch_create` with the suggested branch name (type and name from the plan)
-- This creates and switches to the new branch
-- Then switch to the Implement agent
+- **User chose "Stay in Architect mode"**:
+  - Do NOT create any branch or worktree
+  - Continue in the current session for further planning
 
 ### Step 6: Provide Handoff Context
 If user chooses to switch agents, provide:

package/.opencode/agents/implement.md

@@ -88,37 +88,40 @@ If a plan exists, load it with `plan_load`.
 
 **Suggested branch detection:** If the loaded plan has a `branch` field in its frontmatter (set by `plan_commit`), this is the **suggested branch name** for implementation. The branch may or may not exist yet — `plan_commit` only writes the suggestion, it does not create the branch.
 
-### Step 4: Ask User About Branch Strategy
+### Step 4: Ask User About Branch Strategy (MUST ASK — NEVER skip)
+
+**CRITICAL: You MUST use the question tool to ask the user before creating any branch or worktree. NEVER call `branch_create` or `worktree_create` without explicit user selection. Do NOT assume a choice — always present the options and WAIT for the user's response.**
 
 **If you are already on the suggested branch (it was created during architect handoff):**
 Skip the branch creation prompt entirely — you're already set up. Inform the user:
 "You're on the plan branch `{branch}`. Ready to implement."
 
 **If the plan has a `branch` field BUT the branch doesn't exist yet or you're on a different branch:**
-Offer to create it:
+Use the **question tool** with these options:
 
 "The plan suggests branch `{branch}`. How would you like to proceed?"
 
-Options:
-1. **Create a worktree (Recommended)** — Isolated copy with the suggested branch name
+1. **Create a worktree (Recommended)** — Isolated copy with the suggested branch name. This is the safest option.
 2. **Create the branch here** — Create and switch to `{branch}` in this repo
 3. **Create a different branch** — Use a custom branch name
 4. **Continue here** — Only if you're certain (not recommended on protected branches)
 
 **If no plan exists AND on a protected branch:**
-Use the original prompt:
+Use the **question tool** with these options:
 
 "I'm ready to implement changes. How would you like to proceed?"
 
-Options:
-1. **Create a worktree (Recommended)** - Isolated copy in .worktrees/ for parallel development
-2. **Create a new branch** - Stay in this repo, create feature/bugfix branch
-3. **Continue here** - Only if you're certain (not recommended on protected branches)
+1. **Create a worktree (Recommended)** — Isolated copy in `.worktrees/` for parallel development. This is the safest option.
+2. **Create a new branch** — Stay in this repo, create feature/bugfix branch
+3. **Continue here** — Only if you're certain (not recommended on protected branches)
 
 ### Step 5: Execute Based on Response
-- **Worktree**: Use `worktree_create` with appropriate type and name. Report the worktree path. Continue working in the current session.
-- **Create branch**: Use `branch_create` with the suggested branch name (or custom name)
-- **Continue**: Proceed with caution, warn user about risks
+
+**Only after the user selects an option**, execute the corresponding action:
+
+- **User chose "Worktree"**: Use `worktree_create` with appropriate type and name. Report the worktree path. Continue working in the current session.
+- **User chose "Create branch"**: Use `branch_create` with the suggested branch name (or custom name)
+- **User chose "Continue"**: Proceed with caution, warn user about risks
 
 ### Step 6: REPL Implementation Loop
 

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.5",
+  "version": "4.0.7",
   "description": "Supercharge OpenCode with structured workflows, intelligent agents, and automated development practices",
   "type": "module",
   "main": "dist/index.js",