taskplane 0.1.13 → 0.1.15

package/bin/taskplane.mjs

@@ -212,7 +212,6 @@ orchestrator:
   max_lanes: ${vars.max_lanes}
   worktree_location: "subdirectory"
   worktree_prefix: "${vars.worktree_prefix}"
-  integration_branch: "${vars.integration_branch}"
   batch_id_format: "timestamp"
   spawn_mode: "subprocess"
   tmux_prefix: "${vars.tmux_prefix}"
@@ -291,16 +290,17 @@ async function autoCommitTaskFiles(projectRoot, tasksRoot) {
 	}
 }
 
-function discoverTaskAreaPaths(projectRoot) {
+function discoverTaskAreaMetadata(projectRoot) {
 	const runnerPath = path.join(projectRoot, ".pi", "task-runner.yaml");
-	if (!fs.existsSync(runnerPath)) return [];
+	if (!fs.existsSync(runnerPath)) return { paths: [], contexts: [] };
 
 	const raw = readYaml(runnerPath);
-	if (!raw) return [];
+	if (!raw) return { paths: [], contexts: [] };
 
 	const lines = raw.split(/\r?\n/);
 	let inTaskAreas = false;
 	const paths = new Set();
+	const contexts = new Set();
 
 	for (const line of lines) {
 		const trimmed = line.trim();
@@ -317,13 +317,22 @@ function discoverTaskAreaPaths(projectRoot) {
 			break;
 		}
 
-		const m = line.match(/^\s{4}path:\s*["']?([^"'\n#]+)["']?\s*(?:#.*)?$/);
-		if (m?.[1]) {
-			paths.add(m[1].trim());
+		const pathMatch = line.match(/^\s{4}path:\s*["']?([^"'\n#]+)["']?\s*(?:#.*)?$/);
+		if (pathMatch?.[1]) {
+			paths.add(pathMatch[1].trim());
+		}
+
+		const contextMatch = line.match(/^\s{4}context:\s*["']?([^"'\n#]+)["']?\s*(?:#.*)?$/);
+		if (contextMatch?.[1]) {
+			contexts.add(contextMatch[1].trim());
 		}
 	}
 
-	return [...paths];
+	return { paths: [...paths], contexts: [...contexts] };
+}
+
+function discoverTaskAreaPaths(projectRoot) {
+	return discoverTaskAreaMetadata(projectRoot).paths;
 }
 
 function pruneEmptyDir(dirPath) {
@@ -697,7 +706,6 @@ function getPresetVars(preset, projectRoot, tasksRootOverride = null) {
 	const { test: test_cmd, build: build_cmd } = detectStack(projectRoot);
 	return {
 		project_name: dirName,
-		integration_branch: "main",
 		max_lanes: 3,
 		worktree_prefix: `${slug}-wt`,
 		tmux_prefix: `${slug}-orch`,
@@ -715,7 +723,6 @@ async function getInteractiveVars(projectRoot, tasksRootOverride = null) {
 	const detected = detectStack(projectRoot);
 
 	const project_name = await ask("Project name", dirName);
-	const integration_branch = await ask("Default branch (fallback — orchestrator uses your current branch at runtime)", "main");
 	const max_lanes = parseInt(await ask("Max parallel lanes", "3")) || 3;
 	const tasks_root = tasksRootOverride || await ask("Tasks directory", "taskplane-tasks");
 	const default_area = await ask("Default area name", "general");
@@ -726,7 +733,6 @@ async function getInteractiveVars(projectRoot, tasksRootOverride = null) {
 	const slug = slugify(project_name);
 	return {
 		project_name,
-		integration_branch,
 		max_lanes,
 		worktree_prefix: `${slug}-wt`,
 		tmux_prefix: `${slug}-orch`,
@@ -825,33 +831,25 @@ function cmdDoctor() {
 	}
 
 	// Check task areas from config
-	const runnerYaml = readYaml(path.join(projectRoot, ".pi", "task-runner.yaml"));
-	if (runnerYaml) {
-		// Simple regex extraction of task area paths
-		const pathMatches = [...runnerYaml.matchAll(/^\s+path:\s*"?([^"\n]+)"?/gm)];
-		const contextMatches = [...runnerYaml.matchAll(/^\s+context:\s*"?([^"\n]+)"?/gm)];
-
-		if (pathMatches.length > 0) {
-			console.log();
-			for (const match of pathMatches) {
-				const areaPath = match[1].trim();
-				const exists = fs.existsSync(path.join(projectRoot, areaPath));
-				if (exists) {
-					console.log(`  ${OK} task area path: ${areaPath}`);
-				} else {
-					console.log(`  ${FAIL} task area path: ${areaPath} ${c.dim}(directory not found)${c.reset}`);
-					console.log(`     ${c.dim}→ Run: mkdir -p ${areaPath}${c.reset}`);
-					issues++;
-				}
+	const { paths: taskAreaPaths, contexts: taskAreaContexts } = discoverTaskAreaMetadata(projectRoot);
+	if (taskAreaPaths.length > 0) {
+		console.log();
+		for (const areaPath of taskAreaPaths) {
+			const exists = fs.existsSync(path.join(projectRoot, areaPath));
+			if (exists) {
+				console.log(`  ${OK} task area path: ${areaPath}`);
+			} else {
+				console.log(`  ${FAIL} task area path: ${areaPath} ${c.dim}(directory not found)${c.reset}`);
+				console.log(`     ${c.dim}→ Run: mkdir -p ${areaPath}${c.reset}`);
+				issues++;
 			}
-			for (const match of contextMatches) {
-				const ctxPath = match[1].trim();
-				const exists = fs.existsSync(path.join(projectRoot, ctxPath));
-				if (exists) {
-					console.log(`  ${OK} CONTEXT.md: ${ctxPath}`);
-				} else {
-					console.log(`  ${WARN} CONTEXT.md: ${ctxPath} ${c.dim}(not found)${c.reset}`);
-				}
+		}
+		for (const ctxPath of taskAreaContexts) {
+			const exists = fs.existsSync(path.join(projectRoot, ctxPath));
+			if (exists) {
+				console.log(`  ${OK} CONTEXT.md: ${ctxPath}`);
+			} else {
+				console.log(`  ${WARN} CONTEXT.md: ${ctxPath} ${c.dim}(not found)${c.reset}`);
 			}
 		}
 	}