pi-advisor-flow 0.5.5 → 0.6.0

package/src/tools/loop-gate.ts

@@ -12,24 +12,25 @@ import {
   advisorScoutEnabledRef,
   getAdvisorMaxCallsPerSession,
   isSimpleMode,
-} from "../config/state.js";
-import { herdrAdvisorActivity } from "../herdr.js";
-import type { AdvisorSessionState } from "../session-state.js";
-import { advisorUsageCost, snapshotAdvisorUsage } from "../usage.js";
-import type { runAdvisorGate } from "./consultation.js";
+} from "../config/state.ts";
+import type { GateFailureMode } from "../config/types.ts";
+import { herdrAdvisorActivity } from "../herdr.ts";
+import type { AdvisorSessionState } from "../session-state.ts";
+import { advisorUsageCost, snapshotAdvisorUsage } from "../usage.ts";
+import type { runAdvisorGate } from "./consultation.ts";
 import {
   blockedDecisionEffect,
   failureEffect,
   gateDecisionEffect,
   gateFailureEffectForMode,
   updateAdvisorUsageStatus,
-} from "./gate-policy.js";
-import { adviceForGateText } from "./gate-protocol.js";
+} from "./gate-policy.ts";
+import { adviceForGateText } from "./gate-protocol.ts";
 import {
   appendScoutLifecycleEntry,
   type ScoutStatusManager,
-} from "./scout-status.js";
-import type { AdvisorGateResult, ScoutToolDetails } from "./types.js";
+} from "./scout-status.ts";
+import type { AdvisorGateResult, ScoutToolDetails } from "./types.ts";
 
 const sendAutomaticGateCall = (pi: ExtensionAPI, event: ToolCallEvent) => {
   pi.sendMessage(
@@ -87,6 +88,65 @@ const sendAutomaticGateResult = (
   );
 };
 
+/** Records the invocation, reports it, and maps the gate decision to its
+ * tool-call result (block reason or proceed). */
+const applyGateDecision = (
+  pi: ExtensionAPI,
+  ctx: ExtensionContext,
+  session: AdvisorSessionState,
+  result: Awaited<ReturnType<typeof runAdvisorGate>>,
+  reason: string,
+  failureMode: GateFailureMode
+): ToolCallEventResult | undefined => {
+  if (!result.ok) {
+    session.recordInvocation({
+      executionEffect: gateFailureEffectForMode(failureMode),
+      failure: result.category,
+      kind: "gate",
+      model: advisorRef,
+      trigger: "repeated-tool-call",
+      usage: result.usage,
+    });
+    updateAdvisorUsageStatus(ctx, session);
+    const failure = failureEffect(
+      result.category,
+      result.message,
+      ctx,
+      session,
+      failureMode
+    );
+    sendAutomaticGateFailure(
+      pi,
+      `**Advisor gate failure (${result.category}):** ${result.message}`,
+      result.usage
+    );
+    return failure.block
+      ? { block: true, reason: `${reason}\n${failure.reason}` }
+      : undefined;
+  }
+  session.recordInvocation({
+    cost: advisorUsageCost(result.usage),
+    decision: result.decision,
+    executionEffect: gateDecisionEffect(result.decision, failureMode),
+    kind: "gate",
+    model: result.model,
+    trigger: result.trigger,
+    usage: result.usage,
+  });
+  updateAdvisorUsageStatus(ctx, session);
+  sendAutomaticGateResult(pi, result);
+  if (result.decision === "proceed") {
+    session.resetRepetition();
+    return;
+  }
+  const gateReason = `Advisor loop review: ${result.markdown}`;
+  if (result.decision === "blocked") {
+    const effect = blockedDecisionEffect(gateReason, ctx, session, failureMode);
+    return effect.block ? { block: true, reason: effect.reason } : undefined;
+  }
+  return { block: true, reason: gateReason };
+};
+
 export const handleAutomaticGate = async (
   pi: ExtensionAPI,
   event: ToolCallEvent,
@@ -151,58 +211,7 @@ export const handleAutomaticGate = async (
       event.toolCallId
     );
     ensureGateCall();
-    if (!result.ok) {
-      session.recordInvocation({
-        executionEffect: gateFailureEffectForMode(failureMode),
-        failure: result.category,
-        kind: "gate",
-        model: advisorRef,
-        trigger: "repeated-tool-call",
-        usage: result.usage,
-      });
-      updateAdvisorUsageStatus(ctx, session);
-      const failure = failureEffect(
-        result.category,
-        result.message,
-        ctx,
-        session,
-        failureMode
-      );
-      sendAutomaticGateFailure(
-        pi,
-        `**Advisor gate failure (${result.category}):** ${result.message}`,
-        result.usage
-      );
-      return failure.block
-        ? { block: true, reason: `${reason}\n${failure.reason}` }
-        : undefined;
-    }
-    session.recordInvocation({
-      cost: advisorUsageCost(result.usage),
-      decision: result.decision,
-      executionEffect: gateDecisionEffect(result.decision, failureMode),
-      kind: "gate",
-      model: result.model,
-      trigger: result.trigger,
-      usage: result.usage,
-    });
-    updateAdvisorUsageStatus(ctx, session);
-    sendAutomaticGateResult(pi, result);
-    if (result.decision === "proceed") {
-      session.resetRepetition();
-      return;
-    }
-    const gateReason = `Advisor loop review: ${result.markdown}`;
-    if (result.decision === "blocked") {
-      const effect = blockedDecisionEffect(
-        gateReason,
-        ctx,
-        session,
-        failureMode
-      );
-      return effect.block ? { block: true, reason: effect.reason } : undefined;
-    }
-    return { block: true, reason: gateReason };
+    return applyGateDecision(pi, ctx, session, result, reason, failureMode);
   } finally {
     scoutStatus.release(ctx, scoutStatusToken);
     herdrAdvisorActivity.finish();

package/src/tools/prompts.ts

@@ -6,14 +6,14 @@ import {
   advisorPlanGateRef,
   contextMaxCharsRef,
   isSimpleMode,
-} from "../config/state.js";
-import { recentConversation } from "../conversation.js";
+} from "../config/state.ts";
+import { recentConversation } from "../conversation.ts";
 import {
   capRepositoryContext,
   escapeRepositoryText,
   type GitContextLevel,
   type GitContextResult,
-} from "../git.js";
+} from "../git.ts";
 
 export const advisorMessageText = (
   conversation: string,
@@ -47,10 +47,7 @@ export const advisorMessageText = (
   );
 };
 
