indusagi-coding-agent 0.2.12 → 0.2.14

package/src/console/contract.ts

@@ -46,10 +46,10 @@
  */
 import type { InkThemeAdapter, SessionSnapshot, StatusMessage, ToolExecutionState, UiDisplayBlock } from "indusagi/react-ink";
 import type { Dispatch, ReactNode, Reducer } from "react";
-import type { ConductorState, SessionConductor, SessionSignal } from "../conductor.js";
-import type { PreferenceStore } from "../settings.js";
-import type { SessionLibrary } from "../sessions.js";
-import type { AuthVault, LoginProvider, OAuthLoginResult } from "../launch.js";
+import type { ConductorState, SessionConductor, SessionSignal } from "../conductor/index.js";
+import type { PreferenceStore } from "../settings/index.js";
+import type { SessionLibrary } from "../sessions/index.js";
+import type { AuthVault, LoginProvider, OAuthLoginResult } from "../launch/index.js";
 import type { OAuthLoginCallbacks } from "indusagi/ai";
 /** Re-exported framework vocabulary that console consumers routinely need. */
 export type { SessionSnapshot, ToolExecutionState, StatusMessage, UiDisplayBlock, InkThemeAdapter, };
@@ -358,7 +358,11 @@ export interface ConsoleState {
  *     - `busy:set`          — set the in-flight flag.
  *     - `tick`              — bump the status-bar re-render tick.
  */
-export type ConsoleEvent = {
+export type ConsoleEvent = { readonly type: "view:reset" } | {
+    readonly type: "display:set";
+    readonly key: "showReasoning" | "showImages";
+    readonly value: boolean;
+} | {
     readonly type: "buffer:set";
     readonly text: string;
 } | {
@@ -485,6 +489,7 @@ export type SlashOutcome = {
  * with respect to React internals and lets tests pass a scripted fake.
  */
 export interface SlashContext {
+    readonly services?: OverlayServices;
     /** The raw argument string after the command name (may be empty). */
     readonly args: string;
     /** The session this console drives. */

package/src/console/index.ts

@@ -22,13 +22,13 @@ export { consoleReducer, initConsoleState } from "./reducer.js";
 export { THEMES, THEME_SCHEMES, resolveTheme, MIDNIGHT_PALETTE, DAYLIGHT_PALETTE, PALETTES, deriveTokens, themeAdapter, frameworkColors, } from "./theme/index.js";
 export { SLASH_COMMANDS, FAMILY, DEFAULT_SLASH_REGISTRY, buildRegistry, tokensOf, findCommand, matchPrefix, listFamilies, commandsInFamily, SLASH_PREFIX, looksLikeSlash, parseSlash, resolveSlash, type SlashLine, type SlashResolution, } from "./slash/index.js";
 export { NO_INTENT, readKey, NO_CHORD, advanceChord, type KeyChord, type ConsoleVerb, type ConsoleIntent, type ChordOutcome, type ChordLatch, type ChordStep, PASTE_THRESHOLDS, PASTE_BURST_GAP_MS, EMPTY_PASTE_VAULT, pasteMarker, classifyPaste, coalescePaste, expandMarkers, hasMarkers, type PasteThresholds, type PasteVault, type PasteCapture, completeAt, applySuggestion, type CompletionKind, type Suggestion, type TokenSpan, type CompletionResult, type DirEntry, type DirReader, } from "./input/index.js";
-export { TerminalConsole } from "./components/TerminalConsole";
-export { Composer, type ComposerProps } from "./components/Composer";
-export { StatusBar, type StatusBarProps } from "./components/StatusBar";
-export { Banner, type BannerProps } from "./components/Banner";
-export { BackgroundAgents, deriveAgentRuns, type BackgroundAgentsProps, type AgentRun, type AgentRunStatus, } from "./components/BackgroundAgents";
-export { AgentsView, type AgentsViewProps } from "./components/AgentsView";
-export { MASCOTS, TIPS, WHATS_NEW, mascotRows, pickWelcomeVariant, randomWelcomeSeed, type MascotFace, type MascotTone, type MascotSegment, type WelcomeVariant, } from "./components/welcome";
+export { TerminalConsole } from "./components/TerminalConsole.js";
+export { Composer, type ComposerProps } from "./components/Composer.js";
+export { StatusBar, type StatusBarProps } from "./components/StatusBar.js";
+export { Banner, type BannerProps } from "./components/Banner.js";
+export { BackgroundAgents, deriveAgentRuns, type BackgroundAgentsProps, type AgentRun, type AgentRunStatus, } from "./components/BackgroundAgents.js";
+export { AgentsView, type AgentsViewProps } from "./components/AgentsView.js";
+export { MASCOTS, TIPS, WHATS_NEW, mascotRows, pickWelcomeVariant, randomWelcomeSeed, type MascotFace, type MascotTone, type MascotSegment, type WelcomeVariant, } from "./components/welcome.js";
 export { gatherStartup, gatherChangelog } from "./startup.js";
 export type { StartupMap, StartupSection, StartupChangelog, StartupChangelogMode, StartupNotice, StartupNoticeKind, StartupInputs, } from "./startup.js";
 export { mountConsole, type MountConsoleOptions, type MountResult, } from "./mount.js";

package/src/console/input/complete.ts

@@ -76,13 +76,13 @@ function splitPathStem(stem: string) {
   const body = stem.slice(sigil.length);
   const slash = body.lastIndexOf("/");
   if (slash < 0) return { dir: ".", leaf: body, sigil };
-  return { dir: body.slice(0, slash) || ".", leaf: body.slice(slash + 1), sigil };
+  return { dir: body.slice(0, slash) || "/", leaf: body.slice(slash + 1), sigil };
 }
 
 function completePath(stem: string, readDir: DirReader): Suggestion[] {
   const { dir, leaf, sigil } = splitPathStem(stem);
   const lowerLeaf = leaf.toLowerCase();
-  const prefix = dir === "." ? "" : `${dir}/`;
+  const prefix = dir === "." ? "" : dir === "/" ? "/" : `${dir}/`;
   const matches = readDir(dir)
     .filter((e) => e.name.toLowerCase().startsWith(lowerLeaf))
     .sort((a, b) => {

package/src/console/input/dir-reader.ts

@@ -3,6 +3,7 @@
  */
 import { readdirSync, statSync } from "node:fs";
 import { resolve } from "node:path";
+import { homedir } from "node:os";
 import type { DirReader } from "./complete.js";
 
 function entryIsDir(base: string, name: string, isDirent: boolean, isSymlink: boolean) {
@@ -20,7 +21,8 @@ function entryIsDir(base: string, name: string, isDirent: boolean, isSymlink: bo
  */
 export function createDirReader(cwd: string = process.cwd()): DirReader {
   return (dirPath: string) => {
-    const target = resolve(cwd, dirPath);
+    const expanded = dirPath === "~" ? homedir() : dirPath.startsWith("~/") ? resolve(homedir(), dirPath.slice(2)) : dirPath;
+    const target = resolve(cwd, expanded);
     try {
       const dirents = readdirSync(target, { withFileTypes: true });
       return dirents.map((d) => ({

package/src/console/input/graphemes.ts

@@ -0,0 +1,22 @@
+const segmenter = new Intl.Segmenter(undefined, { granularity: 'grapheme' });
+export function previousGrapheme(text: string, at: number): number {
+  let previous = 0;
+  for (const part of segmenter.segment(text)) {
+    if (part.index >= at) break;
+    previous = part.index;
+  }
+  return previous;
+}
+export function nextGrapheme(text: string, at: number): number {
+  for (const part of segmenter.segment(text)) if (part.index > at) return part.index;
+  return text.length;
+}
+export function moveGrapheme(text: string, at: number, delta: number): number {
+  let next = Math.max(0, Math.min(at, text.length));
+  for (let i = 0; i < Math.abs(delta); i++) next = delta < 0 ? previousGrapheme(text, next) : nextGrapheme(text, next);
+  return next;
+}
+export function snapGrapheme(text: string, at: number): number {
+  const clamped = Math.max(0, Math.min(at, text.length));
+  return clamped === text.length ? clamped : previousGrapheme(text, clamped + 1);
+}

package/src/console/input/keymap.ts

@@ -52,6 +52,7 @@ export type ConsoleVerb =
 
 export interface ConsoleIntent {
   readonly verb: ConsoleVerb;
+  readonly direction?: -1 | 1;
   readonly text?: string;
   readonly overlay?: ModalKind;
 }
@@ -92,7 +93,7 @@ export function readKey(input: string, key: KeyChord): ConsoleIntent {
       case "n":
         return { verb: "flow:cycleModel" };
       case "p":
-        return { verb: "flow:cycleModel" };
+        return { verb: "flow:cycleModel", direction: -1 };
       case "t":
         return { verb: "view:toggleReasoning" };
       case "v":
@@ -117,15 +118,16 @@ export function readKey(input: string, key: KeyChord): ConsoleIntent {
   }
   if (key.escape) return { verb: "flow:dismiss" };
   if (key.tab) return key.shift ? { verb: "mode:cyclePermission" } : { verb: "flow:accept" };
-  if (key.backspace || key.delete || input === "\x7F" || input === "\b") {
+  if (key.delete) return { verb: "edit:eraseNext" };
+  if (key.backspace || input === "\x7F" || input === "\b") {
     return { verb: "edit:erasePrev" };
   }
   if (key.leftArrow) return { verb: "nav:left" };
   if (key.rightArrow) return { verb: "nav:right" };
   if (key.upArrow) return { verb: "nav:up" };
   if (key.downArrow) return { verb: "nav:down" };
-  if (key.pageUp) return { verb: "nav:home" };
-  if (key.pageDown) return { verb: "nav:end" };
+  // Page keys belong to the transcript/overlay viewport, not the composer.
+  if (key.pageUp || key.pageDown) return NO_INTENT;
   return isPrintable(input) ? typed(input) : NO_INTENT;
 }
 

package/src/console/mount.ts

@@ -8,6 +8,38 @@ import { DEFAULT_SLASH_REGISTRY } from "./slash/index.js";
 import { resolveTheme } from "./theme/index.js";
 import type { OverlayServices, SessionConductor, SlashRegistry } from "./contract.js";
 
+export const SYNC_OUTPUT_BEGIN = "\x1b[?2026h";
+export const SYNC_OUTPUT_END = "\x1b[?2026l";
+
+function supportsSynchronizedOutput(stream: NodeJS.WriteStream): boolean {
+  if (!stream.isTTY || process.env["INDUS_TUI_SYNC_OUTPUT"] === "0") return false;
+  const term = process.env["TERM"] ?? "";
+  return process.env["TMUX"] === undefined && process.env["STY"] === undefined &&
+    !term.startsWith("screen") && !term.startsWith("tmux");
+}
+
+/** Wrap complete Ink writes in DEC mode 2026 so terminals paint each frame atomically. */
+export function synchronizedOutputStream(
+  stream: NodeJS.WriteStream,
+  enabled = supportsSynchronizedOutput(stream)
+): NodeJS.WriteStream {
+  if (!enabled) return stream;
+  const write = (chunk: string | Uint8Array, encodingOrCallback?: BufferEncoding | ((error?: Error | null) => void), callback?: (error?: Error | null) => void) => {
+    const framed = typeof chunk === "string"
+      ? `${SYNC_OUTPUT_BEGIN}${chunk}${SYNC_OUTPUT_END}`
+      : Buffer.concat([Buffer.from(SYNC_OUTPUT_BEGIN), Buffer.from(chunk), Buffer.from(SYNC_OUTPUT_END)]);
+    if (typeof encodingOrCallback === "function") return stream.write(framed, encodingOrCallback);
+    return stream.write(framed, encodingOrCallback, callback);
+  };
+  return new Proxy(stream, {
+    get(target, property) {
+      if (property === "write") return write;
+      const value = Reflect.get(target, property, target);
+      return typeof value === "function" ? value.bind(target) : value;
+    }
+  });
+}
+
 /**
  * Options for {@link mountConsole}.
  */
@@ -50,7 +82,17 @@ export async function mountConsole(
       instance.unmount();
     }
   };
-  const instance = render(createElement(TerminalConsole, props));
-  await instance.waitUntilExit();
-  return { clean: exited };
+  const wasRaw = process.stdin.isRaw === true;
+  const stdout = synchronizedOutputStream(process.stdout);
+  const instance = render(createElement(TerminalConsole, props), { exitOnCtrlC: false, stdout });
+  try {
+    await instance.waitUntilExit();
+    return { clean: exited };
+  } finally {
+    // Ink's passive input-hook cleanup may run after waitUntilExit resolves.
+    // Restore the terminal before handing control back to the caller.
+    instance.unmount();
+    if (process.stdin.isTTY) process.stdin.setRawMode(wasRaw);
+    if (process.stdout.isTTY) process.stdout.write("\x1b[?25h");
+  }
 }

package/src/console/overlays/auth.ts

@@ -58,7 +58,7 @@ const SERVER_TIER_ACCOUNT_ID = "server-session";
 const SERVER_TIER_PROVIDER_ID = "indus-server";
 
 function SignOutDialog(props: OverlayGroupProps) {
-  const { services, closeModal } = props;
+  const { services, closeModal, dispatch } = props;
   const [accounts, setAccounts] = useState<any[]>([]);
   useEffect(() => {
     let live = true;
@@ -112,8 +112,10 @@ function SignOutDialog(props: OverlayGroupProps) {
         } else {
           await services!.vault.remove(account.provider, account.accountId);
         }
-      } catch {
-        // ignore
+        await services!.refreshGatewayRouting();
+        dispatch({type:"status:set",status:{kind:"info",text:"Signed out. Model routing refreshed."}});
+      } catch (error) {
+        dispatch({type:"status:set",status:{kind:"error",text:error instanceof Error ? error.message : "Sign-out failed."}});
       }
       closeModal();
     }
@@ -155,15 +157,22 @@ function OAuthFlowDialog(props: OverlayGroupProps & { providerId: string; mode:
   })();
   const [state, setState] = useState(() => seedOAuthState(providerId, providerName, mode));
   const pending = useRef<((value: string) => void) | null>(null);
+  const cancelPrompt = useRef<(() => void) | null>(null);
+  const mounted = useRef(true);
+  const saving = useRef(false);
+  useEffect(() => () => { mounted.current = false; }, []);
   const merge = (next: any) => setState((prev) => ({ ...prev, ...next }));
   useEffect(() => {
     if (mode !== "oauth") return;
     let live = true;
+    const controller = new AbortController();
     const safeMerge = (next: any) => {
       if (live) merge(next);
     };
     const callbacks = {
+      signal: controller.signal,
       onAuth: (info: any) => {
+        if (!live) return;
         safeMerge({ authInfo: info, progress: "Opening your browser to sign in…" });
         void services!.openLoginUrl(info.url).then((opened: boolean) => {
           safeMerge({
@@ -174,13 +183,17 @@ function OAuthFlowDialog(props: OverlayGroupProps & { providerId: string; mode:
         });
       },
       onPrompt: (prompt: any) =>
-        new Promise<string>((resolve) => {
-          pending.current = resolve;
+        new Promise<string>((resolve, reject) => {
+          if (!live) { reject(new DOMException("Sign-in cancelled", "AbortError")); return; }
+          cancelPrompt.current = () => reject(new DOMException("Sign-in cancelled", "AbortError"));
+          pending.current = value => { cancelPrompt.current = null; resolve(value); };
           safeMerge({ prompt, inputLabel: prompt.message, inputValue: "" });
         }),
       onManualCodeInput: () =>
-        new Promise<string>((resolve) => {
-          pending.current = resolve;
+        new Promise<string>((resolve, reject) => {
+          if (!live) { reject(new DOMException("Sign-in cancelled", "AbortError")); return; }
+          cancelPrompt.current = () => reject(new DOMException("Sign-in cancelled", "AbortError"));
+          pending.current = value => { cancelPrompt.current = null; resolve(value); };
           safeMerge({
             prompt: { message: "Paste the authorization code or complete redirect URL:" },
             inputLabel: "Authorization code or redirect URL",
@@ -194,7 +207,9 @@ function OAuthFlowDialog(props: OverlayGroupProps & { providerId: string; mode:
     void (async () => {
       try {
         await services!.startOAuthLogin(providerId, callbacks, services!.vault);
+        if (!live) return;
         await services!.refreshGatewayRouting();
+        if (!live) return;
         selectProviderModel(services!, providerId);
         if (live) {
           dispatch({
@@ -209,15 +224,20 @@ function OAuthFlowDialog(props: OverlayGroupProps & { providerId: string; mode:
     })();
     return () => {
       live = false;
+      controller.abort(); cancelPrompt.current?.(); cancelPrompt.current = null; pending.current = null;
     };
   }, []);
   const saveApiKey = () => {
     const key = (state as any).inputValue.trim();
-    if (key.length === 0) return;
+    if (key.length === 0 || saving.current) return;
+    saving.current = true;
     const account = (state as any).accountId ?? "default";
     void (async () => {
       try {
         await services!.vault.putApiKey(providerId, account, key, true);
+        if (!mounted.current) return;
+        await services!.refreshGatewayRouting();
+        if (!mounted.current) return;
         selectProviderModel(services!, providerId);
         dispatch({
           type: "status:set",

package/src/console/overlays/boards.ts

@@ -2,44 +2,17 @@
  * Saffron picker boards — the themed `/settings` and `/model` overlays.
  */
 import chalk from "chalk";
-import { readFileSync } from "node:fs";
-import { homedir } from "node:os";
-import { join } from "node:path";
 import { useEffect, useMemo, useState } from "indusagi/react-host";
 import { Box, Text, useInput } from "indusagi/react-host/ink";
 import {
   matchesSearchQuery,
   wrapSelectionIndex,
   type InkThemeAdapter,
-  type SettingsDialogItem,
-  type Model
+  type SettingsDialogItem
 } from "indusagi/react-ink";
+import type { Model } from "indusagi/ai";
 import { Fragment, jsx, jsxs } from "indusagi/react-host/jsx-runtime";
-import { isGatewayEligibleProvider } from "../../boot/runners/server-mode.js";
 
-function readServerTierInfo() {
-  let signedIn = false;
-  try {
-    const file = join(homedir(), ".indusagi", "agent", "server-token.json");
-    const token = JSON.parse(readFileSync(file, "utf8"));
-    signedIn = typeof token.expires_at === "string" && new Date(token.expires_at).getTime() - Date.now() > 5 * 60 * 1e3;
-  } catch {
-    signedIn = false;
-  }
-  const localKeys = new Set<string>();
-  try {
-    const file = join(homedir(), ".indusagi", "agent", "auth.json");
-    const vault = JSON.parse(readFileSync(file, "utf8"));
-    for (const [provider, entry] of Object.entries(vault)) {
-      if (entry !== null && typeof entry === "object" && Object.keys(entry).length > 0) {
-        localKeys.add(provider);
-      }
-    }
-  } catch {
-    // ignore
-  }
-  return { signedIn, localKeys };
-}
 
 function truncate(text: string, width: number): string {
   if (text.length <= width) return text;
@@ -155,6 +128,7 @@ export interface SettingsBoardProps {
 }
 
 export function SettingsBoard({ theme, items, onClose }: SettingsBoardProps) {
+  const [error, setError] = useState<string>();
   const [query, setQuery] = useState("");
   const [selectedIndex, setSelectedIndex] = useState(0);
   const filtered = useMemo(
@@ -172,7 +146,11 @@ export function SettingsBoard({ theme, items, onClose }: SettingsBoardProps) {
     const item = filtered[selectedIndex];
     if (!item) return;
     const value = nextValue(item.values, item.value, direction);
-    if (value && value !== item.value) void item.onChange(value);
+    if (value && value !== item.value) {
+      setError(undefined);
+      const failed = (error: unknown) => setError(error instanceof Error ? error.message : String(error));
+      try { void Promise.resolve(item.onChange(value)).catch(failed); } catch (error) { failed(error); }
+    }
   };
   useInput((input, key) => {
     if (key.escape) return onClose();
@@ -187,7 +165,7 @@ export function SettingsBoard({ theme, items, onClose }: SettingsBoardProps) {
   const { start, budget, below } = windowAround(filtered.length, selectedIndex);
   const visible = filtered.slice(start, start + budget);
   const selected = filtered[selectedIndex];
-  const detail = selected ? `${selected.description}  ·  ${selected.values.join(" / ")}` : void 0;
+  const detail = error ?? (selected ? `${selected.description}  ·  ${selected.values.join(" / ")}` : void 0);
   const list =
     items.length === 0
       ? jsx(Text, { children: theme.muted("No settings are available.") })
@@ -242,13 +220,8 @@ export function ModelBoard({ theme, models, onClose, onSelect, search }: ModelBo
   const [query, setQuery] = useState(search ?? "");
   const [selectedIndex, setSelectedIndex] = useState(0);
   useEffect(() => setQuery(search ?? ""), [search]);
-  const serverTier = useMemo(readServerTierInfo, []);
-  const isServerTier = (provider: string) =>
-    serverTier.signedIn && isGatewayEligibleProvider(provider) && !serverTier.localKeys.has(provider);
-  const available = useMemo(
-    () => models.filter((model) => serverTier.localKeys.has(model.provider) || isServerTier(model.provider)),
-    [models, serverTier]
-  );
+  // Authentication belongs to the injected service/parent, never a guessed HOME path.
+  const available = models;
   const filtered = useMemo(() => available.filter((model) => modelMatches(model, query)), [available, query]);
   useEffect(() => setSelectedIndex(0), [query]);
   useEffect(() => {
@@ -289,10 +262,10 @@ export function ModelBoard({ theme, models, onClose, onSelect, search }: ModelBo
                   jsx(Box, { width: 2, children: jsx(Text, { children: isSelected ? theme.color("accent", "›") : " " }) }),
                   jsx(Text, { bold: isSelected, children: theme.color("text", model.id) }),
                   model.name ? jsx(Text, { children: theme.dim(`  ${model.name}`) }) : null,
-                  isServerTier(model.provider) ? jsx(Text, { children: theme.color("accent", "  ⫡ server") }) : null
+                  jsx(Text, { children: theme.dim(`  ${model.provider}`) })
                 ]
               },
-              model.id
+              `${model.provider}/${model.id}`
             );
           })
         });

package/src/console/overlays/host.ts

@@ -16,8 +16,18 @@ export interface OverlayHostProps {
   readonly closeModal: () => void;
 }
 
+import { Box, Text, useInput } from "indusagi/react-host/ink";
+
+function UnavailableOverlay({ closeModal }: { closeModal: () => void }) {
+  useInput((_input, key) => { if (key.escape || key.return) closeModal(); });
+  return jsx(Box, {children: jsx(Text, {children: "This dialog is unavailable in this host. Esc / Enter to return."})});
+}
+
 export function OverlayHost(props: OverlayHostProps) {
   if (props.modal.kind === "none") return null;
+  if (!props.services && props.modal.kind !== "approval" && props.modal.kind !== "plugin") {
+    return jsx(UnavailableOverlay, {closeModal: props.closeModal});
+  }
   const forwarded = {
     modal: props.modal,
     services: props.services,

package/src/console/overlays/pickers.ts

@@ -2,7 +2,10 @@
  * Picker overlays — the selection dialogs raised over the transcript.
  */
 import { useEffect, useState } from "indusagi/react-host";
-import { ScopedModelsDialog, ThemeDialog, type Model } from "indusagi/react-ink";
+import { ScopedModelsDialog, ThemeDialog } from "indusagi/react-ink";
+import type { Model } from "indusagi/ai";
+import type { ThemeScheme } from "../contract.js";
+import type { Preferences, SettingKey } from "../../settings/contract.js";
 import { jsx } from "indusagi/react-host/jsx-runtime";
 import type { ConsoleDispatch, InkThemeAdapter, ModalState, OverlayServices } from "../contract.js";
 import { DEFAULT_SCHEME, isThemeScheme } from "../contract.js";
@@ -13,6 +16,15 @@ import { ModelBoard, SettingsBoard } from "./boards.js";
 
 const TOGGLE_VALUES = ["on", "off"];
 
+function saveSetting<K extends SettingKey>(settings: OverlayServices["settings"], key: K, value: Preferences[K]) {
+  const previous = settings.get(key);
+  try { settings.set(key, value); settings.save(); }
+  catch (error) { settings.set(key, previous); throw error; }
+}
+function reportError(dispatch: ConsoleDispatch, error: unknown) {
+  dispatch({type:"status:set",status:{kind:"error",text:error instanceof Error ? error.message : String(error)}});
+}
+
 function refToModel(ref: any): Model<any> {
   return {
     id: ref.id,
@@ -37,7 +49,7 @@ function listModels(services: OverlayServices): Model<any>[] {
 }
 
 function ModelPicker(props: OverlayGroupProps) {
-  const { services, theme, closeModal } = props;
+  const { services, theme, closeModal, dispatch } = props;
   const authed = useAuthenticatedProviders(services);
   if (!services) return null;
   const all = listModels(services);
@@ -48,8 +60,8 @@ function ModelPicker(props: OverlayGroupProps) {
     onSelect: (model: Model<any>) => {
       try {
         services.conductor.selectModel(model.id);
-      } catch {
-        // ignore
+      } catch (error) {
+        reportError(dispatch, error);
       }
       closeModal();
     },
@@ -72,8 +84,7 @@ function ScopedModelPicker(props: OverlayGroupProps) {
   useEffect(() => {
     if (!services || payload.intent !== "reset") return;
     try {
-      services.settings.set("enabledModels", []);
-      services.settings.save();
+      saveSetting(services.settings, "enabledModels", []);
       dispatch({
         type: "status:set",
         status: { kind: "info", text: "Per-scope model overrides cleared." }
@@ -103,10 +114,9 @@ function ScopedModelPicker(props: OverlayGroupProps) {
       try {
         const all = models.map((model) => model.id);
         const next = ids.length === all.length ? [] : ids;
-        services.settings.set("enabledModels", next);
-        services.settings.save();
-      } catch {
-        // ignore
+        saveSetting(services.settings, "enabledModels", next);
+      } catch (error) {
+        reportError(dispatch, error);
       }
       closeModal();
     },
@@ -114,7 +124,7 @@ function ScopedModelPicker(props: OverlayGroupProps) {
   });
 }
 
-function currentScheme(services: OverlayServices): string {
+function currentScheme(services: OverlayServices): ThemeScheme {
   try {
     const stored = services.settings.get("colourScheme");
     if (typeof stored === "string" && isThemeScheme(stored)) return stored;
@@ -136,12 +146,11 @@ function ThemePicker(props: OverlayGroupProps) {
     themes: [...THEME_SCHEMES],
     onSelect: (name: string) => {
       if (isThemeScheme(name)) {
-        dispatch({ type: "scheme:set", scheme: name });
         try {
-          services.settings.set("colourScheme", name);
-          services.settings.save();
-        } catch {
-          // ignore
+          saveSetting(services.settings, "colourScheme", name);
+          dispatch({ type: "scheme:set", scheme: name });
+        } catch (error) {
+          reportError(dispatch, error);
         }
       }
       closeModal();
@@ -157,20 +166,19 @@ function SettingsPicker(props: OverlayGroupProps) {
   const [, setVersion] = useState(0);
   const bump = () => setVersion((n) => n + 1);
   const onOff = (flag: boolean) => (flag ? "on" : "off");
-  const toggleRow = (id: string, key: string, label: string, description: string, live?: () => void) => ({
+  const toggleRow = (id: string, key: SettingKey, label: string, description: string, live?: (enabled: boolean) => void) => ({
     id,
     label,
     description,
     value: onOff(settings.get(key) as boolean),
     values: [...TOGGLE_VALUES],
     onChange: (value: string) => {
-      settings.set(key, value === "on");
-      settings.save();
-      live?.();
+      saveSetting(settings, key, value === "on");
+      live?.(value === "on");
       bump();
     }
   });
-  const deliveryRow = (id: string, key: string, label: string, description: string) => ({
+  const deliveryRow = (id: string, key: SettingKey, label: string, description: string) => ({
     id,
     label,
     description,
@@ -178,8 +186,7 @@ function SettingsPicker(props: OverlayGroupProps) {
     values: [...DELIVERY_MODES],
     onChange: (value: string) => {
       if (isDeliveryMode(value)) {
-        settings.set(key, value);
-        settings.save();
+        saveSetting(settings, key, value);
       }
       bump();
     }
@@ -193,16 +200,15 @@ function SettingsPicker(props: OverlayGroupProps) {
       value: settings.get("colourScheme") as string,
       values: [...THEME_SCHEMES],
       onChange: (value: string) => {
-        settings.set("colourScheme", value);
-        settings.save();
+        saveSetting(settings, "colourScheme", value);
         if (isThemeScheme(value)) dispatch({ type: "scheme:set", scheme: value });
         bump();
       }
     });
-    items.push(toggleRow("show-images", "showImages", "Show images", "Render inline image content in the transcript.", () => dispatch({ type: "toggle:images" })));
+    items.push(toggleRow("show-images", "showImages", "Show images", "Render inline image content in the transcript.", value => dispatch({ type: "display:set", key: "showImages", value })));
     items.push(toggleRow("image-auto-resize", "imageAutoResize", "Auto-resize images", "Shrink oversized images to fit before handing them to a provider."));
     items.push(toggleRow("block-images", "blockImages", "Block images", "Withhold image content from providers entirely."));
-    items.push(toggleRow("show-reasoning", "showReasoning", "Show reasoning", "Stream the model's reasoning / thinking text as it arrives.", () => dispatch({ type: "toggle:reasoning" })));
+    items.push(toggleRow("show-reasoning", "showReasoning", "Show reasoning", "Stream the model's reasoning / thinking text as it arrives.", value => dispatch({ type: "display:set", key: "showReasoning", value })));
     items.push(toggleRow("skill-commands", "enableSkillCommands", "Skill commands", "Surface discovered skills as their own slash commands."));
     items.push(deliveryRow("steering-mode", "steeringMode", "Steering mode", "Whether queued steering corrections release one at a time or all at once."));
     items.push(deliveryRow("follow-up-mode", "followUpMode", "Follow-up mode", "Whether queued follow-up prompts release one at a time or all at once."));
@@ -211,7 +217,7 @@ function SettingsPicker(props: OverlayGroupProps) {
     items.push(toggleRow("quiet-startup", "quietStartup", "Quiet startup", "Suppress the banner and tips shown on a normal interactive launch."));
     items.push(toggleRow("logo-sweep", "logoSweep", "Logo sweep", "Tint the startup wordmark and emblem along a static colour gradient."));
     items.push(toggleRow("reduced-motion", "reducedMotion", "Reduced motion", "Suppress motion-flavoured flourishes such as the logo colour sweep."));
-    items.push(toggleRow("hardware-cursor", "showHardwareCursor", "Hardware cursor", "Reveal the terminal's own cursor instead of the software-drawn caret."));
+    // Ink 5 owns the hardware cursor; do not offer a nonfunctional switch.
     items.push({
       id: "editor-padding",
       label: "Editor padding",
@@ -221,8 +227,7 @@ function SettingsPicker(props: OverlayGroupProps) {
       onChange: (value: string) => {
         const parsed = Number.parseInt(value, 10);
         if (Number.isFinite(parsed)) {
-          settings.set("editorPaddingX", parsed);
-          settings.save();
+          saveSetting(settings, "editorPaddingX", parsed);
         }
         bump();
       }