mixdog 1.2.2 → 1.2.3

package/src/standalone/session-proxy/projection.mjs

@@ -8,6 +8,35 @@
  */
 import { applySessionStatePatch } from '../session-state-patch.mjs';
 
+// Desktop-only live fields: `streamingPartial` is the unfinished streamed
+// line the desktop paints ahead of the line-gated tail. This terminal view
+// keeps the line-gated text, so it never holds the field nor re-renders for it.
+const DESKTOP_ONLY_FIELDS = ['streamingPartial'];
+
+function terminalState(full) {
+  if (!full || typeof full !== 'object' || !DESKTOP_ONLY_FIELDS.some((key) => Object.hasOwn(full, key))) return full;
+  const next = { ...full };
+  for (const key of DESKTOP_ONLY_FIELDS) delete next[key];
+  return next;
+}
+
+/** The patch without desktop-only fields, or null when nothing else moved. */
+function terminalPatch(patch) {
+  const set = patch.set && typeof patch.set === 'object' ? patch.set : {};
+  const remove = Array.isArray(patch.remove) ? patch.remove : [];
+  if (!patch.partialAppend && !DESKTOP_ONLY_FIELDS.some((key) => Object.hasOwn(set, key) || remove.includes(key))) {
+    return patch;
+  }
+  const nextSet = { ...set };
+  for (const key of DESKTOP_ONLY_FIELDS) delete nextSet[key];
+  const nextRemove = remove.filter((key) => !DESKTOP_ONLY_FIELDS.includes(key));
+  if (Object.keys(nextSet).length === 0 && nextRemove.length === 0 && !patch.itemsAppend && !patch.itemsPrepend) {
+    return null;
+  }
+  const { partialAppend: _desktopOnly, ...rest } = patch;
+  return { ...rest, set: nextSet, remove: nextRemove };
+}
+
 export function createProjection({ binding, log }) {
   let state = {};
   let revision = 0;
@@ -40,7 +69,7 @@ export function createProjection({ binding, log }) {
     const incomingRevision = Number(body.revision);
     if (revisionAttachment !== sourceAttachment || revisionSessionId !== binding.sessionId) {
       if (body.full === undefined || body.full === null) return false;
-      state = body.full;
+      state = terminalState(body.full);
       revision = Number.isFinite(incomingRevision) ? incomingRevision : 0;
       revisionAttachment = sourceAttachment;
       revisionSessionId = binding.sessionId;
@@ -49,7 +78,7 @@ export function createProjection({ binding, log }) {
     }
     if (Number.isFinite(incomingRevision) && incomingRevision < revision) return true;
     if (body.full !== undefined && body.full !== null) {
-      state = body.full;
+      state = terminalState(body.full);
       revision = Number.isFinite(incomingRevision) ? incomingRevision : revision;
       emit();
       return true;
@@ -57,8 +86,16 @@ export function createProjection({ binding, log }) {
     if (body.patch) {
       if (Number(body.revision) === revision && Number(body.baseRevision) === revision - 1) return true;
       if (Number(body.baseRevision) !== revision) return false;
-      state = applySessionStatePatch(state, body.patch);
+      const patch = terminalPatch(body.patch);
+      // Only a desktop-only field moved: the terminal view advances silently.
+      if (!patch) {
+        revision = Number(body.revision) || revision;
+        return true;
+      }
+      const patched = applySessionStatePatch(state, patch);
+      if (!patched) return false;
       revision = Number(body.revision) || revision;
+      state = patched;
       emit();
       return true;
     }
@@ -76,7 +113,7 @@ export function createProjection({ binding, log }) {
   return {
     // The create result seeds the projection for the current binding.
     seed(created) {
-      state = created?.full ?? {};
+      state = terminalState(created?.full ?? {});
       revision = Number(created?.revision) || 0;
       revisionAttachment = binding.attachment;
       revisionSessionId = binding.sessionId;

package/src/standalone/session-runtime-inline-host/boot-loaders.mjs

@@ -50,6 +50,20 @@ export function createInlineBootLoaders({
     return localModulePromise;
   }
 
+  // Background warm-up of the session-local module graph. Independent of the
+  // keychain gate (the ESM cache makes the later localModule() import free);
+  // never throws — a failed warm-up leaves create on its lazy path.
+  async function warmLocalRuntime() {
+    if (isClosed()) return false;
+    try {
+      const module = await loadLocalModule();
+      if (isClosed()) return false;
+      return (await module.warmLocalSessionRuntime?.()) !== false;
+    } catch {
+      return false;
+    }
+  }
+
   function agentGraph() {
     agentGraphPromise ??= measured('agent-dispatch-graph-import', () => {
       assertOpen();
@@ -92,5 +106,5 @@ export function createInlineBootLoaders({
     await tracked;
   }
 
-  return { prewarmKeychain, localModule, agentGraph, prepareAgentProviders };
+  return { prewarmKeychain, warmLocalRuntime, localModule, agentGraph, prepareAgentProviders };
 }

package/src/standalone/session-runtime-inline-host.mjs

@@ -74,6 +74,7 @@ export function createInlineSessionRuntimeHost({
   return {
     create,
     prewarmKeychain: loaders.prewarmKeychain,
+    warmLocalRuntime: loaders.warmLocalRuntime,
     agentDispatch: dispatch.agentDispatch,
     async agentControl(args = {}, context = {}) {
       if (closed) throw new Error('session runtime host is closed');

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

@@ -2,10 +2,17 @@
 // The generic runtime-action lane (read / configure allowlists) and the
 // session catalog listing.
 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';
 
 /** Reads a session without a live runtime answers from disk (readStoredReview). */
-const STORED_REVIEW_ACTIONS = new Set(['getTurnReviewDiff', 'getSessionReviewDiff', 'getTurnChanges']);
+const STORED_REVIEW_ACTIONS = new Set([
+  'getTurnReviewDiff',
+  'getSessionReviewDiff',
+  'getTurnChanges',
+  'getSessionReviewFilePatch',
+  'getTurnReviewFilePatch',
+]);
 
 /** One compact description of an action result for the daemon log, never the payload itself. */
 function resultSummary(value) {
@@ -44,7 +51,8 @@ export function createSessionActionCalls(ctx) {
     assertAvailable();
     if (value === null) throw new Error(`session ${id} is not available`);
     log(`session action ${name} session=${id} result=${resultSummary(value)} (stored)`);
-    return {
+    markPhase('load');
+    const result = {
       value: sanitizeForWire(value) ?? null,
       sessionId: id,
       reservedOnly: false,
@@ -52,6 +60,8 @@ export function createSessionActionCalls(ctx) {
       unchanged: true,
       ...(Number.isInteger(baseRevision) ? { revision: baseRevision } : {}),
     };
+    markPhase('project');
+    return result;
   }
 
   async function runSessionAction(
@@ -62,6 +72,7 @@ export function createSessionActionCalls(ctx) {
     const id = String(sessionId || '');
     if (!id) throw new TypeError('sessionId is required');
     const name = requireSessionAction(action, allowedActions);
+    annotateSpan(name);
     // Opening an earlier session asks for its review right away; loading the
     // whole runtime for that held the review bar (and the pane's reveal) for
     // seconds.
@@ -72,7 +83,9 @@ export function createSessionActionCalls(ctx) {
     assertAvailable(entry);
     const target = entry.runtime[name];
     if (typeof target !== 'function') throw new TypeError(`session action ${name} is unavailable`);
+    markPhase('load');
     const value = await target.apply(entry.runtime, Array.isArray(args) ? args : []);
+    markPhase('action');
     if (name === 'setCwd' && value) {
       try {
         const projects = await loadProjectStore();
@@ -89,11 +102,13 @@ export function createSessionActionCalls(ctx) {
     // Still unwatched: keep it on the retention clock exactly like a runtime
     // released by its view, so an untouched load cannot leak past the idle window.
     retainUnwatched(entry);
-    return {
+    const result = {
       value: sanitizeForWire(value) ?? null,
       sessionId: responseSessionId(entry, id),
       ...bodyForClient(step, Number.isInteger(baseRevision) ? baseRevision : null),
     };
+    markPhase('project');
+    return result;
   }
 
   async function listSessionCatalog(options = {}) {

package/src/standalone/session-service-api.mjs

@@ -1,3 +1,5 @@
+import { shortId, slowSpans } from '../runtime/shared/slow-span.mjs';
+
 const sessionServiceRoutes = ({ desktop, project, session }) => ({
   'desktop.init': (params, ctx) => desktop.init(params, ctx),
   'desktop.invoke': (params, ctx) => desktop.invoke(params, ctx),
@@ -32,13 +34,16 @@ export function createSessionServiceApi({
   getTurnBusyCount,
   getStatus,
   getExternalClientCount,
+  spans = slowSpans,
 }) {
   const routes = sessionServiceRoutes({ desktop, project, session });
   return {
     async handleCall(name, args = {}, ctx = null) {
       const route = routes[String(name || '')];
       if (!route) throw new Error(`unknown session service call ${name}`);
-      return route(args || {}, ctx);
+      const params = args || {};
+      const sid = shortId(params.sessionId);
+      return spans.trace(sid ? `${name}#${sid}` : String(name), () => route(params, ctx));
     },
     ...methods,
     get size() {

package/src/standalone/session-state-patch.d.mts

@@ -3,5 +3,6 @@ export function diffSessionState(
   next: unknown,
   options?: { prepend?: boolean }
 ): Record<string, unknown> | null;
-export function applySessionStatePatch(previous: unknown, patch: unknown): Record<string, unknown>;
+export function streamingPartialSuffix(before: unknown, after: unknown): string | null;
+export function applySessionStatePatch(previous: unknown, patch: unknown): Record<string, unknown> | null;
 export function transcriptItemsDigest(items: readonly unknown[]): string;

package/src/standalone/session-state-patch.mjs

@@ -7,16 +7,51 @@
 // `transcriptPrepend`) carries rows revealed ABOVE the previous list, an
 // older-history page: the previous rows then start `values.length` rows in,
 // and `itemsAppend.from` indexes the PREVIOUS list.
+//
+// `partialAppend` carries growth of the desktop-only `streamingPartial` (the
+// unfinished streamed line) as just its new text: re-sending the whole line on
+// every tick made a long unfinished line cost O(length²) on the wire. A
+// decoder that predates it keeps its last partial, which the desktop join
+// then ignores or shows behind — never wrong text.
 import { createHash } from 'node:crypto';
 
+/** The text `after` appends to `before` when both are the same unfinished
+ *  line (same row, same offset, same row identity), else null: a retraction,
+ *  another row or a new line travels as a full replacement. */
+export function streamingPartialSuffix(before, after) {
+  if (!before || !after || typeof before !== 'object' || typeof after !== 'object') return null;
+  const { text: beforeText, ...beforeRest } = before;
+  const { text: afterText, ...afterRest } = after;
+  if (typeof beforeText !== 'string' || typeof afterText !== 'string') return null;
+  if (afterText.length <= beforeText.length || !afterText.startsWith(beforeText)) return null;
+  // id, from and the row identity: everything but the text stays put.
+  if (JSON.stringify(beforeRest) !== JSON.stringify(afterRest)) return null;
+  return afterText.slice(beforeText.length);
+}
+
+function appendStreamingPartial(state, suffix) {
+  const held = state.streamingPartial;
+  if (!held || typeof held !== 'object' || typeof held.text !== 'string' || typeof suffix !== 'string') return false;
+  state.streamingPartial = { ...held, text: held.text + suffix };
+  return true;
+}
+
 export function diffSessionState(previous, next, { prepend = false } = {}) {
   if (!previous || !next || typeof previous !== 'object' || typeof next !== 'object') return null;
   const set = {};
   const remove = [];
   let itemsAppend = null;
   let itemsPrepend = null;
+  let partialAppend = null;
   for (const [key, value] of Object.entries(next)) {
     if (previous[key] === value) continue;
+    if (key === 'streamingPartial') {
+      const suffix = streamingPartialSuffix(previous[key], value);
+      if (suffix !== null) {
+        partialAppend = { text: suffix };
+        continue;
+      }
+    }
     if (key === 'items' && Array.isArray(value) && Array.isArray(previous.items)) {
       let head = 0;
       if (prepend && previous.items.length > 0 && value[0] !== previous.items[0]) {
@@ -36,13 +71,18 @@ export function diffSessionState(previous, next, { prepend = false } = {}) {
   for (const key of Object.keys(previous)) {
     if (!(key in next)) remove.push(key);
   }
-  return itemsPrepend ? { set, remove, itemsAppend, itemsPrepend } : { set, remove, itemsAppend };
+  const patch = itemsPrepend ? { set, remove, itemsAppend, itemsPrepend } : { set, remove, itemsAppend };
+  if (partialAppend) patch.partialAppend = partialAppend;
+  return patch;
 }
 
+/** The patched state, or null when a `partialAppend` has no held line to grow
+ *  (a broken chain the caller answers with a full resync, never lost text). */
 export function applySessionStatePatch(previous, patch) {
   const base = previous && typeof previous === 'object' ? previous : {};
   if (!patch || typeof patch !== 'object') return base;
   const next = { ...base, ...(patch.set || {}) };
+  if (Object.hasOwn(patch, 'partialAppend') && !appendStreamingPartial(next, patch.partialAppend?.text)) return null;
   if (patch.itemsAppend || patch.itemsPrepend) {
     const items = Array.isArray(base.items) ? base.items : [];
     const head = Array.isArray(patch.itemsPrepend?.values) ? patch.itemsPrepend.values : [];

package/src/tui/App.jsx

@@ -21,6 +21,7 @@ import { useApp, useStdin, useStdout } from 'ink';
 import { useSession } from './hooks/useSession.mjs';
 import { pickFolder } from '../standalone/folder-dialog.mjs';
 import { deriveSlashPalette } from './app/slash-palette.mjs';
+import { createBtwController } from './app/btw-controller.mjs';
 import { skillMentionQuery, useSkillMentionSkills } from './app/skill-mention-palette.mjs';
 import { shouldSupersedePanelEpoch, supersedePanelEpoch } from './app/panel-epoch.mjs';
 import { createPanelSurface } from './app/panel-surface.mjs';
@@ -152,6 +153,24 @@ export function App({ store, initialStatusLine = '', forceOnboarding = false, on
   livePickerRef.current = picker;
   const [contextPanel, setContextPanel] = useState(null);
   const [usagePanel, setUsagePanel] = useState(null);
+  const [btwPanel, setBtwPanel] = useState(null);
+  const btwRef = useRef(null);
+  const sessionIdRef = useRef('');
+  sessionIdRef.current = state.sessionId || '';
+  if (!btwRef.current) {
+    btwRef.current = createBtwController({
+      getStore: () => store,
+      setPanel: setBtwPanel,
+      getSessionId: () => sessionIdRef.current,
+    });
+  }
+  const btw = btwRef.current;
+  // A side answer belongs to the conversation it was asked in: drop it on a
+  // session change (new/resume/clear/switch) and cancel it on unmount.
+  useEffect(() => {
+    btw.sync();
+  }, [btw, state.sessionId]);
+  useEffect(() => () => btw.dispose(), [btw]);
   // OWNING LAYER (app/panel-surface.mjs): the three sinks above are handed over
   // exactly once and never leave that module. Every panel factory below gets
   // `surface` instead, so painting or delegating without a claim that proves
@@ -310,6 +329,7 @@ export function App({ store, initialStatusLine = '', forceOnboarding = false, on
     setSettingsPrompt,
     setOnboardingActive,
     closeUsagePanel,
+    btw,
     oauthSubmitRef,
     clearModelCaches,
     onboardingRef,
@@ -518,6 +538,8 @@ export function App({ store, initialStatusLine = '', forceOnboarding = false, on
       usagePanel,
       closeUsagePanel,
       contextPanel,
+      btwPanel,
+      closeBtwPanel: btw.close,
       installPastedImages,
       clearPastedImagesSnapshot,
       registerPastedImage,
@@ -650,6 +672,7 @@ export function App({ store, initialStatusLine = '', forceOnboarding = false, on
     toolApproval: !!toolApproval,
     contextPanel: !!contextPanel,
     usagePanel: !!usagePanel,
+    btwPanel: !!btwPanel,
     providerPrompt: !!providerPrompt,
     settingsPrompt: !!settingsPrompt,
   };
@@ -711,6 +734,7 @@ export function App({ store, initialStatusLine = '', forceOnboarding = false, on
     picker,
     contextPanel,
     usagePanel,
+    btwPanel,
     slashPaletteOpen,
     tuiReady,
     state,
@@ -822,6 +846,7 @@ export function App({ store, initialStatusLine = '', forceOnboarding = false, on
     activeSlashQuery,
     activeTools,
     agentRevision,
+    btwPanel,
     cancelProviderPrompt,
     cancelSettingsPrompt,
     cancelSlashPalette,

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

@@ -10,9 +10,12 @@
 import { theme } from '../../theme.mjs';
 import { toolApprovalDescription } from '../app-format.mjs';
 import { Picker } from '../../components/Picker.jsx';
+import { QuestionPanel } from '../../components/QuestionPanel.jsx';
+import { questionsOf } from '../../components/question-panel-model.mjs';
 import { SlashCommandPalette } from '../../components/SlashCommandPalette.jsx';
 import { ContextPanel } from '../../components/ContextPanel.jsx';
 import { UsagePanel } from '../../components/UsagePanel.jsx';
+import { BtwPanel } from '../../components/BtwPanel.jsx';
 import { TextEntryPanel } from '../../components/TextEntryPanel.jsx';
 import { textEntryClearsByEmpty } from '../text-entry-policy.mjs';
 import { withPickerEnterLatch } from '../picker-enter-latch.mjs';
@@ -24,7 +27,23 @@ const SKILL_PALETTE_TEXT = {
   help: '↑/↓ select · Enter insert · Esc cancel',
 };
 
-function renderToolApproval({ toolApproval, store, frameColumns, expandedOptionPanel }) {
+function renderToolApproval({ toolApproval, store, frameColumns, expandedOptionPanel, floatingPanelRows }) {
+  if (toolApproval.kind === 'question') {
+    return (
+      <QuestionPanel
+        key={toolApproval.id}
+        questions={questionsOf(toolApproval)}
+        columns={frameColumns}
+        rows={floatingPanelRows}
+        onSubmit={(answers) =>
+          store.resolveToolApproval?.(toolApproval.id, { approved: true, reason: 'answered by user', answers })
+        }
+        onDismiss={() =>
+          store.resolveToolApproval?.(toolApproval.id, { approved: false, reason: 'dismissed by user' })
+        }
+      />
+    );
+  }
   const resolve = (approved) => {
     store.resolveToolApproval?.(toolApproval.id, {
       approved,
@@ -144,6 +163,7 @@ export function renderFloatingPanel(ctx) {
     slashPaletteOpen,
     toolApproval,
     usagePanel,
+    btwPanel,
   } = ctx;
   if (toolApproval) return renderToolApproval(ctx);
   if (picker) return renderPicker(ctx);
@@ -227,5 +247,10 @@ export function renderFloatingPanel(ctx) {
       />
     );
   }
+  if (btwPanel) {
+    return (
+      <BtwPanel panel={btwPanel} columns={frameColumns} panelRows={floatingPanelRows} themeEpoch={ctx.state?.themeEpoch || 0} />
+    );
+  }
   return null;
 }

package/src/tui/app/btw-controller.mjs

@@ -0,0 +1,118 @@
+/**
+ * app/btw-controller.mjs — the transient `/btw` side-question panel.
+ *
+ * The answer lives only in this panel (never the transcript). `ask` replaces
+ * any existing panel, `close` (Esc) cancels a pending request, and a result
+ * that arrives after a replace/close is ignored via the request sequence.
+ */
+import { measureMarkdownRenderedRows } from '../markdown/measure-rendered-rows.mjs';
+
+export const BTW_USAGE_HINT = 'usage: /btw <question>';
+// Border (2) + header (1) + footer (1).
+export const BTW_CHROME_ROWS = 4;
+const BTW_MAX_BODY_ROWS = 10;
+
+/** Rendered row count of the answer body (the scrollable content height). */
+export function btwContentRows(panel, columns) {
+  const body =
+    panel.status === 'done'
+      ? measureMarkdownRenderedRows(panel.text, Math.max(1, columns - 4))
+      : String(panel.text || '').split('\n').length;
+  return Math.max(1, body);
+}
+
+export function btwPanelRows(panel, columns) {
+  if (!panel) return 0;
+  return BTW_CHROME_ROWS + Math.min(BTW_MAX_BODY_ROWS, btwContentRows(panel, columns));
+}
+
+/** Largest scroll offset for `total` content rows shown through `visible` rows. */
+export function btwScrollMax(total, visible) {
+  return Math.max(0, total - Math.max(1, visible));
+}
+
+/** Next scroll offset for a PageUp/PageDown key (other keys leave it unchanged). */
+export function btwScrollOffset(key, offset, visible, total) {
+  const max = btwScrollMax(total, visible);
+  const page = Math.max(1, visible - 1);
+  if (key.pageUp) return Math.max(0, Math.min(max, offset) - page);
+  if (key.pageDown) return Math.min(max, offset + page);
+  return Math.min(max, offset);
+}
+
+/**
+ * Each request is bound to the session it was asked in. A settlement whose
+ * session no longer matches is ignored; `sync` (session change) and `dispose`
+ * (unmount) cancel a pending request for its originating session.
+ */
+export function createBtwController({ getStore, setPanel, getSessionId = () => '' }) {
+  let seq = 0;
+  let pending = null; // { sessionId, dispatched } while a request is queued or in flight
+  let origin = null; // session the visible panel was asked in
+
+  const cancelPending = () => {
+    if (!pending) return;
+    const { sessionId, dispatched } = pending;
+    pending = null;
+    // Not dispatched yet: dropping `pending` stops the queued request, so
+    // there is nothing to cancel (a cancel sent first would not hit it).
+    if (!dispatched) return;
+    try {
+      const result = getStore().cancelSide?.(sessionId);
+      if (result?.catch) void result.catch(() => {});
+    } catch {
+      /* best-effort cancel */
+    }
+  };
+
+  const ask = (question) => {
+    cancelPending();
+    const id = ++seq;
+    const sessionId = getSessionId();
+    const request = { sessionId, dispatched: false };
+    pending = request;
+    origin = sessionId;
+    setPanel({ question, status: 'pending', text: '' });
+    const settle = (next) => {
+      if (id !== seq || getSessionId() !== sessionId) return;
+      pending = null;
+      setPanel({ question, ...next });
+    };
+    Promise.resolve()
+      .then(() => {
+        // askSide runs against the store's current session, so only dispatch
+        // while this ask is still live and still in its origin session.
+        if (pending !== request || id !== seq || getSessionId() !== sessionId) {
+          if (pending === request) pending = null;
+          return undefined; // dropped, never sent; `settle` ignores it (stale id/session)
+        }
+        request.dispatched = true;
+        return getStore().askSide(question);
+      })
+      .then(
+        (result) => settle({ status: 'done', text: String(result?.text ?? '') }),
+        (error) => settle({ status: 'error', text: String(error?.message || error || 'side question failed') })
+      );
+  };
+
+  const close = () => {
+    cancelPending();
+    seq += 1;
+    origin = null;
+    setPanel(null);
+  };
+
+  /** Session changed: a panel from another conversation is cancelled and cleared. */
+  const sync = () => {
+    if (origin !== null && getSessionId() !== origin) close();
+  };
+
+  /** Unmount: cancel without touching React state. */
+  const dispose = () => {
+    cancelPending();
+    seq += 1;
+    origin = null;
+  };
+
+  return { ask, close, sync, dispose };
+}

package/src/tui/app/create-app-pickers.mjs

@@ -37,6 +37,7 @@ export function createAppPickers({
   setSettingsPrompt,
   setOnboardingActive,
   closeUsagePanel,
+  btw,
   oauthSubmitRef,
   clearModelCaches,
   onboardingRef,
@@ -207,6 +208,7 @@ export function createAppPickers({
     normalizeSlashCommandName,
     surface,
     closeUsagePanel,
+    btw,
     openModelPicker: (...a) => openModelPicker(...a),
     modelSwitchNotice,
     openWebSearchPicker: (...a) => openWebSearchPicker(...a),

package/src/tui/app/shell-layout/row-budgets.mjs

@@ -5,7 +5,9 @@
  */
 import { isLiveSpinnerMetaVisible } from '../live-spinner-visibility.mjs';
 import { promptContentRows, wrappedDetailRows, queuedBandRows } from '../text-layout.mjs';
+import { questionPanelRows, questionsOf } from '../../components/question-panel-model.mjs';
 import { CORE_MULTILINE_TEXT_ENTRY_KINDS } from '../panel-signature.mjs';
+import { btwPanelRows } from '../btw-controller.mjs';
 
 const SCROLL_HINT_ROWS = 0;
 const LIVE_STATUS_ROWS = 0;
@@ -114,20 +116,25 @@ function floatingPanelBudget({
   picker,
   contextPanel,
   usagePanel,
+  btwPanel,
   slashPaletteOpen,
   hasTextEntryPrompt,
   TEXT_ENTRY_ROWS,
   OPTION_PANEL_EXTRA_ROWS,
   maxFloatingPanelRows,
+  frameColumns,
 }) {
   let desiredFloatingPanelRows = 0;
-  if (toolApproval) desiredFloatingPanelRows = PANEL_CHROME_ROWS + 2 + OPTION_PANEL_EXTRA_ROWS;
+  if (toolApproval?.kind === 'question' && questionsOf(toolApproval).length > 0) {
+    desiredFloatingPanelRows = questionPanelRows(questionsOf(toolApproval), frameColumns);
+  } else if (toolApproval) desiredFloatingPanelRows = PANEL_CHROME_ROWS + 2 + OPTION_PANEL_EXTRA_ROWS;
   else if (picker?.fillAvailable) desiredFloatingPanelRows = maxFloatingPanelRows;
   else if (picker) desiredFloatingPanelRows = PANEL_BASE_ROWS + OPTION_PANEL_EXTRA_ROWS;
   else if (contextPanel) desiredFloatingPanelRows = PANEL_BASE_ROWS + OPTION_PANEL_EXTRA_ROWS + 3;
   else if (usagePanel) desiredFloatingPanelRows = PANEL_BASE_ROWS + OPTION_PANEL_EXTRA_ROWS;
   else if (slashPaletteOpen) desiredFloatingPanelRows = SLASH_PALETTE_ROWS;
   else if (hasTextEntryPrompt) desiredFloatingPanelRows = TEXT_ENTRY_ROWS;
+  else if (btwPanel) desiredFloatingPanelRows = btwPanelRows(btwPanel, frameColumns);
   const floatingPanelRows = desiredFloatingPanelRows > 0 ? Math.min(desiredFloatingPanelRows, maxFloatingPanelRows) : 0;
   // Give the list every content row the panel exposes. The panel already grew
   // by OPTION_PANEL_EXTRA_ROWS; previously that growth was subtracted back out
@@ -174,6 +181,7 @@ export function computeRowBudgets({
   picker,
   contextPanel,
   usagePanel,
+  btwPanel,
   slashPaletteOpen,
 }) {
   const { textEntryPrompt, hasTextEntryPrompt, hasFloatingPanel, expandedOptionPanel, inputBoxHidden } = surfaces;
@@ -211,11 +219,13 @@ export function computeRowBudgets({
     picker,
     contextPanel,
     usagePanel,
+    btwPanel,
     slashPaletteOpen,
     hasTextEntryPrompt,
     TEXT_ENTRY_ROWS: textEntry.TEXT_ENTRY_ROWS,
     OPTION_PANEL_EXTRA_ROWS,
     maxFloatingPanelRows,
+    frameColumns,
   });
   const rows = {
     floatingPanelRows: panel.floatingPanelRows,

package/src/tui/app/shell-layout/surfaces.mjs

@@ -10,6 +10,7 @@ export function deriveSurfaces({
   picker,
   contextPanel,
   usagePanel,
+  btwPanel,
   slashPaletteOpen,
   tuiReady,
   state,
@@ -24,7 +25,8 @@ export function deriveSurfaces({
     contextPanel ||
     usagePanel ||
     slashPaletteOpen ||
-    hasTextEntryPrompt
+    hasTextEntryPrompt ||
+    btwPanel
   );
   const expandedOptionPanel = !!(toolApproval || picker || contextPanel || usagePanel || hasTextEntryPrompt);
   if (panelTransitionRef.current.signature.includes('picker:project') && !picker) {

package/src/tui/app/slash-commands.mjs

@@ -15,6 +15,12 @@ export const SLASH_COMMANDS = [
     description: 'Switch working directory (project)',
   },
   { name: 'compact', usage: '/compact', description: 'Compact older conversation context' },
+  {
+    name: 'btw',
+    usage: '/btw',
+    params: '<question>',
+    description: 'Ask a quick side question without interrupting the current work',
+  },
   {
     name: 'goal',
     usage: '/goal',
@@ -30,9 +36,12 @@ export const SLASH_COMMANDS = [
   { name: 'resume', usage: '/resume', params: '[id]', description: 'Resume a saved chat' },
   { name: 'context', usage: '/context', description: 'Show current context surface' },
   {
-    name: 'inherit',
-    usage: '/inherit',
-    description: 'Carry this conversation into a new session on the current model',
+    name: 'fork',
+    usage: '/fork',
+    aliases: ['inherit'],
+    aliasUsage: ['inherit'],
+    showAliasUsage: false,
+    description: 'Fork this conversation into a new session on the current model',
   },
   { name: 'usage', usage: '/usage', params: '[refresh]', description: 'Show total provider quota / balance' },
   { name: 'model', usage: '/model', params: '[name|refresh]', description: 'Switch model for subsequent turns' },
@@ -109,6 +118,7 @@ export function overlayBlocksGlobalTranscriptScroll(owner = {}) {
     owner.toolApproval ||
     owner.contextPanel ||
     owner.usagePanel ||
+    owner.btwPanel ||
     owner.providerPrompt ||
     owner.settingsPrompt
   );