@cloudcli-ai/cloudcli 1.37.1 → 1.37.3

package/dist-server/server/modules/providers/list/claude/claude-runtime.provider.js

@@ -17,9 +17,9 @@ import os from 'os';
 import path from 'path';
 import { query } from '@anthropic-ai/claude-agent-sdk';
 import { appendFilesInputTag, buildClaudeUserContent, normalizeImageDescriptors } from '../../../../shared/image-attachments.js';
-import { CLAUDE_PREDEFINED_MODELS } from '../../../../modules/providers/list/claude/claude-models.provider.js';
+import { CLAUDE_PREDEFINED_MODELS, CLAUDE_ULTRACODE_EFFORT } from '../../../../modules/providers/list/claude/claude-models.provider.js';
 import { resolveClaudeCodeExecutablePath } from '../../../../shared/claude-cli-path.js';
-import { createNotificationEvent, notifyRunFailed, notifyRunStopped, notifyUserIfEnabled } from '../../../../modules/notifications/index.js';
+import { createNotificationEvent, notifyBackgroundWorkCompleted, notifyRunFailed, notifyRunStopped, notifyUserIfEnabled } from '../../../../modules/notifications/index.js';
 import { createCompleteMessage, createNormalizedMessage } from '../../../../shared/utils.js';
 const activeSessions = new Map();
 const pendingToolApprovals = new Map();
@@ -27,8 +27,35 @@ const pendingToolApprovals = new Map();
 // terminal `complete` (aborted: true) to the client, so the run loop must not
 // emit a second one when its generator winds down.
 const abortedSessionIds = new Set();
+// Query instances interrupted because a newer run took over their session id
+// (see addSession). Their run loops must stay silent on wind-down: the map
+// entry, the abort flag, and all client-facing events belong to the new run.
+const supersededInstances = new WeakSet();
 const TOOL_APPROVAL_TIMEOUT_MS = parseInt(process.env.CLAUDE_TOOL_APPROVAL_TIMEOUT_MS, 10) || 55000;
+// How long background work is allowed to keep running after a turn ends. This drives
+// two halves of the same behaviour:
+//
+//  1. Passed to the spawned CLI as CLAUDE_CODE_PRINT_BG_WAIT_CEILING_MS, which is how
+//     long it waits for still-running background *agents* before killing them.
+//  2. A backstop on how long we hold the SDK's stdin open after a turn's `result`.
+//     The SDK closes stdin as soon as a turn ends, and the CLI reads that EOF as
+//     "print wind-down" — killing background *shells* after a short grace period,
+//     which the ceiling above does not cover. Holding stdin open also lets the CLI
+//     push follow-up turns (background-task completions, Monitor notifications,
+//     scheduled wake-ups).
+//
+// The hold normally ends long before this: a turn with nothing outstanding closes
+// stdin immediately, background work releases it as soon as it reports back, and a
+// new turn supersedes the previous hold. This ceiling only catches background work
+// that never reports at all, so an abandoned session cannot leak a CLI process
+// forever. The timer resets on every message, so it measures silence, not total time.
+const BG_WAIT_CEILING_MS = 30 * 60 * 1000;
 const TOOLS_REQUIRING_INTERACTION = new Set(['AskUserQuestion', 'ExitPlanMode']);
