cli-wechat-bridge 1.2.1 → 1.2.3

package/dist/bridge/bridge-adapters.core.js

@@ -7,7 +7,7 @@
 import net from "node:net";
 import path from "node:path";
 import { spawn as spawnPty } from "node-pty";
-import { t } from "../i18n/index.js";
+import { getLocale, t } from "../i18n/index.js";
 import { attachLocalCompanionMessageListener, buildLocalCompanionToken, clearLocalCompanionEndpoint, clearLocalCompanionOccupancy, sendLocalCompanionMessage, updateLocalCompanionOccupancy, writeLocalCompanionEndpoint, } from "../companion/local-companion-link.js";
 import { detectCliApproval, } from "./bridge-utils.js";
 import { normalizeOutput, nowIso, truncatePreview } from "../core/text-utils.js";
@@ -56,6 +56,8 @@ export class LocalCompanionProxyAdapter {
     readyWaiters = new Set();
     detachMessageListener = null;
     requestCounter = 0;
+    announcedApprovalRequestId;
+    announcedUserInputRequestId;
     endpoint = null;
     pendingRequests = new Map();
     shuttingDown = false;
@@ -181,6 +183,14 @@ export class LocalCompanionProxyAdapter {
     async setPlanMode(enabled) {
         return await this.sendRequest({ command: "set_plan_mode", enabled });
     }
+    async updateLocale(locale) {
+        if (!this.socket)
+            return true;
+        if (!this.state.supportsLocaleUpdates)
+            return false;
+        await this.sendRequest({ command: "set_locale", locale });
+        return true;
+    }
     async interrupt() {
         const result = await this.sendRequest({
             command: "interrupt",
@@ -192,10 +202,17 @@ export class LocalCompanionProxyAdapter {
             command: "reset",
         });
     }
-    async resolveApproval(action) {
+    async resolveApproval(action, requestId) {
+        if (!this.state.supportsApprovalRequestIds) {
+            throw new Error("Restart the visible CLI to upgrade its companion before approving remotely.");
+        }
+        const expectedId = requestId ?? this.state.pendingApproval?.requestId;
+        if (!expectedId)
+            return false;
         const result = await this.sendRequest({
             command: "resolve_approval",
             action,
+            requestId: expectedId,
         });
         return Boolean(result);
     }
@@ -203,11 +220,15 @@ export class LocalCompanionProxyAdapter {
         const ok = await this.resolveApproval(action);
         return ok ? 1 : 0;
     }
-    async submitUserInput(answers) {
+    async submitUserInput(answers, requestId) {
+        const expectedId = requestId ?? this.state.pendingUserInput?.requestId;
+        if (expectedId && !this.state.supportsUserInputRequestIds)
+            return false;
         try {
             const result = await this.sendRequest({
                 command: "submit_user_input",
                 answers,
+                requestId: expectedId,
             });
             return result === true;
         }
@@ -270,6 +291,7 @@ export class LocalCompanionProxyAdapter {
                     return;
                 }
                 authenticated = true;
+                this.state.supportsLocaleUpdates = message.supportsLocaleUpdates;
                 this.clearReconnectShutdownTimer();
                 this.expectedCloseReason = null;
                 this.socket = socket;
@@ -283,7 +305,7 @@ export class LocalCompanionProxyAdapter {
                     companionPid: message.companionPid,
                     companionConnectedAt,
                 }, this.endpoint?.instanceId, { adapter: this.options.kind });
-                sendLocalCompanionMessage(socket, { type: "hello_ack" });
+                sendLocalCompanionMessage(socket, { type: "hello_ack", locale: getLocale() });
                 return;
             }
             this.handlePanelMessage(message);
@@ -311,9 +333,19 @@ export class LocalCompanionProxyAdapter {
                 this.expectedCloseReason = message.reason;
                 return;
             case "event":
+                if (message.event.type === "user_input_required" && message.event.request.requestId) {
+                    if (this.announcedUserInputRequestId === message.event.request.requestId)
+                        return;
+                    this.announcedUserInputRequestId = message.event.request.requestId;
+                }
+                if (message.event.type === "approval_required" && message.event.request.requestId) {
+                    if (this.announcedApprovalRequestId === message.event.request.requestId)
+                        return;
+                    this.announcedApprovalRequestId = message.event.request.requestId;
+                }
                 this.eventSink(message.event);
                 return;
-            case "state":
+            case "state": {
                 if (this.endpoint) {
                     Object.assign(this.endpoint, buildCompanionHealthPatch(message.state, nowIso()));
                     const nextSessionId = getSharedSessionIdFromAdapterState(message.state);
@@ -333,6 +365,12 @@ export class LocalCompanionProxyAdapter {
                 this.state.lastInputAt = undefined;
                 this.state.lastOutputAt = undefined;
                 this.state.pendingApproval = null;
+                this.state.pendingApprovals = undefined;
+                this.state.supportsApprovalRequestIds = undefined;
+                this.state.supportsUserInputRequestIds = undefined;
+                this.state.supportsLocaleUpdates = undefined;
+                this.state.pendingUserInput = null;
+                this.state.pendingUserInputOrigin = undefined;
                 this.state.sharedSessionId = undefined;
                 this.state.sharedThreadId = undefined;
                 this.state.activeRuntimeSessionId = undefined;
@@ -356,7 +394,27 @@ export class LocalCompanionProxyAdapter {
                     status: this.state.status,
                     timestamp: nowIso(),
                 });
+                const question = message.state.pendingUserInput;
+                if (question?.requestId && question.requestId !== this.announcedUserInputRequestId) {
+                    this.announcedUserInputRequestId = question.requestId;
+                    this.eventSink({ type: "user_input_required", request: question, timestamp: nowIso() });
+                }
+                else if (!question) {
+                    this.announcedUserInputRequestId = undefined;
+                }
+                if (this.state.pendingApprovals !== undefined) {
+                    this.eventSink({ type: "approval_state_changed", requests: this.state.pendingApprovals, timestamp: nowIso() });
+                    const head = message.state.pendingApproval;
+                    if (head?.requestId && head.requestId !== this.announcedApprovalRequestId) {
+                        this.announcedApprovalRequestId = head.requestId;
+                        this.eventSink({ type: "approval_required", request: head, timestamp: nowIso() });
+                    }
+                    else if (!head) {
+                        this.announcedApprovalRequestId = undefined;
+                    }
+                }
                 return;
+            }
             case "response": {
                 const pending = this.pendingRequests.get(message.id);
                 if (!pending) {
@@ -392,6 +450,14 @@ export class LocalCompanionProxyAdapter {
         this.state.lastOutputAt = undefined;
         this.state.pendingApproval = null;
         this.state.pendingApprovalOrigin = undefined;
+        this.state.pendingApprovals = undefined;
+        this.state.supportsApprovalRequestIds = undefined;
+        this.announcedApprovalRequestId = undefined;
+        this.announcedUserInputRequestId = undefined;
+        this.state.supportsUserInputRequestIds = undefined;
+        this.state.supportsLocaleUpdates = undefined;
+        this.state.pendingUserInput = null;
+        this.state.pendingUserInputOrigin = undefined;
         this.state.activeTurnId = undefined;
         this.state.activeTurnOrigin = undefined;
     }
@@ -509,7 +575,7 @@ export class LocalCompanionProxyAdapter {
                 launchMode: this.options.companionLaunchMode,
             }));
         }
-        if (!this.state.pid && payload.command !== "dispose") {
+        if (!this.state.pid && payload.command !== "dispose" && payload.command !== "set_locale") {
             await this.waitForCompanionReady();
             socket = this.socket;
             if (!socket) {
@@ -733,7 +799,10 @@ export class AbstractPtyAdapter {
         await this.dispose();
         await this.start();
     }
-    async resolveApproval(action) {
+    async resolveApproval(action, requestId) {
+        if (requestId !== undefined && this.pendingApproval?.requestId !== requestId) {
+            return false;
+        }
         if (!this.pendingApproval) {
             return false;
         }
@@ -743,6 +812,9 @@ export class AbstractPtyAdapter {
         }
         this.pendingApproval = null;
         this.state.pendingApproval = null;
+        this.state.pendingApprovals = [];
+        this.state.pendingApprovalOrigin = undefined;
+        this.emit({ type: "approval_state_changed", requests: [], timestamp: nowIso() });
         return true;
     }
     async resolveAllApprovals(action) {
@@ -754,8 +826,13 @@ export class AbstractPtyAdapter {
     }
     async dispose() {
         this.clearCompletionTimer();
+        const hadApproval = Boolean(this.pendingApproval);
         this.pendingApproval = null;
         this.state.pendingApproval = null;
+        this.state.pendingApprovals = [];
+        this.state.pendingApprovalOrigin = undefined;
+        if (hadApproval)
+            this.emit({ type: "approval_state_changed", requests: [], timestamp: nowIso() });
         if (!this.pty) {
             this.state.status = "stopped";
             return;