@dotobokuri/fleet-cli 1.1.2 → 1.2.0

package/dist/index.js

@@ -24041,7 +24041,7 @@ async function executeOneShot(opts) {
 // ../../packages/fleet-infra/dist/index.js
 init_chunk_6K6JYAYY();
 
-// ../../packages/fleet-infra/dist/chunk-UJJES4N6.js
+// ../../packages/fleet-infra/dist/chunk-JMJCE3TR.js
 init_chunk_EDU3Y4RB();
 
 // ../../packages/fleet-infra/dist/chunk-NRRUNHG6.js
@@ -24134,30 +24134,30 @@ function ensureSafeDirectoryIfSensitive(dir, sensitivity) {
   }
 }
 
-// ../../packages/fleet-infra/dist/chunk-UJJES4N6.js
+// ../../packages/fleet-infra/dist/chunk-JMJCE3TR.js
 init_chunk_PZ5AY32C();
 import * as path8 from "path";
-var preset_exports = {};
-__export2(preset_exports, {
-  createEmptyPresetData: () => createEmptyPresetData,
-  createPresetService: () => createPresetService,
-  createPresetStore: () => createPresetStore,
-  sanitizePresetData: () => sanitizePresetData
-});
-var PRESET_VERSION = 1;
-var PRESET_FILE_NAME = "presets.json";
-var LOCK_DIR_NAME = "presets.json.lock";
+var global_options_exports = {};
+__export2(global_options_exports, {
+  createEmptyGlobalOptionsData: () => createEmptyGlobalOptionsData,
+  createGlobalOptionsService: () => createGlobalOptionsService,
+  createGlobalOptionsStore: () => createGlobalOptionsStore,
+  sanitizeGlobalOptionsData: () => sanitizeGlobalOptionsData
+});
+var GLOBAL_OPTIONS_VERSION = 1;
+var GLOBAL_OPTIONS_FILE_NAME = "settings.json";
+var LOCK_DIR_NAME = "settings.json.lock";
 var LOCK_OWNER_FILE_NAME = "owner";
