taskplane 0.7.1 → 0.8.0

package/extensions/taskplane/supervisor.ts

@@ -2028,7 +2028,38 @@ When the conversation reaches the config generation phase, create ALL of these
 - \`.gitignore\` entries — add Taskplane working file patterns if not already present
 
 Use conservative creation: check if each file exists before writing. If files
-already exist (partial setup), read and merge rather than overwrite.`;
+already exist (partial setup), read and merge rather than overwrite.
+
+### CRITICAL: Task Area Registration
+
+**Every task folder MUST be registered in \`.pi/taskplane-config.json\` under
+\`taskRunner.taskAreas\`.** Without registration, \`/orch all\` will fail with
+"no task areas configured" — even if the folders and tasks physically exist.
+
+When creating a task folder (e.g., \`taskplane-tasks/\`):
+1. Create the folder and its \`CONTEXT.md\`
+2. Register it in \`.pi/taskplane-config.json\`:
+   \`\`\`json
+   {
+     "taskRunner": {
+       "taskAreas": {
+         "general": {
+           "path": "taskplane-tasks",
+           "prefix": "TP",
+           "context": "taskplane-tasks/CONTEXT.md"
+         }
+       }
+     }
+   }
+   \`\`\`
+3. **Verify** by reading the config back to confirm the area is registered
+
+When creating tasks inside an area, check that the area is registered first.
+If it's not (e.g., operator created the folder manually), register it before
+proceeding.
+
+This also applies when creating tasks later in the conversation — always verify
+the task area is registered in the config before offering to run \`/orch all\`.`;
 			break;
 
 		case "pending-tasks":
@@ -2068,7 +2099,14 @@ Follow the primer's **"Script 6: Batch Planning"** section
 5. **Offer a health check** (Script 7) if the operator prefers to assess
    project state rather than create tasks
 6. **Graceful fallback**: If \`gh\` CLI is unavailable, skip GitHub checks and
-   mention it to the operator — continue with CONTEXT.md and TODO scanning`;
+   mention it to the operator — continue with CONTEXT.md and TODO scanning
+
+### Important: Task Area Verification
+
+Before creating any tasks, verify that the target task area folder is registered
+in \`.pi/taskplane-config.json\` under \`taskRunner.taskAreas\`. If it's missing
+(e.g., the folder exists but was never registered), register it first. Without
+registration, \`/orch all\` will fail with "no task areas configured."`;
 			break;
 
 		case "completed-batch":
@@ -2149,13 +2187,30 @@ Read the relevant script section now before starting the conversation.
 - Summarize what you'll create before writing files — let the operator confirm
 - If the operator says "just give me defaults", do it and move on
 
+## Starting a Batch
+
+When the operator wants to run pending tasks, use the \`/orch all\` command.
+You can invoke it directly — it will seamlessly transition you from conversational
+mode to batch monitoring mode. Examples of operator intent:
+
+- "run the open tasks" → respond with a brief confirmation, then invoke \`/orch all\`
+- "start the batch" → invoke \`/orch all\`
+- "run just the platform tasks" → invoke \`/orch platform\` (with the area name)
+
+Before starting, you may optionally:
+- Show a quick summary of pending tasks and wave plan (\`/orch-plan all\`)
+- Ask for confirmation if the operator's intent was ambiguous
+
+After \`/orch all\` starts, your system prompt will automatically switch to
+batch monitoring mode. You'll have full visibility into wave progress, task
+outcomes, and can handle failures.
+
 ## What You Must NEVER Do
 
-1. Never start a batch execution (that's \`/orch all\` or \`/orch <areas>\`)
-2. Never modify existing code files (only create config/scaffolding)
-3. Never \`git push\` to any remote
-4. Never overwrite existing config files without asking
-5. Never make assumptions about project conventions — detect them
+1. Never modify existing code files (only create config/scaffolding)
+2. Never \`git push\` to any remote
+3. Never overwrite existing config files without asking
+4. Never make assumptions about project conventions — detect them
 `;
 
 	return prompt;
