@dotobokuri/fleet-cli 1.1.1 → 1.1.3

package/dist/index.js

@@ -18998,6 +18998,7 @@ var models_default = {
         { modelId: "gemini-3-flash", name: "Gemini 3 Flash", effort: { supported: false } },
         { modelId: "gemini-3.5-flash", name: "Gemini 3.5 Flash", effort: { supported: false } },
         { modelId: "claude-opus-4-7-thinking", name: "Claude Opus 4.7 Thinking", spawnModelTemplate: "claude-opus-4-7-thinking-{effort}", effort: { supported: true, levels: ["low", "medium", "high", "xhigh", "max"], default: "xhigh" } },
+        { modelId: "claude-opus-4-8-thinking", name: "Claude Opus 4.8 Thinking", spawnModelTemplate: "claude-opus-4-8-thinking-{effort}", effort: { supported: true, levels: ["low", "medium", "high", "xhigh", "max"], default: "xhigh" } },
         { modelId: "claude-4.6-sonnet-medium-thinking", name: "Claude Sonnet 4.6 Medium Thinking", effort: { supported: false } }
       ]
     }
@@ -31862,12 +31863,20 @@ async function runTaskForceBackend(registry3, cliType, carrierId, requestKey, re
         appendBlock(jobId, toArchiveBlock("thought", carrierId, text, cliType));
         emitStreamEvent(registry3, { type: "track:thought", jobId, trackId, text: cleanText });
       },
-      onToolCall: (title, status, _rawOutput, toolCallId) => {
+      onToolCall: (title, status, rawOutput, toolCallId) => {
         progress.status = "streaming";
         progress.toolCallCount++;
         const cleanTitle = sanitizeToolLabel(title);
         const cleanStatus = sanitizeToolLabel(status);
-        emitStreamEvent(registry3, { type: "track:tool", jobId, trackId, title: cleanTitle, status: cleanStatus, toolCallId });
+        emitStreamEvent(registry3, {
+          type: "track:tool",
+          jobId,
+          trackId,
+          detailChars: rawOutput?.length ?? 0,
+          title: cleanTitle,
+          status: cleanStatus,
+          toolCallId
+        });
       }
     });
     progress.status = result.status === "done" ? "done" : "error";
@@ -32043,14 +32052,7 @@ function buildCarrierDispatchToolSpec(registry3) {
         });
       }
       const metadata = config2.carrierMetadata;
-      if (isCarrierAgentModeSubagent(carrierId, config2.defaultAgentMode)) {
-        const displayName = resolveCarrierDisplayName(registry3, carrierId);
-        return launchResponseResult({
-          job_id: jobId,
-          accepted: false,
-          error: `Carrier "${carrierId}" is in native subagent mode and is unreachable via carrier_dispatch. Invoke it directly as the native subagent "${displayName}".`
-        });
-      }
+      const isNativeSubagentMode = isCarrierAgentModeSubagent(carrierId, config2.defaultAgentMode);
       if (metadata) {
         const blockValidation = validateRequiredRequestBlocks(metadata, request, carrierId);
         if (!blockValidation.ok) {
@@ -32061,7 +32063,7 @@ function buildCarrierDispatchToolSpec(registry3) {
           });
         }
       }