-var TEMP_FILE_PREFIX = `.tmp-${PRESET_FILE_NAME}-`;
-function createPresetStore(deps = {}) {
+var TEMP_FILE_PREFIX = `.tmp-${GLOBAL_OPTIONS_FILE_NAME}-`;
+function createGlobalOptionsStore(deps = {}) {
   const dataDir2 = deps.dataDir ?? getFleetDataDir();
-  const presetPath = path8.join(dataDir2, PRESET_FILE_NAME);
+  const optionsPath = path8.join(dataDir2, GLOBAL_OPTIONS_FILE_NAME);
   const lockDir = path8.join(dataDir2, LOCK_DIR_NAME);
   const store2 = createDurableJsonStore({
-    filePath: presetPath,
+    filePath: optionsPath,
     lockDir,
     lockOwnerFileName: LOCK_OWNER_FILE_NAME,
-    sanitize: (value) => sanitizePresetData(value).data,
+    sanitize: (value) => sanitizeGlobalOptionsData(value).data,
     sensitivity: "sensitive",
     timeoutMs: deps.timeoutMs,
     staleLockMs: deps.staleLockMs,
@@ -24165,113 +24165,50 @@ function createPresetStore(deps = {}) {
     now: deps.now
   });
   return {
-    path: presetPath,
+    path: optionsPath,
     load: () => store2.load(),
-    save: (data) => store2.save(sanitizePresetData(data).data),
-    update: (mutate) => store2.update((current) => sanitizePresetData(mutate(current)).data)
+    save: (data) => store2.save(sanitizeGlobalOptionsData(data).data),
+    update: (mutate) => store2.update((current) => sanitizeGlobalOptionsData(mutate(current)).data)
   };
 }
-function createEmptyPresetData() {
-  return { version: PRESET_VERSION, byCli: {} };
+function createEmptyGlobalOptionsData() {
+  return {
+    version: GLOBAL_OPTIONS_VERSION
+  };
 }
-function sanitizePresetData(value) {
+function sanitizeGlobalOptionsData(value) {
   if (!isRecord(value)) {
-    return { data: createEmptyPresetData(), changed: true };
-  }
-  let changed = value.version !== PRESET_VERSION;
-  const defaultCliId = typeof value.defaultCliId === "string" && value.defaultCliId.length > 0 ? value.defaultCliId : void 0;
-  if ("defaultCliId" in value && defaultCliId === void 0) {
-    changed = true;
-  }
-  const byCli = /* @__PURE__ */ Object.create(null);
-  if (isRecord(value.byCli)) {
-    for (const [cliId, rawPreset] of Object.entries(value.byCli)) {
-      if (!isSafeDictionaryKey(cliId)) {
-        changed = true;
-        continue;
-      }
-      const preset = sanitizeCliPreset(rawPreset);
-      if (preset.changed) {
-        changed = true;
-      }
-      if (Object.keys(preset.data).length > 0) {
-        byCli[cliId] = preset.data;
-      }
-    }
-  } else if ("byCli" in value) {
-    changed = true;
+    return { data: createEmptyGlobalOptionsData(), changed: true };
   }
-  return { data: { version: PRESET_VERSION, ...defaultCliId ? { defaultCliId } : {}, byCli }, changed };
-}
-function sanitizeCliPreset(value) {
-  if (!isRecord(value)) {
-    return { data: {}, changed: true };
+  if (value.version !== GLOBAL_OPTIONS_VERSION) {
+    return { data: createEmptyGlobalOptionsData(), changed: true };
   }
   const data = {
-    ...typeof value.model === "string" && value.model.length > 0 ? { model: value.model } : {},
+    version: GLOBAL_OPTIONS_VERSION,
     ...typeof value.native === "boolean" ? { native: value.native } : {},
     ...typeof value.replaceSystemPrompt === "boolean" ? { replaceSystemPrompt: value.replaceSystemPrompt } : {},
-    ...typeof value.enableMetaphor === "boolean" ? { enableMetaphor: value.enableMetaphor } : {},
-    ...typeof value.cursorSync === "boolean" ? { cursorSync: value.cursorSync } : {}
+    ...typeof value.enableMetaphor === "boolean" ? { enableMetaphor: value.enableMetaphor } : {}
   };
-  const changed = Object.keys(value).some((key) => !(key in data)) || "model" in value && data.model === void 0 || "native" in value && data.native === void 0 || "replaceSystemPrompt" in value && data.replaceSystemPrompt === void 0 || "enableMetaphor" in value && data.enableMetaphor === void 0 || "cursorSync" in value && data.cursorSync === void 0;
+  const allowedKeys = /* @__PURE__ */ new Set(["version", "native", "replaceSystemPrompt", "enableMetaphor"]);
+  const changed = Object.keys(value).some((key) => !allowedKeys.has(key)) || "native" in value && typeof value.native !== "boolean" || "replaceSystemPrompt" in value && typeof value.replaceSystemPrompt !== "boolean" || "enableMetaphor" in value && typeof value.enableMetaphor !== "boolean";
   return { data, changed };
 }
-function isSafeDictionaryKey(key) {
-  return key.length > 0 && key !== "__proto__" && key !== "prototype" && key !== "constructor";
-}
 function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function createPresetService(deps = {}) {
-  const store2 = deps.store ?? createPresetStore({ dataDir: deps.dataDir });
+function createGlobalOptionsService(deps = {}) {
+  const store2 = deps.store ?? createGlobalOptionsStore({ dataDir: deps.dataDir });
   return {
     load: () => store2.load(),
-    resolveCliPreset: (cliId) => store2.load().byCli[cliId] ?? {},
-    saveCliPreset: (cliId, values) => updatePreset(store2, { cliId, values }),
-    saveDefaultCliId: (cliId) => updatePreset(store2, { defaultCliId: cliId ?? null }),
-    resetCliPreset: (cliId) => updatePreset(store2, { cliId, values: null }),
-    update: (mutation) => updatePreset(store2, mutation)
-  };
-}
-function updatePreset(store2, mutation) {
-  return store2.update((current) => applyPresetMutation(current, mutation));
-}
-function applyPresetMutation(current, mutation) {
-  const byCli = /* @__PURE__ */ Object.create(null);
-  for (const [cliId, preset] of Object.entries(current.byCli)) {
-    if (isSafeDictionaryKey2(cliId)) {
-      byCli[cliId] = preset;
-    }
-  }
-  if (mutation.cliId !== void 0) {
-    if (!isSafeDictionaryKey2(mutation.cliId)) {
-      return { version: 1, ...current.defaultCliId ? { defaultCliId: current.defaultCliId } : {}, byCli };
-    }
-    if (mutation.values === null) {
-      delete byCli[mutation.cliId];
-    } else if (mutation.values !== void 0) {
-      byCli[mutation.cliId] = prunePreset(mutation.values);
-    }
-  }
-  const nextDefaultCliId = mutation.defaultCliId === null ? void 0 : mutation.defaultCliId ?? current.defaultCliId;
-  return {
-    version: 1,
-    ...nextDefaultCliId ? { defaultCliId: nextDefaultCliId } : {},
-    byCli
-  };
-}
-function prunePreset(preset) {
-  return {
-    ...preset.model !== void 0 ? { model: preset.model } : {},
-    ...preset.native !== void 0 ? { native: preset.native } : {},
-    ...preset.replaceSystemPrompt !== void 0 ? { replaceSystemPrompt: preset.replaceSystemPrompt } : {},
-    ...preset.enableMetaphor !== void 0 ? { enableMetaphor: preset.enableMetaphor } : {},
-    ...preset.cursorSync !== void 0 ? { cursorSync: preset.cursorSync } : {}
+    save: (data) => {
+      store2.save(data);
+      return store2.load();
+    },
+    update: (mutate) => updateGlobalOptions(store2, mutate)
   };
 }
-function isSafeDictionaryKey2(key) {
-  return key.length > 0 && key !== "__proto__" && key !== "prototype" && key !== "constructor";
+function updateGlobalOptions(store2, mutate) {
+  return store2.update(mutate);
 }
 
 // ../../packages/fleet-infra/dist/index.js
@@ -24302,7 +24239,7 @@ __export2(fs_store_exports, {
 // ../../packages/fleet-infra/dist/index.js
 init_chunk_PZ5AY32C();
 function createInfraServices(deps = {}) {
-  const presetService = createPresetService();
+  const globalOptionsService = createGlobalOptionsService();
   const authService = createAuthService({ authPath: deps.authPath ?? DEFAULT_AUTH_PATH });
   return {
     agent: agent_exports,
@@ -24310,9 +24247,9 @@ function createInfraServices(deps = {}) {
     authService,
     dataDir,
     fsStore: fs_store_exports,
-    preset: preset_exports,
+    globalOptions: global_options_exports,
     executorPortRuntime,
-    presetService
+    globalOptionsService
   };
 }
 
@@ -31835,6 +31772,7 @@ async function runTaskForceBackend(registry3, cliType, carrierId, requestKey, re
     type: "track:begin",
     jobId,
     trackId,
+    startedAt: execStartedAt,
     requestPreview: request.trim().split(/\r?\n/, 1)[0]
   });
   try {
@@ -31884,7 +31822,7 @@ async function runTaskForceBackend(registry3, cliType, carrierId, requestKey, re
     return buildTaskForceResult(cliType, result);
   } catch (error51) {
     const message = error51 instanceof Error ? error51.message : String(error51);
-    emitStreamEvent(registry3, { type: "track:finalized", jobId, trackId, status: "err", error: message });
+    emitStreamEvent(registry3, { type: "track:finalized", jobId, trackId, status: "err", finishedAt: Date.now(), error: message });
     throw error51;
   }
 }
@@ -31951,6 +31889,7 @@ function emitTrackFinalized(registry3, jobId, trackId, result) {
     jobId,
     trackId,
     status: toTrackFinalStatus(status),
+    finishedAt: Date.now(),
     error: status === "aborted" ? "aborted" : result.error,
     fallbackText: sanitizeChunk(result.responseText),
     fallbackThought: sanitizeChunk(result.thoughtText)
@@ -32171,6 +32110,7 @@ async function runSingleCarrier(opts) {
     type: "track:begin",
     jobId: opts.jobId,
     trackId: opts.carrierId,
+    startedAt: execStartedAt,
     requestPreview: opts.request.trim().split(/\r?\n/, 1)[0]
   });
   try {
@@ -32220,6 +32160,7 @@ async function runSingleCarrier(opts) {
       jobId: opts.jobId,
       trackId: opts.carrierId,
       status: toTrackFinalStatus(finalStatus),
+      finishedAt: Date.now(),
       sessionId,
       fallbackText: sanitizeChunk(execResult.responseText),
       fallbackThought: sanitizeChunk(execResult.thoughtText),
@@ -32242,6 +32183,7 @@ async function runSingleCarrier(opts) {
       jobId: opts.jobId,
       trackId: opts.carrierId,
       status: "err",
+      finishedAt: Date.now(),
       error: message
     });
     throw error51;
@@ -32255,7 +32197,8 @@ function emitJobRegistered(registry3, jobId, carrierId, sortieKey, label, starte
     displayCli: carrierId,
     displayName: resolveCarrierDisplayName(registry3, carrierId),
     kind: "carrier",
-    runId
+    runId,
+    startedAt
   }];
   emitStreamEvent(registry3, {
     type: "job:registered",
@@ -33976,7 +33919,7 @@ Upon re-evaluation downgrade, halt the current phase and re-apply the appropriat
 
 The two gates are orthogonal: an anchored objective with speculative evidence still fails the Context Confidence gate, and conversely, complete evidence on a drifting objective still fails the Mission Anchor self-check. Apply both independently — never collapse one into the other.
 
-### Admiral's role
+### Admiral's role (yours — the host agent, 제독; not the user)
 
 Evaluate confidence honestly and apply the gate strictly. Do not flatten partial evidence into a confident-sounding label. Surfacing ${"`"}partial${"`"} or ${"`"}speculative${"`"} is a feature, not a failure — it triggers the correct workflow (re-entry) and prevents low-quality plans from contaminating execution.`
 };
@@ -34002,7 +33945,7 @@ Any phase produces output (from a Carrier, from the Admiral's own analysis, or f
 ### Depth limit
 Deep Dive verification depth is capped at **2 iterations**. If after 2 rounds of audit + follow-up verification a claim remains unconfirmed, mark it as ${"``"}[Unverified — depth limit reached]${"``"} and report it to the Admiral of the Navy (대원수). Do not continue iterating — the cost of further verification outweighs the risk of surfaced uncertainty.
 
-### Admiral's role
+### Admiral's role (yours — the host agent, 제독; not the user)
 Your role throughout Deep Dive is **coordination, not investigation**. Route, synthesize, and report — do not spend effort on direct deep analysis. Do **not** flatten uncertainty into confident-sounding summaries — preserve and surface ambiguity honestly.`
 };
 var MISSION_ANCHOR = {
@@ -34025,7 +33968,7 @@ Apply this Standing Order before entering Phase 1 and at every phase boundary in
 4. **Drift Recovery** — If the self-check is ${"``"}partial — adjust${"``"} or ${"``"}drift — halt${"``"}, do not enter the next phase. Return to the original user request, re-derive the anchor, and continue only after the objective is clear.
 5. **Compact Mode** — For trivial single-phase tasks with no more than 3 changed lines, state the Objective once and omit per-phase Anchor Recall lines. Multi-phase tasks never use this exemption.
 
-### Admiral's role
+### Admiral's role (yours — the host agent, 제독; not the user)
 Your role is to preserve objective alignment, not to expand scope. Use the anchor to decide what to investigate, delegate, implement, review, document, skip, or halt.`
 };
 var RESULT_INTEGRITY = {
@@ -34078,6 +34021,7 @@ var FLEET_ROLE_PROMPT = String.raw`
 You are the host agent coordinating the Agent Harness Fleet for the user.
 
 # Action Guidelines
+- The user is the Admiral of the Navy (대원수). Address and refer to the user only as 대원수 — never as 제독, which is your own title (the host agent's). This rule holds whether or not the tone overlay is active.
 - Treat the ${"`"}<fleet section=\"protocol\">${"`"} and ${"`"}<fleet section=\"standing-orders\">${"`"} blocks as the binding operational doctrine for every task. The Fleet Action Protocol's phases and all Standing Orders apply unconditionally — they override any default behavior in conflict.
 - Fleet MCP surfaces (${"`"}fleet-carriers${"`"}, ${"`"}fleet-wiki${"`"}) and their tools may be lazy-loaded; never declare a Fleet tool unavailable without first inspecting these surfaces.
 - When delegating to a Carrier, state which Carrier in your reply to the user.
@@ -34086,8 +34030,10 @@ You are the host agent coordinating the Agent Harness Fleet for the user.
 `;
 var FLEET_PERSONA_PROMPT = String.raw`
 # Persona
-You are the Admiral (제독) commanding this Fleet.
-Your ultimate superior is the Admiral of the Navy (대원수), the supreme commander above the entire formation.
+You are the Admiral (제독) commanding this Fleet — this title denotes YOURSELF ALONE, used only in the first person.
+The user you serve is your ultimate superior, the Admiral of the Navy (대원수), the supreme commander above the entire formation.
+ALWAYS address and refer to the user as 대원수 — never as 제독. ALWAYS reserve 제독 for yourself — never apply it to the user.
+"제독" = you (the host agent); "대원수" = the user. These are two distinct roles; never collapse them onto one title.
 When operating under grand-fleet, intermediate strategic dispatch arrives through the Admiralty's Fleet Admiral (사령관) chain of command.
 You command your own Captains (함장들) of Carriers within this workspace.
 `;
@@ -36039,6 +35985,41 @@ function dim(text, colorEnabled) {
   return paint(ANSI_DIM, text, colorEnabled);
 }
 
+// src/mission-control/layout.ts
+function maxVisibleWidth(texts) {
+  let maxWidth = 0;
+  for (const text of texts) {
+    maxWidth = Math.max(maxWidth, visibleWidth(text));
+  }
+  return maxWidth;
+}
+function padEndVisible(text, width) {
+  return `${text}${" ".repeat(Math.max(0, width - visibleWidth(text)))}`;
+}
+function computeBlockLeftPad(blockWidth, innerWidth) {
+  return Math.max(0, Math.floor((Math.max(0, innerWidth) - Math.max(0, blockWidth)) / 2));
+}
+function renderChoiceBlock(options2) {
+  const labelWidth = maxVisibleWidth(options2.rows.map((row) => row.label));
+  const rowTexts = options2.rows.map((row) => formatChoiceRow(row, labelWidth));
+  const blockWidth = maxVisibleWidth(rowTexts);
+  const leftPad = computeBlockLeftPad(blockWidth, options2.innerWidth);
+  const rowWidth = Math.max(0, options2.innerWidth - leftPad);
+  return rowTexts.map((row) => `${" ".repeat(leftPad)}${truncateToWidth(row, rowWidth)}`);
+}
+function renderKeyValueBlock(options2) {
+  const keyWidth = maxVisibleWidth(options2.rows.map((row) => row.key));
+  const rowTexts = options2.rows.map((row) => `${padEndVisible(row.key, keyWidth)}: ${row.value}`);
+  const blockWidth = maxVisibleWidth(rowTexts);
+  const leftPad = computeBlockLeftPad(blockWidth, options2.innerWidth);
+  const rowWidth = Math.max(0, options2.innerWidth - leftPad);
+  return rowTexts.map((row) => `${" ".repeat(leftPad)}${truncateToWidth(row, rowWidth)}`);
+}
+function formatChoiceRow(row, labelWidth) {
+  const label = padEndVisible(row.label, labelWidth);
+  return row.trailing === void 0 ? `${row.marker} ${label}` : `${row.marker} ${label}  ${row.trailing}`;
+}
+
 // src/mission-control/welcome.ts
 var FLEET_BANNER = ASCII_FLEET_BANNER;
 var BANNER_VISIBLE_WIDTH = visibleWidth(FLEET_BANNER[0] ?? "");
@@ -36115,6 +36096,7 @@ var MISSION_CONTROL_THEME = {
   fg: (name, text) => MISSION_CONTROL_THEME[name](text),
   muted: (text) => paint2("\x1B[38;2;160;150;180m", text),
   reset: (text) => `${text}${ANSI_RESET3}`,
+  section: (text) => paint2(FLEET_COMMAND, text),
   success: (text) => paint2("\x1B[38;2;80;200;160m", text),
   warning: (text) => paint2("\x1B[38;2;255;200;100m", text)
 };
@@ -36129,8 +36111,8 @@ var STYLE = {
 function renderMissionControl(width, options2) {
   const innerWidth = Math.max(0, width);
   const banner = buildFleetBanner(innerWidth, options2.bannerPhase ?? 0);
-  const choiceWidth = computeChoiceWidth(options2.cliOptions);
-  const choiceLeftPad = Math.max(0, Math.floor((innerWidth - choiceWidth) / 2));
+  const choiceWidth = CHOICE_INDENT + maxVisibleWidth(options2.cliOptions.map((option3) => option3.label));
+  const choiceLeftPad = computeBlockLeftPad(choiceWidth, innerWidth);
   const lines = [""];
   if (banner.length > 0) {
     for (const line of banner) {
@@ -36174,10 +36156,9 @@ function renderChoiceLine(options2) {
   const marker = options2.selected ? STYLE.accent(SELECTED_MARKER) : STYLE.dim(IDLE_MARKER);
   const number4 = STYLE.muted(`${options2.index + 1}.`);
   const label = colorizeProvider(options2.entry.id, options2.entry.label);
-  const chips = options2.entry.optionChips && options2.entry.optionChips.length > 0 ? STYLE.dim(`  [${options2.entry.optionChips.join(" \xB7 ")}]`) : "";
   const prefix = `${" ".repeat(options2.leftPad)}${marker} ${number4} `;
   const remaining = Math.max(0, options2.innerWidth - visibleWidth(prefix));
-  return `${prefix}${truncateToWidth(`${label}${chips}`, remaining)}`;
+  return `${prefix}${truncateToWidth(label, remaining)}`;
 }
 function renderCountsLine(counts, release2, innerWidth) {
   const segments = [];
@@ -36241,16 +36222,6 @@ function colorizeProvider(cliId, text) {
   const color = getCarrierAnsi(cliId);
   return color ? `${color}${text}${ANSI_RESET3}` : text;
 }
-function computeChoiceWidth(cliOptions) {
-  let maxLabelWidth = 0;
-  for (const option3 of cliOptions) {
-    const width = visibleWidth(option3.label);
-    if (width > maxLabelWidth) {
-      maxLabelWidth = width;
-    }
-  }
-  return CHOICE_INDENT + maxLabelWidth;
-}
 function paint2(code, text) {
   return paint(code, text, true);
 }
@@ -36336,6 +36307,8 @@ function handleCarrierStatusOverlayInput(data, inputState, controller) {
 var ANSI_RESET4 = "\x1B[0m";
 var ANIM_INTERVAL_MS = 100;
 var BREATHING_CYCLE_FRAMES = 10;
+var TOKEN_COUNTUP_EASING_FACTOR = 0.25;
+var TOKEN_COUNTUP_MIN_STEP = 8;
 var PANEL_DIM_COLOR = "\x1B[38;2;160;150;180m";
 var TASKFORCE_BADGE_RGB = [100, 180, 255];
 var TASKFORCE_BADGE_COLOR2 = `\x1B[38;2;${TASKFORCE_BADGE_RGB[0]};${TASKFORCE_BADGE_RGB[1]};${TASKFORCE_BADGE_RGB[2]}m`;
@@ -36346,8 +36319,6 @@ var DEFAULT_BODY_H = 6;
 // src/mission-control/carrier-roster/renderer.ts
 var ANSI_RESET5 = "\x1B[0m";
 var INDENT = "    ";
-var SLOT_WIDTH = 4;
-var NAME_WIDTH = 12;
 var MIN_CELL_WIDTH = 40;
 var ROSTER_ACTIONS_ID = "__roster_actions__";
 var CARRIER_ACTION_LABELS = [
@@ -36372,6 +36343,7 @@ function renderCarrierStatusOverlay(width, model, deps) {
   }
   for (let gi = 0; gi < model.viewModel.groupedEntries.length; gi++) {
     const group = model.viewModel.groupedEntries[gi];
+    const entryMetrics = resolveEntryLineMetrics(group.entries);
     body.push(toCellLine(`${group.color}\u25C7${ANSI_RESET5} ${group.color}${group.header}${ANSI_RESET5}`), { kind: "blank" });
     for (const entry of group.entries) {
       const isSelected = entry.carrierId === model.viewModel.selectedCarrierId;
@@ -36379,7 +36351,7 @@ function renderCarrierStatusOverlay(width, model, deps) {
         kind: "cell",
         line: {
           bg: isSelected ? getEntryBgColorForEntry(entry) : void 0,
-          text: withIndent(renderEntryLine(entry, isSelected, deps))
+          text: withIndent(renderEntryLine(entry, entryMetrics, isSelected, deps))
         }
       });
       if (isSelected && shouldRenderEntryEditor(model.state, entry.carrierId)) {
@@ -36556,20 +36528,19 @@ function toIndentedCellLine(text) {
 function withIndent(text) {
   return `${INDENT}${text}`;
 }
-function padEndVisible(text, width) {
-  return `${text}${" ".repeat(Math.max(0, width - visibleWidth(text)))}`;
-}
 function getDetailInnerWidth(width) {
   return Math.max(20, width - 8);
 }
 function buildDetailRows(entry, innerWidth, deps) {
   const provider = deps.getAvailableModels(entry.cliType);
   const modelLabel = getModelLabel(provider, entry.model);
-  const labelWidth = 8;
-  const valueWidth = Math.max(10, innerWidth - 10 - labelWidth);
+  const labels = ["model", "cli", "role", "desc"];
+  const labelWidth = maxVisibleWidth(labels);
+  const prefix = "      ";
+  const valueWidth = Math.max(10, innerWidth - visibleWidth(prefix) - labelWidth - 1);
   const lines = [];
   const detailLine = (label, value) => {
-    lines.push(`      ${deps.theme.dim(label.padEnd(labelWidth, " "))} ${value}`);
+    lines.push(`${prefix}${deps.theme.dim(padEndVisible(label, labelWidth))} ${value}`);
   };
   detailLine("model", modelLabel);
   detailLine("cli", getCliDisplayName(entry.cliType));
@@ -36677,14 +36648,19 @@ function getSelectedEntry(model) {
   const selectedCarrierId = model.viewModel.selectedCarrierId;
   return selectedCarrierId ? model.viewModel.flatEntries.find((entry) => entry.carrierId === selectedCarrierId) ?? null : null;
 }
-function renderEntryLine(entry, isSelected, deps) {
+function resolveEntryLineMetrics(entries) {
+  return {
+    displayNameWidth: maxVisibleWidth(entries.map((entry) => entry.displayName)),
+    slotWidth: maxVisibleWidth(entries.map((entry) => `#${entry.slot}`))
+  };
+}
+function renderEntryLine(entry, metrics, isSelected, deps) {
   const dim3 = deps.theme.dim;
   const slotStr = `#${entry.slot}`;
-  const slotPad = " ".repeat(Math.max(0, SLOT_WIDTH - slotStr.length));
-  const namePad = " ".repeat(Math.max(0, NAME_WIDTH - visibleWidth(entry.displayName)));
   const nameColor = getEntryColor(entry);
   const selectedPrefix = isSelected ? `${nameColor}\u25B8${ANSI_RESET5}` : " ";
-  const coloredName = `${nameColor}${entry.displayName}${ANSI_RESET5}`;
+  const slotCell = padEndVisible(dim3(slotStr), metrics.slotWidth);
+  const coloredName = padEndVisible(`${nameColor}${entry.displayName}${ANSI_RESET5}`, metrics.displayNameWidth);
   const modelLabel = getModelLabel(deps.getAvailableModels(entry.cliType), entry.model);
   const modelStr = entry.isDefault ? dim3(modelLabel) : modelLabel;
   const effortSupported = deps.getModelEffortLevels(entry.cliType, entry.model).length > 0;
@@ -36692,7 +36668,7 @@ function renderEntryLine(entry, isSelected, deps) {
   const roleStr = entry.role ? dim3(`  (${entry.role})`) : "";
   const taskForceTag = !entry.subagentMode && entry.taskForceBackendCount >= 2 ? `  ${TASKFORCE_BADGE_COLOR2}[TF:${entry.taskForceBackendCount}]${ANSI_RESET5}` : "";
   const subagentTag = entry.subagentMode ? `  ${getSubagentSignatureColor()}[SA]${ANSI_RESET5}` : "";
-  return `${selectedPrefix} ${dim3(slotStr)}${slotPad}${coloredName}${namePad}${modelStr}${effortStr}${roleStr}${subagentTag}${taskForceTag}`;
+  return `${selectedPrefix} ${slotCell} ${coloredName}  ${modelStr}${effortStr}${roleStr}${subagentTag}${taskForceTag}`;
 }
 function renderRosterActionsRow(isSelected, deps) {
   const marker = isSelected ? `${deps.theme.accent("\u25B8")}` : " ";
@@ -37609,19 +37585,20 @@ var RosterTaskForcePanelSurface = class {
     return clampOverlayRows(maxRows, this.buildBackendEntries().length + editRows + TASKFORCE_EXTRA_BODY_ROWS);
   }
   render(width) {
+    const entries = this.buildBackendEntries();
+    const entryMetrics = this.resolveEntryLineMetrics(entries);
     const body = [
       { kind: "center", text: this.options.theme.dim("Carrier Roster / TaskForce") },
       { kind: "center", text: this.options.theme.accent(`TaskForce - ${this.options.carrierDisplayName}`) },
       { kind: "blank" }
     ];
-    const entries = this.buildBackendEntries();
     for (let i = 0; i < entries.length; i++) {
       const entry = entries[i];
       const isSelected = i === this.selectedIndex;
       body.push({
         kind: "cell",
         line: {
-          text: withIndent2(this.renderEntryLine(entry, isSelected))
+          text: withIndent2(this.renderEntryLine(entry, entryMetrics, isSelected))
         }
       });
       if (isSelected && this.mode === "model") {
@@ -37834,15 +37811,26 @@ var RosterTaskForcePanelSurface = class {
     this.feedbackMessage = null;
     this.options.requestRender();
   }
-  renderEntryLine(entry, isSelected) {
+  resolveEntryLineMetrics(entries) {
+    return {
+      detailWidth: maxVisibleWidth(entries.map((entry) => this.formatEntryDetail(entry))),
+      displayNameWidth: maxVisibleWidth(entries.map((entry) => entry.displayName))
+    };
+  }
+  renderEntryLine(entry, metrics, isSelected) {
     const selectedPrefix = isSelected ? `${entry.color}\u25B8${ANSI_RESET6}` : " ";
+    const nameCell = padEndVisible(`${entry.color}${entry.displayName}${ANSI_RESET6}`, metrics.displayNameWidth);
+    const detailCell = padEndVisible(this.formatEntryDetail(entry), metrics.detailWidth);
+    const configTag = entry.isCustom ? `  ${ANSI_ACCENT}(custom)${ANSI_RESET6}` : `  ${ANSI_DIM3}(origin)${ANSI_RESET6}`;
+    return `  ${selectedPrefix} ${nameCell}  ${detailCell}${configTag}`;
+  }
+  formatEntryDetail(entry) {
     const provider = this.getAvailableModels(entry.cliType);
     const modelName = provider.models.find((model) => model.modelId === entry.model)?.name ?? entry.model;
     const modelStr = entry.isCustom ? modelName : this.options.theme.dim(modelName);
     const effortSupported = this.getEffortLevels(entry.cliType, entry.model).length > 0;
     const effortStr = effortSupported && entry.effort ? ` ${this.options.theme.dim("\xB7")} ${entry.isCustom ? entry.effort : this.options.theme.dim(entry.effort)}` : "";
-    const configTag = entry.isCustom ? `  ${ANSI_ACCENT}(custom)${ANSI_RESET6}` : `  ${ANSI_DIM3}(origin)${ANSI_RESET6}`;
-    return `  ${selectedPrefix} ${entry.color}${entry.displayName}${ANSI_RESET6}  ${modelStr}${effortStr}${configTag}`;
+    return `${modelStr}${effortStr}`;
   }
   getBackendConfig(cliType) {
     const snapshot = readCarriersSnapshot();
@@ -37978,7 +37966,7 @@ function resolveCellWidth2(lines) {
   return Math.max(MIN_CELL_WIDTH2, ...lineWidths);
 }
 function renderCellLine2(line, cellWidth, width) {
-  const padded = padEndVisible2(truncateToWidth(line.text, cellWidth), cellWidth);
+  const padded = padEndVisible(truncateToWidth(line.text, cellWidth), cellWidth);
   return centerText(applyLineBg2(padded, line.bg), width);
 }
 function toCellLine2(text) {
@@ -37993,9 +37981,6 @@ function toIndentedCellLine2(text) {
 function withIndent2(text) {
   return `${INDENT2}${text}`;
 }
-function padEndVisible2(text, width) {
-  return `${text}${" ".repeat(Math.max(0, width - visibleWidth(text)))}`;
-}
 function applyLineBg2(line, bg) {
   if (!bg) return line;
   return `${bg}${line.replaceAll(ANSI_RESET6, `${ANSI_RESET6}${bg}`)}${ANSI_RESET6}`;
@@ -38130,25 +38115,31 @@ function createAboutPanel(deps) {
     render({ width }) {
       const release2 = deps.getRelease();
       const counts = deps.counts;
+      const releaseRows = [
+        { key: "Version", value: MISSION_CONTROL_THEME.accent(release2?.version ?? "(local)") },
+        { key: "Channel", value: MISSION_CONTROL_THEME.accent(release2?.channel ?? "local") }
+      ];
+      const infoRows = [
+        { key: "Carriers", value: MISSION_CONTROL_THEME.accent(String(counts?.carriers ?? 0)) },
+        { key: "Wiki entries", value: MISSION_CONTROL_THEME.accent(String(counts?.wikiEntries ?? 0)) },
+        { key: "Queued patches", value: MISSION_CONTROL_THEME.accent(String(counts?.queuedPatches ?? 0)) },
+        { key: "Docs", value: MISSION_CONTROL_THEME.accent("(configured later)") },
+        { key: "Node", value: MISSION_CONTROL_THEME.accent(process.version) }
+      ];
       return [
         centerText(MISSION_CONTROL_THEME.dim(renderBreadcrumbs(deps.stack.breadcrumbs())), width),
         centerText(MISSION_CONTROL_THEME.accent("Fleet"), width),
-        centerText(formatKeyValue("Version", release2?.version ?? "(local)"), width),
-        centerText(formatKeyValue("Channel", release2?.channel ?? "local"), width),
+        ...renderInfoRows(releaseRows, width),
         "",
-        centerText(formatKeyValue("Carriers", String(counts?.carriers ?? 0)), width),
-        centerText(formatKeyValue("Wiki entries", String(counts?.wikiEntries ?? 0)), width),
-        centerText(formatKeyValue("Queued patches", String(counts?.queuedPatches ?? 0)), width),
-        centerText(formatKeyValue("Docs", "(configured later)"), width),
-        centerText(formatKeyValue("Node", process.version), width),
+        ...renderInfoRows(infoRows, width),
         "",
         centerText(MISSION_CONTROL_THEME.dim("Esc back"), width)
       ];
     }
   };
 }
-function formatKeyValue(key, value) {
-  return `${key}: ${MISSION_CONTROL_THEME.accent(value)}`;
+function renderInfoRows(rows, width) {
+  return renderKeyValueBlock({ innerWidth: width, rows });
 }
 
 // src/mission-control/menu/action-list-panel.ts
@@ -38197,7 +38188,7 @@ function createActionListPanel(options2) {
         ...breadcrumbLines,
         centerText(MISSION_CONTROL_THEME.accent(options2.title), width),
         "",
-        ...actions.map((item, index) => centerText(formatActionRow(item, index === selected), width)),
+        ...renderActionRows(actions, selected, width),
         "",
         ...statusLines.map((line) => centerText(line, width)),
         ...statusLines.length === 0 ? [] : [""],
@@ -38222,11 +38213,15 @@ function clampSelected(selected, length) {
   if (length <= 0) return 0;
   return Math.min(selected, length - 1);
 }
+function renderActionRows(actions, selected, width) {
+  const rows = actions.map((item, index) => formatActionRow(item, index === selected));
+  return renderChoiceBlock({ innerWidth: width, rows });
+}
 function formatActionRow(item, selected) {
   const marker = selected ? MISSION_CONTROL_THEME.accent(item.marker ?? "\u25B8") : MISSION_CONTROL_THEME.dim(" ");
-  const detail = item.detail === void 0 ? "" : MISSION_CONTROL_THEME.dim(`  ${item.detail}`);
+  const trailing = item.detail === void 0 ? void 0 : MISSION_CONTROL_THEME.dim(item.detail);
   const label = selected ? MISSION_CONTROL_THEME.bg("selected", MISSION_CONTROL_THEME.accent(item.label)) : item.label;
-  return `${marker} ${label}${detail}`;
+  return { label, marker, trailing };
 }
 function move(index, length, delta) {
   return length === 0 ? 0 : (index + delta + length) % length;
@@ -38348,7 +38343,7 @@ function createAuthPanel(deps) {
         centerText(MISSION_CONTROL_THEME.dim(renderBreadcrumbs(deps.stack.breadcrumbs())), width),
         centerText(MISSION_CONTROL_THEME.accent("Authentication"), width),
         "",
-        ...rows.map((row, index) => centerText(formatProviderRow(row, index === selected), width)),
+        ...renderProviderRows(rows, selected, width),
         "",
         centerText(MISSION_CONTROL_THEME.dim("Enter actions  Esc back"), width)
       ];
@@ -38460,11 +38455,17 @@ function createProviderRows() {
     status: "Checking"
   })).sort((left, right) => left.label.localeCompare(right.label));
 }
+function renderProviderRows(rows, selected, width) {
+  return renderChoiceBlock({
+    innerWidth: width,
+    rows: rows.map((row, index) => formatProviderRow(row, index === selected))
+  });
+}
 function formatProviderRow(row, selected) {
   const marker = selected ? MISSION_CONTROL_THEME.accent("\u25B8") : MISSION_CONTROL_THEME.dim(" ");
   const label = selected ? MISSION_CONTROL_THEME.bg("selected", MISSION_CONTROL_THEME.accent(row.label)) : row.label;
   const status = row.configured ? MISSION_CONTROL_THEME.success(row.status) : MISSION_CONTROL_THEME.warning(row.status);
-  return `${marker} ${label}  ${status}`;
+  return { label, marker, trailing: status };
 }
 function formatCliLabel(cliId) {
   return cliId.split("-").map((part) => part.length > 0 ? `${part[0]?.toUpperCase() ?? ""}${part.slice(1)}` : part).join(" ");
@@ -38479,15 +38480,13 @@ function formatError2(error51) {
 // src/mission-control/menu/diagnostics-panel.ts
 init_data_dir();
 import * as os6 from "os";
-import * as path12 from "path";
-var ROOT_ROWS = ["Data Dir", "Reset Preset To Defaults", "System Info"];
+var ROOT_ROWS = ["Data Dir", "System Info"];
 var CONTROL_CHARS2 = /[\u0000-\u001f\u007f]/g;
 var LINE_BREAK_CHARS = /[\r\n]+/g;
 function createDiagnosticsPanel(deps) {
   let selected = 0;
   let view = "root";
   let scroll = 0;
-  let message = "";
   return {
     id: "fleet-menu:diagnostics",
     title: "Diagnostics",
@@ -38529,19 +38528,15 @@ function createDiagnosticsPanel(deps) {
       if (view === "system") {
         return renderSystemInfo(width);
       }
-      const lines = [
+      return [
         "",
         centerText(MISSION_CONTROL_THEME.dim(renderBreadcrumbs(deps.stack.breadcrumbs())), width),
         centerText(MISSION_CONTROL_THEME.accent("Diagnostics"), width),
         "",
-        ...ROOT_ROWS.map((row, index) => centerText(formatRootRow(row, index === selected), width)),
+        ...renderRootRows(selected, width),
         "",
         centerText(MISSION_CONTROL_THEME.dim("Enter open  Esc back"), width)
       ];
-      if (message.length > 0) {
-        lines.push(centerText(message, width));
-      }
-      return lines;
     }
   };
   function openSelected() {
@@ -38554,80 +38549,55 @@ function createDiagnosticsPanel(deps) {
       view = "system";
       return;
     }
-    deps.stack.push(createActionListPanel({
-      id: "diagnostics:reset-preset",
-      title: "Reset Preset To Defaults",
-      statusLines: () => [MISSION_CONTROL_THEME.warning("All CLI presets will be reset to defaults. Continue?")],
-      onBack: () => {
-        deps.stack.pop();
-      },
-      actions: [
-        {
-          id: "confirm",
-          label: "Confirm",
-          run: () => {
-            resetPresets();
-            deps.stack.pop();
-          }
-        },
-        {
-          id: "cancel",
-          label: "Cancel",
-          run: () => {
-            deps.stack.pop();
-          }
-        }
-      ]
-    }));
   }
   function renderDataDir(width) {
     const dataDir2 = safeValue(getFleetDataDir);
     const cleanDataDir = sanitizeTerminalText(dataDir2);
+    const rows = [
+      { key: "Root", value: MISSION_CONTROL_THEME.accent(cleanDataDir) }
+    ];
     return [
       "",
       centerText(MISSION_CONTROL_THEME.dim(`${renderBreadcrumbs(deps.stack.breadcrumbs())} / Data Dir`), width),
       centerText(MISSION_CONTROL_THEME.accent("Data Dir"), width),
       "",
-      centerText(formatKeyValue2("Root", cleanDataDir), width),
-      centerText(formatKeyValue2("Presets", sanitizeTerminalText(path12.join(dataDir2, "presets.json"))), width),
+      ...renderInfoRows2(rows, width),
       "",
       centerText(MISSION_CONTROL_THEME.dim("Esc back"), width)
     ];
   }
   function renderSystemInfo(width) {
+    const rows = [
+      { key: "Node", value: MISSION_CONTROL_THEME.accent(process.version) },
+      { key: "OS", value: MISSION_CONTROL_THEME.accent(`${os6.platform()} ${os6.release()} ${os6.arch()}`) },
+      { key: "Shell", value: MISSION_CONTROL_THEME.accent(sanitizeTerminalText(deps.env.SHELL ?? "(unknown)")) },
+      { key: "Terminal", value: MISSION_CONTROL_THEME.accent(sanitizeTerminalText(deps.env.TERM ?? "(unknown)")) },
+      { key: "CWD", value: MISSION_CONTROL_THEME.accent(sanitizeTerminalText(deps.cwd)) }
+    ];
     return [
       "",
       centerText(MISSION_CONTROL_THEME.dim(`${renderBreadcrumbs(deps.stack.breadcrumbs())} / System Info`), width),
       centerText(MISSION_CONTROL_THEME.accent("System Info"), width),
       "",
-      centerText(formatKeyValue2("Node", process.version), width),
-      centerText(formatKeyValue2("OS", `${os6.platform()} ${os6.release()} ${os6.arch()}`), width),
-      centerText(formatKeyValue2("Shell", sanitizeTerminalText(deps.env.SHELL ?? "(unknown)")), width),
-      centerText(formatKeyValue2("Terminal", sanitizeTerminalText(deps.env.TERM ?? "(unknown)")), width),
-      centerText(formatKeyValue2("CWD", sanitizeTerminalText(deps.cwd)), width),
+      ...renderInfoRows2(rows, width),
       "",
       centerText(MISSION_CONTROL_THEME.dim("Esc back"), width)
     ];
   }
-  function resetPresets() {
-    const preset = deps.presetService?.load();
-    if (preset !== void 0) {
-      for (const cliId of Object.keys(preset.byCli)) {
-        deps.presetService?.resetCliPreset(cliId);
-      }
-      deps.presetService?.saveDefaultCliId(void 0);
-    }
-    deps.onPresetReset?.();
-    message = MISSION_CONTROL_THEME.success("Preset defaults restored.");
-  }
 }
-function formatKeyValue2(key, value) {
-  return `${key}: ${MISSION_CONTROL_THEME.accent(value)}`;
+function renderInfoRows2(rows, width) {
+  return renderKeyValueBlock({ innerWidth: width, rows });
+}
+function renderRootRows(selected, width) {
+  return renderChoiceBlock({
+    innerWidth: width,
+    rows: ROOT_ROWS.map((row, index) => formatRootRow(row, index === selected))
+  });
 }
 function formatRootRow(row, selected) {
   const marker = selected ? MISSION_CONTROL_THEME.accent("\u25B8") : MISSION_CONTROL_THEME.dim(" ");
   const label = selected ? MISSION_CONTROL_THEME.bg("selected", MISSION_CONTROL_THEME.accent(row)) : row;
-  return `${marker} ${label}`;
+  return { label, marker };
 }
 function safeValue(read) {
   try {
@@ -38711,6 +38681,165 @@ function isEscIntermediate2(code) {
   return code >= 32 && code <= 47;
 }
 
+// src/mission-control/menu/sectioned-list-panel.ts
+function createSectionedListPanel(options2) {
+  let selected = firstSelectableIndex(resolveRows(options2.rows));
+  return {
+    id: options2.id,
+    title: options2.title,
+    handleInput(data) {
+      const rows = resolveRows(options2.rows);
+      selected = clampSelectable(rows, selected);
+      if (isUp(data)) {
+        selected = move4(rows, selected, -1);
+        return true;
+      }
+      if (isDown(data)) {
+        selected = move4(rows, selected, 1);
+        return true;
+      }
+      const row = rows[selected];
+      if (isEnter(data) && isSelectable(row)) {
+        runSelected(row);
+        return true;
+      }
+      if (isRight(data) && row?.kind === "launch" && row.openModelOverride !== void 0) {
+        row.openModelOverride();
+        return true;
+      }
+      return false;
+    },
+    getFocusLine({ width }) {
+      const rows = resolveRows(options2.rows);
+      selected = clampSelectable(rows, selected);
+      if (!isSelectable(rows[selected])) return void 0;
+      return getRowFocusLine(width, options2, selected);
+    },
+    render({ width }) {
+      const rows = resolveRows(options2.rows);
+      selected = clampSelectable(rows, selected);
+      const breadcrumbs = options2.breadcrumbs?.() ?? [];
+      const statusLines = options2.statusLines?.() ?? [];
+      const footerHint = MISSION_CONTROL_THEME.dim(options2.footer ?? "\u2191\u2193 select  Enter open");
+      const breadcrumbLines = breadcrumbs.length <= 1 ? [] : [
+        "",
+        centerText(MISSION_CONTROL_THEME.dim(renderBreadcrumbs(breadcrumbs)), width)
+      ];
+      return [
+        ...breadcrumbLines,
+        centerText(MISSION_CONTROL_THEME.accent(options2.title), width),
+        "",
+        ...renderRows(rows, selected, width),
+        "",
+        ...statusLines.map((line) => centerText(line, width)),
+        ...statusLines.length === 0 ? [] : [""],
+        centerText(footerHint, width)
+      ];
+    }
+  };
+}
+function clampSelectable(rows, selected) {
+  if (isSelectable(rows[selected])) {
+    return selected;
+  }
+  return firstSelectableIndex(rows);
+}
+function firstSelectableIndex(rows) {
+  const index = rows.findIndex(isSelectable);
+  return index === -1 ? 0 : index;
+}
+function getRowFocusLine(width, options2, selected) {
+  const breadcrumbs = options2.breadcrumbs?.() ?? [];
+  const breadcrumbLines = breadcrumbs.length <= 1 ? [] : [
+    "",
+    centerText(MISSION_CONTROL_THEME.dim(renderBreadcrumbs(breadcrumbs)), width)
+  ];
+  const displayIndex = buildDisplayRows(resolveRows(options2.rows), selected).findIndex((row) => row.kind === "choice" && row.sourceIndex === selected);
+  return breadcrumbLines.length + 2 + Math.max(0, displayIndex);
+}
+function isRight(data) {
+  return data === "\x1B[C" || data === "\x1BOC";
+}
+function isSelectable(row) {
+  return row !== void 0 && row.kind !== "header";
+}
+function move4(rows, index, delta) {
+  const selectableCount = rows.filter(isSelectable).length;
+  if (selectableCount === 0) return 0;
+  let next = index;
+  do {
+    next = (next + delta + rows.length) % rows.length;
+  } while (!isSelectable(rows[next]));
+  return next;
+}
+function renderRows(rows, selected, width) {
+  const displayRows = buildDisplayRows(rows, selected);
+  const choiceRows = displayRows.filter((row) => row.kind === "choice");
+  const renderedChoiceRows = renderChoiceBlock({
+    innerWidth: width,
+    rows: choiceRows.map((row) => row.choice)
+  });
+  let choiceIndex = 0;
+  return displayRows.map((row) => {
+    if (row.kind === "blank") return "";
+    return renderedChoiceRows[choiceIndex++] ?? "";
+  });
+}
+function resolveRows(rows) {
+  return typeof rows === "function" ? rows() : rows;
+}
+function runSelected(row) {
+  if (row.kind === "launch") {
+    row.launch();
+    return;
+  }
+  if (row.kind === "toggle") {
+    row.toggle();
+    return;
+  }
+  row.navigate();
+}
+function formatRow(row, selected) {
+  if (row.kind === "header") {
+    return {
+      label: MISSION_CONTROL_THEME.section(row.label),
+      marker: MISSION_CONTROL_THEME.dim(" ")
+    };
+  }
+  const marker = selected ? `    ${MISSION_CONTROL_THEME.accent("\u25B8")}` : MISSION_CONTROL_THEME.dim("     ");
+  const label = selected ? MISSION_CONTROL_THEME.bg("selected", MISSION_CONTROL_THEME.accent(row.label)) : row.label;
+  const trailing = getTrailing(row);
+  return { label, marker, trailing };
+}
+function buildDisplayRows(rows, selected) {
+  const displayRows = [];
+  let seenHeader = false;
+  for (const [index, row] of rows.entries()) {
+    if (row.kind === "header" && seenHeader) {
+      displayRows.push({ kind: "blank" });
+    }
+    if (row.kind === "header") {
+      seenHeader = true;
+    }
+    displayRows.push({
+      choice: formatRow(row, index === selected),
+      kind: "choice",
+      sourceIndex: index
+    });
+  }
+  return displayRows;
+}
+function getTrailing(row) {
+  if (row.kind === "launch") {
+    const parts = [row.detail, row.trailing].filter((part) => part !== void 0 && part.length > 0);
+    return parts.length === 0 ? void 0 : MISSION_CONTROL_THEME.dim(parts.join("  "));
+  }
+  if (row.kind === "toggle") {
+    return MISSION_CONTROL_THEME.dim(row.value);
+  }
+  return row.detail === void 0 ? void 0 : MISSION_CONTROL_THEME.dim(row.detail);
+}
+
 // ../fleet-wiki-ui/dist/cli.mjs
 import { spawnSync, spawn as spawn3 } from "child_process";
 import { existsSync as existsSync5 } from "fs";
@@ -39569,13 +39698,16 @@ function createWikiPanel(deps) {
     },
     render({ width }) {
       const status = wiki.getStatus();
+      const infoRows = [
+        { key: "Port", value: MISSION_CONTROL_THEME.accent(String(wiki.getPort())) }
+      ];
       return [
         "",
         centerText(MISSION_CONTROL_THEME.dim(renderBreadcrumbs(deps.stack.breadcrumbs())), width),
         centerText(MISSION_CONTROL_THEME.accent("Wiki Server"), width),
         "",
         centerText(formatStatus(status), width),
-        centerText(formatKeyValue3("Port", String(wiki.getPort())), width),
+        ...renderInfoRows3(infoRows, width),
         "",
         centerText(MISSION_CONTROL_THEME.dim("External fleet wiki processes are not managed here."), width),
         "",
@@ -39666,8 +39798,8 @@ function formatStatus(status) {
 function formatActionsRow() {
   return `${MISSION_CONTROL_THEME.accent("\u25B8")} ${MISSION_CONTROL_THEME.bg("selected", MISSION_CONTROL_THEME.accent("Actions"))}`;
 }
-function formatKeyValue3(key, value) {
-  return `${key}: ${MISSION_CONTROL_THEME.accent(value)}`;
+function renderInfoRows3(rows, width) {
+  return renderKeyValueBlock({ innerWidth: width, rows });
 }
 function formatError3(error51) {
   return error51 instanceof Error && error51.message.length > 0 ? error51.message : "Wiki server failed.";
@@ -39681,10 +39813,9 @@ var EMPTY_MOUSE_PROTOCOL_STATE = {
 };
 var DEFAULT_SHIMMER_INTERVAL_MS = 100;
 var DEFAULT_SHIMMER_PHASE_STEP = 0.15;
-var LAUNCHER_ITEMS = ["Start", "Configure Carriers", "Options", "System Menu", "Exit Fleet"];
 function createMissionControlController(options2) {
-  const cliOptions = options2.cliOptions.length > 0 ? [...options2.cliOptions] : [{ id: options2.defaultCliId, label: options2.defaultCliId }];
-  let selectedCliId = cliOptions.some((entry) => entry.id === options2.defaultCliId) ? options2.defaultCliId : cliOptions[0]?.id ?? options2.defaultCliId;
+  const cliOptions = options2.cliOptions.length > 0 ? [...options2.cliOptions] : [{ id: options2.initialCliId, label: options2.initialCliId }];
+  let selectedCliId = cliOptions.some((entry) => entry.id === options2.initialCliId) ? options2.initialCliId : cliOptions[0]?.id ?? options2.initialCliId;
   let state = "idle";
   let lastExit;
   let active;
@@ -39883,59 +40014,55 @@ function createMissionControlController(options2) {
   }
   function openLauncherRoot() {
     let stack;
-    const root = createLauncherRoot({
+    const root = createMissionRootPanel({
+      cliOptions,
       getStack: () => stack,
-      onRenderRequest: options2.onRenderRequest,
-      openItem: (index) => {
-        if (index === 0) {
-          stack.push(createStartPanel({
-            cliOptions,
-            launchSelected,
-            onRenderRequest: options2.onRenderRequest,
-            selectedCliId: () => selectedCliId,
-            sessionOptions: options2.sessionOptions,
-            setSelectedCliId: (cliId) => {
-              selectedCliId = cliId;
-              options2.sessionOptions?.selectCli(cliId);
-              options2.onRenderRequest();
-            },
-            stack
-          }));
-          return;
-        }
-        if (index === 1) {
-          openCarrierRoster();
-          return;
-        }
-        if (index === 2) {
-          stack.push(createOptionsPanel({
-            onRenderRequest: options2.onRenderRequest,
-            sessionOptions: options2.sessionOptions
-          }));
-          return;
-        }
-        if (index === 3) {
-          stack.push(createSystemMenuPanel({
-            authService: options2.authService,
-            counts: options2.loadedCounts,
-            cwd: options2.invocationCwd ?? process.cwd(),
-            env: options2.env ?? process.env,
-            getRelease: () => release2,
-            getStack: () => stack,
-            onPresetReset: () => {
-              options2.sessionOptions?.resetOverrides();
-            },
-            onRenderRequest: options2.onRenderRequest,
-            presetService: options2.presetService,
-            wikiController: options2.wikiController
-          }));
-          return;
-        }
-        options2.onExitFleet();
+      launchCli: (entry) => {
+        selectedCliId = entry.id;
+        options2.sessionOptions?.selectCli(entry.id);
+        void launchSelected();
       },
       loadedCounts: options2.loadedCounts,
+      onRenderRequest: options2.onRenderRequest,
+      openCarrierRoster,
+      openModelOverride: (entry) => {
+        selectedCliId = entry.id;
+        options2.sessionOptions?.selectCli(entry.id);
+        openModelOverride({
+          entry,
+          onRenderRequest: options2.onRenderRequest,
+          sessionOptions: options2.sessionOptions,
+          stack
+        });
+      },
+      openSystemMenu: () => {
+        stack.push(createSystemMenuPanel({
+          authService: options2.authService,
+          counts: options2.loadedCounts,
+          cwd: options2.invocationCwd ?? process.cwd(),
+          env: options2.env ?? process.env,
+          getRelease: () => release2,
+          getStack: () => stack,
+          onRenderRequest: options2.onRenderRequest,
+          wikiController: options2.wikiController
+        }));
+      },
       onExitFleet: options2.onExitFleet,
-      release: () => release2
+      release: () => release2,
+      selectedCliId: () => selectedCliId,
+      sessionOptions: options2.sessionOptions,
+      toggleEnableMetaphor: () => {
+        options2.sessionOptions?.toggleEnableMetaphor();
+        options2.onRenderRequest();
+      },
+      toggleNative: () => {
+        options2.sessionOptions?.toggleNative();
+        options2.onRenderRequest();
+      },
+      toggleReplaceSystemPrompt: () => {
+        options2.sessionOptions?.toggleReplaceSystemPrompt();
+        options2.onRenderRequest();
+      }
     });
     stack = createPanelStack({
       root,
@@ -40006,79 +40133,85 @@ function createMissionControlController(options2) {
 function clearDefaultShimmerInterval(timer) {
   clearInterval(timer);
 }
-function createLauncherRoot(options2) {
-  return createActionListPanel({
+function createMissionRootPanel(options2) {
+  return createSectionedListPanel({
     id: "mission-control:launcher-root",
     title: "Mission Control",
     breadcrumbs: () => options2.getStack().breadcrumbs(),
-    footer: "\u2191\u2193 select  Enter open",
-    statusLines: () => formatLauncherStatusLines(options2.loadedCounts, options2.release()),
-    actions: LAUNCHER_ITEMS.map((label, index) => ({
-      id: label.toLowerCase().replaceAll(" ", "-"),
-      label,
-      run: () => {
-        if (label === "Exit Fleet") {
-          options2.onExitFleet();
-          return;
-        }
-        options2.openItem(index);
-        options2.onRenderRequest();
-      }
-    }))
+    footer: "\u2191\u2193 select  Enter launch/open  \u2192 model",
+    statusLines: () => [
+      ...formatLauncherStatusLines(options2.loadedCounts, options2.release()),
+      ...options2.sessionOptions?.getStatusLines?.().map((line) => MISSION_CONTROL_THEME.error(line)) ?? []
+    ],
+    rows: () => createMissionRootRows(options2)
   });
 }
-function createStartPanel(options2) {
-  let selected = Math.max(0, options2.cliOptions.findIndex((entry) => entry.id === options2.selectedCliId()));
-  return {
-    id: "mission-control:start",
-    title: "Start",
-    handleInput(data) {
-      selected = clampIndex(selected, options2.cliOptions.length);
-      if (isUp(data)) {
-        selected = moveIndex(selected, options2.cliOptions.length, -1);
-        return true;
-      }
-      if (isDown(data)) {
-        selected = moveIndex(selected, options2.cliOptions.length, 1);
-        return true;
-      }
-      const entry = options2.cliOptions[selected];
-      if (entry === void 0) {
-        return false;
-      }
-      if (isEnter(data)) {
-        options2.setSelectedCliId(entry.id);
-        void options2.launchSelected();
-        return true;
-      }
-      if (isRight(data) && options2.sessionOptions !== void 0) {
-        options2.setSelectedCliId(entry.id);
-        openStartModelOverride(options2, entry);
-        return true;
+function createMissionRootRows(options2) {
+  const values = options2.sessionOptions?.getResolved().values;
+  const model = options2.sessionOptions?.getDraft().model;
+  return [
+    { kind: "header", label: "LAUNCH" },
+    ...options2.cliOptions.map((entry) => ({
+      kind: "launch",
+      id: `launch:${entry.id}`,
+      label: entry.label,
+      detail: entry.id === options2.selectedCliId() ? "selected" : void 0,
+      trailing: model === void 0 ? void 0 : `model ${model}`,
+      launch: () => options2.launchCli(entry),
+      openModelOverride: () => options2.openModelOverride(entry)
+    })),
+    { kind: "header", label: "OPTION" },
+    {
+      kind: "toggle",
+      id: "option:mode",
+      label: "Mode",
+      value: values?.native ? "Native" : "Fleet prompt",
+      toggle: options2.toggleNative
+    },
+    {
+      kind: "toggle",
+      id: "option:system-prompt",
+      label: "System prompt",
+      value: formatSystemPromptOption(options2.sessionOptions),
+      toggle: options2.toggleReplaceSystemPrompt
+    },
+    {
+      kind: "toggle",
+      id: "option:metaphor",
+      label: "Metaphor",
+      value: values?.enableMetaphor ? "Enabled" : "Off",
+      toggle: options2.toggleEnableMetaphor
+    },
+    { kind: "header", label: "SYSTEM" },
+    {
+      kind: "navigate",
+      id: "system:carrier-roster",
+      label: "Carrier Roster",
+      navigate: () => {
+        options2.openCarrierRoster();
+        options2.onRenderRequest();
       }
-      return false;
     },
-    getFocusLine() {
-      selected = clampIndex(selected, options2.cliOptions.length);
-      return options2.cliOptions.length === 0 ? void 0 : 4 + selected;
+    {
+      kind: "navigate",
+      id: "system:system-menu",
+      label: "System Menu",
+      navigate: () => {
+        options2.openSystemMenu();
+        options2.onRenderRequest();
+      }
     },
-    render({ width }) {
-      selected = clampIndex(selected, options2.cliOptions.length);
-      return [
-        "",
-        centerText(MISSION_CONTROL_THEME.dim(renderBreadcrumbs(options2.stack.breadcrumbs())), width),
-        centerText(MISSION_CONTROL_THEME.accent("Start"), width),
-        "",
-        ...options2.cliOptions.map((entry, index) => centerText(formatStartCliRow(entry, index === selected, options2.sessionOptions), width)),
-        "",
-        centerText(MISSION_CONTROL_THEME.dim("\u2191\u2193 select  Enter launch  \u2192 model  Esc back"), width)
-      ];
+    {
+      kind: "navigate",
+      id: "system:exit",
+      label: "Exit",
+      navigate: options2.onExitFleet
     }
-  };
+  ];
 }
-function openStartModelOverride(options2, entry) {
+function openModelOverride(options2) {
   options2.stack.push(createInputModal({
-    title: `${entry.label} Model Override`,
+    title: `${options2.entry.label} Model Override`,
     message: "Set model override for the next launch.",
     mode: "text",
     initialValue: options2.sessionOptions?.getDraft().model ?? "",
@@ -40093,98 +40226,6 @@ function openStartModelOverride(options2, entry) {
     }
   }));
 }
-function formatStartCliRow(entry, selected, sessionOptions) {
-  const marker = selected ? MISSION_CONTROL_THEME.accent("\u25B8") : MISSION_CONTROL_THEME.dim(" ");
-  const label = selected ? MISSION_CONTROL_THEME.bg("selected", MISSION_CONTROL_THEME.accent(entry.label)) : entry.label;
-  const model = sessionOptions?.getDraft().model;
-  const detail = model === void 0 ? "" : MISSION_CONTROL_THEME.dim(`  model ${model}`);
-  return `${marker} ${label}${detail}`;
-}
-function isRight(data) {
-  return data === "\x1B[C" || data === "\x1BOC";
-}
-function clampIndex(index, length) {
-  if (length <= 0) {
-    return 0;
-  }
-  return Math.min(index, length - 1);
-}
-function moveIndex(index, length, delta) {
-  return length === 0 ? 0 : (index + delta + length) % length;
-}
-function createOptionsPanel(options2) {
-  let saveError = "";
-  return createActionListPanel({
-    id: "mission-control:options",
-    title: "Options",
-    footer: "\u2191\u2193 select  Enter apply  Esc back",
-    statusLines: () => [
-      ...options2.sessionOptions === void 0 ? [MISSION_CONTROL_THEME.dim("Session options are unavailable.")] : [],
-      ...saveError.length > 0 ? [MISSION_CONTROL_THEME.error(`Save failed: ${saveError}`)] : []
-    ],
-    actions: () => [
-      {
-        id: "mode",
-        label: "Mode",
-        detail: options2.sessionOptions?.getResolved().values.native ? "Native" : "Fleet prompt",
-        run: () => {
-          options2.sessionOptions?.toggleNative();
-          options2.onRenderRequest();
-        }
-      },
-      {
-        id: "system-prompt",
-        label: "System prompt",
-        detail: formatSystemPromptOption(options2.sessionOptions),
-        run: () => {
-          cycleSystemPromptRuntime(options2.sessionOptions);
-          options2.onRenderRequest();
-        }
-      },
-      {
-        id: "metaphor",
-        label: "Metaphor",
-        detail: options2.sessionOptions?.getResolved().values.enableMetaphor ? "Enabled" : "Off",
-        run: () => {
-          options2.sessionOptions?.toggleEnableMetaphor();
-          options2.onRenderRequest();
-        }
-      },
-      {
-        id: "cursor-sync",
-        label: "Cursor sync",
-        detail: options2.sessionOptions?.getResolved().values.cursorSync ? "Enabled" : "Off",
-        run: () => {
-          options2.sessionOptions?.toggleCursorSync();
-          options2.onRenderRequest();
-        }
-      },
-      {
-        id: "save-defaults",
-        label: "Save defaults",
-        run: () => {
-          saveError = "";
-          options2.onRenderRequest();
-          void options2.sessionOptions?.saveDraft().then(() => {
-            saveError = "";
-            options2.onRenderRequest();
-          }).catch((error51) => {
-            saveError = formatSaveError(error51);
-            options2.onRenderRequest();
-          });
-        }
-      },
-      {
-        id: "reset-overrides",
-        label: "Reset overrides",
-        run: () => {
-          options2.sessionOptions?.resetOverrides();
-          options2.onRenderRequest();
-        }
-      }
-    ]
-  });
-}
 function createSystemMenuPanel(options2) {
   return createActionListPanel({
     id: "mission-control:system-menu",
@@ -40225,9 +40266,7 @@ function createSystemMenuPanel(options2) {
           stack.push(createDiagnosticsPanel({
             cwd: options2.cwd,
             env: options2.env,
-            onPresetReset: options2.onPresetReset,
             onRenderRequest: options2.onRenderRequest,
-            presetService: options2.presetService,
             stack
           }));
         }
@@ -40276,24 +40315,6 @@ function formatSystemPromptOption(sessionOptions) {
   }
   return values.replaceSystemPrompt ? "Replace" : "Append";
 }
-function cycleSystemPromptRuntime(sessionOptions) {
-  const draft = sessionOptions?.getDraft();
-  if (draft === void 0) {
-    return;
-  }
-  if (draft.native) {
-    sessionOptions?.toggleNative();
-    if (draft.replaceSystemPrompt) {
-      sessionOptions?.toggleReplaceSystemPrompt();
-    }
-    return;
-  }
-  if (!draft.replaceSystemPrompt) {
-    sessionOptions?.toggleReplaceSystemPrompt();
-    return;
-  }
-  sessionOptions?.toggleNative();
-}
 function isFailedExit(event) {
   return event.exitCode !== void 0 && event.exitCode !== 0 || event.signal !== void 0 && event.signal !== 0;
 }
@@ -40333,20 +40354,14 @@ function getMissionControlPanelFocusLine(component, width, rendered, panelLines)
   if (panelFocusLine === void 0) return void 0;
   return rendered.length - panelLines.length + panelFocusLine;
 }
-function formatSaveError(error51) {
-  if (error51 instanceof Error && error51.message.length > 0) {
-    return error51.message;
-  }
-  return "Failed to save Fleet options.";
-}
 
 // src/mission-control/loaded-counts.ts
 import { existsSync as existsSync6, readdirSync as readdirSync3, statSync as statSync2 } from "fs";
-import { join as join11 } from "path";
+import { join as join10 } from "path";
 
 // ../../packages/fleet-wiki/dist/index.js
 import path62 from "path";
-import path13 from "path";
+import path12 from "path";
 import path52 from "path";
 import crypto4 from "crypto";
 import { mkdir as mkdir4, readdir as readdir2, readFile as readFile3, rename, rm as rm2, stat as stat2, writeFile as writeFile2 } from "fs/promises";
@@ -40370,7 +40385,7 @@ import crypto22 from "crypto";
 import { readdir as readdir3 } from "fs/promises";
 import path122 from "path";
 import path112 from "path";
-import path132 from "path";
+import path13 from "path";
 import { readFile as readFile42, stat as stat22 } from "fs/promises";
 import path14 from "path";
 import path15 from "path";
@@ -40422,7 +40437,7 @@ function extractLegacyMarkdownWikiLinks(body, wikiDir, basePath) {
 }
 function resolveLegacyWikiTarget(target, wikiDir, basePath) {
   if (!target || target.startsWith("#")) return null;
-  if (path13.isAbsolute(target)) return null;
+  if (path12.isAbsolute(target)) return null;
   if (/^[a-z][a-z0-9+.-]*:/i.test(target)) return null;
   const withoutFragment = target.split("#", 1)[0]?.split("?", 1)[0] ?? "";
   if (!withoutFragment.endsWith(".md")) return null;
@@ -40432,12 +40447,12 @@ function resolveLegacyWikiTarget(target, wikiDir, basePath) {
   } catch {
     return null;
   }
-  const resolved = path13.resolve(path13.dirname(basePath), decodedTarget);
-  const relative = path13.relative(wikiDir, resolved);
-  if (!relative || relative.startsWith("..") || path13.isAbsolute(relative)) return null;
+  const resolved = path12.resolve(path12.dirname(basePath), decodedTarget);
+  const relative = path12.relative(wikiDir, resolved);
+  if (!relative || relative.startsWith("..") || path12.isAbsolute(relative)) return null;
   return {
     target,
-    entryId: path13.basename(relative, ".md")
+    entryId: path12.basename(relative, ".md")
   };
 }
 var KNOWLEDGE_ROOT_DIRNAME2 = ".fleet/knowledge";
@@ -44279,7 +44294,7 @@ async function planIngest(input, paths, now) {
   const target = `wiki/${input.id}.md`;
   const proposer = input.proposer ?? "tool:wiki_ingest";
   const currentEntry = await readWikiEntry(input.id, paths);
-  const currentMarkdown = currentEntry ? await readPatchFile(path132.join(paths.wikiDir, `${input.id}.md`)) : void 0;
+  const currentMarkdown = currentEntry ? await readPatchFile(path13.join(paths.wikiDir, `${input.id}.md`)) : void 0;
   const currentHash = currentMarkdown ? computeContentHash(currentMarkdown) : void 0;
   const rawSource = buildRawSourceEntry(input, now);
   await ensureWorkspaceSchema(paths);
@@ -46394,7 +46409,7 @@ function countQueuedPatches(queueDir) {
     if (!entry.isDirectory() || entry.name.startsWith("_")) {
       continue;
     }
-    const patchPath = join11(queueDir, entry.name, QUEUE_PATCH_FILENAME);
+    const patchPath = join10(queueDir, entry.name, QUEUE_PATCH_FILENAME);
     if (existsSync6(patchPath) && statSync2(patchPath).isFile()) {
       count += 1;
     }
@@ -46410,7 +46425,7 @@ function countMarkdownFilesRecursively(dir, isWikiRoot) {
     return 0;
   }
   for (const entry of entries) {
-    const entryPath = join11(dir, entry.name);
+    const entryPath = join10(dir, entry.name);
     if (entry.isDirectory()) {
       count += countMarkdownFilesRecursively(entryPath, false);
       continue;
@@ -46503,10 +46518,13 @@ function buildPanelTrackViewModel(track, runs, maxTrackBlocks = DEFAULT_MAX_TRAC
     blocks: blockTail,
     displayCli: track.displayCli,
     displayName: track.displayName,
+    displayedTokenCount: run?.displayedTokenCount ?? stats.estimatedTokenCount,
     estimatedTokenCount: stats.estimatedTokenCount,
+    finishedAt: track.finishedAt,
     isComplete: status === "done" || status === "err",
     kind: track.kind,
     runId: run?.runId ?? track.runId,
+    startedAt: track.startedAt,
     status,
     streamKey: track.streamKey,
     subtitle: track.subtitle,
@@ -46706,20 +46724,21 @@ function appendWidgetJobSummary(carrierRuntime, lines, width, jobs2, frame, them
         width
       ));
       if (shouldInlineSingleTrack(job)) continue;
-      appendTrackRows(carrierRuntime, lines, width, job, jobColor, frame, theme);
+      appendTrackRows(carrierRuntime, lines, width, job, jobColor, frame, theme, now);
     }
   }
 }
-function appendTrackRows(carrierRuntime, lines, width, job, jobColor, frame, theme) {
+function appendTrackRows(carrierRuntime, lines, width, job, jobColor, frame, theme, now) {
   for (let trackIndex = 0; trackIndex < job.tracks.length && lines.length < MAX_WIDGET_LINES; trackIndex++) {
     const track = job.tracks[trackIndex];
     if (!track) continue;
     const trackColor = resolveBackendRowColor(carrierRuntime, track.displayCli, job.ownerCarrierId) || jobColor;
     const icon = trackStatusIcon(track, frame, trackColor);
+    const elapsed = widgetTrackElapsed(track, job, now);
     const stats = widgetTrackStats(track);
     const inline = !track.isComplete ? trackInlineBlock(track) : "";
     lines.push(truncateToWidth(
-      `${STREAM_PREFIX}    ${border(theme, "\u2514\u2500")} ${icon} ${trackColor}${trackDisplayName(track)}${ANSI_RESET4}${stats}${inline}`,
+      `${STREAM_PREFIX}    ${border(theme, "\u2514\u2500")} ${icon} ${trackColor}${trackDisplayName(track)}${ANSI_RESET4}${elapsed}${stats}${inline}`,
       width
     ));
   }
@@ -46783,20 +46802,12 @@ function formatExitWarning() {
   return `${PANEL_DIM_COLOR}${EXIT_WARNING_TEXT}${ANSI_RESET4}`;
 }
 function formatCarrierTile(carrier, frame) {
-  const icon = carrierStatusIcon(carrier, frame, carrier.color);
   const hasActiveJob = carrier.activeJobCount > 0;
   const suffix = carrierBadges(carrier);
-  const prefix = `${icon} `;
   if (hasActiveJob) {
-    return `${prefix}${waveText(carrier.displayName, carrier.rgb, frame)}${suffix}${ANSI_RESET4}`;
-  }
-  return `${prefix}${carrier.color}${carrier.displayName}${suffix}${ANSI_RESET4}`;
-}
-function carrierStatusIcon(carrier, frame, color) {
-  if (carrier.activeJobCount > 0) {
-    return activeBreathingIcon(frame, color);
+    return `${waveText(carrier.displayName, carrier.rgb, frame)}${suffix}${ANSI_RESET4}`;
   }
-  return color ? `${color}\u25CB${ANSI_RESET4}` : "\u25CB";
+  return `${carrier.color}${carrier.displayName}${suffix}${ANSI_RESET4}`;
 }
 function carrierBadges(carrier) {
   if (carrier.subagentMode) {
@@ -46956,16 +46967,20 @@ function isHudEscIntermediate(code) {
   return code >= 32 && code <= 47;
 }
 function widgetTrackStats(track) {
-  const label = formatTokenEstimate(track.estimatedTokenCount);
+  const label = formatTokenEstimate(track.displayedTokenCount);
   return label ? ` ${PANEL_DIM_COLOR}${label}${ANSI_RESET4}` : "";
 }
 function widgetJobElapsed(job, now) {
   return ` ${PANEL_DIM_COLOR}${formatElapsedDuration((job.finishedAt ?? now) - job.startedAt)}${ANSI_RESET4}`;
 }
+function widgetTrackElapsed(track, job, now) {
+  if (track.startedAt === void 0) return "";
+  return ` ${PANEL_DIM_COLOR}${formatElapsedDuration((track.finishedAt ?? job.finishedAt ?? now) - track.startedAt)}${ANSI_RESET4}`;
+}
 function activeBreathingIcon(frame, color) {
   const cycleFrame = (frame % BREATHING_CYCLE_FRAMES + BREATHING_CYCLE_FRAMES) % BREATHING_CYCLE_FRAMES;
   const eased = (Math.sin(cycleFrame / BREATHING_CYCLE_FRAMES * Math.PI * 2 - Math.PI / 2) + 1) / 2;
-  const icon = eased >= 0.5 ? "\u25CF" : "\u25CB";
+  const icon = eased >= 0.5 ? "\u25CF" : " ";
   return color ? `${color}${icon}${ANSI_RESET4}` : icon;
 }
 function formatTokenEstimate(tokenCount) {
@@ -47268,6 +47283,7 @@ function createJobBarState(options2) {
     if (state.animTimer) return;
     state.animTimer = setInterval(() => {
       state.frame++;
+      advanceDisplayedTokenCounts(state);
       getJobBarStateBindings().onRenderRequest();
       stopPanelAnimTimerIfIdle();
     }, ANIM_INTERVAL_MS);
@@ -47307,8 +47323,10 @@ function createJobBarState(options2) {
   function beginTrack(event) {
     const track = getTrack(event.jobId, event.trackId);
     if (!track) return;
+    const startedAt = event.startedAt;
     const run = ensureRun(canonicalRunKey(track), track.displayCli, "conn");
     run.requestPreview = event.requestPreview ?? run.requestPreview;
+    track.startedAt = startedAt ?? track.startedAt;
     track.status = "conn";
     syncCarrierActivityStatus(track.displayCli);
   }
@@ -47349,8 +47367,10 @@ function createJobBarState(options2) {
   function finalizeTrack(event) {
     const track = getTrack(event.jobId, event.trackId);
     if (!track) return;
+    const finishedAt = event.finishedAt;
     const run = resolveRunForTrack(track) ?? ensureRun(canonicalRunKey(track), track.displayCli, toColStatus(event.status));
     track.status = toColStatus(event.status);
+    track.finishedAt = finishedAt ?? Date.now();
     run.status = track.status;
     if (event.sessionId !== void 0) run.sessionId = event.sessionId;
     if (event.error !== void 0) run.error = event.error;
@@ -47365,6 +47385,7 @@ function createJobBarState(options2) {
       displayName: input.displayName,
       kind: input.kind,
       runId: input.runId,
+      startedAt: input.startedAt,
       status: "wait",
       streamKey: input.streamKey,
       subtitle: input.subtitle,
@@ -47390,6 +47411,7 @@ function createJobBarState(options2) {
     return {
       blocks: [],
       cli,
+      displayedTokenCount: 0,
       runId,
       status,
       text: "",
@@ -47418,6 +47440,31 @@ function createJobBarState(options2) {
     run.thinking = run.blocks.filter((block) => block.type === "thought").map((block) => block.text).join("");
     run.toolCalls = run.blocks.filter((block) => block.type === "tool").map((block) => ({ status: block.status, title: block.title }));
   }
+  function advanceDisplayedTokenCounts(state) {
+    for (const run of state.runs.values()) {
+      const target = estimateTokenCount(run.blocks);
+      if (run.displayedTokenCount >= target) {
+        run.displayedTokenCount = target;
+        continue;
+      }
+      const delta = target - run.displayedTokenCount;
+      const easedStep = Math.ceil(delta * TOKEN_COUNTUP_EASING_FACTOR);
+      run.displayedTokenCount = Math.min(target, run.displayedTokenCount + Math.max(TOKEN_COUNTUP_MIN_STEP, easedStep));
+    }
+  }
+  function estimateTokenCount(blocks) {
+    let charCount = 0;
+    for (const block of blocks) {
+      if (block.type === "tool") {
+        charCount += block.title.length;
+        if (block.status) charCount += block.status.length;
+        charCount += block.detailChars ?? 0;
+        continue;
+      }
+      charCount += block.text.length;
+    }
+    return charCount === 0 ? 0 : Math.max(1, Math.round(charCount / 4));
+  }
   function prependFallbackBlocks(run, fallbackText, fallbackThought) {
     if (fallbackText && !run.text.trim()) {
       run.blocks.unshift({ text: fallbackText, type: "text" });
@@ -47620,91 +47667,45 @@ var TRUE_VALUES = /* @__PURE__ */ new Set(["1", "true", "yes", "on"]);
 var FALSE_VALUES = /* @__PURE__ */ new Set(["0", "false", "no", "off"]);
 function resolveSessionOptions(input) {
   const envCliId = input.parseCliId(input.env.FLEET_AGENT_CLI);
-  const presetDefaultCliId = parsePresetCliId(input.parseCliId, input.preset.defaultCliId);
-  const cliId = input.cliIdOverride ?? envCliId ?? presetDefaultCliId ?? input.defaults.cliId;
-  const cliIdSource = sourceOf(
-    input.cliIdOverride !== void 0,
-    envCliId !== void 0,
-    presetDefaultCliId !== void 0
-  );
-  const cliPreset = input.preset.byCli[cliId] ?? {};
+  const cliId = input.cliIdOverride ?? envCliId ?? input.defaults.cliId;
+  const cliIdSource = input.cliIdOverride !== void 0 ? "arg" : envCliId !== void 0 ? "env" : "default";
+  const native = chooseBooleanWithoutArg({
+    env: parseBooleanEnv(input.env.FLEET_NATIVE),
+    globalOptions: input.globalOptions.native,
+    fallback: input.defaults.native
+  });
+  const replaceSystemPrompt = chooseBooleanWithoutArg({
+    env: parseBooleanEnv(input.env.FLEET_REPLACE_SYSTEM_PROMPT),
+    globalOptions: input.globalOptions.replaceSystemPrompt,
+    fallback: input.defaults.replaceSystemPrompt
+  });
+  const enableMetaphor = chooseBooleanWithoutArg({
+    env: parseBooleanEnv(input.env.FLEET_ENABLE_METAPHOR),
+    globalOptions: input.globalOptions.enableMetaphor,
+    fallback: input.defaults.enableMetaphor
+  });
   return {
     values: {
       cliId,
-      model: chooseString({
-        arg: void 0,
-        env: void 0,
-        preset: cliPreset.model,
-        fallback: input.defaults.model
-      }).value,
-      native: chooseBooleanWithoutArg({
-        env: parseBooleanEnv(input.env.FLEET_NATIVE),
-        preset: cliPreset.native,
-        fallback: input.defaults.native
-      }).value,
-      replaceSystemPrompt: chooseBooleanWithoutArg({
-        env: parseBooleanEnv(input.env.FLEET_REPLACE_SYSTEM_PROMPT),
-        preset: cliPreset.replaceSystemPrompt,
-        fallback: input.defaults.replaceSystemPrompt
-      }).value,
-      enableMetaphor: chooseBooleanWithoutArg({
-        env: parseBooleanEnv(input.env.FLEET_ENABLE_METAPHOR),
-        preset: cliPreset.enableMetaphor,
-        fallback: input.defaults.enableMetaphor
-      }).value,
-      cursorSync: chooseBoolean({
-        arg: input.argv.argvOverrides.cursorSync ? input.argv.cursorSync : void 0,
-        env: parseCursorSyncEnv(input.env.FLEET_CURSOR_SYNC),
-        preset: cliPreset.cursorSync,
-        fallback: input.defaults.cursorSync
-      }).value
+      model: input.defaults.model,
+      native: native.value,
+      replaceSystemPrompt: replaceSystemPrompt.value,
+      enableMetaphor: enableMetaphor.value
     },
     sources: {
       cliId: cliIdSource,
-      model: chooseString({ arg: void 0, env: void 0, preset: cliPreset.model, fallback: input.defaults.model }).source,
-      native: chooseBooleanWithoutArg({ env: parseBooleanEnv(input.env.FLEET_NATIVE), preset: cliPreset.native, fallback: input.defaults.native }).source,
-      replaceSystemPrompt: chooseBooleanWithoutArg({ env: parseBooleanEnv(input.env.FLEET_REPLACE_SYSTEM_PROMPT), preset: cliPreset.replaceSystemPrompt, fallback: input.defaults.replaceSystemPrompt }).source,
-      enableMetaphor: chooseBooleanWithoutArg({ env: parseBooleanEnv(input.env.FLEET_ENABLE_METAPHOR), preset: cliPreset.enableMetaphor, fallback: input.defaults.enableMetaphor }).source,
-      cursorSync: chooseBoolean({ arg: input.argv.argvOverrides.cursorSync ? input.argv.cursorSync : void 0, env: parseCursorSyncEnv(input.env.FLEET_CURSOR_SYNC), preset: cliPreset.cursorSync, fallback: input.defaults.cursorSync }).source
+      model: "default",
+      native: native.source,
+      replaceSystemPrompt: replaceSystemPrompt.source,
+      enableMetaphor: enableMetaphor.source
     }
   };
 }
-function toPresetFragment(options2) {
-  return {
-    ...options2.model !== void 0 ? { model: options2.model } : {},
-    native: options2.native,
-    replaceSystemPrompt: options2.replaceSystemPrompt,
-    enableMetaphor: options2.enableMetaphor,
-    cursorSync: options2.cursorSync
-  };
-}
-function chooseBoolean(options2) {
-  if (options2.arg !== void 0) return { value: options2.arg, source: "arg" };
-  if (options2.env !== void 0) return { value: options2.env, source: "env" };
-  if (options2.preset !== void 0) return { value: options2.preset, source: "preset" };
-  return { value: options2.fallback, source: "default" };
-}
 function chooseBooleanWithoutArg(options2) {
   if (options2.env !== void 0) return { value: options2.env, source: "env" };
-  if (options2.preset !== void 0) return { value: options2.preset, source: "preset" };
+  if (options2.globalOptions !== void 0) return { value: options2.globalOptions, source: "global-options" };
   return { value: options2.fallback, source: "default" };
 }
-function chooseString(options2) {
-  if (options2.arg !== void 0) return { value: options2.arg, source: "arg" };
-  if (options2.env !== void 0) return { value: options2.env, source: "env" };
-  if (options2.preset !== void 0) return { value: options2.preset, source: "preset" };
-  return { value: options2.fallback, source: "default" };
-}
-function sourceOf(hasArg, hasEnv, hasPreset) {
-  if (hasArg) return "arg";
-  if (hasEnv) return "env";
-  if (hasPreset) return "preset";
-  return "default";
-}
-function parseCursorSyncEnv(value) {
-  if (value === void 0) return void 0;
-  return parseBooleanEnv(value) ?? true;
-}
 function parseBooleanEnv(value) {
   if (value === void 0) return void 0;
   const normalized = value.trim().toLowerCase();
@@ -47712,23 +47713,18 @@ function parseBooleanEnv(value) {
   if (FALSE_VALUES.has(normalized)) return false;
   return void 0;
 }
-function parsePresetCliId(parseCliId, value) {
-  try {
-    return parseCliId(value);
-  } catch {
-    return void 0;
-  }
-}
 
 // src/mission-control/options/runtime.ts
 function createSessionOptionsRuntime(options2) {
-  let preset = options2.presetService.load();
+  let globalOptions = options2.globalOptionsService.load();
   let resolved = resolve3();
   let sessionFields = /* @__PURE__ */ new Set();
   let draft = { ...resolved.values };
+  let statusLines = [];
   return {
     getResolved: () => toDraftResolved(),
     getDraft: () => draft,
+    getStatusLines: () => statusLines,
     selectCli: (cliId) => {
       const previousDraft = draft;
       const nextResolved = resolveForCli(cliId);
@@ -47740,42 +47736,12 @@ function createSessionOptionsRuntime(options2) {
       };
       markSession("cliId");
     },
-    toggleNative: () => {
-      draft = { ...draft, native: !draft.native };
-      markSession("native");
-    },
-    toggleReplaceSystemPrompt: () => {
-      draft = { ...draft, replaceSystemPrompt: !draft.replaceSystemPrompt };
-      markSession("replaceSystemPrompt");
-    },
-    toggleEnableMetaphor: () => {
-      draft = { ...draft, enableMetaphor: !draft.enableMetaphor };
-      markSession("enableMetaphor");
-    },
-    toggleCursorSync: () => {
-      draft = { ...draft, cursorSync: !draft.cursorSync };
-      markSession("cursorSync");
-    },
+    toggleNative: () => updateBoolean("native", !draft.native),
+    toggleReplaceSystemPrompt: () => updateBoolean("replaceSystemPrompt", !draft.replaceSystemPrompt),
+    toggleEnableMetaphor: () => updateBoolean("enableMetaphor", !draft.enableMetaphor),
     setModel: (model) => {
       draft = { ...draft, model: model && model.length > 0 ? model : void 0 };
       markSession("model");
-    },
-    saveDraft: async () => {
-      preset = options2.presetService.update({
-        defaultCliId: draft.cliId,
-        cliId: draft.cliId,
-        values: toPresetFragment(draft)
-      });
-      resolved = resolve3();
-      sessionFields = /* @__PURE__ */ new Set();
-      draft = { ...resolved.values };
-      return resolved;
-    },
-    resetOverrides: () => {
-      preset = options2.presetService.load();
-      resolved = resolveWithoutArg();
-      sessionFields = /* @__PURE__ */ new Set();
-      draft = { ...resolved.values };
     }
   };
   function resolve3() {
@@ -47783,22 +47749,8 @@ function createSessionOptionsRuntime(options2) {
       argv: options2.argv,
       defaults: options2.defaults,
       env: options2.env,
-      parseCliId: options2.parseCliId,
-      preset
-    });
-  }
-  function resolveWithoutArg() {
-    return resolveSessionOptions({
-      argv: {
-        ...options2.argv,
-        argvOverrides: {
-          cursorSync: false
-        }
-      },
-      defaults: options2.defaults,
-      env: options2.env,
-      parseCliId: options2.parseCliId,
-      preset
+      globalOptions,
+      parseCliId: options2.parseCliId
     });
   }
   function resolveForCli(cliId) {
@@ -47810,13 +47762,23 @@ function createSessionOptionsRuntime(options2) {
         cliId
       },
       env: options2.env,
-      parseCliId: options2.parseCliId,
-      preset
+      globalOptions,
+      parseCliId: options2.parseCliId
     });
   }
   function markSession(field) {
     sessionFields = new Set(sessionFields).add(field);
   }
+  function persistGlobalOptions(field, value) {
+    statusLines = [];
+    void Promise.resolve().then(() => {
+      globalOptions = options2.globalOptionsService.update((current) => ({ ...current, [field]: value }));
+    }).catch((error51) => {
+      statusLines = [`Save failed: ${formatSaveError(error51)}`];
+    }).finally(() => {
+      options2.onStatusChange?.();
+    });
+  }
   function toDraftResolved() {
     return {
       sources: {
@@ -47826,6 +47788,19 @@ function createSessionOptionsRuntime(options2) {
       values: draft
     };
   }
+  function updateBoolean(field, value) {
+    globalOptions = { ...globalOptions, [field]: value };
+    resolved = resolve3();
+    draft = { ...draft, [field]: value };
+    markSession(field);
+    persistGlobalOptions(field, value);
+  }
+}
+function formatSaveError(error51) {
+  if (error51 instanceof Error && error51.message.length > 0) {
+    return error51.message;
+  }
+  return "Failed to save Fleet options.";
 }
 
 // src/runtime/runtime.ts
@@ -47995,7 +47970,7 @@ var DEFAULT_HOST_KEYBINDINGS = [
 function createMissionControlProfileConfig(options2) {
   return {
     cliOptions: getAgentCliMetadata(),
-    defaultCliId: resolveAgentCliId(options2.env),
+    initialCliId: resolveAgentCliId(options2.env),
     resolveProfile: (selectedCliId, launchOptions) => resolveAgentCliProfile(options2.env, options2.invocationCwd, { cliId: selectedCliId, model: launchOptions?.model })
   };
 }
@@ -48008,14 +47983,17 @@ async function runApp(options2 = {}) {
     argv: argvOptions,
     defaults: {
       cliId: getDefaultAgentCliId(),
-      cursorSync: true,
       enableMetaphor: false,
       native: false,
       replaceSystemPrompt: true
     },
     env: process.env,
-    parseCliId: parseAgentCliId,
-    presetService: runtime.infraServices.presetService
+    globalOptionsService: runtime.infraServices.globalOptionsService,
+    onStatusChange: () => {
+      ptyManager?.requestResize("programmatic");
+      scheduleRender();
+    },
+    parseCliId: parseAgentCliId
   });
   const initialSessionOptions = sessionOptionsRuntime.getResolved().values;
   const cliId = initialSessionOptions.cliId;
@@ -48036,7 +48014,6 @@ async function runApp(options2 = {}) {
     env: process.env,
     invocationCwd
   });
-  const optionChips = createMissionControlOptionChips(sessionOptionsRuntime.getResolved());
   const wikiController = createWikiProcessController({
     cwd: invocationCwd,
     onChange: () => {
@@ -48047,11 +48024,8 @@ async function runApp(options2 = {}) {
   const release2 = readFleetCliRelease();
   const missionControl = createMissionControlController({
     ...missionControlProfileConfig,
-    defaultCliId: cliId,
-    cliOptions: missionControlProfileConfig.cliOptions.map((entry) => ({
-      ...entry,
-      optionChips: entry.id === cliId ? optionChips : []
-    })),
+    initialCliId: cliId,
+    cliOptions: missionControlProfileConfig.cliOptions,
     authService: runtime.infraServices.authService,
     carrierRuntime: runtime.carrierRuntime,
     createPtyHost: (profile) => createPtyHost({ profile }),
@@ -48071,7 +48045,6 @@ async function runApp(options2 = {}) {
     },
     env: process.env,
     invocationCwd,
-    presetService: runtime.infraServices.presetService,
     release: release2,
     sessionOptions: sessionOptionsRuntime,
     wikiController
@@ -48199,7 +48172,7 @@ async function runApp(options2 = {}) {
     writeDedicated: (data) => missionControl.ptyHost.write(data)
   });
   syncCursorPolicy = createCursorPolicySync({
-    cursorSync: true,
+    cursorSync: argvOptions.cursorSync,
     cursorSyncExplicitlyEnabled: argvOptions.cursorSyncExplicitlyEnabled,
     fleetPty: missionBridge.ptyApi,
     getActiveAgentProfileId: () => missionControl.getActiveProfile()?.id,
@@ -48209,14 +48182,6 @@ async function runApp(options2 = {}) {
     ptyView: missionControl.ptyView,
     ui
   });
-  const staticCursorPolicySync = syncCursorPolicy;
-  syncCursorPolicy = () => {
-    if (!sessionOptionsRuntime.getDraft().cursorSync) {
-      ui.setCursorAnchorTarget(void 0);
-      return;
-    }
-    staticCursorPolicySync();
-  };
   ui.setChildren([missionControl.component, missionBridge.component]);
   syncCursorPolicy();
   missionBridge.start();
@@ -48233,17 +48198,6 @@ async function runApp(options2 = {}) {
   process.stdout.write(KITTY_ENABLE);
   disposeInputStream = attachInputStream(ui);
 }
-function createMissionControlOptionChips(resolved) {
-  const { sources, values } = resolved;
-  const star = (source) => source === "arg" ? "*" : "";
-  return [
-    values.native ? `Native${star(sources.native)}` : `Fleet prompt${star(sources.native)}`,
-    values.replaceSystemPrompt ? `Replace${star(sources.replaceSystemPrompt)}` : `Append${star(sources.replaceSystemPrompt)}`,
-    values.enableMetaphor ? `Metaphor${star(sources.enableMetaphor)}` : void 0,
-    values.model ? values.model : void 0,
-    values.cursorSync ? void 0 : `Cursor off${star(sources.cursorSync)}`
-  ].filter((chip) => chip !== void 0);
-}
 function createRunAppArgOptions(options2) {
   return {
     argvOverrides: {
@@ -48307,7 +48261,7 @@ var HELP_BANNER_INDENT2 = "  ";
 var HELP_HINT = "Run 'fleet --help' for usage.";
 var TRUE_VALUES2 = /* @__PURE__ */ new Set(["1", "true", "yes", "on"]);
 function parseFleetCliOptions(argv2, env = process.env) {
-  const cursorSyncEnv = parseCursorSyncEnv2(env.FLEET_CURSOR_SYNC);
+  const cursorSyncEnv = parseCursorSyncEnv(env.FLEET_CURSOR_SYNC);
   let cursorSync = cursorSyncEnv.value;
   let cursorSyncExplicitlyEnabled = cursorSyncEnv.explicitlyEnabled;
   let help = false;
@@ -48368,7 +48322,7 @@ function formatUnknownFleetOption(option3) {
   return `Unknown fleet option: ${option3}
 ${HELP_HINT}`;
 }
-function parseCursorSyncEnv2(value) {
+function parseCursorSyncEnv(value) {
   if (value === void 0) {
     return { explicitlyEnabled: false, value: true };
   }