@namzu/cli 34.1.1 → 35.0.0

package/dist/tui/App.js

@@ -16,6 +16,7 @@ import { TURN_LIMIT_FIELDS, turnLimitCommands } from './turn-limits-settings.js'
 import { discoverProviders } from '../integrations/providers/discover.js';
 import { ProviderSetup } from './ProviderSetup.js';
 import { ToolOutputViewer } from './ToolOutputViewer.js';
+import { BackgroundJobsPanel, backgroundJobOutputPageSize, backgroundJobsPageSize, maxBackgroundJobTailOffset, } from './BackgroundJobsPanel.js';
 import { join, relative } from 'node:path';
 import { DEFAULT_MAX_GOAL_ROUNDS, DiskMessageFeedbackStore, GoalRoundLimitError, HostCommandRegistry, SessionGoalActivation, StaleGoalError, TurnCancelled, asSessionId, createAssistantMessage, createUserMessage, generateSessionId, generateTurnId, isCompactionMessage, kernelHostCommands, SKILL_TOOL_NAME, } from '@namzu/sdk';
 import { Box, Text, useApp, useInput, useStdout, useWindowSize } from 'ink';
@@ -52,6 +53,7 @@ import { unavailable as triggerUnavailable } from './triggers/detect.js';
 import { BUILTIN_TRIGGERS, compileRegistry, triggerDefinition, } from './triggers/registry.js';
 import { describeComposerTriggers, setComposerTriggers } from './triggers/setting.js';
 import { ComposerFrame } from './ComposerFrame.js';
+import { PendingInputPanel, pendingInputPanelRows } from './PendingInputPanel.js';
 import { EffortSlider, effortSliderLayout } from './EffortSlider.js';
 import { HYPERMODE, HYPERMODE_SUMMARY, ORCHESTRATE_ALIAS_NOTICE, hypermodeEffort, hypermodeStopLabel, } from './hypermode.js';
 import { CopyPicker } from './CopyPicker.js';
@@ -229,14 +231,20 @@ export function projectConversation(messages, nextId, readableUserTexts = []) {
         return [];
     });
 }
+function isRecallableHumanPrompt(prompt) {
+    return prompt?.kind === 'human' && prompt.recallable === true;
+}
 /** Put an undelivered steer back where it occurred among Tab-queued prompts. */
 function mergeUndeliveredLiveInput(queued, undelivered) {
     const merged = [...queued];
-    let inserted = 0;
+    let lastInsertedIndex = -1;
     for (const input of undelivered) {
-        const index = Math.min(input.queueBoundary + inserted, merged.length);
+        let lastPredecessorIndex = -1;
+        for (const predecessor of input.queuedBefore)
+            lastPredecessorIndex = Math.max(lastPredecessorIndex, merged.indexOf(predecessor));
+        const index = Math.max(lastPredecessorIndex, lastInsertedIndex) + 1;
         merged.splice(index, 0, input.prompt);
-        inserted += 1;
+        lastInsertedIndex = index;
     }
     return merged;
 }
@@ -451,23 +459,23 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         summaries: 0,
         reclaimedTokens: 0,
     });
-    // Jobs that ended while no turn was running.
-    //
-    // Only those: an exit that lands mid-turn belongs to the kernel, which
-    // rides it out on the next tool result or, for a job the model awaited,
-    // delivers it as the message that releases its own suspend. Queueing one
-    // here as well would announce the same exit twice, so the `abortRef`
-    // check below is the boundary between the two owners rather than an
-    // optimisation. Between turns the kernel is not listening, so the exit is
-    // held here and handed to the next send as part of the system text; the
-    // transcript row is written at once.
-    const idleJobNoticesRef = useRef([]);
-    const drainIdleJobNotices = () => {
-        if (idleJobNoticesRef.current.length === 0)
-            return undefined;
-        const lines = idleJobNoticesRef.current;
-        idleJobNoticesRef.current = [];
-        return `Background jobs that ended since your last turn:\n${lines.map((l) => `- ${l}`).join('\n')}`;
+    // Keep exits until the kernel acknowledges delivery or a later completed
+    // turn carries them. An exit after the last tool result still needs that
+    // next turn, while every exit gets one immediate transcript row.
+    const idleJobNoticesRef = useRef({ ownerSession: null, pending: new Map(), delivered: new Set(), shown: new Set() });
+    const [jobSnapshot, setJobSnapshot] = useState({ ownerSession: null, jobs: [] });
+    const backgroundJobs = jobSnapshot.ownerSession === session ? jobSnapshot.jobs : [];
+    const snapshotIdleJobNotices = () => {
+        if (idleJobNoticesRef.current.ownerSession !== session)
+            return { ids: [] };
+        const pending = idleJobNoticesRef.current.pending;
+        if (pending.size === 0)
+            return { ids: [] };
+        const lines = [...pending.values()];
+        return {
+            ids: [...pending.keys()],
+            text: `Background jobs that ended since your last turn:\n${lines.map((l) => `- ${l}`).join('\n')}`,
+        };
     };
     // Commands the operator ran with `!` since the last turn. The model did
     // not see them happen; it reads them here on its next turn.
@@ -480,11 +488,22 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         return `What the operator did outside you since your last turn — commands they ran in their own shell, files they put back — with the output:\n\n${blocks.join('\n\n')}`;
     };
     useEffect(() => {
+        const notices = {
+            ownerSession: session,
+            pending: new Map(),
+            delivered: new Set(),
+            shown: new Set(),
+        };
+        idleJobNoticesRef.current = notices;
+        setJobSnapshot({ ownerSession: session, jobs: session?.jobs?.() ?? [] });
         if (!session?.onJobExit)
             return;
         return session.onJobExit((job) => {
-            if (abortRef.current !== null)
+            // The visible running-shell count belongs to the session even when
+            // the kernel owns this exit's model/transcript notice.
+            if (previousSessionRef.current !== session || idleJobNoticesRef.current !== notices)
                 return;
+            setJobSnapshot({ ownerSession: session, jobs: session.jobs?.() ?? [] });
             const text = describeJobExit({
                 jobId: job.id,
                 command: job.command,
@@ -492,8 +511,15 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 ...(job.exitCode !== undefined ? { exitCode: job.exitCode } : {}),
                 ...(job.signal ? { signal: job.signal } : {}),
             });
-            idleJobNoticesRef.current.push(text);
-            pushMessage('system', text, false, 'J');
+            // SDK delivery can run before this listener on a host with different
+            // subscription order. The tombstone keeps that acknowledged exit out of
+            // the next turn even when its UI event arrives later.
+            if (!notices.delivered.has(job.id))
+                notices.pending.set(job.id, text);
+            if (!notices.shown.has(job.id)) {
+                notices.shown.add(job.id);
+                pushMessage('system', text, false, 'J');
+            }
         });
     }, [session]);
     const [usage, setUsage] = useState(null);
