@cloudcli-ai/cloudcli 1.37.0 → 1.37.2

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

@@ -1,12 +1,12 @@
 import { readFile } from 'node:fs/promises';
 import { sessionsDb } from '../../../../modules/database/index.js';
 import { buildDefaultProviderCurrentActiveModel } from '../../../../shared/utils.js';
-export const CLAUDE_FALLBACK_MODELS = {
+export const CLAUDE_PREDEFINED_MODELS = {
     OPTIONS: [
         {
             value: 'default',
             label: 'Default (recommended)',
-            description: 'Use the Claude Code default model (currently Sonnet 4.6)',
+            description: 'Use the recommended model for your Claude account and deployment.',
             effort: {
                 default: 'high',
                 values: [
@@ -17,10 +17,25 @@ export const CLAUDE_FALLBACK_MODELS = {
                 ],
             },
         },
+        {
+            value: 'best',
+            label: 'Best available',
+            description: 'Use Fable 5 when available, otherwise the latest Opus model.',
+            effort: {
+                default: 'high',
+                values: [
+                    { value: 'low' },
+                    { value: 'medium' },
+                    { value: 'high' },
+                    { value: 'xhigh' },
+                    { value: 'max' },
+                ],
+            },
+        },
         {
             value: 'fable',
-            label: 'Fable',
-            description: 'Fable 5 · Most capable for your hardest and longest-running tasks · Uses your limits ~2× faster than Opus',
+            label: 'Fable 5',
+            description: 'Most capable Claude model for the hardest, longest-running tasks.',
             effort: {
                 default: 'high',
                 values: [
@@ -33,15 +48,16 @@ export const CLAUDE_FALLBACK_MODELS = {
             },
         },
         {
-            value: "sonnet",
-            label: "Sonnet",
-            description: "Sonnet 4.6 · Best for everyday tasks · $3/$15 per Mtok",
+            value: 'sonnet',
+            label: 'Sonnet',
+            description: 'Latest Sonnet model for everyday coding tasks.',
             effort: {
                 default: 'high',
                 values: [
                     { value: 'low' },
                     { value: 'medium' },
                     { value: 'high' },
+                    { value: 'xhigh' },
                     { value: 'max' },
                 ],
             },
@@ -49,13 +65,14 @@ export const CLAUDE_FALLBACK_MODELS = {
         {
             value: 'sonnet[1m]',
             label: 'Sonnet (1M context)',
-            description: 'Sonnet 4.6 for long sessions · $3/$15 per Mtok',
+            description: 'Latest Sonnet model with a 1M context window.',
             effort: {
                 default: 'high',
                 values: [
                     { value: 'low' },
                     { value: 'medium' },
                     { value: 'high' },
+                    { value: 'xhigh' },
                     { value: 'max' },
                 ],
             },
@@ -63,7 +80,7 @@ export const CLAUDE_FALLBACK_MODELS = {
         {
             value: 'opus',
             label: 'Opus',
-            description: 'Opus 4.8 · Best for everyday, complex tasks · ~2× usage vs Sonnet',
+            description: 'Latest Opus model for complex reasoning and coding tasks.',
             effort: {
                 default: 'high',
                 values: [
@@ -77,8 +94,8 @@ export const CLAUDE_FALLBACK_MODELS = {
         },
         {
             value: 'opus[1m]',
-            label: 'Opus 4.8 (1M context)',
-            description: 'Opus 4.8 with 1M context · Most capable for complex work · $5/$25 per Mtok',
+            label: 'Opus (1M context)',
+            description: 'Latest Opus model with a 1M context window.',
             effort: {
                 default: 'high',
                 values: [
@@ -93,7 +110,22 @@ export const CLAUDE_FALLBACK_MODELS = {
         {
             value: 'haiku',
             label: 'Haiku',
-            description: 'Haiku 4.5 · Fastest for quick answers · $1/$5 per Mtok',
+            description: 'Fast and efficient Claude model for simple tasks.',
+        },
+        {
+            value: 'opusplan',
+            label: 'Opus Plan',
+            description: 'Use Opus while planning, then switch to Sonnet for execution.',
+            effort: {
+                default: 'high',
+                values: [
+                    { value: 'low' },
+                    { value: 'medium' },
+                    { value: 'high' },
+                    { value: 'xhigh' },
+                    { value: 'max' },
+                ],
+            },
         },
     ],
     DEFAULT: 'default',
@@ -103,7 +135,7 @@ export const findClaudeModelOption = (model) => {
     if (!normalizedModel) {
         return null;
     }
-    return CLAUDE_FALLBACK_MODELS.OPTIONS.find((option) => option.value === normalizedModel) ?? null;
+    return CLAUDE_PREDEFINED_MODELS.OPTIONS.find((option) => option.value === normalizedModel) ?? null;
 };
 const ANSI_PATTERN = new RegExp('[\\u001B\\u009B][[\\]()#;?]*(?:'
     + '(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]'
@@ -193,7 +225,7 @@ export class ClaudeProviderModels {
         // const supportedModels = await queryInstance.supportedModels();
         // queryInstance.close();
         // return buildClaudeModelsDefinition(supportedModels);
-        return CLAUDE_FALLBACK_MODELS;
+        return CLAUDE_PREDEFINED_MODELS;
     }
     async getCurrentActiveModel(sessionId) {
         if (!sessionId?.trim()) {

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

@@ -1 +1 @@
-{"version":3,"file":"claude-models.provider.js","sourceRoot":"","sources":["../../../../../../server/modules/providers/list/claude/claude-models.provider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"claude-models.provider.js","sourceRoot":"","sources":["../../../../../../server/modules/providers/list/claude/claude-models.provider.ts"],"names":[],"mappings":"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"}

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_FALLBACK_MODELS } from '../../../../modules/providers/list/claude/claude-models.provider.js';
+import { CLAUDE_PREDEFINED_MODELS } 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,9 +27,31 @@ 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']);
-function resolveClaudeEffort(model, effort, modelsDefinition = CLAUDE_FALLBACK_MODELS) {
+function resolveClaudeEffort(model, effort, modelsDefinition = CLAUDE_PREDEFINED_MODELS) {
     const selectedModel = modelsDefinition?.OPTIONS?.find((option) => option.value === model) || null;
     const allowedEfforts = selectedModel?.effort?.values
         ?.map((value) => value.value) || [];
@@ -131,7 +153,7 @@ function mapCliOptionsToSDK(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.
-    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);
@@ -164,8 +186,8 @@ function mapCliOptionsToSDK(options = {}) {
     // but being explicit ensures forward compatibility and clarity.
     sdkOptions.tools = { type: 'preset', preset: 'claude_code' };
     sdkOptions.disallowedTools = settings.disallowedTools || [];
-    sdkOptions.model = options.model || CLAUDE_FALLBACK_MODELS.DEFAULT;
-    const resolvedEffort = resolveClaudeEffort(sdkOptions.model, effort, options.effortModels || CLAUDE_FALLBACK_MODELS);
+    sdkOptions.model = options.model || CLAUDE_PREDEFINED_MODELS.DEFAULT;
+    const resolvedEffort = resolveClaudeEffort(sdkOptions.model, effort, options.effortModels || CLAUDE_PREDEFINED_MODELS);
     if (resolvedEffort) {
         sdkOptions.effort = resolvedEffort;
     }
@@ -185,13 +207,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
     });
 }
 /**
@@ -294,28 +338,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',
@@ -323,8 +394,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
@@ -406,9 +499,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;
+    // 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_FALLBACK_MODELS;
+        let effortModels = CLAUDE_PREDEFINED_MODELS;
         try {
             effortModels = await context.getProviderModels();
         }
@@ -425,10 +552,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: '',
@@ -516,13 +643,11 @@ async function queryClaudeSDK(command, options = {}, ws, context) {
             }
             return { behavior: 'deny', message: decision.message ?? 'User denied tool use' };
         };
-        // Query constructor reads this synchronously.
-        const prevStreamTimeout = process.env.CLAUDE_CODE_STREAM_CLOSE_TIMEOUT;
-        process.env.CLAUDE_CODE_STREAM_CLOSE_TIMEOUT = '300000';
-        let queryInstance;
+        let heldPrompt = createHeldPromptStream(promptMessages);
+        releasePromptStream = heldPrompt.release;
         try {
             queryInstance = query({
-                prompt: await createPrompt(),
+                prompt: heldPrompt.stream,
                 options: sdkOptions
             });
         }
@@ -531,21 +656,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
             });
         }
-        // Restore immediately — Query constructor already captured the value
-        if (prevStreamTimeout !== undefined) {
-            process.env.CLAUDE_CODE_STREAM_CLOSE_TIMEOUT = prevStreamTimeout;
-        }
-        else {
-            delete process.env.CLAUDE_CODE_STREAM_CLOSE_TIMEOUT;
-        }
         // 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');
@@ -553,7 +675,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);
@@ -584,32 +706,93 @@ async function queryClaudeSDK(command, options = {}, ws, context) {
             if (tokenBudgetData) {
                 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
@@ -621,9 +804,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',
@@ -632,6 +819,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
@@ -651,6 +847,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