pum-agent 0.2.29-beta.1 → 0.2.31-beta.1

package/README.md

@@ -23,6 +23,21 @@ pum
 PUM opens the login panel automatically on the first start. Press `?` on an
 empty prompt to see every control.
 
+Select a model in `Ctrl+P`. GPT-6 Astra is listed for OpenAI and Codex;
+using it requires access on your provider account. Press `r` in the model
+list to refresh providers that support catalog discovery.
+
+Use `/model <name or provider/model-id> [effort]` to change the main-agent model.
+Names and IDs match exactly, without case sensitivity. Display names can contain spaces.
+Use the provider-qualified ID when a name matches more than one model.
+`/model` opens the model picker. `/effort <level>` changes only reasoning effort.
+`/effort` shows the current effort and supported levels.
+Both commands autocomplete available values and reject unsupported efforts before changing the model.
+Model and effort changes use the same authentication and persistence as Settings.
+Run these commands from the main transcript while the agent is idle; child models remain unchanged.
+Use `/store` or `/s` to save current settings as global defaults, exactly like `s` in Settings.
+These aliases promote PUM settings and clear session overrides. Pi already persists model and effort separately.
+
 > [!WARNING]
 > PUM can read, write, and delete files. Check mode adds deterministic policy
 > checks, and supported hosts can enforce native Bash isolation, but the
@@ -103,6 +118,13 @@ bun run start
 
 Use `bun run start -r` to resume the latest session for the current directory,
 and `/login` to add or update a provider later.
+Inside the TUI, `/history` or its alias `/resume` opens the saved-session browser.
+
+Only one PUM instance can own a saved session at a time. Close the owning
+session before resuming it elsewhere. This also applies to headless runs,
+managed agents, and worktree resume aliases. A locked history selection leaves
+the current session unchanged. PUM automatically recovers locks from dead
+processes when it can verify the owner. It never expires a live process lock.
 
 The published package is called `pum-agent` because the bare `pum` name is
 taken; the installed command is still `pum`. `npm i -g pum-agent` copies the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pum-agent",
-  "version": "0.2.29-beta.1",
+  "version": "0.2.31-beta.1",
   "description": "A compact terminal coding agent powered by pi and OpenTUI.",
   "license": "MIT",
   "type": "module",