-/**
- * Splits the character budget so repository context can never starve the
- * conversation: it may claim its own cap or half the budget, whichever is less.
- */
+/** Splits the character budget so repository context can never starve the conversation. */
 export const advisorGitContextBudget = (
   contextMaxChars: number,
   gitContextMaxChars: number

package/src/tools/register-ask-advisor.ts

@@ -5,35 +5,30 @@ import {
   getAdvisorMaxCallsPerSession,
   getAdvisorSettings,
   isSimpleMode,
-} from "../config/state.js";
-import { herdrAdvisorActivity, notifyHerdrAdvisorFailure } from "../herdr.js";
+} from "../config/state.ts";
+import { herdrAdvisorActivity, notifyHerdrAdvisorFailure } from "../herdr.ts";
 import {
   ADVISOR_STREAM_UPDATE_INTERVAL_MS,
   createCoalescedUpdate,
-} from "../model-stream.js";
+} from "../model-stream.ts";
 import {
   advisorUsageCost,
   advisorUsageForPi,
   snapshotAdvisorUsage,
-} from "../usage.js";
-import { notifyLocalFailure, updateAdvisorUsageStatus } from "./gate-policy.js";
-import { renderAdvisorResult } from "./render-advisor-result.js";
+} from "../usage.ts";
+import { notifyLocalFailure, updateAdvisorUsageStatus } from "./gate-policy.ts";
+import { renderAdvisorResult } from "./render-advisor-result.ts";
 import {
   renderAdvisorCallBox,
   resolveAdvisorRequest,
-} from "./render-common.js";
-import { scoutDetailsFromEvent } from "./scout-status.js";
+} from "./render-common.ts";
+import { scoutDetailsFromEvent } from "./scout-status.ts";
 import type {
   AdvisorToolContext,
   AdvisorToolDetails,
   ToolRegistrationContext,
-} from "./types.js";
+} from "./types.ts";
 
