@yu_robotics/remote-cli 1.6.169 → 1.6.173

package/README.md

@@ -20,8 +20,6 @@ Router 1.6.117 and newer explicitly label standalone background-task notificatio
 
 ## Public Activity
 
-From Router 1.6.169, reply-card thread lists start collapsed. Use **Show threads** to expand the list in the same card, or **Switch to this thread** to select the thread that produced the reply. Opening or hiding the list does not change the input target; a successful switch hides the list and confirms the new target without changing the reply's source label. No separate thread-management card is sent. The recursive element budget is 180 instead of 150, with room reserved for the expanded controls; table and size thresholds are unchanged. This presentation update requires the newer Router, not a new CLI protocol capability.
-
 From Router 1.6.158, completion pagination keeps the final body item (or complete worker group) with the completion note, optional model metadata and thread controls when they fit together. This avoids preventable footer-only continuations, including replies without model metadata. Indivisible oversized groups still split according to node, size and table limits; thread-button refreshes preserve the final body. This does not change streaming completion timing or the wire protocol.
 
 From CLI 1.6.153, Codex shell calls no longer lose their label when native command actions are absent or unknown. Native reads, searches, and directory listings remain preferred. Other calls use fixed operation labels such as `Run npm command` or `Run Git command` for simple allowlisted programs, and `Run shell command` for compound or unrecognized commands. These are deterministic operation labels, not model-authored purpose summaries: installed Codex 0.160.0 command items have no per-call description field. Arguments, full paths, output, and execution-wide reasoning are never copied into these fallback labels. Late native action metadata can enrich a pending row before its first result; repeated results retain one row. Existing description fields, heading limits, and card-node counts are unchanged; upgrade the CLI, with no new Router capability required.
@@ -80,6 +78,12 @@ The client is normally installed and run directly on the developer's machine rat
 
 Claude tool-result content blocks are normalized to text; embedded media and unknown payloads are not scanned for local files. Local image detection and forwarding are best-effort: failures do not fail the task or terminate the CLI. Web-result excerpts remain excluded from local-file scanning.
 
+CLI and Router 1.6.173 add direct forwarding for recognized successful Codex native image results, MCP image blocks, and dynamic-tool inline images. These images do not require a Markdown link. Native saved-file references use the same local directory policy as Markdown images. Structured extraction does not traverse arbitrary JSON path fields or publish image-view events, and remote URLs are not fetched. Ordinary tool-result text retains local-path detection; shell tools that return only text still need a local path or Markdown image link.
+
+Each reply accepts up to 32 image candidates and displays up to 8 distinct images, with a 2 MiB decoded limit per image. Supported raster formats are checked from their bytes. Local files must pass canonical directory and regular-file checks; denied, missing, invalid, oversized, or timed-out images produce a bounded omission notice while text can still complete. Identical bytes are deduplicated within the reply, including native and Markdown copies; changed bytes at the same path can be displayed again. Reads and uploads have bounded concurrency and waiting times, and late results cannot be attached after cancellation or replacement.
+
+Upgrade both CLI and Router for the complete fix: the CLI discovers and validates images, while the Router waits for admitted uploads before completing the card. The image wire format remains compatible with older image-capable peers, but an older Router retains its upload/finalization race. Delivery is best-effort with no image replay across disconnects; a model saying it sent an image is not a delivery acknowledgement.
+
 Sending local image files requires a Router with image forwarding support and
 the bot application's `im:resource` permission. Router 1.6.85 and newer render
 local and URL-based Markdown image references as captions; the uploaded image
@@ -433,6 +437,21 @@ With CLI 1.6.93 or newer, `/cd` to a different normalized directory clears saved
 
 Thread switch panels show `Reply from:` with the reply's full thread name and workspace. Under `Switch thread`, a check mark (`✓`) and primary button styling identify the destination of new top-level messages when the card is finalized or clicked. Selected buttons remain clickable. Switching updates only the clicked card; other historical cards retain their last displayed selection.
 
