taskplane 0.1.13 → 0.1.15

package/extensions/taskplane/execution.ts

@@ -1403,7 +1403,7 @@ export function computeTransitiveDependents(
  *
  * This function checks each wave task's folder for untracked or modified files,
  * stages them, and creates a commit on the current branch. This must run BEFORE
- * allocateLanes() so that worktrees (which are based on the integration branch)
+ * allocateLanes() so that worktrees (which are based on the batch's base branch)
  * include the task files.
  *
  * Only task-specific folders are staged — no other working tree changes are touched.
@@ -1522,6 +1522,7 @@ export function ensureTaskFilesCommitted(
  * @param batchId           - Batch ID for naming
  * @param pauseSignal       - Shared pause signal (mutated by stop-wave policy)
  * @param dependencyGraph   - Dependency graph for computing transitive dependents
+ * @param baseBranch        - Branch to base worktrees on (captured at batch start)
  * @param onMonitorUpdate   - Optional callback for dashboard updates during monitoring
  * @param onLanesAllocated  - Optional callback fired after lane allocation succeeds
  * @returns WaveExecutionResult with outcomes and blocked task IDs
@@ -1535,6 +1536,7 @@ export async function executeWave(
 	batchId: string,
 	pauseSignal: { paused: boolean },
 	dependencyGraph: DependencyGraph,
+	baseBranch: string,
 	onMonitorUpdate?: MonitorUpdateCallback,
 	onLanesAllocated?: (lanes: AllocatedLane[]) => void,
 ): Promise<WaveExecutionResult> {
@@ -1576,7 +1578,7 @@ export async function executeWave(
 	}
 
 	// ── Stage 1: Allocate lanes ──────────────────────────────────
-	const allocResult = allocateLanes(waveTasks, pending, config, repoRoot, batchId);
+	const allocResult = allocateLanes(waveTasks, pending, config, repoRoot, batchId, baseBranch);
 
 	if (!allocResult.success) {
 		const errMsg = allocResult.error?.message || "Unknown allocation failure";

package/extensions/taskplane/git.ts

@@ -1,10 +1,28 @@
-/**
- * Git command runner
- * @module orch/git
- */
-import { execFileSync } from "child_process";
-
-
+/**
+ * Git command runner
+ * @module orch/git
+ */
+import { execFileSync } from "child_process";
+
+
+// ── Branch Helpers ───────────────────────────────────────────────────
+
+/**
+ * Get the current branch name (the branch checked out in the given directory).
+ *
+ * Uses `git rev-parse --abbrev-ref HEAD`. Returns the branch name or null
+ * if HEAD is detached or git fails.
+ *
+ * @param cwd - Working directory (defaults to process.cwd())
+ */
+export function getCurrentBranch(cwd?: string): string | null {
+	const result = runGit(["rev-parse", "--abbrev-ref", "HEAD"], cwd);
+	if (!result.ok || !result.stdout.trim() || result.stdout.trim() === "HEAD") {
+		return null;
+	}
+	return result.stdout.trim();
+}
+
 // ── Git Command Runner ───────────────────────────────────────────────
 
 /**

package/extensions/taskplane/merge.ts

@@ -1,16 +1,16 @@
-/**
- * Merge orchestration, merge agents, merge worktree
- * @module orch/merge
- */
-import { readFileSync, writeFileSync, existsSync, unlinkSync } from "fs";
-import { spawnSync } from "child_process";
-import { join } from "path";
-
-import { buildLaneEnvVars, buildTmuxSpawnArgs, execLog, tmuxHasSession, tmuxKillSession, toTmuxPath } from "./execution.ts";
-import { MERGE_POLL_INTERVAL_MS, MERGE_RESULT_GRACE_MS, MERGE_RESULT_READ_RETRIES, MERGE_RESULT_READ_RETRY_DELAY_MS, MERGE_SPAWN_RETRY_MAX, MERGE_TIMEOUT_MS, MergeError, VALID_MERGE_STATUSES } from "./types.ts";
-import type { AllocatedLane, LaneExecutionResult, MergeLaneResult, MergeResult, MergeResultStatus, MergeWaveResult, OrchestratorConfig, WaveExecutionResult } from "./types.ts";
-import { sleepSync } from "./worktree.ts";
-
+/**
+ * Merge orchestration, merge agents, merge worktree
+ * @module orch/merge
+ */
+import { readFileSync, writeFileSync, existsSync, unlinkSync } from "fs";
+import { spawnSync } from "child_process";
+import { join } from "path";
+
+import { buildLaneEnvVars, buildTmuxSpawnArgs, execLog, tmuxHasSession, tmuxKillSession, toTmuxPath } from "./execution.ts";
+import { MERGE_POLL_INTERVAL_MS, MERGE_RESULT_GRACE_MS, MERGE_RESULT_READ_RETRIES, MERGE_RESULT_READ_RETRY_DELAY_MS, MERGE_SPAWN_RETRY_MAX, MERGE_TIMEOUT_MS, MergeError, VALID_MERGE_STATUSES } from "./types.ts";
+import type { AllocatedLane, LaneExecutionResult, MergeLaneResult, MergeResult, MergeResultStatus, MergeWaveResult, OrchestratorConfig, WaveExecutionResult } from "./types.ts";
+import { sleepSync } from "./worktree.ts";
+
 // ── Merge Implementation ─────────────────────────────────────────────
 
 /**
@@ -451,7 +451,7 @@ export function waitForMergeResult(
 }
 
 /**
- * Merge a completed wave's lane branches into the integration branch.
+ * Merge a completed wave's lane branches into the base branch.
  *
  * Orchestration flow:
  * 1. Filter to only succeeded lanes (failed lanes are not merged)
@@ -464,7 +464,7 @@ export function waitForMergeResult(
  *    e. Handle result (continue, log, or pause)
  * 4. Return MergeWaveResult
  *
- * Sequential execution is mandatory — the integration branch is a shared
+ * Sequential execution is mandatory — the base branch is a shared
  * resource, and each merge must see the prior merge's result.
  *
  * On CONFLICT_UNRESOLVED or BUILD_FAILURE: stops merging remaining lanes
@@ -479,6 +479,7 @@ export function waitForMergeResult(
  * @param config           - Orchestrator configuration
  * @param repoRoot         - Main repository root
  * @param batchId          - Batch ID for session naming
+ * @param baseBranch       - Branch to merge into (captured at batch start)
  * @returns MergeWaveResult with per-lane outcomes
  */
 export function mergeWave(
@@ -488,10 +489,11 @@ export function mergeWave(
 	config: OrchestratorConfig,
 	repoRoot: string,
 	batchId: string,
+	baseBranch: string,
 ): MergeWaveResult {
 	const startTime = Date.now();
 	const tmuxPrefix = config.orchestrator.tmux_prefix;
-	const targetBranch = config.orchestrator.integration_branch;
+	const targetBranch = baseBranch;
 	const laneResults: MergeLaneResult[] = [];
 
 	// Build lane outcome lookup for merge eligibility checks.