pi-cockpit 0.7.0 → 0.9.0

package/README.md

@@ -2,7 +2,7 @@
 
 A responsive **agent cockpit** for [Pi](https://pi.dev): wide terminals get a docked Maestro operations sidebar, narrow terminals automatically fall back to the existing Todo and Agent widgets, and every layout keeps the Starship-style footer.
 
-It is the third plugin of the `pi-maestro-flow` project (alongside `pi-maestro-flow` and `pi-maestro-teammate`). It is installed and registered with `pi-maestro-flow`, but it also runs standalone. Current version: **0.5.1**.
+It is the third plugin of the `pi-maestro-flow` project (alongside `pi-maestro-flow` and `pi-maestro-teammate`). It is installed and registered with `pi-maestro-flow`, but it also runs standalone. Current version: **0.8.0**.
 
 The dock is a non-capturing top-right overlay. Cockpit reserves its columns by wrapping the active TUI renderer at runtime, so the Pi workspace reflows instead of rendering underneath it. No Pi source files are modified.
 
@@ -73,6 +73,16 @@ Cockpit has no package dependency on `pi-maestro-flow`. It observes optional pro
     "width": 40,
     "density": "comfortable"
   },
+  "title": {
+    "enabled": true,
+    "showSession": true,
+    "showCwd": false,
+    "showModel": false,
+    "showThinking": false,
+    "showGit": false,
+    "showMaestro": false,
+    "maxLength": 80
+  },
   "theme": ""
 }
 ```
@@ -86,11 +96,24 @@ Cockpit has no package dependency on `pi-maestro-flow`. It observes optional pro
 - `sidebar.width`: persisted dock width, rounded and clamped to `32..56`; default `40`.
 - `sidebar.density`: `"comfortable"` or `"compact"`.
 - `icons.mode`: `"auto"` (detect Nerd Font), `"nerd"`, or `"ascii"`.
+- `title.enabled`: master switch for the terminal tab title (session summary + working state + opt-in tags). On by default.
+- `title.showSession`: include the session summary (the `session_info` name, else a short session id) right after `pi`. On by default.
+- `title.showCwd`: include the working directory after the session. Off by default — the title stays short, since the tab strip has no room for a wall of tags.
+- `title.showModel`: include the active model tag (`m:gpt-5.6-sol`). Off by default.
+- `title.showThinking`: include the thinking level tag (`t:high`); skipped while off. Off by default.
+- `title.showGit`: include the git branch tag (`git:main`, `git:detached`); read synchronously from `.git/HEAD`, so it costs no process spawn. Off by default.
+- `title.showMaestro`: include the Maestro workflow status tag (`wf:running`, `wf:done`). Off by default.
+- `title.maxLength`: hard cap on the composed title; the middle is ellided to keep the head and the working-state tail. Clamped to `20..200`; default `80`.
+- `title.generationModel`: `"provider/model"` (e.g. `"maestro-qwen/qwen3.8-max-preview"`) of a model registered with the `/api-manager` command (or any other provider pi resolves). When set, the session title is generated by that model over the first completed turn (user prompt + assistant reply) through its OpenAI-compatible endpoint, with a 10s timeout. Empty (default) uses the offline rule-based extractor instead. Generation is best-effort — on any failure the title silently falls back to the rule-based one. Editable from the `/cockpit` settings overlay (`z` or cursor to the `title gen model` row, Enter, type, Enter to save; empty clears back to rule-based).
+
+The tab title is `frame + pi - <session> - <working state>`. The session part follows Claude Code's chain (`sessionTitle ?? agentTitle ?? haikuTitle ?? default`): the `/session name` title wins, otherwise the generated title, otherwise a short session id. The frame is Claude Code's title chrome: `⠂`/`⠐` braille spinner while a turn runs, static `✳` when idle; failure replaces it with `✗`. On quit, Cockpit clears the title so no stale tab label lingers (Claude Code's `CLEAR_TERMINAL_TITLE`).
 - `theme`: named theme override; empty string follows the Pi session theme.
 
 ## Commands
 
 - `/cockpit` — opens the settings overlay.
+- `/maestro-settings` — opens the unified settings shell (Cockpit, Flow, Teammate and integrations).
+- `Alt+J` — opens the background Bash jobs overlay (live status, command, cwd, duration, output tail).
 - `/cockpit sidebar` — reports the current sidebar mode, width, and density.
 - `/cockpit sidebar auto|on|off` — selects dock behavior.
 - `/cockpit sidebar resize` or `Ctrl+Shift+R` — enters temporary Resize mode. Left/Right adjusts one column, Shift+Left/Shift+Right adjusts four, Enter accepts, and Escape rolls back. Mouse reporting is active only during Resize mode.

package/package.json

@@ -1,71 +1,75 @@
-{
-  "name": "pi-cockpit",
-  "version": "0.7.0",
-  "description": "Responsive Maestro operations sidebar, fallback status widgets, and footer for Pi.",
-  "type": "module",
-  "keywords": [
-    "pi-package",
-    "pi",
-    "pi-extension",
-    "tui",
-    "teammate",
-    "todo"
-  ],
-  "license": "MIT",
-  "files": [
-    "src/",
-    "themes/",
-    "README.md"
-  ],
-  "scripts": {
-    "test": "node --test --experimental-transform-types tests/config.test.ts tests/public-events.test.ts tests/maestro-store.test.ts tests/split-pane.test.ts tests/sidebar-render.test.ts tests/sidebar-controller.test.ts tests/viewport-stability.test.ts tests/quiet-tools.test.ts tests/agents-store.test.ts tests/bash-bg-store.test.ts tests/bash-bg-widget.test.ts tests/bash-bg-overlay.test.ts tests/todo-store.test.ts tests/render.test.ts tests/footer.test.ts tests/extension-status.test.ts tests/integration-contract.test.ts tests/stack-widget.test.ts tests/settings-view.test.ts tests/thinking-fold.test.ts tests/thinking-timer.test.ts tests/tick-policy.test.ts tests/ambient.test.ts tests/viewport.test.ts tests/theme-picker.test.ts",
-    "typecheck": "tsc --noEmit"
-  },
-  "pi": {
-    "extensions": [
-      "./src/extension/index.ts"
-    ],
-    "themes": [
-      "./themes"
-    ]
-  },
-  "peerDependencies": {
-    "@earendil-works/pi-agent-core": "*",
-    "@earendil-works/pi-ai": "*",
-    "@earendil-works/pi-coding-agent": "*",
-    "@earendil-works/pi-tui": "*",
-    "pi-maestro-teammate": "^1.5.0"
-  },
-  "peerDependenciesMeta": {
-    "@earendil-works/pi-agent-core": {
-      "optional": true
-    },
-    "@earendil-works/pi-ai": {
-      "optional": true
-    },
-    "@earendil-works/pi-coding-agent": {
-      "optional": true
-    },
-    "@earendil-works/pi-tui": {
-      "optional": true
-    },
-    "pi-maestro-teammate": {
-      "optional": true
-    }
-  },
-  "devDependencies": {
-    "@earendil-works/pi-agent-core": "0.82.1",
-    "@earendil-works/pi-ai": "0.82.1",
-    "@earendil-works/pi-coding-agent": "0.82.1",
-    "@earendil-works/pi-tui": "0.82.1",
-    "@types/node": "^22.0.0",
-    "pi-maestro-teammate": "1.5.0",
-    "typescript": "^5.5.0"
-  },
-  "main": "./src/index.ts",
-  "exports": {
-    ".": "./src/index.ts",
-    "./v1/events": "./src/public/v1/events.ts",
-    "./src/*": "./src/*"
-  }
-}
+{
+  "name": "pi-cockpit",
+  "version": "0.9.0",
+  "description": "Responsive Maestro operations sidebar, fallback status widgets, and footer for Pi.",
+  "type": "module",
+  "keywords": [
+    "pi-package",
+    "pi",
+    "pi-extension",
+    "tui",
+    "teammate",
+    "todo"
+  ],
+  "license": "MIT",
+  "files": [
+    "src/",
+    "themes/",
+    "README.md"
+  ],
+  "scripts": {
+    "test": "node --test --experimental-transform-types tests/config.test.ts tests/public-events.test.ts tests/maestro-store.test.ts tests/split-pane.test.ts tests/editor-bottom.test.ts tests/sidebar-render.test.ts tests/sidebar-controller.test.ts tests/viewport-stability.test.ts tests/quiet-tools.test.ts tests/agents-store.test.ts tests/bash-bg-store.test.ts tests/bash-bg-widget.test.ts tests/bash-bg-overlay.test.ts tests/todo-store.test.ts tests/render.test.ts tests/footer.test.ts tests/extension-status.test.ts tests/integration-contract.test.ts tests/stack-widget.test.ts tests/settings-view.test.ts tests/thinking-fold.test.ts tests/thinking-timer.test.ts tests/tick-policy.test.ts tests/ambient.test.ts tests/viewport.test.ts tests/theme-picker.test.ts tests/title-gen.test.ts tests/title-llm.test.ts tests/settings-registry.test.ts tests/settings-coordinator.test.ts tests/settings-locale.test.ts tests/settings-shell.test.ts tests/settings-cockpit-provider.test.ts tests/settings-cross-package.test.ts",
+    "typecheck": "tsc --noEmit"
+  },
+  "pi": {
+    "extensions": [
+      "./src/extension/index.ts"
+    ],
+    "themes": [
+      "./themes"
+    ]
+  },
+  "dependencies": {
+    "pi-maestro-settings-core": "0.1.0",
+    "proper-lockfile": "4.1.2"
+  },
+  "peerDependencies": {
+    "@earendil-works/pi-agent-core": "*",
+    "@earendil-works/pi-ai": "*",
+    "@earendil-works/pi-coding-agent": "*",
+    "@earendil-works/pi-tui": "*",
+    "pi-maestro-teammate": "^1.6.0"
+  },
+  "peerDependenciesMeta": {
+    "@earendil-works/pi-agent-core": {
+      "optional": true
+    },
+    "@earendil-works/pi-ai": {
+      "optional": true
+    },
+    "@earendil-works/pi-coding-agent": {
+      "optional": true
+    },
+    "@earendil-works/pi-tui": {
+      "optional": true
+    },
+    "pi-maestro-teammate": {
+      "optional": true
+    }
+  },
+  "devDependencies": {
+    "@earendil-works/pi-agent-core": "0.83.0",
+    "@earendil-works/pi-ai": "0.83.0",
+    "@earendil-works/pi-coding-agent": "0.83.0",
+    "@earendil-works/pi-tui": "0.83.0",
+    "@types/node": "^22.0.0",
+    "pi-maestro-teammate": "1.7.0",
+    "typescript": "^5.5.0"
+  },
+  "main": "./src/index.ts",
+  "exports": {
+    ".": "./src/index.ts",
+    "./v1/events": "./src/public/v1/events.ts",
+    "./src/*": "./src/*"
+  }
+}

package/src/agents-store.ts

@@ -114,6 +114,13 @@ export function mapAgentStatus(status: unknown): AgentStatus {
 	}
 }
 
+function activityFromProgressStatus(status: unknown): "running" | "sleeping" | undefined {
+	if (typeof status !== "string") return undefined;
+	return status === "sleeping" || status === "completed" || status === "failed" || status === "terminated"
+		? "sleeping"
+		: "running";
+}
+
 export const AGENT_STALL_TIMEOUT_MS = 30_000;
 export type AgentDisplayStatus = AgentStatus | "result-ready" | "stalled";
 
@@ -138,9 +145,10 @@ function terminalTime(
 	now: number,
 ): number {
 	const completedAt = normalizeStartedAt(payload.completedAt, Number.NaN);
-	if (Number.isFinite(completedAt)) return Math.max(row.startedAt, completedAt);
+	const turnStartedAt = row.turnStartedAt ?? row.startedAt;
+	if (Number.isFinite(completedAt)) return Math.max(turnStartedAt, completedAt);
 	if (typeof payload.durationMs === "number" && Number.isFinite(payload.durationMs)) {
-		return row.startedAt + Math.max(0, payload.durationMs);
+		return turnStartedAt + Math.max(0, payload.durationMs);
 	}
 	return row.finishedAt ?? now;
 }
@@ -198,6 +206,14 @@ export class AgentsStore {
 			role: deriveRole(p.agent, p.name),
 			task: prev?.task ?? clean(p.name),
 			status: p.status === undefined ? prev?.status ?? "running" : mapAgentStatus(p.status),
+			phase: typeof p.phase === "string" ? clean(p.phase) : prev?.phase,
+			lastOutcome: p.lastOutcome
+				? {
+					status: p.lastOutcome.status,
+					...(p.lastOutcome.message ? { message: truncateTail(p.lastOutcome.message) } : {}),
+					settledAt: p.lastOutcome.settledAt,
+				}
+				: prev?.lastOutcome,
 			tail: prev?.tail ?? "",
 			startedAt: prev?.startedAt ?? normalizeStartedAt(p.startedAt, now),
 			lastActivityAt: normalizeStartedAt(p.lastActivityAt, now),
@@ -207,7 +223,15 @@ export class AgentsStore {
 					? { parentCorrelationId: prev.parentCorrelationId }
 					: {}),
 		};
-		if (row.status !== "done" && row.status !== "failed" && row.status !== "terminated") delete row.finishedAt;
+		if (row.status === "running") {
+			row.turnStartedAt = now;
+			delete row.finishedAt;
+			delete row.failedAt;
+		} else if (row.status === "sleeping") {
+			row.finishedAt = row.lastOutcome?.settledAt ?? prev?.finishedAt ?? now;
+		} else if (row.status !== "done" && row.status !== "failed" && row.status !== "terminated") {
+			delete row.finishedAt;
+		}
 		this.roster.set(id, row);
 	}
 
@@ -239,7 +263,7 @@ export class AgentsStore {
 				correlationId: targetId,
 				agent: p.agent ?? "",
 				name: p.name,
-				status: p.status,
+				status: activityFromProgressStatus(p.status),
 				lastActivityAt: p.lastActivityAt,
 				...(p.taskCorrelationId && p.taskCorrelationId !== p.correlationId
 					? { spawnedBy: p.correlationId }
@@ -278,6 +302,8 @@ export class AgentsStore {
 				delete row.finishedAt;
 			}
 		}
+		if (typeof p.phase === "string") row.phase = clean(p.phase);
+		else if (row.status === "sleeping") delete row.phase;
 		if (typeof p.taskIndex === "number") row.taskIndex = p.taskIndex;
 		if (Array.isArray(p.dependencies)) row.dependencies = [...p.dependencies];
 	}
@@ -307,23 +333,38 @@ export class AgentsStore {
 				row.status = "terminated";
 				row.taskStatus = "terminated";
 				row.finishedAt = terminalTime(row, id === p.correlationId ? p : {}, now);
+				row.lastOutcome = { status: "terminated", settledAt: row.finishedAt };
 				row.lastActivityAt = now;
 				delete row.activeTool;
 				delete row.failedAt;
+			} else if (row && id === p.correlationId && p.wakeable) {
+				// A recoverable logical agent is sleeping regardless of the previous
+				// run outcome. Failure remains visible as orthogonal outcome metadata.
+				row.status = "sleeping";
+				row.taskStatus = "sleeping";
+				row.phase = undefined;
+				row.finishedAt = terminalTime(row, p, now);
+				row.lastActivityAt = now;
+				row.lastOutcome = {
+					status: failedByExitCode ? "failed" : "completed",
+					...(failedByExitCode && row.error ? { message: row.error } : {}),
+					settledAt: row.finishedAt,
+				};
+				if (failedByExitCode) row.failedAt = now;
+				else delete row.failedAt;
+				delete row.activeTool;
 			} else if (row && (row.status === "failed" || failedByExitCode)) {
 				row.status = "failed";
 				row.taskStatus = "failed";
 				row.finishedAt = terminalTime(row, id === p.correlationId ? p : {}, now);
+				row.lastOutcome = {
+					status: "failed",
+					...(row.error ? { message: row.error } : {}),
+					settledAt: row.finishedAt,
+				};
 				row.failedAt = now;
 				row.lastActivityAt = now;
 				delete row.activeTool;
-			} else if (row && id === p.correlationId && p.wakeable && p.exitCode === 0) {
-				// A wakeable agent enters sleeping state after completion.
-				// Keep the row visible so the user can see it is idle but recallable.
-				row.status = "sleeping";
-				row.finishedAt = terminalTime(row, id === p.correlationId ? p : {}, now);
-				row.lastActivityAt = now;
-				delete row.activeTool;
 			} else {
 				this.roster.delete(id);
 				// Tombstone even when the row never existed: a `complete` that beats
@@ -364,6 +405,14 @@ export class AgentsStore {
 		return false;
 	}
 
+	/** True while any agent (foreground or background) is still running, so elapsed/stall repaints keep the loop alive. */
+	hasActive(): boolean {
+		for (const row of this.roster.values()) {
+			if (row.status === "running") return true;
+		}
+		return false;
+	}
+
 	private applyProgress(parentCorrelationId: string, p: ProgressPayload, now: number): void {
 		if (!this.roster.has(p.correlationId)
 			&& this.canMaterialize(p.correlationId, parentCorrelationId, now)) {
@@ -375,7 +424,7 @@ export class AgentsStore {
 				correlationId: p.correlationId,
 				agent: p.agent,
 				name: p.name,
-				status: p.status,
+				status: activityFromProgressStatus(p.status),
 				startedAt: p.startedAt,
 				lastActivityAt: p.lastActivityAt,
 				...(parentCorrelationId !== p.correlationId
@@ -403,6 +452,8 @@ export class AgentsStore {
 				delete row.finishedAt;
 			}
 		}
+		if (typeof p.phase === "string") row.phase = clean(p.phase);
+		else if (row.status === "sleeping") delete row.phase;
 		row.resultReadyAt = p.resultReadyAt === undefined
 			? undefined
 			: normalizeStartedAt(p.resultReadyAt, now);

package/src/ambient.ts

@@ -21,6 +21,22 @@ export interface AmbientState {
 	hideLiveDuration?: boolean;
 	/** Separator glyph between label and elapsed time (e.g. " · "). */
 	separator?: string;
+	/** Session summary — the session_info name, else a short session id. */
+	session?: string;
+	/** Active model short id. */
+	model?: string;
+	/** Active thinking level (omitted while off). */
+	thinking?: string;
+	/** Git branch name, or "detached". */
+	gitBranch?: string;
+	/** Maestro workflow status (run status when a run is active). */
+	maestro?: string;
+	/**
+	 * Leading title glyph: spinner frames while a turn runs, a static marker
+	 * when idle (Claude Code's `✳` / braille frames). Failure keeps its own
+	 * mark and ignores this. Absent when the caller opts out.
+	 */
+	frame?: string;
 }
 
 function liveAgents(agents: readonly AgentRow[]): AgentRow[] {
@@ -51,24 +67,56 @@ export function workingMessage(state: AmbientState, now = Date.now()): string |
 	return `\x1b[3m${text}\x1b[23m`;
 }
 
+/** Composition options for titleFor. */
+export interface TitleOptions {
+	/** Hard cap on the composed title. The middle is ellided, keeping head + state tail. */
+	maxLength?: number;
+}
+
 /**
  * The terminal tab title.
  *
  * A developer with several tabs open cannot otherwise tell which run finished and
  * which one needs them. Failure outranks progress, because that is the state that
- * actually requires a human.
+ * actually requires a human. The session summary (when present) sits right after
+ * "pi"; model / thinking / git / maestro tags follow the working state. Fields
+ * are only appended when present, so callers decide what to expose per config.
  */
-export function titleFor(state: AmbientState, marks: { ok: string; fail: string }, sep = " - "): string {
-	const base = state.cwd ? `pi${sep}${state.cwd}` : "pi";
+export function titleFor(
+	state: AmbientState,
+	marks: { ok: string; fail: string },
+	sep = " - ",
+	opts?: TitleOptions,
+): string {
+	const head = ["pi"];
+	if (state.session) head.push(state.session);
+	if (state.cwd) head.push(state.cwd);
+	const base = head.join(sep);
 	const broken = failedAgents(state.agents).length + failedJobs(state.jobs).length;
-	if (broken > 0) return `${marks.fail} ${base}${sep}${broken} failed`;
-	if (state.running) {
+	const prefix = state.frame ? `${state.frame} ` : "";
+	let title: string;
+	if (broken > 0) {
+		title = `${marks.fail} ${base}${sep}${broken} failed`;
+	} else if (state.running) {
 		const live = liveAgents(state.agents).length;
-		return live > 0 ? `${base}${sep}${live} agents` : `${base}${sep}working`;
+		title = live > 0 ? `${prefix}${base}${sep}${live} agents` : `${prefix}${base}${sep}working`;
+	} else {
+		const jobs = state.jobs.filter((job) => job.status === "running").length;
+		title = jobs > 0 ? `${prefix}${base}${sep}${jobs} bg` : `${prefix}${base}`;
+	}
+	const tags: string[] = [];
+	if (state.model) tags.push(`m:${state.model}`);
+	if (state.thinking) tags.push(`t:${state.thinking}`);
+	if (state.gitBranch) tags.push(`git:${state.gitBranch}`);
+	if (state.maestro) tags.push(`wf:${state.maestro}`);
+	if (tags.length > 0) title = `${title}${sep}${tags.join(sep)}`;
+	if (opts?.maxLength !== undefined && title.length > opts.maxLength) {
+		const cap = opts.maxLength;
+		const headLen = Math.max(8, Math.floor(cap * 0.4));
+		const tailLen = Math.max(8, Math.floor(cap * 0.5));
+		title = `${title.slice(0, headLen)}…${title.slice(-tailLen)}`;
 	}
-	const jobs = state.jobs.filter((job) => job.status === "running").length;
-	if (jobs > 0) return `${base}${sep}${jobs} bg`;
-	return base;
+	return title;
 }
 
 /**

package/src/bash-bg-overlay.ts

@@ -1,7 +1,9 @@
 import type { Theme, ThemeColor } from "@earendil-works/pi-coding-agent";
 import {
+	Key,
 	type Component,
 	type Focusable,
+	matchesKey,
 	truncateToWidth,
 	visibleWidth,
 	wrapTextWithAnsi,
@@ -56,7 +58,7 @@ export class BashBgOverlay implements Component, Focusable {
 	}
 
 	handleInput(data: string): void {
-		if (data === "\x1b") {
+		if (matchesKey(data, Key.escape)) {
 			if (this.mode === "detail") this.mode = "list";
 			else this.params.close();
 			this.params.requestRender();
@@ -64,20 +66,20 @@ export class BashBgOverlay implements Component, Focusable {
 		}
 		// Plain letters stay reserved for future filter/command modes, so navigation
 		// and refresh use arrows and a non-letter key only.
-		if (data === "\x1b[A") {
+		if (matchesKey(data, Key.up)) {
 			this.move(-1);
 			return;
 		}
-		if (data === "\x1b[B") {
+		if (matchesKey(data, Key.down)) {
 			this.move(1);
 			return;
 		}
-		if (data === "\r" || data === "\n") {
+		if (matchesKey(data, Key.enter)) {
 			if (this.selectedJob()) this.mode = this.mode === "detail" ? "list" : "detail";
 			this.params.requestRender();
 			return;
 		}
-		if (data === "\x12" || data === "\x1b[15~") {
+		if (data === "\x12" || matchesKey(data, Key.f5)) {
 			// Ctrl+R / F5 — refresh is acknowledged immediately even though the
 			// authoritative snapshot only arrives later. Schedule the ack's own
 			// expiry so it disappears even without any follow-up repaint.

package/src/config.ts

@@ -30,6 +30,13 @@ export function mergeConfig(base: CockpitConfig, over: unknown): CockpitConfig {
 	const sidebarWidth = sidebarRaw && typeof sidebarRaw.width === "number" && Number.isFinite(sidebarRaw.width)
 		? Math.min(SIDEBAR_MAX_WIDTH, Math.max(SIDEBAR_MIN_WIDTH, Math.round(sidebarRaw.width)))
 		: base.sidebar.width;
+	const titleRaw = o.title && typeof o.title === "object" && !Array.isArray(o.title)
+		? (o.title as Record<string, unknown>)
+		: undefined;
+	const isBool = (v: unknown): v is boolean => typeof v === "boolean";
+	const titleMaxLength = titleRaw && typeof titleRaw.maxLength === "number" && Number.isFinite(titleRaw.maxLength)
+		? Math.min(200, Math.max(20, Math.round(titleRaw.maxLength)))
+		: base.title.maxLength;
 	return {
 		enabled: typeof o.enabled === "boolean" ? o.enabled : base.enabled,
 		staticMode: typeof o.staticMode === "boolean" ? o.staticMode : base.staticMode,
@@ -40,12 +47,26 @@ export function mergeConfig(base: CockpitConfig, over: unknown): CockpitConfig {
 		todoMode: isMode(o.todoMode) ? o.todoMode : base.todoMode,
 		todoExpanded: typeof o.todoExpanded === "boolean" ? o.todoExpanded : base.todoExpanded,
 		hideNativeAgents: typeof o.hideNativeAgents === "boolean" ? o.hideNativeAgents : base.hideNativeAgents,
+		pinEditorBottom: typeof o.pinEditorBottom === "boolean" ? o.pinEditorBottom : base.pinEditorBottom,
 		icons: { mode: iconsRaw && isIconMode(iconsRaw.mode) ? iconsRaw.mode : base.icons.mode },
 		sidebar: {
 			mode: sidebarRaw && isSidebarMode(sidebarRaw.mode) ? sidebarRaw.mode : base.sidebar.mode,
 			width: sidebarWidth,
 			density: sidebarRaw && isSidebarDensity(sidebarRaw.density) ? sidebarRaw.density : base.sidebar.density,
 		},
+		title: {
+			enabled: isBool(titleRaw?.enabled) ? titleRaw!.enabled : base.title.enabled,
+			showSession: isBool(titleRaw?.showSession) ? titleRaw!.showSession : base.title.showSession,
+			showCwd: isBool(titleRaw?.showCwd) ? titleRaw!.showCwd : base.title.showCwd,
+			showModel: isBool(titleRaw?.showModel) ? titleRaw!.showModel : base.title.showModel,
+			showThinking: isBool(titleRaw?.showThinking) ? titleRaw!.showThinking : base.title.showThinking,
+			showGit: isBool(titleRaw?.showGit) ? titleRaw!.showGit : base.title.showGit,
+			showMaestro: isBool(titleRaw?.showMaestro) ? titleRaw!.showMaestro : base.title.showMaestro,
+			generationModel: titleRaw && typeof titleRaw.generationModel === "string"
+				? titleRaw.generationModel
+				: base.title.generationModel,
+			maxLength: titleMaxLength,
+		},
 		theme: typeof o.theme === "string" ? o.theme : base.theme,
 	};
 }
@@ -76,6 +97,39 @@ export function loadConfig(notify?: (msg: string, level: "warning" | "info") =>
 	}
 }
 
+export function mergeConfigDocument(raw: unknown, config: CockpitConfig): Record<string, unknown> {
+	const root = raw && typeof raw === "object" && !Array.isArray(raw)
+		? { ...(raw as Record<string, unknown>) }
+		: {};
+	const icons = root.icons && typeof root.icons === "object" && !Array.isArray(root.icons)
+		? { ...(root.icons as Record<string, unknown>), mode: config.icons.mode }
+		: { mode: config.icons.mode };
+	const sidebar = root.sidebar && typeof root.sidebar === "object" && !Array.isArray(root.sidebar)
+		? {
+			...(root.sidebar as Record<string, unknown>),
+			mode: config.sidebar.mode,
+			width: config.sidebar.width,
+			density: config.sidebar.density,
+		}
+		: { ...config.sidebar };
+	return {
+		...root,
+		enabled: config.enabled,
+		staticMode: config.staticMode,
+		quietMode: config.quietMode,
+		quietSymbols: config.quietSymbols,
+		toolPalette: config.toolPalette,
+		agentsMode: config.agentsMode,
+		todoMode: config.todoMode,
+		todoExpanded: config.todoExpanded,
+		hideNativeAgents: config.hideNativeAgents,
+		pinEditorBottom: config.pinEditorBottom,
+		icons,
+		sidebar,
+		theme: config.theme,
+	};
+}
+
 export interface SaveResult {
 	ok: boolean;
 	error?: string;
@@ -95,7 +149,9 @@ export function saveConfig(config: CockpitConfig): SaveResult {
 	try {
 		const dir = getAgentDir();
 		if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
-		writeFileSync(tmp, JSON.stringify(config, null, 2) + "\n", "utf8");
+		let raw: unknown = {};
+		try { if (existsSync(path)) raw = JSON.parse(readFileSync(path, "utf8")); } catch { /* replace malformed config */ }
+		writeFileSync(tmp, JSON.stringify(mergeConfigDocument(raw, config), null, 2) + "\n", "utf8");
 		renameSync(tmp, path);
 		return { ok: true };
 	} catch (err) {