mixdog 1.4.0 → 1.4.1

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/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([
@@ -114,20 +115,26 @@ export function createSessionActionCalls(ctx) {
   /** 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. */
+   *  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();
-    if (!waiting.size && !questions.size) return rows;
+    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);
-      if (!kind && !asked) return row;
+      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 } : {}),
       };
     });
   }

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-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,

package/src/tui/components/QuestionPanel.jsx

@@ -69,9 +69,12 @@ export function QuestionPanel({ questions, columns = 80, rows, onSubmit, onDismi
     if (text) commit({ ...s, buf: appendCapped(s.buf, text) });
   };
 
-  usePaste((text) => {
-    if (ref.current.typing) typeInto(text);
-  }, { isActive: isRawModeSupported });
+  usePaste(
+    (text) => {
+      if (ref.current.typing) typeInto(text);
+    },
+    { isActive: isRawModeSupported }
+  );
 
   useInput(
     (input, key) => {
@@ -232,7 +235,13 @@ export function QuestionPanel({ questions, columns = 80, rows, onSubmit, onDismi
   }
   if (plan.below > 0) out.push(moreRow('below', `↓ ${plan.below} more`));
 
-  const help = questionHelp({ multi, typing: state.typing, last: state.qi >= last, count: n, questionCount: questions.length });
+  const help = questionHelp({
+    multi,
+    typing: state.typing,
+    last: state.qi >= last,
+    count: n,
+    questionCount: questions.length,
+  });
 
   return (
     <Box flexDirection="column" flexShrink={0} width="100%">

package/src/tui/dist/index.mjs

@@ -41076,7 +41076,7 @@ var summarizeAskUserResult = ({ text, translate }) => {
 };
 var TOOL_RESULT_SUMMARIZERS = new Map(
   [
-    [["ask_user"], summarizeAskUserResult],
+    [["ask_user", "handoff_user"], summarizeAskUserResult],
     [["read", "view_image", "read_mcp_resource"], summarizeReadResult],
     [["apply_patch"], summarizePatchResult],
     [["grep"], summarizeGrepResult],
@@ -41240,6 +41240,7 @@ var TOOL_CATEGORY = /* @__PURE__ */ new Map([
   ["goal", "Setup"],
   ["request_user_input", "Setup"],
   ["ask_user", "Setup"],
+  ["handoff_user", "Setup"],
   ["update_plan", "Setup"],
   ["skill", "Skill"],
   ["skill_execute", "Skill"],
@@ -41815,6 +41816,7 @@ var TOOL_UNITS = /* @__PURE__ */ new Map([
   ["code_graph", codeGraphUnit],
   ["request_user_input", () => unitDescriptor("Setup", { active: "Asking", done: "Asked", noun: "user" })],
   ["ask_user", () => unitDescriptor("Setup", { active: "Asking", done: "Asked", noun: "user" })],
+  ["handoff_user", () => unitDescriptor("Setup", { active: "Asking", done: "Asked", noun: "user" })],
   ["update_plan", () => unitDescriptor("Setup", { active: "Updating", done: "Updated", noun: "plan" })],
   ["list_mcp_resources", () => unitDescriptor("Setup", { active: "Listing", done: "Listed", noun: "MCP resource" })],
   [
@@ -41912,6 +41914,7 @@ function displayToolName(name, args = {}) {
     case "request_user_input":
       return "Ask User";
     case "ask_user":
+    case "handoff_user":
       return "Question";
     case "update_plan":
       return "Plan";
@@ -41994,6 +41997,8 @@ function summarizeToolArgs(name, args, { max = DEFAULT_SUMMARY_MAX } = {}) {
       return summarizeGithub(a, max);
     case "goal":
       return compactParts([String(a.action || ""), truncateToolText(a.objective, max)]);
+    case "handoff_user":
+      return "";
     case "ask_user":
       return truncateToolText(
         (Array.isArray(a.questions) ? a.questions : []).map((q) => String(q?.header || q?.question || "").trim()).filter(Boolean).join(", "),
@@ -44282,7 +44287,15 @@ function resolveDisplayedResult(base, { normalizedName, parsedArgs }, translate)
 }
 
 // src/runtime/shared/tool-card-model/card-status.mjs
-var ENVELOPE_STATUS_TOOLS = /* @__PURE__ */ new Set(["agent", "bridge", "task", "web_search", "search_query", "image_query", "web_search_call"]);
+var ENVELOPE_STATUS_TOOLS = /* @__PURE__ */ new Set([
+  "agent",
+  "bridge",
+  "task",
+  "web_search",
+  "search_query",
+  "image_query",
+  "web_search_call"
+]);
 function shellFragments(base, display, isShellSurface) {
   if (!isShellSurface) return { shellStatus: "", shellElapsed: "" };
   const { pending, failedCount, exitFailedCount, isError, elapsed } = base;
@@ -54506,9 +54519,12 @@ function QuestionPanel({ questions, columns = 80, rows: rows2, onSubmit, onDismi
     const text = cleanTyped(input);
     if (text) commit({ ...s, buf: appendCapped(s.buf, text) });
   };
-  use_paste_default((text) => {
-    if (ref.current.typing) typeInto(text);
-  }, { isActive: isRawModeSupported });
+  use_paste_default(
+    (text) => {
+      if (ref.current.typing) typeInto(text);
+    },
+    { isActive: isRawModeSupported }
+  );
   use_input_default(
     (input, key) => {
       const s = ref.current;
@@ -54643,7 +54659,13 @@ function QuestionPanel({ questions, columns = 80, rows: rows2, onSubmit, onDismi
     else optionRow(item.index);
   }
   if (plan.below > 0) out.push(moreRow("below", `\u2193 ${plan.below} more`));
-  const help = questionHelp({ multi, typing: state.typing, last: state.qi >= last, count: n, questionCount: questions.length });
+  const help = questionHelp({
+    multi,
+    typing: state.typing,
+    last: state.qi >= last,
+    count: n,
+    questionCount: questions.length
+  });
   return /* @__PURE__ */ jsx11(Box_default, { flexDirection: "column", flexShrink: 0, width: "100%", children: /* @__PURE__ */ jsxs9(Box_default, { flexDirection: "column", borderStyle: "round", borderColor: theme.promptBorder, paddingX: 1, width: "100%", children: [
     /* @__PURE__ */ jsxs9(Box_default, { flexDirection: "row", justifyContent: "space-between", children: [
       /* @__PURE__ */ jsx11(Box_default, { flexShrink: 1, children: /* @__PURE__ */ jsxs9(Text, { wrap: "truncate", children: [
@@ -56467,7 +56489,15 @@ function renderFloatingPanel(ctx) {
     );
   }
   if (btwPanel) {
-    return /* @__PURE__ */ jsx21(BtwPanel, { panel: btwPanel, columns: frameColumns, panelRows: floatingPanelRows, themeEpoch: ctx.state?.themeEpoch || 0 });
+    return /* @__PURE__ */ jsx21(
+      BtwPanel,
+      {
+        panel: btwPanel,
+        columns: frameColumns,
+        panelRows: floatingPanelRows,
+        themeEpoch: ctx.state?.themeEpoch || 0
+      }
+    );
   }
   return null;
 }
@@ -60258,6 +60288,11 @@ var hiddenSpawnOpts = Object.freeze({
 });
 
 // src/runtime/shared/open-url.mjs
+function canOpenBrowser(env4 = process.env, platform2 = process.platform, wsl = isWSL()) {
+  if (env4.SSH_TTY || env4.SSH_CONNECTION) return false;
+  if (platform2 !== "linux" || wsl) return true;
+  return Boolean(env4.DISPLAY || env4.WAYLAND_DISPLAY);
+}
 function openInBrowser(url) {
   const u = String(url);
   let candidates;
@@ -60472,7 +60507,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"
       },
       {
@@ -60514,6 +60549,20 @@ function showOAuthResult(flow, providerItem, ok, message = "") {
     onCancel: leave
   });
 }
+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:
+${loginUrl}${opened}`;
+  if (loginUrl) return `Open this URL to sign in:
+${loginUrl}${opened}`;
+  return "Finish signing in for this provider.";
+}
 function beginInteractiveOAuthLogin(flow, providerItem, login) {
   let handled = false;
   const providerName = providerItem._providerName || providerItem._providerId || "OAuth";
@@ -60532,20 +60581,21 @@ function beginInteractiveOAuthLogin(flow, providerItem, login) {
       message || (ok ? `${providerName} login complete.` : `${providerName} login failed.`)
     );
   };
-  void flow.store.beginOAuthProviderLogin(providerItem._providerId).then((started) => {
+  const openBrowser = canOpenBrowser();
+  void flow.store.beginOAuthProviderLogin(providerItem._providerId, { openBrowser }).then((started) => {
+    const loginUrl = started?.manualUrl || started?.url || "";
     if (typeof started?.completeCode === "function") {
       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: () => {
@@ -60559,16 +60609,12 @@ function beginInteractiveOAuthLogin(flow, providerItem, login) {
         }
       });
       flow.store.pushNotice(
-        `browser opened for ${providerName}; paste code/redirect here if callback does not finish`,
+        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 if (started?.userCode) {
-      flow.store.pushNotice(
-        `${providerName}: enter code ${started.userCode} in the browser to finish signing in`,
-        "info"
-      );
-    } else {
-      flow.store.pushNotice(`browser opened for ${providerName}; finish signing in there`, "info");
+    } else if (!login.backedOut && flow.ownsSurface()) {
+      const opened = openBrowser ? " (browser opened)" : "";
+      showOAuthProgress(flow, providerItem, pollingLoginMessage(started?.userCode, loginUrl, opened), login.onBack);
     }
     started.waitForCallback?.then((result) => {
       if (result && !flow.oauthSubmitRef.current) finish(true, `${providerName} login complete`);
@@ -60595,11 +60641,14 @@ function runLegacyOAuthLogin(flow, providerItem, login) {
   });
 }
 function startOAuthLogin(flow, providerItem) {
-  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\u2026", login.onBack);
   if (typeof flow.store.beginOAuthProviderLogin === "function") {
     beginInteractiveOAuthLogin(flow, providerItem, login);
     return;
@@ -61103,9 +61152,7 @@ function createFastParameterSelection({ state, currentRoute, isCurrentRoute, isS
     return true;
   };
   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/session/session-flow/queue/take-entries.mjs

@@ -87,6 +87,17 @@ export function createTakeEntriesOps({ pending, pendingNotificationKeys, removeQ
     // prompt the user already took back.
     const mirrored = queued.filter((entry) => entry.steeringPersistId);
     if (mirrored.length > 0) void dropTuiSteeringPersist(leadSessionId(), mirrored);
+    // The entries left the queue for good, so nothing later (a drain, the
+    // close of the session) can settle them: whoever submitted one is told it
+    // was cancelled, once, here. A submitter that waits on its settlement (a
+    // bot's send, which owns the work until then) is released.
+    for (const entry of queued) {
+      try {
+        entry.onSettled?.({ status: 'cancelled', reason: 'reclaimed', result: null, session: null });
+      } catch {
+        // A throwing callback must not leave the remaining entries unsettled.
+      }
+    }
     const queuedText = queued
       .map((item) => item.text)
       .filter((text) => String(text || '').trim())

package/src/ui/statusline-agents.mjs

@@ -13,9 +13,7 @@ import { positiveInt } from '../runtime/shared/numbers.mjs';
 
 // One table owns both halves of a maintenance agent: which agents are hidden
 // from the worker list by default, and the short label they render as.
-const MAINTENANCE_AGENT_LABELS = new Map([
-  ['cycle1-agent', 'cycle1'],
-]);
+const MAINTENANCE_AGENT_LABELS = new Map([['cycle1-agent', 'cycle1']]);
 const DEFAULT_HIDDEN_STATUSLINE_AGENTS = Object.freeze([...MAINTENANCE_AGENT_LABELS.keys()]);
 const TERMINAL_AGENT_STATUS = /idle|done|complete|success|closed|error|fail|cancel|killed|timeout/i;
 const ACTIVE_AGENT_STATUS = /^(?:connecting|requesting|streaming|tool[-_\s]?running|running|queued|pending|starting)$/i;