@@ -541,6 +567,10 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
     const settledRef = useRef(0);
     // Complete prompts waiting for the one queue pump that may start a turn.
     const [queued, setQueued] = useState([]);
+    // Esc can make the screen idle before an aborted iterator settles. Recheck
+    // the queue when that iterator releases its turn token, even if `idle` did
+    // not change and no new prompt was appended in its finally block.
+    const [queueSettleVersion, setQueueSettleVersion] = useState(0);
     /** Return-submitted prompts accepted by the active turn but not yet drained by the SDK. */
     const [pendingSteers, setPendingSteers] = useState([]);
     // Kept synchronous with the rendered queue so a turn's `finally` can decide
@@ -673,6 +703,35 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
      */
     const [narration, setNarration] = useState([]);
     const [agentSurface, setAgentSurfaceState] = useState(null);
+    const [jobSurfaceState, setJobSurfaceState] = useState(null);
+    const jobSurface = jobSurfaceState?.ownerSession === session ? jobSurfaceState : null;
+    const jobSurfaceRef = useRef(null);
+    const jobSurfaceCommittedRef = useRef(null);
+    const setJobSurface = useCallback((next) => {
+        const wasVisible = jobSurfaceCommittedRef.current !== null;
+        jobSurfaceRef.current = next;
+        if (next === null)
+            jobSurfaceCommittedRef.current = null;
+        else if (wasVisible)
+            jobSurfaceCommittedRef.current = next;
+        setJobSurfaceState(next);
+    }, []);
+    useLayoutEffect(() => {
+        jobSurfaceCommittedRef.current = jobSurface;
+    }, [jobSurface]);
+    useEffect(() => setJobSurface(null), [session, setJobSurface]);
+    const [jobClock, setJobClock] = useState(Date.now());
+    const hasRunningBackgroundJob = backgroundJobs.some((job) => job.status === 'running');
+    const jobSurfaceOpen = jobSurface !== null;
+    useEffect(() => {
+        if (!jobSurfaceOpen || !hasRunningBackgroundJob)
+            return;
+        const timer = setInterval(() => {
+            setJobClock(Date.now());
+            setJobSnapshot({ ownerSession: session, jobs: session?.jobs?.() ?? [] });
+        }, 1000);
+        return () => clearInterval(timer);
+    }, [jobSurfaceOpen, hasRunningBackgroundJob, session]);
     const agentSurfaceRef = useRef(null);
     const agentSurfaceCommittedRef = useRef(null);
     const setAgentSurface = useCallback((next) => {
@@ -1009,16 +1068,20 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
     const [saveSkillPrompt, setSaveSkillPromptState] = useState(null);
     const saveSkillPromptRef = useRef(null);
     const setSaveSkillPrompt = useCallback((next) => {
+        if (next)
+            setJobSurface(null);
         saveSkillPromptRef.current = next;
         setSaveSkillPromptState(next);
-    }, []);
+    }, [setJobSurface]);
     const [scheduleReviewPrompt, setScheduleReviewPromptState] = useState(null);
     const scheduleReviewTokenRef = useRef(0);
     const scheduleReviewPromptRef = useRef(null);
     const setScheduleReviewPrompt = useCallback((next) => {
+        if (next)
+            setJobSurface(null);
         scheduleReviewPromptRef.current = next;
         setScheduleReviewPromptState(next);
-    }, []);
+    }, [setJobSurface]);
     const saveSkillNotifyRef = useRef(null);
     const saveSkillToolRef = useRef(null);
     if (saveSkillToolRef.current === null) {
@@ -1314,6 +1377,28 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             ]);
         return id;
     }, [nextId]);
+    const recallQueuedPrompt = useCallback(() => {
+        const pending = queuedRef.current;
+        let index = pending.length - 1;
+        while (index >= 0 && !isRecallableHumanPrompt(pending[index]))
+            index -= 1;
+        if (index < 0) {
+            pushMessage('system', 'No queued message to edit.');
+            return null;
+        }
+        const prompt = pending[index];
+        if (!isRecallableHumanPrompt(prompt))
+            return null;
+        const remaining = [...pending.slice(0, index), ...pending.slice(index + 1)];
+        replaceQueued(remaining);
+        if (remaining.length === 0)
+            setQueuePause(null);
+        return {
+            text: prompt.recallText ?? prompt.text,
+            ...(prompt.attachments ? { attachments: prompt.attachments } : {}),
+            ...(prompt.triggers ? { triggers: prompt.triggers } : {}),
+        };
+    }, [pushMessage, replaceQueued, setQueuePause]);
     /**
      * The skill proposal's per-conversation facts: whether this conversation
      * has proposed one, and whether it has used a skill. Keyed by the
@@ -3056,6 +3141,30 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         }
     }, [activateTrustedProject, pushMessage, runProbe]);
     const finalized = messages.filter((m) => !m.pending);
+    const runningShellCount = backgroundJobs.filter((job) => job.status === 'running').length;
+    const shellFurniture = runningShellCount > 0 ? 1 : 0;
+    const pendingInputItems = pendingSteers.map((input) => ({
+        text: input.prompt.recallText ?? input.prompt.text,
+        attachmentCount: (input.prompt.attachments?.length ?? 0) + input.attachedFiles,
+    }));
+    const queuedInputItems = queued.map((prompt) => ({
+        text: prompt.kind === 'goal' ? 'Automatic goal continuation' : prompt.recallText ?? prompt.text,
+        attachmentCount: prompt.kind === 'human' ? prompt.attachments?.length : undefined,
+    }));
+    const recallableQueued = queued.filter(isRecallableHumanPrompt).at(-1);
+    const canRecallQueued = recallableQueued !== undefined;
+    const pendingInputVisible = phase === 'ready' &&
+        agentSurface === null && outputViewer === null && jobSurface === null &&
+        permission === null && saveSkillPrompt === null && scheduleReviewPrompt === null &&
+        textPrompt === null && choicePicker === null && copyPicker === null;
+    const pendingInputFurniture = pendingInputVisible
+        ? pendingInputPanelRows({
+            pendingSteers: pendingInputItems,
+            queued: queuedInputItems,
+            rows: terminal.rows,
+            canRecall: canRecallQueued,
+        })
+        : 0;
     // Where the streaming reply stands among the finalized rows: a row written
     // while it streams is drawn below it, as it will be once it has finished.
     const streamingAt = messages.findIndex((m) => m.pending);
@@ -3074,12 +3183,12 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         messages,
         rows: terminal.rows,
         columns: terminal.columns,
-        furnitureRows: LIVE_FURNITURE_ROWS + fullToolFurniture,
+        furnitureRows: LIVE_FURNITURE_ROWS + fullToolFurniture + shellFurniture + pendingInputFurniture,
         raw: rawOutput,
     });
     const liveTasks = checklistShown ? [] : tasks;
     const fullTaskFurniture = taskListRows(liveTasks);
-    const compactWork = LIVE_FURNITURE_ROWS + fullTaskFurniture + fullToolFurniture >= terminal.rows;
+    const compactWork = LIVE_FURNITURE_ROWS + fullTaskFurniture + fullToolFurniture + shellFurniture + pendingInputFurniture >= terminal.rows;
     const taskFurniture = fullTaskFurniture;
     const toolFurniture = compactWork && fullToolFurniture > 0 ? 2 : fullToolFurniture;
     // How much of the transcript is still redrawable. The rest belongs to native
@@ -3097,7 +3206,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         messages: finalized,
         rows: terminal.rows,
         columns: terminal.columns,
-        furnitureRows: LIVE_FURNITURE_ROWS + taskFurniture + toolFurniture,
+        furnitureRows: LIVE_FURNITURE_ROWS + taskFurniture + toolFurniture + shellFurniture + pendingInputFurniture,
         settled: settledRef.current,
         raw: rawOutput,
     });
@@ -3106,9 +3215,9 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
     // settling in the background prints through the child screen. Returning
     // advances the floor once and emits those finalized rows exactly once.
     const nextSettled = settledBeforeStreaming(messages, window.settled, settledRef.current);
-    if (agentSurface === null && outputViewer === null && scheduleReviewPrompt === null)
+    if (agentSurface === null && outputViewer === null && jobSurface === null && scheduleReviewPrompt === null)
         settledRef.current = nextSettled;
-    const renderedSettled = agentSurface === null && outputViewer === null && scheduleReviewPrompt === null
+    const renderedSettled = agentSurface === null && outputViewer === null && jobSurface === null && scheduleReviewPrompt === null
         ? nextSettled
         : settledRef.current;
     // One merged vocabulary for the session: this host's own commands plus
@@ -3478,7 +3587,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
      * leave it hanging with its reply unsaved. It is the same decision Ctrl+C
      * sends at that prompt, for the same reason.
      */
