taskplane 0.24.20 → 0.24.21

package/extensions/taskplane/merge.ts

@@ -609,9 +609,20 @@ export async function spawnMergeAgentV2(
 		timeoutMs: (config.merge.timeout_minutes ?? 10) * 60 * 1000,
 		stateRoot: stateRoot ?? repoRoot,
 		packet: null,
-		env: { ORCH_BATCH_ID: bid },
+		env: {
+			ORCH_BATCH_ID: bid,
+			// Isolate merge agent from operator's user preferences to prevent
+			// verification test contamination (e.g., stale reviewerModel pref
+			// overriding schema defaults in deep-equal assertions).
+			PI_CODING_AGENT_DIR: join(sidecarRoot, "runtime", bid, "merge-agent-env"),
+		},
 	};
 
+	// Ensure isolated agent dir exists with empty preferences
+	const isolatedAgentDir = join(sidecarRoot, "runtime", bid, "merge-agent-env", "taskplane");
+	mkdirSync(isolatedAgentDir, { recursive: true });
+	try { writeFileSync(join(isolatedAgentDir, "preferences.json"), "{}\n", { flag: "wx" }); } catch { /* already exists */ }
+
 	const { promise, kill } = spawnAgent(opts);
 
 	// Store the kill handle for external cleanup (pause/abort).

package/extensions/taskplane/settings-tui.ts

@@ -102,7 +102,7 @@ export const SECTIONS: SectionDef[] = [
 			// The user-facing spawn mode setting is under Worker (controls /task behavior).
 			{ configPath: "orchestrator.orchestrator.sessionPrefix", label: "Session Prefix", control: "input", layer: "L1+L2", fieldType: "string", prefsKey: "sessionPrefix", description: "Prefix for orchestrator session names" },
 			{ configPath: "orchestrator.orchestrator.operatorId", label: "Operator ID", control: "input", layer: "L1+L2", fieldType: "string", prefsKey: "operatorId", description: "Operator identifier (empty = auto-detect)" },
-			{ configPath: "orchestrator.orchestrator.integration", label: "Integration", control: "toggle", layer: "L1", fieldType: "enum", values: ["manual", "supervised", "auto"], description: "How completed batches are integrated. manual = user runs /orch-integrate. supervised = supervisor proposes plan, asks confirmation. auto = supervisor executes without asking." },
+			{ configPath: "orchestrator.orchestrator.integration", label: "Integration", control: "picker", layer: "L1", fieldType: "enum", values: ["manual", "supervised", "auto"], description: "How completed batches are integrated. manual = user runs /orch-integrate. supervised = supervisor proposes plan, asks confirmation. auto = supervisor executes without asking." },
 		],
 	},
 	{
@@ -154,7 +154,7 @@ export const SECTIONS: SectionDef[] = [
 		name: "Supervisor",
 		fields: [
 			{ configPath: "orchestrator.supervisor.model", label: "Supervisor Model", control: "input", layer: "L1+L2", fieldType: "string", prefsKey: "supervisorModel", description: "Supervisor model (inherit = use session model)" },
-			{ configPath: "orchestrator.supervisor.autonomy", label: "Autonomy Level", control: "toggle", layer: "L1", fieldType: "enum", values: ["interactive", "supervised", "autonomous"], description: "Recovery action confirmation behavior" },
+			{ configPath: "orchestrator.supervisor.autonomy", label: "Autonomy Level", control: "picker", layer: "L1", fieldType: "enum", values: ["interactive", "supervised", "autonomous"], description: "Recovery action confirmation behavior" },
 		],
 	},
 	{
@@ -1391,6 +1391,14 @@ async function showSectionSettingsLoop(
 				const selected = await pickThinkingMode(ctx, normalizedCurrent);
 				if (selected === undefined) continue;  // Cancelled
 				result.rawValue = selected;
+			} else if (field.control === "picker" && field.values && field.values.length > 0) {
+				// Enum picker: show scrollable list of allowed values
+				const options = field.values.map((v) =>
+					`${v}${v === normalizedCurrent ? "  ✓ current" : ""}`
+				);
+				const selected = await selectScrollable(ctx, field.label, options);
+				if (!selected) continue;  // Cancelled
+				result.rawValue = selected.replace(/\s+✓ current$/, "");
 			} else {
 				const placeholder = currentClean === "(not set)" || currentClean === "(inherit)" ? "" : currentClean;
 

package/package.json

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