refactor(exec): unify channel approvals and restore routing/auth (#57838)

* fix(exec): add shared approval runtime * fix(exec): harden shared approval runtime * fix(exec): guard approval expiration callbacks * fix(exec): handle approval runtime races * fix(exec): clean up failed approval deliveries * fix(exec): restore channel approval routing * fix(exec): scope telegram legacy approval fallback * refactor(exec): centralize native approval delivery * fix(exec): harden approval auth and account routing * test(exec): align telegram approval auth assertions * fix(exec): align approval rebase followups * fix(exec): clarify plugin approval not-found errors * fix(exec): fall back to session-bound telegram accounts * fix(exec): detect structured telegram approval misses * test(exec): align discord approval auth coverage * fix(exec): ignore discord dm origin channel routes * fix(telegram): skip self-authored message echoes * fix(exec): keep implicit approval auth non-explicit
2026-05-05 17:00:21 +00:00 · 2026-03-30 15:49:02 -07:00
parent e7e15b92bd
commit 9ff57ac479
35 changed files with 3606 additions and 2136 deletions
--- a/extensions/telegram/src/exec-approval-resolver.ts
+++ b/extensions/telegram/src/exec-approval-resolver.ts
@@ -0,0 +1,114 @@
+import type { OpenClawConfig } from "openclaw/plugin-sdk/config-runtime";
+import { createOperatorApprovalsGatewayClient } from "openclaw/plugin-sdk/gateway-runtime";
+import type { ExecApprovalReplyDecision } from "openclaw/plugin-sdk/infra-runtime";
+
+export type ResolveTelegramExecApprovalParams = {
+  cfg: OpenClawConfig;
+  approvalId: string;
+  decision: ExecApprovalReplyDecision;
+  senderId?: string | null;
+  allowPluginFallback?: boolean;
+  gatewayUrl?: string;
+};
+
+const INVALID_REQUEST = "INVALID_REQUEST";
+const APPROVAL_NOT_FOUND = "APPROVAL_NOT_FOUND";
+
+function readErrorCode(value: unknown): string | null {
+  return typeof value === "string" && value.trim() ? value : null;
+}
+
+function readApprovalNotFoundDetailsReason(value: unknown): string | null {
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    return null;
+  }
+  const reason = (value as { reason?: unknown }).reason;
+  return typeof reason === "string" && reason.trim() ? reason : null;
+}
+
+function isApprovalNotFoundError(err: unknown): boolean {
+  if (!(err instanceof Error)) {
+    return false;
+  }
+  const gatewayCode = readErrorCode((err as { gatewayCode?: unknown }).gatewayCode);
+  if (gatewayCode === APPROVAL_NOT_FOUND) {
+    return true;
+  }
+
+  const detailsReason = readApprovalNotFoundDetailsReason((err as { details?: unknown }).details);
+  if (gatewayCode === INVALID_REQUEST && detailsReason === APPROVAL_NOT_FOUND) {
+    return true;
+  }
+
+  return /unknown or expired approval id/i.test(err.message);
+}
+
+export async function resolveTelegramExecApproval(
+  params: ResolveTelegramExecApprovalParams,
+): Promise<void> {
+  let readySettled = false;
+  let resolveReady!: () => void;
+  let rejectReady!: (err: unknown) => void;
+  const ready = new Promise<void>((resolve, reject) => {
+    resolveReady = resolve;
+    rejectReady = reject;
+  });
+  const markReady = () => {
+    if (readySettled) {
+      return;
+    }
+    readySettled = true;
+    resolveReady();
+  };
+  const failReady = (err: unknown) => {
+    if (readySettled) {
+      return;
+    }
+    readySettled = true;
+    rejectReady(err);
+  };
+
+  const gatewayClient = await createOperatorApprovalsGatewayClient({
+    config: params.cfg,
+    gatewayUrl: params.gatewayUrl,
+    clientDisplayName: `Telegram approval (${params.senderId?.trim() || "unknown"})`,
+    onHelloOk: () => {
+      markReady();
+    },
+    onConnectError: (err) => {
+      failReady(err);
+    },
+    onClose: (code, reason) => {
+      // Once onHelloOk resolves `ready`, in-flight request failures must come from
+      // gatewayClient.request() itself; failReady only covers the pre-ready phase.
+      failReady(new Error(`gateway closed (${code}): ${reason}`));
+    },
+  });
+
+  try {
+    gatewayClient.start();
+    await ready;
+    const requestApproval = async (method: "exec.approval.resolve" | "plugin.approval.resolve") => {
+      await gatewayClient.request(method, {
+        id: params.approvalId,
+        decision: params.decision,
+      });
+    };
+    if (params.approvalId.startsWith("plugin:")) {
+      await requestApproval("plugin.approval.resolve");
+    } else {
+      try {
+        await requestApproval("exec.approval.resolve");
+      } catch (err) {
+        if (!params.allowPluginFallback || !isApprovalNotFoundError(err)) {
+          throw err;
+        }
+        await requestApproval("plugin.approval.resolve");
+      }
+    }
+  } finally {
+    await gatewayClient.stopAndWait().catch(() => {
+      gatewayClient.stop();
+    });
+  }
+}