mixdog 1.3.5 → 1.4.1

package/src/standalone/session-protocol.mjs

@@ -27,6 +27,7 @@ export const SESSION_READ_ACTIONS = Object.freeze([
   'getChannelSettings',
   'getChannelSetup',
   'getChannelWorkerStatus',
+  'getCacheWarmingSettings',
   'getCompactionSettings',
   'getConversationImportJobs',
   'getDeveloperSettings',
@@ -40,6 +41,7 @@ export const SESSION_READ_ACTIONS = Object.freeze([
   'getOAuthProviderLoginStatus',
   'getOutputStyle',
   'getOrchestrationMode',
+  'getConfiguredOrchestrationMode',
   'getProfile',
   'getProviderSetup',
   'getProviderAccounts',
@@ -211,6 +213,7 @@ export const SESSION_CONFIGURE_ACTIONS = Object.freeze([
   'setAgentRoute',
   'setAutoClear',
   'setAutoUpdate',
+  'setCacheWarmingEnabled',
   'setCompactionSettings',
   'setCwd',
   'setDeveloperOption',
@@ -242,6 +245,8 @@ export const SESSION_CONFIGURE_ACTIONS = Object.freeze([
   'setRecapEnabled',
   'setAiSessionTitles',
   'setHeartbeatEnabled',
+  'setHeartbeatInterval',
+  'noteUserInput',
   'setReactionsEnabled',
   'setLeadAppearance',
   'setBotOrder',

package/src/standalone/session-service/agent-tree/agent-child.mjs

@@ -31,6 +31,7 @@ export function createAgentChildFactory({ registry, rehydrateAgentSessions, crea
       sourceName: spec.sourceName || spec.agent || 'agent',
       clientHostPid: spec.clientHostPid || null,
       ...(preset.fallbacks !== undefined ? { routeFallbacks: preset.fallbacks } : {}),
+      ...(preset.fallbackSource ? { routeFallbackSource: preset.fallbackSource } : {}),
     };
     const created = await createSession({
       cwd: spec.cwd || process.cwd(),

package/src/standalone/session-service/agent-tree/agent-turns.mjs

@@ -5,8 +5,12 @@ import { randomUUID } from 'node:crypto';
 import { createAgentChildFactory } from './agent-child.mjs';
 import { partialHandoffTextFromSession } from '../../../runtime/agent/orchestrator/agent-runtime/agent-progress-watchdog.mjs';
 import { attachmentsForIntake } from '../../../runtime/attachments/store.mjs';
-import { artifactLines } from '../../../runtime/shared/handoff-artifacts.mjs';
-import { collectTurnArtifacts, handoffContent, sessionRoots } from '../../../session-runtime/handoff-attachments.mjs';
+import { producedFileLines } from '../../../runtime/shared/handoff-artifacts.mjs';
+import {
+  collectUnreportedWrites,
+  handoffContent,
+  sessionRoots,
+} from '../../../session-runtime/handoff-attachments.mjs';
 
 /** An agent turn's prompt: text, or text with forwarded attachment parts
  *  (handoff-attachments.mjs), never any other shape. */
@@ -25,18 +29,19 @@ export function agentTurnTranscriptMeta(content) {
   return { sender: 'lead', ...(attachments.length ? { attachments } : {}) };
 }
 
-/** The artifact lines of the turn that began at `messageStart`; [] on any
- *  failure to read it (the handoff still goes out). */
-async function turnArtifactLines(runtime, messageStart, descriptor) {
+/** The lines for files the turn that began at `messageStart` created or
+ *  modified and `report` does not already name; [] on any failure to read it
+ *  (the handoff still goes out). */
+async function turnArtifactLines(runtime, messageStart, descriptor, report) {
   try {
     const { messages } = await runtime.readModelMessages(messageStart);
     const session = runtime.session || descriptor;
-    const { files, omitted } = collectTurnArtifacts(messages, {
+    const { files, omitted } = collectUnreportedWrites(messages, {
       cwd: descriptor.cwd,
       roots: sessionRoots(session, descriptor.cwd),
+      report,
     });
-    // Text only: the caller forwards these by path (an id in text is never trusted).
-    return artifactLines(files, omitted, { ids: false });
+    return producedFileLines(files, omitted);
   } catch {
     return [];
   }
@@ -131,10 +136,9 @@ export function createAgentTurns({
       }
       let result = detail?.result || { content: '' };
       // The files the turn produced reach the owner with its handoff.
-      const files = await turnArtifactLines(entry.runtime, messageStart, descriptor);
-      if (files.length) {
-        result = { ...result, content: [String(result.content || ''), files.join('\n')].join('\n\n') };
-      }
+      const report = String(result.content || '');
+      const files = await turnArtifactLines(entry.runtime, messageStart, descriptor, report);
+      if (files.length) result = { ...result, content: [report, files.join('\n')].join('\n\n') };
       descriptor.status = 'idle';
       descriptor.stage = 'idle';
       descriptor.lastHandoff = typeof result?.content === 'string' ? result.content : '';

package/src/standalone/session-service/quota-resume.mjs

@@ -44,6 +44,9 @@ async function resumeDueEntry(entry, { store, materializeSession, readQuotaUsabl
   try {
     usable = await readQuotaUsable(provider, model);
   } catch (error) {
+    // A disconnected PC supplies no quota reading. The scheduler's outer
+    // deferral keeps this reservation without spending an exhaustion attempt.
+    if (error?.code === 'MODEL_PROXY_UNAVAILABLE') throw error;
     log(`quota resume usage reading failed provider=${provider}: ${error?.message || error}`);
   }
   if (!isCurrent(store, entry)) return 'cancelled';

package/src/standalone/session-service/retention/busy.mjs

@@ -7,6 +7,17 @@
  * turn. The eviction sweep that consumes this lives in ../retention.mjs.
  */
 import { activeBackgroundTaskSessionIds, hasActiveBackgroundTasks } from '../../../runtime/shared/background-tasks.mjs';
+import { emitSessionApprovalCardChange } from '../../../runtime/shared/session-activity-signal.mjs';
+import { roomMemberOfSession } from '../../../runtime/agent/orchestrator/session/agent-room.mjs';
+
+/** A room member session's copies of the questions of sessions it handed work
+ *  to (tui/session/tool-approval.mjs `handoffQuestions`); empty for any other
+ *  session. The room shows them from the member's catalog row (agent-rooms.ts),
+ *  as no view watches a member session. */
+function roomHandoffQuestionsOf(sessionId, state) {
+  if (!roomMemberOfSession(sessionId)) return [];
+  return Array.isArray(state?.handoffQuestions) ? state.handoffQuestions : [];
+}
 
 export function createBusyTracker({ sessions, currentSessionId }) {
   function stateBusy(state) {
@@ -18,9 +29,54 @@ export function createBusyTracker({ sessions, currentSessionId }) {
   function updateEntryBusy(entry, state) {
     const next = stateBusy(state);
     entry.busy = next;
+    // Every runtime state change passes here, watched or headless: a session
+    // that starts or stops showing an approval card (any kind, a sub-agent's
+    // delegated copy included) announces it, so the session catalog — the one
+    // status source every list row has, open pane or not — re-reads it.
+    const awaitingApproval = Boolean(state?.toolApproval);
+    const awaitingQuestion = state?.toolApproval?.kind === 'question';
+    // A room member's handed-off questions coming and going re-read it too.
+    const sessionId = currentSessionId(entry) || '';
+    const handoffQuestions = roomHandoffQuestionsOf(sessionId, state)
+      .map((question) => String(question?.id ?? ''))
+      .join('\n');
+    if (
+      awaitingApproval !== (entry.awaitingApproval === true) ||
+      awaitingQuestion !== (entry.awaitingQuestion === true) ||
+      handoffQuestions !== (entry.handoffQuestions ?? '')
+    ) {
+      entry.awaitingApproval = awaitingApproval;
+      entry.awaitingQuestion = awaitingQuestion;
+      entry.handoffQuestions = handoffQuestions;
+      emitSessionApprovalCardChange(sessionId);
+    }
     return next;
   }
 
+  /** Room member session id -> its pending handed-off question copies, for
+   *  every live member runtime holding one. */
+  function roomHandoffQuestions() {
+    const byMember = new Map();
+    for (const entry of sessions) {
+      const sessionId = currentSessionId(entry);
+      const questions = sessionId ? roomHandoffQuestionsOf(sessionId, entry.runtime?.getState?.()) : [];
+      if (questions.length) byMember.set(sessionId, questions);
+    }
+    return byMember;
+  }
+
+  /** Session id -> the kind of its pending card ('approval' | 'question') for
+   *  every session whose live runtime shows one waiting on the user. */
+  function awaitingApprovalSessionKinds() {
+    const kinds = new Map();
+    for (const entry of sessions) {
+      const sessionId = currentSessionId(entry);
+      const pending = sessionId ? entry.runtime?.getState?.()?.toolApproval : null;
+      if (pending) kinds.set(sessionId, pending.kind === 'question' ? 'question' : 'approval');
+    }
+    return kinds;
+  }
+
   function sessionBusy(entry) {
     const sessionId = currentSessionId(entry);
     // Detached views do not make their background commands disposable. Keep
@@ -65,5 +121,13 @@ export function createBusyTracker({ sessions, currentSessionId }) {
     return count;
   }
 
-  return { stateBusy, updateEntryBusy, sessionBusy, liveBusyCount, liveTurnBusyCount };
+  return {
+    stateBusy,
+    updateEntryBusy,
+    awaitingApprovalSessionKinds,
+    roomHandoffQuestions,
+    sessionBusy,
+    liveBusyCount,
+    liveTurnBusyCount,
+  };
 }

package/src/standalone/session-service/session-calls/session-action.mjs

@@ -4,6 +4,7 @@
 import { SESSION_CONFIGURE_ACTION_SET, SESSION_READ_ACTION_SET } from '../../session-protocol.mjs';
 import { annotateSpan, markPhase } from '../../../runtime/shared/slow-span.mjs';
 import { sanitizeForWire } from '../../session-wire-values.mjs';
+import { botWorkBySession } from '../../../runtime/shared/bot-owned-work.mjs';
 
 /** Reads a session without a live runtime answers from disk (readStoredReview). */
 const STORED_REVIEW_ACTIONS = new Set([
@@ -40,7 +41,7 @@ export function createSessionActionCalls(ctx) {
     responseSessionId,
   } = ctx;
   const { bodyForClient } = ctx.projection;
-  const { retainUnwatched } = ctx.retention;
+  const { retainUnwatched, awaitingApprovalSessionKinds, roomHandoffQuestions } = ctx.retention;
   const { assertAvailable, hostedEntryForSession, entryForSession } = ctx.entries;
 
   /** A cold session's review, read from its durable turn record (the same
@@ -111,6 +112,33 @@ export function createSessionActionCalls(ctx) {
     return result;
   }
 
+  /** Rows with `awaitingApproval` on every session whose live runtime shows an
+   *  approval card: a list row reads "needs you" from it whether or not any
+   *  pane receives that session's lane. A room member's row also carries the
+   *  handed-off questions it holds (`handoffQuestions`), which its room shows.
+   *  A session holding work a bot sent (bot-owned-work.mjs) carries those bots
+   *  (`handedBy`): the work there is theirs, and a turn nobody sent (the
+   *  user's own) is nobody's but the user's. */
+  function withApprovalWaits(rows) {
+    if (!Array.isArray(rows)) return rows;
+    const waiting = awaitingApprovalSessionKinds();
+    const questions = roomHandoffQuestions();
+    const sent = botWorkBySession();
+    if (!waiting.size && !questions.size && !sent.size) return rows;
+    return rows.map((row) => {
+      const kind = waiting.get(row?.id);
+      const asked = questions.get(row?.id);
+      const bots = sent.get(row?.id);
+      if (!kind && !asked && !bots) return row;
+      return {
+        ...row,
+        ...(kind ? { awaitingApproval: true, ...(kind === 'question' ? { awaitingQuestion: true } : {}) } : {}),
+        ...(asked ? { handoffQuestions: asked } : {}),
+        ...(bots ? { handedBy: bots } : {}),
+      };
+    });
+  }
+
   async function listSessionCatalog(options = {}) {
     if (isClosed()) throw new Error('session service is closed');
     if (typeof listSessions !== 'function') {
@@ -124,7 +152,7 @@ export function createSessionActionCalls(ctx) {
     });
     // A `page: { limit, cursor }` request answers one page: { sessions, nextCursor }.
     const page = listed && !Array.isArray(listed) && Array.isArray(listed.sessions) ? listed : null;
-    const sessions = page ? page.sessions : listed;
+    const sessions = withApprovalWaits(page ? page.sessions : listed);
     const remoteSession = typeof getRemoteSessionState === 'function' ? await getRemoteSessionState() : null;
     const nextCursor = typeof page?.nextCursor === 'string' ? page.nextCursor : null;
     return {

package/src/standalone/session-service/session-calls/session-views.mjs

@@ -131,6 +131,14 @@ export function createSessionViewCalls(ctx) {
     notePrependViewer(viewer, params);
     const id = String(sessionId || '');
     if (!id) throw new TypeError('sessionId is required');
+    if (params.attachmentHistory === true) {
+      // Apart from every window: nothing here reads, fills or replaces a
+      // transcript projection.
+      const stored =
+        typeof readStoredSession === 'function' ? await readStoredSession(id, { attachmentHistory: true }) : null;
+      assertAvailable();
+      return { history: stored ? { items: stored.items } : null };
+    }
     const live = await liveEntryFor(id);
     assertAvailable(live);
     if (params.transcriptRange) {

package/src/standalone/session-tool-output.mjs

@@ -7,6 +7,8 @@ import { summarizeToolResult } from '../runtime/shared/tool-result-summary.mjs';
 import { TOOL_OUTPUT_PAGE_BYTES, TOOL_OUTPUT_TAIL_BYTES } from '../runtime/shared/tool-output-budget.mjs';
 
 export const SESSION_TOOL_OUTPUT_BYTES = TOOL_OUTPUT_TAIL_BYTES;
+// A session title as the session tool quotes it, listed or read.
+export const SESSION_TITLE_LIMIT = 160;
 const MESSAGE_TEXT_LIMIT = 2000;
 const LIST_PREVIEW_LIMIT = 100;
 const outputBytes = (value) => Buffer.byteLength(JSON.stringify(value), 'utf8');
@@ -15,24 +17,30 @@ const outputBytes = (value) => Buffer.byteLength(JSON.stringify(value), 'utf8');
  *  `rich` adds the owning bot, last activity, latest line and working state
  *  (never for a background caller: bot-status.mjs scopedBot). `rich` may be a
  *  per-row predicate: a bot gets them only for its own sessions. */
-export function sessionListOutput(page, limit, { rich = true } = {}) {
+export function sessionListOutput(page, limit, { rich = true, cursorOf = encodeCatalogCursor } = {}) {
   const raw = page.sessions;
   const sessions = raw.slice(0, limit).map((row) => {
     // Decided first: a session that is not the caller's carries its real
     // title only, never a preview standing in for it.
     const own = typeof rich === 'function' ? rich(row) : rich;
     const title = own ? row.title || row.preview : row.title;
+    // Live work, for every caller: its own turn or pool row (`working`)
+    // reads `running` whatever the settled catalog status; an Agent session
+    // working for it (`agentWorking`) marks it working too.
+    const status = row.working === true ? 'running' : row.status;
+    const working = row.working === true || row.agentWorking === true ? { working: true } : {};
     const base = {
       id: row.id,
-      ...(title ? { title: escapeHarnessTags(truncateToolText(title, 160)) } : {}),
-      ...(row.status ? { status: row.status } : {}),
+      ...(title ? { title: escapeHarnessTags(truncateToolText(title, SESSION_TITLE_LIMIT)) } : {}),
+      ...(status ? { status } : {}),
       ...(row.cwd ? { cwd: row.cwd } : {}),
       ...(row.archived === true ? { archived: true } : {}),
     };
-    if (!own) return base;
+    if (!own) return { ...base, ...working };
     // The bot it belongs to: its chat, room seat or the task's creator.
     const bot = sessionBotOf(row);
-    const lastUsedAt = Number(row.lastUsedAt) || 0;
+    // A live row's latest sign of work (`liveAt`) is newer than its last settled turn.
+    const lastUsedAt = Math.max(Number(row.lastUsedAt) || 0, Number(row.liveAt) || 0);
     const preview = String(row.lastMessagePreview || '').replace(/\s+/g, ' ');
     return {
       ...base,
@@ -40,7 +48,7 @@ export function sessionListOutput(page, limit, { rich = true } = {}) {
       ...(lastUsedAt ? { lastUsedAt: new Date(lastUsedAt).toISOString() } : {}),
       // The latest user or assistant line, quoted data.
       ...(preview.trim() ? { preview: escapeHarnessTags(truncateToolText(preview, LIST_PREVIEW_LIMIT)) } : {}),
-      ...(row.working === true || row.agentWorking === true ? { working: true } : {}),
+      ...working,
     };
   });
   const result = {
@@ -50,7 +58,7 @@ export function sessionListOutput(page, limit, { rich = true } = {}) {
   };
   for (;;) {
     if (sessions.length < raw.length && sessions.length) {
-      result.nextCursor = encodeCatalogCursor(raw[sessions.length - 1]);
+      result.nextCursor = cursorOf(raw[sessions.length - 1]);
     }
     if (outputBytes(result) <= TOOL_OUTPUT_PAGE_BYTES) return result;
     if (sessions.length <= 1) throw new Error('session: one catalog row exceeds the output budget');

package/src/standalone/session-transport/client-registry/client-grace.mjs

@@ -70,15 +70,18 @@ export function createClientGrace({
     // tick for as long as the daemon took to go down. A lifecycle client that
     // attaches again clears the latch, because that daemon is staying up.
     if (graceTimer || signalled) return;
-    graceTimer = setTimeout(() => {
-      graceTimer = null;
-      if (isClosed() || lifecycleClientCount() > 0) return;
-      signalled = true;
-      log(`no clients remain (${reason}) — signalling shutdown`);
-      try {
-        onClientsEmpty();
-      } catch {}
-    }, lastLifecycleWasRemote ? remoteClientGraceMs() : clientGraceMs);
+    graceTimer = setTimeout(
+      () => {
+        graceTimer = null;
+        if (isClosed() || lifecycleClientCount() > 0) return;
+        signalled = true;
+        log(`no clients remain (${reason}) — signalling shutdown`);
+        try {
+          onClientsEmpty();
+        } catch {}
+      },
+      lastLifecycleWasRemote ? remoteClientGraceMs() : clientGraceMs
+    );
     graceTimer.unref?.();
   }
 

package/src/tui/app/app-view/floating-panel.jsx

@@ -38,9 +38,7 @@ function renderToolApproval({ toolApproval, store, frameColumns, expandedOptionP
         onSubmit={(answers) =>
           store.resolveToolApproval?.(toolApproval.id, { approved: true, reason: 'answered by user', answers })
         }
-        onDismiss={() =>
-          store.resolveToolApproval?.(toolApproval.id, { approved: false, reason: 'dismissed by user' })
-        }
+        onDismiss={() => store.resolveToolApproval?.(toolApproval.id, { approved: false, reason: 'dismissed by user' })}
       />
     );
   }
@@ -249,7 +247,12 @@ export function renderFloatingPanel(ctx) {
   }
   if (btwPanel) {
     return (
-      <BtwPanel panel={btwPanel} columns={frameColumns} panelRows={floatingPanelRows} themeEpoch={ctx.state?.themeEpoch || 0} />
+      <BtwPanel
+        panel={btwPanel}
+        columns={frameColumns}
+        panelRows={floatingPanelRows}
+        themeEpoch={ctx.state?.themeEpoch || 0}
+      />
     );
   }
   return null;

package/src/tui/app/model-options.mjs

@@ -9,6 +9,7 @@ import { theme } from '../theme.mjs';
 import { displayModelName, effortDisplayLabel } from '../../runtime/shared/model-display.mjs';
 import { isRollingModelAlias } from '../../runtime/shared/model-alias.mjs';
 import { describeError } from '../../runtime/shared/error-presentation.mjs';
+import { providerDisplayName } from '../../runtime/shared/provider-display-name.mjs';
 import { DAYBREAK_PROVIDER, daybreakBlueOn } from '../../runtime/shared/llm/openai-daybreak.mjs';
 
 export const parsedModelVersion = (id) => {
@@ -165,34 +166,8 @@ export const normalizeModelOptions = (models) => {
   return normalized;
 };
 
-const PROVIDER_DISPLAY_NAMES = new Map([
-  ['openai-oauth', 'OpenAI OAuth'],
-  ['anthropic-oauth', 'Anthropic OAuth'],
-  ['grok-oauth', 'Grok OAuth'],
-  ['muse-code-oauth', 'Muse Code'],
-  ['command-code-oauth', 'Command Code'],
-  ['mimo-oauth', 'MiMo'],
-  ['cursor-oauth', 'Cursor OAuth'],
-  ['devin-oauth', 'Devin'],
-  ['antigravity-oauth', 'Antigravity OAuth'],
-  ['openai', 'OpenAI API'],
-  ['openai-api', 'OpenAI API'],
-  ['anthropic', 'Anthropic API'],
-  ['anthropic-api', 'Anthropic API'],
-  ['gemini', 'Gemini API'],
-  ['gemini-api', 'Gemini API'],
-  ['xai', 'xAI API'],
-  ['xai-api', 'xAI API'],
-  ['deepseek', 'DeepSeek API'],
-  ['deepseek-api', 'DeepSeek API'],
-  ['opencode-go-oauth', 'OpenCode Go OAuth'],
-  ['openrouter', 'OpenRouter'],
-  ['mixdog-local', 'Local Provider'],
-  ['default', 'Default'],
-]);
-
-export const providerDisplayName = (provider) =>
-  PROVIDER_DISPLAY_NAMES.get(String(provider || '').toLowerCase()) ?? (provider || 'Provider');
+// Provider display names live in runtime/shared so error text can name the provider too.
+export { providerDisplayName };
 
 export const resolveProviderDisplayName = (provider, providerNames = null) =>
   (String(provider || '')

package/src/tui/app/model-picker/route-selection/fast-parameters.mjs

@@ -89,9 +89,7 @@ export function createFastParameterSelection({ state, currentRoute, isCurrentRou
    *  on/off) to its next option; false when the model has none. Fast is
    *  dropped when the new parameters rule it out. */
   const cycleThinking = (model) => {
-    const definition = (model.modelParameterOptions || []).find((parameter) =>
-      TOGGLE_PARAMETER_IDS.has(parameter.id)
-    );
+    const definition = (model.modelParameterOptions || []).find((parameter) => TOGGLE_PARAMETER_IDS.has(parameter.id));
     if (!definition?.options?.length) return false;
     const wanted = definition.id;
     const parameters = modelParametersFor(model);

package/src/tui/app/model-picker/route-selection.mjs

@@ -27,9 +27,10 @@ export function createRouteSelection({ providerModels, state, currentRoute }) {
     const fastCapable = fast.fastAvailableFor(selected, coercedEffort);
     const contextSelection = context.contextSelectionFor(selected);
     const { serviceTier, ...otherParameters } = fast.modelParametersFor(selected);
-    const modelParameters = serviceTier && fastCapable && fast.getSelectedFast(selected)
-      ? { ...otherParameters, serviceTier }
-      : otherParameters;
+    const modelParameters =
+      serviceTier && fastCapable && fast.getSelectedFast(selected)
+        ? { ...otherParameters, serviceTier }
+        : otherParameters;
     return {
       effort: coercedEffort,
       routeInput: {
@@ -38,9 +39,7 @@ export function createRouteSelection({ providerModels, state, currentRoute }) {
         ...(coercedEffort ? { effort: coercedEffort } : {}),
         ...(contextSelection ? { contextPercent: contextSelection.percent } : {}),
         ...(selected.fastCapable ? { fast: fastCapable && fast.getSelectedFast(selected) } : {}),
-        ...((selected.modelParameterOptions || []).length
-          ? { modelParameters }
-          : {}),
+        ...((selected.modelParameterOptions || []).length ? { modelParameters } : {}),
       },
     };
   };

package/src/tui/app/provider-setup/oauth-actions.mjs

@@ -3,6 +3,7 @@
 // progress and result panels, the interactive (code prompt) login through
 // store.beginOAuthProviderLogin, and the legacy store.loginOAuthProvider
 // path. `flow` is the per-open picker state built by provider-setup-picker.mjs.
+import { canOpenBrowser } from '../../../runtime/shared/open-url.mjs';
 import { providerDetailText } from '../app-format.mjs';
 import { forgetProviderAuth, providerStatusFooter } from './provider-items.mjs';
 
@@ -27,7 +28,7 @@ function showOAuthProgress(flow, providerItem, message, onBack) {
         value: 'waiting',
         label: 'Waiting for login',
         meta: 'Running',
-        description: 'finish the browser/OAuth prompt',
+        description: 'finish the sign-in shown above',
         _action: 'waiting',
       },
       {
@@ -71,6 +72,20 @@ function showOAuthResult(flow, providerItem, ok, message = '') {
   });
 }
 
+function oauthCodeHint(manualUrl, loginUrl, providerName) {
+  if (manualUrl) return 'If the browser callback does not finish, open the URL below manually and paste code#state.';
+  if (loginUrl) {
+    return `Open the URL below to sign in, then paste the authorization code or full redirect URL for ${providerName}.`;
+  }
+  return `Paste the authorization code or full redirect URL for ${providerName}.`;
+}
+
+function pollingLoginMessage(userCode, loginUrl, opened) {
+  if (userCode) return `Enter code ${userCode} at:\n${loginUrl}${opened}`;
+  if (loginUrl) return `Open this URL to sign in:\n${loginUrl}${opened}`;
+  return 'Finish signing in for this provider.';
+}
+
 /** Login through store.beginOAuthProviderLogin: a code-completing login hands
  *  the surface to the OAuth code prompt; the callback (or the prompt) finishes. */
 function beginInteractiveOAuthLogin(flow, providerItem, login) {
@@ -91,26 +106,26 @@ function beginInteractiveOAuthLogin(flow, providerItem, login) {
       message || (ok ? `${providerName} login complete.` : `${providerName} login failed.`)
     );
   };
+  // Headless machines never try a browser; the URL is shown in the panel either way.
+  const openBrowser = canOpenBrowser();
   void flow.store
-    .beginOAuthProviderLogin(providerItem._providerId)
+    .beginOAuthProviderLogin(providerItem._providerId, { openBrowser })
     .then((started) => {
+      const loginUrl = started?.manualUrl || started?.url || '';
       if (typeof started?.completeCode === 'function') {
         // Post-await handover to the OAuth code prompt: only if this flow
         // still owns the surface (Esc during beginOAuthProviderLogin).
         if (!flow.ownsSurface()) return;
         flow.releaseSurface();
-        const manualUrl = started?.manualUrl || '';
         flow.setProviderPrompt({
           kind: 'oauth-code',
           providerId: providerItem._providerId,
           providerName,
           label: `${providerName} OAuth code`,
-          hint: manualUrl
-            ? 'If the browser callback does not finish, open the URL below manually and paste code#state.'
-            : `Paste the authorization code or full redirect URL for ${providerName}.`,
+          hint: oauthCodeHint(started?.manualUrl, loginUrl, providerName),
           // Shown inside the live panel only — never written to the
           // transcript, so it cannot linger in scrollback after the flow.
-          detail: manualUrl,
+          detail: loginUrl,
           login: started,
           afterSave: flow.returnTo,
           successReturn: () => {
@@ -124,16 +139,16 @@ function beginInteractiveOAuthLogin(flow, providerItem, login) {
           },
         });
         flow.store.pushNotice(
-          `browser opened for ${providerName}; paste code/redirect here if callback does not finish`,
-          'info'
-        );
-      } else if (started?.userCode) {
-        flow.store.pushNotice(
-          `${providerName}: enter code ${started.userCode} in the browser to finish signing in`,
+          openBrowser
+            ? `browser opened for ${providerName}; paste code/redirect here if callback does not finish`
+            : `open the URL shown to sign in to ${providerName}, then paste the code/redirect here`,
           'info'
         );
-      } else {
-        flow.store.pushNotice(`browser opened for ${providerName}; finish signing in there`, 'info');
+      } else if (!login.backedOut && flow.ownsSurface()) {
+        // Device-code and URL-only polling logins stay in the progress panel,
+        // with the code and URL, until the result panel replaces it or Back.
+        const opened = openBrowser ? ' (browser opened)' : '';
+        showOAuthProgress(flow, providerItem, pollingLoginMessage(started?.userCode, loginUrl, opened), login.onBack);
       }
       started.waitForCallback
         ?.then((result) => {
@@ -171,11 +186,14 @@ function runLegacyOAuthLogin(flow, providerItem, login) {
 function startOAuthLogin(flow, providerItem) {
   // Back on the progress panel returns to the actions; a login that settles
   // afterwards becomes a notice instead of a result panel.
-  const login = { backedOut: false };
-  showOAuthProgress(flow, providerItem, 'Opening login flow. Complete it in the browser if prompted.', () => {
-    login.backedOut = true;
-    openOAuthProviderActions(flow, providerItem);
-  });
+  const login = {
+    backedOut: false,
+    onBack: () => {
+      login.backedOut = true;
+      openOAuthProviderActions(flow, providerItem);
+    },
+  };
+  showOAuthProgress(flow, providerItem, 'Starting login flow…', login.onBack);
   if (typeof flow.store.beginOAuthProviderLogin === 'function') {
     beginInteractiveOAuthLogin(flow, providerItem, login);
     return;

package/src/tui/app/provider-setup/provider-items.mjs

@@ -80,8 +80,14 @@ export function buildProviderItems(setup) {
   if (setup.managedByClient === true) {
     for (const p of setup.local || []) {
       providerItems.push({
-        value: `local:${p.id}`, label: p.name, meta: providerStatusLabel(p), description: '',
-        _type: 'local', _providerId: p.id, _providerName: p.name, _provider: p,
+        value: `local:${p.id}`,
+        label: p.name,
+        meta: providerStatusLabel(p),
+        description: '',
+        _type: 'local',
+        _providerId: p.id,
+        _providerName: p.name,
+        _provider: p,
       });
     }
   }

package/src/tui/app/provider-setup-picker.mjs

@@ -129,13 +129,17 @@ export function createProviderSetupPicker({
 
     flow.paint({
       title: options.title || 'Providers',
-      description: setup.managedByClient === true
-        ? 'Manage provider sign-ins and accounts in the local desktop window. Refresh to update availability.'
-        : options.description || 'Choose a provider. Enter opens provider actions.',
+      description:
+        setup.managedByClient === true
+          ? 'Manage provider sign-ins and accounts in the local desktop window. Refresh to update availability.'
+          : options.description || 'Choose a provider. Enter opens provider actions.',
       footer: providerFooter,
       footerGapRows: 1,
-      help: options.confirmBar ? undefined : setup.managedByClient === true
-        ? '↑/↓ Select · Enter Refresh · Esc Back' : '↑/↓ Select · Enter Open · Esc Back',
+      help: options.confirmBar
+        ? undefined
+        : setup.managedByClient === true
+          ? '↑/↓ Select · Enter Refresh · Esc Back'
+          : '↑/↓ Select · Enter Open · Esc Back',
       indexMode: 'always',
       labelWidth: 18,
       metaWidth: 12,