openclaw-openagent 1.0.6 → 1.0.8

package/dist/src/plugin-ui/ui-extension-loader/registry-regex.js

@@ -235,27 +235,28 @@ const toolcardRender = {
         if (hasManualCollapseWrapper) {
             const wrapperFn = findFunctionByAnchor(content, wrapperAnchor);
             if (!wrapperFn) {
-                logger.warn('[ui-ext:regex] toolcard-render: manual collapse wrapper function not found');
-                return false;
+                logger.warn('[ui-ext:regex] toolcard-render: manual collapse wrapper function not found, skipping wrapper patch');
             }
-            if (!wrapperFn.body.includes('chat-tool-msg-body') || !wrapperFn.body.includes('onToggleExpanded')) {
-                logger.warn('[ui-ext:regex] toolcard-render: manual collapse wrapper shape mismatch');
-                return false;
+            else if (!wrapperFn.body.includes('chat-tool-msg-body') || !wrapperFn.body.includes('onToggleExpanded')) {
+                logger.warn('[ui-ext:regex] toolcard-render: manual collapse wrapper shape mismatch, skipping wrapper patch');
             }
-            const wrapperReturnTagMatch = wrapperFn.body.match(/return\s+([a-zA-Z_$]\w*)\s*`/);
-            if (!wrapperReturnTagMatch) {
-                logger.warn('[ui-ext:regex] toolcard-render: manual collapse Lit html tag not found');
-                return false;
+            else {
+                const wrapperReturnTagMatch = wrapperFn.body.match(/return\s+([a-zA-Z_$]\w*)\s*`/);
+                if (!wrapperReturnTagMatch) {
+                    logger.warn('[ui-ext:regex] toolcard-render: manual collapse Lit html tag not found, skipping wrapper patch');
+                }
+                else {
+                    const wrapperHtmlVar = wrapperReturnTagMatch[1];
+                    const wrapperParams = wrapperFn.params.split(',').map((s) => s.trim());
+                    const wrapperCardParam = wrapperParams[0] || 'e';
+                    const wrapperOptionsParam = wrapperParams[1] || '';
+                    const wrapperSidebarArg = wrapperOptionsParam ? `${wrapperOptionsParam}&&${wrapperOptionsParam}.onOpenSidebar` : 'undefined';
+                    const wrapperHook = `${marker}if(window.__openagentRenderToolCard){let __cl=window.__openagentRenderToolCard(${wrapperCardParam},${wrapperSidebarArg});if(__cl)return ${wrapperHtmlVar}\`\${__cl}\`}`;
+                    content = content.substring(0, wrapperFn.bodyStart) + wrapperHook + content.substring(wrapperFn.bodyStart);
+                    patchedWrapper = true;
+                    logger.info(`[ui-ext:regex] toolcard-render: patched manual wrapper ${wrapperFn.funcName}(${wrapperFn.params.substring(0, 20)}) html=${wrapperHtmlVar}`);
+                }
             }
-            const wrapperHtmlVar = wrapperReturnTagMatch[1];
-            const wrapperParams = wrapperFn.params.split(',').map((s) => s.trim());
-            const wrapperCardParam = wrapperParams[0] || 'e';
-            const wrapperOptionsParam = wrapperParams[1] || '';
-            const wrapperSidebarArg = wrapperOptionsParam ? `${wrapperOptionsParam}&&${wrapperOptionsParam}.onOpenSidebar` : 'undefined';
-            const wrapperHook = `${marker}if(window.__openagentRenderToolCard){let __cl=window.__openagentRenderToolCard(${wrapperCardParam},${wrapperSidebarArg});if(__cl)return ${wrapperHtmlVar}\`\${__cl}\`}`;
-            content = content.substring(0, wrapperFn.bodyStart) + wrapperHook + content.substring(wrapperFn.bodyStart);
-            patchedWrapper = true;
-            logger.info(`[ui-ext:regex] toolcard-render: patched manual wrapper ${wrapperFn.funcName}(${wrapperFn.params.substring(0, 20)}) html=${wrapperHtmlVar}`);
         }
         // 4.11+ also renders tool-result messages through the grouped message
         // renderer itself instead of nb(). That path only calls the inner ToolCard
@@ -267,12 +268,12 @@ const toolcardRender = {
             let toolMessageOk = true;
             const toolMessageFn = findFunctionByAnchor(content, toolMessageAnchor, 8000);
             if (!toolMessageFn) {
-                logger.warn('[ui-ext:regex] toolcard-render: tool message wrapper function not found');
+                logger.warn('[ui-ext:regex] toolcard-render: tool message wrapper function not found, skipping');
                 toolMessageOk = false;
             }
             if (toolMessageOk && (!toolMessageFn.body.includes('chat-tool-msg-collapse--manual')
                 || !toolMessageFn.body.includes('chat-tool-msg-body'))) {
-                logger.warn('[ui-ext:regex] toolcard-render: tool message wrapper shape mismatch');
+                logger.warn('[ui-ext:regex] toolcard-render: tool message wrapper shape mismatch, skipping');
                 toolMessageOk = false;
             }
             let toolMessageHtmlVar = '';
@@ -287,35 +288,56 @@ const toolcardRender = {
                 }
             }
             if (toolMessageOk) {
+                // 双模式匹配单卡 guard：
+                //   Shape A (2026.4.x): ,Z=X.length===1?X[0]:null,Y=Z&&!A&&!B?
+                //   Shape B (2026.5.x): ,N=u.length===1?u[0]:null,...ae=P?`Tool error`:ne&&!C&&!h?ne:...
                 const singleCardMatch = toolMessageFn.body.match(/(?:let\s+|,)([a-zA-Z_$]\w*)=([a-zA-Z_$]\w*)\.length===1\?\2\[0\]:null,\w+=\1&&!([a-zA-Z_$]\w*)&&!([a-zA-Z_$]\w*)\?/);
-                if (!singleCardMatch) {
-                    logger.warn('[ui-ext:regex] toolcard-render: tool message single-card guard not found');
+                let cardsVar = '';
+                let mediaVar = '';
+                if (singleCardMatch) {
+                    // Shape A: old bundle
+                    cardsVar = singleCardMatch[2];
+                    mediaVar = singleCardMatch[4];
+                }
+                else {
+                    // Shape B: 2026.5.x bundle
+                    const shapeB = toolMessageFn.body.match(/,(?:let\s+)?([a-zA-Z_$]\w*)=([a-zA-Z_$]\w*)\.length===1\?\2\[0\]:null/);
+                    if (!shapeB) {
+                        logger.warn('[ui-ext:regex] toolcard-render: tool message single-card guard not found');
+                        toolMessageOk = false;
+                    }
+                    else {
+                        cardsVar = shapeB[2];
+                        // 从 ae=P?`Tool error`:ne&&!C&&!h 中提取排除变量 C, h
+                        const aeMatch = toolMessageFn.body.match(/,\w+=\w+\?`Tool error`:(\w+)&&!(\w+)&&!(\w+)\?/);
+                        if (aeMatch) {
+                            mediaVar = `(${aeMatch[2]}||${aeMatch[3]})`;
+                        }
+                        else {
+                            mediaVar = 'false';
+                        }
+                    }
+                }
+                const chatBubbleClassMatch = toolMessageFn.body.match(/[,;]([a-zA-Z_$]\w*)=\[`chat-bubble`,/);
+                if (!chatBubbleClassMatch) {
+                    logger.warn('[ui-ext:regex] toolcard-render: tool message chat-bubble class var not found');
                     toolMessageOk = false;
                 }
                 if (toolMessageOk) {
-                    const cardsVar = singleCardMatch[2];
-                    const mediaVar = singleCardMatch[4];
-                    const chatBubbleClassMatch = toolMessageFn.body.match(/[,;]([a-zA-Z_$]\w*)=\[`chat-bubble`,/);
-                    if (!chatBubbleClassMatch) {
-                        logger.warn('[ui-ext:regex] toolcard-render: tool message chat-bubble class var not found');
+                    const chatBubbleClassVar = chatBubbleClassMatch[1];
+                    const toolMessageParams = toolMessageFn.params.split(',').map((s) => s.trim());
+                    const toolMessageSidebarArg = toolMessageParams[3] || 'undefined';
+                    const toolMessageReturnIdx = toolMessageFn.body.indexOf(`return ${toolMessageHtmlVar}\``);
+                    if (toolMessageReturnIdx < 0) {
+                        logger.warn('[ui-ext:regex] toolcard-render: tool message return anchor not found');
                         toolMessageOk = false;
                     }
                     if (toolMessageOk) {
-                        const chatBubbleClassVar = chatBubbleClassMatch[1];
-                        const toolMessageParams = toolMessageFn.params.split(',').map((s) => s.trim());
-                        const toolMessageSidebarArg = toolMessageParams[3] || 'undefined';
-                        const toolMessageReturnIdx = toolMessageFn.body.indexOf(`return ${toolMessageHtmlVar}\``);
-                        if (toolMessageReturnIdx < 0) {
-                            logger.warn('[ui-ext:regex] toolcard-render: tool message return anchor not found');
-                            toolMessageOk = false;
-                        }
-                        if (toolMessageOk) {
-                            const toolMessageHook = `${marker}let __openagentToolMsgCard=null;if(!${mediaVar}&&window.__openagentRenderToolCard){for(let __openagentI=${cardsVar}.length-1;__openagentI>=0&&!__openagentToolMsgCard;__openagentI--){let __openagentCandidate=${cardsVar}[__openagentI];if(__openagentCandidate&&(__openagentCandidate.outputText||__openagentCandidate.text))__openagentToolMsgCard=window.__openagentRenderToolCard(__openagentCandidate,${toolMessageSidebarArg})}for(let __openagentI=0;__openagentI<${cardsVar}.length&&!__openagentToolMsgCard;__openagentI++){__openagentToolMsgCard=window.__openagentRenderToolCard(${cardsVar}[__openagentI],${toolMessageSidebarArg})}}if(__openagentToolMsgCard)return ${toolMessageHtmlVar}\`<div class="\${${chatBubbleClassVar}}">\${__openagentToolMsgCard}</div>\`;`;
-                            const toolMessageInsertAt = toolMessageFn.bodyStart + toolMessageReturnIdx;
-                            content = content.substring(0, toolMessageInsertAt) + toolMessageHook + content.substring(toolMessageInsertAt);
-                            patchedToolMessageWrapper = true;
-                            logger.info(`[ui-ext:regex] toolcard-render: patched tool message wrapper ${toolMessageFn.funcName}(${toolMessageFn.params.substring(0, 20)}) html=${toolMessageHtmlVar}`);
-                        }
+                        const toolMessageHook = `${marker}let __openagentToolMsgCard=null;console.log('[openagent] toolMsg hook: cards='+${cardsVar}.length+' mediaVar='+${mediaVar});if(!${mediaVar}&&window.__openagentRenderToolCard){for(let __openagentI=${cardsVar}.length-1;__openagentI>=0&&!__openagentToolMsgCard;__openagentI--){let __openagentCandidate=${cardsVar}[__openagentI];if(__openagentCandidate&&(__openagentCandidate.outputText||__openagentCandidate.text))__openagentToolMsgCard=window.__openagentRenderToolCard(__openagentCandidate,${toolMessageSidebarArg})}for(let __openagentI=0;__openagentI<${cardsVar}.length&&!__openagentToolMsgCard;__openagentI++){__openagentToolMsgCard=window.__openagentRenderToolCard(${cardsVar}[__openagentI],${toolMessageSidebarArg})}}if(__openagentToolMsgCard)return ${toolMessageHtmlVar}\`<div class="\${${chatBubbleClassVar}}">\${__openagentToolMsgCard}</div>\`;`;
+                        const toolMessageInsertAt = toolMessageFn.bodyStart + toolMessageReturnIdx;
+                        content = content.substring(0, toolMessageInsertAt) + toolMessageHook + content.substring(toolMessageInsertAt);
+                        patchedToolMessageWrapper = true;
+                        logger.info(`[ui-ext:regex] toolcard-render: patched tool message wrapper ${toolMessageFn.funcName}(${toolMessageFn.params.substring(0, 20)}) html=${toolMessageHtmlVar}`);
                     }
                 }
             }
@@ -613,11 +635,36 @@ const remoteAgentMessageShortCircuit = {
             logger.info(`[ui-ext:regex] remote-agent-msg: patched (strategy C, sc=${scVar})`);
             return true;
         }
+        // Strategy D (v5.17+ fallback): search for any if-condition referencing
+        // hasToolCards alongside a role-like variable — v5.17+ may replace the
+        // ternary/compound patterns of A/B/C with a different expression shape.
+        const strategyDRe = new RegExp(`if\\(!` + `([a-zA-Z_$][a-zA-Z0-9_$]*)\\s*&&\\s*` +
+            hasToolCardsVar + `\\s*&&\\s*([a-zA-Z_$][a-zA-Z0-9_$]*)\\s*\\)`);
+        const strategyDMatch = content.match(strategyDRe);
+        if (strategyDMatch) {
+            const markdownVarD = strategyDMatch[1];
+            const isToolResultVarD = strategyDMatch[2];
+            const dMatchFull = strategyDMatch[0];
+            const dIdx = strategyDMatch.index;
+            const patched = `if(` + marker +
+                `(!` + markdownVarD + `||window.__openagentOwnsToolCards&&window.__openagentOwnsToolCards(` +
+                toolCardsVar + `))&&` + hasToolCardsVar + `&&` + isToolResultVarD + `)`;
+            content = content.substring(0, dIdx) + patched + content.substring(dIdx + dMatchFull.length);
+            writeFileSync(bundlePath, content, 'utf-8');
+            logger.info(`[ui-ext:regex] remote-agent-msg: patched (strategy D, md=${markdownVarD})`);
+            return true;
+        }
         // 策略B (v4.11~v4.1x fallback): compound = hasToolCards && (showToolCalls ?? !0)
         const compoundRe = new RegExp(`(\\w+)=${hasToolCardsVar}&&\\(\\w+\\.showToolCalls\\?\\?!0\\)`);
         const compoundMatch = content.match(compoundRe);
         if (!compoundMatch) {
-            logger.warn('[ui-ext:regex] remote-agent-msg: all strategies (A/C/B) failed');
+            // All strategies (A/C/D/B) failed — dump context for diagnostics
+            const anchorHintIdx = content.indexOf(hasToolCardsVar);
+            const ctxStart = anchorHintIdx > 200 ? anchorHintIdx - 200 : 0;
+            const ctxEnd = Math.min(anchorHintIdx + 200, content.length);
+            logger.warn(`[ui-ext:regex] remote-agent-msg: all strategies (A/C/D/B) failed for toolCards=${toolCardsVar}. ` +
+                `Context around hasToolCardsVar (at ${anchorHintIdx}): ` +
+                content.substring(ctxStart, ctxEnd));
             return false;
         }
         const compoundVar = compoundMatch[1];
@@ -670,14 +717,15 @@ const mentionHooks = {
         const markerA = makeMarker(this.id);
         const hookA = `${markerA}if(window.__clMention?.onKeyDown(${eventParam}))return;`;
         content = content.substring(0, keydownInsertIdx) + hookA + content.substring(keydownInsertIdx);
-        // 注入点 B: handleInput — 支持三种形态
+        // 注入点 B: handleInput — 四种形态兼容
         // Shape A (old):       .onDraftChange(target.value)}}
         // Shape B (4.11~4.x):  .onDraftChange(target.value)        (arrow function 内)
-        // Shape C (2026.6.x):  be=t=>{let n=t.target;pL(e,n.value)} — 引入 pL helper，
-        //                      arrow body 末尾不再出现 onDraftChange 字面
+        // Shape C (2026.6.x):  be=t=>{let n=t.target;pL(e,n.value)} — 引入 pL helper
+        // Shape D (generic):   .onDraftChange(任意.target.value) 不加结尾限制
         const inputReA = /\.onDraftChange\(([a-zA-Z_$][a-zA-Z0-9_$]*)\.value\)\}\}/;
         const inputReB = /\.onDraftChange\(([a-zA-Z_$][a-zA-Z0-9_$]*)\.value\)/;
         const inputReC = /let ([a-zA-Z_$][a-zA-Z0-9_$]*)=[a-zA-Z_$][a-zA-Z0-9_$]*\.target;[a-zA-Z_$][a-zA-Z0-9_$]*\([a-zA-Z_$][a-zA-Z0-9_$]*,\1\.value\)\}/;
+        const inputReD = /\.onDraftChange\(([a-zA-Z_$][a-zA-Z0-9_$]*)\.target\.value\)/;
         let inputMatch = content.match(inputReA);
         let inputShape = 'A';
         if (!inputMatch) {
@@ -689,12 +737,22 @@ const mentionHooks = {
             inputShape = 'B';
         }
         if (!inputMatch) {
-            logger.warn('[ui-ext:regex] mention-hooks: input anchor not found (Shape A/B/C all missed)');
+            inputMatch = content.match(inputReD);
+            inputShape = 'D';
+        }
+        if (!inputMatch) {
+            // All shapes missed — dump context for diagnostics
+            const draftHintIdx = content.indexOf('.onDraftChange');
+            const ctxStart = draftHintIdx > 200 ? draftHintIdx - 200 : 0;
+            const ctxEnd = Math.min(draftHintIdx + 200, content.length);
+            logger.warn(`[ui-ext:regex] mention-hooks: input anchor not found (Shape A/B/C/D all missed). ` +
+                `Context around onDraftChange (at ${draftHintIdx}): ` +
+                content.substring(ctxStart, ctxEnd));
             return false;
         }
         const targetVar = inputMatch[1];
         const inputAnchorIdx = content.indexOf(inputMatch[0]);
-        // Shape A: }} 之前；Shape C: 末尾 } 之前；Shape B: ) 之后
+        // Shape A: }} 之前；Shape C: 末尾 } 之前；Shape B/D: ) 之后
         const draftCallEnd = inputShape === 'A'
             ? inputAnchorIdx + inputMatch[0].length - 2
             : inputShape === 'C'

package/dist/src/util/url-resolver.d.ts

@@ -5,3 +5,11 @@
  * Used by remote-agent-tool (WebUI continuation) and download-file-tool (artifact download).
  */
 export declare function resolveOasnAccessUrl(accessApiBase: string | undefined, url: string): string;
+/**
+ * Resolve a WebUI continuation URL for user-facing browser clicks.
+ *
+ * WebUI auth is Owner-cookie based, so the clickable URL must use the same
+ * public origin as the claim/login flow. API-key calls can use an internal
+ * Access base, but browser links cannot reuse cookies across IP/domain origins.
+ */
+export declare function resolveOasnWebuiUrl(accessApiBase: string | undefined, claimUrl: string | undefined, url: string): string;

package/dist/src/util/url-resolver.js

@@ -18,3 +18,43 @@ export function resolveOasnAccessUrl(accessApiBase, url) {
         return url;
     }
 }
+/**
+ * Resolve a WebUI continuation URL for user-facing browser clicks.
+ *
+ * WebUI auth is Owner-cookie based, so the clickable URL must use the same
+ * public origin as the claim/login flow. API-key calls can use an internal
+ * Access base, but browser links cannot reuse cookies across IP/domain origins.
+ */
+export function resolveOasnWebuiUrl(accessApiBase, claimUrl, url) {
+    if (!url)
+        return url;
+    const claimOrigin = originOf(claimUrl);
+    if (!claimOrigin || !isWebuiUrl(url, accessApiBase || claimOrigin)) {
+        return resolveOasnAccessUrl(accessApiBase, url);
+    }
+    try {
+        const absolute = new URL(url, accessApiBase || claimOrigin);
+        return new URL(`${absolute.pathname}${absolute.search}${absolute.hash}`, claimOrigin).toString();
+    }
+    catch {
+        return resolveOasnAccessUrl(accessApiBase, url);
+    }
+}
+function originOf(value) {
+    if (!value)
+        return undefined;
+    try {
+        return new URL(value).origin;
+    }
+    catch {
+        return undefined;
+    }
+}
+function isWebuiUrl(url, base) {
+    try {
+        return new URL(url, base).pathname.startsWith('/webui/');
+    }
+    catch {
+        return false;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-openagent",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "type": "module",
   "description": "OpenAgent channel plugin for OpenClaw",
   "license": "MIT",

package/src/app/remote-agent-tool.ts

@@ -29,7 +29,7 @@ import { sendC2CCustomMessage, waitForC2CReply } from '../tim/c2c.js';
 import type { OasnTransport, TaskHandle, TaskRequest } from '../transport/types.js';
 import fs from 'node:fs';
 import nodePath from 'node:path';
-import { resolveOasnAccessUrl } from '../util/url-resolver.js';
+import { resolveOasnAccessUrl, resolveOasnWebuiUrl } from '../util/url-resolver.js';
 
 // ── Helpers ──
 
@@ -242,7 +242,7 @@ export function createCallRemoteAgentTool(): ToolDescriptor {
       //     listUnsettledInvocations() 续轮询，避免重复扣费
       const requestId = generateRequestId();
       const TIMEOUT_MS = 15 * 60 * 1000; // 15 分钟：远程 agent 可能跑长工具
-      const OASN_INVOCATION_TIMEOUT_MS = 60_000; // compute02 REL 当前允许的 ServiceAgent 执行预算
+      const OASN_INVOCATION_TIMEOUT_MS = 24 * 60 * 60 * 1000; // 24 小时
 
       logger.info(
         `[remote-tool] Calling remote agent: agentId=${agentId} requestId=${requestId} ` +
@@ -350,7 +350,8 @@ export function createCallRemoteAgentTool(): ToolDescriptor {
           const accessBase = rt.config?.accessApiBase || rt.config?.apiBase;
           if (result.webuiContinuation?.launchUrl) {
             const rawLink = result.webuiContinuation.launchUrl;
-            const link = resolveOasnAccessUrl(accessBase, rawLink);
+            const claimUrl = rt.config?.claimUrl;
+            const link = resolveOasnWebuiUrl(accessBase, claimUrl, rawLink);
             const label = result.webuiContinuation.displayName || 'Open WebUI';
             content = content.trim()
               ? `${content}\n\n${label}: ${link}`

package/src/compat.ts

@@ -15,6 +15,9 @@ export const PLUGIN_VERSION = '1.0.0';
 
 export const SUPPORTED_HOST_MIN = '2026.3.22';
 
+/** Plugin has been verified up to this OpenClaw host version */
+export const MAX_TESTED_VERSION = '2026.6.30';
+
 export interface OpenClawVersion {
   year: number;
   month: number;
@@ -71,6 +74,15 @@ export function assertHostCompatibility(hostVersion: string | undefined): void {
   }
   if (isHostVersionSupported(hostVersion)) {
     logger.info(`[compat] Host OpenClaw ${hostVersion} >= ${SUPPORTED_HOST_MIN}, OK.`);
+    // Warn but don't block for versions beyond tested range
+    const host = parseOpenClawVersion(hostVersion);
+    const max = parseOpenClawVersion(MAX_TESTED_VERSION);
+    if (host && max && compareVersions(host, max) > 0) {
+      logger.warn(
+        `[compat] Host OpenClaw ${hostVersion} is beyond max tested version ${MAX_TESTED_VERSION}. ` +
+        `The plugin may encounter compatibility issues.`,
+      );
+    }
     return;
   }
   throw new Error(