taskplane 0.1.13 → 0.1.15

package/extensions/taskplane/worktree.ts

@@ -1103,8 +1103,9 @@ export function escapeRegex(str: string): string {
  *
  * @param count    - Number of worktrees to create (1-indexed: lane 1..count)
  * @param batchId  - Batch ID timestamp for branch naming
- * @param config   - Orchestrator config (prefix, baseBranch extracted from it)
+ * @param config   - Orchestrator config (prefix extracted from it)
  * @param repoRoot - Absolute path to the main repository root
+ * @param baseBranch - Branch to base worktrees on (captured at batch start)
  * @returns        - CreateLaneWorktreesResult with success flag and details
  */
 export function createLaneWorktrees(
@@ -1112,9 +1113,9 @@ export function createLaneWorktrees(
 	batchId: string,
 	config: OrchestratorConfig,
 	repoRoot: string,
+	baseBranch: string,
 ): CreateLaneWorktreesResult {
 	const prefix = config.orchestrator.worktree_prefix;
-	const baseBranch = config.orchestrator.integration_branch;
 	const created: WorktreeInfo[] = [];
 	const errors: BulkWorktreeError[] = [];
 
@@ -1175,7 +1176,7 @@ export function createLaneWorktrees(
  * Ensure required lane worktrees exist for the current wave.
  *
  * Reuses existing worktrees when present (multi-wave behavior), resetting
- * them to integration HEAD before use, and only creates missing lanes.
+ * them to the base branch HEAD before use, and only creates missing lanes.
  * If creation of a missing lane fails, newly-created lanes in this call are
  * rolled back.
  *
@@ -1187,9 +1188,9 @@ export function ensureLaneWorktrees(
 	batchId: string,
 	config: OrchestratorConfig,
 	repoRoot: string,
+	baseBranch: string,
 ): CreateLaneWorktreesResult {
 	const prefix = config.orchestrator.worktree_prefix;
-	const baseBranch = config.orchestrator.integration_branch;
 
 	const existing = listWorktrees(prefix, repoRoot);
 	const existingByLane = new Map<number, WorktreeInfo>();
@@ -1205,7 +1206,7 @@ export function ensureLaneWorktrees(
 	for (const lane of needed) {
 		const reused = existingByLane.get(lane);
 		if (reused) {
-			// Reused worktrees must be reset to integration branch HEAD before use.
+			// Reused worktrees must be reset to base branch HEAD before use.
 			// This covers normal multi-wave reuse and stale leftovers from prior batches.
 			const resetResult = safeResetWorktree(reused, baseBranch, repoRoot);
 			if (resetResult.success) {

package/package.json

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

package/templates/config/task-orchestrator.yaml

@@ -1,89 +1,86 @@
-# ═══════════════════════════════════════════════════════════════════════
-# Parallel Task Orchestrator Configuration
-# ═══════════════════════════════════════════════════════════════════════
-#
-# Copy this file to `.pi/task-orchestrator.yaml` in your project and
-# customize it. The orchestrator reads BOTH this file and task-runner.yaml.
-#
-#   - task-runner.yaml        → task areas, reference docs, worker/reviewer
-#   - task-orchestrator.yaml  → lane count, worktrees, merge, failure policy
-#
-# This template is intentionally conservative so it is safe to adapt to a
-# wide range of repositories.
-# ═══════════════════════════════════════════════════════════════════════
-
-# ── Orchestrator Core ─────────────────────────────────────────────────
-
-orchestrator:
-  # Maximum parallel lanes (worktrees)
-  max_lanes: 3
-
-  # Where to create worktree directories.
-  # "sibling"       = ../{prefix}-{N}          (e.g. ../project-wt-1)
-  # "subdirectory"  = .worktrees/{prefix}-{N}  (e.g. .worktrees/project-wt-1)
-  worktree_location: "subdirectory"
-  worktree_prefix: "project-wt"
-
-  # Integration branch that lanes merge into.
-  integration_branch: "main"
-
-  # Batch ID format used in branch names and logs.
-  batch_id_format: "timestamp"
-
-  # "tmux" = named sessions you can attach to
-  # "subprocess" = headless execution without tmux dependency
-  spawn_mode: "subprocess"
-
-  # Prefix for TMUX session names when tmux mode is enabled.
-  tmux_prefix: "orch"
-
-# ── Dependency Analysis ───────────────────────────────────────────────
-
-dependencies:
-  # "prompt" = parse dependencies from PROMPT.md
-  # "agent"  = use an agent to analyze tasks
-  source: "prompt"
-  cache: true
-
-# ── Lane Assignment ───────────────────────────────────────────────────
-
-assignment:
-  strategy: "affinity-first"
-  size_weights:
-    S: 1
-    M: 2
-    L: 4
-
-# ── Pre-warming ───────────────────────────────────────────────────────
-
-# Disabled by default. Add commands that fit your stack if you want to use it.
-pre_warm:
-  auto_detect: false
-  commands: {}
-  always: []
-
-# ── Merge ─────────────────────────────────────────────────────────────
-
-merge:
-  model: ""                    # empty = inherit from parent pi session
-  tools: "read,write,edit,bash,grep,find,ls"
-
-  # Verification commands to run after each merge.
-  # Add only the commands that are safe and relevant for your project.
-  verify: []
-
-  order: "fewest-files-first"
-
-# ── Failure Handling ──────────────────────────────────────────────────
-
-failure:
-  on_task_failure: "skip-dependents"
-  on_merge_failure: "pause"
-  stall_timeout: 30
-  max_worker_minutes: 30
-  abort_grace_period: 60
-
-# ── Monitoring ────────────────────────────────────────────────────────
-
-monitoring:
-  poll_interval: 5
+# ═══════════════════════════════════════════════════════════════════════
+# Parallel Task Orchestrator Configuration
+# ═══════════════════════════════════════════════════════════════════════
+#
+# Copy this file to `.pi/task-orchestrator.yaml` in your project and
+# customize it. The orchestrator reads BOTH this file and task-runner.yaml.
+#
+#   - task-runner.yaml        → task areas, reference docs, worker/reviewer
+#   - task-orchestrator.yaml  → lane count, worktrees, merge, failure policy
+#
+# This template is intentionally conservative so it is safe to adapt to a
+# wide range of repositories.
+# ═══════════════════════════════════════════════════════════════════════
+
+# ── Orchestrator Core ─────────────────────────────────────────────────
+
+orchestrator:
+  # Maximum parallel lanes (worktrees)
+  max_lanes: 3
+
+  # Where to create worktree directories.
+  # "sibling"       = ../{prefix}-{N}          (e.g. ../project-wt-1)
+  # "subdirectory"  = .worktrees/{prefix}-{N}  (e.g. .worktrees/project-wt-1)
+  worktree_location: "subdirectory"
+  worktree_prefix: "project-wt"
+
+  # Batch ID format used in branch names and logs.
+  batch_id_format: "timestamp"
+
+  # "tmux" = named sessions you can attach to
+  # "subprocess" = headless execution without tmux dependency
+  spawn_mode: "subprocess"
+
+  # Prefix for TMUX session names when tmux mode is enabled.
+  tmux_prefix: "orch"
+
+# ── Dependency Analysis ───────────────────────────────────────────────
+
+dependencies:
+  # "prompt" = parse dependencies from PROMPT.md
+  # "agent"  = use an agent to analyze tasks
+  source: "prompt"
+  cache: true
+
+# ── Lane Assignment ───────────────────────────────────────────────────
+
+assignment:
+  strategy: "affinity-first"
+  size_weights:
+    S: 1
+    M: 2
+    L: 4
+
+# ── Pre-warming ───────────────────────────────────────────────────────
+
+# Disabled by default. Add commands that fit your stack if you want to use it.
+pre_warm:
+  auto_detect: false
+  commands: {}
+  always: []
+
+# ── Merge ─────────────────────────────────────────────────────────────
+
+merge:
+  model: ""                    # empty = inherit from parent pi session
+  tools: "read,write,edit,bash,grep,find,ls"
+
+  # Verification commands to run after each merge.
+  # Add only the commands that are safe and relevant for your project.
+  verify: []
+
+  order: "fewest-files-first"
+
+# ── Failure Handling ──────────────────────────────────────────────────
+
+failure:
+  on_task_failure: "skip-dependents"
+  on_merge_failure: "pause"
+  stall_timeout: 30
+  max_worker_minutes: 30
+  abort_grace_period: 60
+
+# ── Monitoring ────────────────────────────────────────────────────────
+
+monitoring:
+  poll_interval: 5

package/templates/config/task-runner.yaml

@@ -1,99 +1,95 @@
-# ═══════════════════════════════════════════════════════════════════════
-# Task Runner Configuration
-# ═══════════════════════════════════════════════════════════════════════
-#
-# Copy this file to `.pi/task-runner.yaml` in your project and customize it.
-# This template is intentionally generic — replace the example paths, test
-# commands, and task areas with ones that fit your repository.
-# ═══════════════════════════════════════════════════════════════════════
-
-# ── Project ───────────────────────────────────────────────────────────
-
-project:
-  name: "Your Project"
-  description: "Short description of your project"
-
-paths:
-  tasks: "tasks"
-  architecture: "docs/architecture.md"
-
-# ── Verification Commands ─────────────────────────────────────────────
-
-# Add the commands your project uses for validation. Keep only the ones
-# that are relevant to your stack.
-testing:
-  commands:
-    test: "npm test"
-    build: "npm run build"
-    lint: "npm run lint"
-
-# ── Standards ─────────────────────────────────────────────────────────
-
-standards:
-  docs:
-    - "README.md"
-    - "CONTRIBUTING.md"
-  rules:
-    - "Keep changes scoped to the task"
-    - "Update documentation when behavior changes"
-    - "Prefer typed interfaces over unstructured data"
-    - "Avoid destructive changes unless explicitly requested"
-
-# Per-area standards overrides. Omit or delete if you do not need them.
-standards_overrides: {}
-
-# ── Runner Settings ───────────────────────────────────────────────────
-
-worker:
-  model: ""                    # empty = inherit from parent pi session
-  tools: "read,write,edit,bash,grep,find,ls"
-  thinking: "off"
-  # spawn_mode: "subprocess"   # "subprocess" (default) or "tmux"
-  # tmux_prefix: "task"        # used only in tmux mode
-
-reviewer:
-  model: ""
-  tools: "read,write,bash,grep,find,ls"
-  thinking: "off"
-
-context:
-  worker_context_window: 200000
-  warn_percent: 70
-  kill_percent: 85
-  max_worker_iterations: 20
-  max_review_cycles: 2
-  no_progress_limit: 3
-  # max_worker_minutes: 30      # used only in tmux mode
-
-# ── Task Creation / Discovery ─────────────────────────────────────────
-
-# Define the task areas that exist in your project.
-task_areas:
-  core:
-    path: "tasks/core"
-    prefix: "CORE"
-    context: "tasks/core/CONTEXT.md"
-  docs:
-    path: "tasks/docs"
-    prefix: "DOC"
-    context: "tasks/docs/CONTEXT.md"
-
-# Reference docs available for higher-context task prompts.
-reference_docs:
-  overview: "README.md"
-  architecture: "docs/architecture.md"
-  contributing: "CONTRIBUTING.md"
-
-# Docs that should never be loaded during task execution.
-never_load:
-  - "PROGRESS.md"
-  - "HANDOFF-LOG.md"
-
-# Self-documentation targets (where agents should log useful discoveries).
-self_doc_targets:
-  tech_debt: "CONTEXT.md ## Technical Debt / Future Work"
-
-# Docs requiring explicit user approval to modify.
-protected_docs:
-  - "docs/"
-  - "templates/"
+# ═══════════════════════════════════════════════════════════════════════
+# Task Runner Configuration
+# ═══════════════════════════════════════════════════════════════════════
+#
+# Copy this file to `.pi/task-runner.yaml` in your project and customize it.
+# This template is intentionally generic — replace the example paths, test
+# commands, and task areas with ones that fit your repository.
+# ═══════════════════════════════════════════════════════════════════════
+
+# ── Project ───────────────────────────────────────────────────────────
+
+project:
+  name: "Your Project"
+  description: "Short description of your project"
+
+paths:
+  tasks: "tasks"
+  architecture: "docs/architecture.md"
+
+# ── Verification Commands ─────────────────────────────────────────────
+
+# Add the commands your project uses for validation. Keep only the ones
+# that are relevant to your stack.
+testing:
+  commands:
+    test: "npm test"
+    build: "npm run build"
+    lint: "npm run lint"
+
+# ── Standards ─────────────────────────────────────────────────────────
+
+standards:
+  docs:
+    - "README.md"
+    - "CONTRIBUTING.md"
+  rules:
+    - "Keep changes scoped to the task"
+    - "Update documentation when behavior changes"
+    - "Prefer typed interfaces over unstructured data"
+    - "Avoid destructive changes unless explicitly requested"
+
+# Per-area standards overrides. Omit or delete if you do not need them.
+standards_overrides: {}
+
+# ── Runner Settings ───────────────────────────────────────────────────
+
+worker:
+  model: ""                    # empty = inherit from parent pi session
+  tools: "read,write,edit,bash,grep,find,ls"
+  thinking: "off"
+  # spawn_mode: "subprocess"   # "subprocess" (default) or "tmux"
+  # tmux_prefix: "task"        # used only in tmux mode
+
+reviewer:
+  model: ""
+  tools: "read,write,bash,grep,find,ls"
+  thinking: "off"
+
+context:
+  worker_context_window: 200000
+  warn_percent: 70
+  kill_percent: 85
+  max_worker_iterations: 20
+  max_review_cycles: 2
+  no_progress_limit: 3
+  # max_worker_minutes: 30      # used only in tmux mode
+
+# ── Task Creation / Discovery ─────────────────────────────────────────
+
+# Define the task areas that exist in your project.
+task_areas:
+  general:
+    path: "taskplane-tasks"
+    prefix: "TP"
+    context: "taskplane-tasks/CONTEXT.md"
+
+# Reference docs available for higher-context task prompts.
+reference_docs:
+  overview: "README.md"
+  architecture: "docs/architecture.md"
+  contributing: "CONTRIBUTING.md"
+
+# Docs that should never be loaded during task execution.
+never_load:
+  - "PROGRESS.md"
+  - "HANDOFF-LOG.md"
+
+# Self-documentation targets (where agents should log useful discoveries).
+self_doc_targets:
+  tech_debt: "CONTEXT.md ## Technical Debt / Future Work"
+
+# Docs requiring explicit user approval to modify.
+protected_docs:
+  - "docs/"
+  - "templates/"