taskplane 0.20.6 → 0.21.1

package/bin/rpc-wrapper.mjs

@@ -331,6 +331,8 @@ function createSessionState() {
 		currentTool: null,
 		error: null,
 		agentEnded: false,
+		/** Authoritative context usage from pi get_session_stats (null if unavailable) */
+		contextUsage: null,
 	};
 }
 
@@ -414,6 +416,10 @@ function applyEvent(state, event) {
 			if (event.success === false && event.error) {
 				state.error = event.error;
 			}
+			// get_session_stats response — extract authoritative contextUsage
+			if (event.success === true && event.data?.contextUsage) {
+				state.contextUsage = event.data.contextUsage;
+			}
 			break;
 		}
 
@@ -455,6 +461,8 @@ function buildExitSummary(state, exitCode, exitSignal, errorOverride, startTime)
 		durationSec,
 		lastToolCall: state.lastToolCall,
 		error: finalError,
+		// Authoritative context usage from pi ≥ 0.63.0 (null if unavailable)
+		contextUsage: state.contextUsage || null,
 	};
 
 	return redactSummary(rawSummary);
@@ -614,6 +622,22 @@ function closeStdin() {
 	}
 }
 
+/**
+ * Query pi for authoritative session stats including contextUsage.
+ * Available in pi ≥ 0.63.0 (RPC get_session_stats exposes contextUsage).
+ * Safe to call on older versions — the command is ignored or returns
+ * without the field, and state.contextUsage stays null.
+ */
+function querySessionStats() {
+	try {
+		if (proc.stdin && !proc.stdin.destroyed) {
+			proc.stdin.write(JSON.stringify({ type: "get_session_stats" }) + "\n");
+		}
+	} catch {
+		// stdin may be closed — ignore
+	}
+}
+
 // ── Route RPC events ─────────────────────────────────────────────────
 
 function handleEvent(event) {
@@ -628,6 +652,13 @@ function handleEvent(event) {
 	// Side effects that depend on the event type (IO, stdin lifecycle, display)
 	switch (event.type) {
 		case "message_end":
+			displayProgress(state);
+			// Query pi for authoritative context usage (pi ≥ 0.63.0).
+			// Falls back gracefully: older pi versions ignore the command
+			// or return a response without contextUsage — state.contextUsage stays null.
+			querySessionStats();
+			break;
+
 		case "tool_execution_start":
 			displayProgress(state);
 			break;

package/bin/taskplane.mjs

@@ -1112,9 +1112,33 @@ async function cmdInit(args) {
 	if (effectiveAlreadyInitialized && resolvedMode === "workspace" && effectiveConfigPath) {
 		const configRepo = path.basename(path.dirname(effectiveConfigPath));
 		const configRepoRoot = path.join(projectRoot, configRepo);
+		// Read existing routing from config repo first, then fall back to
+		// the workspace root's .pi/taskplane-workspace.yaml (which --force may overwrite).
+		// This preserves user's tasks_root and default_repo on reinit.
 		const existingWorkspaceJson = readWorkspaceJson(configRepoRoot);
-		const workspaceTasksRoot = existingWorkspaceJson?.routing?.tasks_root || "taskplane-tasks";
-		const workspaceDefaultRepo = existingWorkspaceJson?.routing?.default_repo || configRepo;
+		const existingRootYaml = (() => {
+			try {
+				const yamlPath = path.join(projectRoot, ".pi", "taskplane-workspace.yaml");
+				if (fs.existsSync(yamlPath)) {
+					const raw = fs.readFileSync(yamlPath, "utf-8");
+					const tasksMatch = raw.match(/tasks_root:\s*"?([^"\n]+)"?/);
+					const defaultMatch = raw.match(/default_repo:\s*"?([^"\n]+)"?/);
+					return {
+						routing: {
+							tasks_root: tasksMatch?.[1]?.trim() || null,
+							default_repo: defaultMatch?.[1]?.trim() || null,
+						},
+					};
+				}
+			} catch {}
+			return null;
+		})();
+		const workspaceTasksRoot = existingWorkspaceJson?.routing?.tasks_root
+			|| existingRootYaml?.routing?.tasks_root
+			|| "taskplane-tasks";
+		const workspaceDefaultRepo = existingWorkspaceJson?.routing?.default_repo
+			|| existingRootYaml?.routing?.default_repo
+			|| configRepo;
 		const workspaceRepoNames = Array.from(
 			new Set([
 				...detection.subRepos,
@@ -1193,6 +1217,15 @@ async function cmdInit(args) {
 			{ skipIfExists: !force, label: ".pi/taskplane-workspace.yaml" },
 		);
 
+		// ── Gitignore enforcement in config repo (Scenario D) ───
+		// Ensure .gitignore exists even when reusing existing config
+		const gitignoreResult = ensureGitignoreEntries(configRepoRoot, { dryRun: false, prefix: ".taskplane/" });
+		if (gitignoreResult.created) {
+			console.log(`  ${c.green}create${c.reset} ${configRepo}/.gitignore`);
+		} else if (gitignoreResult.added.length > 0) {
+			console.log(`  ${c.green}update${c.reset} ${configRepo}/.gitignore (${gitignoreResult.added.length} entries added)`);
+		}
+
 		console.log(`\n${OK} ${c.bold}Workspace pointer created.${c.reset}\n`);
 		console.log(`  Config:  ${c.cyan}${configRepo}/.taskplane/${c.reset}`);
 		console.log(`  Pointer: ${c.cyan}.pi/taskplane-pointer.json${c.reset}`);
@@ -2510,18 +2543,20 @@ function cmdDoctor() {
 	console.log();
 	const hasUnifiedJson = fs.existsSync(path.join(configLocation.root, configLocation.prefix, "taskplane-config.json"));
 	const configFiles = [
-		{ path: "taskplane-config.json", required: false },
-		{ path: "task-runner.yaml", required: !hasUnifiedJson },
-		{ path: "task-orchestrator.yaml", required: !hasUnifiedJson },
-		{ path: "agents/task-worker.md", required: true },
-		{ path: "agents/task-reviewer.md", required: true },
-		{ path: "agents/task-merger.md", required: true },
-		{ path: "agents/supervisor.md", required: false },
-		{ path: "taskplane.json", required: false },
+		{ path: "taskplane-config.json", required: false, hide: false },
+		// YAML configs are legacy fallback — hide when taskplane-config.json exists
+		{ path: "task-runner.yaml", required: !hasUnifiedJson, hide: hasUnifiedJson },
+		{ path: "task-orchestrator.yaml", required: !hasUnifiedJson, hide: hasUnifiedJson },
+		{ path: "agents/task-worker.md", required: true, hide: false },
+		{ path: "agents/task-reviewer.md", required: true, hide: false },
+		{ path: "agents/task-merger.md", required: true, hide: false },
+		// supervisor.md is created by /orch; taskplane.json is created at runtime
+		{ path: "agents/supervisor.md", required: false, hide: true },
+		{ path: "taskplane.json", required: false, hide: true },
 	];
 
 	let missingRequiredConfigs = 0;
-	for (const { path: relPath, required } of configFiles) {
+	for (const { path: relPath, required, hide } of configFiles) {
 		const fullPath = path.join(configLocation.root, configLocation.prefix, relPath);
 		const displayPath = `${configLocation.label}/${relPath}`;
 		const exists = fs.existsSync(fullPath);
@@ -2531,7 +2566,8 @@ function cmdDoctor() {
 			console.log(`  ${FAIL} ${displayPath} missing`);
 			missingRequiredConfigs++;
 			issues++;
-		} else {
+		} else if (!hide) {
+			// Show optional files only when they're relevant (not superseded)
 			console.log(`  ${WARN} ${displayPath} missing ${c.dim}(optional)${c.reset}`);
 		}
 	}

package/extensions/task-runner.ts

@@ -1367,6 +1367,8 @@ interface SidecarTelemetryDelta {
 	lastRetryError: string;
 	/** Whether any sidecar events were parsed in this tick (used for callback gating) */
 	hadEvents: boolean;
+	/** Authoritative context usage from pi get_session_stats (pi ≥ 0.63.0, null if unavailable) */
+	contextUsage: { percentUsed: number; totalTokens: number; maxTokens: number } | null;
 }
 
 /**
@@ -1385,7 +1387,7 @@ function tailSidecarJsonl(filePath: string, tailState: SidecarTailState): Sideca
 		inputTokens: 0, outputTokens: 0, cacheReadTokens: 0, cacheWriteTokens: 0,
 		cost: 0, latestTotalTokens: 0, toolCalls: 0, lastTool: "",
 		retryActive: tailState.retryActive, retriesStarted: 0, lastRetryError: "",
-		hadEvents: false,
+		hadEvents: false, contextUsage: null,
 	};
 
 	// Gracefully handle missing file (wrapper hasn't written yet)
@@ -1496,6 +1498,21 @@ function tailSidecarJsonl(filePath: string, tailState: SidecarTailState): Sideca
 				tailState.retryActive = false;
 				break;
 			}
+
+			case "response": {
+				// get_session_stats response from pi ≥ 0.63.0 — authoritative context usage
+				if (event.success === true && event.data?.contextUsage) {
+					const cu = event.data.contextUsage;
+					if (typeof cu.percentUsed === "number") {
+						delta.contextUsage = {
+							percentUsed: cu.percentUsed,
+							totalTokens: cu.totalTokens || 0,
+							maxTokens: cu.maxTokens || 0,
+						};
+					}
+				}
+				break;
+			}
 		}
 	}
 
@@ -2405,8 +2422,10 @@ export default function (pi: ExtensionAPI) {
 								state.reviewerLastTool = delta.lastTool;
 							}
 
-							// Context %
-							if (delta.latestTotalTokens > 0 && contextWindow > 0) {
+							// Context % — prefer authoritative contextUsage (pi ≥ 0.63.0)
+							if (delta.contextUsage) {
+								state.reviewerContextPct = delta.contextUsage.percentUsed;
+							} else if (delta.latestTotalTokens > 0 && contextWindow > 0) {
 								state.reviewerContextPct = (delta.latestTotalTokens / contextWindow) * 100;
 							}
 
@@ -2566,7 +2585,10 @@ export default function (pi: ExtensionAPI) {
 								state.reviewerCostUsd += delta.cost;
 								state.reviewerToolCount += delta.toolCalls;
 								if (delta.lastTool) state.reviewerLastTool = delta.lastTool;
-								if (delta.latestTotalTokens > 0 && contextWindow > 0) {
+								// Context % — prefer authoritative contextUsage (pi ≥ 0.63.0)
+								if (delta.contextUsage) {
+									state.reviewerContextPct = delta.contextUsage.percentUsed;
+								} else if (delta.latestTotalTokens > 0 && contextWindow > 0) {
 									state.reviewerContextPct = (delta.latestTotalTokens / contextWindow) * 100;
 								}
 								writeLaneState(state);
@@ -3140,18 +3162,24 @@ export default function (pi: ExtensionAPI) {
 						state.workerLastRetryError = delta.lastRetryError;
 					}
 
-					// Context % (same as subprocess onContextPct)
-					// totalTokens is cumulative from the most recent message_end
-					if (delta.latestTotalTokens > 0 && contextWindow > 0) {
-						const pct = (delta.latestTotalTokens / contextWindow) * 100;
-						state.workerContextPct = pct;
-						if (pct >= warnPct) {
-							writeWrapUpSignal(`Wrap up (context ${Math.round(pct)}%)`);
-						}
-						if (pct >= killPct && state.workerStatus === "running") {
-							console.error(`[task-runner] tmux worker: context limit (${Math.round(pct)}%) — killing session '${sessionName}'`);
-							killReason = "context";
-							spawned.kill();
+					// Context % — prefer authoritative contextUsage from pi ≥ 0.63.0,
+					// fall back to manual calculation from totalTokens + cacheRead.
+					{
+						const pct = delta.contextUsage
+							? delta.contextUsage.percentUsed
+							: (delta.latestTotalTokens > 0 && contextWindow > 0)
+								? (delta.latestTotalTokens / contextWindow) * 100
+								: 0;
+						if (pct > 0) {
+							state.workerContextPct = pct;
+							if (pct >= warnPct) {
+								writeWrapUpSignal(`Wrap up (context ${Math.round(pct)}%)`);
+							}
+							if (pct >= killPct && state.workerStatus === "running") {
+								console.error(`[task-runner] tmux worker: context limit (${Math.round(pct)}%) — killing session '${sessionName}'`);
+								killReason = "context";
+								spawned.kill();
+							}
 						}
 					}
 

package/package.json

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