@yu_robotics/remote-cli 1.6.176 → 1.6.177

package/README.md

@@ -2,6 +2,8 @@
 
 Remote control Claude Code, AGY CLI, Codex CLI, OpenCode CLI, Kimi Code CLI, ZCode, or Pi from anywhere using your mobile phone through Feishu (Lark) messaging.
 
+![Remote CLI architecture](../../docs/images/remote-cli-architecture.png)
+
 ## Features
 
 - **Remote Control**: Control your local development environment from anywhere via mobile
@@ -179,8 +181,8 @@ Linux users upgrading from version 1.6.23 or earlier should run `remote-cli serv
 | `/skills` | List available skills for the active backend |
 | `/abort` | Abort executing task in current thread |
 | `/queue` | Inspect or manage confirmed messages waiting in thread queues |
-| `/clear` | Clear context for this thread |
-| `/new` | Alias for `/clear`; start a fresh conversation in this thread |
+| `/clear` | Reset all direct backend and managed worker conversations for this thread |
+| `/new` | Alias for `/clear`; start fresh across this thread's backends and workers |
 | `/compact` | Compress history to save tokens |
 | `/cd [dir]` | Browse directories as a card, or change directory directly with a path |
 | `/model [name]` | Open native model settings, or set the active backend model with a text argument |
@@ -490,6 +492,21 @@ 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
 
+From CLI 1.6.177, `/clear` and its `/new` alias reset the entire current
+thread's conversation context: all direct backend session bindings and every
+managed worker conversation, across backends and parallel worker lanes. The
+working directory, files, Git artifacts, archived native transcripts, login,
+backend/model/effort selections, delegation preference, and sandbox grants are
+preserved. Other threads are unaffected. A later backend switch starts fresh
+instead of restoring a pre-clear binding. Busy tasks, queued work, and workers
+with unconfirmed shutdowns must settle before clearing. Reset intent is saved
+before any session binding changes. A persisted reset intent blocks old
+conversations until clearing succeeds, including after a CLI restart. If
+clearing fails, resolve the reported problem and retry `/clear` or `/new`.
+Service shutdown waits for retained cleanup and reports unconfirmed native exits
+before acknowledging completion.
+Single-worker **Clear context** controls still reset only the selected worker.
+
 ## 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).

package/dist/client/MessageHandler.d.ts

@@ -80,6 +80,7 @@ export declare class MessageHandler {
     private handleStatusQuery;
     private isValidMessage;
     private handleWorkerContextReset;
+    private clearThreadConversation;
     /**
      * Handle built-in commands (thread-scoped).
      * Returns true if handled.

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

@@ -29,6 +29,7 @@ const uuid_1 = require("uuid");
 const ZCodeCommand_1 = require("../executor/zcode/ZCodeCommand");
 const DelegationManager_1 = require("../delegation/DelegationManager");
 const DelegationBridge_1 = require("../delegation/DelegationBridge");
+const DelegatedWorkerSessionStore_1 = require("../delegation/DelegatedWorkerSessionStore");
 const contract_1 = require("../delegation/contract");
 const DelegationStatusFormatter_1 = require("../delegation/DelegationStatusFormatter");
 const WorkerPolicy_1 = require("../delegation/WorkerPolicy");
@@ -205,7 +206,7 @@ class MessageHandler {
             for (const delivery of this.imageDeliveries.values())
                 delivery.invalidatePending();
         });
-        this.delegation = new DelegationManager_1.DelegationManager(directoryGuard);
+        this.delegation = new DelegationManager_1.DelegationManager(directoryGuard, undefined, undefined, undefined, undefined, undefined, new DelegatedWorkerSessionStore_1.DelegatedWorkerSessionStore(undefined, threadManager.contextResets));
         this.settingsCatalogReader = new SettingsCatalog_1.SettingsCatalogReader(directoryGuard);
         this.settingsService = new SettingsService_1.SettingsService({
             state: id => this.settingsState(id),
@@ -410,7 +411,12 @@ class MessageHandler {
     async handleCommandMessage(message, fileOrder) {
         const threadId = message.threadId ?? this.threadManager.getDefaultThread().id;
         const content = message.content?.trim() ?? '';
-        const body = () => this.handleAdmittedCommandMessage(message, fileOrder);
+        const clearing = content === '/clear' || content === '/new';
+        const body = () => {
+            if (!clearing)
+                this.threadManager.contextResets.assertReady(threadId);
+            return this.handleAdmittedCommandMessage(message, fileOrder);
+        };
         this.messageOpenIds.set(message.messageId, message.openId);
         if ((0, SessionResumeService_1.isSessionControl)(content)) {
             if (!this.threadManager.getThread(threadId)) {
@@ -419,11 +425,13 @@ class MessageHandler {
             }
             let response;
             try {
+                this.threadManager.contextResets.assertReady(threadId);
                 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.threadManager.contextResets.assertReady(threadId);
                             this.settingsService.invalidate(threadId);
                             try {
                                 return await control();
@@ -451,7 +459,7 @@ class MessageHandler {
             // Abort and addressed human replies must remain available during native work.
             if (content === '/abort' || /^(?:yes|no)(?:\s|$)/.test(content) || content.startsWith('/input '))
                 return await body();
-            if (/^\/(?:backend|model|effort|cd)\s+\S/.test(content)) {
+            if (clearing || /^\/(?:backend|model|effort|cd)\s+\S/.test(content)) {
                 const global = /^\/backend\s/.test(content) && !/\s@$/.test(content);
                 await this.settingsAdmission.mutation(global ? '*' : threadId, async () => {
                     this.settingsService.invalidate(global ? undefined : threadId);
@@ -469,7 +477,7 @@ class MessageHandler {
             }
         }
         catch (error) {
-            this.sendResponse(message.messageId, threadId, { success: false, error: error instanceof Error ? error.message : 'Command admission failed.' });
+            this.sendResponse(message.messageId, threadId, { success: false, error: error instanceof Error ? error.message : 'Command admission failed.' }, clearing);
         }
     }
     async handleAdmittedCommandMessage(message, fileOrder) {
@@ -497,6 +505,10 @@ class MessageHandler {
             return;
         }
         const settingsCommand = content?.trim() ?? '';
+        if (settingsCommand === '/clear' || settingsCommand === '/new') {
+            await this.clearThreadConversation(messageId, resolvedThreadId);
+            return;
+        }
         if (this.directoryCardsSupported && openId && settingsCommand === '/cd') {
             try {
                 const menu = await this.directoryBrowser.open(resolvedThreadId, openId, messageId);
@@ -932,6 +944,30 @@ class MessageHandler {
         this.wsClient.send({ type: 'worker_context_reset_result', messageId: request.messageId,
             success: !error, ...(error ? { error } : {}), timestamp: Date.now() });
     }
+    async clearThreadConversation(messageId, threadId) {
+        if (this.threadPool.isThreadBusy(threadId) || this.hasThreadQueueState(threadId)
+            || this.abortOperations.has(threadId) || this.activeThreadOperations.has(threadId)) {
+            throw new Error('This thread is busy or has queued messages. Wait for it to finish and clear its queue before retrying /clear.');
+        }
+        this.threadPool.assertContextResettable(threadId);
+        const token = this.beginThreadOperation(threadId);
+        try {
+            await this.delegation.assertThreadContextResettable(threadId);
+            await this.threadManager.contextResets.begin(threadId);
+            await this.threadPool.clearThreadContext(threadId);
+            await this.delegation.clearThreadContexts(threadId);
+            await this.threadManager.contextResets.complete(threadId);
+            this.sendResponse(messageId, threadId, { success: true,
+                output: 'Conversation context cleared for all direct backends and managed workers in this thread.' }, true);
+        }
+        catch (error) {
+            const detail = error instanceof Error ? error.message : 'Local context storage is unavailable';
+            throw new Error(`Could not clear thread conversation: ${detail}. Check local CLI storage and retry /clear or /new.`);
+        }
+        finally {
+            this.finishThreadOperation(threadId, token);
+        }
+    }
     /**
      * Handle built-in commands (thread-scoped).
      * Returns true if handled.
@@ -1165,14 +1201,6 @@ You can also use natural language commands to control Claude Code CLI.`,
             });
             return true;
         }