-    const interruptTurn = useCallback(() => {
+    const interruptTurn = useCallback((recoverInput = false) => {
         const cancelledSwitch = cancelPendingModelSwitch();
         for (const pending of permissionQueueRef.current.splice(0)) {
             pending.resolve({ kind: 'reject', feedback: 'User interrupted.' });
@@ -3497,15 +3606,27 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 if (activeSessionId)
                     goalActivation.disarm(activeSessionId);
                 wakeGoalDriver();
-                discardQueued();
+                if (recoverInput && queuedRef.current.length > 0)
+                    setQueuePause({ outcome: 'stopped', source: 'operator-interrupt' });
+                else
+                    discardQueued();
                 setState('idle');
                 return true;
             }
-            if (cancelledSwitch)
-                discardQueued();
+            if (cancelledSwitch) {
+                if (recoverInput && queuedRef.current.length > 0)
+                    setQueuePause({ outcome: 'stopped', source: 'operator-interrupt' });
+                else
+                    discardQueued();
+            }
             return cancelledSwitch;
         }
         ac.abort(new TurnCancelled('user'));
+        // Esc with a pending steer means "let this instruction interrupt the
+        // answer". The kernel has not drained these inputs yet, so reclaim them
+        // before closing the inbox and let the queue pump start them first after
+        // the aborted turn settles. Ctrl+C keeps its deliberate cancel-all path.
+        const undeliveredSteers = recoverInput ? (activeTurnInboxRef.current?.close() ?? []) : [];
         const activeSessionId = scopeRef.current?.sessionId;
         if (activeSessionId)
             goalActivation.disarm(activeSessionId);
@@ -3513,10 +3634,19 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         activeTurnTokenRef.current = null;
         activeTurnInboxRef.current = null;
         setPendingSteers([]);
-        // Dropped now so a second interrupt does not re-abort, and the queue with
-        // it: interrupting means stop, not "run the next one".
+        // Dropped now so a second interrupt does not re-abort.
         abortRef.current = null;
-        discardQueued();
+        if (recoverInput && undeliveredSteers.length > 0) {
+            replaceQueued([...undeliveredSteers.map((input) => input.prompt), ...queuedRef.current]);
+            setQueuePause(null);
+        }
+        else if (recoverInput && queuedRef.current.length > 0) {
+            // Esc without a pending steer stops the current turn; queued future
+            // instructions stay visible but do not start on a cancelled answer.
+            setQueuePause({ outcome: 'stopped', source: 'operator-interrupt' });
+        }
+        else
+            discardQueued();
         clearActiveTools();
         setState('idle');
         return true;
@@ -3525,7 +3655,9 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         clearActiveTools,
         discardQueued,
         goalActivation,
+        replaceQueued,
         resolvePermission,
+        setQueuePause,
         wakeGoalDriver,
     ]);
     // A termination signal leaves like `/exit`, after stopping the turn: the
@@ -4170,9 +4302,10 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         };
         signal?.addEventListener('abort', onAbort, { once: true });
         setSelectedChoice(0);
+        setJobSurface(null);
         setChoicePicker(picker);
         sendTerminalNotification({ kind: 'approval-required' });
