@lansenger-pm/openclaw-lansenger-channel 3.16.22 → 3.17.0

package/CHANGELOG.md

@@ -4,6 +4,30 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/), and this project adheres to [Semantic Versioning](https://semver.org/).
 
+## [3.17.0] - 2026-07-02
+
+### Changed
+
+- **Refactor**: Extracted helper functions and added section headers to `channel.ts`, `client.ts`, and `runtime.ts` for improved readability and maintainability. Pure code reorganization, no behavior changes.
+
+## [3.16.23] - 2026-06-30
+
+### Fixed
+
+- **Duplicate approval text messages before approval card**: Two text messages ("🔒 Exec approval required" and "Approval required") were sent before the approval card. Root causes:
+  - SDK's text fallback was not suppressed because `delivery.shouldSuppressForwardingFallback` was missing from `approvalCapability`.
+  - `shouldSuppressLocalPayloadPrompt` was placed outside the `base` outbound object, causing `resolveChatChannelOutbound` to silently drop it during flattening. Moved inside `base`.
+
+### Added
+
+- **`AccountId` to ctxPayload**: Injected into message context so LLM tools can resolve the correct account for the current session.
+- **`expired` strategy kind** for card status updates, covering expiry denial display.
+
+### Changed
+
+- **Channel**: Removed dead `approval-pending` suppression code in `beforeDeliverPayload` that was guarded by the never-set `nativeRouteActive` flag.
+- **Cleanup**: Removed unused `MAX_MESSAGE_LENGTH`, `AppCardOptions` type, `LOCALE` export, and dead imports.
+
 ## [3.16.22] - 2026-06-30
 
 ### Fixed

package/dist/src/channel.js

@@ -1,4 +1,5 @@
 import { createChatChannelPlugin, createChannelPluginBase, } from "openclaw/plugin-sdk/channel-core";
+import { createChannelMessageAdapterFromOutbound } from "openclaw/plugin-sdk/channel-outbound";
 import { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk/account-id";
 import { createChannelApprovalCapability } from "openclaw/plugin-sdk/approval-runtime";
 import { createResolvedApproverActionAuthAdapter } from "openclaw/plugin-sdk/approval-auth-runtime";
@@ -12,11 +13,14 @@ import * as os from "node:os";
 import * as path from "node:path";
 import * as crypto from "node:crypto";
 import { LansengerClient, DEFAULT_API_GATEWAY_URL } from "./client.js";
-import { getRunningClient, getRunningClientByAccountId, getLastInboundTime, getLastInboundTimeByAccountId, stripOpenClawUuidSuffix, gatewayStartAccount, gatewayStopAccount } from "./runtime.js";
+import { getRunningClientByAccountId, getSessionAccountId, getLastInboundTimeByAccountId, stripOpenClawUuidSuffix, gatewayStartAccount, gatewayStopAccount } from "./runtime.js";
 import { lansengerSetupWizard } from "./setup-wizard.js";
 const log = createSubsystemLogger("lansenger");
 const LANSENGER_TEXT_CHUNK_LIMIT = 4000;
 import { PersistentStore } from "./persistent-store.js";
+// ══════════════════════════════════════════════
+// PERSISTENT STORES
+// ══════════════════════════════════════════════
 const APPROVAL_CARD_FILE = path.join(os.homedir(), ".openclaw", "lansenger-approval-cards.json");
 class PersistentApprovalCardStore extends PersistentStore {
     constructor() {
@@ -31,6 +35,9 @@ class PersistentApprovalCallbackStore extends PersistentStore {
     }
 }
 const pendingApprovalCallbacks = new PersistentApprovalCallbackStore();
+// ══════════════════════════════════════════════
+// PATH UTILS
+// ══════════════════════════════════════════════
 function isPathAllowed(filePath, roots) {
     if (roots.length === 0)
         return true;
@@ -42,6 +49,9 @@ function isPathAllowed(filePath, roots) {
     }
     return false;
 }
+// ══════════════════════════════════════════════
+// ACCOUNT RESOLUTION
+// ══════════════════════════════════════════════
 function resolveSecretValue(raw) {
     if (typeof raw === "string" && raw.trim())
         return raw;
@@ -162,6 +172,9 @@ function resolveAccount(cfg, accountId) {
         execApprovals,
     };
 }
+// ══════════════════════════════════════════════
+// CLIENT & APPROVER FACTORY
+// ══════════════════════════════════════════════
 function makeClient(account, logger) {
     const client = new LansengerClient({
         appId: account.appId,
@@ -170,7 +183,10 @@ function makeClient(account, logger) {
         dangerouslyAllowPrivateNetwork: account.dangerouslyAllowPrivateNetwork,
         logger,
     });
-    client.ownerId = account.homeChannel || "";
+    // Set ownerId so isGroupChat() can correctly identify group vs DM endpoints.
+    // Without this, fresh clients default to chatId.startsWith("group:") which
+    // never matches Lansenger IDs. The running client sets this from WS data.
+    client.ownerId = account.appId;
     return client;
 }
 function resolveLansengerApprovers({ cfg, accountId }) {
@@ -198,6 +214,9 @@ const approverAuth = createResolvedApproverActionAuthAdapter({
     channelLabel: "Lansenger",
     resolveApprovers: resolveLansengerApprovers,
 });
+// ══════════════════════════════════════════════
+// PROBE
+// ══════════════════════════════════════════════
 async function probeLansengerAccount(account) {
     if (!account.appId || !account.appSecret) {
         return { ok: false, error: "missing credentials (appId, appSecret)" };
@@ -218,6 +237,9 @@ async function probeLansengerAccount(account) {
         };
     }
 }
+// ══════════════════════════════════════════════
+// CHAT PLUGIN (base)
+// ══════════════════════════════════════════════
 const chatPlugin = createChatChannelPlugin({
     base: createChannelPluginBase({
         id: "lansenger",
@@ -473,11 +495,13 @@ const chatPlugin = createChatChannelPlugin({
         attachedResults: {
             channel: "lansenger",
             sendText: async (ctx) => {
-                const sessionKey = ctx.sessionKey;
-                const account = resolveAccount(ctx.cfg, ctx.accountId ?? undefined);
-                const client = makeClient(account);
+                const sdkSessionKey = ctx.sessionKey;
+                const sessionAccountId = sdkSessionKey ? getSessionAccountId(sdkSessionKey) : undefined;
+                const account = resolveAccount(ctx.cfg, sessionAccountId ?? ctx.accountId);
+                const client = getRunningClientByAccountId(account.appId) ?? makeClient(account);
+                log.debug(`sendText: to=${ctx.to} textLen=${ctx.text?.length ?? 0} accountId=${ctx.accountId ?? "n/a"}`);
                 const result = await client.sendFormatText(ctx.to, ctx.text);
-                return { messageId: result.messageId ?? "", sessionKey };
+                return { messageId: result.messageId ?? "", sessionKey: sdkSessionKey };
             },
             sendMedia: async (ctx) => {
                 const sessionKey = ctx.sessionKey;
@@ -536,7 +560,6 @@ const chatPlugin = createChatChannelPlugin({
                 const target = params.target;
                 const payload = params.payload;
                 const hint = params.hint;
-                const sessionKey = params.sessionKey ?? "";
                 if (hint?.kind === "approval-resolved") {
                     const chatId = target?.to;
                     const cardKey = target?.accountId ? `${target.accountId}:${chatId}` : chatId;
@@ -556,11 +579,14 @@ const chatPlugin = createChatChannelPlugin({
                 }
             },
             sendFormattedText: async (ctx) => {
-                const sessionKey = ctx.sessionKey;
-                const account = resolveAccount(ctx.cfg, ctx.accountId ?? undefined);
-                const client = makeClient(account);
+                const sdkSessionKey = ctx.sessionKey;
+                const sessionAccountId = sdkSessionKey ? getSessionAccountId(sdkSessionKey) : undefined;
+                const account = resolveAccount(ctx.cfg, sessionAccountId ?? ctx.accountId);
+                const client = getRunningClientByAccountId(account.appId) ?? makeClient(account);
+                log.debug(`sendFormattedText: to=${ctx.to} textLen=${ctx.text?.length ?? 0} accountId=${account.appId ?? "n/a"}`);
                 const result = await client.sendFormatText(ctx.to, ctx.text);
-                return [{ channel: "lansenger", messageId: result.messageId ?? "", sessionKey }];
+                log.debug(`sendFormattedText: result — success=${result.success} messageId=${result.messageId ?? "none"} error=${result.error ?? "none"}`);
+                return [{ channel: "lansenger", messageId: result.messageId ?? "", sessionKey: sdkSessionKey }];
             },
             textChunkLimit: LANSENGER_TEXT_CHUNK_LIMIT,
             chunkerMode: "markdown",
@@ -572,15 +598,15 @@ const chatPlugin = createChatChannelPlugin({
                 return resolveTextChunkLimit(params.cfg, "lansenger", params.accountId, { fallbackLimit: LANSENGER_TEXT_CHUNK_LIMIT });
             },
             shouldSuppressLocalPayloadPrompt: (params) => {
-                const hint = params.hint;
-                if (hint?.kind === "approval-pending" && hint?.nativeRouteActive) {
-                    return true;
-                }
-                return false;
+                // Suppress the native approval text — we use approval cards instead.
+                return params.hint?.kind === "approval-pending";
             },
         },
     },
 });
+// ══════════════════════════════════════════════
+// ONBOARDING
+// ══════════════════════════════════════════════
 const lansengerOnboarding = {
     configuredCheck: (cfg) => {
         const section = cfg.channels?.["lansenger"];
@@ -746,6 +772,73 @@ const lansengerOnboarding = {
         return { ...cfg, channels };
     },
 };
+function buildApprovalCards(params) {
+    const { sessionKey, commandPreview, requestId, shortId, buttonScope, expireTime, allowedDecisions } = params;
+    const showSession = allowedDecisions.includes("allow-session");
+    const showAlways = allowedDecisions.includes("allow-always");
+    // --- zh card ---
+    const zhCard = {
+        head: {
+            title: "⚠️ 命令审批",
+            headStatus: { describe: "待审批", colour: "#FFB116", statusIcon: 1 },
+        },
+        body: {
+            title: "危险命令审批请求",
+            content: {
+                formatType: 1,
+                text: [
+                    "**会话 ID**", sessionKey, "",
+                    "**命令**", "```", commandPreview, "```", "",
+                    `> 按钮不可用时请发送命令审批：`, "",
+                    `> 执行一次`, "> ```", `> /approve ${shortId} allow-once`, "> ```", "",
+                    ...(showSession ? [`> 本会话有效`, "> ```", `> /approve ${shortId} allow-session`, "> ```", ""] : []),
+                    ...(showAlways ? [`> 永久允许`, "> ```", `> /approve ${shortId} allow-always`, "> ```", ""] : []),
+                    `> 拒绝执行`, "> ```", `> /approve ${shortId} deny`, "> ```",
+                ].join("\n"),
+            },
+        },
+        buttons: [
+            { text: "执行一次", buttonTheme: 1, permissionScope: buttonScope, callbackInfo: `once:${requestId}` },
+            ...(showSession ? [{ text: "本会话有效", buttonTheme: 2, permissionScope: buttonScope, callbackInfo: `session:${requestId}` }] : []),
+            ...(showAlways ? [{ text: "永久允许", buttonTheme: 3, permissionScope: buttonScope, callbackInfo: `always:${requestId}` }] : []),
+            { text: "拒绝执行", buttonTheme: 4, permissionScope: buttonScope, callbackInfo: `deny:${requestId}` },
+        ],
+        expireTime,
+    };
+    // --- en card ---
+    const enCard = {
+        head: {
+            title: "⚠️ Command Approval",
+            headStatus: { describe: "Pending", colour: "#FFB116", statusIcon: 1 },
+        },
+        body: {
+            title: "Dangerous Command Approval Request",
+            content: {
+                formatType: 1,
+                text: [
+                    "**Session**", sessionKey, "",
+                    "**Command**", "```", commandPreview, "```", "",
+                    `> If buttons are unavailable, use:`, "",
+                    `> Approve once`, "> ```", `> /approve ${shortId} allow-once`, "> ```", "",
+                    ...(showSession ? [`> This session`, "> ```", `> /approve ${shortId} allow-session`, "> ```", ""] : []),
+                    ...(showAlways ? [`> Always allow`, "> ```", `> /approve ${shortId} allow-always`, "> ```", ""] : []),
+                    `> Deny`, "> ```", `> /approve ${shortId} deny`, "> ```",
+                ].join("\n"),
+            },
+        },
+        buttons: [
+            { text: "Approve Once", buttonTheme: 1, permissionScope: buttonScope, callbackInfo: `once:${requestId}` },
+            ...(showSession ? [{ text: "This Session", buttonTheme: 2, permissionScope: buttonScope, callbackInfo: `session:${requestId}` }] : []),
+            ...(showAlways ? [{ text: "Always Allow", buttonTheme: 3, permissionScope: buttonScope, callbackInfo: `always:${requestId}` }] : []),
+            { text: "Deny", buttonTheme: 4, permissionScope: buttonScope, callbackInfo: `deny:${requestId}` },
+        ],
+        expireTime,
+    };
+    return { zh: zhCard, en: enCard };
+}
+// ══════════════════════════════════════════════
+// MAIN PLUGIN
+// ══════════════════════════════════════════════
 export const lansengerPlugin = {
     ...chatPlugin,
     setupWizard: lansengerSetupWizard,
@@ -801,6 +894,9 @@ export const lansengerPlugin = {
                 return { kind: "unsupported" };
             return { kind: "enabled" };
         },
+        delivery: {
+            shouldSuppressForwardingFallback: () => true,
+        },
         native: {
             describeDeliveryCapabilities: ({ cfg, accountId }) => ({
                 enabled: true,
@@ -833,6 +929,7 @@ export const lansengerPlugin = {
                     const req = request?.request ?? request;
                     const commandPreview = (req?.command ?? req?.summary ?? "").slice(0, 300);
                     const sessionKey = req?.sessionKey ?? "unknown";
+                    log.debug(`buildPendingPayload: command="${commandPreview.slice(0, 60)}" sessionKey="${sessionKey.slice(0, 40)}" requestKeys=${Object.keys(request ?? {}).join(",")} reqKeys=${Object.keys(req ?? {}).join(",")}`);
                     const requestId = request?.id ?? req?.id ?? "unknown";
                     const shortId = requestId.length > 8 ? requestId.slice(0, 8) : requestId;
                     const approverIds = resolveLansengerApprovers({ cfg, accountId: target?.accountId ?? null });
@@ -841,136 +938,31 @@ export const lansengerPlugin = {
                         : undefined;
                     // Expiration: view.expiresAtMs is absolute ms, compute remaining seconds
                     const expireTime = view?.expiresAtMs ? Math.max(1, Math.ceil((view.expiresAtMs - nowMs) / 1000)) : undefined;
-                    // "allow-always" is only available when the policy allows permanent approval
-                    const execAskPolicy = cfg?.approvals?.exec?.ask ?? "dangerous";
-                    const showAlways = execAskPolicy !== "always";
-                    const zhCard = {
-                        head: {
-                            title: "⚠️ 命令审批",
-                            headStatus: {
-                                describe: "待审批",
-                                colour: "#FFB116",
-                                statusIcon: 1,
-                            },
-                        },
-                        body: {
-                            title: "危险命令审批请求",
-                            content: {
-                                formatType: 1,
-                                text: [
-                                    `**会话 ID**`,
-                                    sessionKey,
-                                    "",
-                                    `**命令**`,
-                                    "```",
-                                    commandPreview,
-                                    "```",
-                                    "",
-                                    `> 按钮不可用时请发送命令审批：`,
-                                    "",
-                                    `> 执行一次`,
-                                    "> ```",
-                                    `> /approve ${shortId} allow-once`,
-                                    "> ```",
-                                    "",
-                                    `> 本会话有效`,
-                                    "> ```",
-                                    `> /approve ${shortId} allow-session`,
-                                    "> ```",
-                                    "",
-                                    ...(showAlways ? [
-                                        `> 永久允许`,
-                                        "> ```",
-                                        `> /approve ${shortId} allow-always`,
-                                        "> ```",
-                                        "",
-                                    ] : []),
-                                    `> 拒绝执行`,
-                                    "> ```",
-                                    `> /approve ${shortId} deny`,
-                                    "> ```",
-                                ].join("\n"),
-                            },
-                        },
-                        buttons: [
-                            { text: "执行一次", buttonTheme: 1, permissionScope: buttonScope, callbackInfo: `once:${requestId}` },
-                            { text: "本会话有效", buttonTheme: 2, permissionScope: buttonScope, callbackInfo: `session:${requestId}` },
-                            ...(showAlways ? [{ text: "永久允许", buttonTheme: 3, permissionScope: buttonScope, callbackInfo: `always:${requestId}` }] : []),
-                            { text: "拒绝执行", buttonTheme: 4, permissionScope: buttonScope, callbackInfo: `deny:${requestId}` },
-                        ],
+                    // Use the framework's allowedDecisions to determine which buttons to show.
+                    // When exec.ask is "always", only allow-once + deny are available (no session/always).
+                    const allowedDecisions = req?.allowedDecisions ?? ["allow-once", "allow-session", "allow-always", "deny"];
+                    log.debug(`buildPendingPayload: allowedDecisions=${allowedDecisions.join(",")}`);
+                    const { zh: zhCard, en: enCard } = buildApprovalCards({
+                        sessionKey,
+                        commandPreview,
+                        requestId,
+                        shortId,
+                        buttonScope,
                         expireTime,
-                    };
-                    const enCard = {
-                        head: {
-                            title: "⚠️ Command Approval",
-                            headStatus: {
-                                describe: "Pending",
-                                colour: "#FFB116",
-                                statusIcon: 1,
-                            },
-                        },
-                        body: {
-                            title: "Dangerous Command Approval Request",
-                            content: {
-                                formatType: 1,
-                                text: [
-                                    `**Session**`,
-                                    sessionKey,
-                                    "",
-                                    `**Command**`,
-                                    "```",
-                                    commandPreview,
-                                    "```",
-                                    "",
-                                    `> If buttons are unavailable, use:`,
-                                    "",
-                                    `> Approve once`,
-                                    "> ```",
-                                    `> /approve ${shortId} allow-once`,
-                                    "> ```",
-                                    "",
-                                    `> This session`,
-                                    "> ```",
-                                    `> /approve ${shortId} allow-session`,
-                                    "> ```",
-                                    "",
-                                    ...(showAlways ? [
-                                        `> Always allow`,
-                                        "> ```",
-                                        `> /approve ${shortId} allow-always`,
-                                        "> ```",
-                                        "",
-                                    ] : []),
-                                    `> Deny`,
-                                    "> ```",
-                                    `> /approve ${shortId} deny`,
-                                    "> ```",
-                                ].join("\n"),
-                            },
-                        },
-                        buttons: [
-                            { text: "Approve Once", buttonTheme: 1, permissionScope: buttonScope, callbackInfo: `once:${requestId}` },
-                            { text: "This Session", buttonTheme: 2, permissionScope: buttonScope, callbackInfo: `session:${requestId}` },
-                            ...(showAlways ? [{ text: "Always Allow", buttonTheme: 3, permissionScope: buttonScope, callbackInfo: `always:${requestId}` }] : []),
-                            { text: "Deny", buttonTheme: 4, permissionScope: buttonScope, callbackInfo: `deny:${requestId}` },
-                        ],
-                        expireTime,
-                    };
+                        allowedDecisions,
+                    });
                     return { type: "approveCard", zh: zhCard, en: enCard, isDynamic: true, requestId, sessionKey };
                 },
                 buildResolvedResult: ({ cfg, resolved, entry }) => {
-                    // When resolved.kind and strategy are both undefined, the resolution
-                    // hasn't completed yet (e.g. resolveApprovalOverGateway is still in
-                    // progress). Skip the update — the callback handler already updated
-                    // the card, and the SDK will call us again once the resolution is final.
+                    // Dump all params to understand the resolved structure from native approval runtime
+                    const resolvedType = typeof resolved;
+                    const resolvedKeys = resolved && typeof resolved === "object" ? Object.keys(resolved) : [];
+                    const resolvedRaw = resolved && typeof resolved === "object" ? JSON.stringify(resolved).slice(0, 200) : String(resolved);
+                    log.debug(`buildResolvedResult: resolved.type=${resolvedType} keys=[${resolvedKeys.join(",")}] raw=${resolvedRaw} entryKeys=${entry ? Object.keys(entry).join(",") : "no-entry"}`);
                     const kindFromStrategy = resolved?.strategy?.kind;
                     const kindFromResolved = resolved?.kind;
-                    if (kindFromStrategy === undefined && kindFromResolved === undefined) {
-                        log.debug(`buildResolvedResult: resolution not yet complete, skipping update`);
-                        return { kind: "noop" };
-                    }
-                    const strategyKind = kindFromStrategy ?? kindFromResolved ?? "deny";
-                    log.debug(`buildResolvedResult: resolved.kind=${kindFromResolved} resolved.strategy?.kind=${kindFromStrategy} strategyKind=${strategyKind}`);
+                    const decisionFromResolved = resolved?.decision; // webchat/control-ui resolution
+                    const strategyKind = kindFromStrategy ?? kindFromResolved ?? decisionFromResolved ?? "deny";
                     // Button theme: 1=primary (allow-once), 2=secondary (allow-session), 3=secondary-black (allow-always), 4=warning (deny)
                     const buttonThemeMap = { "allow-once": 1, "allow-session": 2, "allow-always": 3, deny: 4 };
                     const resolvedButtonTheme = buttonThemeMap[strategyKind] ?? 4;
@@ -983,7 +975,7 @@ export const lansengerPlugin = {
                     return { kind: "update", payload: { status: "denied", strategyKind: "deny", buttonTheme: 4 } };
                 },
                 buildExpiredResult: ({ cfg, request, entry }) => {
-                    return { kind: "delete" };
+                    return { kind: "update", payload: { status: "denied", strategyKind: "expired" } };
                 },
             },
             transport: {
@@ -1063,6 +1055,20 @@ export const lansengerPlugin = {
             },
         },
     }),
+    message: createChannelMessageAdapterFromOutbound({
+        outbound: {
+            sendText: async (ctx) => {
+                const sdkSessionKey = ctx.sessionKey;
+                const sessionAccountId = sdkSessionKey ? getSessionAccountId(sdkSessionKey) : undefined;
+                const account = resolveAccount(ctx.cfg, sessionAccountId ?? ctx.accountId);
+                const client = getRunningClientByAccountId(account.appId) ?? makeClient(account);
+                log.debug(`message.sendText: to=${ctx.to} textLen=${ctx.text?.length ?? 0}`);
+                const result = await client.sendFormatText(ctx.to, ctx.text);
+                log.debug(`message.sendText: result — success=${result.success} messageId=${result.messageId ?? "none"}`);
+                return { messageId: result.messageId ?? "" };
+            },
+        },
+    }),
     commands: {
         nativeCommandsAutoEnabled: true,
         nativeSkillsAutoEnabled: true,