taskplane 0.2.3 → 0.2.5

package/extensions/taskplane/merge.ts

@@ -78,6 +78,9 @@ export function parseMergeResult(resultPath: string): MergeResult {
 				);
 			}
 
+			// Normalize status to uppercase (merge agents may write lowercase)
+			parsed.status = String(parsed.status).toUpperCase();
+
 			// Validate status value
 			if (!VALID_MERGE_STATUSES.has(parsed.status)) {
 				execLog("merge", "parse", `unknown merge status "${parsed.status}" — treating as BUILD_FAILURE`, {

package/extensions/taskplane/waves.ts

@@ -567,17 +567,11 @@ export function resolveBaseBranch(
 	batchBaseBranch: string,
 	workspaceConfig?: WorkspaceConfig | null,
 ): string {
-	// Step 1: Per-repo default branch from workspace config
-	if (repoId && workspaceConfig) {
-		const repoConfig = workspaceConfig.repos.get(repoId);
-		if (repoConfig?.defaultBranch) {
-			return repoConfig.defaultBranch;
-		}
-	}
-
-	// Step 2: Detect current branch of this specific repo
-	// In repo mode this is the same repo as the batch, so it's equivalent to batchBaseBranch.
-	// In workspace mode this detects the actual HEAD of each repo independently.
+	// Step 1: Detect current branch of this specific repo.
+	// This is the branch the developer is working on — worktrees should
+	// branch from here so task files committed on this branch are visible.
+	// In repo mode this equals batchBaseBranch. In workspace mode this
+	// detects each repo's actual HEAD independently.
 	if (repoId) {
 		const detected = getCurrentBranch(repoRoot);
 		if (detected) {
@@ -585,6 +579,15 @@ export function resolveBaseBranch(
 		}
 	}
 
+	// Step 2: Per-repo default branch from workspace config.
+	// Used when repo HEAD is detached or undetectable.
+	if (repoId && workspaceConfig) {
+		const repoConfig = workspaceConfig.repos.get(repoId);
+		if (repoConfig?.defaultBranch) {
+			return repoConfig.defaultBranch;
+		}
+	}
+
 	// Step 3: Ultimate fallback — batch-level base branch
 	return batchBaseBranch;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "taskplane",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "AI agent orchestration for pi — parallel task execution with checkpoint discipline",
   "keywords": [
     "pi-package",