-    }), [closeLiveReply, sendTerminalNotification, setChoicePicker, setSelectedChoice, resolveQuestion]);
+    }), [closeLiveReply, sendTerminalNotification, setChoicePicker, setSelectedChoice, setJobSurface, resolveQuestion]);
     const reviewSchedule = useCallback((request, signal) => new Promise((resolve) => {
         if (signal?.aborted) {
             resolve('cancel');
@@ -4398,6 +4531,11 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 break;
             }
             case 'tool-end': {
+                // A background bash call creates its job before this event. A job
+                // action may also stop one. Re-read the owning session here so the
+                // shell rail updates while the model continues its turn.
+                if (event.toolName === 'bash' || event.toolName === 'job')
+                    setJobSnapshot({ ownerSession: previousSessionRef.current, jobs: previousSessionRef.current?.jobs?.() ?? [] });
                 const running = activeToolsRef.current;
                 // Match strictly by toolUseId. Never fall back to "the first
                 // active tool" — under parallel calls that mis-attributes a
@@ -4595,9 +4733,12 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 break;
             }
             case 'job':
-                // The kernel saw it end during a turn; the model reads the notice
-                // on its next tool result, the operator reads this row.
-                pushMessage('system', describeJobExit(event), false, 'J');
+                // The session listener normally painted this at exit time. A host
+                // without that listener still gets the kernel event; never paint twice.
+                if (!idleJobNoticesRef.current.shown.has(event.jobId)) {
+                    idleJobNoticesRef.current.shown.add(event.jobId);
+                    pushMessage('system', describeJobExit(event), false, 'J');
+                }
                 break;
             case 'context':
                 // Into the TRANSCRIPT, not a status line. A status indicator is
@@ -5070,6 +5211,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             wakeGoalDriver();
             pushMessage('system', `Goal round ${goalRound.round} was not started because this conversation is not durable. Automatic continuation is disarmed; /goal resume retries explicitly.`);
         }
+        let idleNoticeSnapshot = { ids: [] };
         try {
             // Setup above awaited. A conversation switch can happen meanwhile and
             // move the mutable SessionScope captured by `createAgentSession`. Re-admit
@@ -5083,6 +5225,10 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 (!goalRound ||
                     (destination === goalRound.sessionId &&
                         goalActivation.isArmed(goalRound.sessionId, goalRound)))) {
+                // Keep these notices pending until a completed send commits them.
+                // An early throw or abort never proves the model received context.
+                idleNoticeSnapshot = snapshotIdleJobNotices();
+                const operatorShellSnapshot = drainOperatorShell();
                 for await (const event of session.send(priorForSdk, {
                     signal: ac.signal,
                     turnId,
@@ -5103,7 +5249,11 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                     ...(turnHypermode ? { hypermode: true } : {}),
                     // Read at every iteration, so an after-turn trigger a steer
                     // binds to this turn is said from the next one on.
-                    hostContext: () => st.contextTexts ?? [],
+                    hostContext: () => [
+                        ...(st.contextTexts ?? []),
+                        idleNoticeSnapshot.text,
+                        operatorShellSnapshot,
+                    ].filter((part) => Boolean(part)),
                     ...(goalRound ? { goalRound } : {}),
                     // The mode above decides whether this callback is consulted.
                     onPermission: askPermission,
@@ -5111,9 +5261,16 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                     onModelSwitch: requestModelSwitch,
                     inboundMessages: () => inbox.drain(),
                     waitForInbound: (signal) => inbox.waitForInbound(signal),
-                    extraSystem: [composeSkillsPrompt(activeSkills), drainIdleJobNotices(), drainOperatorShell()]
-                        .filter((part) => Boolean(part))
-                        .join('\n\n') || undefined,
+                    onJobNoticeDelivered: (ids) => {
+                        const notices = idleJobNoticesRef.current;
+                        if (notices.ownerSession !== session)
+                            return;
+                        for (const id of ids) {
+                            notices.delivered.add(id);
+                            notices.pending.delete(id);
+                        }
+                    },
+                    extraSystem: composeSkillsPrompt(activeSkills) || undefined,
                     onConversationMessages: (messages) => {
                         // State-only: opaque reasoning/signatures must reach the next
                         // provider and durable store without becoming transcript text.
@@ -5167,6 +5324,10 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             }
         }
         finally {
+            if (st.completed && idleJobNoticesRef.current.ownerSession === session) {
+                for (const id of idleNoticeSnapshot.ids)
+                    idleJobNoticesRef.current.pending.delete(id);
+            }
             const undeliveredLiveInput = inbox.close();
             const ownsInbox = activeTurnInboxRef.current === inbox;
             if (ownsInbox) {
@@ -5240,6 +5401,8 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
             // The kernel recorded the turn in the session log as it ran; nothing is
             // left to publish once the loop has unwound.
             unsettledTurnGenerationsRef.current.delete(turnToken);
+            if (queuedRef.current.length > 0)
+                setQueueSettleVersion((version) => version + 1);
             const pending = pendingModelSwitchRef.current;
             if (pending?.turnToken === turnToken && pending.selection) {
                 const selection = pending.selection;
@@ -5611,6 +5774,17 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                     }, () => pushMessage('system', renderAgents(agentIds)));
                     return;
                 }
+                case 'jobs': {
+                    const current = session?.jobs?.() ?? [];
+                    if (!session) {
+                        pushMessage('system', 'Shell jobs are available after a session starts.');
+                        return;
+                    }
+                    setJobSnapshot({ ownerSession: session, jobs: current });
+                    setJobClock(Date.now());
+                    setJobSurface({ ownerSession: session, selectedJobId: current.find((job) => job.status === 'running')?.id ?? current[0]?.id ?? null, detailJobId: null, tailOffset: 0 });
+                    return;
+                }
                 case 'abandon': {
                     void abandonActiveTurn(slash.reason);
                     return;
@@ -6631,10 +6805,14 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         //
         // Keep the attachment array beside its text. Reconstructing a prompt from
         // the transcript later cannot recover bytes whose composer chip is gone.
-        advanceQueueContinuation();
+        const wasHeldByInterrupt = queuePauseRef.current?.source === 'operator-interrupt';
+        if (mode === 'submit')
+            advanceQueueContinuation();
         const prompt = {
             kind: 'human',
             text: outgoing,
+            ...(meta.source === 'composer' && !skillFlow ? { recallable: true } : {}),
+            ...(meta.source === 'composer' && !skillFlow && outgoing !== value ? { recallText: value } : {}),
             ...(attachments && attachments.length > 0 ? { attachments: [...attachments] } : {}),
             ...(skillFlow ? { skillFlow: true } : {}),
             ...(armedTriggers.length > 0 && !skillFlow ? { triggers: armedTriggers } : {}),
@@ -6654,14 +6832,17 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                     prompt,
                     message: createUserMessage(expanded.sendText, prompt.attachments),
                     attachedFiles: expanded.attached.length,
-                    queueBoundary: queuedRef.current.length,
+                    queuedBefore: [...queuedRef.current],
                 })) {
                     bindSteeredTriggers(armedTriggers);
                     return;
                 }
             }
         }
-        enqueueQueued(prompt);
+        if (mode === 'submit' && wasHeldByInterrupt)
+            replaceQueued([prompt, ...queuedRef.current]);
+        else
+            enqueueQueued(prompt);
     }, [
         activeSkills,
         advanceQueueContinuation,
@@ -6689,6 +6870,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         rawOutput,
         rememberProjectNote,
         removeStoredCredential,
+        replaceQueued,
         resetTranscript,
         runConversationExport,
         session,
@@ -6975,6 +7157,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         state,
         phase,
         queued,
+        queueSettleVersion,
         modelSwitchVersion,
         queuePause,
         textPrompt,
@@ -7296,6 +7479,110 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 resolvePermission({ kind });
             return;
         }
+        // The shell view observes only this AgentSession's jobs. Consent always
+        // takes precedence above; the composer stays mounted but hidden below.
+        const shellView = jobSurfaceRef.current;
+        if (shellView) {
+            if (shellView.ownerSession !== session) {
+                setJobSurface(null);
+                return;
+            }
+            // The Return that submitted /jobs must not also inspect or stop a
+            // row before the new screen has painted.
+            if (jobSurfaceCommittedRef.current !== shellView)
+                return;
+            if ((key.ctrl && input === 'c') || input.toLowerCase() === 'q') {
+                setJobSurface(null);
+                return;
+            }
+            if (key.escape) {
+                setJobSurface(shellView.detailJobId ? { ...shellView, detailJobId: null, tailOffset: 0 } : null);
+                return;
+            }
+            const selectedId = shellView.detailJobId ?? shellView.selectedJobId ?? backgroundJobs[0]?.id;
+            const selectedJob = backgroundJobs.find((job) => job.id === selectedId);
+            if (input.toLowerCase() === 'x' && selectedJob?.status === 'running' && session?.stopJob && !shellView.busyJobId) {
+                const owner = session;
+                const stopJob = owner.stopJob;
+                if (!stopJob)
+                    return;
+                setJobSurface({ ...shellView, busyJobId: selectedJob.id, notice: undefined });
+                void stopJob(selectedJob.id).then((result) => {
+                    if (previousSessionRef.current !== owner)
+                        return;
+                    setJobSnapshot({ ownerSession: owner, jobs: owner.jobs?.() ?? [] });
+                    const current = jobSurfaceRef.current;
+                    if (current?.busyJobId === selectedJob.id)
+                        setJobSurface({
+                            ...current,
+                            busyJobId: undefined,
+                            notice: result.status === 'killed'
+                                ? `Stopped ${selectedJob.id}.`
+                                : result.status === 'exited'
+                                    ? `${selectedJob.id} had already exited (${result.exitCode ?? '?'}).`
+                                    : `Stop request for ${selectedJob.id} did not finish.`,
+                        });
+                }, (error) => {
+                    if (previousSessionRef.current !== owner)
+                        return;
+                    const current = jobSurfaceRef.current;
+                    if (current?.busyJobId === selectedJob.id)
+                        setJobSurface({ ...current, busyJobId: undefined, notice: `Could not stop ${selectedJob.id}: ${error instanceof Error ? error.message : String(error)}` });
+                });
+                return;
+            }
+            if (shellView.detailJobId) {
+                let output;
+                try {
+                    output = session?.readJob?.(shellView.detailJobId);
+                }
+                catch {
+                    output = undefined;
+                }
+                const max = maxBackgroundJobTailOffset(output, terminal.rows, Math.max(1, terminal.columns - 2));
+                const page = backgroundJobOutputPageSize(terminal.rows);
+                const offset = Math.min(shellView.tailOffset, max);
+                const next = key.home || input === 'g'
+                    ? max
+                    : key.end || input === 'G'
+                        ? 0
+                        : key.pageUp
+                            ? Math.min(max, offset + page)
+                            : key.pageDown
+                                ? Math.max(0, offset - page)
+                                : key.upArrow
+                                    ? Math.min(max, offset + 1)
+                                    : key.downArrow
+                                        ? Math.max(0, offset - 1)
+                                        : null;
+                if (next !== null)
+                    setJobSurface({ ...shellView, tailOffset: next, notice: undefined });
+                return;
+            }
+            if (key.return && selectedJob) {
+                setJobSurface({ ...shellView, selectedJobId: selectedJob.id, detailJobId: selectedJob.id, tailOffset: 0, notice: undefined });
+                return;
+            }
+            if (key.home || key.end || key.pageUp || key.pageDown || key.upArrow || key.downArrow) {
+                const current = Math.max(0, backgroundJobs.findIndex((job) => job.id === shellView.selectedJobId));
+                const page = backgroundJobsPageSize(terminal.rows);
+                const next = key.home
+                    ? 0
+                    : key.end
+                        ? backgroundJobs.length - 1
+                        : key.pageUp
+                            ? Math.max(0, current - page)
+                            : key.pageDown
+                                ? Math.min(backgroundJobs.length - 1, current + page)
+                                : key.upArrow
+                                    ? Math.max(0, current - 1)
+                                    : Math.min(backgroundJobs.length - 1, current + 1);
+                const job = backgroundJobs[next];
+                if (job)
+                    setJobSurface({ ...shellView, selectedJobId: job.id, notice: undefined });
+            }
+            return;
+        }
         // The active child count already advertises this key beside Working.
         // Open the same retained cockpit as `/agent`; Enter then drills into a
         // child's transcript. Keep the shortcut below consent so it can never
@@ -7614,10 +7901,10 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 void abandonActiveTurn('The operator stopped the turn a tool paused for them.');
             return;
         }