+From Router 1.6.171, completed cards keep the thread buttons and **+ New** inside a native Feishu **Switch thread** folding panel, collapsed by default. Click its header to expand or collapse the list without sending a command or changing the input target. The reply-source caption remains visible. Selecting a thread uses the existing routing behavior. Hidden buttons still count toward card limits; unrelated full-card updates can reset the panel to its default collapsed state. This uses the existing Card 2.0 client requirement (Feishu 7.20 or newer).
+
+From CLI 1.6.172, Codex threads support native goals through `/goal` (status), `/goal <objective>` (start), `/goal pause`, `/goal resume`, and `/goal clear`. Start or resume only when the thread and queue are idle, with managed delegation explicitly disabled using `/delegation off`. This initial restriction does not disable Codex's native subagents. Optional `--budget <tokens>` on start or resume sets an explicit positive token budget; omitting it does not invent a budget. For example:
+
+```text
+/delegation off
+/goal --budget 40000 Fix the failing tests and verify the public API stays compatible
+/goal
+/goal pause
+/goal resume
+/goal clear
+```
+
+Codex owns the persisted goal and automatic continuations; remote-cli keeps the execution card, approvals, and busy-state reservation across native turns. Status, pause, clear, and `/abort` remain available during work. Pause and clear stop current goal work; `/abort` pauses the goal, while clear removes the goal without clearing the conversation. After process loss, inspect with `/goal` and explicitly recover with `/goal resume`; status queries do not load or start the goal. Send attachments in an ordinary message before starting a goal. Use a Codex build exposing the native thread-goal APIs (verified with 0.163.0); unavailable APIs or disabled goals report an error. Other backends reject `/goal`. See [the native goal API](https://learn.chatgpt.com/docs/app-server#manage-a-thread-goal).
+
 With a CLI and Router that support queue-start notifications, confirming a message keeps a static queue receipt. When the task actually starts, a new execution card appears at the bottom of the chat with its thread, working directory, task preview, and remaining queue count. Progress and results stay on that new card, and the old receipt points to it. Older clients retain the waiting-card behavior. Queued work remains in memory; this does not make queues persistent across service restarts.
 
 When a thread is busy, ordinary messages require confirmation before they enter its queue. Use `/queue` to inspect pending work, `/queue clear` to discard queued messages, and `/abort` to stop the active task and clear that thread's queue. A message received during abort cleanup waits and starts after the backend is safe to reuse. A backend failure in the active task still advances to the first confirmed queued message; a failure in a task taken from the queue pauses the remaining queue. Context-changing commands such as `/model`, `/effort`, `/cd`, `/compact`, `/clear`, and its `/new` alias are handled separately rather than queued as ordinary messages. Feishu thread buttons show automatic names such as `thread-2` as their sequence number, such as `2`; routing continues to use the full internal name. Continuation cards repeat the thread and working-directory header of the original card.

package/dist/client/GoalCommand.d.ts

@@ -0,0 +1,15 @@
+import type { ExecutorGoal, ExecutorGoalRunRequest } from '../executor/IExecutor';
+export declare const GOAL_USAGE: string;
+export type GoalCommand = {
+    kind: 'show' | 'pause' | 'clear' | 'help';
+} | {
+    kind: 'run';
+    request: ExecutorGoalRunRequest;
+} | {
+    kind: 'invalid';
+    error: string;
+};
+/** Parse before approval/input routing so control commands never answer a tool prompt. */
+export declare function parseGoalCommand(content: string): GoalCommand | undefined;
+export declare function formatGoal(goal: ExecutorGoal | null): string;
+//# sourceMappingURL=GoalCommand.d.ts.map

package/dist/client/GoalCommand.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"GoalCommand.d.ts","sourceRoot":"","sources":["../../src/client/GoalCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAElF,eAAO,MAAM,UAAU,QAMX,CAAC;AAEb,MAAM,MAAM,WAAW,GACnB;IAAE,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,GAAG,MAAM,CAAA;CAAE,GAC7C;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,OAAO,EAAE,sBAAsB,CAAA;CAAE,GAChD;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEvC,0FAA0F;AAC1F,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS,CA6BzE;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI,GAAG,MAAM,CAU5D"}

package/dist/client/GoalCommand.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GOAL_USAGE = void 0;
+exports.parseGoalCommand = parseGoalCommand;
+exports.formatGoal = formatGoal;
+exports.GOAL_USAGE = [
+    '/goal - Show the current Codex goal',
+    '/goal [--budget <tokens>] <objective> - Start a native goal',
+    '/goal pause - Pause the goal and stop its current work',
+    '/goal resume [--budget <tokens>] - Resume the existing goal',
+    '/goal clear - Remove the goal and stop its current work',
+].join('\n');
+/** Parse before approval/input routing so control commands never answer a tool prompt. */
+function parseGoalCommand(content) {
+    const match = /^\/goal(?:\s+([\s\S]*))?$/.exec(content.trim());
+    if (!match)
+        return undefined;
+    const argument = (match[1] ?? '').trim();
+    if (!argument || argument === 'status')
+        return { kind: 'show' };
+    if (argument === 'pause' || argument === 'clear' || argument === 'help')
+        return { kind: argument };
+    const resume = /^resume(?:\s|$)/.test(argument);
+    let objective = resume ? argument.slice('resume'.length).trim() : argument;
+    let tokenBudget;
+    if (/^--budget(?:\s|$)/.test(objective)) {
+        const budget = /^--budget\s+([0-9]+)(?:\s+([\s\S]*))?$/.exec(objective);
+        if (!budget || !Number.isSafeInteger(Number(budget[1])) || Number(budget[1]) <= 0) {
+            return { kind: 'invalid', error: 'Goal token budget must be a positive safe integer.\n' + exports.GOAL_USAGE };
+        }
+        tokenBudget = Number(budget[1]);
+        objective = (budget[2] ?? '').trim();
+    }
+    if (resume) {
+        if (objective)
+            return { kind: 'invalid', error: 'Resume does not accept a new objective.\n' + exports.GOAL_USAGE };
+        return { kind: 'run', request: tokenBudget === undefined ? {} : { tokenBudget } };
+    }
+    if (!objective || objective.startsWith('--') || /^(?:pause|clear|status|help)(?:\s|$)/.test(objective)) {
+        return { kind: 'invalid', error: 'Invalid goal command.\n' + exports.GOAL_USAGE };
+    }
+    if (Array.from(objective).length > 4000) {
+        return { kind: 'invalid', error: 'Goal objectives must contain at most 4,000 characters.' };
+    }
+    return { kind: 'run', request: { objective, ...(tokenBudget === undefined ? {} : { tokenBudget }) } };
+}
+function formatGoal(goal) {
+    if (!goal)
+        return 'No Codex goal is set for this thread.\n\n' + exports.GOAL_USAGE;
+    return [
+        'Codex goal',
+        `Objective: ${goal.objective}`,
+        `Status: ${goal.status}`,
+        `Tokens used: ${goal.tokensUsed}${goal.tokenBudget === null ? ' (no explicit budget)' : ` / ${goal.tokenBudget}`}`,
+        `Active time: ${goal.timeUsedSeconds}s`,
+        '', exports.GOAL_USAGE,
+    ].join('\n');
+}
+//# sourceMappingURL=GoalCommand.js.map

package/dist/client/GoalCommand.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GoalCommand.js","sourceRoot":"","sources":["../../src/client/GoalCommand.ts"],"names":[],"mappings":"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"}

package/dist/client/MessageHandler.d.ts

@@ -34,6 +34,7 @@ export declare class MessageHandler {
     private readonly sessionControl;
     private readonly activeThreadOperations;
     private readonly abortOperations;
+    private readonly pendingGoalActivations;
     private automaticUpdateInProgress;
     private approvalCardsSupported;
     private streamingContextSupported;
@@ -53,6 +54,8 @@ export declare class MessageHandler {
     private readonly delegation;
     private readonly delegationBridges;
     private fileInbox?;
+    private readonly imageDeliveries;
+    private imageConnectionEpoch;
     constructor(wsClient: WebSocketClient, threadPool: ThreadExecutorPool, threadManager: ThreadManager, directoryGuard: DirectoryGuard, config: ConfigManager);
     reconcilePendingDelegatedWorkers(): Promise<void>;
     /**

package/dist/client/MessageHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MessageHandler.d.ts","sourceRoot":"","sources":["../../src/client/MessageHandler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"MessageHandler.d.ts","sourceRoot":"","sources":["../../src/client/MessageHandler.ts"],"names":[],"mappings":"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"}

package/dist/client/MessageHandler.js

@@ -12,9 +12,11 @@ const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const DelegationSettings_1 = require("../thread/DelegationSettings");
+const GoalCommand_1 = require("./GoalCommand");
 const hooks_1 = require("../hooks");
 const FileReadDetector_1 = require("../utils/FileReadDetector");
 const LocalImageDetector_1 = require("../utils/LocalImageDetector");
+const ImageDelivery_1 = require("../utils/ImageDelivery");
 const WorkingDirectory_1 = require("../utils/WorkingDirectory");
 const MachineCommands_1 = require("../machines/MachineCommands");
 const child_process_1 = require("child_process");
@@ -167,6 +169,7 @@ class MessageHandler {
     });
     activeThreadOperations = new Map();
     abortOperations = new Map();
+    pendingGoalActivations = new Map();
     automaticUpdateInProgress = false;
     approvalCardsSupported = false;
     streamingContextSupported = false;
@@ -186,6 +189,8 @@ class MessageHandler {
     delegation;
     delegationBridges = new Map();
     fileInbox;
+    imageDeliveries = new Map();
+    imageConnectionEpoch = 0;
     constructor(wsClient, threadPool, threadManager, directoryGuard, config) {
         this.wsClient = wsClient;
         this.threadPool = threadPool;
@@ -193,8 +198,11 @@ class MessageHandler {
         this.directoryGuard = directoryGuard;
         this.config = config;
         this.wsClient.onClose?.(() => {
+            this.imageConnectionEpoch++;
             this.routerVersion = undefined;
             this.fileInbox?.disconnect();
+            for (const delivery of this.imageDeliveries.values())
+                delivery.invalidatePending();
         });
         this.delegation = new DelegationManager_1.DelegationManager(directoryGuard);
         this.settingsCatalogReader = new SettingsCatalog_1.SettingsCatalogReader(directoryGuard);
@@ -525,6 +533,53 @@ class MessageHandler {
         }
         const executor = this.threadPool.getExecutor(resolvedThreadId);
         this.sendStreamContext(messageId, resolvedThreadId, executor);
+        const goalCommand = (0, GoalCommand_1.parseGoalCommand)(settingsCommand);
+        let goalRequest;
+        if (goalCommand) {
+            if (goalCommand.kind === 'invalid' || goalCommand.kind === 'help') {
+                this.sendResponse(messageId, resolvedThreadId, goalCommand.kind === 'invalid'
+                    ? { success: false, error: goalCommand.error } : { success: true, output: GoalCommand_1.GOAL_USAGE });
+                return;
+            }
+            if (this.threadPool.getBackendKey(resolvedThreadId) !== 'codex'
+                || !executor.getGoal || !executor.executeGoal || !executor.pauseGoal || !executor.clearGoal) {
+                this.sendResponse(messageId, resolvedThreadId, { success: false,
+                    error: '/goal requires the Codex app-server backend and an executor version with native goal support.' });
+                return;
+            }
+            if (attachments?.length || message.fileIds?.length) {
+                this.sendResponse(messageId, resolvedThreadId, { success: false,
+                    error: 'Send attachments in a normal message before starting a goal. No goal was changed.' });
+                return;
+            }
+            if (goalCommand.kind !== 'run') {
+                try {
+                    const pending = this.pendingGoalActivations.get(resolvedThreadId);
+                    if (pending && goalCommand.kind !== 'show')
+                        pending.cancelled = true;
+                    const result = goalCommand.kind === 'show' ? { success: true, output: (0, GoalCommand_1.formatGoal)(await executor.getGoal()) }
+                        : goalCommand.kind === 'pause' ? await executor.pauseGoal() : await executor.clearGoal();
+                    this.sendResponse(messageId, resolvedThreadId, { ...result, threads: this.threadPool.getSummaries() });
+                }
+                catch (error) {
+                    this.sendResponse(messageId, resolvedThreadId, { success: false,
+                        error: `Goal control failed: ${error instanceof Error ? error.message : String(error)}` });
+                }
+                return;
+            }
+            if ((0, DelegationSettings_1.isDelegationEnabled)(thread) || this.delegation.hasActiveTasks(resolvedThreadId)) {
+                this.sendResponse(messageId, resolvedThreadId, { success: false,
+                    error: 'Native goals require managed delegation to be off. Wait for workers to finish and send /delegation off in this thread, then retry /goal.' });
+                return;
+            }
+            if (this.threadPool.isThreadBusy(resolvedThreadId) || executor.isBusy?.()
+                || this.hasThreadQueueState(resolvedThreadId) || this.abortOperations.has(resolvedThreadId)) {
+                this.sendResponse(messageId, resolvedThreadId, { success: false,
+                    error: 'Start or resume a goal only when this thread and its queue are idle. Use /goal pause or /abort to stop current goal work.' });
+                return;
+            }
+            goalRequest = goalCommand.request;
+        }
         // Handle /abort for this specific thread (bypasses busy check)
         if (content?.trim() === '/abort') {
             await this.handleAbortCommand(messageId, resolvedThreadId, executor);
@@ -594,7 +649,7 @@ class MessageHandler {
             return;
         }
         const inputExecutor = this.delegation.waitingExecutor(resolvedThreadId) ?? executor;
-        if ('isWaitingInput' in inputExecutor && typeof inputExecutor.isWaitingInput === 'function') {
+        if (!goalRequest && 'isWaitingInput' in inputExecutor && typeof inputExecutor.isWaitingInput === 'function') {
             const ex = inputExecutor;
             if (ex.isWaitingInput()) {
                 const input = content?.trim();
@@ -682,6 +737,9 @@ class MessageHandler {
             });
             return;
         }
+        const goalActivation = goalRequest ? { cancelled: false } : undefined;
+        if (goalActivation)
+            this.pendingGoalActivations.set(resolvedThreadId, goalActivation);
         const operationToken = this.beginThreadOperation(resolvedThreadId);
         try {
             this.trackTask(messageId, resolvedThreadId, content || '');
@@ -716,6 +774,10 @@ class MessageHandler {
                 await this.executePendingReplace(messageId, resolvedThreadId, pendingKey, content);
                 return;
             }
+            if (goalRequest) {
+                await this.executeCommand(messageId, resolvedThreadId, content, executor, undefined, false, goalRequest, goalActivation);
+                return;
+            }
             const builtInResult = await this.handleBuiltInCommand(messageId, resolvedThreadId, content, executor);
             if (builtInResult)
                 return;
@@ -736,6 +798,9 @@ class MessageHandler {
             });
         }
         finally {
+            if (goalActivation && this.pendingGoalActivations.get(resolvedThreadId) === goalActivation) {
+                this.pendingGoalActivations.delete(resolvedThreadId);
+            }
             if (this.finishThreadOperation(resolvedThreadId, operationToken) && !this.pausedQueues.has(resolvedThreadId)) {
                 void this.startNextQueuedCommand(resolvedThreadId);
             }
@@ -746,9 +811,20 @@ class MessageHandler {
      */
     async handleAbortCommand(messageId, threadId, executor) {
         this.fileInbox?.cancelThread(threadId);
+        this.imageDeliveries.get(threadId)?.cancel();
+        const pendingGoal = this.pendingGoalActivations.get(threadId);
+        if (pendingGoal)
+            pendingGoal.cancelled = true;
         const existingAbort = this.abortOperations.get(threadId);
         if (existingAbort) {
             await existingAbort;
+            if (executor.isGoalRunning?.()) {
+                this.sendResponse(messageId, threadId, {
+                    success: false,
+                    error: 'Native goal stop could not be confirmed. This thread remains busy; retry /goal pause or /abort.',
+                });
+                return;
+            }
             this.sendResponse(messageId, threadId, {
                 success: true,
                 output: 'ℹ️ The abort operation has already completed.',
@@ -763,6 +839,9 @@ class MessageHandler {
             if ((0, DelegationSettings_1.isDelegationEnabled)(this.threadManager.getThread(threadId)))
                 await this.delegation.cancelThread(threadId);
             aborted = await executor.abort();
+            if (!aborted && executor.isGoalRunning?.()) {
+                throw new Error('Native goal stop could not be confirmed. This thread remains busy; retry /goal pause or /abort.');
+            }
             if (activeOperation)
                 await activeOperation.done;
         })();
@@ -1051,6 +1130,7 @@ Use /compact to reduce conversation context or /clear to start a fresh context.`
 - /cd <directory> - Change working directory for this thread
 - /model [name] - Open model settings, or set the active backend model with a text argument
 - /effort [auto|level] - Open effort settings, or set a native supported level with a text argument
+- /goal [objective|pause|resume|clear] - Manage a native Codex goal; optional --budget <tokens> on start or resume
 - /sandbox [on|off|read-only|default|allow <directory>|remove <directory>|network on|off] - Configure this thread's sandbox (Codex, Claude Code)
 - /delegation [on|off|reset [backend]] - Delegate tasks between installed agent backends; reset saved worker context when needed
 - /backend - Open backend settings (Current thread by default; Confirm applies)
@@ -2010,12 +2090,13 @@ You can also use natural language commands to control Claude Code CLI.`,
     /**
      * Execute AI command on a specific executor
      */
-    async executeCommand(messageId, threadId, content, executor, attachments, fromQueue = false) {
+    async executeCommand(messageId, threadId, content, executor, attachments, fromQueue = false, goalRequest, goalActivation) {
         this.sendStreamContext(messageId, threadId, executor);
         let delegationScope;
         let delegationBridge;
         let executionMetadata;
         let requestFinished = false;
+        let imageDelivery;
         let executionActive = false;
         let lastProgramState;
         const activity = new ActivityProgress_1.ActivityProgress(snapshot => {
@@ -2040,6 +2121,9 @@ You can also use natural language commands to control Claude Code CLI.`,
                 lastProgramState = text;
         };
         const complete = async (success, error) => {
+            await imageDelivery?.finish();
+            if (this.imageDeliveries.get(threadId) === imageDelivery)
+                this.imageDeliveries.delete(threadId);
             requestFinished = true;
             activity.dispose();
             delegationBridge?.activate(undefined);
@@ -2079,6 +2163,9 @@ You can also use natural language commands to control Claude Code CLI.`,
             }
             const openId = this.getMessageOpenId(messageId);
             const thread = this.threadManager.getThread(threadId);
+            if (goalRequest && thread && (0, DelegationSettings_1.isDelegationEnabled)(thread)) {
+                throw new Error('Turn managed delegation off before starting a native goal.');
+            }
             if (thread && (0, DelegationSettings_1.isDelegationEnabled)(thread) && executor.configureDelegation) {
                 if (this.delegation.blocksWorkspace(executor.getCurrentWorkingDirectory(), threadId)) {
                     throw new Error('A delegated worker holds this workspace. Wait for it to finish; if worker cleanup failed, stop the worker and restart the CLI.');
@@ -2133,37 +2220,41 @@ You can also use natural language commands to control Claude Code CLI.`,
                     return;
                 this.notificationAdapter.sendTaskNotification({ ...notification, threadId }, openId);
             };
-            const emittedLocalImages = new Set();
-            const pendingLocalImageEmissions = new Set();
+            const imageCwd = thread?.workingDirectory ?? executor.getCurrentWorkingDirectory();
+            const imageGeneration = thread?.delegationWorkspaceGeneration ?? 0;
+            const imageBackend = this.threadPool.getBackendKey(threadId);
+            let imagePhase = 0;
+            const imageEligible = () => {
+                const phase = imagePhase;
+                return () => phase === imagePhase && (!delegationScope
+                    || (!delegationScope.isClosed() && !delegationScope.hasPendingResults()));
+            };
+            imageDelivery = new ImageDelivery_1.ImageDelivery({
+                readFile: filePath => (0, LocalImageDetector_1.readLocalImagePath)(filePath, imageCwd, this.directoryGuard),
+                publish: image => {
+                    if (!this.sendImage(messageId, threadId, image))
+                        throw new Error('Image send failed');
+                },
+                notice: text => this.sendStreamChunk(messageId, threadId, text),
+                isCurrent: () => {
+                    const current = this.threadManager.getThread(threadId);
+                    return !requestFinished && !this.isDestroyed && !this.abortOperations.has(threadId)
+                        && this.wsClient.isConnected() && this.imageDeliveries.get(threadId) === imageDelivery
+                        && this.wsClient.canSendTaskOutput?.(messageId) !== false
+                        && !!current && current.workingDirectory === imageCwd
+                        && (current.delegationWorkspaceGeneration ?? 0) === imageGeneration
+                        && this.threadPool.getBackendKey(threadId) === imageBackend;
+                },
+            });
+            this.imageDeliveries.get(threadId)?.cancel();
+            this.imageDeliveries.set(threadId, imageDelivery);
             const delegationControlTools = new Set();
             const toolImageStates = new Map();
             const webToolNames = new Set(['websearch', 'webfetch', 'web_search', 'web_fetch', 'search_web', 'read_url_content', 'fetch']);
-            let streamedOutput = '';
-            const emitLocalImages = async (text) => {
-                try {
-                    const thread = this.threadManager.getThread(threadId);
-                    if (typeof text !== 'string' || !text || !thread?.workingDirectory)
-                        return;
-                    const images = await (0, LocalImageDetector_1.readLocalImages)(text, thread.workingDirectory, (candidate, cwd) => (this.directoryGuard.isSafePath(candidate, cwd)));
-                    for (const image of images) {
-                        if (emittedLocalImages.has(image.path))
-                            continue;
-                        emittedLocalImages.add(image.path);
-                        this.sendImage(messageId, threadId, {
-                            type: 'image',
-                            data: image.data,
-                            mimeType: image.mimeType,
-                        });
-                    }
-                }
-                catch {
-                    // Image forwarding is optional; never reject a task or log native content on failure.
-                    console.warn('Failed to forward local images; continuing task output.');
-                }
-            };
+            let streamedAny = false;
+            let imageTextDropped = false;
             const queueLocalImages = (text) => {
-                const pending = emitLocalImages(text).finally(() => pendingLocalImageEmissions.delete(pending));
-                pendingLocalImageEmissions.add(pending);
+                imageDelivery?.offerText(text, imageEligible());
             };
             const executeOptions = {
                 onActivity: this.activityProgressSupported ? (snapshot) => activity.offer(snapshot) : undefined,
@@ -2174,8 +2265,11 @@ You can also use natural language commands to control Claude Code CLI.`,
                 onApprovalResolved: (requestId, status) => this.resolveApprovalCard(requestId, status),
                 onTaskNotification,
                 onStream: (chunk) => {
-                    streamedOutput += chunk;
-                    this.sendStreamChunk(messageId, threadId, chunk);
+                    streamedAny = true;
+                    if (this.sendStreamChunk(messageId, threadId, chunk))
+                        imageDelivery?.offerStream(chunk, imageEligible());
+                    else
+                        imageTextDropped = true;
                 },
                 onToolUse: (toolUse) => {
                     if (delegationScope && /remote_cli_(list_backends|delegate|result|cancel|integrate)$/.test(toolUse.name)) {
@@ -2213,7 +2307,8 @@ You can also use natural language commands to control Claude Code CLI.`,
                 },
                 onRedactedThinking: () => this.sendRedactedThinking(messageId, threadId),
                 onPlanMode: (planContent) => this.sendPlanMode(messageId, threadId, planContent),
-                onImage: (image) => this.sendImage(messageId, threadId, image),
+                onImage: (image) => imageDelivery?.offerImage(image, imageEligible()),
+                onImageFile: (filePath) => imageDelivery?.offerFile(filePath, imageEligible()),
                 attachments,
             };
             const assertCoordinatorActive = () => {
@@ -2225,6 +2320,11 @@ You can also use natural language commands to control Claude Code CLI.`,
             let mayRetry = true;
             const executeOnce = async (prompt, options, flushImages = true) => {
                 assertCoordinatorActive();
+                imagePhase++;
+                streamedAny = false;
+                imageTextDropped = false;
+                imageDelivery?.resetStream();
+                const imageEpoch = this.imageConnectionEpoch;
                 const scope = delegationScope;
                 let active = true;
                 let finished = false;
@@ -2280,6 +2380,10 @@ You can also use natural language commands to control Claude Code CLI.`,
                         options.onImage?.(image);
                     else
                         suppressed = true; },
+                    onImageFile: filePath => { if (canPublish())
+                        options.onImageFile?.(filePath);
+                    else
+                        suppressed = true; },
                     onRedactedThinking: () => { if (canPublish())
                         options.onRedactedThinking?.(); },
                     onToolUse: tool => { if (active && !scope?.isClosed())
@@ -2292,7 +2396,19 @@ You can also use natural language commands to control Claude Code CLI.`,
                 executionMetadata = launchMetadata;
                 let capturedMetadata = false;
                 try {
-                    const result = await executor.execute(prompt, guardedOptions);
+                    if (goalRequest && (goalActivation?.cancelled || this.isDestroyed || this.abortOperations.has(threadId))) {
+                        throw new Error('Native goal activation was cancelled before it started.');
+                    }
+                    // No await between releasing preparation ownership and the adapter's
+                    // synchronous installation of native goal ownership.
+                    if (goalActivation && this.pendingGoalActivations.get(threadId) === goalActivation) {
+                        this.pendingGoalActivations.delete(threadId);
+                    }
+                    const result = goalRequest
+                        ? await executor.executeGoal(goalRequest, guardedOptions)
+                        : await executor.execute(prompt, guardedOptions);
+                    if (goalRequest && !streamedAny && result.output)
+                        guardedOptions.onStream?.(result.output);
                     executionMetadata = (0, ExecutionMetadata_1.mergeReportedExecutionMetadata)(launchMetadata, (0, ExecutionMetadata_1.captureExecutionMetadata)(executor, backend));
                     capturedMetadata = true;
                     active = false;
@@ -2303,9 +2419,11 @@ You can also use natural language commands to control Claude Code CLI.`,
                     scope?.finishExecution(result.success);
                     finished = true;
                     if (flushImages) {
-                        await Promise.all(pendingLocalImageEmissions);
-                        const visibleResult = scope && (suppressed || scope.hasPendingResults()) ? '' : result.output ?? '';
-                        await emitLocalImages(`${streamedOutput}\n${visibleResult}`);
+                        imageDelivery?.flushStream();
+                        const visibleResult = imageTextDropped || this.imageConnectionEpoch !== imageEpoch
+                            || (scope && (suppressed || scope.hasPendingResults())) ? '' : result.output ?? '';
+                        queueLocalImages(visibleResult);
+                        await imageDelivery?.drain();
                     }
                     assertCoordinatorActive();
                     return result;
@@ -2319,7 +2437,8 @@ You can also use natural language commands to control Claude Code CLI.`,
                     delegationBridge?.activate(undefined);
                     if (!finished)
                         scope?.finishExecution(false);
-                    mayRetry = !scope || scope.getLaunchRevision() === launchRevision;
+                    // Goal activation mutates durable native state; never replay it as a model retry.
+                    mayRetry = !goalRequest && (!scope || scope.getLaunchRevision() === launchRevision);
                 }
             };
             let prompt = content;
@@ -2514,7 +2633,7 @@ You can also use natural language commands to control Claude Code CLI.`,
     }
     sendStreamChunk(messageId, threadId, chunk) {
         try {
-            this.wsClient.send({
+            return this.wsClient.send({
                 type: 'stream',
                 messageId,
                 chunk,
@@ -2522,10 +2641,11 @@ You can also use natural language commands to control Claude Code CLI.`,
                 openId: this.getMessageOpenId(messageId),
                 threadId,
                 timestamp: Date.now(),
-            });
+            }) !== false;
         }
         catch (error) {
             console.error('Failed to send stream chunk:', error);
+            return false;
         }
     }
     sendToolUse(messageId, threadId, toolUse) {
@@ -2624,7 +2744,7 @@ You can also use natural language commands to control Claude Code CLI.`,
     }
     sendImage(messageId, threadId, image) {
         try {
-            this.wsClient.send({
+            return this.wsClient.send({
                 type: 'stream',
                 messageId,
                 streamType: 'image',
@@ -2632,10 +2752,11 @@ You can also use natural language commands to control Claude Code CLI.`,
                 openId: this.getMessageOpenId(messageId),
                 threadId,
                 timestamp: Date.now(),
-            });
+            }) !== false;
         }
-        catch (error) {
-            console.error('Failed to send generated image:', error);
+        catch {
+            console.warn('Failed to send generated image.');
+            return false;
         }
     }
     sendStructuredContent(messageId, threadId, structuredContent) {
@@ -2997,6 +3118,9 @@ You can also use natural language commands to control Claude Code CLI.`,
         this.directoryBrowser.destroy();
         this.settingsService.destroy();
         this.isDestroyed = true;
+        for (const delivery of this.imageDeliveries.values())
+            delivery.cancel();
+        this.imageDeliveries.clear();
         await this.fileInbox?.destroy();
         this.notificationAdapter.unregister();
         try {