@@ -2252,7 +2307,7 @@ export function freshSupervisorState(): SupervisorState {
  * @returns The resolved Model, or undefined if not found
  * @since TP-041
  */
-function resolveModelFromString(
+export function resolveModelFromString(
 	modelStr: string,
 	ctx: ExtensionContext,
 ): Model<Api> | undefined {
@@ -2504,6 +2559,78 @@ export async function deactivateSupervisor(
 	state.pendingSummaryDeps = null;
 }
 
+/**
+ * Transition the supervisor from batch-monitoring mode back to routing mode.
+ *
+ * Called after a batch completes (or fails/pauses) instead of fully deactivating.
+ * Tears down batch-monitoring infrastructure (lockfile, heartbeat, event tailer)
+ * but keeps the supervisor active with a routing context — so the operator can
+ * continue the conversation (plan next batch, create tasks, integrate, etc.)
+ * without needing to re-invoke `/orch`.
+ *
+ * This enables the continuous workflow:
+ *   /orch → conversation → "run the tasks" → batch runs → batch completes →
+ *   conversation continues → "create more tasks" → "run them" → repeat
+ *
+ * @param pi - The ExtensionAPI instance
+ * @param state - Supervisor state to transition
+ * @param routingContext - The routing context for the new conversational mode
+ *
+ * @since TP-128
+ */
+export async function transitionToRoutingMode(
+	pi: ExtensionAPI,
+	state: SupervisorState,
+	routingContext: SupervisorRoutingContext,
+): Promise<void> {
+	if (!state.active) return;
+
+	// Tear down batch-monitoring infrastructure
+	stopEventTailer(state.eventTailer);
+
+	if (state.heartbeatTimer) {
+		clearInterval(state.heartbeatTimer);
+		state.heartbeatTimer = null;
+	}
+
+	// Remove lockfile (no active batch to protect)
+	if (state.stateRoot && state.lockSessionId) {
+		const currentLock = readLockfile(state.stateRoot);
+		if (!currentLock || currentLock.sessionId === state.lockSessionId) {
+			removeLockfile(state.stateRoot);
+		}
+	}
+	state.lockSessionId = "";
+
+	// Present deferred batch summary if any
+	if (state.pendingSummaryDeps && state.batchStateRef && state.stateRoot) {
+		const deps = state.pendingSummaryDeps;
+		presentBatchSummary(pi, state.batchStateRef, state.stateRoot, deps.opId, deps.diagnostics, deps.mergeResults);
+		state.pendingSummaryDeps = null;
+	}
+
+	// Switch to routing mode — keep supervisor active with new context
+	state.routingContext = routingContext;
+	state.batchId = "";
+	// Keep batchStateRef/orchConfigRef/stateRoot — routing prompt may need them
+	// Keep model override — don't switch models mid-conversation
+
+	// Notify the operator that conversational mode is back
+	pi.sendMessage(
+		{
+			customType: "supervisor-routing-transition",
+			content: [{
+				type: "text",
+				text:
+					`🔀 **Supervisor returning to conversational mode.**\n\n` +
+					routingContext.contextMessage,
+			}],
+			display: `Supervisor — ${routingContext.routingState}`,
+		},
+		{ triggerTurn: true, deliverAs: "nextTurn" },
+	);
+}
+
 /**
  * Register the before_agent_start hook for persistent system prompt injection.
  *
@@ -2956,11 +3083,16 @@ export function startHeartbeat(
 			return;
 		}
 
-		// Update heartbeat
+		// Update heartbeat (and refresh batchId if it was initially unknown)
 		try {
 			const lock = readLockfile(stateRoot);
 			if (lock && lock.sessionId === sessionId) {
 				lock.heartbeat = new Date().toISOString();
+				// TP-130: batchId may have been "(initializing)" at lock creation
+				// because the batch hadn't started yet. Refresh from live state ref.
+				if (state.batchStateRef?.batchId && lock.batchId !== state.batchStateRef.batchId) {
+					lock.batchId = state.batchStateRef.batchId;
+				}
 				writeLockfile(stateRoot, lock);
 			}
 		} catch {

package/extensions/taskplane/types.ts

@@ -182,7 +182,7 @@ export const DEFAULT_ORCHESTRATOR_CONFIG: OrchestratorConfig = {
 		tools: "read,write,edit,bash,grep,find,ls",
 		verify: [],
 		order: "fewest-files-first",
-		timeout_minutes: 10,
+		timeout_minutes: 90,
 	},
 	failure: {
 		on_task_failure: "skip-dependents",
@@ -1225,7 +1225,7 @@ export class MergeError extends Error {
  * is generous and covers verification (go build) on large codebases.
  */
 /** Default merge agent timeout. Use config.merge.timeout_minutes to override. */
-export const MERGE_TIMEOUT_MS = 10 * 60 * 1000;
+export const MERGE_TIMEOUT_MS = 90 * 60 * 1000;
 
 /**
  * Polling interval for merge result file (ms).
@@ -1736,7 +1736,7 @@ export type MergeRetryLoopOutcome =
  */
 export interface MergeRetryCallbacks {
 	/** Re-invoke mergeWaveByRepo and return the new result */
-	performMerge: () => MergeWaveResult;
+	performMerge: () => MergeWaveResult | Promise<MergeWaveResult>;
 	/** Persist batch state with a trigger label */
 	persist: (trigger: string) => void;
 	/** Log a message */
@@ -1746,7 +1746,7 @@ export interface MergeRetryCallbacks {
 	/** Update the merge result in tracking arrays */
 	updateMergeResult: (result: MergeWaveResult) => void;
 	/** Sleep for cooldown (allows test injection) */
-	sleep: (ms: number) => void;
+	sleep: (ms: number) => void | Promise<void>;
 	/**
 	 * Optional callback fired when a retry attempt is about to be executed.
 	 * Provides the retry decision with classification, attempt count, and cooldown

package/extensions/taskplane/worktree.ts

@@ -598,6 +598,19 @@ export function sleepSync(ms: number): void {
 	}
 }
 
+/**
+ * Async sleep for a given number of milliseconds.
+ *
+ * Unlike `sleepSync`, this yields the event loop so that other async work
+ * (supervisor heartbeats, user input, dashboard updates) can proceed while
+ * waiting. Use this in async code paths such as merge polling.
+ *
+ * @param ms - Milliseconds to sleep
+ */
+export function sleepAsync(ms: number): Promise<void> {
+	return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
 /**
  * Determine if a git worktree remove error is retriable.
  *

package/package.json

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

package/templates/agents/local/task-reviewer.md

@@ -1,7 +1,7 @@
 ---
 name: task-reviewer
 # tools: read,write,bash,grep,find,ls
-# model: openai/gpt-5.3-codex
+# model:
 # standalone: true
 ---
 

package/templates/agents/local/task-worker.md

@@ -1,7 +1,7 @@
 ---
 name: task-worker
 # tools: read,write,edit,bash,grep,find,ls
-# model: anthropic/claude-sonnet-4-20250514
+# model:
 # standalone: true
 ---
 
@@ -13,8 +13,9 @@ name: task-worker
 
   The base prompt (maintained by taskplane) handles:
   - STATUS.md-first workflow and checkpoint discipline
-  - Fresh-context loop behavior and iteration rules
-  - Git commit conventions and .DONE file creation
+  - Multi-step execution (worker handles all remaining steps per invocation)
+  - Iteration recovery (context limit → next invocation resumes from STATUS.md)
+  - Git commit conventions (per-step commits) and .DONE file creation
   - Review response handling
 
   Add project-specific rules below. Common examples: