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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pum-agent",
-  "version": "0.2.31-beta.1",
+  "version": "0.2.32-beta.1",
   "description": "A compact terminal coding agent powered by pi and OpenTUI.",
   "license": "MIT",
   "type": "module",

package/src/app.tsx

@@ -152,6 +152,7 @@ import {
 import { setBashOutputSettingsIfPresent } from "./bash-output";
 import { settingsCompletions } from "./settings-autocomplete";
 import { modelCommandCompletions, modelReference, parseModelSelection, validateEffort } from "./model-command";
+import { saveMainModelDefaults } from "./model-settings";
 import {
   applySettingChange,
   listSettingsMessage,
@@ -1010,6 +1011,7 @@ export function App({
   const [commandInput, setCommandInput] = useState("");
   const [inputCursorOffset, setInputCursorOffset] = useState(0);
   const [commandCursor, setCommandCursor] = useState(0);
+  const [hoverSuggestionStart, setHoverSuggestionStart] = useState<number | null>(null);
   const [commandSuggestionsDismissed, setCommandSuggestionsDismissed] = useState(false);
   const [editingStashIndexState, setEditingStashIndexState] = useState<number | null>(null);
   const [inputRows, setInputRows] = useState(1);
@@ -1063,7 +1065,16 @@ export function App({
   const newsCursorRef = useRef(0);
   const statsOpenRef = useRef(false);
 
-  const theme = useMemo(() => loadTheme(settings.theme), [settings.theme]);
+  // Preview only the visible autocomplete selection. The committed setting and
+  // its session/global persistence never participate in this temporary state.
+  const themeSuggestions = shellMode || stashOpen || commandSuggestionsDismissed || activeAgentId
+    || transcriptFocused || settingsOpen || helpOpen || historyOpen || statsOpen || agentSelectorOpen
+    || triggersOpen || loginOpen || providersOpen || newsOpen || todoOpen
+    || questionnaireManager?.current() || spawnPreviewManager?.current()
+    ? [] : settingsCompletions(commandInput, inputCursorOffset, cwd);
+  const previewTheme = themeSuggestions[Math.min(commandCursor, Math.max(0, themeSuggestions.length - 1))]?.previewTheme;
+  const displayedTheme = previewTheme ?? settings.theme;
+  const theme = useMemo(() => loadTheme(displayedTheme), [displayedTheme]);
   const { width, height } = useTerminalDimensions();
   const syntaxStyle = useMemo(() => buildSyntaxStyle(theme), [theme]);
   const newsReadById = useMemo(
@@ -1318,7 +1329,10 @@ export function App({
   // Every match stays selectable. Only SUGGESTION_ROWS of them are on screen,
   // and the window scrolls with the selection.
   const suggestionIndex = Math.min(commandCursor, Math.max(0, suggestionCount - 1));
-  const suggestionStart = suggestionWindowStart(suggestionIndex, suggestionCount);
+  // Hover must not scroll its own row out from under a stationary pointer.
+  const suggestionStart = hoverSuggestionStart === null
+    ? suggestionWindowStart(suggestionIndex, suggestionCount)
+    : Math.min(hoverSuggestionStart, Math.max(0, suggestionCount - SUGGESTION_ROWS));
   const visibleSettingRows = filterSettingsRows(settingsQuery);
   const visibleModels = useMemo(() => filterModels(
     modelRuntime.getAvailableSnapshot(),
@@ -1620,6 +1634,7 @@ export function App({
     setCommandSuggestionsClosed(false);
     commandCursorRef.current = 0;
     setCommandCursor(0);
+    setHoverSuggestionStart(null);
     setCommandInput(value);
     scheduleInputMetrics();
   };
@@ -1671,6 +1686,7 @@ export function App({
     setCommandSuggestionsClosed(false);
     commandCursorRef.current = 0;
     setCommandCursor(0);
+    setHoverSuggestionStart(null);
     setCommandInput(value);
     scheduleInputMetrics();
     if (removedImages > 0 || removedPastedTexts > 0) {
@@ -2727,13 +2743,20 @@ export function App({
   /** Explicit global promotion shared by popup `s`, /s, and /store. */
   const promoteSessionSettings = () => {
     const next = settingsRef.current;
+    // Always promote main, even when a child transcript is selected. Do not
+    // call setModel here: it can reset effort and recheck authentication.
+    const savedModel = saveMainModelDefaults(sessionRef.current);
     globalSettingsRef.current = next;
     saveSettings(next);
     // Nothing differs from global any more, so the session owns no overrides.
     sessionOverridesRef.current = {};
     setSessionOverrides({});
     saveSessionSettings(session.sessionFile, {});
-    appendMainLine({ kind: "text", role: "system", text: "Saved these settings as the global defaults." });
+    void savedModel.then(() => {
+      appendMainLine({ kind: "text", role: "system", text: "Saved these settings as the global defaults." });
+    }).catch((error) => {
+      appendMainLine({ kind: "text", role: "error", text: `Could not save model defaults: ${String(error)}` });
+    });
   };
 
   const stepThinking = (step: number) => {
@@ -2742,7 +2765,7 @@ export function App({
     // step from the committed value instead of from a stale render closure.
     const i = levels.indexOf(session.agent.state.thinkingLevel as ThinkingLevel);
     const target = levels[Math.max(0, Math.min(levels.length - 1, i + step))]!;
-    session.setThinkingLevel(target);
+    session.setThinkingLevel(target, { persist: true });
     // setThinkingLevel clamps to what the model supports — show the real value.
     setThinkingLevel(session.agent.state.thinkingLevel as ThinkingLevel);
   };
@@ -2823,6 +2846,7 @@ export function App({
           await deleteProvider(modelRuntime as any, entry);
           // The active model may have belonged to the provider just removed.
           // Move to another one rather than keep a model PUM cannot authenticate.
+          // This automatic fallback must not replace the saved model preference.
           const runtime = modelRuntime as any;
           const replacement = modelAfterRemoval(
             sessionRef.current.agent.state.model,
@@ -2886,7 +2910,7 @@ export function App({
     setModelQuery("");
     setModelSearchFocused(false);
     session
-      .setModel(model)
+      .setModel(model, { persist: true })
       .then(() => setModelId(session.agent.state.model.id))
       .catch((err) => append({ kind: "text", role: "error", text: String(err) }));
   };
@@ -3593,7 +3617,7 @@ export function App({
     const loginCommand = trimmed === "/login";
     const providersCommand = parseProvidersCommand(trimmed);
     const checkPathCommand = /^\/check-path(?:\s|$)/.test(trimmed);
-    const settingsCommand = /^\/settings(?:\s|$)/.test(trimmed);
+    const settingsCommand = /^\/(?:settings|theme)(?:\s|$)/.test(trimmed);
     const modelCommand = /^\/model(?:\s|$)/.test(trimmed);
     const effortCommand = /^\/effort(?:\s|$)/.test(trimmed);
     const triggersCommand = trimmed === "/triggers";
@@ -3697,11 +3721,11 @@ export function App({
           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);
+          await targetSession.setModel(selection.model, { persist: true });
+          if (selection.effort !== undefined) targetSession.setThinkingLevel(selection.effort, { persist: true });
         } else {
           const value = trimmed.slice("/effort".length).trim();
-          if (value) targetSession.setThinkingLevel(validateEffort(value, targetSession.agent.state.model));
+          if (value) targetSession.setThinkingLevel(validateEffort(value, targetSession.agent.state.model), { persist: true });
         }
         setModelId(targetSession.agent.state.model!.id);
         setThinkingLevel(targetSession.agent.state.thinkingLevel as ThinkingLevel);
@@ -5720,6 +5744,7 @@ export function App({
         );
         commandCursorRef.current = next;
         setCommandCursor(next);
+        setHoverSuggestionStart(null);
         return;
       }
       // Keep arrow navigation inside multiline or visually wrapped prompts.
@@ -6026,7 +6051,16 @@ export function App({
               .map((suggestion, index) => {
                 const highlighted = suggestionStart + index === suggestionIndex;
                 return (
-                  <box key={suggestion.key} style={{ height: 1, flexShrink: 0, flexDirection: "row" }}>
+                  <box
+                    key={suggestion.key}
+                    onMouseMove={() => {
+                      const next = suggestionStart + index;
+                      commandCursorRef.current = next;
+                      setHoverSuggestionStart(suggestionStart);
+                      setCommandCursor(next);
+                    }}
+                    style={{ height: 1, flexShrink: 0, flexDirection: "row" }}
+                  >
                     <box style={{ width: 2, flexShrink: 0 }}>
                       {highlighted ? <text content="❯ " fg={theme.accent} /> : null}
                     </box>

package/src/commands.ts

@@ -81,6 +81,10 @@ export const COMMANDS: Command[] = [
     name: "/settings",
     description: "Show or change a setting: /settings <name> <value> [--global]",
   },
+  {
+    name: "/theme",
+    description: "Show or change the theme: /theme <theme> [--global]",
+  },
   {
     name: "/check-path",
     description: "Manage additional Check mode directory roots",

package/src/help-popup.tsx

@@ -66,6 +66,7 @@ export const HELP_GROUPS: HelpGroup[] = [
       ["/todo", "Show the agent's todo list"],
       ["/stats", "Show session statistics"],
       ["/settings", "Show or change a setting"],
+      ["/theme <theme>", "Preview and change the theme"],
       ["/model", "Choose model [effort]; no name opens picker"],
       ["/effort [level]", "Show or change main-agent reasoning effort"],
       ["/store · /s", "Save current settings as global defaults"],

package/src/login-controller.ts

@@ -147,6 +147,8 @@ export class LoginController {
     const selected = await refreshAndSelectModel(
       this.runtime,
       providerId,
+      // Authentication can select a usable model, but it is not an explicit
+      // model preference. Keep the saved main defaults unchanged.
       (model) => session.setModel(model),
       AbortSignal.timeout(15_000),
       session.model,

package/src/model-settings.ts

@@ -0,0 +1,15 @@
+import type { AgentSession } from "@earendil-works/pi-coding-agent";
+
+/** Promote main-session defaults without switching models or resetting effort.
+ * Call only for explicit global promotion, never for startup or child setup.
+ */
+export async function saveMainModelDefaults(session: Pick<AgentSession, "agent" | "settingsManager">): Promise<void> {
+  const { model, thinkingLevel } = session.agent.state;
+  if (model) session.settingsManager.setDefaultModelAndProvider(model.provider, model.id);
+  session.settingsManager.setDefaultThinkingLevel(thinkingLevel);
+  await session.settingsManager.flush();
+  // pi records write failures instead of rejecting flush(). Do not report a
+  // successful promotion when those writes failed.
+  const errors = session.settingsManager.drainErrors();
+  if (errors.length > 0) throw new Error(errors.map(({ error }) => error.message).join("; "));
+}

package/src/settings-autocomplete.ts

@@ -21,6 +21,8 @@ import {
 export type SettingsCompletion = PathCompletion & {
   /** Trailing hint shown after the value in the suggestion row. */
   description?: string;
+  /** Render-only theme preview. Never update settings until command execution. */
+  previewTheme?: string;
 };
 
 const CHECK_PATH_ACTIONS = ["list", "add", "remove", "clear"];
@@ -50,6 +52,16 @@ export function settingsCompletions(
   cursorOffset: number,
   cwd: string,
 ): SettingsCompletion[] {
+  const alias = /^\s*\/theme(?=\s|$)/.exec(input);
+  if (alias) {
+    const commandEnd = alias[0].length;
+    if (cursorOffset <= commandEnd) return [];
+    const expanded = input.slice(0, commandEnd).replace(/\/theme$/, "/settings theme")
+      + input.slice(commandEnd);
+    const added = expanded.length - input.length;
+    return settingsCompletions(expanded, cursorOffset + added, cwd)
+      .map((completion) => ({ ...completion, start: completion.start - added, end: completion.end - added }));
+  }
   if (!/^\s*\/settings(?:\s|$)/.test(input)) return [];
   const cursor = Math.max(0, Math.min(cursorOffset, input.length));
   // Completing behind a trailing argument would rewrite text the cursor has
@@ -111,6 +123,7 @@ export function settingsCompletions(
         start,
         end,
         replacement: candidate.value,
+        ...(spec.key === "theme" ? { previewTheme: candidate.value } : {}),
         ...(candidate.description ? { description: candidate.description } : {}),
       })),
     ...flag,

package/src/settings-command.ts

@@ -367,7 +367,7 @@ export type SettingsCommand =
 
 /** Returns undefined when the input is not a /settings command at all. */
 export function parseSettingsCommand(input: string): SettingsCommand | undefined {
-  const trimmed = input.trim();
+  const trimmed = input.trim().replace(/^\/theme(?=\s|$)/, "/settings theme");
   if (!/^\/settings(?:\s|$)/.test(trimmed)) return undefined;
 
   const tokens = tokenizeSettingsInput(trimmed).slice(1);