+// Ultracode is a session-scoped setting rather than an SDK effort level: it pairs xhigh
+// effort with standing dynamic-workflow orchestration, and the CLI only honours it when
+// Workflows are enabled. The catalog offers it as an effort choice for the picker, so the
+// selection is translated back into the two options the SDK actually understands here.
+const ULTRACODE_SDK_EFFORT = 'xhigh';
 function resolveClaudeEffort(model, effort, modelsDefinition = CLAUDE_PREDEFINED_MODELS) {
     const selectedModel = modelsDefinition?.OPTIONS?.find((option) => option.value === model) || null;
     const allowedEfforts = selectedModel?.effort?.values
@@ -37,6 +64,27 @@ function resolveClaudeEffort(model, effort, modelsDefinition = CLAUDE_PREDEFINED
         ? effort
         : undefined;
 }
+/**
+ * Writes the resolved effort choice onto the SDK options, expanding `ultracode` into the
+ * xhigh effort level plus the session-scoped settings it requires.
+ * @param {Object} sdkOptions - SDK options being built
+ * @param {string|undefined} resolvedEffort - Catalog-validated effort selection
+ */
+function applyClaudeEffort(sdkOptions, resolvedEffort) {
+    if (!resolvedEffort) {
+        return;
+    }
+    if (resolvedEffort !== CLAUDE_ULTRACODE_EFFORT) {
+        sdkOptions.effort = resolvedEffort;
+        return;
+    }
+    sdkOptions.effort = ULTRACODE_SDK_EFFORT;
+    sdkOptions.settings = {
+        ...(sdkOptions.settings || {}),
+        ultracode: true,
+        enableWorkflows: true
+    };
+}
 function createRequestId() {
     if (typeof crypto.randomUUID === 'function') {
         return crypto.randomUUID();
@@ -127,17 +175,19 @@ function matchesToolPermission(entry, toolName, input) {
     return false;
 }
 function mapCliOptionsToSDK(options = {}) {
-    const { providerSessionId, cwd, toolsSettings, permissionMode, effort } = options;
+    const { providerSessionId, cwd, toolsSettings, permissionMode, effort, resumeAnchorId, resumeFromScratch } = options;
     const sdkOptions = {};
     // Forward all host env vars (e.g. ANTHROPIC_BASE_URL) to the subprocess.
     // Since SDK 0.2.113, options.env replaces process.env instead of overlaying it.
-    // This snapshot is also how CLI-side knobs reach the child: e.g. how long the CLI waits for
-    // still-running background agents after a turn ends is set by CLAUDE_CODE_PRINT_BG_WAIT_CEILING_MS
-    // (default 600000 ms; 0 = wait indefinitely) on this server's own environment.
-    sdkOptions.env = { ...process.env };
+    sdkOptions.env = { ...process.env, CLAUDE_CODE_PRINT_BG_WAIT_CEILING_MS: String(BG_WAIT_CEILING_MS) };
     // Resolve the executable eagerly on Windows because the SDK uses raw child_process.spawn,
     // which does not reliably follow npm's shell wrappers like cross-spawn does.
-    sdkOptions.pathToClaudeCodeExecutable = resolveClaudeCodeExecutablePath(process.env.CLAUDE_CLI_PATH);
+    // When nothing resolves the option stays unset on purpose: the SDK then falls back to the
+    // binary it ships, which beats handing it a bare `claude` that raw spawn can never launch.
+    const claudeExecutablePath = resolveClaudeCodeExecutablePath(process.env.CLAUDE_CLI_PATH);
+    if (claudeExecutablePath) {
+        sdkOptions.pathToClaudeCodeExecutable = claudeExecutablePath;
+    }
     if (cwd) {
         sdkOptions.cwd = cwd;
     }
@@ -168,18 +218,25 @@ function mapCliOptionsToSDK(options = {}) {
     sdkOptions.tools = { type: 'preset', preset: 'claude_code' };
     sdkOptions.disallowedTools = settings.disallowedTools || [];
     sdkOptions.model = options.model || CLAUDE_PREDEFINED_MODELS.DEFAULT;
-    const resolvedEffort = resolveClaudeEffort(sdkOptions.model, effort, options.effortModels || CLAUDE_PREDEFINED_MODELS);
-    if (resolvedEffort) {
-        sdkOptions.effort = resolvedEffort;
-    }
+    applyClaudeEffort(sdkOptions, resolveClaudeEffort(sdkOptions.model, effort, options.effortModels || CLAUDE_PREDEFINED_MODELS));
     sdkOptions.systemPrompt = {
         type: 'preset',
         preset: 'claude_code'
     };
     sdkOptions.settingSources = ['project', 'user', 'local'];
     // The SDK resumes with the provider-native session id, never the app id.
-    if (providerSessionId) {
+    // `resumeFromScratch` is set when the very first prompt of a conversation was
+    // edited: there is nothing before it to resume through, so the turn has to
+    // start the conversation over instead.
+    if (providerSessionId && !resumeFromScratch) {
         sdkOptions.resume = providerSessionId;
+        // Editing an already-sent message re-runs the conversation truncated just
+        // before it. `resumeSessionAt` is inclusive of the uuid it names, so the
+        // caller resolves the last row to KEEP and passes that — never the edited
+        // turn itself, which would leave the original prompt in context.
+        if (resumeAnchorId) {
+            sdkOptions.resumeSessionAt = resumeAnchorId;
+        }
     }
     return sdkOptions;
 }
@@ -188,13 +245,35 @@ function mapCliOptionsToSDK(options = {}) {
  * @param {string} sessionId - Session identifier
  * @param {Object} queryInstance - SDK query instance
  * @param {Object} writer - WebSocket writer for reconnect support
+ * @param {Function} releaseInput - Closes the held stdin stream so the CLI can exit
  */
-function addSession(sessionId, queryInstance, writer = null) {
+function addSession(sessionId, queryInstance, writer = null, releaseInput = null) {
+    const existing = activeSessions.get(sessionId);
+    // A different live instance under the same key means an earlier run was
+    // superseded without being stopped (e.g. an abort that raced run setup and
+    // found nothing to interrupt). Overwriting it here would strand its
+    // generator forever — this map entry is the only handle for interrupting
+    // it. Stop it directly rather than via abortClaudeSDKSession, whose
+    // session-keyed abortedSessionIds flag would be consumed by the new run
+    // and suppress its terminal `complete`.
+    const superseding = Boolean(existing && existing.status === 'active' && existing.instance && existing.instance !== queryInstance);
+    if (superseding) {
+        supersededInstances.add(existing.instance);
+        Promise.resolve()
+            .then(() => existing.instance.interrupt())
+            .catch((error) => {
+            console.error(`Error interrupting superseded run for session ${sessionId}:`, error?.message || error);
+        });
+        existing.releaseInput?.();
+    }
+    const carried = superseding ? null : existing;
     activeSessions.set(sessionId, {
         instance: queryInstance,
-        startTime: Date.now(),
+        startTime: carried?.startTime || Date.now(),
         status: 'active',
-        writer
+        writer,
+        // Re-registered mid-run once the provider session id lands; keep the closer.
+        releaseInput: releaseInput || carried?.releaseInput || null
     });
 }
 /**
@@ -234,44 +313,118 @@ function transformMessage(sdkMessage) {
     }
     return sdkMessage;
 }
+/**
+ * True for the user bubble the SDK echoes for a subagent's own prompt.
+ *
+ * Subagent traffic carries `parent_tool_use_id`, so this echo lands in the main
+ * thread and stacks a second copy of the prompt right below the Agent tool card
+ * that already displays it. It also disappears on reload, because the transcript
+ * keeps that turn in the subagent's sidechain rather than the session file.
+ * @param {Object} message - Normalized message about to be sent to the client
+ * @returns {boolean}
+ */
+export function isSubagentPromptEcho(message) {
+    return Boolean(message?.parentToolUseId) && message.role === 'user' && message.kind === 'text';
+}
 function readNumber(value) {
     const parsed = Number(value);
     return Number.isFinite(parsed) ? parsed : 0;
 }
 /**
- * Extracts token usage from SDK messages.
- * Prefers per-step `message.usage` (Claude message payload), then falls back
- * to result-level usage/modelUsage for compatibility across SDK versions.
+ * @typedef {Object} TokenBudget
+ * @property {number} used
+ * @property {number} total
+ * @property {number} inputTokens
+ * @property {number} outputTokens
+ * @property {number} [cacheReadTokens]
+ * @property {number} [cacheCreationTokens]
+ * @property {number} [cacheTokens]
+ * @property {{ input: number, output: number }} breakdown
+ */
+/**
+ * Builds a context-window budget from an Anthropic-shaped usage payload.
+ *
+ * `input_tokens + cache_read + cache_creation` is one request's whole prompt,
+ * which is exactly what the context window holds at that moment.
+ * @param {Object} messageUsage - Anthropic usage payload
+ * @returns {TokenBudget} Token budget object
+ */
+function buildTokenBudget(messageUsage) {
+    const directInputTokens = readNumber(messageUsage.input_tokens ?? messageUsage.inputTokens);
+    const cacheCreationTokens = readNumber(messageUsage.cache_creation_input_tokens ?? messageUsage.cacheCreationInputTokens ?? messageUsage.cacheCreationTokens);
+    const cacheReadTokens = readNumber(messageUsage.cache_read_input_tokens ?? messageUsage.cacheReadInputTokens ?? messageUsage.cacheReadTokens);
+    const cacheTokens = cacheCreationTokens + cacheReadTokens;
+    const inputTokens = directInputTokens + cacheTokens;
+    const outputTokens = readNumber(messageUsage.output_tokens ?? messageUsage.outputTokens);
+    const contextWindow = parseInt(process.env.CONTEXT_WINDOW, 10) || 160000;
+    return {
+        used: inputTokens + outputTokens,
+        total: contextWindow,
+        inputTokens,
+        outputTokens,
+        cacheReadTokens,
+        cacheCreationTokens,
+        cacheTokens,
+        breakdown: {
+            input: inputTokens,
+            output: outputTokens,
+        },
+    };
+}
+/**
+ * Extracts the session's context-window usage from an SDK stream message.
+ *
+ * Only assistant messages describe the context window: each one reports the
+ * prompt its own request carried. The turn-ending `result` is deliberately not
+ * a source here — see `extractCumulativeTokenBudget`.
  * @param {Object} sdkMessage - SDK stream message
- * @returns {Object|null} Token budget object or null
+ * @returns {TokenBudget|null} Token budget object or null
  */
 function extractTokenBudget(sdkMessage) {
     if (!sdkMessage || typeof sdkMessage !== 'object') {
         return null;
     }
-    const messageUsage = sdkMessage.message?.usage || sdkMessage.usage;
-    if (messageUsage && typeof messageUsage === 'object') {
-        const directInputTokens = readNumber(messageUsage.input_tokens ?? messageUsage.inputTokens);
-        const cacheCreationTokens = readNumber(messageUsage.cache_creation_input_tokens ?? messageUsage.cacheCreationInputTokens ?? messageUsage.cacheCreationTokens);
-        const cacheReadTokens = readNumber(messageUsage.cache_read_input_tokens ?? messageUsage.cacheReadInputTokens ?? messageUsage.cacheReadTokens);
-        const cacheTokens = cacheCreationTokens + cacheReadTokens;
-        const inputTokens = directInputTokens + cacheTokens;
-        const outputTokens = readNumber(messageUsage.output_tokens ?? messageUsage.outputTokens);
-        const totalUsed = inputTokens + outputTokens;
-        const contextWindow = parseInt(process.env.CONTEXT_WINDOW, 10) || 160000;
-        return {
-            used: totalUsed,
-            total: contextWindow,
-            inputTokens,
-            outputTokens,
-            cacheReadTokens,
-            cacheCreationTokens,
-            cacheTokens,
-            breakdown: {
-                input: inputTokens,
-                output: outputTokens,
-            },
-        };
+    // Subagent traffic (parent_tool_use_id set) reports the subagent's own
+    // context window, not this session's — surfacing it makes the counter drop
+    // to the subagent's number and bounce back on the next main-thread event.
+    if (sdkMessage.parent_tool_use_id) {
+        return null;
+    }
+    // Only assistant messages carry Anthropic-shaped usage. System
+    // task_progress/task_notification events have a top-level `usage` too, but
+    // shaped {total_tokens, tool_uses, duration_ms} — reading Anthropic keys
+    // off it yields an all-zero budget that flashes "0" in the composer.
+    if (sdkMessage.type !== 'assistant') {
+        return null;
+    }
+    const messageUsage = sdkMessage.message?.usage;
+    if (!messageUsage || typeof messageUsage !== 'object') {
+        return null;
+    }
+    return buildTokenBudget(messageUsage);
+}
+/**
+ * Last-resort budget read from a turn's `result` message.
+ *
+ * `result.usage` and `result.modelUsage` are the turn's *bill*: every request
+ * the turn made, summed, including each subagent's. A turn that made four
+ * requests therefore reports roughly four times the context the conversation
+ * actually holds, so publishing it made the counter leap at the end of a turn
+ * and fall back on the next assistant message — worst with subagents running,
+ * whose requests inflate the sum without ever entering this session's context.
+ *
+ * It is still the only usage an SDK build that reports none per assistant
+ * message ever emits, so it stays available for the caller to use when a turn
+ * produced no assistant budget at all.
+ * @param {Object} sdkMessage - SDK stream message
+ * @returns {TokenBudget|null} Token budget object or null
+ */
+function extractCumulativeTokenBudget(sdkMessage) {
+    if (!sdkMessage || typeof sdkMessage !== 'object' || sdkMessage.type !== 'result') {
+        return null;
+    }
+    if (sdkMessage.usage && typeof sdkMessage.usage === 'object') {
+        return buildTokenBudget(sdkMessage.usage);
     }
     if (!sdkMessage.modelUsage || typeof sdkMessage.modelUsage !== 'object') {
         return null;
@@ -297,28 +450,55 @@ function extractTokenBudget(sdkMessage) {
         },
     };
 }
+// Tool calls that leave work running past the end of a turn. Bash only counts
+// when it is explicitly backgrounded; the rest defer or watch work by nature.
+const DEFERRED_WORK_TOOLS = new Set(['Monitor', 'ScheduleWakeup', 'CronCreate', 'TaskCreate']);
+/**
+ * Detects tool calls that keep working after the turn's `result` arrives.
+ *
+ * Only turns that start background work need their CLI process held open; every
+ * other turn can let it exit immediately, as it did before the hold existed.
+ *
+ * @param {Object} sdkMessage - SDK stream message
+ * @returns {boolean} True when the message launches work that outlives the turn
+ */
+function startsBackgroundWork(sdkMessage) {
+    const content = sdkMessage?.message?.content;
+    if (!Array.isArray(content)) {
+        return false;
+    }
+    return content.some((block) => {
+        if (block?.type !== 'tool_use') {
+            return false;
+        }
+        if (block.name === 'Bash') {
+            return block.input?.run_in_background === true;
+        }
+        return DEFERRED_WORK_TOOLS.has(block.name);
+    });
+}
 /**
- * Builds the SDK `prompt` payload for one turn.
+ * Builds the SDK user messages for one turn.
  *
- * Plain text turns pass the string through unchanged. Turns with image
- * attachments use the SDK's streaming-input mode: a single SDKUserMessage
- * whose content carries the prompt text plus one base64 `image` block per
- * attachment (read from the global `~/.cloudcli/assets` folder).
+ * Always returns SDKUserMessage records rather than a bare string: a string
+ * prompt makes the SDK flag the query as single-turn and close stdin the moment
+ * the turn's `result` arrives, which kills the CLI's background tasks. Plain
+ * text turns carry string content; turns with image attachments carry the
+ * prompt text plus one base64 `image` block per attachment (read from the
+ * global `~/.cloudcli/assets` folder).
  *
  * @param {string} command - User prompt
  * @param {Array} images - Image descriptors ({ path, name?, mimeType? })
  * @param {Array} files - Non-image attachment descriptors
  * @param {string} cwd - Project working directory attachment paths resolve against
- * @returns {Promise<string|AsyncIterable>} SDK prompt payload
+ * @returns {Promise<Array<Object>>} SDKUserMessage records for the turn
  */
-async function buildPromptPayload(command, images, files, cwd) {
+async function buildPromptMessages(command, images, files, cwd) {
     const promptWithFiles = appendFilesInputTag(command, files);
-    if (normalizeImageDescriptors(images).length === 0) {
-        return promptWithFiles;
-    }
-    const content = await buildClaudeUserContent(promptWithFiles, images, cwd);
-    return (async function* () {
-        yield {
+    const content = normalizeImageDescriptors(images).length === 0
+        ? promptWithFiles
+        : await buildClaudeUserContent(promptWithFiles, images, cwd);
+    return [{
             type: 'user',
             message: {
                 role: 'user',
@@ -326,8 +506,30 @@ async function buildPromptPayload(command, images, files, cwd) {
             },
             parent_tool_use_id: null,
             timestamp: new Date().toISOString()
-        };
+        }];
+}
+/**
+ * Wraps prompt messages in an async iterable that yields them and then parks.
+ *
+ * The SDK closes the CLI's stdin as soon as its input iterable is exhausted (and
+ * immediately on `result` for string prompts). The CLI reads that EOF as the end
+ * of the run and kills anything still going in the background, so the iterable
+ * has to stay pending until we actually want the process gone.
+ *
+ * @param {Array<Object>} messages - SDKUserMessage records to send
+ * @returns {{ stream: AsyncIterable, release: () => void }} Stream plus its closer
+ */
+function createHeldPromptStream(messages) {
+    let release;
+    const held = new Promise((resolve) => { release = resolve; });
+    const stream = (async function* () {
+        for (const message of messages) {
+            yield message;
+        }
+        // Keeps stdin open — the CLI stays alive until release() is called.
+        await held;
     })();
+    return { stream, release };
 }
 /**
  * Loads MCP server configurations from ~/.claude.json
@@ -409,6 +611,43 @@ async function queryClaudeSDK(command, options = {}, ws, context) {
             event
         });
     };
+    // Closes the held stdin stream so the CLI can wind down. Replaced once the
+    // stream exists; the finally block calls it no matter how the run ends.
+    let releasePromptStream = () => { };
+    let idleReleaseTimer = null;
+    // The client is told the turn is over as soon as `result` lands, even though
+    // the process lingers, so the UI never waits out the idle hold.
+    let turnCompleteSent = false;
+    // Set when a turn starts background work, cleared when the next `result`
+    // arrives — only turns with work still outstanding hold their process open.
+    let backgroundWorkPending = false;
+    // True while the process is being held open for background work, so a later
+    // `result` can be recognised as that work reporting back.
+    let heldForBackgroundWork = false;
+    // Set once a turn publishes a budget read from an assistant message, so the
+    // turn-ending `result` is only mined for usage when nothing better arrived.
+    let assistantBudgetSent = false;
+    // A new turn supersedes any earlier one still holding this session's process
+    // open, so held runs cannot stack up across a conversation.
+    if (sessionKey()) {
+        getSession(sessionKey())?.releaseInput?.();
+    }
+    // Arms (or re-arms) the idle countdown that eventually closes stdin.
+    const scheduleRelease = () => {
+        if (idleReleaseTimer) {
+            clearTimeout(idleReleaseTimer);
+            idleReleaseTimer = null;
+        }
+        idleReleaseTimer = setTimeout(() => {
+            idleReleaseTimer = null;
+            releasePromptStream();
+        }, BG_WAIT_CEILING_MS);
+        // Never let the hold keep the server process alive on its own.
+        idleReleaseTimer.unref?.();
+    };
+    // Hoisted above the try so the catch's cleanup can tell whether this run
+    // still owns the activeSessions entry (or was superseded by a newer run).
+    let queryInstance = null;
     try {
         const resolvedModel = await context.resolveResumeModel(sessionId, options.model);
         let effortModels = CLAUDE_PREDEFINED_MODELS;
@@ -428,10 +667,10 @@ async function queryClaudeSDK(command, options = {}, ws, context) {
         if (mcpServers) {
             sdkOptions.mcpServers = mcpServers;
         }
-        // Turns with image attachments switch to streaming input so the images
-        // ride along as real content blocks. Built per query attempt because an
-        // async generator cannot be replayed once consumed.
-        const createPrompt = () => buildPromptPayload(command, options.images, options.files, options.cwd);
+        // Every turn uses streaming input so stdin stays open past the turn's
+        // `result`. The message list is reusable, but each query attempt needs its
+        // own stream because an async generator cannot be replayed once consumed.
+        const promptMessages = await buildPromptMessages(command, options.images, options.files, options.cwd);
         sdkOptions.hooks = {
             Notification: [{
                     matcher: '',
@@ -506,6 +745,12 @@ async function queryClaudeSDK(command, options = {}, ws, context) {
             if (decision.cancelled) {
                 return { behavior: 'deny', message: 'Permission request cancelled' };
             }
+            // A client answered. Announce it on the run stream so the replay buffer
+            // and every other attached tab drop the prompt — resolving happens over
+            // the inbound socket only, so without this a mid-run page refresh
+            // replays the `permission_request` with nothing to retract it and the
+            // already-answered prompt resurrects.
+            ws.send(createNormalizedMessage({ kind: 'permission_resolved', requestId, sessionId: capturedSessionId || sessionId || null, provider: 'claude' }));
             if (decision.allow) {
                 if (decision.rememberEntry && typeof decision.rememberEntry === 'string') {
                     if (!sdkOptions.allowedTools.includes(decision.rememberEntry)) {
@@ -519,10 +764,11 @@ async function queryClaudeSDK(command, options = {}, ws, context) {
             }
             return { behavior: 'deny', message: decision.message ?? 'User denied tool use' };
         };
-        let queryInstance;
+        let heldPrompt = createHeldPromptStream(promptMessages);
+        releasePromptStream = heldPrompt.release;
         try {
             queryInstance = query({
-                prompt: await createPrompt(),
+                prompt: heldPrompt.stream,
                 options: sdkOptions
             });
         }
@@ -531,14 +777,18 @@ async function queryClaudeSDK(command, options = {}, ws, context) {
             // Keep notification behavior operational via runtime events even if hook registration fails.
             console.warn('Failed to initialize Claude query with hooks, retrying without hooks:', hookError?.message || hookError);
             delete sdkOptions.hooks;
+            // Discard the abandoned stream and build a fresh one for the retry.
+            heldPrompt.release();
+            heldPrompt = createHeldPromptStream(promptMessages);
+            releasePromptStream = heldPrompt.release;
             queryInstance = query({
-                prompt: await createPrompt(),
+                prompt: heldPrompt.stream,
                 options: sdkOptions
             });
         }
         // Track the query instance for abort capability
         if (sessionKey()) {
-            addSession(sessionKey(), queryInstance, ws);
+            addSession(sessionKey(), queryInstance, ws, releasePromptStream);
         }
         // Process streaming messages
         console.log('Starting async generator loop for session:', capturedSessionId || 'NEW');
@@ -546,7 +796,7 @@ async function queryClaudeSDK(command, options = {}, ws, context) {
             // Capture session ID from first message
             if (message.session_id && !capturedSessionId) {
                 capturedSessionId = message.session_id;
-                addSession(sessionKey(), queryInstance, ws);
+                addSession(sessionKey(), queryInstance, ws, releasePromptStream);
                 // Set session ID on writer
                 if (ws.setSessionId && typeof ws.setSessionId === 'function') {
                     ws.setSessionId(capturedSessionId);
@@ -570,39 +820,109 @@ async function queryClaudeSDK(command, options = {}, ws, context) {
                 if (transformedMessage.parentToolUseId && !msg.parentToolUseId) {
                     msg.parentToolUseId = transformedMessage.parentToolUseId;
                 }
+                if (isSubagentPromptEcho(msg)) {
+                    continue;
+                }
                 ws.send(msg);
             }
-            // Extract and send token budget updates from assistant/result usage payloads
-            const tokenBudgetData = extractTokenBudget(message);
+            // Extract and send token budget updates from assistant usage payloads,
+            // falling back to the turn's cumulative bill only for SDK builds that
+            // report no per-assistant usage at all.
+            const tokenBudgetData = extractTokenBudget(message)
+                || (assistantBudgetSent ? null : extractCumulativeTokenBudget(message));
             if (tokenBudgetData) {
+                if (message.type === 'assistant') {
+                    assistantBudgetSent = true;
+                }
                 ws.send(createNormalizedMessage({ kind: 'status', text: 'token_budget', tokenBudget: tokenBudgetData, sessionId: capturedSessionId || sessionId || null, provider: 'claude' }));
             }
+            if (startsBackgroundWork(message)) {
+                backgroundWorkPending = true;
+            }
+            if (message.type === 'result') {
+                // The turn is done as far as the client is concerned.
+                const abortPending = sessionKey() ? abortedSessionIds.has(sessionKey()) : false;
+                if (!turnCompleteSent && !abortPending) {
+                    turnCompleteSent = true;
+                    ws.send(createCompleteMessage({ provider: 'claude', sessionId: capturedSessionId || sessionId || null, exitCode: 0 }));
+                    notifyRunStopped({
+                        userId: ws?.userId || null,
+                        provider: 'claude',
+                        sessionId: sessionId || capturedSessionId || null,
+                        sessionName: sessionSummary,
+                        stopReason: 'completed'
+                    });
+                }
+                else if (heldForBackgroundWork && !abortPending) {
+                    // A result after the turn already reported complete means the work we
+                    // held the process open for has finished and pushed a follow-up turn.
+                    notifyBackgroundWorkCompleted({
+                        userId: ws?.userId || null,
+                        provider: 'claude',
+                        sessionId: sessionId || capturedSessionId || null,
+                        sessionName: sessionSummary
+                    });
+                }
+                if (backgroundWorkPending) {
+                    // Work started during this turn is still running. Hold the process
+                    // open so it can finish and report back in a follow-up turn; the
+                    // ceiling is only a backstop for work that never reports.
+                    backgroundWorkPending = false;
+                    heldForBackgroundWork = true;
+                    scheduleRelease();
+                }
+                else {
+                    // Either nothing was backgrounded, or the background work just
+                    // reported in — let the CLI exit now, as it always has.
+                    heldForBackgroundWork = false;
+                    releasePromptStream();
+                }
+            }
+            else if (idleReleaseTimer) {
+                // Background activity after the turn — push the countdown back out.
+                scheduleRelease();
+            }
         }
-        // Clean up session on completion
-        if (sessionKey()) {
+        // Clean up session on completion — only while this run still owns the map
+        // entry. A superseding run may have replaced it, and deleting here would
+        // strand that run.
+        if (sessionKey() && getSession(sessionKey())?.instance === queryInstance) {
             removeSession(sessionKey());
         }
+        // A superseded run winds down silently: the map entry, the abort flag,
+        // and all client-facing events belong to the run that replaced it.
+        const superseded = supersededInstances.has(queryInstance);
         // Send the terminal completion event — skipped for aborted runs, whose
-        // terminal `complete` (aborted: true) was already sent by abort-session.
-        const wasAborted = sessionKey() ? abortedSessionIds.delete(sessionKey()) : false;
-        if (!wasAborted) {
-            ws.send(createCompleteMessage({ provider: 'claude', sessionId: capturedSessionId || sessionId || null, exitCode: 0 }));
+        // terminal `complete` (aborted: true) was already sent by abort-session, and
+        // for runs that already reported completion when their `result` arrived.
+        const wasAborted = !superseded && sessionKey() ? abortedSessionIds.delete(sessionKey()) : false;
+        if (!turnCompleteSent && !superseded) {
+            turnCompleteSent = true;
+            if (!wasAborted) {
+                ws.send(createCompleteMessage({ provider: 'claude', sessionId: capturedSessionId || sessionId || null, exitCode: 0 }));
+            }
+            notifyRunStopped({
+                userId: ws?.userId || null,
+                provider: 'claude',
+                sessionId: sessionId || capturedSessionId || null,
+                sessionName: sessionSummary,
+                stopReason: wasAborted ? 'aborted' : 'completed'
+            });
         }
-        notifyRunStopped({
-            userId: ws?.userId || null,
-            provider: 'claude',
-            sessionId: sessionId || capturedSessionId || null,
-            sessionName: sessionSummary,
-            stopReason: wasAborted ? 'aborted' : 'completed'
-        });
         // Complete
     }
     catch (error) {
         console.error('SDK query error:', error);
-        // Clean up session on error
-        if (sessionKey()) {
+        // Clean up session on error — only while this run still owns the map entry
+        // (a superseding run may have replaced it).
+        if (sessionKey() && getSession(sessionKey())?.instance === queryInstance) {
             removeSession(sessionKey());
         }
+        if (supersededInstances.has(queryInstance)) {
+            // Interrupted because a newer run took over this session id; that run
+            // owns the abort flag and all further client-facing events.
+            return;
+        }
         const wasAborted = sessionKey() ? abortedSessionIds.delete(sessionKey()) : false;
         if (wasAborted) {
             // The abort already produced the terminal complete; a generator throw
@@ -614,9 +934,13 @@ async function queryClaudeSDK(command, options = {}, ws, context) {
         const errorContent = !installed
             ? 'Claude Code is not installed. Please install it first: https://docs.anthropic.com/en/docs/claude-code'
             : error.message;
-        // Send error to WebSocket, then the terminal complete
+        // Send error to WebSocket, then the terminal complete. A run that already
+        // reported completion and then failed during its post-turn hold still
+        // surfaces the error, but must not emit a second terminal complete.
         ws.send(createNormalizedMessage({ kind: 'error', content: errorContent, sessionId: capturedSessionId || sessionId || null, provider: 'claude' }));
-        ws.send(createCompleteMessage({ provider: 'claude', sessionId: capturedSessionId || sessionId || null, exitCode: 1 }));
+        if (!turnCompleteSent) {
+            ws.send(createCompleteMessage({ provider: 'claude', sessionId: capturedSessionId || sessionId || null, exitCode: 1 }));
+        }
         notifyRunFailed({
             userId: ws?.userId || null,
             provider: 'claude',
@@ -625,6 +949,15 @@ async function queryClaudeSDK(command, options = {}, ws, context) {
             error
         });
     }
+    finally {
+        // Always close stdin — otherwise an aborted or failed run leaves the CLI
+        // process (and its MCP servers) alive until the server exits.
+        if (idleReleaseTimer) {
+            clearTimeout(idleReleaseTimer);
+            idleReleaseTimer = null;
+        }
+        releasePromptStream();
+    }
 }
 /**
  * Aborts an active SDK session
@@ -644,6 +977,9 @@ async function abortClaudeSDKSession(sessionId) {
         abortedSessionIds.add(sessionId);
         // Call interrupt() on the query instance
         await session.instance.interrupt();
+        // Release the held stdin stream; without this the CLI stays up for the rest
+        // of the post-turn hold even though the user cancelled.
+        session.releaseInput?.();
         // Update session status
         session.status = 'aborted';
         // Clean up session
@@ -718,5 +1054,5 @@ export const claudeRuntime = {
     },
 };
 // Export public API
-export { queryClaudeSDK, abortClaudeSDKSession, isClaudeSDKSessionActive, getActiveClaudeSDKSessions, resolveToolApproval, getPendingApprovalsForSession, reconnectSessionWriter };
+export { queryClaudeSDK, abortClaudeSDKSession, isClaudeSDKSessionActive, getActiveClaudeSDKSessions, resolveToolApproval, getPendingApprovalsForSession, reconnectSessionWriter, extractTokenBudget, extractCumulativeTokenBudget };
 //# sourceMappingURL=claude-runtime.provider.js.map