taskplane 0.1.14 → 0.1.16

package/extensions/taskplane/config.ts

@@ -1,14 +1,14 @@
-/**
- * Config loading from YAML
- * @module orch/config
- */
-import { readFileSync, existsSync } from "fs";
-import { join } from "path";
-import { parse as yamlParse } from "yaml";
-
-import { DEFAULT_ORCHESTRATOR_CONFIG, DEFAULT_TASK_RUNNER_CONFIG } from "./types.ts";
-import type { OrchestratorConfig, TaskArea, TaskRunnerConfig } from "./types.ts";
-
+/**
+ * Config loading from YAML
+ * @module orch/config
+ */
+import { readFileSync, existsSync } from "fs";
+import { join } from "path";
+import { parse as yamlParse } from "yaml";
+
+import { DEFAULT_ORCHESTRATOR_CONFIG, DEFAULT_TASK_RUNNER_CONFIG } from "./types.ts";
+import type { OrchestratorConfig, TaskArea, TaskRunnerConfig } from "./types.ts";
+
 // ── Config Loading ───────────────────────────────────────────────────
 
 /**
@@ -84,11 +84,16 @@ export function loadTaskRunnerConfig(cwd: string): TaskRunnerConfig {
 		if (loaded?.task_areas) {
 			for (const [name, area] of Object.entries(loaded.task_areas)) {
 				const a = area as any;
-				taskAreas[name] = {
+				const ta: TaskArea = {
 					path: a?.path || "",
 					prefix: a?.prefix || "",
 					context: a?.context || "",
 				};
+				// Parse repo_id (snake_case YAML key) into repoId for routing
+				if (a?.repo_id && typeof a.repo_id === "string" && a.repo_id.trim()) {
+					ta.repoId = a.repo_id.trim();
+				}
+				taskAreas[name] = ta;
 			}
 		}
 		return {

package/extensions/taskplane/discovery.ts

@@ -1,12 +1,13 @@
-/**
- * Task discovery, PROMPT.md parsing, dependency resolution
- * @module orch/discovery
- */
-import { readFileSync, writeFileSync, existsSync, readdirSync, statSync } from "fs";
-import { join, dirname, basename, resolve } from "path";
-
-import type { DiscoveryError, DiscoveryResult, ParsedTask, TaskArea } from "./types.ts";
-
+/**
+ * Task discovery, PROMPT.md parsing, dependency resolution
+ * @module orch/discovery
+ */
+import { readFileSync, writeFileSync, existsSync, readdirSync, statSync } from "fs";
+import { join, dirname, basename, resolve } from "path";
+
+import { FATAL_DISCOVERY_CODES } from "./types.ts";
+import type { DiscoveryError, DiscoveryResult, ParsedTask, TaskArea, WorkspaceConfig } from "./types.ts";
+
 // ── PROMPT.md Parsing ────────────────────────────────────────────────
 
 /**
@@ -184,6 +185,54 @@ export function parsePromptForOrchestrator(
 		}
 	}
 
+	// ── Extract execution target (repo ID) ──────────────────────
+	// Repo ID validation: lowercase alphanumeric + hyphens, starting with alnum
+	const REPO_ID_PATTERN = /^[a-z0-9][a-z0-9-]*$/;
+
+	let promptRepoId: string | undefined;
+
+	// Priority 1: Section-based "## Execution Target" with "Repo: <id>" line
+	// Capture everything from section header to the next heading or --- divider.
+	// We avoid \n$ (which in multiline mode matches blank lines) by using a two-pass
+	// approach: find the section start, then slice to the next section boundary.
+	const execTargetHeaderIdx = content.search(/^##\s+Execution Target\s*$/m);
+	let execTargetSectionBody: string | null = null;
+	if (execTargetHeaderIdx !== -1) {
+		const afterHeader = content.indexOf("\n", execTargetHeaderIdx);
+		if (afterHeader !== -1) {
+			const rest = content.slice(afterHeader + 1);
+			const nextSectionMatch = rest.search(/^##\s|^---/m);
+			execTargetSectionBody = nextSectionMatch !== -1
+				? rest.slice(0, nextSectionMatch)
+				: rest;
+		}
+	}
+	if (execTargetSectionBody !== null) {
+		// Match "Repo: api" or "**Repo:** api" or "Repo: api" with whitespace
+		const repoLineMatch = execTargetSectionBody.match(
+			/^\s*\*?\*?Repo:?\*?\*?\s+(\S+)/mi,
+		);
+		if (repoLineMatch) {
+			const candidate = repoLineMatch[1].trim().toLowerCase();
+			if (REPO_ID_PATTERN.test(candidate)) {
+				promptRepoId = candidate;
+			}
+		}
+	}
+
+	// Priority 2 (fallback): Inline "**Repo:** <id>" anywhere in content
+	if (!promptRepoId) {
+		const inlineRepoMatch = content.match(
+			/^\*\*Repo:\*\*\s+(\S+)/m,
+		);
+		if (inlineRepoMatch) {
+			const candidate = inlineRepoMatch[1].trim().toLowerCase();
+			if (REPO_ID_PATTERN.test(candidate)) {
+				promptRepoId = candidate;
+			}
+		}
+	}
+
 	// ── Extract file scope ───────────────────────────────────────
 	const fileScope: string[] = [];
 	const fileScopeMatch = content.match(
@@ -214,12 +263,13 @@ export function parsePromptForOrchestrator(
 			promptPath: resolve(promptPath),
 			areaName,
 			status: "pending",
+			...(promptRepoId ? { promptRepoId } : {}),
 		},
 		error: null,
 	};
 }
 
-
+
 // ── Area Scanning ────────────────────────────────────────────────────
 
 /**
@@ -291,7 +341,7 @@ export function scanAreaForTasks(
 	return { tasks, errors };
 }
 
-
+
 // ── Completed Task Set ───────────────────────────────────────────────
 
 /**
@@ -361,7 +411,7 @@ export function buildCompletedTaskSet(areaPaths: string[]): Set<string> {
 	return completed;
 }
 
-
+
 // ── Argument Resolution ──────────────────────────────────────────────
 
 /**
@@ -440,6 +490,8 @@ export interface DiscoveryOptions {
 	refreshDependencies?: boolean;
 	dependencySource?: "prompt" | "agent";
 	useDependencyCache?: boolean;
+	/** Workspace config for repo routing (null/undefined = repo mode, no routing). */
+	workspaceConfig?: WorkspaceConfig | null;
 }
 
 export interface DependencyCacheFile {
@@ -531,7 +583,7 @@ export function applyDependenciesFromCache(
 	return { applied };
 }
 
-
+
 // ── Task Registry ────────────────────────────────────────────────────
 
 /**
@@ -637,7 +689,7 @@ export function buildTaskRegistry(
 	return { pending, completed, errors };
 }
 
-
+
 // ── Cross-Area Dependency Resolution ─────────────────────────────────
 
 /** Candidate match for a dependency reference found in task areas. */
@@ -806,7 +858,93 @@ export function resolveDependencies(
 	return errors;
 }
 
-
+
+// ── Task-to-Repo Routing ─────────────────────────────────────────────
+
+/** Repo ID validation: lowercase alphanumeric + hyphens, starting with alnum */
+const ROUTING_REPO_ID_PATTERN = /^[a-z0-9][a-z0-9-]*$/;
+
+/**
+ * Resolve the target repo for each discovered task using the routing
+ * precedence chain:
+ *
+ *   1. `task.promptRepoId` — declared in PROMPT.md metadata
+ *   2. `taskArea.repoId` — area-level config from task-runner.yaml
+ *   3. `workspaceConfig.routing.defaultRepo` — workspace-level default
+ *
+ * Only applied in workspace mode (when `workspaceConfig` is provided).
+ * In repo mode this function is never called.
+ *
+ * Returns an array of DiscoveryError for routing failures:
+ *   - TASK_REPO_UNRESOLVED: no source provided a repo ID
+ *   - TASK_REPO_UNKNOWN: resolved repo ID is not in workspace repos map
+ */
+export function resolveTaskRouting(
+	discovery: DiscoveryResult,
+	taskAreas: Record<string, TaskArea>,
+	workspaceConfig: WorkspaceConfig,
+): DiscoveryError[] {
+	const errors: DiscoveryError[] = [];
+	const validRepoIds = workspaceConfig.repos;
+
+	for (const task of discovery.pending.values()) {
+		// Precedence 1: prompt-declared repo
+		let resolvedId = task.promptRepoId;
+		let source = "prompt";
+
+		// Precedence 2: area-level repo
+		if (!resolvedId) {
+			const area = taskAreas[task.areaName];
+			if (area?.repoId) {
+				const candidate = area.repoId.trim().toLowerCase();
+				if (ROUTING_REPO_ID_PATTERN.test(candidate)) {
+					resolvedId = candidate;
+					source = "area";
+				}
+			}
+		}
+
+		// Precedence 3: workspace default repo
+		if (!resolvedId) {
+			resolvedId = workspaceConfig.routing.defaultRepo;
+			source = "default";
+		}
+
+		// Validate resolution
+		if (!resolvedId) {
+			errors.push({
+				code: "TASK_REPO_UNRESOLVED",
+				message:
+					`Task ${task.taskId} has no resolved repo. ` +
+					`Add a Repo: field to the PROMPT, set repo_id on area "${task.areaName}", ` +
+					`or set routing.default_repo in the workspace config.`,
+				taskId: task.taskId,
+				taskPath: task.promptPath,
+			});
+			continue;
+		}
+
+		if (!validRepoIds.has(resolvedId)) {
+			errors.push({
+				code: "TASK_REPO_UNKNOWN",
+				message:
+					`Task ${task.taskId} resolved to repo "${resolvedId}" (via ${source}), ` +
+					`but no repo with that ID exists in the workspace config. ` +
+					`Known repos: ${[...validRepoIds.keys()].join(", ")}`,
+				taskId: task.taskId,
+				taskPath: task.promptPath,
+			});
+			continue;
+		}
+
+		// Attach resolved repo to the task
+		task.resolvedRepoId = resolvedId;
+	}
+
+	return errors;
+}
+
+
 // ── Discovery Pipeline (Public) ──────────────────────────────────────
 
 /**
@@ -901,6 +1039,13 @@ export function runDiscovery(
 		}
 	}
 
+	// Step 6: Task-to-repo routing (workspace mode only)
+	const workspaceConfig = options.workspaceConfig;
+	if (workspaceConfig && workspaceConfig.mode === "workspace") {
+		const routingErrors = resolveTaskRouting(discovery, taskAreas, workspaceConfig);
+		discovery.errors.push(...routingErrors);
+	}
+
 	return discovery;
 }
 
@@ -939,8 +1084,12 @@ export function formatDiscoveryResults(result: DiscoveryResult): string {
 					task.dependencies.length > 0
 						? ` → depends on: ${task.dependencies.join(", ")}`
 						: "";
+				const repo =
+					task.resolvedRepoId
+						? ` → repo: ${task.resolvedRepoId}`
+						: "";
 				lines.push(
-					`    ${task.taskId} [${task.size}] ${task.taskName}${deps}`,
+					`    ${task.taskId} [${task.size}] ${task.taskName}${deps}${repo}`,
 				);
 			}
 		}
@@ -949,22 +1098,9 @@ export function formatDiscoveryResults(result: DiscoveryResult): string {
 
 	// Show errors
 	if (result.errors.length > 0) {
-		const fatalErrors = result.errors.filter(
-			(e) =>
-				e.code === "DUPLICATE_ID" ||
-				e.code === "DEP_UNRESOLVED" ||
-				e.code === "DEP_PENDING" ||
-				e.code === "DEP_AMBIGUOUS" ||
-				e.code === "PARSE_MISSING_ID",
-		);
-		const warnings = result.errors.filter(
-			(e) =>
-				e.code !== "DUPLICATE_ID" &&
-				e.code !== "DEP_UNRESOLVED" &&
-				e.code !== "DEP_PENDING" &&
-				e.code !== "DEP_AMBIGUOUS" &&
-				e.code !== "PARSE_MISSING_ID",
-		);
+		const fatalCodes = new Set<string>(FATAL_DISCOVERY_CODES);
+		const fatalErrors = result.errors.filter((e) => fatalCodes.has(e.code));
+		const warnings = result.errors.filter((e) => !fatalCodes.has(e.code));
 
 		if (fatalErrors.length > 0) {
 			lines.push("❌ Errors:");