-        // Esc interrupts a running turn (Ctrl+C stays reserved for exit). Mirrors
-        // the Ctrl+C interrupt path: abort, drop the queue, one "Interrupted." line.
+        // Esc interrupts the running turn. Its pending steer can start a fresh
+        // turn, while a next-turn queue remains visible for the operator.
         if (key.escape && (abortRef.current || pendingModelSwitchRef.current)) {
-            interruptTurn();
+            interruptTurn(true);
             pushMessage('system', 'Interrupted.');
             return;
         }
@@ -7651,7 +7938,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                 return;
             }
             const projected = liveWindow({ messages: proposed.filter((m) => !m.pending), rows: terminal.rows,
-                columns: terminal.columns, furnitureRows: LIVE_FURNITURE_ROWS + taskFurniture + toolFurniture,
+                columns: terminal.columns, furnitureRows: LIVE_FURNITURE_ROWS + taskFurniture + toolFurniture + shellFurniture + pendingInputFurniture,
                 settled: settledRef.current, raw: rawOutput });
             if (collapsible.length === 0 || (expanding && projected.settled > settledRef.current)) {
                 setOutputViewer(block);
@@ -7707,6 +7994,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         ? subagents.find((agent) => agent.viewId === agentSurface.selectedId)
         : undefined;
     const lifecycleOwnsViewport = outputViewer !== null ||
+        jobSurface !== null ||
         scheduleReviewPrompt !== null ||
         phase === 'trust' ||
         phase === 'resume' ||
@@ -7723,7 +8011,8 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         choicePicker === null &&
         copyPicker === null &&
         scheduleReviewPrompt === null &&
-        agentSurface === null
+        agentSurface === null &&
+        jobSurface === null
         ? goalStatusLabel(goalStatus, goalStatus ? goalActivation.isArmed(goalStatus.sessionId, goalStatus) : false)
         : null;
     // The effort chooser is a left-to-right slider wherever its stops fit on
@@ -7731,6 +8020,12 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
     const effortSlider = choicePicker?.kind === 'reasoning-effort'
         ? effortSliderLayout(choicePicker.options.map((option) => option.label), Math.max(1, (terminal.columns ?? 80) - 2))
         : undefined;
+    const jobStatusHint = jobSurface?.detailJobId
+        ? !jobSurface.busyJobId &&
+            backgroundJobs.some((job) => job.id === jobSurface.detailJobId && job.status === 'running')
+            ? 'shell output · x stop · esc list'
+            : 'shell output · esc list'
+        : 'shells · enter inspect · esc close';
     const statusHint = conversationMutation === 'fork'
         ? 'forking conversation — input is paused'
         : conversationMutation === 'edit'
@@ -7755,21 +8050,23 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                                                 : 'agents — enter inspect · left phases · esc return'
                                         : agentSurface?.kind === 'transcript'
                                             ? 'observing agent — esc agents · q parent'
-                                            : textPrompt
-                                                ? 'editor open · enter apply · esc cancel'
-                                                : choicePicker
-                                                    ? choicePickerSearchable(choicePicker)
-                                                        ? 'type to filter · ↑↓ select · enter apply · esc back'
-                                                        : effortSlider
-                                                            ? '←/→ adjust · 1–9 select · enter apply · esc back'
-                                                            : '↑↓ / 1–9 select · enter apply · esc back'
-                                                    : copyPicker
-                                                        ? 'copy target open — ↑↓ / 1–9 select · esc cancel'
-                                                        : handoffPark && phase === 'ready' && state === 'idle' && !composerHasDraft
-                                                            ? 'enter continue · esc stop'
-                                                            : goalStatus && phase === 'ready' && state === 'idle'
-                                                                ? undefined
-                                                                : hintForPhase(phase, state, session?.hasProvider === true, composerHasDraft);
+                                            : jobSurface
+                                                ? jobStatusHint
+                                                : textPrompt
+                                                    ? 'editor open · enter apply · esc cancel'
+                                                    : choicePicker
+                                                        ? choicePickerSearchable(choicePicker)
+                                                            ? 'type to filter · ↑↓ select · enter apply · esc back'
+                                                            : effortSlider
+                                                                ? '←/→ adjust · 1–9 select · enter apply · esc back'
+                                                                : '↑↓ / 1–9 select · enter apply · esc back'
+                                                        : copyPicker
+                                                            ? 'copy target open — ↑↓ / 1–9 select · esc cancel'
+                                                            : handoffPark && phase === 'ready' && state === 'idle' && !composerHasDraft
+                                                                ? 'enter continue · esc stop'
+                                                                : goalStatus && phase === 'ready' && state === 'idle'
+                                                                    ? undefined
+                                                                    : hintForPhase(phase, state, session?.hasProvider === true, composerHasDraft);
     const permissionSource = reviewSource(permission, scopeRef.current?.sessionId);
     const permissionOwner = permissionSource
         ? subagents.find((agent) => agent.sessionId === permissionSource)
@@ -7809,6 +8106,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
         phase !== 'resume' &&
         phase !== 'edit' &&
         phase !== 'picker';
+    const childSurfaceOpen = agentSurface !== null || outputViewer !== null || jobSurface !== null;
     return (
     // One row short of the terminal, always: see ViewportBound.tsx for the
     // renderer path a taller frame takes and the scrollback row it costs.
@@ -7826,7 +8124,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                     // where it is decided rather than guessed on the screen: with no
                     // session behind the picker, esc exits namzu and the footer says
                     // so instead of offering a cancel nobody will see.
-                    cancelExits: !session?.hasProvider })) : (_jsxs(_Fragment, { children: [agentSurface === null && outputViewer === null && scheduleReviewPrompt === null ? (_jsx(LiveActivity, { compact: compactWork, activeTools: visibleActiveTools, working: state === 'thinking' || state === 'tool', interruptible: abortRef.current !== null, animate: stdout.isTTY === true &&
+                    cancelExits: !session?.hasProvider })) : (_jsxs(_Fragment, { children: [agentSurface === null && outputViewer === null && jobSurface === null && scheduleReviewPrompt === null ? (_jsx(LiveActivity, { compact: compactWork, activeTools: visibleActiveTools, working: state === 'thinking' || state === 'tool', interruptible: abortRef.current !== null, animate: stdout.isTTY === true &&
                                 permission === null &&
                                 textPrompt === null &&
                                 saveSkillPrompt === null &&
@@ -7834,13 +8132,12 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                                 permission !== null ||
                                 textPrompt !== null ||
                                 saveSkillPrompt !== null ||
-                                scheduleReviewPrompt !== null })) : null, agentSurface === null && outputViewer === null && permission === null && scheduleReviewPrompt === null ? (_jsx(TaskList, { tasks: liveTasks })) : null, permission ? (_jsx(PermissionOverlay, { toolCalls: permission.toolCalls, review: permission.review, summary: permission.summary, detailsOpen: permissionDetailsOpen, reviewOffset: permissionReviewOffset, choice: permissionChoice, queuedCount: queuedPermissionCount, sourceLabel: permissionSourceLabel, columns: terminal.columns, rows: terminal.rows, batchOnly: permission.batchOnly === true, siteNotes: permission.siteNotes, ...(permission.screenConsent === true
+                                scheduleReviewPrompt !== null })) : null, agentSurface === null && outputViewer === null && jobSurface === null && permission === null && scheduleReviewPrompt === null ? (_jsx(TaskList, { tasks: liveTasks })) : null, permission ? (_jsx(PermissionOverlay, { toolCalls: permission.toolCalls, review: permission.review, summary: permission.summary, detailsOpen: permissionDetailsOpen, reviewOffset: permissionReviewOffset, choice: permissionChoice, queuedCount: queuedPermissionCount, sourceLabel: permissionSourceLabel, columns: terminal.columns, rows: terminal.rows, batchOnly: permission.batchOnly === true, siteNotes: permission.siteNotes, ...(permission.screenConsent === true
                                 ? { screenConsent: { provider: session?.providerSummary ?? null } }
-                                : {}) })) : null, saveSkillPrompt && permission === null && scheduleReviewPrompt === null ? (_jsx(SaveSkillOverlay, { request: saveSkillPrompt.request, cwd: ctx.cwd, columns: Math.max(1, (terminal.columns ?? 80) - 2), rows: terminal.rows, onAnswer: saveSkillPrompt.resolve }, saveSkillPrompt.request.markdown)) : null, scheduleReviewPrompt && permission === null ? (_jsx(ScheduleReviewOverlay, { request: scheduleReviewPrompt.request, columns: Math.max(1, (terminal.columns ?? 80) - 2), rows: Math.max(1, (terminal.rows ?? 24) - 2), onAnswer: scheduleReviewPrompt.resolve }, scheduleReviewPrompt.token)) : null, textPrompt ? (_jsx(TextPrompt, { columns: Math.max(1, (terminal.columns ?? 80) - 2), title: textPrompt.title, placeholder: textPrompt.placeholder, initialValue: textPrompt.initialValue, emptyNotice: textPrompt.emptyNotice, hidden: permission !== null || scheduleReviewPrompt !== null || (agentSurface !== null || outputViewer !== null), onSubmit: submitTextPrompt, onCancel: cancelTextPrompt }, textPrompt.token)) : permission === null && scheduleReviewPrompt === null &&
-                            agentSurface === null &&
-                            outputViewer === null &&
+                                : {}) })) : null, saveSkillPrompt && permission === null && scheduleReviewPrompt === null ? (_jsx(SaveSkillOverlay, { request: saveSkillPrompt.request, cwd: ctx.cwd, columns: Math.max(1, (terminal.columns ?? 80) - 2), rows: terminal.rows, onAnswer: saveSkillPrompt.resolve }, saveSkillPrompt.request.markdown)) : null, scheduleReviewPrompt && permission === null ? (_jsx(ScheduleReviewOverlay, { request: scheduleReviewPrompt.request, columns: Math.max(1, (terminal.columns ?? 80) - 2), rows: Math.max(1, (terminal.rows ?? 24) - 2), onAnswer: scheduleReviewPrompt.resolve }, scheduleReviewPrompt.token)) : null, textPrompt ? (_jsx(TextPrompt, { columns: Math.max(1, (terminal.columns ?? 80) - 2), title: textPrompt.title, placeholder: textPrompt.placeholder, initialValue: textPrompt.initialValue, emptyNotice: textPrompt.emptyNotice, hidden: permission !== null || scheduleReviewPrompt !== null || childSurfaceOpen, onSubmit: submitTextPrompt, onCancel: cancelTextPrompt }, textPrompt.token)) : permission === null && scheduleReviewPrompt === null &&
+                            !childSurfaceOpen &&
                             choicePicker?.kind === 'reasoning-effort' &&
-                            effortSlider ? (_jsx(EffortSlider, { title: choicePicker.title, notice: choicePicker.notice, options: choicePicker.options, selected: selectedChoice, layout: effortSlider, columns: Math.max(1, (terminal.columns ?? 80) - 2) })) : permission === null && scheduleReviewPrompt === null && agentSurface === null && outputViewer === null && choicePicker ? (_jsx(ChoicePicker, { busy: 'busy' in choicePicker && choicePicker.busy === true, columns: Math.max(1, (terminal.columns ?? 80) - 2), title: choicePicker.title, notice: choicePicker.notice, options: filterChoiceOptions(choicePicker.options, choiceQuery), query: choicePickerSearchable(choicePicker) ? choiceQuery : undefined, selected: selectedChoice, windowSize: choicePicker.kind === 'command' ? choicePicker.windowSize : undefined })) : permission === null && scheduleReviewPrompt === null && agentSurface === null && outputViewer === null && copyPicker ? (_jsx(CopyPicker, { targets: copyPicker.targets, selected: selectedCopy })) : null, _jsxs(ComposerFrame, { columns: Math.max(2, (terminal.columns ?? 80) - 2), working: state === 'thinking' || state === 'tool' || visibleActiveTools.length > 0, ...(hypermode ? { mode: HYPERMODE } : {}), activation: hypermodeActivation, animate: externalEditorRequest === null, focus: phase === 'ready' &&
+                            effortSlider ? (_jsx(EffortSlider, { title: choicePicker.title, notice: choicePicker.notice, options: choicePicker.options, selected: selectedChoice, layout: effortSlider, columns: Math.max(1, (terminal.columns ?? 80) - 2) })) : permission === null && scheduleReviewPrompt === null && !childSurfaceOpen && choicePicker ? (_jsx(ChoicePicker, { busy: 'busy' in choicePicker && choicePicker.busy === true, columns: Math.max(1, (terminal.columns ?? 80) - 2), title: choicePicker.title, notice: choicePicker.notice, options: filterChoiceOptions(choicePicker.options, choiceQuery), query: choicePickerSearchable(choicePicker) ? choiceQuery : undefined, selected: selectedChoice, windowSize: choicePicker.kind === 'command' ? choicePicker.windowSize : undefined })) : permission === null && scheduleReviewPrompt === null && !childSurfaceOpen && copyPicker ? (_jsx(CopyPicker, { targets: copyPicker.targets, selected: selectedCopy })) : null, _jsxs(ComposerFrame, { columns: Math.max(2, (terminal.columns ?? 80) - 2), working: state === 'thinking' || state === 'tool' || visibleActiveTools.length > 0, ...(hypermode ? { mode: HYPERMODE } : {}), activation: hypermodeActivation, animate: externalEditorRequest === null, focus: phase === 'ready' &&
                                 state !== 'awaiting-permission' &&
                                 !compacting &&
                                 externalEditorRequest === null &&
@@ -7850,55 +8147,48 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                                 copyPicker === null &&
                                 saveSkillPrompt === null &&
                                 scheduleReviewPrompt === null &&
-                                agentSurface === null && outputViewer === null, hidden: permission !== null ||
+                                !childSurfaceOpen, hidden: permission !== null ||
                                 saveSkillPrompt !== null ||
                                 scheduleReviewPrompt !== null ||
                                 textPrompt !== null ||
                                 choicePicker !== null ||
                                 copyPicker !== null ||
-                                (agentSurface !== null || outputViewer !== null), children: [pendingSteers.length > 0 &&
-                                    permission === null &&
-                                    textPrompt === null &&
-                                    choicePicker === null &&
-                                    copyPicker === null &&
-                                    agentSurface === null && outputViewer === null ? (_jsx(Box, { paddingX: 1, children: _jsxs(Text, { color: theme.accent.user, children: ["\u21B3 ", pendingSteers.length, " message", pendingSteers.length > 1 ? 's' : '', " steering the active turn \u2014 waiting for its next response boundary"] }) })) : null, queued.length > 0 &&
-                                    permission === null &&
-                                    textPrompt === null &&
-                                    choicePicker === null &&
-                                    copyPicker === null &&
-                                    agentSurface === null && outputViewer === null ? (_jsx(Box, { paddingX: 1, children: _jsxs(Text, { color: theme.text.muted, children: [queuePause ? '‖' : '⏎', " ", queued.length, " message", queued.length > 1 ? 's' : '', " queued \u2014", ' ', queuePause
-                                                ? queuePause.outcome === 'paused'
-                                                    ? 'held after a resumable turn paused; wait for recovery, change model, or send a message to release it'
-                                                    : `paused after a ${queuePause.outcome} turn; send a message or change model to continue`
-                                                : 'sending when ready', queuedTriggerLabels(queued)] }) })) : null, _jsx(Composer, { reasoningEffortLevels: session?.reasoningEffortLevels, onCycleMode: cyclePermissionMode, disabled: outputViewer !== null ||
+                                childSurfaceOpen, children: [pendingInputVisible ? (_jsx(PendingInputPanel, { pendingSteers: pendingInputItems, queued: queuedInputItems, columns: Math.max(2, (terminal.columns ?? 80) - 2), rows: terminal.rows, canRecall: canRecallQueued, ...(recallableQueued
+                                        ? { recallItem: { text: recallableQueued.recallText ?? recallableQueued.text, attachmentCount: recallableQueued.attachments?.length } }
+                                        : {}), queuedTags: queuedTriggerLabels(queued), held: queuePause })) : null, _jsx(Composer, { reasoningEffortLevels: session?.reasoningEffortLevels, onCycleMode: cyclePermissionMode, disabled: outputViewer !== null ||
+                                        jobSurface !== null ||
                                         phase !== 'ready' ||
                                         state === 'awaiting-permission' ||
                                         compacting ||
                                         conversationMutation !== null ||
                                         externalEditorRequest !== null ||
-                                        (agentSurface !== null || outputViewer !== null), hidden: permission !== null ||
+                                        childSurfaceOpen, hidden: permission !== null ||
                                         saveSkillPrompt !== null ||
                                         scheduleReviewPrompt !== null ||
                                         textPrompt !== null ||
                                         choicePicker !== null ||
                                         copyPicker !== null ||
-                                        (agentSurface !== null || outputViewer !== null), 
+                                        childSurfaceOpen, 
                                     // A turn is running, so Esc is the interrupt and not
                                     // the composer's clear.
                                     escapeInterrupts: (!compacting &&
                                         (state === 'thinking' ||
                                             state === 'tool' ||
                                             pendingModelSwitchRef.current !== null)) ||
-                                        (handoffPark !== null && state === 'idle'), onSubmit: handleSubmit, onNotice: (text) => pushMessage('system', text), onStepReasoningEffort: stepReasoningEffort, onExternalEdit: requestExternalEditor, onEditPrevious: openPromptEditor, draftToRestore: composerDraft, onDraftRestored: (token) => setComposerDraft((draft) => (draft?.token === token ? null : draft)), onDraftPresenceChange: setComposerHasDraft, onOpenAgentPanel: openAgentCockpit, userCommands: userCommands, builtins: hostCommands.map((command) => ({
+                                        (handoffPark !== null && state === 'idle'), onSubmit: handleSubmit, onNotice: (text) => pushMessage('system', text), onStepReasoningEffort: stepReasoningEffort, onExternalEdit: requestExternalEditor, onEditPrevious: openPromptEditor, draftToRestore: composerDraft, onDraftRestored: (token) => setComposerDraft((draft) => (draft?.token === token ? null : draft)), onDraftPresenceChange: setComposerHasDraft, onOpenAgentPanel: openAgentCockpit, onRecallQueued: recallQueuedPrompt, userCommands: userCommands, builtins: hostCommands.map((command) => ({
                                         ...command,
                                         description: command.unavailable?.(slashCtx) ?? command.description,
-                                    })), mentionCandidates: mentionCandidates, history: history, ...(composerTriggers ? { triggers: composerTriggers } : {}), turnActive: !compacting && (state === 'thinking' || state === 'tool') })] })] })), _jsx(StatusBar, { cwd: ctx.cwd, provider: session?.providerSummary ?? null, model: session?.modelSummary ?? null, effort: reasoningEffort, goal: statusGoal, state: state, hint: statusHint, permissionMode: displayedPermissionMode, canCycleMode: true }), showComposerSurface &&
+                                    })), mentionCandidates: mentionCandidates, history: history, ...(composerTriggers ? { triggers: composerTriggers } : {}), turnActive: !compacting && (state === 'thinking' || state === 'tool') })] })] })), _jsx(StatusBar, { cwd: ctx.cwd, provider: session?.providerSummary ?? null, model: session?.modelSummary ?? null, effort: reasoningEffort, goal: statusGoal, state: state, hint: statusHint, permissionMode: displayedPermissionMode, canCycleMode: true }), showComposerSurface && !childSurfaceOpen && permission === null && scheduleReviewPrompt === null && runningShellCount > 0 ? (_jsx(Box, { children: _jsx(Text, { color: theme.text.secondary, wrap: "truncate-end", children: terminal.columns < 38
+                            ? `${runningShellCount} shell${runningShellCount === 1 ? '' : 's'} · /jobs`
+                            : `${runningShellCount} shell${runningShellCount === 1 ? '' : 's'} running · /jobs to manage` }) })) : null, showComposerSurface &&
                     permission === null &&
                     agentSurface === null &&
                     outputViewer === null &&
