Polish IIFE helpers: tighten persistWithMergeBase and PromptActionBar

Collapse dual try/catch in persistWithMergeBase into one path, destructure
PromptActionBar props directly, and compute input lines once before the
bordered/plain body branch.

Author: TheGreatAxios

src/tui/components/chat-input.tsx

@@ -68,7 +68,17 @@ export type ChatInputProps = {
 
 // Action bar above the prompt: revolving verb + interrupt/queue hint on the
 // left, profile · model · effort right-aligned. Null when nothing to show.
-function PromptActionBar(props: {
+function PromptActionBar({
+  showSteerHint,
+  value,
+  steerOnEnter,
+  queuedCount,
+  verb,
+  profile,
+  model,
+  effort,
+  attachmentSummary,
+}: {
   showSteerHint: boolean;
   value: string;
   steerOnEnter: boolean;
@@ -79,17 +89,6 @@ function PromptActionBar(props: {
   effort?: string;
   attachmentSummary?: string;
 }): ReactNode {
-  const {
-    showSteerHint,
-    value,
-    steerOnEnter,
-    queuedCount,
-    verb,
-    profile,
-    model,
-    effort,
-    attachmentSummary,
-  } = props;
   // Enter and Alt+Enter are no-ops on an empty field, so with nothing typed
   // the hint advertises the interrupt chord instead.
   const hasPromptText = value.trim().length > 0;
@@ -99,6 +98,7 @@ function PromptActionBar(props: {
       ? "Enter queues for orchestrator"
       : "Enter steer · Alt+Enter queue";
   const steerText = queuedCount > 0 ? `${queuedCount} queued · ${actionsText}` : actionsText;
+  // exactOptionalPropertyTypes: omit undefined keys rather than pass them.
   const modelText = composePromptActionBarModelLabel({
     ...(profile !== undefined ? { profile } : {}),
     ...(model !== undefined ? { model } : {}),
@@ -790,9 +790,10 @@ export function ChatInput({
 
   // When slash/@ pickers are open the input renders plainly so the
   // suggestion list sits flush above it without a competing border.
+  const inputLines = renderInputLines();
   const inputBody = showSlash || showAt ? (
     <Box flexDirection="column" paddingX={1}>
-      {renderInputLines()}
+      {inputLines}
     </Box>
   ) : (
     <Box marginX={1} flexDirection="column">
@@ -802,7 +803,7 @@ export function ChatInput({
         flexDirection="column"
         paddingX={1}
       >
-        {renderInputLines()}
+        {inputLines}
       </Box>
     </Box>
   );

src/tui/hooks/use-provider-manager.ts

@@ -163,38 +163,31 @@ function persistGlobalSettings(
 // Shared disk-first persist path for catalog and tier writes. Loads a fresh
 // merge base, builds settings, optionally mutates in-memory state, then saves.
 // Fire-and-forget: callers `void` the promise so UI stays non-blocking.
+// onBeforeSave runs only after load+build succeed so a failed re-read never
+// leaves UI state ahead of disk.
 async function persistWithMergeBase(args: {
   globalSettingsPath: string;
   initialSettings: Settings | undefined;
   buildSettings: (base: Settings | undefined) => Settings;
   onMessage: (msg: string) => void;
   successMessage: string;
   failPrefix: string;
-  /** Runs only after load+build succeed, before the disk write. */
   onBeforeSave?: () => void;
 }): Promise<void> {
-  let base: Settings | undefined;
   try {
-    base = await loadMergeBase(args.globalSettingsPath, args.initialSettings);
-  } catch (err) {
-    args.onMessage(`${args.failPrefix}: ${err instanceof Error ? err.message : String(err)}`);
-    return;
-  }
-  let settings: Settings;
-  try {
-    settings = args.buildSettings(base);
+    const base = await loadMergeBase(args.globalSettingsPath, args.initialSettings);
+    const settings = args.buildSettings(base);
+    args.onBeforeSave?.();
+    persistGlobalSettings(
+      args.globalSettingsPath,
+      settings,
+      args.onMessage,
+      args.successMessage,
+      args.failPrefix,
+    );
   } catch (err) {
     args.onMessage(`${args.failPrefix}: ${err instanceof Error ? err.message : String(err)}`);
-    return;
   }
-  args.onBeforeSave?.();
-  persistGlobalSettings(
-    args.globalSettingsPath,
-    settings,
-    args.onMessage,
-    args.successMessage,
-    args.failPrefix,
-  );
 }
 
 export function useProviderManager({
@@ -353,9 +346,7 @@ export function useProviderManager({
     successMessage: string,
   ): void => {
     // Disk-first merge base: mid-session /plugins writes must survive a later
-    // provider save. Fail closed if settings cannot be re-read. Catalog state
-    // only updates after load+build succeed so a failed re-read never leaves
-    // the UI ahead of disk.
+    // provider save. Fail closed if settings cannot be re-read.
     void persistWithMergeBase({
       globalSettingsPath,
       initialSettings,