@@ -50,8 +50,9 @@
     "pack:check": "bun run scripts/validate-pack.ts"
   },
   "dependencies": {
-    "@earendil-works/pi-ai": "^0.84.1",
-    "@earendil-works/pi-coding-agent": "^0.84.1",
+    "@earendil-works/pi-ai": "^0.85.0",
+    "@earendil-works/pi-coding-agent": "^0.85.0",
+    "@earendil-works/pi-server": "^0.85.0",
     "@opentui/core": "^0.5.1",
     "@opentui/react": "^0.5.1",
     "react": "^19.2.8",

package/src/app.tsx

@@ -151,6 +151,7 @@ import {
 } from "./path-autocomplete";
 import { setBashOutputSettingsIfPresent } from "./bash-output";
 import { settingsCompletions } from "./settings-autocomplete";
+import { modelCommandCompletions, modelReference, parseModelSelection, validateEffort } from "./model-command";
 import {
   applySettingChange,
   listSettingsMessage,
@@ -176,9 +177,7 @@ import {
   type PendingImage,
 } from "./image-paste";
 import {
-  cleanupPendingPastedTexts,
-  pastedTextReadBlock,
-  removePendingPastedText,
+  expandPastedTexts,
   shouldStagePastedText,
   stagePastedText as stagePastedTextDefault,
   type PendingPastedText,
@@ -861,7 +860,7 @@ export function App({
   promptStashStore?: PromptStashStore;
   captureImage?: typeof captureClipboardImage;
   readPastedText?: typeof readClipboardText;
-  /** Store large or multiline pasted text in a temp file and show a marker. */
+  /** Keep large or multiline pasted text in memory and show a marker. */
   stagePastedText?: typeof stagePastedTextDefault;
   /** Copies the selected news answer for the popup. */
   copyNewsAnswerText?: typeof copyTextToClipboard;
@@ -1041,6 +1040,8 @@ export function App({
   }));
   const [modelQuery, setModelQuery] = useState("");
   const [modelSearchFocused, setModelSearchFocused] = useState(false);
+  const [modelRefreshing, setModelRefreshing] = useState(false);
+  const [modelRevision, setModelRevision] = useState(0);
   const [, setAgentRevision] = useState(0);
   const [triggersOpen, setTriggersOpen] = useState(false);
   const [processTab, setProcessTab] = useState<ProcessTab>("triggers");
@@ -1266,7 +1267,7 @@ export function App({
     )
     : EMPTY_STATS_SNAPSHOT), [statsOpen, statsManager, session, statsRevision]);
   const inputHint = transcriptFocused
-    ? " transcript  j/k move  enter details  c copy  esc prompt "
+    ? " transcript  ↑/↓ move  enter details  type for prompt "
     : cancelArmed
     ? " esc again to cancel "
     : quitArmed
@@ -1289,8 +1290,7 @@ export function App({
       commandInput,
       activeAgentId ? "subagent" : "main",
     );
-  // /providers and /settings are the commands whose arguments come from closed
-  // sets, so they complete them. Every other command still stops at its name.
+  // Commands with closed argument sets share the path-completion insert path.
   const argumentSuggestionsOff = shellMode || stashOpen || commandSuggestionsDismissed
     || Boolean(activeAgentId);
   const providersSuggestions = argumentSuggestionsOff
@@ -1298,7 +1298,10 @@ export function App({
     : providersCompletions(commandInput, inputCursorOffset, managedProviders);
   const settingsSuggestions = argumentSuggestionsOff
     ? []
-    : settingsCompletions(commandInput, inputCursorOffset, cwd);
+    : [
+      ...settingsCompletions(commandInput, inputCursorOffset, cwd),
+      ...modelCommandCompletions(commandInput, inputCursorOffset, modelRuntime.getAvailableSnapshot(), session.agent.state.model),
+    ];
   const pathSuggestions = (!shellMode && activeAgentId) || stashOpen || commandSuggestionsDismissed
     || isCommandInput(commandInput)
     || !shouldAutoShowPathCompletions(commandInput, inputCursorOffset)
@@ -1321,7 +1324,7 @@ export function App({
     modelRuntime.getAvailableSnapshot(),
     modelQuery,
     (providerId) => (modelRuntime as any).getProvider?.(providerId)?.name ?? "",
-  ), [modelRuntime, modelId, modelQuery, loginPage]);
+  ), [modelRuntime, modelId, modelQuery, loginPage, modelRevision]);
 
   const inputRef = useRef<TextareaRenderable>(null);
   const inputModeRef = useRef(false);
@@ -1334,6 +1337,7 @@ export function App({
   const processTabRef = useRef<ProcessTab>("triggers");
   const settingsPageRef = useRef(page);
   const settingsSearchFocusedRef = useRef(settingsSearchFocused);
+  const modelRefreshInFlightRef = useRef(false);
   const focusInputAfterSwitch = useRef(false);
   const activeAgentIdRef = useRef<string | null>(null);
   const agentSelectorCursorRef = useRef(0);
@@ -1358,9 +1362,6 @@ export function App({
   const lastInputValue = useRef("");
   const pendingPastedTexts = useRef<PendingPastedText[]>([]);
   const nextPastedTextId = useRef(1);
-  /** Pasted-text files consumed by a send whose turn has not settled yet. */
-  const postTurnPastedTexts = useRef(new Map<string, PendingPastedText[]>());
-  const previousSubagentStatus = useRef(new Map<string, string>());
   const imagePasteBusy = useRef(false);
   const loginTextPasteBusy = useRef(false);
   const viewDrafts = useRef(new Map<string, string>());
@@ -1581,18 +1582,10 @@ export function App({
   };
 
   const clearPendingPastedTexts = () => {
-    for (const pasted of pendingPastedTexts.current) removePendingPastedText(pasted);
     pendingPastedTexts.current = [];
     nextPastedTextId.current = 1;
   };
 
-  const releasePostTurnPastedTexts = (targetKey: string) => {
-    const files = postTurnPastedTexts.current.get(targetKey);
-    if (!files) return;
-    postTurnPastedTexts.current.delete(targetKey);
-    for (const pasted of files) removePendingPastedText(pasted);
-  };
-
   const syncInputMetrics = () => {
     const input = inputRef.current;
     // A queued frame or microtask can still run after the renderer destroys the
@@ -1645,8 +1638,7 @@ export function App({
     pathCompletionCycle.current = null;
     const edit = { previous: lastInputValue.current, next: nextValue };
 
-    // Editing any part of a marker deletes the whole attachment and its temp
-    // file at once. Both collections share one running draft, so the pastes
+    // Editing any part of a marker deletes the whole attachment at once. Both collections share one running draft, so the pastes
     // prune against what the images already cut, and both are re-anchored
     // afterwards against the final value.
     const imagePrune = pruneEditedMarkers(pendingImages.current, {
@@ -1668,7 +1660,6 @@ export function App({
     pendingPastedTexts.current = pastes.kept;
 
     for (const image of [...imagePrune.removed, ...images.removed]) removePendingImage(image);
-    for (const pasted of [...pastedPrune.removed, ...pastes.removed]) removePendingPastedText(pasted);
     const removedImages = imagePrune.removed.length + images.removed.length;
     const removedPastedTexts = pastedPrune.removed.length + pastes.removed.length;
 
@@ -1772,7 +1763,6 @@ export function App({
       });
       pendingPastedTexts.current = pendingPastedTexts.current.filter((pasted) => {
         if (!intersects(pasted)) return true;
-        removePendingPastedText(pasted);
         return false;
       });
 
@@ -1818,7 +1808,7 @@ export function App({
 
   /**
    * Replace one large or multiline paste with a `[Pasted text #n]` marker. The text is
-   * written to a private temp file that the agent can `read` during the turn.
+   * kept in memory and expanded into the submitted conversation text.
    */
   const stageLargePastedText = (event: PasteEvent) => {
     if (
@@ -1844,13 +1834,32 @@ export function App({
     const staged = stagePastedText(text);
     const current = input.plainText;
     const selection = input.hasSelection() ? input.getSelection() : null;
-    const start = selection ? selection.start : input.cursorOffset;
-    const end = selection ? selection.end : start;
+    let start = selection ? Math.min(selection.start, selection.end) : input.cursorOffset;
+    let end = selection ? Math.max(selection.start, selection.end) : start;
+    const intersects = (item: { start: number; end: number }) => start === end
+      ? start > item.start && start < item.end
+      : start < item.end && end > item.start;
+    for (const item of [...pendingImages.current, ...pendingPastedTexts.current]) {
+      if (!intersects(item)) continue;
+      start = Math.min(start, item.start);
+      end = Math.max(end, item.end);
+    }
+    pendingImages.current = pendingImages.current.filter((image) => {
+      if (!intersects(image)) return true;
+      removePendingImage(image);
+      return false;
+    });
+    pendingPastedTexts.current = pendingPastedTexts.current.filter((paste) => !intersects(paste));
+    const shift = marker.length - (end - start);
+    const reposition = <T extends { start: number; end: number }>(item: T): T =>
+      item.start >= end ? { ...item, start: item.start + shift, end: item.end + shift } : item;
+    pendingImages.current = pendingImages.current.map(reposition);
+    pendingPastedTexts.current = pendingPastedTexts.current.map(reposition);
     const value = `${current.slice(0, start)}${marker}${current.slice(end)}`;
     pendingPastedTexts.current.push({
       id,
       marker,
-      path: staged.path,
+      text: staged.text,
       bytes: staged.bytes,
       start,
       end: start + marker.length,
@@ -2197,7 +2206,6 @@ export function App({
           answerBufRef.current = "";
           userTurnActiveRef.current = false;
           turnPromptsRef.current = [];
-          releasePostTurnPastedTexts("main");
           streamingRef.current = false;
           setWorking(false);
           // A `/goalf` interview settles into a proposal, never into goal work.
@@ -2231,12 +2239,7 @@ export function App({
       clearTimeout(cancelTimer.current);
       clearPendingImages();
       cleanupPendingImages();
-      const pastedTempFiles = [...pendingPastedTexts.current];
-      for (const files of postTurnPastedTexts.current.values()) pastedTempFiles.push(...files);
-      for (const pasted of pastedTempFiles) removePendingPastedText(pasted);
       pendingPastedTexts.current = [];
-      postTurnPastedTexts.current.clear();
-      cleanupPendingPastedTexts();
       spawnPreviewManager?.cancelAll("shutdown");
     },
     [spawnPreviewManager],
@@ -2246,19 +2249,7 @@ export function App({
     resetCancelArm();
   }, [activeAgentId, visibleBusy]);
 
-  // Release pasted-text temp files once the subagent turn that consumed them settles.
   useEffect(() => {
-    for (const agent of agents) {
-      const previous = previousSubagentStatus.current.get(agent.id);
-      previousSubagentStatus.current.set(agent.id, agent.status);
-      if (
-        (previous === "starting" || previous === "running") &&
-        agent.status !== "starting" &&
-        agent.status !== "running"
-      ) {
-        releasePostTurnPastedTexts(agent.id);
-      }
-    }
     // A judge that settles without calling goal_verdict has said nothing. Drop
     // it, or `judgeInFlight` would stay true and stall the goal for good.
     const judge = judgeRef.current;
@@ -2726,14 +2717,14 @@ export function App({
     // the running bash tool has to see the new policy on the next call.
     if (patch.bashOutput !== undefined) setBashOutputSettingsIfPresent(patch.bashOutput);
     // Session-scoped: the popup never writes the global config, which the
-    // sandboxes keep read-only. `s` in the popup is the one way to promote.
+    // sandboxes keep read-only. Popup `s` and /store explicitly promote.
     const overrides = sessionSettingsDiff(globalSettingsRef.current, next);
     sessionOverridesRef.current = overrides;
     setSessionOverrides(overrides);
     saveSessionSettings(session.sessionFile, overrides);
   };
 
-  /** Promote this session's settings to the global defaults, on `s` in the popup. */
+  /** Explicit global promotion shared by popup `s`, /s, and /store. */
   const promoteSessionSettings = () => {
     const next = settingsRef.current;
     globalSettingsRef.current = next;
@@ -2870,6 +2861,25 @@ export function App({
     void loadManagedProviders();
   }, [commandInput, managedProviders.length]);
 
+  const refreshModels = async () => {
+    if (modelRefreshInFlightRef.current) return;
+    modelRefreshInFlightRef.current = true;
+    setModelRefreshing(true);
+    try {
+      const result = await modelRuntime.refresh({ allowNetwork: true, force: true });
+      if (result.errors.size > 0) {
+        const details = [...result.errors].map(([provider, error]) => `${provider}: ${error.message}`).join("; ");
+        append({ kind: "text", role: "error", text: `model refresh completed with errors: ${details}` });
+      }
+    } catch (error) {
+      append({ kind: "text", role: "error", text: `model refresh failed: ${String(error)}` });
+    } finally {
+      modelRefreshInFlightRef.current = false;
+      setModelRefreshing(false);
+      setModelRevision((revision) => revision + 1);
+    }
+  };
+
   const selectModel = (model: Model<any>) => {
     settingsPageRef.current = "main";
     setPage("main");
@@ -3503,7 +3513,7 @@ export function App({
   /**
    * Session scope by default, exactly like the popup. `--global` also rewrites
    * that one key in pum.json, so the rest of the global file and this session's
-   * other overrides are left alone — only `s` in the popup promotes everything.
+   * other overrides are left alone — popup `s` and /store promote everything.
    */
   const applySettingsPatch = (patch: Partial<PumSettings>, global: boolean) => {
     if (global) {
@@ -3572,20 +3582,27 @@ export function App({
   const runCommand = (text: string): boolean => {
     const trimmed = text.trim();
     if (runGoalCommand(trimmed)) return true;
+    if (trimmed === "/s" || trimmed === "/store") {
+      setEditorText("");
+      promoteSessionSettings();
+      return true;
+    }
     const compress = /^\/compress(?:\s+(.*))?$/s.exec(trimmed);
     const clear = /^\/(?:clear|new)$/.test(trimmed);
-    const historyCommand = trimmed === "/history";
+    const historyCommand = trimmed === "/history" || trimmed === "/resume";
     const loginCommand = trimmed === "/login";
     const providersCommand = parseProvidersCommand(trimmed);
     const checkPathCommand = /^\/check-path(?:\s|$)/.test(trimmed);
     const settingsCommand = /^\/settings(?:\s|$)/.test(trimmed);
+    const modelCommand = /^\/model(?:\s|$)/.test(trimmed);
+    const effortCommand = /^\/effort(?:\s|$)/.test(trimmed);
     const triggersCommand = trimmed === "/triggers";
     const processesCommand = trimmed === "/processes";
     const newsCommand = trimmed === "/news";
     const todoCommand = trimmed === "/todo";
     const statsCommand = trimmed === "/stats";
     const worktreeCommand = parseWorktreeCommand(trimmed);
-    if (!compress && !clear && !historyCommand && !loginCommand && !providersCommand && !checkPathCommand && !settingsCommand && !triggersCommand && !processesCommand && !newsCommand && !todoCommand && !statsCommand && !worktreeCommand) return false;
+    if (!compress && !clear && !historyCommand && !loginCommand && !providersCommand && !checkPathCommand && !settingsCommand && !modelCommand && !effortCommand && !triggersCommand && !processesCommand && !newsCommand && !todoCommand && !statsCommand && !worktreeCommand) return false;
     setEditingStash(null);
 
     if (historyCommand) {
@@ -3593,6 +3610,16 @@ export function App({
       openHistory();
       return true;
     }
+    if (modelCommand && trimmed === "/model") {
+      setEditorText("");
+      setModelQuery("");
+      setModelSearchFocused(true);
+      settingsPageRef.current = "models";
+      setPage("models");
+      settingsOpenRef.current = true;
+      setSettingsOpen(true);
+      return true;
+    }
     if (loginCommand) {
       setEditorText("");
       openLogin();
@@ -3663,6 +3690,25 @@ export function App({
         })
         .catch((err) => append({ kind: "text", role: "error", text: String(err) }))
         .finally(() => setWorking(streamingRef.current));
+    } else if (modelCommand || effortCommand) {
+      const targetSession = session;
+      Promise.resolve().then(async () => {
+        if (modelCommand) {
+          const selection = parseModelSelection(trimmed.slice("/model".length), modelRuntime.getAvailableSnapshot());
+          // Validate before setModel: an invalid effort must not change the model.
+          // setModel owns authentication, persistence, and model-change events.
+          await targetSession.setModel(selection.model);
+          if (selection.effort !== undefined) targetSession.setThinkingLevel(selection.effort);
+        } else {
+          const value = trimmed.slice("/effort".length).trim();
+          if (value) targetSession.setThinkingLevel(validateEffort(value, targetSession.agent.state.model));
+        }
+        setModelId(targetSession.agent.state.model!.id);
+        setThinkingLevel(targetSession.agent.state.thinkingLevel as ThinkingLevel);
+        append({ kind: "text", role: "system", text: `Model: ${modelReference(targetSession.agent.state.model!)}; effort: ${targetSession.agent.state.thinkingLevel}. Supported efforts: ${getSupportedThinkingLevels(targetSession.agent.state.model).join(", ")}` });
+      })
+        .catch((err) => append({ kind: "text", role: "error", text: String(err) }))
+        .finally(() => setWorking(streamingRef.current));
     } else if (settingsCommand) {
       runSettingsCommand(trimmed)
         .catch((err) => append({ kind: "text", role: "error", text: String(err) }))
@@ -4227,21 +4273,18 @@ export function App({
     const targetKey = selectedAgentId ?? "main";
     const rawDisplayText = value ?? inputRef.current?.plainText ?? "";
     const commandEligible = isCommandInput(rawDisplayText);
-    const displayText = rawDisplayText.trim();
     const attachments = value === undefined ? [...pendingImages.current] : [];
     const pastedTexts = value === undefined ? [...pendingPastedTexts.current] : [];
     const submittedEditingIndex = editingStashIndex.current;
-    let promptText = rawDisplayText;
-    for (const image of attachments) promptText = promptText.replace(image.marker, "");
-    for (const pasted of pastedTexts) {
-      promptText = promptText.replace(pasted.marker, pastedTextReadBlock(pasted));
-    }
-    promptText = promptText.trim();
-
-    // History and stash keep the draft form, never the ephemeral temp path.
-    let persistedPrompt = rawDisplayText;
-    for (const pasted of pastedTexts) persistedPrompt = persistedPrompt.replace(pasted.marker, "");
-    persistedPrompt = persistedPrompt.trim();
+    const expandedText = expandPastedTexts(rawDisplayText, pastedTexts);
+    const displayText = pastedTexts.length ? expandedText : expandedText.trim();
+    const expandedPrompt = expandPastedTexts(rawDisplayText, [
+      ...pastedTexts,
+      ...attachments.map((image) => ({ ...image, text: "" })),
+    ]);
+    const promptText = pastedTexts.length ? expandedPrompt : expandedPrompt.trim();
+    // Recall and persisted transcript text remain usable without draft payloads.
+    const persistedPrompt = displayText;
 
     if (!promptText && attachments.length === 0 && pastedTexts.length === 0) return;
 
@@ -4284,17 +4327,13 @@ export function App({
       return;
     }
 
-    // Detach files from editor cleanup until delivery succeeds. A failed send
+    // Detach attachments from editor cleanup until delivery succeeds. A failed send
     // can then restore the exact draft and each still-valid attachment marker.
     if (value === undefined) {
       pendingImages.current = [];
       nextImageId.current = 1;
       pendingPastedTexts.current = [];
       nextPastedTextId.current = 1;
-      if (pastedTexts.length > 0) {
-        const existing = postTurnPastedTexts.current.get(targetKey) ?? [];
-        postTurnPastedTexts.current.set(targetKey, [...existing, ...pastedTexts]);
-      }
     }
 
     setEditorText("");
@@ -4303,18 +4342,11 @@ export function App({
       for (const image of attachments) removePendingImage(image);
     };
     const restoreFailedDraft = () => {
-      const postTurn = postTurnPastedTexts.current.get(targetKey) ?? [];
-      const submittedPaths = new Set(pastedTexts.map((pasted) => pasted.path));
-      const remaining = postTurn.filter((pasted) => !submittedPaths.has(pasted.path));
-      if (remaining.length > 0) postTurnPastedTexts.current.set(targetKey, remaining);
-      else postTurnPastedTexts.current.delete(targetKey);
-
       const canRestore =
         activeAgentIdRef.current === selectedAgentId &&
         !(inputRef.current?.plainText ?? "");
       if (!canRestore) {
         finishAttachments();
-        for (const pasted of pastedTexts) removePendingPastedText(pasted);
         append({
           kind: "text",
           role: "error",
@@ -4346,6 +4378,13 @@ export function App({
       return;
     }
 
+    // Model controls follow Settings: only main owns model mutations.
+    if (selectedAgentId && attachments.length === 0 && commandEligible
+      && /^\/(?:model|effort|s|store)(?:\s|$)/.test(promptText)) {
+      appendRequesterLine(selectedAgentId, { kind: "text", role: "error", text: "Model, effort, and global settings commands require the main transcript. Select the main transcript first." });
+      return;
+    }
+
     // /background belongs to the selected transcript, unlike the main-only
     // command router below, and must never become an ordinary child message.
     if (
@@ -4411,7 +4450,7 @@ export function App({
   };
 
   const submitShellCommand = () => {
-    const command = inputRef.current?.plainText ?? "";
+    const command = expandPastedTexts(inputRef.current?.plainText ?? "", pendingPastedTexts.current);
     if (!command.trim()) return;
     const selectedAgentId = activeAgentIdRef.current;
     setEditorText("");
@@ -4644,24 +4683,24 @@ export function App({
       ? "  (no truecolor)"
       : "";
   const rowValues: Record<SettingRowId, string> = {
-    theme: `‹ ${theme.name} ›`,
-    providers: "login and custom setup ›",
-    animations: `‹ ${settings.animations ? "on" : "off"} ›`,
-    workingRuleAnimation: `‹ ${WORKING_RULE_ANIMATION_LABELS[settings.workingRuleAnimation]} ›${settings.workingRuleAnimation === "off" ? "" : animationUnavailable}`,
-    outputMode: `‹ ${OUTPUT_MODE_LABELS[settings.outputMode ?? "normal"]} ›`,
-    showAgentMessages: `‹ ${settings.showAgentMessages === false ? "off" : "on"} ›`,
-    webSearch: `‹ ${settings.webSearch ? "on" : "off"} ›${searchProviders.length ? "" : "  (not on provider)"}`,
-    writingStyle: `‹ ${settings.writingStyle} ›`,
-    explanationStrength: `‹ ${settings.explanationStrength} ›`,
-    checkMode: `‹ ${settings.checkMode} ›`,
-    sandboxMode: `‹ ${settings.sandboxMode ?? "auto"} ›`,
-    checkModel: `${settings.checkModel} ›`,
-    checkPaths: `${checkPathsForProject(settings, cwd).length} additional · /check-path ›`,
-    thinkingLevel: `‹ ${thinkingLevel} ›`,
-    showThinking: `‹ ${settings.showThinking ? "on" : "off"} ›`,
-    maxActiveSubagents: `‹ ${settings.maxActiveSubagents} ›`,
-    goalRetryLimit: `‹ ${normalizeGoalRetryLimit(settings.goalRetryLimit) || "unlimited"} ›`,
-    model: `${modelId} ›`,
+    theme: `‹ › ${theme.name}`,
+    providers: "› login and custom setup",
+    animations: `‹ › ${settings.animations ? "on" : "off"}`,
+    workingRuleAnimation: `‹ › ${WORKING_RULE_ANIMATION_LABELS[settings.workingRuleAnimation]}${settings.workingRuleAnimation === "off" ? "" : animationUnavailable}`,
+    outputMode: `‹ › ${OUTPUT_MODE_LABELS[settings.outputMode ?? "normal"]}`,
+    showAgentMessages: `‹ › ${settings.showAgentMessages === false ? "off" : "on"}`,
+    webSearch: `‹ › ${settings.webSearch ? "on" : "off"}${searchProviders.length ? "" : "  (not on provider)"}`,
+    writingStyle: `‹ › ${settings.writingStyle}`,
+    explanationStrength: `‹ › ${settings.explanationStrength}`,
+    checkMode: `‹ › ${settings.checkMode}`,
+    sandboxMode: `‹ › ${settings.sandboxMode ?? "auto"}`,
+    checkModel: `› ${settings.checkModel}`,
+    checkPaths: `› ${checkPathsForProject(settings, cwd).length} additional · /check-path`,
+    thinkingLevel: `‹ › ${thinkingLevel}`,
+    showThinking: `‹ › ${settings.showThinking ? "on" : "off"}`,
+    maxActiveSubagents: `‹ › ${settings.maxActiveSubagents}`,
+    goalRetryLimit: `‹ › ${normalizeGoalRetryLimit(settings.goalRetryLimit) || "unlimited"}`,
+    model: `› ${modelId}`,
   };
 
   const updateSettingsQuery = (query: string) => {
@@ -4875,18 +4914,6 @@ export function App({
   // the life of the app. The ref carries the current closure behind it.
   clickTranscriptDisclosureRef.current = clickTranscriptDisclosure;
 
-  const copyTranscriptRow = () => {
-    const line = visibleLines[transcriptCursorRef.current];
-    if (!line) return;
-    copyTranscriptText(projectedLineRawText(line), {
-      osc52: (value) => renderer.copyToClipboardOSC52(value),
-    }).catch((error) => append({
-      kind: "text",
-      role: "error",
-      text: `copy failed: ${String(error)}`,
-    }));
-  };
-
   usePaste((event) => {
     const controller = loginControllerRef.current;
     if (loginOpen) {
@@ -4900,6 +4927,12 @@ export function App({
   });
 
   useKeyboard((key) => {
+    // Match Textarea's printable sequence handling, but leave all modified
+    // commands (including Option) with their existing owner.
+    const typedText = !key.ctrl && !key.meta && !key.option && !key.super && !key.hyper
+      ? key.name === "space" ? " " : key.sequence && !/[\u0000-\u001f\u007f-\u009f]/u.test(key.sequence)
+        ? key.sequence : ""
+      : "";
     if (spawnPreview) {
       const isPreviewReturn = ["return", "enter", "kpenter", "linefeed"].includes(key.name);
       if (key.name === "escape" || (key.ctrl && key.name === "c")) {
@@ -5073,13 +5106,12 @@ export function App({
       return;
     }
 
-    if (transcriptFocusedRef.current) {
+    if (transcriptFocusedRef.current && !typedText) {
       key.stopPropagation();
       if (key.name === "escape") setTranscriptFocus(false);
-      else if (key.name === "j" || key.name === "down") moveTranscriptCursor(1);
-      else if (key.name === "k" || key.name === "up") moveTranscriptCursor(-1);
+      else if (key.name === "down") moveTranscriptCursor(1);
+      else if (key.name === "up") moveTranscriptCursor(-1);
       else if (["return", "enter", "kpenter", "linefeed"].includes(key.name)) toggleTranscriptDetail();
-      else if (key.name === "c" && !key.ctrl && !key.meta && !key.option) copyTranscriptRow();
       return;
     }
 
@@ -5255,6 +5287,18 @@ export function App({
       return;
     }
 
+    // Popups above retain typing ownership. Settings handles its fields below.
+    // A clicked transcript row or a native blur must not consume the first
+    // typed character. Stop dispatch before focusing: OpenTUI can otherwise
+    // deliver this same event to the newly focused textarea a second time.
+    const recoverTypedInput = Boolean(typedText && !settingsOpenRef.current && !settingsOpen
+      && inputRef.current && (!inputRef.current.focused || transcriptFocusedRef.current));
+    if (recoverTypedInput) {
+      key.stopPropagation();
+      if (transcriptFocusedRef.current) setTranscriptFocus(false);
+      inputRef.current?.focus();
+    }
+
     // `?` on an empty prompt opens help instead of typing a question mark.
     // With text already in the line it is just a character.
     if (key.sequence === "?" && !settingsOpen && !inputRef.current?.plainText) {
@@ -5284,6 +5328,11 @@ export function App({
           }
           return;
         }
+        if (!key.ctrl && !key.meta && !key.option && printableKey === "r") {
+          key.stopPropagation();
+          void refreshModels();
+          return;
+        }
         if (isModelSearchShortcut(key, modelSearchFocused)) {
           key.stopPropagation();
           setModelSearchFocused(true);
@@ -5424,7 +5473,10 @@ export function App({
       : providersCompletions(inputValue, inputCursor, managedProvidersRef.current);
     const settingsMatches = argumentMatchesOff
       ? []
-      : settingsCompletions(inputValue, inputCursor, cwd);
+      : [
+        ...settingsCompletions(inputValue, inputCursor, cwd),
+        ...modelCommandCompletions(inputValue, inputCursor, modelRuntime.getAvailableSnapshot(), session.agent.state.model),
+      ];
     // Every source carries path-completion offsets, so one insert path serves all.
     const closedSetMatches = providersMatches.length > 0 ? providersMatches : settingsMatches;
     const argumentMatches = closedSetMatches.length > 0 ? closedSetMatches : pathMatches;
@@ -5759,6 +5811,7 @@ export function App({
       settingsOpenRef.current = true;
       setSettingsOpen(true);
     }
+    if (recoverTypedInput) inputRef.current?.insertText(typedText);
   });
 
   const lastLine = visibleLines[visibleLines.length - 1];
@@ -6170,6 +6223,7 @@ export function App({
               models={visibleModels}
               modelQuery={modelQuery}
               modelSearchFocused={modelSearchFocused}
+              modelRefreshing={modelRefreshing}
               onSearchChange={updateSettingsQuery}
               onModelSearchChange={setModelQuery}
               onSelectModel={selectModel}

package/src/bash-tail-text.ts

@@ -0,0 +1,15 @@
+import { TextRenderable } from "@opentui/core";
+import { extend } from "@opentui/react";
+
+/** A fixed tail viewport: wheel events belong to the enclosing transcript. */
+export class BashTailTextRenderable extends TextRenderable {
+  protected override handleScroll(): void {}
+}
+
+extend({ bash_tail_text: BashTailTextRenderable });
+
+declare module "@opentui/react" {
+  interface OpenTUIComponents {
+    bash_tail_text: typeof BashTailTextRenderable;
+  }
+}