-      if (getConfiguredTaskForceBackends(carrierId).length >= 2) {
+      if (!isNativeSubagentMode && getConfiguredTaskForceBackends(carrierId).length >= 2) {
         return launchTaskForceJob({
           registry: registry3,
           carrierId,
@@ -32198,10 +32200,18 @@ async function runSingleCarrier(opts) {
         appendBlock(opts.jobId, toArchiveBlock("thought", opts.carrierId, text));
         emitStreamEvent(opts.registry, { type: "track:thought", jobId: opts.jobId, trackId: opts.carrierId, text: cleanText });
       },
-      onToolCall: (toolTitle, toolStatus, _rawOutput, toolCallId) => {
+      onToolCall: (toolTitle, toolStatus, rawOutput, toolCallId) => {
         const title = sanitizeToolLabel(toolTitle);
         const status = sanitizeToolLabel(toolStatus);
-        emitStreamEvent(opts.registry, { type: "track:tool", jobId: opts.jobId, trackId: opts.carrierId, title, status, toolCallId });
+        emitStreamEvent(opts.registry, {
+          type: "track:tool",
+          jobId: opts.jobId,
+          trackId: opts.carrierId,
+          detailChars: rawOutput?.length ?? 0,
+          title,
+          status,
+          toolCallId
+        });
       }
     });
     const finalStatus = toCarrierJobStatus(execResult.status);
@@ -33722,7 +33732,6 @@ function createBoundCarrierJobs(registry3, boundStream = createBoundCarrierStrea
 }
 
 // ../../packages/fleet-admiral/dist/index.js
-var FLEET_ACTION_LABEL = "Fleet Action Protocol";
 var FLEET_ACTION_PROMPT = String.raw`Every task progresses through the following phases **in order**. Phases marked *conditional* may be skipped when the task is trivially small or the condition is not met.
 
 **Deep Dive rule:** After **every phase** that produces analytical results, evaluate whether the Deep Dive Standing Order should be triggered before advancing to the next phase. This applies to all phases — not just analysis phases.
@@ -33875,21 +33884,16 @@ Resolve technical trade-offs first; never delegate unresolved decisions to a pla
 ### Tool Selection
 | Intent | Tool |
 |---|---|
-| Delegate to a roster Carrier (listed in <fleet section="roster">) | carrier_dispatch |
-| Delegate to a subagent-mode Carrier (listed in <fleet section="subagents">) | its native Claude subagent path — never carrier_dispatch |
-| Parallel subtasks on one Carrier | multiple carrier_dispatch calls |
+| Delegate to a roster Carrier (listed in <fleet section="roster">) | native subagent path (spawn_agent / agent) when available; otherwise carrier_dispatch |
+| Parallel subtasks on one Carrier | multiple invocations, same response |
 | Lookup/control detached jobs | carrier_jobs (never for delegation) |
 | Synthesis, strategic advice | (no tool) |
 
-### Routing by Carrier Mode
-A Carrier's section determines its delegation route — check it before every delegation, and do not default to carrier_dispatch reflexively.
-- carrier_dispatch reaches ONLY carriers listed in <fleet section="roster">.
-- A Carrier listed under <fleet section="subagents"> is in subagent mode: it is intentionally absent from the roster and is unreachable via carrier_dispatch. Invoke it through its native Claude subagent path exactly as that section names it; never reroute it to carrier_dispatch.
-- Native subagent results are NOT recovered into carrier_jobs, JobArchive, or [carrier:result] pushes — after invoking a subagent-mode Carrier, do not wait for a completion push.
-- If no <fleet section="subagents"> block is present, every Carrier is a roster Carrier and this rule is inert.
+### Carrier Invocation
+Every Carrier lives in <fleet section="roster">. For any Carrier, prefer the native subagent path (spawn_agent / agent); if the Carrier cannot be invoked that way in this session, fall back to carrier_dispatch. If neither path accepts the Carrier, report it unavailable per Dispatch rules — never silently substitute. Native invocations return inline and do NOT emit a [carrier:result] push — do not wait for one. Only carrier_dispatch jobs push completion via [carrier:result].
 
 ### Parallel Default
-When the same phase or step calls multiple Captain-led Carriers, dispatch them in parallel — one tool call per carrier, same response. Sequence only when:
+When the same phase or step calls multiple Captain-led Carriers, invoke them in parallel — one tool call per carrier, same response. Sequence only when:
 - a later Carrier's work depends on an earlier Carrier's output,
 - carriers share a mutable resource (same files, generated artifacts, lock files, singleton test environment), or
 - a recon Carrier must complete before a specialist Carrier can be selected.
@@ -33901,7 +33905,7 @@ When the same phase or step calls multiple Captain-led Carriers, dispatch them i
 - Splitting a parallel launch into sequential calls.
 - Sortieing a planning carrier for single-carrier work.
 - Falling back to direct work when delegation is appropriate.
-- Dispatching a subagent-mode Carrier (one listed under <fleet section="subagents">) via carrier_dispatch instead of its native subagent path.`
+- Treating native subagent availability as exclusive; prefer the native path, but carrier_dispatch remains allowed when operationally useful.`
 };
 var CONTEXT_CONFIDENCE = {
   id: "context-confidence",
@@ -34103,12 +34107,12 @@ Tool results and user messages may include ${"`"}<system-reminder>${"`"} tags. T
 `;
 function createSystemPromptBuilder(deps) {
   return {
-    build(injectTone, nativeSubagents = []) {
-      return buildSystemPromptWithSubagents(deps, injectTone, nativeSubagents);
+    build(injectTone) {
+      return buildSystemPromptFromDeps(deps, injectTone);
     }
   };
 }
-function buildSystemPromptWithSubagents(deps, injectTone, nativeSubagents) {
+function buildSystemPromptFromDeps(deps, injectTone) {
   const parts = [];
   parts.push(FLEET_PREAMBLE.trim());
   parts.push(`<fleet section="role">
@@ -34124,25 +34128,11 @@ ${FLEET_TONE_PROMPT.trim()}
   }
   const carrierRuntime = deps.carrierRuntime;
   const carrierIds = getRegisteredOrder(carrierRuntime.registry);
-  const subagentCarrierIds = nativeSubagents.map((subagent) => subagent.carrierId);
-  const rosterCarrierIds = carrierIds.filter((carrierId) => !subagentCarrierIds.includes(carrierId));
-  if (rosterCarrierIds.length > 0) {
+  if (carrierIds.length > 0) {
     parts.push(`<fleet section="roster">
 ${buildCarrierRoster(carrierRuntime.registry, carrierIds, {
-      excludeCarrierIds: subagentCarrierIds,
       heading: "# Available Carriers"
     })}
-</fleet>`);
-  }
-  if (nativeSubagents.length > 0) {
-    const metadataByCarrierId = new Map(
-      nativeSubagents.map((subagent) => [
-        subagent.carrierId,
-        getRegisteredCarrierConfig(carrierRuntime.registry, subagent.carrierId)?.carrierMetadata
-      ]).filter((entry) => Boolean(entry[1]))
-    );
-    parts.push(`<fleet section="subagents">
-${buildNativeSubagentSection(nativeSubagents, metadataByCarrierId)}
 </fleet>`);
   }
   const protocolBody = `# Fleet Action Protocol \u2014 Operational Doctrine
@@ -34167,34 +34157,6 @@ ${ordersBody}
   }
   return parts.join("\n\n");
 }
-function buildNativeSubagentSection(subagents, metadataByCarrierId) {
-  const host = isCodexSubagent(subagents[0]) ? "Codex" : "Claude";
-  const invocationKind = host === "Codex" ? "native Codex roles" : "native Claude subagents";
-  const lines = [
-    `# Native ${host} Subagents`,
-    `The following Fleet carriers are exposed to this ${host}-family dedicated CLI session as ${invocationKind}.`,
-    "This path coexists with Fleet `carrier_dispatch`; use either route according to the task.",
-    "Native subagent output is not recovered into Fleet `carrier_jobs`, JobArchive, stream events, or `[carrier:result]` reminders.",
-    "When invoking a native subagent, use the carrier's structured request blocks below and keep the request concise.",
-    ""
-  ];
-  for (const subagent of subagents) {
-    lines.push(`- ${subagent.carrierId}: invoke as \`${getNativeSubagentInvocationName(subagent)}\` \u2014 ${subagent.description}`);
-    const metadata = metadataByCarrierId.get(subagent.carrierId);
-    const blockLines = metadata ? formatRequestBlocksGuide(metadata) : [];
-    if (blockLines.length > 0) {
-      lines.push("  Request blocks \u2014 wrap content in these (? = optional):");
-      lines.push(...blockLines);
-    }
-  }
-  return lines.join("\n");
-}
-function getNativeSubagentInvocationName(subagent) {
-  return isCodexSubagent(subagent) ? subagent.roleKey : subagent.name;
-}
-function isCodexSubagent(subagent) {
-  return Boolean(subagent && "roleKey" in subagent);
-}
 var CARRIER_MCP_SERVER_NAME = "fleet-carriers";
 var WIKI_MCP_SERVER_NAME = "fleet-wiki";
 var CARRIER_EXECUTOR_MCP_TOOL_IDS = ["carrier_jobs"];
@@ -35633,7 +35595,7 @@ async function injectAgentCliProfile(profile, options2) {
   const codexSubagents = startupSubagents.host === "codex" ? startupSubagents.definitions.map((definition) => ensureCodexSubagentRoleFile(definition)).filter((role) => role !== void 0) : [];
   const systemPromptFile = writeSystemPromptFile(
     profile.id,
-    options2.buildSystemPrompt(injectTone, startupSubagents.definitions),
+    options2.buildSystemPrompt(injectTone),
     options2.onCleanup
   );
   const context = {
@@ -35999,11 +35961,6 @@ var ASCII_FLEET_BANNER = [
   "\u255A\u2550\u255D     \u255A\u2550\u2550\u2550\u2550\u2550\u2550\u255D\u255A\u2550\u2550\u2550\u2550\u2550\u2550\u255D\u255A\u2550\u2550\u2550\u2550\u2550\u2550\u255D   \u255A\u2550\u255D   "
 ];
 
-// src/styles/hud.ts
-function getFleetActionHudColor() {
-  return "\x1B[38;2;100;180;255m";
-}
-
 // src/styles/carriers.ts
 var PROVIDER_RGBS = {
   claude: [255, 149, 0],
@@ -36146,9 +36103,11 @@ var SELECTED_MARKER = "\u25B8";
 var IDLE_MARKER = " ";
 var CHOICE_INDENT = 4;
 var COUNT_SEPARATOR = "  \xB7  ";
+var SELECTED_BG = "\x1B[48;2;45;55;70m";
+var DEFAULT_BG = "\x1B[48;2;28;28;36m";
 var MISSION_CONTROL_THEME = {
   accent: (text) => paint2(FLEET_ACCENT, text),
-  bg: (name, text) => paint2(name === "selected" ? "\x1B[48;2;45;55;70m" : "\x1B[48;2;28;28;36m", text),
+  bg: (name, text) => paintBackground(name === "selected" ? SELECTED_BG : DEFAULT_BG, text),
   bold: (text) => paint2("\x1B[1m", text),
   border: (text) => paint2("\x1B[38;5;244m", text),
   dim: (text) => paint2("\x1B[38;5;244m", text),
@@ -36295,6 +36254,9 @@ function computeChoiceWidth(cliOptions) {
 function paint2(code, text) {
   return paint(code, text, true);
 }
+function paintBackground(code, text) {
+  return `${code}${text.replaceAll(ANSI_RESET3, `${ANSI_RESET3}${code}`)}${ANSI_RESET3}`;
+}
 
 // src/mission-control/carrier-roster/model-flow.ts
 function buildModelEffortTransition(input) {
@@ -36372,8 +36334,8 @@ function handleCarrierStatusOverlayInput(data, inputState, controller) {
 
 // src/mission-bridge/job-bar/constants.ts
 var ANSI_RESET4 = "\x1B[0m";
-var SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
 var ANIM_INTERVAL_MS = 100;
+var BREATHING_CYCLE_FRAMES = 10;
 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`;
@@ -36389,11 +36351,11 @@ var NAME_WIDTH = 12;
 var MIN_CELL_WIDTH = 40;
 var ROSTER_ACTIONS_ID = "__roster_actions__";
 var CARRIER_ACTION_LABELS = [
-  "Edit Model",
-  "Change CLI Type",
-  "Rename",
-  "Toggle Native(SubAgent)",
-  "Open TaskForce",
+  "Agent CLI",
+  "Model",
+  "Configure TaskForce",
+  "Configure SubAgent",
+  "Rename Carrier",
   "Toggle Details"
 ];
 var ROSTER_ACTION_LABELS = [
@@ -36416,7 +36378,7 @@ function renderCarrierStatusOverlay(width, model, deps) {
       body.push({
         kind: "cell",
         line: {
-          selected: isSelected,
+          bg: isSelected ? getEntryBgColorForEntry(entry) : void 0,
           text: withIndent(renderEntryLine(entry, isSelected, deps))
         }
       });
@@ -36427,7 +36389,7 @@ function renderCarrierStatusOverlay(width, model, deps) {
         body.push(...buildRenameEditorLines(model.renameState, deps.theme));
       }
       if (isSelected && model.expandedCarrierId === entry.carrierId) {
-        body.push(...buildDetailRows(entry, Math.max(20, width - 8), deps).map((line) => toIndentedCellLine(line)));
+        body.push(...buildDetailRows(entry, getDetailInnerWidth(width), deps).map((line) => toIndentedCellLine(line)));
       }
     }
     if (gi < model.viewModel.groupedEntries.length - 1) {
@@ -36435,10 +36397,7 @@ function renderCarrierStatusOverlay(width, model, deps) {
     }
   }
   body.push({ kind: "blank" });
-  body.push(toCellLine(
-    renderRosterActionsRow(model.viewModel.selectedCarrierId === ROSTER_ACTIONS_ID, deps),
-    model.viewModel.selectedCarrierId === ROSTER_ACTIONS_ID
-  ));
+  body.push(toCellLine(renderRosterActionsRow(model.viewModel.selectedCarrierId === ROSTER_ACTIONS_ID, deps)));
   if (model.state.kind === "carrierActions") {
     body.push(...buildActionMenuLines("Carrier Actions", CARRIER_ACTION_LABELS, model.state.cursor, deps));
   }
@@ -36451,7 +36410,7 @@ function renderCarrierStatusOverlay(width, model, deps) {
     body.push({ kind: "center", text: tone(model.feedbackMessage) }, { kind: "blank" });
   }
   body.push({ kind: "center", text: deps.theme.dim(getFooterHint(model)) });
-  return renderDisplayLines(body, width, deps.theme);
+  return renderDisplayLines(body, width);
 }
 function estimateCarrierStatusRows(model, deps) {
   let rows = 0;
@@ -36475,9 +36434,78 @@ function estimateCarrierStatusRows(model, deps) {
 function clampCarrierStatusOverlayRows(maxRows, cardRows) {
   return Math.min(Math.max(0, maxRows), Math.max(0, cardRows));
 }
+function getCarrierStatusFocusLine(width, model, deps) {
+  let line = 2;
+  if (model.state.kind === "batchFrom" || model.state.kind === "batchTo") {
+    return line + getBatchChoiceLineOffset(buildBatchCliPanelLines(model.state, deps), model.state);
+  }
+  for (let gi = 0; gi < model.viewModel.groupedEntries.length; gi++) {
+    const group = model.viewModel.groupedEntries[gi];
+    line += 2;
+    for (const entry of group.entries) {
+      const entryLine = line;
+      line++;
+      if (entry.carrierId === model.viewModel.selectedCarrierId) {
+        const entryFocusLine = getSelectedEntryFocusLine(entryLine, entry, model, deps);
+        if (entryFocusLine !== void 0) return entryFocusLine;
+        line += getSelectedEntryExtraRows(width, entry, model, deps);
+      }
+    }
+    if (gi < model.viewModel.groupedEntries.length - 1) {
+      line++;
+    }
+  }
+  line++;
+  const rosterActionsLine = line;
+  if (model.viewModel.selectedCarrierId === ROSTER_ACTIONS_ID && model.state.kind === "browse") {
+    return rosterActionsLine;
+  }
+  line++;
+  if (model.state.kind === "carrierActions") {
+    return line + 1 + clampCursor(model.state.cursor, CARRIER_ACTION_LABELS.length);
+  }
+  if (model.state.kind === "rosterActions") {
+    return line + 1 + clampCursor(model.state.cursor, ROSTER_ACTION_LABELS.length);
+  }
+  return void 0;
+}
 function getModelLabel(provider, modelId) {
   return provider.models.find((model) => model.modelId === modelId)?.name ?? modelId;
 }
+function getBatchChoiceLineOffset(lines, state) {
+  const choiceStart = Math.max(0, lines.length - state.choices.length);
+  return choiceStart + clampCursor(state.cursor, state.choices.length);
+}
+function getSelectedEntryFocusLine(entryLine, entry, model, deps) {
+  const state = model.state;
+  if (shouldRenderEntryEditor(state, entry.carrierId) && "cursor" in state) {
+    return entryLine + 1 + clampCursor(state.cursor, getEntryEditorOptions(entry, state, deps).length);
+  }
+  if (model.renameState?.carrierId === entry.carrierId) {
+    return entryLine + 2;
+  }
+  if (state.kind === "browse" || state.kind === "saving") {
+    return entryLine;
+  }
+  return void 0;
+}
+function getSelectedEntryExtraRows(width, entry, model, deps) {
+  let rows = 0;
+  if (shouldRenderEntryEditor(model.state, entry.carrierId)) {
+    rows += getEntryEditorOptions(entry, model.state, deps).length;
+  }
+  if (model.renameState?.carrierId === entry.carrierId) {
+    rows += buildRenameEditorLines(model.renameState, deps.theme).length;
+  }
+  if (model.expandedCarrierId === entry.carrierId) {
+    rows += buildDetailRows(entry, getDetailInnerWidth(width), deps).length;
+  }
+  return rows;
+}
+function clampCursor(cursor, length) {
+  if (length <= 0) return 0;
+  return Math.max(0, Math.min(length - 1, cursor));
+}
 function buildBatchCliPanelLines(state, deps) {
   if (state.kind !== "batchFrom" && state.kind !== "batchTo") return [];
   const title = state.kind === "batchFrom" ? "  Batch CLI: FROM \uC120\uD0DD" : "  Batch CLI: TO \uC120\uD0DD";
@@ -36488,16 +36516,15 @@ function buildBatchCliPanelLines(state, deps) {
   }
   for (let i = 0; i < state.choices.length; i++) {
     const choice = state.choices[i];
-    const cursor = i === state.cursor ? "\u25B8" : " ";
+    const cursor = i === state.cursor ? deps.theme.accent("\u25B8") : " ";
     const content = `  ${cursor} \u25CB ${choice.label}`;
     lines.push(toCellLine(
-      choice.carrierCount === 0 && state.kind === "batchFrom" ? deps.theme.dim(content) : content,
-      i === state.cursor
+      choice.carrierCount === 0 && state.kind === "batchFrom" ? deps.theme.dim(content) : content
     ));
   }
   return lines;
 }
-function renderDisplayLines(lines, width, theme) {
+function renderDisplayLines(lines, width) {
   const cellWidth = resolveCellWidth(lines);
   return lines.map((line) => {
     if (line.kind === "blank") {
@@ -36506,28 +36533,25 @@ function renderDisplayLines(lines, width, theme) {
     if (line.kind === "center") {
       return centerText(line.text, width);
     }
-    return centerText(renderCellLine(line.line, cellWidth, theme), width);
+    return renderCellLine(line.line, cellWidth, width);
   });
 }
 function resolveCellWidth(lines) {
   const lineWidths = lines.filter((line) => line.kind === "cell").map((line) => visibleWidth(line.line.text));
   return Math.max(MIN_CELL_WIDTH, ...lineWidths);
 }
-function renderCellLine(line, cellWidth, theme) {
+function renderCellLine(line, cellWidth, width) {
   const padded = padEndVisible(truncateToWidth(line.text, cellWidth), cellWidth);
-  if (line.selected) {
-    return theme.bg("selected", padded);
-  }
-  return applyLineBg(padded, line.bg);
+  return centerText(applyLineBg(padded, line.bg), width);
 }
-function toCellLine(text, selected = false) {
+function toCellLine(text) {
   return {
     kind: "cell",
-    line: { selected, text }
+    line: { text }
   };
 }
-function toIndentedCellLine(text, selected = false) {
-  return toCellLine(withIndent(text), selected);
+function toIndentedCellLine(text) {
+  return toCellLine(withIndent(text));
 }
 function withIndent(text) {
   return `${INDENT}${text}`;
@@ -36535,6 +36559,9 @@ function withIndent(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);
@@ -36560,20 +36587,23 @@ function buildEntryEditorLines(entry, state, deps) {
   return options2.map((option3, index) => {
     const cursorToken = index === cursor ? `${getCliEntryColor(entry.cliType)}\u25B8${ANSI_RESET5}` : " ";
     const marker = option3.value === currentValue ? "\u25CF" : "\u25CB";
-    return toIndentedCellLine(`      ${cursorToken} ${marker} ${option3.label}`, index === cursor);
+    return toIndentedCellLine(`      ${cursorToken} ${marker} ${option3.label}`);
   });
 }
 function buildActionMenuLines(title, labels, cursor, deps) {
   return [
     toIndentedCellLine(deps.theme.accent(`      ${title}`)),
-    ...labels.map((label, index) => toIndentedCellLine(`      ${index === cursor ? "\u25B8" : " "} ${label}`, index === cursor))
+    ...labels.map((label, index) => {
+      const marker = index === cursor ? deps.theme.accent("\u25B8") : " ";
+      return toIndentedCellLine(`      ${marker} ${label}`);
+    })
   ];
 }
 function buildRenameEditorLines(renameState, theme) {
   const draft = renameState.draft.length > 0 ? renameState.draft : theme.dim("(empty resets default)");
   return [
     toIndentedCellLine(theme.accent("      \uC774\uB984 \uBCC0\uACBD")),
-    toIndentedCellLine(`      \u25B8 ${draft}`, true)
+    toIndentedCellLine(`      ${theme.accent("\u25B8")} ${draft}`)
   ];
 }
 function getEntryEditorCurrentValue(entry, state, deps) {
@@ -36617,10 +36647,16 @@ function isWarningFeedback(message) {
   return message.startsWith("\uC800\uC7A5 \uC2E4\uD328") || message.startsWith("\uACBD\uACE0:");
 }
 function getEntryColor(entry) {
-  if (entry.subagentMode) return getSubagentSignatureColor();
+  if (entry.subagentMode) return PROVIDER_ANSI_COLORS[entry.cliType] ?? "";
   if (entry.taskForceBackendCount >= 2) return TASKFORCE_BADGE_COLOR2;
   return PROVIDER_ANSI_COLORS[entry.cliType] ?? "";
 }
+function getEntryBgColor(cliType) {
+  return PROVIDER_BG_ANSI_COLORS[cliType];
+}
+function getEntryBgColorForEntry(entry) {
+  return getEntryBgColor(entry.cliType);
+}
 function getCliEntryColor(cliType) {
   return PROVIDER_ANSI_COLORS[cliType] ?? "";
 }
@@ -36654,7 +36690,7 @@ function renderEntryLine(entry, isSelected, deps) {
   const effortSupported = deps.getModelEffortLevels(entry.cliType, entry.model).length > 0;
   const effortStr = effortSupported && entry.effort ? `${dim3(" \xB7 ")}${entry.effort}` : "";
   const roleStr = entry.role ? dim3(`  (${entry.role})`) : "";
-  const taskForceTag = entry.taskForceBackendCount >= 2 ? `  ${TASKFORCE_BADGE_COLOR2}[TF:${entry.taskForceBackendCount}]${ANSI_RESET5}` : "";
+  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}`;
 }
@@ -36856,11 +36892,11 @@ function sanitizeCarrierMetadataText(value) {
 // src/mission-control/carrier-roster/panel.ts
 var ROSTER_ACTIONS_ID2 = "__roster_actions__";
 var CARRIER_ACTION_LABELS2 = [
-  "Edit Model",
-  "Change CLI Type",
-  "Rename",
-  "Toggle Native(SubAgent)",
-  "Open TaskForce",
+  "Agent CLI",
+  "Model",
+  "Configure TaskForce",
+  "Configure SubAgent",
+  "Rename Carrier",
   "Toggle Details"
 ];
 var ROSTER_ACTION_LABELS2 = [
@@ -36917,6 +36953,9 @@ var CarrierStatusOverlay = class {
   render(width) {
     return renderCarrierStatusOverlay(width, this.getRenderModel(), this.getRenderDeps());
   }
+  getFocusLine(width) {
+    return getCarrierStatusFocusLine(width, this.getRenderModel(), this.getRenderDeps());
+  }
   getEntries() {
     return buildStatusEntries(this.options.carrierRuntime);
   }
@@ -37014,19 +37053,19 @@ var CarrierStatusOverlay = class {
     this.state = { kind: "browse" };
     switch (index) {
       case 0:
-        this.startModelEdit();
+        this.startCliTypeEdit();
         return;
       case 1:
-        this.startCliTypeEdit();
+        this.startModelEdit();
         return;
       case 2:
-        this.startRenameEdit();
+        this.openTaskForce();
         return;
       case 3:
         this.toggleSubagentMode();
         return;
       case 4:
-        this.openTaskForce();
+        this.startRenameEdit();
         return;
       case 5:
         this.toggleDetails();
@@ -37582,7 +37621,6 @@ var RosterTaskForcePanelSurface = class {
       body.push({
         kind: "cell",
         line: {
-          selected: isSelected,
           text: withIndent2(this.renderEntryLine(entry, isSelected))
         }
       });
@@ -37592,7 +37630,7 @@ var RosterTaskForcePanelSurface = class {
           const model = models[j];
           const cursor = j === this.editCursor ? `${entry.color}\u25B8${ANSI_RESET6}` : " ";
           const marker = model.modelId === entry.model ? "\u25CF" : "\u25CB";
-          body.push(toIndentedCellLine2(`      ${cursor} ${marker} ${model.name ?? model.modelId}`, j === this.editCursor));
+          body.push(toIndentedCellLine2(`      ${cursor} ${marker} ${model.name ?? model.modelId}`));
         }
       }
       if (isSelected && this.mode === "effort") {
@@ -37601,7 +37639,7 @@ var RosterTaskForcePanelSurface = class {
           const level = effortLevels[j];
           const cursor = j === this.editCursor ? `${entry.color}\u25B8${ANSI_RESET6}` : " ";
           const marker = level === (entry.effort ?? "") ? "\u25CF" : "\u25CB";
-          body.push(toIndentedCellLine2(`      ${cursor} ${marker} ${level}`, j === this.editCursor));
+          body.push(toIndentedCellLine2(`      ${cursor} ${marker} ${level}`));
         }
       }
       if (isSelected && this.mode === "actions") {
@@ -37610,7 +37648,7 @@ var RosterTaskForcePanelSurface = class {
         for (let j = 0; j < actions.length; j++) {
           const action = actions[j];
           const cursor = j === this.editCursor ? `${entry.color}\u25B8${ANSI_RESET6}` : " ";
-          body.push(toIndentedCellLine2(`      ${cursor} ${action}`, j === this.editCursor));
+          body.push(toIndentedCellLine2(`      ${cursor} ${action}`));
         }
       }
     }
@@ -37620,7 +37658,7 @@ var RosterTaskForcePanelSurface = class {
       body.push({ kind: "center", text: color(this.feedbackMessage) }, { kind: "blank" });
     }
     body.push({ kind: "center", text: this.options.theme.dim(this.getFooterHint()) });
-    return renderDisplayLines2(body, width, this.options.theme);
+    return renderDisplayLines2(body, width);
   }
   buildBackendEntries() {
     return this.getTaskForceCliTypes().map((cliType) => {
@@ -37923,7 +37961,7 @@ function syncConfiguredTaskForceCarriers(carrierRuntime) {
 function clampOverlayRows(maxRows, cardRows) {
   return Math.min(Math.max(0, maxRows), Math.max(0, cardRows));
 }
-function renderDisplayLines2(lines, width, theme) {
+function renderDisplayLines2(lines, width) {
   const cellWidth = resolveCellWidth2(lines);
   return lines.map((line) => {
     if (line.kind === "blank") {
@@ -37932,28 +37970,25 @@ function renderDisplayLines2(lines, width, theme) {
     if (line.kind === "center") {
       return centerText(line.text, width);
     }
-    return centerText(renderCellLine2(line.line, cellWidth, theme), width);
+    return renderCellLine2(line.line, cellWidth, width);
   });
 }
 function resolveCellWidth2(lines) {
   const lineWidths = lines.filter((line) => line.kind === "cell").map((line) => visibleWidth(line.line.text));
   return Math.max(MIN_CELL_WIDTH2, ...lineWidths);
 }
-function renderCellLine2(line, cellWidth, theme) {
+function renderCellLine2(line, cellWidth, width) {
   const padded = padEndVisible2(truncateToWidth(line.text, cellWidth), cellWidth);
-  if (line.selected) {
-    return theme.bg("selected", padded);
-  }
-  return applyLineBg2(padded, line.bg);
+  return centerText(applyLineBg2(padded, line.bg), width);
 }
-function toCellLine2(text, selected = false) {
+function toCellLine2(text) {
   return {
     kind: "cell",
-    line: { selected, text }
+    line: { text }
   };
 }
-function toIndentedCellLine2(text, selected = false) {
-  return toCellLine2(withIndent2(text), selected);
+function toIndentedCellLine2(text) {
+  return toCellLine2(withIndent2(text));
 }
 function withIndent2(text) {
   return `${INDENT2}${text}`;
@@ -38001,6 +38036,9 @@ function createCarrierRosterPanel(options2) {
       component.handleInput(data);
       return true;
     },
+    getFocusLine({ width }) {
+      return component.getFocusLine?.(width);
+    },
     render({ width }) {
       return component.render(width);
     }
@@ -38028,6 +38066,9 @@ function createPanelStack(options2) {
       },
       invalidate() {
       },
+      getFocusLine(width) {
+        return api.current().getFocusLine?.({ width });
+      },
       render(width) {
         return [...api.current().render({ width })];
       }
@@ -38137,6 +38178,12 @@ function createActionListPanel(options2) {
       }
       return false;
     },
+    getFocusLine({ width }) {
+      const actions = resolveActions(options2.actions);
+      selected = clampSelected(selected, actions.length);
+      if (actions.length === 0) return void 0;
+      return getActionFocusLine(width, options2, selected);
+    },
     render({ width }) {
       const actions = resolveActions(options2.actions);
       selected = clampSelected(selected, actions.length);
@@ -38159,6 +38206,14 @@ function createActionListPanel(options2) {
     }
   };
 }
+function getActionFocusLine(width, options2, selected) {
+  const breadcrumbs = options2.breadcrumbs?.() ?? [];
+  const breadcrumbLines = breadcrumbs.length <= 1 ? [] : [
+    "",
+    centerText(MISSION_CONTROL_THEME.dim(renderBreadcrumbs(breadcrumbs)), width)
+  ];
+  return breadcrumbLines.length + 2 + selected;
+}
 function resolveActions(actions) {
   const items = typeof actions === "function" ? actions() : actions;
   return items.filter((item) => item !== false && item !== void 0);
@@ -39619,11 +39674,6 @@ function formatError3(error51) {
 }
 
 // src/mission-control/controller.ts
-var EMPTY_KEYBOARD_PROTOCOL_STATE = {
-  childRequested: false,
-  effectiveMode: "passthrough",
-  outerEnabled: false
-};
 var EMPTY_MOUSE_PROTOCOL_STATE = {
   activeEncoding: "default",
   activeProtocol: "none",
@@ -39677,16 +39727,18 @@ function createMissionControlController(options2) {
         openLauncherRoot();
       }
       if (activePanel !== void 0) {
-        return fitMissionControlRows(renderMissionControl(width, {
+        const panelLines = activePanel.component.render(width);
+        const rendered = renderMissionControl(width, {
           bannerPhase: getBannerPhase(),
           cliOptions,
           lastExit,
           loadedCounts: options2.loadedCounts,
-          panelLines: activePanel.component.render(width),
+          panelLines,
           release: release2,
           selectedCliId,
           state
-        }), rows);
+        });
+        return fitMissionControlRows(rendered, rows, getMissionControlPanelFocusLine(activePanel.component, width, rendered, panelLines));
       }
       return fitMissionControlRows(renderMissionControl(width, {
         bannerPhase: getBannerPhase(),
@@ -39701,7 +39753,6 @@ function createMissionControlController(options2) {
     resize(nextCols, nextRows) {
       cols = nextCols;
       rows = nextRows;
-      activePanel?.component.desiredHeight?.(nextRows);
       active?.view.resize(nextCols, nextRows);
     },
     scrollLines(delta) {
@@ -39712,7 +39763,6 @@ function createMissionControlController(options2) {
     }
   };
   const ptyHost = {
-    getKeyboardProtocol: () => active?.host.getKeyboardProtocol?.() ?? EMPTY_KEYBOARD_PROTOCOL_STATE,
     getMouseProtocol: () => active?.host.getMouseProtocol?.() ?? EMPTY_MOUSE_PROTOCOL_STATE,
     kill() {
       suppressNextExit = true;
@@ -40008,6 +40058,10 @@ function createStartPanel(options2) {
       }
       return false;
     },
+    getFocusLine() {
+      selected = clampIndex(selected, options2.cliOptions.length);
+      return options2.cliOptions.length === 0 ? void 0 : 4 + selected;
+    },
     render({ width }) {
       selected = clampIndex(selected, options2.cliOptions.length);
       return [
@@ -40251,10 +40305,11 @@ function normalizeRenderedRows(lines, rows) {
   }
   return normalized;
 }
-function fitMissionControlRows(lines, rows) {
+function fitMissionControlRows(lines, rows, focusLine) {
   const targetRows = Math.max(0, Math.floor(rows));
   if (lines.length >= targetRows) {
-    return lines.slice(0, targetRows);
+    const start = getFitStartLine(lines.length, targetRows, focusLine);
+    return lines.slice(start, start + targetRows);
   }
   const topPadding = Math.floor((targetRows - lines.length) / 2);
   const normalized = [
@@ -40266,6 +40321,18 @@ function fitMissionControlRows(lines, rows) {
   }
   return normalized;
 }
+function getFitStartLine(totalRows, targetRows, focusLine) {
+  if (targetRows <= 0 || focusLine === void 0 || !Number.isFinite(focusLine)) return 0;
+  const normalizedFocusLine = Math.max(0, Math.min(totalRows - 1, Math.floor(focusLine)));
+  const maxStart = Math.max(0, totalRows - targetRows);
+  if (normalizedFocusLine < targetRows) return 0;
+  return Math.min(maxStart, normalizedFocusLine - targetRows + 1);
+}
+function getMissionControlPanelFocusLine(component, width, rendered, panelLines) {
+  const panelFocusLine = component.getFocusLine?.(width);
+  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;
@@ -46361,7 +46428,6 @@ function countMarkdownFilesRecursively(dir, isWikiRoot) {
 
 // src/mission-bridge/fleet-status-section.ts
 var BORDER_CHAR = "\u2500";
-var PROTOCOL_ICON = "\u2693";
 var FleetStatusSection = class {
   constructor(options2) {
     this.options = options2;
@@ -46370,22 +46436,10 @@ var FleetStatusSection = class {
   invalidate() {
   }
   render(width) {
-    if (this.options.getNative?.() ?? this.options.native) {
-      return [renderBorder(width, DIM_COLOR)];
-    }
-    return [renderStatusLine2(width, getFleetActionHudColor(), FLEET_ACTION_LABEL)];
+    this.options.getNative?.();
+    return [renderBorder(width, DIM_COLOR)];
   }
 };
-function renderStatusLine2(width, protocolColor, protocolLabel) {
-  if (width <= 0) return "";
-  const centerBlock = paint(protocolColor, ` ${PROTOCOL_ICON} ${protocolLabel} `, true);
-  const centerWidth = visibleWidth(centerBlock);
-  if (centerWidth >= width) return truncateToWidth(centerBlock, width);
-  const remainingWidth = width - centerWidth;
-  const leftWidth = Math.floor(remainingWidth / 2);
-  const rightWidth = remainingWidth - leftWidth;
-  return renderBorder(leftWidth, protocolColor) + centerBlock + renderBorder(rightWidth, protocolColor);
-}
 function renderBorder(width, color) {
   if (width <= 0) return "";
   return paint(color, BORDER_CHAR.repeat(width), true);
@@ -46449,14 +46503,13 @@ function buildPanelTrackViewModel(track, runs, maxTrackBlocks = DEFAULT_MAX_TRAC
     blocks: blockTail,
     displayCli: track.displayCli,
     displayName: track.displayName,
-    isComplete: status === "done",
+    estimatedTokenCount: stats.estimatedTokenCount,
+    isComplete: status === "done" || status === "err",
     kind: track.kind,
     runId: run?.runId ?? track.runId,
     status,
     streamKey: track.streamKey,
     subtitle: track.subtitle,
-    textLineCount: stats.textLineCount,
-    toolCallCount: stats.toolCallCount,
     trackId: track.trackId
   };
 }
@@ -46496,16 +46549,18 @@ function resolveRun(track, runs) {
   return runs.get(track.streamKey) ?? runs.get(track.trackId);
 }
 function collectBlockStats(blocks) {
-  let textLineCount = 0;
-  let toolCallCount = 0;
+  let charCount = 0;
   for (const block of blocks) {
     if (block.type === "tool") {
-      toolCallCount++;
+      charCount += block.title.length;
+      if (block.status) charCount += block.status.length;
+      charCount += block.detailChars ?? 0;
       continue;
     }
-    textLineCount += block.text.split("\n").filter((line) => line.trim()).length;
+    charCount += block.text.length;
   }
-  return { textLineCount, toolCallCount };
+  const estimatedTokenCount = charCount === 0 ? 0 : Math.max(1, Math.round(charCount / 4));
+  return { estimatedTokenCount };
 }
 
 // src/mission-bridge/job-bar/renderer.ts
@@ -46528,8 +46583,9 @@ var KIND_LABELS = {
 function renderCarrierJobHud(options2) {
   const lines = [];
   const jobs2 = buildActiveJobViewModels(options2.jobs, options2.runs);
+  const now = options2.now ?? Date.now();
   if (jobs2.length === 0) return [];
-  appendWidgetJobSummary(options2.carrierRuntime, lines, options2.width, jobs2, options2.frame, options2.theme);
+  appendWidgetJobSummary(options2.carrierRuntime, lines, options2.width, jobs2, options2.frame, options2.theme, now);
   return lines.slice(0, MAX_WIDGET_LINES).map((line) => truncateToWidth(line, options2.width));
 }
 function renderCarrierJobHudStrip(options2) {
@@ -46540,7 +46596,6 @@ function renderCarrierJobHudStrip(options2) {
     carriers,
     options2.frame,
     options2.theme,
-    options2.keyboardProtocol,
     options2.pendingExitWarning === true
   );
 }
@@ -46616,13 +46671,12 @@ function renderBlockLines(blocks) {
   }
   return lines;
 }
-function renderCarrierHudStrip(width, carriers, frame, theme, keyboardProtocol, pendingExitWarning) {
+function renderCarrierHudStrip(width, carriers, frame, theme, pendingExitWarning) {
   const tiles = carriers.map((carrier) => formatCarrierTile(carrier, frame));
   const line = centerLine2(tiles.join(tileSeparator(theme)), width);
-  const warnedLine = prependExitWarning(line, width, pendingExitWarning);
-  return [appendProtocolIndicator(warnedLine, width, keyboardProtocol)];
+  return [prependExitWarning(line, width, pendingExitWarning)];
 }
-function appendWidgetJobSummary(carrierRuntime, lines, width, jobs2, frame, theme) {
+function appendWidgetJobSummary(carrierRuntime, lines, width, jobs2, frame, theme, now) {
   const subagentModes = readCarrierAgentModeSnapshot(buildCarrierDefaults(carrierRuntime)).agentModes;
   const groups = buildCarrierJobGroups(
     jobs2,
@@ -46635,7 +46689,7 @@ function appendWidgetJobSummary(carrierRuntime, lines, width, jobs2, frame, them
     const taskForceBackendCount = getConfiguredTaskForceBackendsFromSnapshot(readCarriersSnapshot(), group.carrierId).length;
     const groupColor = resolveCarrierPresentationColor(carrierRuntime, group.carrierId, subagentModes, taskForceBackendCount);
     lines.push(truncateToWidth(
-      `${STREAM_PREFIX}${groupColor}Carrier ${group.displayName}${ANSI_RESET4}`,
+      `${STREAM_PREFIX}${groupColor}${group.displayName}${ANSI_RESET4}`,
       width
     ));
     for (let jobIndex = 0; jobIndex < group.jobs.length && lines.length < MAX_WIDGET_LINES; jobIndex++) {
@@ -46645,9 +46699,10 @@ function appendWidgetJobSummary(carrierRuntime, lines, width, jobs2, frame, them
       const jobBranch = isLastJob ? "\u2514\u2500" : "\u251C\u2500";
       const jobColor = resolveJobRowColor(carrierRuntime, job);
       const inline = shouldInlineSingleTrack(job) && job.tracks[0] && !job.tracks[0].isComplete ? trackInlineBlock(job.tracks[0]) : "";
+      const elapsed = widgetJobElapsed(job, now);
       const stats = shouldInlineSingleTrack(job) && job.tracks[0] ? widgetTrackStats(job.tracks[0]) : "";
       lines.push(truncateToWidth(
-        `${STREAM_PREFIX}  ${border(theme, jobBranch)} ${jobIcon(job, frame, jobColor)} ${jobColor}${jobDisplayLabel(job)}${ANSI_RESET4}${stats}${inline}`,
+        `${STREAM_PREFIX}  ${border(theme, jobBranch)} ${jobIcon(job, frame, jobColor)} ${jobColor}${jobDisplayLabel(job)}${ANSI_RESET4}${elapsed}${stats}${inline}`,
         width
       ));
       if (shouldInlineSingleTrack(job)) continue;
@@ -46678,7 +46733,6 @@ function buildCarrierTiles(carrierRuntime, activeJobs) {
     const subagentMode = subagentModes[carrierId] === "subagent";
     return {
       activeJobCount: activeCarrierJobs.length,
-      activeTrackCount: activeCarrierJobs.reduce((sum, job) => sum + job.tracks.length, 0),
       carrierId,
       color: resolveCarrierPresentationColor(carrierRuntime, carrierId, subagentModes, taskForceBackendCount),
       displayName: resolveCarrierDisplayName2(carrierRuntime.registry, carrierId),
@@ -46709,14 +46763,6 @@ function centerLine2(line, width) {
 function centerPadding(line, width) {
   return Math.max(0, Math.floor((width - visibleWidth(line)) / 2));
 }
-function appendProtocolIndicator(line, width, state) {
-  if (!state) return line;
-  const indicator = formatProtocolIndicator(state);
-  const indicatorWidth = visibleWidth(indicator);
-  const content = truncateToWidth(line, Math.max(0, width - indicatorWidth));
-  const padding = Math.max(0, width - visibleWidth(content) - indicatorWidth);
-  return truncateToWidth(`${content}${" ".repeat(padding)}${indicator}`, width);
-}
 function prependExitWarning(line, width, pending) {
   if (!pending) return line;
   const warning = formatExitWarning();
@@ -46736,18 +46782,10 @@ function prependExitWarning(line, width, pending) {
 function formatExitWarning() {
   return `${PANEL_DIM_COLOR}${EXIT_WARNING_TEXT}${ANSI_RESET4}`;
 }
-function formatProtocolIndicator(state) {
-  const suffix = protocolIndicatorSuffix(state);
-  return `${PANEL_DIM_COLOR}\u2328${suffix}${ANSI_RESET4}`;
-}
-function protocolIndicatorSuffix(state) {
-  if (!state.outerEnabled) return "S";
-  return state.effectiveMode === "transform" ? "T" : "E";
-}
 function formatCarrierTile(carrier, frame) {
   const icon = carrierStatusIcon(carrier, frame, carrier.color);
   const hasActiveJob = carrier.activeJobCount > 0;
-  const suffix = `${carrierBadges(carrier)}${carrierActivityBadge(carrier)}`;
+  const suffix = carrierBadges(carrier);
   const prefix = `${icon} `;
   if (hasActiveJob) {
     return `${prefix}${waveText(carrier.displayName, carrier.rgb, frame)}${suffix}${ANSI_RESET4}`;
@@ -46756,9 +46794,7 @@ function formatCarrierTile(carrier, frame) {
 }
 function carrierStatusIcon(carrier, frame, color) {
   if (carrier.activeJobCount > 0) {
-    const frames = SPINNER_FRAMES;
-    const spinner = frames[frame % frames.length] ?? "\u25CB";
-    return color ? `${color}${spinner}${ANSI_RESET4}` : spinner;
+    return activeBreathingIcon(frame, color);
   }
   return color ? `${color}\u25CB${ANSI_RESET4}` : "\u25CB";
 }
@@ -46769,11 +46805,6 @@ function carrierBadges(carrier) {
   const tfBadge = carrier.taskForceBackendCount >= 2 ? ` ${TASKFORCE_BADGE_COLOR2}[TF:${carrier.taskForceBackendCount}]${ANSI_RESET4}` : "";
   return tfBadge;
 }
-function carrierActivityBadge(carrier) {
-  if (carrier.activeJobCount <= 0) return "";
-  const trackSuffix = carrier.activeTrackCount > 0 ? `:${carrier.activeTrackCount}` : "";
-  return ` ${PANEL_DIM_COLOR}[${carrier.activeJobCount}${trackSuffix}]${ANSI_RESET4}`;
-}
 function kindDisplayName(kind) {
   return KIND_LABELS[kind] ?? capitalize(kind);
 }
@@ -46783,9 +46814,7 @@ function capitalize(text) {
 }
 function jobIcon(job, frame, color) {
   if (job.status === "active") {
-    const frames = SPINNER_FRAMES;
-    const spinner = frames[frame % frames.length] ?? "\u25CB";
-    return color ? `${color}${spinner}${ANSI_RESET4}` : spinner;
+    return activeBreathingIcon(frame, color);
   }
   if (job.status === "done") return `${COLOR_DONE}${SYM_INDICATOR}${ANSI_RESET4}`;
   if (job.status === "error" || job.status === "aborted") return `${COLOR_ERROR}${SYM_INDICATOR}${ANSI_RESET4}`;
@@ -46813,14 +46842,12 @@ function buildCarrierDefaults(carrierRuntime) {
   );
 }
 function resolveCarrierPresentationColor(carrierRuntime, carrierId, subagentModes, taskForceBackendCount) {
-  if (subagentModes[carrierId] === "subagent") return SUBAGENT_PRESENTATION_ANSI;
+  if (subagentModes[carrierId] === "subagent") return resolveCarrierColor(carrierRuntime.registry, carrierId);
   if (taskForceBackendCount >= 2) return TASKFORCE_BADGE_COLOR2;
   return resolveCarrierColor(carrierRuntime.registry, carrierId);
 }
 function resolveCarrierPresentationRgb(carrierRuntime, carrierId, subagentModes, taskForceBackendCount) {
-  if (subagentModes[carrierId] === "subagent") {
-    return [...SUBAGENT_PRESENTATION_RGB];
-  }
+  if (subagentModes[carrierId] === "subagent") return resolveCarrierRgb(carrierRuntime.registry, carrierId);
   if (taskForceBackendCount >= 2) return TASKFORCE_BADGE_RGB;
   return resolveCarrierRgb(carrierRuntime.registry, carrierId);
 }
@@ -46836,9 +46863,7 @@ function trackStatusIcon(track, frame, color) {
     if (track.status === "err") return `${COLOR_ERROR}${SYM_INDICATOR}${ANSI_RESET4}`;
     return `${COLOR_DONE}${SYM_INDICATOR}${ANSI_RESET4}`;
   }
-  const frames = SPINNER_FRAMES;
-  const spinner = frames[frame % frames.length] ?? "\u25CB";
-  return color ? `${color}${spinner}${ANSI_RESET4}` : spinner;
+  return activeBreathingIcon(frame, color);
 }
 function trackDisplayName(track) {
   if (track.kind === "backend") {
@@ -46931,10 +46956,31 @@ function isHudEscIntermediate(code) {
   return code >= 32 && code <= 47;
 }
 function widgetTrackStats(track) {
-  const parts = [];
-  if (track.toolCallCount > 0) parts.push(`${track.toolCallCount}T`);
-  if (track.textLineCount > 0) parts.push(`${track.textLineCount}L`);
-  return parts.length > 0 ? ` ${PANEL_DIM_COLOR}[${parts.join("\xB7")}]${ANSI_RESET4}` : "";
+  const label = formatTokenEstimate(track.estimatedTokenCount);
+  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 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";
+  return color ? `${color}${icon}${ANSI_RESET4}` : icon;
+}
+function formatTokenEstimate(tokenCount) {
+  if (tokenCount <= 0) return "";
+  if (tokenCount < 1e3) return `~${tokenCount} tokens`;
+  const scaled = tokenCount / 1e3;
+  const rounded = scaled.toFixed(1).replace(/\.0$/, "");
+  return `~${rounded}k tokens`;
+}
+function formatElapsedDuration(elapsedMs) {
+  const totalSeconds = Math.max(0, Math.floor(elapsedMs / 1e3));
+  if (totalSeconds < 60) return `${totalSeconds}s`;
+  const minutes = Math.floor(totalSeconds / 60);
+  const seconds = totalSeconds % 60;
+  return `${minutes}m ${seconds}s`;
 }
 
 // src/mission-bridge/job-bar/section.ts
@@ -46963,7 +47009,6 @@ var JobBarStripSection = class {
       carrierRuntime: this.jobBarState.carrierRuntime,
       frame: state.frame,
       jobs: this.jobBarState.getActiveJobs(),
-      keyboardProtocol: this.jobBarState.getKeyboardProtocol?.(),
       pendingExitWarning: this.jobBarState.getPendingExitWarning(),
       runs: this.jobBarState.getPanelRuns(),
       width
@@ -47012,7 +47057,6 @@ function createJobBarState(options2) {
     dispose: disposeJobBarState,
     ensurePanelAnimTimer,
     getActiveJobs: getActiveJobs2,
-    getKeyboardProtocol: options2.getKeyboardProtocol,
     getGrandFleetStreamStoreState,
     getJobById,
     getPanelJobs,
@@ -47188,7 +47232,7 @@ function createJobBarState(options2) {
         return;
       case "track:tool":
         updateRunBlocks(event.jobId, event.trackId, (run) => {
-          upsertToolBlock(run.blocks, event.toolCallId, event.title, event.status);
+          upsertToolBlock(run.blocks, event.toolCallId, event.title, event.status, event.detailChars);
           if (run.status === "wait" || run.status === "conn") run.status = "stream";
         });
         schedulePanelRender(true);
@@ -47461,7 +47505,7 @@ function createJobBarState(options2) {
     }
     blocks.push({ text, type: "thought" });
   }
-  function upsertToolBlock(blocks, toolCallId, title, status) {
+  function upsertToolBlock(blocks, toolCallId, title, status, detailChars) {
     const existingIndex = blocks.findIndex(
       (block) => block.type === "tool" && (toolCallId ? block.toolCallId === toolCallId : block.title === title)
     );
@@ -47470,12 +47514,19 @@ function createJobBarState(options2) {
       if (existing?.type !== "tool") return;
       blocks[existingIndex] = {
         ...existing,
+        ...detailChars !== void 0 ? { detailChars } : {},
         status: status || existing.status,
         title: title || existing.title
       };
       return;
     }
-    blocks.push({ status, title, toolCallId, type: "tool" });
+    blocks.push({
+      ...detailChars !== void 0 ? { detailChars } : {},
+      status,
+      title,
+      toolCallId,
+      type: "tool"
+    });
   }
   function toReadonlyPanelJob(job) {
     return {
@@ -47504,7 +47555,6 @@ function createJobBarState(options2) {
 function createMissionBridgeController(options2) {
   const jobBarState = createJobBarState({
     carrierRuntime: options2.carrierRuntime,
-    getKeyboardProtocol: options2.getKeyboardProtocol,
     onCarrierResultReminder: options2.onCarrierResultReminder === void 0 ? void 0 : (text) => options2.onCarrierResultReminder?.(sanitizeCarrierResultReminder(text)),
     onRenderRequest: options2.onJobBarRenderRequest
   });
@@ -47942,11 +47992,6 @@ var DEFAULT_HOST_KEYBINDINGS = [
   { action: "host-interrupt", key: "", label: "Ctrl+C" },
   { action: "mode-toggle", key: "", label: "Ctrl+T" }
 ];
-var STANDARD_KEYBOARD_PROTOCOL_STATE = {
-  outerEnabled: false,
-  childRequested: false,
-  effectiveMode: "passthrough"
-};
 function createMissionControlProfileConfig(options2) {
   return {
     cliOptions: getAgentCliMetadata(),
@@ -48041,7 +48086,6 @@ async function runApp(options2 = {}) {
     addInputListener: (listener) => ui.addInputListener(listener),
     carrierRuntime: runtime.carrierRuntime,
     getColumns: () => ui.columns,
-    getKeyboardProtocol: () => missionControl.ptyHost.getKeyboardProtocol?.() ?? STANDARD_KEYBOARD_PROTOCOL_STATE,
     getNative: () => sessionOptionsRuntime.getDraft().native,
     getRows: () => ptyManager?.getCurrentRequest().fleetRows ?? Math.max(0, ui.rows - missionControl.ptyView.maxRows),
     onCarrierResultReminder: (text) => sendCarrierResultReminder(text),