taskplane 0.24.21 → 0.24.22

package/extensions/taskplane/config-schema.ts

@@ -480,34 +480,25 @@ export interface TaskplaneConfig {
 }
 
 
-// ── User Preferences (Layer 2) ───────────────────────────────────────
+// ── Global Preferences (Layer 2) ─────────────────────────────────────
 
 /**
- * User preferences — personal settings stored per-user.
+ * Global preferences — personal settings stored per-user.
  *
  * File: `~/.pi/agent/taskplane/preferences.json`
  * (or `$PI_CODING_AGENT_DIR/taskplane/preferences.json` if set)
  *
  * These are "Layer 2" fields — they override project config (Layer 1)
  * for user-scoped settings only. The merge is allowlist-based: only
- * the fields defined here can be overridden by user preferences.
+ * the fields defined here can be overridden by global preferences.
  * Unknown keys in the preferences file are silently ignored.
  *
  * Preferences JSON uses camelCase keys matching the runtime config shape.
  *
- * Layer 2 allowlist — preference field → config path:
- *
- * | Preference field   | Config path                          | Type    |
- * |--------------------|--------------------------------------|---------|
- * | operatorId         | orchestrator.orchestrator.operatorId | string  |
- * | sessionPrefix      | orchestrator.orchestrator.sessionPrefix | string  |
- * | spawnMode          | orchestrator.orchestrator.spawnMode  | string  |
- * | workerModel        | taskRunner.worker.model              | string  |
- * | reviewerModel      | taskRunner.reviewer.model            | string  |
- * | mergeModel         | orchestrator.merge.model             | string  |
- * | supervisorModel    | orchestrator.supervisor.model        | string  |
- * | dashboardPort      | (preferences-only; not yet in schema)| number  |
- * | initAgentDefaults  | (preferences-only; used by init UX)  | object  |
+ * Layer 2 allowlist:
+ * - Config-shaped nested overrides (`taskRunner`, `orchestrator`, `workspace`)
+ * - Legacy flat aliases (`workerModel`, `reviewerModel`, etc.) for backward compatibility
+ * - Preferences-only keys (`dashboardPort`, `initAgentDefaults`)
  */
 export interface InitAgentDefaultsPreferences {
 	/** Worker model default for `taskplane init` prompts (empty = inherit) */
@@ -524,42 +515,68 @@ export interface InitAgentDefaultsPreferences {
 	mergeThinking?: string;
 }
 
-export interface UserPreferences {
-	/** Operator identifier (overrides orchestrator.orchestrator.operatorId) */
+export type DeepPartial<T> = T extends Array<infer U>
+	? Array<DeepPartial<U>>
+	: T extends object
+		? { [K in keyof T]?: DeepPartial<T[K]> }
+		: T;
+
+export interface GlobalPreferences {
+	/**
+	 * Global baseline overrides using the same shape as project config.
+	 * All fields are optional and merged deeply into schema defaults.
+	 */
+	taskRunner?: DeepPartial<TaskRunnerSection>;
+	orchestrator?: DeepPartial<OrchestratorSection>;
+	workspace?: DeepPartial<WorkspaceSectionConfig>;
+
+	/** Legacy flat aliases (backward compatibility for existing preferences.json files). */
 	operatorId?: string;
-	/** Orchestrator session prefix (overrides orchestrator.orchestrator.sessionPrefix) */
 	sessionPrefix?: string;
-	/** Spawn mode override (overrides orchestrator.orchestrator.spawnMode). */
 	spawnMode?: "subprocess";
-	/** Worker model override (overrides taskRunner.worker.model) */
 	workerModel?: string;
-	/** Reviewer model override (overrides taskRunner.reviewer.model) */
 	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) */
+
+	/** Preferences-only values (stored globally, not merged into runtime config). */
 	dashboardPort?: number;
 	/** Saved defaults used to pre-populate `taskplane init` model/thinking prompts */
 	initAgentDefaults?: InitAgentDefaultsPreferences;
 }
 
-/** Default (empty) user preferences — all fields undefined means "no override". */
-export const DEFAULT_USER_PREFERENCES: UserPreferences = {};
+/** Default (empty) global preferences — all fields undefined means "no override". */
+export const DEFAULT_GLOBAL_PREFERENCES: GlobalPreferences = {};
+
+/**
+ * Seed values used when first bootstrapping preferences.json.
+ *
+ * Kept separate from DEFAULT_GLOBAL_PREFERENCES so runtime fallback semantics
+ * remain "no override", while first-install scaffolding can provide
+ * user-friendly init defaults.
+ */
+export const DEFAULT_BOOTSTRAP_GLOBAL_PREFERENCES: GlobalPreferences = {
+	initAgentDefaults: {
+		workerModel: "",
+		reviewerModel: "",
+		mergeModel: "",
+		workerThinking: "high",
+		reviewerThinking: "high",
+		mergeThinking: "high",
+	},
+};
 
 /**
- * Canonical filename for user preferences.
+ * Canonical filename for global preferences.
  * Resolved relative to agent directory: `<agentDir>/taskplane/preferences.json`
  */
-export const USER_PREFERENCES_FILENAME = "preferences.json";
+export const GLOBAL_PREFERENCES_FILENAME = "preferences.json";
 
 /**
  * Subdirectory under the agent dir for taskplane preferences.
  */
-export const USER_PREFERENCES_SUBDIR = "taskplane";
+export const GLOBAL_PREFERENCES_SUBDIR = "taskplane";
 
 
 // ── Defaults ─────────────────────────────────────────────────────────
@@ -624,7 +641,7 @@ export const DEFAULT_ORCHESTRATOR_SECTION: OrchestratorSection = {
 	merge: {
 		model: "",
 		tools: "read,write,edit,bash,grep,find,ls",
-		thinking: "",
+		thinking: "off",
 		verify: [],
 		order: "fewest-files-first",
 		timeoutMinutes: 90,

package/extensions/taskplane/merge.ts

@@ -611,7 +611,7 @@ export async function spawnMergeAgentV2(
 		packet: null,
 		env: {
 			ORCH_BATCH_ID: bid,
-			// Isolate merge agent from operator's user preferences to prevent
+			// Isolate merge agent from operator's global 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"),