@yu_robotics/remote-cli 1.6.158 → 1.6.166

package/README.md

@@ -76,6 +76,8 @@ The client is normally installed and run directly on the developer's machine rat
 
 ## Installation
 
+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.
+
 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
@@ -178,7 +180,7 @@ Linux users upgrading from version 1.6.23 or earlier should run `remote-cli serv
 | `/model [name]` | Open native model settings, or set the active backend model with a text argument |
 | `/effort [auto|level]` | Open native effort settings, or set/clear the active backend effort with a text argument |
 | `/sandbox [on/off/read-only/default]` | Configure the current Codex or Claude Code thread sandbox, directory grants, and networking |
-| `/backend` | Open backend settings; Current thread is the default and Confirm applies the selection |
+| `/backend` | Open backend settings; click a backend to switch immediately, defaulting to Current thread |
 | `/delegation [on|off]` | Inspect or enable delegation between installed agent backends in this thread |
 | `/backend <index>` | Switch all threads and clear per-thread backend overrides |
 | `/backend <index> @` | Switch only the current thread |
@@ -187,9 +189,9 @@ Linux users upgrading from version 1.6.23 or earlier should run `remote-cli serv
 | `/unbind` | Unbind all devices |
 | `/device` | List and switch between bound devices |
 
-CLI and Router 1.6.152 add standalone settings cards. `/backend` lists all eight stable backend choices, disables missing installations and applies only after Confirm; Current thread is the default and All threads on this device is opt-in. `/model` and `/effort` submit native options immediately, and show applied state only after a saved-setting acknowledgement. Their target-backend selector configures future worker launches without switching the coordinator. Busy work, expired cards and changed settings require refresh; older peers and parameterized text commands retain their existing behavior. See [Model and Reasoning Effort](../../README.md#model-and-reasoning-effort).
+CLI and Router 1.6.152 add standalone settings cards. `/backend` lists all eight stable backend choices, disables missing installations and defaults to Current thread, with All threads on this device opt-in. From Router 1.6.160, clicking a backend submits immediately without Confirm; scope controls only set the next click's target. Scope persists in the same card across backend acknowledgements, while a new card defaults to Current thread. Follow global applies immediately to the original thread and restores Current thread scope after acknowledgement. `/model` and `/effort` submit native options immediately, and show applied state only after a saved-setting acknowledgement. Their target-backend selector configures future worker launches without switching the coordinator. Busy work, expired cards and changed settings require refresh; older peers and parameterized text commands retain their existing behavior. See [Model and Reasoning Effort](../../README.md#model-and-reasoning-effort).
 
-From 1.6.154, numbered sections separate backend selection, scope and Confirm, or target backend, model/effort choices and secondary actions. Selected drafts and known preferences carry explicit checks; changing the target still never switches the coordinator. AGY model catalogs accept tab-delimited and formatted multi-space native rows, with exact IDs and explicit failures for empty, unusable or oversized responses. No inference or additional protocol capability is needed.
+From 1.6.154, numbered sections separate backend selection above scope (Confirm removed in Router 1.6.160), or target backend, model/effort choices and secondary actions. The acknowledged backend, selected scope and known preferences carry explicit checks; changing the target still never switches the coordinator. AGY model catalogs accept tab-delimited and formatted multi-space native rows, with exact IDs and explicit failures for empty, unusable or oversized responses. No inference or additional protocol capability is needed.
 
 From Router 1.6.155, the selected backend application scope is highlighted in blue, and model/effort target selectors separate the main backend from other backends' worker preferences. Choices are shown together when the complete card fits its node and byte budgets; only oversized catalogs paginate, with headers, groups and pending/retry controls included. Viewing a target never changes the coordinator, and same-backend workers continue to share its per-thread preference. Existing CLI settings metadata is sufficient; no new capability or native request is required.
 
@@ -328,6 +330,7 @@ source reservations remain held until owned operations settle, even on cancellat
 no late worker is launched. Failed collection after confirmed exit preserves only
 the affected lane and files for recovery rather than quarantining the source.
 Individual Git command deadlines remain; cancellation may wait for Git to settle.
+From CLI 1.6.159, delegated `git worktree add` and `git checkout` commands have a 120-second deadline per command. Other Git commands, including worktree listing/removal and nested object transfers, retain their 15-second deadlines. Git command timeout errors show the operation, elapsed milliseconds and deadline without paths or checkout references. Preparation remains pending until the Git child exits; cancellation can wait for this bounded cleanup, and the existing task ID remains available for polling.
 Slow launch/cancel tools return the accepted task ID and a pending status before
 the adapter timeout; poll that ID with `remote_cli_result`, not a new delegation.
 The response does not claim cancellation cleanup or workspace release is complete.
@@ -451,6 +454,12 @@ Claude Code also supports opt-in `/sandbox` policies. Workspace-write mode autom
 - **Device authentication**: Each device has a unique hardware-based ID
 - **Binding codes**: Expire after 5 minutes
 
+## Session Resume
+
+CLI 1.6.164 supports confirmed Pi native session connections and read-only Pi/Codex/Claude Code discovery. Adopted Pi history reloads before every remote turn; `/session detach` preserves it and `/session release` is removed. Foreground Pi `/new` and `/clear` also preserve old history and start independent IDs; new default names use native session IDs and persisted names are not overwritten on reopen. Worker/metadata cleanup is unchanged. Resume drafts keep ordinary messages in the current conversation until confirmation succeeds. Use only one side at a time. Local Pi windows may stay open but must use native `/resume` before their next local turn; automatic local refresh and writer locking are not provided. Existing Router command/response envelopes support the text workflow without a new wire capability. See the [session resume specification](../../SESSION_RESUME_SPEC.md).
+
+From CLI 1.6.165, Pi connection and detach confirmations exclude simultaneous settings/context mutations and reject queued work, active delegated tasks, and automatic updates. One daemon reserves a selected Pi file before startup; successful connection/detach requires pointer persistence. Failed writes keep the previous association. Uncertain process cleanup keeps the selected file reserved; confirm Pi has exited before restarting the client to clear that quarantine. Discovery respects `PI_CODING_AGENT_DIR`, and Pi local reopen commands quote file paths. These guards do not lock unmanaged terminals or other CLI instances. Claude Code and Codex catalogs remain read-only; their executor, settings, and history behavior is unchanged.
+
 ## Documentation
 
 For full documentation including router server deployment, see the [project README](https://github.com/Yu-Robotics/remote-cli#readme).

package/dist/client/MessageHandler.d.ts

@@ -13,11 +13,6 @@ export interface Message {
     content?: string;
     timestamp?: number;
 }
-/**
- * Thread-aware Message Handler.
- * Each thread has its own executor process managed by ThreadExecutorPool.
- * Commands without a threadId are routed to the default thread.
- */
 export declare class MessageHandler {
     private wsClient;
     private threadPool;
@@ -33,6 +28,10 @@ export declare class MessageHandler {
     private readonly pendingQueueConfirmations;
     private readonly pausedQueues;
     private readonly messageOpenIds;
+    /** Thread operations held by session controls (adopt and detach). */
+    private readonly sessionOperations;
+    /** `/resume` and `/session`: read-only listing plus confirmed, strict native adoption. */
+    private readonly sessionControl;
     private readonly activeThreadOperations;
     private readonly abortOperations;
     private automaticUpdateInProgress;

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":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAQpD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAgK,MAAM,UAAU,CAAC;AACzM,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAMxD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAuHxD;;GAEG;AACH,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAsBD,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAkB;IAClC,OAAO,CAAC,UAAU,CAAqB;IACvC,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,aAAa,CAAC,CAAS;IAC/B,OAAO,CAAC,mBAAmB,CAA4B;IACvD,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,eAAe,CAA0C;IACjE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAsC;IACnE,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAA+C;IACzF,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAqB;IAClD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAyC;IACxE,qEAAqE;IACrE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA6B;IAC/D,0FAA0F;IAC1F,OAAO,CAAC,QAAQ,CAAC,cAAc,CA2B5B;IACH,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAA4C;IACnF,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAoC;IACpE,OAAO,CAAC,yBAAyB,CAAS;IAC1C,OAAO,CAAC,sBAAsB,CAAS;IACvC,OAAO,CAAC,yBAAyB,CAAS;IAC1C,OAAO,CAAC,2BAA2B,CAAS;IAC5C,OAAO,CAAC,+BAA+B,CAAS;IAChD,OAAO,CAAC,yBAAyB,CAAS;IAC1C,OAAO,CAAC,2BAA2B,CAAS;IAC5C,OAAO,CAAC,sBAAsB,CAAS;IACvC,OAAO,CAAC,wBAAwB,CAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA2B;IAC7D,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAwB;IAC9D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkB;IAClD,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAoG;IACzI,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAoB;IAC/C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAuC;IACzE,OAAO,CAAC,SAAS,CAAC,CAAY;gBAG5B,QAAQ,EAAE,eAAe,EACzB,UAAU,EAAE,kBAAkB,EAC9B,aAAa,EAAE,aAAa,EAC5B,cAAc,EAAE,cAAc,EAC9B,MAAM,EAAE,aAAa;IAqDjB,gCAAgC,IAAI,OAAO,CAAC,IAAI,CAAC;IAUvD;;OAEG;IACG,aAAa,CAAC,OAAO,EAAE,OAAO,GAAG,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IA2FtE,uBAAuB,IAAI,OAAO;IAoBlC,kBAAkB,IAAI,IAAI;IAI1B;;OAEG;YACW,oBAAoB;YAmDpB,4BAA4B;IAwR1C;;OAEG;YACW,kBAAkB;IAwDhC;;OAEG;YACW,iBAAiB;IAiB/B,OAAO,CAAC,cAAc;YAOR,wBAAwB;IAsBtC;;;OAGG;YACW,oBAAoB;IAialC,OAAO,CAAC,uBAAuB;IAmC/B,OAAO,CAAC,+BAA+B;IAUvC,OAAO,CAAC,gBAAgB;IAexB,OAAO,CAAC,cAAc;YASR,kBAAkB;YA8ElB,sBAAsB;IAmDpC,OAAO,CAAC,sBAAsB;IAU9B,OAAO,CAAC,oBAAoB;IAS5B,OAAO,CAAC,qBAAqB;IAS7B,OAAO,CAAC,mBAAmB;IAK3B;;;;;;;;;OASG;YACW,eAAe;IAqC7B;;OAEG;YACW,mBAAmB;IA0GjC;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAS1B;;;OAGG;YACW,oBAAoB;IA6MlC;;OAEG;YACW,qBAAqB;IAiBnC;;OAEG;IACH,OAAO,CAAC,UAAU;IAuBlB;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAM9B;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,wBAAwB,CAG7C;YAEW,eAAe;IAgC7B;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAI3B;;;;;;;;;;;;;OAaG;YACW,mBAAmB;IAgEjC;;;OAGG;IACH,OAAO,CAAC,uBAAuB;IA0E/B;;OAEG;YACW,cAAc;YAiWd,sBAAsB;IAoBpC,OAAO,CAAC,4BAA4B;IAOpC,OAAO,CAAC,gBAAgB;IAIxB,OAAO,CAAC,SAAS;IASjB,OAAO,CAAC,eAAe;IAWvB,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,oBAAoB;IAY5B,OAAO,CAAC,mBAAmB;IAQ3B,OAAO,CAAC,sBAAsB;IAuB9B,iFAAiF;IACjF,OAAO,CAAC,iBAAiB;IAezB,OAAO,CAAC,eAAe;IAgBvB,OAAO,CAAC,WAAW;IAgBnB,OAAO,CAAC,cAAc;IAgBtB,OAAO,CAAC,sBAAsB;IAyB9B,OAAO,CAAC,YAAY;IAUpB,OAAO,CAAC,oBAAoB;IAe5B,OAAO,CAAC,YAAY;IAgBpB,OAAO,CAAC,SAAS;IAgBjB,OAAO,CAAC,qBAAqB;IAmB7B,OAAO,CAAC,YAAY;IAqDpB,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,aAAa;IAcrB,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,gBAAgB;IAYxB,uFAAuF;YACzE,sBAAsB;IAsBpC,mFAAmF;YACrE,eAAe;YA2Cf,mBAAmB;IAuBjC,OAAO,CAAC,YAAY;YAUN,cAAc;YAuBd,oBAAoB;IAgHlC;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAe/B"}

package/dist/client/MessageHandler.js

@@ -8,6 +8,8 @@ const FileInbox_1 = require("../files/FileInbox");
 const DeviceIdentity_1 = require("../files/DeviceIdentity");
 const crypto_1 = require("crypto");
 const DocumentExtractor_1 = require("../files/DocumentExtractor");
+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 hooks_1 = require("../hooks");
@@ -17,8 +19,8 @@ const WorkingDirectory_1 = require("../utils/WorkingDirectory");
 const MachineCommands_1 = require("../machines/MachineCommands");
 const child_process_1 = require("child_process");
 const promises_1 = require("fs/promises");
-const fs_1 = require("fs");
-const os_1 = require("os");
+const fs_2 = require("fs");
+const os_2 = require("os");
 const path_2 = require("path");
 const config_1 = require("../types/config");
 const uuid_1 = require("uuid");
@@ -35,6 +37,10 @@ const ActivityProgress_1 = require("../utils/ActivityProgress");
 const SettingsAdmission_1 = require("../settings/SettingsAdmission");
 const SettingsCatalog_1 = require("../settings/SettingsCatalog");
 const SettingsService_1 = require("../settings/SettingsService");
+const SessionResumeService_1 = require("../session/SessionResumeService");
+const adapters_1 = require("../session/adapters");
+const PiSessionCatalog_1 = require("../session/adapters/PiSessionCatalog");
+const SessionControl_1 = require("../session/SessionControl");
 const EFFORT_BACKENDS = new Set(['claude', 'codex', 'agy', 'opencode', 'kimi', 'zcode', 'pi', 'dsh']);
 const SLASH_SESSION_BACKENDS = new Set(['opencode', 'kimi', 'zcode', 'pi']);
 const NATIVE_SKILLS_BACKENDS = new Set(['claude', 'agy', 'opencode', 'kimi', 'zcode', 'pi']);
@@ -92,6 +98,20 @@ const MAX_THREAD_QUEUE_LENGTH = 10;
  * Each thread has its own executor process managed by ThreadExecutorPool.
  * Commands without a threadId are routed to the default thread.
  */
+/** Same base directory PiExecutor uses for its per-thread pointers. */
+function remoteCliDirectory() {
+    return path_1.default.join(process.env.HOME || os_1.default.homedir(), '.remote-cli');
+}
+/** Read the thread's Pi pointer binding flags without starting an executor. */
+function readPiBinding(threadId) {
+    try {
+        const pointer = JSON.parse(fs_1.default.readFileSync(path_1.default.join(remoteCliDirectory(), 'pi-sessions', `${threadId}.json`), 'utf8'));
+        return { id: typeof pointer.id === 'string' ? pointer.id : undefined, adopted: pointer.adopted === true };
+    }
+    catch {
+        return undefined;
+    }
+}
 class MessageHandler {
     wsClient;
     threadPool;
@@ -107,6 +127,43 @@ class MessageHandler {
     pendingQueueConfirmations = new Map();
     pausedQueues = new Set();
     messageOpenIds = new Map();
+    /** Thread operations held by session controls (adopt and detach). */
+    sessionOperations = new Map();
+    /** `/resume` and `/session`: read-only listing plus confirmed, strict native adoption. */
+    sessionControl = new SessionControl_1.SessionControl({
+        sharingConfig: () => this.config.get('sessionSharing'),
+        backendOf: threadId => this.threadPool.getBackendKey(threadId),
+        workingDirectory: threadId => {
+            const directory = this.threadManager.getThread(threadId)?.workingDirectory;
+            try {
+                return directory ? this.directoryGuard.resolveWorkingDirectory(directory) : undefined;
+            }
+            catch {
+                return undefined;
+            }
+        },
+        threadName: threadId => this.threadManager.getThread(threadId)?.name,
+        // Queued or pending work counts as busy: a confirmation must never redirect it into another session.
+        isBusy: threadId => this.threadPool.isThreadBusy(threadId) || this.hasThreadQueueState(threadId)
+            || this.abortOperations.has(threadId) || this.isDestroyed || this.automaticUpdateInProgress
+            || this.delegation.hasActiveTasks(threadId) || this.settingsAdmission.hasCommand(threadId),
+        setBusy: (threadId, busy) => {
+            if (busy) {
+                this.sessionOperations.set(threadId, this.beginThreadOperation(threadId));
+                return;
+            }
+            const token = this.sessionOperations.get(threadId);
+            this.sessionOperations.delete(threadId);
+            // Messages that arrived during the operation were queued; resume draining them.
+            if (token && this.finishThreadOperation(threadId, token))
+                void this.startNextQueuedCommand(threadId);
+        },
+        executor: threadId => this.threadPool.getExecutor(threadId),
+        readCatalog: (backend, cwd) => (0, adapters_1.readSessionCatalog)(backend, cwd),
+        resolvePi: (cwd, id) => (0, PiSessionCatalog_1.resolvePiSessionLocator)(cwd, id, { remoteCliDirectory: remoteCliDirectory() }),
+        piHolder: (file, threadId) => (0, PiSessionCatalog_1.piSessionHolder)(file, threadId, { remoteCliDirectory: remoteCliDirectory() }),
+        piBinding: threadId => readPiBinding(threadId),
+    });
     activeThreadOperations = new Map();
     abortOperations = new Map();
     automaticUpdateInProgress = false;
@@ -310,6 +367,41 @@ class MessageHandler {
         const content = message.content?.trim() ?? '';
         const body = () => this.handleAdmittedCommandMessage(message, fileOrder);
         this.messageOpenIds.set(message.messageId, message.openId);
+        if ((0, SessionResumeService_1.isSessionControl)(content)) {
+            if (!this.threadManager.getThread(threadId)) {
+                this.sendResponse(message.messageId, undefined, { success: false, error: 'The selected thread no longer exists.' });
+                return;
+            }
+            let response;
+            try {
+                const control = () => this.sessionControl.handle(content, { openId: message.openId, threadId });
+                // Only Pi confirmations mutate native context. Other catalogs remain read-only.
+                if (this.threadPool.getBackendKey(threadId) === 'pi' && /^\/(?:resume|r|session)\s+confirm(?:\s|$)/i.test(content)) {
+                    try {
+                        response = await this.settingsAdmission.mutation(threadId, async () => {
+                            this.settingsService.invalidate(threadId);
+                            try {
+                                return await control();
+                            }
+                            finally {
+                                this.settingsService.invalidate(threadId);
+                            }
+                        });
+                    }
+                    finally {
+                        void this.startNextQueuedCommand(threadId);
+                    }
+                }
+                else {
+                    response = await control();
+                }
+            }
+            catch (error) {
+                response = { success: false, error: `Session control failed: ${error instanceof Error ? error.message : String(error)}. No task was sent.` };
+            }
+            this.sendResponse(message.messageId, threadId, { ...response, threads: this.threadPool.getSummaries() }, true);
+            return;
+        }
         try {
             // Abort and addressed human replies must remain available during native work.
             if (content === '/abort' || /^(?:yes|no)(?:\s|$)/.test(content) || content.startsWith('/input '))
@@ -907,6 +999,8 @@ Use /compact to reduce conversation context or /clear to start a fresh context.`
 - /thread list - List all threads with their status
 - /thread new [name] - Create a new thread
 - /thread delete <name> - Delete a thread (only when idle)
+- /session - Show this thread's native session binding; /session detach
+- /resume - List this workspace's Pi sessions and connect one after confirmation (Pi only)
 
 Remote Machine commands:
 - /proxy set <proxyHost> <proxyPort> <hostSuffix> [proxyAuth] - Configure global proxy
@@ -1680,8 +1774,6 @@ You can also use natural language commands to control Claude Code CLI.`,
      */
     expandCommandShortcuts(content) {
         const trimmed = content.trim();
-        if (trimmed === '/r' || trimmed === '/resume')
-            return 'Please resume the previous conversation';
         if (trimmed === '/c' || trimmed === '/continue')
             return 'Please continue from where we left off';
         return content;
@@ -1699,8 +1791,8 @@ You can also use natural language commands to control Claude Code CLI.`,
     ]);
     async listLocalSkills(cwd, backend) {
         const roots = backend === 'codex'
-            ? [(0, path_2.join)(cwd, '.agents', 'skills'), (0, path_2.join)((0, os_1.homedir)(), '.codex', 'skills'), (0, path_2.join)((0, os_1.homedir)(), '.codex', 'skills', '.system')]
-            : [(0, path_2.join)(cwd, '.claude', 'skills'), (0, path_2.join)((0, os_1.homedir)(), '.claude', 'skills')];
+            ? [(0, path_2.join)(cwd, '.agents', 'skills'), (0, path_2.join)((0, os_2.homedir)(), '.codex', 'skills'), (0, path_2.join)((0, os_2.homedir)(), '.codex', 'skills', '.system')]
+            : [(0, path_2.join)(cwd, '.claude', 'skills'), (0, path_2.join)((0, os_2.homedir)(), '.claude', 'skills')];
         const skills = [];
         const seen = new Set();
         for (const root of roots) {
@@ -1967,7 +2059,7 @@ You can also use natural language commands to control Claude Code CLI.`,
                         if (other.id === threadId || !this.threadPool.isThreadBusy(other.id))
                             return false;
                         try {
-                            return (0, DelegationManager_1.workspacesOverlap)((0, fs_1.realpathSync)(this.threadPool.getExecutor(other.id).getCurrentWorkingDirectory()), cwd);
+                            return (0, DelegationManager_1.workspacesOverlap)((0, fs_2.realpathSync)(this.threadPool.getExecutor(other.id).getCurrentWorkingDirectory()), cwd);
                         }
                         catch {
                             return true;
@@ -1997,19 +2089,25 @@ You can also use natural language commands to control Claude Code CLI.`,
             const webToolNames = new Set(['websearch', 'webfetch', 'web_search', 'web_fetch', 'search_web', 'read_url_content', 'fetch']);
             let streamedOutput = '';
             const emitLocalImages = async (text) => {
-                const thread = this.threadManager.getThread(threadId);
-                if (!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,
-                    });
+                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.');
                 }
             };
             const queueLocalImages = (text) => {
@@ -2504,7 +2602,7 @@ You can also use natural language commands to control Claude Code CLI.`,
             console.error('Failed to send structured content:', error);
         }
     }
-    sendResponse(messageId, threadId, result) {
+    sendResponse(messageId, threadId, result, metadataOnly = false) {
         if (!result.queueConfirmation)
             this.fileInbox?.release(messageId, !result.success);
         try {
@@ -2512,7 +2610,8 @@ You can also use natural language commands to control Claude Code CLI.`,
             let cwd;
             try {
                 if (threadId) {
-                    cwd = this.threadPool.getExecutor(threadId).getCurrentWorkingDirectory();
+                    cwd = metadataOnly ? this.threadManager.getThread(threadId)?.workingDirectory
+                        : this.threadPool.getExecutor(threadId).getCurrentWorkingDirectory();
                 }
             }
             catch {