taskplane 0.24.17 → 0.24.19

package/extensions/taskplane/config-loader.ts

@@ -753,6 +753,7 @@ function extractAllowlistedPreferences(raw: Record<string, any>, prefsPath: stri
 	if (typeof raw.workerModel === "string") prefs.workerModel = raw.workerModel;
 	if (typeof raw.reviewerModel === "string") prefs.reviewerModel = raw.reviewerModel;
 	if (typeof raw.mergeModel === "string") prefs.mergeModel = raw.mergeModel;
+	if (typeof raw.mergeThinking === "string") prefs.mergeThinking = raw.mergeThinking;
 	if (typeof raw.supervisorModel === "string") prefs.supervisorModel = raw.supervisorModel;
 	if (typeof raw.dashboardPort === "number" && Number.isFinite(raw.dashboardPort)) {
 		prefs.dashboardPort = raw.dashboardPort;
@@ -794,6 +795,7 @@ export function applyUserPreferences(config: TaskplaneConfig, prefs: UserPrefere
 	applyStr(prefs.workerModel, (v) => { config.taskRunner.worker.model = v; });
 	applyStr(prefs.reviewerModel, (v) => { config.taskRunner.reviewer.model = v; });
 	applyStr(prefs.mergeModel, (v) => { config.orchestrator.merge.model = v; });
+	applyStr(prefs.mergeThinking, (v) => { config.orchestrator.merge.thinking = v; });
 	applyStr(prefs.supervisorModel, (v) => { config.orchestrator.supervisor.model = v; });
 
 	// spawnMode: enum — apply if defined (not a string-empty check)
@@ -1017,6 +1019,7 @@ export function toOrchestratorConfig(config: TaskplaneConfig): import("./types.t
 		merge: {
 			model: o.merge.model,
 			tools: o.merge.tools,
+			thinking: o.merge.thinking,
 			verify: [...o.merge.verify],
 			order: o.merge.order,
 			timeout_minutes: o.merge.timeoutMinutes ?? 90,

package/extensions/taskplane/config-schema.ts

@@ -302,6 +302,8 @@ export interface MergeConfig {
 	model: string;
 	/** Merge-agent tool allowlist */
 	tools: string;
+	/** Merge-agent thinking mode (empty = inherit session thinking) */
+	thinking: string;
 	/** Verification commands run after merge operations */
 	verify: string[];
 	/** Lane merge ordering policy */
@@ -519,6 +521,8 @@ export interface UserPreferences {
 	reviewerModel?: string;
 	/** Merge model override (overrides orchestrator.merge.model) */
 	mergeModel?: string;
+	/** Merge thinking override (overrides orchestrator.merge.thinking) */
+	mergeThinking?: string;
 	/** Supervisor model override (overrides orchestrator.supervisor.model) (TP-041) */
 	supervisorModel?: string;
 	/** Dashboard port (preferences-only; not yet wired into config schema) */
@@ -602,6 +606,7 @@ export const DEFAULT_ORCHESTRATOR_SECTION: OrchestratorSection = {
 	merge: {
 		model: "",
 		tools: "read,write,edit,bash,grep,find,ls",
+		thinking: "",
 		verify: [],
 		order: "fewest-files-first",
 		timeoutMinutes: 90,

package/extensions/taskplane/merge.ts

@@ -602,6 +602,7 @@ export async function spawnMergeAgentV2(
 		systemPrompt,
 		model: config.merge.model || undefined,
 		tools: config.merge.tools || undefined,
+		thinking: config.merge.thinking || undefined,
 		mailboxDir,
 		eventsPath,
 		exitSummaryPath,

package/extensions/taskplane/settings-tui.ts

@@ -129,6 +129,7 @@ export const SECTIONS: SectionDef[] = [
 		fields: [
 			{ configPath: "orchestrator.merge.model", label: "Merge Model", control: "input", layer: "L1+L2", fieldType: "string", prefsKey: "mergeModel", description: "Merge-agent model (inherit = use session model)" },
 			{ configPath: "orchestrator.merge.tools", label: "Merge Tools", control: "input", layer: "L1", fieldType: "string", description: "Merge-agent tool allowlist" },
+			{ configPath: "orchestrator.merge.thinking", label: "Merge Thinking", control: "input", layer: "L1+L2", fieldType: "string", prefsKey: "mergeThinking", description: "Merge-agent thinking mode (empty = inherit session)" },
 			{ configPath: "orchestrator.merge.order", label: "Merge Order", control: "toggle", layer: "L1", fieldType: "enum", values: ["fewest-files-first", "sequential"], description: "Lane merge ordering policy" },
 			{ configPath: "orchestrator.merge.timeoutMinutes", label: "Merge Timeout (minutes)", control: "input", layer: "L1", fieldType: "number", description: "Max time for merge agent to complete. Increase for large batches (default: 10)" },
 		],

package/extensions/taskplane/types.ts

@@ -37,6 +37,8 @@ export interface OrchestratorConfig {
 	merge: {
 		model: string;
 		tools: string;
+		/** Merge-agent thinking mode (empty = inherit session thinking) */
+		thinking: string;
 		verify: string[];
 		order: "fewest-files-first" | "sequential";
 		/** Merge agent timeout in minutes. Default: 10. Increase for large batches. */
@@ -280,6 +282,7 @@ export const DEFAULT_ORCHESTRATOR_CONFIG: OrchestratorConfig = {
 	merge: {
 		model: "",
 		tools: "read,write,edit,bash,grep,find,ls",
+		thinking: "",
 		verify: [],
 		order: "fewest-files-first",
 		timeout_minutes: 90,

package/package.json

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