+                    jobSurface === null &&
                     scheduleReviewPrompt === null ? (_jsx(AgentNarrationBand, { lines: narration })) : null, showComposerSurface &&
                     agentSurface === null &&
                     outputViewer === null &&
+                    jobSurface === null &&
                     scheduleReviewPrompt === null &&
                     liveSubagents.length > 0 ? (
                 // The active agents remain in memory while the schedule review
@@ -7913,7 +8203,7 @@ export function App({ ctx: initialCtx, onExitSummary, externalEditor = defaultEx
                     }, onNext: () => {
                         if (outputIndex >= 0 && outputIndex + 1 < outputBlocks.length)
                             setOutputViewer(outputBlocks[outputIndex + 1]);
-                    }, title: outputViewer.content, lines: outputViewer.detail ?? [], rows: terminal.rows, columns: terminal.columns, onClose: () => setOutputViewer(null) }, outputViewer.id)) : null] }) }));
+                    }, title: outputViewer.content, lines: outputViewer.detail ?? [], rows: terminal.rows, columns: terminal.columns, onClose: () => setOutputViewer(null) }, outputViewer.id)) : null, jobSurface && permission === null && scheduleReviewPrompt === null ? (_jsx(BackgroundJobsPanel, { jobs: backgroundJobs, selectedJobId: jobSurface.selectedJobId, detailJobId: jobSurface.detailJobId, tailOffset: jobSurface.tailOffset, readJob: (id) => session?.readJob?.(id), rows: terminal.rows, columns: Math.max(1, terminal.columns - 2), now: jobClock, busyJobId: jobSurface.busyJobId, notice: jobSurface.notice })) : null] }) }));
 }
 /** One line for a background job that ended, for the transcript and the next turn. */
 function describeJobExit(job) {