-/**
- * Validates a tracked-file follow-up and consumes the one-shot handoff only
- * when the call is worth it: consent must be enabled and the session budget
- * was checked by the caller. A rejected call never burns the claim.
- */
 const claimTrackedHandoff = (
   session: ToolRegistrationContext["session"],
   includeTrackedFiles: string[] | undefined

package/src/tools/register-lifecycle.ts

@@ -2,13 +2,13 @@ import {
   advisorSessionSummaryRef,
   getAdvisorMaxCallsPerSession,
   isSimpleMode,
-} from "../config/state.js";
-import { loadConfig } from "../config/storage.js";
-import { herdrAdvisorBlock } from "../herdr.js";
-import { reserveAdvisorCall } from "./gate-policy.js";
-import { handleAutomaticGate } from "./loop-gate.js";
-import { advisorInvocationGuidelines } from "./prompts.js";
-import type { ToolRegistrationContext } from "./types.js";
+} from "../config/state.ts";
+import { loadConfig } from "../config/storage.ts";
+import { herdrAdvisorBlock } from "../herdr.ts";
+import { reserveAdvisorCall } from "./gate-policy.ts";
+import { handleAutomaticGate } from "./loop-gate.ts";
+import { advisorInvocationGuidelines } from "./prompts.ts";
+import type { ToolRegistrationContext } from "./types.ts";
 
 export const registerToolLifecycle = ({
   pi,

package/src/tools/register-outcome.ts

@@ -1,10 +1,10 @@
 import { Text } from "@earendil-works/pi-tui";
 import { Type } from "typebox";
-import { advisorOutcomeLoggingRef } from "../config/state.js";
-import { loadConfig } from "../config/storage.js";
-import { textFrom } from "../conversation.js";
-import { ADOPTIONS, VALIDATIONS } from "../outcomes.js";
-import type { ToolRegistrationContext } from "./types.js";
+import { advisorOutcomeLoggingRef } from "../config/state.ts";
+import { loadConfig } from "../config/storage.ts";
+import { textFrom } from "../conversation.ts";
+import { ADOPTIONS, VALIDATIONS } from "../outcomes.ts";
+import type { ToolRegistrationContext } from "./types.ts";
 
 export const registerOutcomeTool = ({
   appendOutcome: appendAdvisorOutcome,

package/src/tools/register-renderers.ts

@@ -3,11 +3,11 @@ import {
   getMarkdownTheme,
 } from "@earendil-works/pi-coding-agent";
 import { Box, Markdown, Text } from "@earendil-works/pi-tui";
-import { getAdvisorSettings } from "../config/state.js";
-import { formatAdvisorUsage } from "../usage.js";
-import { adviceForDisplay, renderAdvisorCallBox } from "./render-common.js";
-import { renderScoutDetails } from "./scout-status.js";
-import type { GateDecision, ScoutToolDetails } from "./types.js";
+import { getAdvisorSettings } from "../config/state.ts";
+import { formatAdvisorUsage } from "../usage.ts";
+import { adviceForDisplay, renderAdvisorCallBox } from "./render-common.ts";
+import { renderScoutDetails } from "./scout-status.ts";
+import type { GateDecision, ScoutToolDetails } from "./types.ts";
 
 export const registerToolRenderers = (pi: ExtensionAPI): void => {
   pi.registerEntryRenderer?.(

package/src/tools/registration.ts

@@ -1,17 +1,17 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { appendOutcome } from "../outcomes.js";
-import type { AdvisorSessionState } from "../session-state.js";
-import { consultAdvisor, runAdvisorGate } from "./consultation.js";
-import { registerAskAdvisorTool } from "./register-ask-advisor.js";
-import { registerToolLifecycle } from "./register-lifecycle.js";
-import { registerOutcomeTool } from "./register-outcome.js";
-import { registerToolRenderers } from "./register-renderers.js";
-import { ScoutStatusManager } from "./scout-status.js";
-import { advisorSessionState } from "./session.js";
+import { appendOutcome } from "../outcomes.ts";
+import type { AdvisorSessionState } from "../session-state.ts";
+import { consultAdvisor, runAdvisorGate } from "./consultation.ts";
+import { registerAskAdvisorTool } from "./register-ask-advisor.ts";
+import { registerToolLifecycle } from "./register-lifecycle.ts";
+import { registerOutcomeTool } from "./register-outcome.ts";
+import { registerToolRenderers } from "./register-renderers.ts";
+import { ScoutStatusManager } from "./scout-status.ts";
+import { advisorSessionState } from "./session.ts";
 import type {
   ToolRegistrationContext,
   ToolRegistrationDependencies,
-} from "./types.js";
+} from "./types.ts";
 
 export const registerAdvisorTool = (
   pi: ExtensionAPI,

package/src/tools/render-advisor-result.ts

@@ -4,19 +4,19 @@ import {
   type Theme,
   type ToolRenderResultOptions,
 } from "@earendil-works/pi-coding-agent";
-import { Box, Markdown, Text } from "@earendil-works/pi-tui";
-import { getAdvisorSettings } from "../config/state.js";
-import { textFrom } from "../conversation.js";
-import { formatAdvisorUsage } from "../usage.js";
+import { Box, Markdown, Spacer, Text } from "@earendil-works/pi-tui";
+import { getAdvisorSettings } from "../config/state.ts";
+import { textFrom } from "../conversation.ts";
+import { formatAdvisorUsage } from "../usage.ts";
 import {
   adviceForDisplay,
   hasSoundVerdict,
   renderAdvisorResponseHeader,
   renderThinkingMarkdown,
   SPINNER_FRAMES,
-} from "./render-common.js";
-import { renderScoutDetails } from "./scout-status.js";
-import type { AdvisorToolContext, AdvisorToolDetails } from "./types.js";
+} from "./render-common.ts";
+import { renderScoutDetails } from "./scout-status.ts";
+import type { AdvisorToolContext, AdvisorToolDetails } from "./types.ts";
 
 const advisorResultDetails = (result: AgentToolResult<AdvisorToolDetails>) =>
   result.details;
@@ -153,10 +153,11 @@ export const renderAdvisorResult = (
   theme: Theme,
   context: AdvisorToolContext
 ) => {
+  // Pi frames this inside its own padded tool box; padding here doubles the gap below the request.
   const box =
     context.lastComponent instanceof Box
       ? context.lastComponent
-      : new Box(1, 1, (text: string) => theme.bg("customMessageBg", text));
+      : new Box(1, 0, (text: string) => theme.bg("customMessageBg", text));
   box.setBgFn((text) => theme.bg("customMessageBg", text));
   box.clear();
   if (isPartial) {
@@ -164,5 +165,7 @@ export const renderAdvisorResult = (
   } else {
     renderFinalAdvisorResult(box, result, expanded, theme, context);
   }
+  // Restores the bottom breathing room the removed vertical padding provided.
+  box.addChild(new Spacer(1));
   return box;
 };

package/src/tools/render-common.ts

@@ -7,7 +7,8 @@ import {
   truncateToWidth,
   visibleWidth,
 } from "@earendil-works/pi-tui";
-import { advisorCollapseResponsesRef } from "../config/state.js";
+import { advisorCollapseResponsesRef } from "../config/state.ts";
+import { piHideThinkingEnabled } from "../pi-settings.ts";
 
 export const SPINNER_FRAMES = [
   "⠋",
@@ -22,20 +23,11 @@ export const SPINNER_FRAMES = [
   "⠏",
 ];
 
-const THINKING_PREFIX = "  💭 ";
+const THINKING_PREFIX = "  ";
 const THINKING_PREFIX_WIDTH = visibleWidth(THINKING_PREFIX);
 export type ThinkingTheme = Pick<Theme, "fg">;
 
-/**
- * Renders visible nested-model thinking with the same Markdown semantics as
- * Pi's assistant thinking blocks while keeping the compact speech-bubble cue.
- * The prefix is added after Markdown parsing so it cannot change block syntax.
- *
- * Note: During streaming, incomplete Markdown (e.g., `**text` without closing **)
- * displays raw markers transiently until delimiters arrive. This mirrors expected
- * behavior when typing Markdown incrementally and is acceptable in the context
- * of brief thinking previews. When thinking is complete, all markers render.
- */
+/** Renders nested-model thinking as Markdown with the compact speech-bubble cue; the prefix is added after parsing so it cannot change block syntax. */
 class ThinkingMarkdown implements Component {
   private readonly markdown: Markdown;
   private readonly prefix: string;
@@ -66,10 +58,30 @@ class ThinkingMarkdown implements Component {
   }
 }
 
+/** Collapsed placeholder shown when Pi's hide_thinking setting is on. */
+class HiddenThinkingLabel implements Component {
+  private readonly label: string;
+
+  constructor(theme: ThinkingTheme) {
+    this.label = theme.fg("thinkingText", `${THINKING_PREFIX}Thinking…`);
+  }
+
+  render(): string[] {
+    return [this.label];
+  }
+
+  invalidate(): void {
+    // The collapsed label is static.
+  }
+}
+
 export const renderThinkingMarkdown = (
   thinking: string,
   theme: ThinkingTheme
-): Component => new ThinkingMarkdown(thinking, theme);
+): Component =>
+  piHideThinkingEnabled()
+    ? new HiddenThinkingLabel(theme)
+    : new ThinkingMarkdown(thinking, theme);
 
 export const resolveAdvisorRequest = (question?: string) =>
   question?.trim() || undefined;

package/src/tools/scout-status.ts

@@ -4,11 +4,11 @@ import type {
   Theme,
 } from "@earendil-works/pi-coding-agent";
 import { type Box, Text } from "@earendil-works/pi-tui";
-import { executorRef, getAdvisorSettings } from "../config/state.js";
-import type { ScoutLifecycleEvent } from "../scout.js";
-import { formatAdvisorUsage, snapshotAdvisorUsage } from "../usage.js";
-import { renderThinkingMarkdown, SPINNER_FRAMES } from "./render-common.js";
-import type { ScoutToolDetails } from "./types.js";
+import { executorRef, getAdvisorSettings } from "../config/state.ts";
+import type { ScoutLifecycleEvent } from "../scout.ts";
+import { formatAdvisorUsage, snapshotAdvisorUsage } from "../usage.ts";
+import { renderThinkingMarkdown, SPINNER_FRAMES } from "./render-common.ts";
+import type { ScoutToolDetails } from "./types.ts";
 
 export const scoutDetailsFromEvent = (
   event: ScoutLifecycleEvent,

package/src/tools/session.ts

@@ -1,3 +1,3 @@
-import { AdvisorSessionState } from "../session-state.js";
+import { AdvisorSessionState } from "../session-state.ts";
 
 export const advisorSessionState = new AdvisorSessionState();

package/src/tools/types.ts

@@ -1,21 +1,21 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import type { appendOutcome } from "../outcomes.js";
-import type { ScoutOutcome } from "../scout.js";
+import type { appendOutcome } from "../outcomes.ts";
+import type { ScoutOutcome } from "../scout.ts";
 import type {
   AdvisorSessionState,
   ConsultationTrigger,
   GateDecision,
   GateTrigger,
-} from "../session-state.js";
-import type { consultAdvisor, runAdvisorGate } from "./consultation.js";
-import type { ScoutStatusManager } from "./scout-status.js";
+} from "../session-state.ts";
+import type { consultAdvisor, runAdvisorGate } from "./consultation.ts";
+import type { ScoutStatusManager } from "./scout-status.ts";
 
 export type {
   AdvisorInvocationRecord,
   ConsultationTrigger,
   GateDecision,
   GateTrigger,
-} from "../session-state.js";
+} from "../session-state.ts";
 
 export interface ScoutToolDetails {
   availableCount?: number;
@@ -89,7 +89,7 @@ export interface AdvisorToolDetails {
   usage?: unknown;
 }
 
-export interface AdvisorRenderState {
+interface AdvisorRenderState {
   phase?: string;
   scout?: ScoutToolDetails;
   timerId?: ReturnType<typeof setInterval>;

package/src/tools.ts

@@ -3,9 +3,9 @@ export {
   consultAdvisor,
   curateAdvisorConversation,
   runAdvisorGate,
-} from "./tools/consultation.js";
-export { gateFailureEffectForMode } from "./tools/gate-policy.js";
-export { parseAutomaticDecision } from "./tools/gate-protocol.js";
+} from "./tools/consultation.ts";
+export { gateFailureEffectForMode } from "./tools/gate-policy.ts";
+export { parseAutomaticDecision } from "./tools/gate-protocol.ts";
 export {
   ADVISOR_DECISION_SYSTEM,
   ADVISOR_SYSTEM,
@@ -15,8 +15,8 @@ export {
   advisorRepositoryContext,
   advisorRequestConversation,
   gitContextNote,
-} from "./tools/prompts.js";
-export { registerAdvisorTool } from "./tools/registration.js";
+} from "./tools/prompts.ts";
+export { registerAdvisorTool } from "./tools/registration.ts";
 export {
   adviceForDisplay,
   hasSoundVerdict,
@@ -25,14 +25,14 @@ export {
   renderThinkingMarkdown,
   resolveAdvisorRequest,
   SPINNER_FRAMES,
-} from "./tools/render-common.js";
+} from "./tools/render-common.ts";
 export {
   appendScoutLifecycleEntry,
   renderScoutDetails,
   ScoutStatusManager,
   scoutDetailsFromEvent,
-} from "./tools/scout-status.js";
-export { advisorSessionState } from "./tools/session.js";
+} from "./tools/scout-status.ts";
+export { advisorSessionState } from "./tools/session.ts";
 export type {
   AdvisorConsultationResult,
   AdvisorGateFailure,
@@ -44,4 +44,4 @@ export type {
   GateFailureCategory,
   GateTrigger,
   ScoutToolDetails,
-} from "./tools/types.js";
+} from "./tools/types.ts";

package/src/ui/manual-dialog-render.ts

@@ -3,8 +3,8 @@ import {
   visibleWidth,
   wrapTextWithAnsi,
 } from "@earendil-works/pi-tui";
-import type { GitContextLevel } from "../git.js";
-import type { ManualAdvisorDialogView } from "./types.js";
+import type { GitContextLevel } from "../git.ts";
+import type { ManualAdvisorDialogView } from "./types.ts";
 
 const MANUAL_GIT_CONTEXT_COPY: Record<
   GitContextLevel,
@@ -135,8 +135,15 @@ export const renderManualAdvisorDialog = (
   const cancelLabel = cancel
     ? theme.fg("accent", "[Cancel]")
     : theme.fg("text", "[Cancel]");
+  const actionButtons = `${submitLabel}  ${cancelLabel}`;
+  // Center the buttons in the content area; the 2-column focus marker sits
+  // left of the computed offset.
+  const buttonOffset = Math.max(
+    0,
+    Math.floor((contentWidth - visibleWidth(actionButtons)) / 2) - 2
+  );
   addLine(
-    `${focusMarker("actions")}                 ${submitLabel}  ${cancelLabel}`
+    `${focusMarker("actions")}${" ".repeat(buttonOffset)}${actionButtons}`
   );
   addWrapped(interactionHint, "dim");
   addLine("");

package/src/ui/manual-dialog.ts

@@ -12,24 +12,19 @@ import {
   clampGitContextLevel,
   GIT_CONTEXT_LEVELS,
   type GitContextLevel,
-} from "../git.js";
-import { renderManualAdvisorDialog } from "./manual-dialog-render.js";
+} from "../git.ts";
+import { renderManualAdvisorDialog } from "./manual-dialog-render.ts";
 import type {
   ManualAdvisorDialogOptions,
   ManualAdvisorFocus,
-} from "./types.js";
+} from "./types.ts";
 
 // Keep the keybinding components separate from Socket's URL-string heuristic.
 const TUI_INPUT_TAB: keyof Keybindings = ["tui", "input", "tab"].join(
   "."
 ) as keyof Keybindings;
 
-/**
- * The small, deliberately non-persistent form used by `/advisor-manual`.
- *
- * The dialog owns only local input state. Callers decide when to consume a
- * budget or start a consultation after the submitted request is returned.
- */
+/** The small, non-persistent /advisor-manual form; callers own budget and consultation decisions. */
 export class ManualAdvisorDialog implements Component, Focusable {
   private readonly options: ManualAdvisorDialogOptions;
   private readonly editor: Editor;

package/src/ui/model-selector.ts

@@ -6,8 +6,9 @@ import {
   Input,
   type Keybindings,
   type KeybindingsManager,
+  truncateToWidth,
 } from "@earendil-works/pi-tui";
-import type { SearchableModelSelectorOptions } from "./types.js";
+import type { SearchableModelSelectorOptions } from "./types.ts";
 
 export class SearchableModelSelector implements Component, Focusable {
   private readonly tui: SearchableModelSelectorOptions["tui"];
@@ -58,9 +59,9 @@ export class SearchableModelSelector implements Component, Focusable {
   }
 
   render(width: number): string[] {
-    const lines: string[] = ["═".repeat(width)];
+    const lines: string[] = [this.theme.fg("border", "─".repeat(width))];
     lines.push(`  ${this.theme.fg("accent", this.theme.bold(this.title))}`);
-    const inputLines = this.searchInput.render(width - 12);
+    const inputLines = this.searchInput.render(Math.max(1, width - 10));
     lines.push(
       `  ${this.theme.fg("accent", "Search: ")}${inputLines[0] || ""}`
     );
@@ -108,10 +109,10 @@ export class SearchableModelSelector implements Component, Focusable {
     }
     lines.push("");
     lines.push(
-      `  ${this.theme.fg("muted", "Type to search · ↑↓: navigate · Enter: select · Esc: cancel")}`
+      `  ${this.theme.fg("dim", "Type to search · ↑↓: navigate · Enter: select · Esc: cancel")}`
     );
-    lines.push("═".repeat(width));
-    return lines;
+    lines.push(this.theme.fg("border", "─".repeat(width)));
+    return lines.map((line) => truncateToWidth(line, width));
   }
 
   handleInput(keyData: string): void {

package/src/ui/settings-formatting.ts

@@ -1,7 +1,7 @@
 import { visibleWidth } from "@earendil-works/pi-tui";
-import type { ContextPreset } from "./types.js";
+import { DEFAULT_EFFORT_LEVEL } from "../commands/model-options.ts";
+import type { ContextPreset } from "./types.ts";
 
-export const DEFAULT_EFFORT_LEVEL = "Default (Model Default)";
 export const TOGGLE_VALUES = ["On", "Off"];
 export const SIMPLE_MODE_GRADIENT_INTERVAL_MS = 100;
 // Purple steps with a moving light highlight, retained from the original UI.