taskplane 0.24.30 → 0.25.0

package/extensions/taskplane/worktree.ts

@@ -2266,6 +2266,120 @@ export function preserveFailedLaneProgress(
 }
 
 
+/**
+ * TP-147: Preserve partial progress for all skipped tasks before cleanup/reset.
+ *
+ * Skipped tasks may have worker commits (STATUS.md updates, partial code)
+ * that would be lost when the worktree is cleaned up. This function saves
+ * their lane branches as task-ID-named saved branches, similar to how
+ * preserveFailedLaneProgress works for failed tasks.
+ *
+ * Unlike failed tasks, skipped-task branches are NOT merged (partial work
+ * could break verification). Instead they are preserved for manual recovery.
+ *
+ * @param allocatedLanes - Lanes from the current/last wave
+ * @param taskOutcomes   - All task outcomes accumulated so far
+ * @param opId           - Operator identifier
+ * @param batchId        - Batch ID
+ * @param resolveRepo    - Callback to resolve repo root and target branch per repoId
+ * @returns PreserveFailedLaneProgressResult with per-task results and preserved branch set
+ */
+export function preserveSkippedLaneProgress(
+	allocatedLanes: AllocatedLane[],
+	taskOutcomes: LaneTaskOutcome[],
+	opId: string,
+	batchId: string,
+	resolveRepo: ResolveRepoContext,
+): PreserveFailedLaneProgressResult {
+	const results: SavePartialProgressResult[] = [];
+	const preservedBranches = new Set<string>();
+	const unsafeBranches = new Set<string>();
+
+	// Build a map: taskId → { laneBranch, repoId } from allocated lanes
+	const taskToLane = new Map<string, { branch: string; repoId?: string }>();
+	for (const lane of allocatedLanes) {
+		for (const allocatedTask of lane.tasks) {
+			taskToLane.set(allocatedTask.taskId, {
+				branch: lane.branch,
+				repoId: lane.repoId,
+			});
+		}
+	}
+
+	// Find skipped tasks
+	const skippedTasks = taskOutcomes.filter(
+		(to) => to.status === "skipped",
+	);
+
+	// Track which lane branches we've already processed (a lane may have
+	// multiple tasks; only save once per branch since all commits are shared)
+	const processedBranches = new Set<string>();
+
+	for (const skippedTask of skippedTasks) {
+		const laneInfo = taskToLane.get(skippedTask.taskId);
+		if (!laneInfo) {
+			results.push({
+				saved: false,
+				commitCount: 0,
+				taskId: skippedTask.taskId,
+				error: "Task not found in allocated lanes",
+			});
+			continue;
+		}
+
+		// Skip if we've already processed this branch
+		if (processedBranches.has(laneInfo.branch)) {
+			continue;
+		}
+		processedBranches.add(laneInfo.branch);
+
+		// Resolve repo-specific target branch and repo root
+		const { repoRoot: perRepoRoot, targetBranch } = resolveRepo(laneInfo.repoId);
+
+		const result = savePartialProgress(
+			laneInfo.branch,
+			targetBranch,
+			opId,
+			skippedTask.taskId,
+			batchId,
+			perRepoRoot,
+			laneInfo.repoId,
+		);
+
+		results.push(result);
+
+		if (result.saved) {
+			preservedBranches.add(result.savedBranch!);
+
+			execLog("partial-progress", skippedTask.taskId,
+				`Task ${skippedTask.taskId} was skipped but has ${result.commitCount} commit(s) of partial progress preserved on branch ${result.savedBranch}`,
+				{
+					laneBranch: laneInfo.branch,
+					savedBranch: result.savedBranch,
+					commitCount: result.commitCount,
+					repoId: laneInfo.repoId ?? "(default)",
+				},
+			);
+		} else if (result.commitCount > 0 || result.error) {
+			unsafeBranches.add(laneInfo.branch);
+
+			execLog("partial-progress", skippedTask.taskId,
+				`WARNING: Failed to preserve partial progress for skipped task ${skippedTask.taskId} ` +
+				`(${result.commitCount} commit(s) at risk on branch "${laneInfo.branch}")`,
+				{
+					laneBranch: laneInfo.branch,
+					commitCount: result.commitCount,
+					error: result.error ?? "unknown",
+					repoId: laneInfo.repoId ?? "(default)",
+				},
+			);
+		}
+	}
+
+	return { results, preservedBranches, unsafeBranches };
+}
+
+
 // ── Stale Branch Cleanup (TP-051) ────────────────────────────────────
 
 /**

package/package.json

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

package/templates/agents/supervisor.md

@@ -152,7 +152,7 @@ Use tools **proactively** when the situation calls for it:
 - Operator asks to run tasks or start a batch → call `orch_start(target="all")` (or a specific area)
 - Operator asks "how's it going?" → call `orch_status()` first, then summarize
 - Batch paused due to a failure you diagnosed and fixed → call `orch_resume()`
-- Batch completed successfully → offer to call `orch_integrate(mode="pr")` or the operator's preferred mode
+- Batch completed successfully → offer to call `orch_integrate()` (fast-forward is default and cleanest; use `mode="merge"` if diverged, `mode="pr"` only if remotes exist and branch is protected)
 - Batch is stuck or failing repeatedly → call `orch_status()` to diagnose, then `orch_abort()` if needed
 - Need to investigate before more tasks launch → call `orch_pause()` first
 

package/templates/agents/task-worker.md

@@ -37,6 +37,13 @@ visibility into your progress. If you batch updates, the dashboard shows
 7. If all steps are complete, update STATUS.md **Status** field to `✅ Complete`
    and **Current Step** to the last step name — this is your final action
 
+## CRITICAL: Do NOT Create .DONE Files
+
+**The `.DONE` file is managed by the runtime, not by you.** Never create,
+write, or touch a `.DONE` file. The lane-runner creates it automatically
+when all segments of your task are complete. If you create `.DONE` early,
+it will cause downstream segments to be skipped and deliverables to be lost.
+
 ## CRITICAL: Never Exit Without Updating STATUS.md
 
 **Every turn MUST end with a tool call.** Do NOT produce a text-only response

package/templates/config/task-orchestrator.yaml

@@ -1,93 +0,0 @@
-# ═══════════════════════════════════════════════════════════════════════
-# 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}-{opId}-{N}          (e.g. ../project-wt-alice-1)
-  # "subdirectory"  = .worktrees/{prefix}-{opId}-{N}  (e.g. .worktrees/project-wt-alice-1)
-  worktree_location: "subdirectory"
-  worktree_prefix: "project-wt"
-
-  # Batch ID format used in branch names and logs.
-  batch_id_format: "timestamp"
-
-  # Runtime V2 execution backend (subprocess-only)
-  spawn_mode: "subprocess"
-
-  # Prefix for orchestrator session names.
-  session_prefix: "orch"
-
-  # Optional operator identifier for team-scale collision resistance.
-  # Auto-detected from OS username if empty. Set explicitly in CI or
-  # when multiple operators share the same machine.
-  # operator_id: ""
-
-# ── 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"
-
-  # Merge agent timeout in minutes. Increase for large batches with many files.
-  timeout_minutes: 90
-
-# ── 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,94 +0,0 @@
-# ═══════════════════════════════════════════════════════════════════════
-# 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: ""                 # empty = inherit from parent pi session
-  # spawn_mode: "subprocess"   # currently supported runtime mode
-
-reviewer:
-  model: ""
-  tools: "read,write,bash,grep,find,ls"
-  thinking: "off"
-
-context:
-  # worker_context_window: 200000  # 0 or omit = auto-detect from model registry; set explicitly to override
-  warn_percent: 85
-  kill_percent: 95
-  max_worker_iterations: 20
-  max_review_cycles: 2
-  no_progress_limit: 3
-  # max_worker_minutes: 30      # optional wall-clock guard for long worker runs
-
-# ── 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/"