taskplane 0.24.17 → 0.24.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1017,6 +1017,7 @@ export function toOrchestratorConfig(config: TaskplaneConfig): import("./types.t
|
|
|
1017
1017
|
merge: {
|
|
1018
1018
|
model: o.merge.model,
|
|
1019
1019
|
tools: o.merge.tools,
|
|
1020
|
+
thinking: o.merge.thinking,
|
|
1020
1021
|
verify: [...o.merge.verify],
|
|
1021
1022
|
order: o.merge.order,
|
|
1022
1023
|
timeout_minutes: o.merge.timeoutMinutes ?? 90,
|
|
@@ -302,6 +302,8 @@ export interface MergeConfig {
|
|
|
302
302
|
model: string;
|
|
303
303
|
/** Merge-agent tool allowlist */
|
|
304
304
|
tools: string;
|
|
305
|
+
/** Merge-agent thinking mode (empty = inherit session thinking) */
|
|
306
|
+
thinking: string;
|
|
305
307
|
/** Verification commands run after merge operations */
|
|
306
308
|
verify: string[];
|
|
307
309
|
/** Lane merge ordering policy */
|
|
@@ -602,6 +604,7 @@ export const DEFAULT_ORCHESTRATOR_SECTION: OrchestratorSection = {
|
|
|
602
604
|
merge: {
|
|
603
605
|
model: "",
|
|
604
606
|
tools: "read,write,edit,bash,grep,find,ls",
|
|
607
|
+
thinking: "",
|
|
605
608
|
verify: [],
|
|
606
609
|
order: "fewest-files-first",
|
|
607
610
|
timeoutMinutes: 90,
|
|
@@ -129,6 +129,7 @@ export const SECTIONS: SectionDef[] = [
|
|
|
129
129
|
fields: [
|
|
130
130
|
{ configPath: "orchestrator.merge.model", label: "Merge Model", control: "input", layer: "L1+L2", fieldType: "string", prefsKey: "mergeModel", description: "Merge-agent model (inherit = use session model)" },
|
|
131
131
|
{ configPath: "orchestrator.merge.tools", label: "Merge Tools", control: "input", layer: "L1", fieldType: "string", description: "Merge-agent tool allowlist" },
|
|
132
|
+
{ configPath: "orchestrator.merge.thinking", label: "Merge Thinking", control: "input", layer: "L1+L2", fieldType: "string", prefsKey: "mergeThinking", description: "Merge-agent thinking mode (empty = inherit session)" },
|
|
132
133
|
{ configPath: "orchestrator.merge.order", label: "Merge Order", control: "toggle", layer: "L1", fieldType: "enum", values: ["fewest-files-first", "sequential"], description: "Lane merge ordering policy" },
|
|
133
134
|
{ 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)" },
|
|
134
135
|
],
|
|
@@ -37,6 +37,8 @@ export interface OrchestratorConfig {
|
|
|
37
37
|
merge: {
|
|
38
38
|
model: string;
|
|
39
39
|
tools: string;
|
|
40
|
+
/** Merge-agent thinking mode (empty = inherit session thinking) */
|
|
41
|
+
thinking: string;
|
|
40
42
|
verify: string[];
|
|
41
43
|
order: "fewest-files-first" | "sequential";
|
|
42
44
|
/** Merge agent timeout in minutes. Default: 10. Increase for large batches. */
|
|
@@ -280,6 +282,7 @@ export const DEFAULT_ORCHESTRATOR_CONFIG: OrchestratorConfig = {
|
|
|
280
282
|
merge: {
|
|
281
283
|
model: "",
|
|
282
284
|
tools: "read,write,edit,bash,grep,find,ls",
|
|
285
|
+
thinking: "",
|
|
283
286
|
verify: [],
|
|
284
287
|
order: "fewest-files-first",
|
|
285
288
|
timeout_minutes: 90,
|