-        if (trimmed === '/clear' || trimmed === '/new') {
-            executor.resetContext();
-            this.sendResponse(messageId, threadId, {
-                success: true,
-                output: '✅ Conversation context cleared',
-            });
-            return true;
-        }
         if (trimmed === '/compact') {
             if (!('compactWhenFull' in executor && typeof executor.compactWhenFull === 'function')) {
                 this.sendResponse(messageId, threadId, {
@@ -2837,6 +2865,7 @@ You can also use natural language commands to control Claude Code CLI.`,
         return { success: true, output: `✅ Changed working directory to: ${cwd}${changed ? '\nConversation context cleared for all direct and delegated backends in this thread.' : ''}${cleanup.failed ? `\n⚠️ ${cleanup.failed} delegated worker lane(s) could not be cleaned up. Retry with /delegation reset after checking filesystem permissions.` : ''}` };
     }
     settingsState(threadId) {
+        this.threadManager.contextResets.assertReady(threadId);
         const thread = this.threadManager.getThread(threadId);
         if (!thread)
             return undefined;
@@ -2902,6 +2931,7 @@ You can also use natural language commands to control Claude Code CLI.`,
     }
     /** Shared native/persistent mutation for cards and parameterized text commands. */
     async applyPreference(threadId, backend, kind, value, onStream) {
+        this.threadManager.contextResets.assertReady(threadId);
         const thread = this.threadManager.getThread(threadId);
         if (!thread)
             return { success: false, error: 'This thread no longer exists.' };
@@ -2975,6 +3005,9 @@ You can also use natural language commands to control Claude Code CLI.`,
     }
     async applyBackendSetting(threadId, backend, scope, followGlobal = false) {
         try {
+            for (const thread of scope === 'all' ? this.threadManager.listThreads() : [{ id: threadId }]) {
+                this.threadManager.contextResets.assertReady(thread.id);
+            }
             if (followGlobal) {
                 await this.threadPool.destroyThread(threadId, { deleteData: false });
                 await this.threadManager.updateThread(threadId, { backend: undefined });
@@ -3140,14 +3173,20 @@ You can also use natural language commands to control Claude Code CLI.`,
         await this.fileInbox?.destroy();
         this.notificationAdapter.unregister();
         try {
-            await this.delegation.destroy();
-            await Promise.all([...this.delegationBridges.values()].map(bridge => bridge.close()));
+            const results = await Promise.allSettled([
+                this.delegation.destroy(),
+                ...[...this.delegationBridges.values()].map(bridge => bridge.close()),
+                this.threadPool.destroyAll({ deleteData: false, shutdown: true }),
+            ]);
+            const failure = results.find((result) => result.status === 'rejected');
+            if (failure)
+                throw failure.reason;
             this.delegationBridges.clear();
-            await this.threadPool.destroyAll({ deleteData: false });
             this.pendingApprovalCards.clear();
         }
         catch (err) {
             console.error('Error destroying thread executors:', err);
+            throw err;
         }
     }
 }