openclaw-openagent 1.0.2 → 1.0.4

package/dist/src/app/download-file-tool.js

@@ -71,7 +71,7 @@ export function createDownloadFileTool() {
                 return fail('OASN transport not ready');
             }
             // ② Resolve download URL
-            const accessBase = rt.config?.accessApiBase;
+            const accessBase = rt.config?.accessApiBase || rt.config?.apiBase;
             const downloadUrl = resolveOasnAccessUrl(accessBase, contentUrl);
             logger.info(`[download-tool] Downloading artifact: url=${downloadUrl} saveTo=${savePath}`);
             // ③ Download

package/dist/src/app/remote-agent-tool.js

@@ -290,7 +290,7 @@ export function createCallRemoteAgentTool() {
                     // 在 visible_result.webui_continuation 里返回可继续交互的入口。
                     if (result.webuiContinuation?.launchUrl) {
                         const rawLink = result.webuiContinuation.launchUrl;
-                        const accessBase = rt.config?.accessApiBase;
+                        const accessBase = rt.config?.accessApiBase || rt.config?.apiBase;
                         const link = resolveOasnAccessUrl(accessBase, rawLink);
                         const label = result.webuiContinuation.displayName || 'Open WebUI';
                         content = content.trim()

package/dist/src/plugin-ui/assets/openagent-override.js

@@ -2,7 +2,7 @@
  * OpenAgent UI Override — Auto-generated, do not edit directly!
  *
  * Source: src/plugin-ui/modules/
- * Built:  2026-06-25T03:47:26.820Z
+ * Built:  2026-06-25T07:10:51.968Z
  *
  * To modify, edit the source modules and run:
  *   npm run build:override
@@ -2891,7 +2891,16 @@ liveTextarea.dispatchEvent(new Event('change', { bubbles: true }));
 // tryInject() 只做 DOM 注入（@ 按钮 + CSS class），不绑定任何事件。
 
 // ── textarea 选择器（全局复用）──
-const _CL_TEXTAREA_SELECTOR = 'textarea[placeholder*="Message"], textarea[placeholder*="Enter to send"]';
+// 多策略回退：v3 "Message..." / v4 "发消息..." / 结构化选择器
+const _CL_TEXTAREA_SELECTOR = [
+  'textarea[placeholder*="发消息"]',
+  'textarea[placeholder*="Message"]',
+  'textarea[placeholder*="Enter to send"]',
+  '.agent-chat__composer-combobox textarea',
+  '.chat-composer textarea',
+  '.chat-input textarea',
+  '[class*="composer"] textarea:not([placeholder*="Search"])',
+].join(', ');
 
 function _getTextarea() {
   return document.querySelector(_CL_TEXTAREA_SELECTOR);
@@ -2929,7 +2938,8 @@ function _isLikelyNativeSendButton(target, textarea) {
   if (!button || !textarea) return false;
   if (button.classList && button.classList.contains('openagent-at-btn')) return false;
 
-  const inputContainer = textarea.closest('.chat-input')
+  const inputContainer = textarea.closest('.agent-chat__composer-combobox')
+                      || textarea.closest('.chat-input')
                       || textarea.closest('[class*="chat-composer"]')
                       || textarea.closest('[class*="chat"]')
                       || textarea.parentElement;
@@ -3086,7 +3096,8 @@ function tryInject() {
   }
 
   // ── 给输入区域加 position: relative 包裹层 ──
-  const inputContainer = textarea.closest('.chat-input')
+  const inputContainer = textarea.closest('.agent-chat__composer-combobox')
+                      || textarea.closest('.chat-input')
                       || textarea.closest('[class*="chat-composer"]')
                       || textarea.closest('[class*="chat"]')
                       || textareaParent?.parentElement

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

@@ -264,47 +264,61 @@ const toolcardRender = {
         const toolMessageAnchor = 'toolmsg:${';
         let patchedToolMessageWrapper = false;
         if (content.includes(toolMessageAnchor)) {
+            let toolMessageOk = true;
             const toolMessageFn = findFunctionByAnchor(content, toolMessageAnchor, 8000);
             if (!toolMessageFn) {
                 logger.warn('[ui-ext:regex] toolcard-render: tool message wrapper function not found');
-                return false;
+                toolMessageOk = false;
             }
-            if (!toolMessageFn.body.includes('chat-tool-msg-collapse--manual')
-                || !toolMessageFn.body.includes('chat-tool-msg-body')) {
+            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');
-                return false;
+                toolMessageOk = false;
             }
-            const toolMessageReturnTagMatch = toolMessageFn.body.match(/return\s+([a-zA-Z_$]\w*)\s*`/);
-            if (!toolMessageReturnTagMatch) {
-                logger.warn('[ui-ext:regex] toolcard-render: tool message Lit html tag not found');
-                return false;
-            }
-            const toolMessageHtmlVar = toolMessageReturnTagMatch[1];
-            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');
-                return false;
-            }
-            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');
-                return false;
+            let toolMessageHtmlVar = '';
+            if (toolMessageOk) {
+                const toolMessageReturnTagMatch = toolMessageFn.body.match(/return\s+([a-zA-Z_$]\w*)\s*`/);
+                if (!toolMessageReturnTagMatch) {
+                    logger.warn('[ui-ext:regex] toolcard-render: tool message Lit html tag not found');
+                    toolMessageOk = false;
+                }
+                else {
+                    toolMessageHtmlVar = toolMessageReturnTagMatch[1];
+                }
             }
-            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');
-                return false;
+            if (toolMessageOk) {
+                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');
+                    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');
+                        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;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}`);
         }
         writeFileSync(bundlePath, content, 'utf-8');
         logger.info(`[ui-ext:regex] toolcard-render: patched ${funcName}(${params.substring(0, 20)}) html=${litHtmlVar}${patchedWrapper ? ' + wrapper' : ''}${patchedToolMessageWrapper ? ' + tool-message' : ''}`);
@@ -411,7 +425,7 @@ const toolcallidPropagate = {
         logger.debug(`[ui-ext:regex] toolcallid-propagate: mVar=${mVar} cards=${cardsVar} callLoop=${callLoopVar} resultLoop=${resultLoopVar}`);
         // 计算注入内容
         const marker = makeMarker(this.id);
-        const tcidCapture = `${marker}var __tcid=(typeof ${mVar}.toolCallId==='string'&&${mVar}.toolCallId)||(typeof ${mVar}.tool_call_id==='string'&&${mVar}.tool_call_id)||'';`;
+        const tcidCapture = `${marker}var __tcid=(typeof ${msgParam}.toolCallId==='string'&&${msgParam}.toolCallId)||(typeof ${msgParam}.tool_call_id==='string'&&${msgParam}.tool_call_id)||'';`;
         const inlinePatchCall = callLoopVar
             ? `,toolCallId:__tcid||${callLoopVar}.id||${callLoopVar}.toolCallId||${callLoopVar}.tool_call_id||''`
             : `,toolCallId:__tcid`;
@@ -423,16 +437,16 @@ const toolcallidPropagate = {
         const arrInitPattern = `,${cardsVar}=[];`;
         let arrInitIdx = funcBody.indexOf(arrInitPattern);
         if (arrInitIdx < 0) {
-            // v4.11+: 可能是 ,i=[]（后接分号或逗号之前的位置不同）
+            // v4.11+: 可能是 ,i=[]（后接逗号，如 a=[],o=...），不能直接插 var
             const altPattern = `,${cardsVar}=[]`;
             arrInitIdx = funcBody.indexOf(altPattern);
             if (arrInitIdx < 0) {
                 logger.warn('[ui-ext:regex] toolcallid-propagate: cards init not found');
                 return false;
             }
-            // 找到 ] 后面的分隔符位置
-            arrInitIdx += altPattern.length;
-            // captureInsertOffset 在 ; 或 , 之后
+            // altPattern 后面是逗号（逗号表达式），var 声明无法插入此处
+            // 改为插入到函数体开头，利用 var 提升特性
+            arrInitIdx = 0;
         }
         else {
             arrInitIdx += arrInitPattern.length;
@@ -630,7 +644,7 @@ const remoteAgentMessageShortCircuit = {
 // ── Extension 7: mention-hooks ───────────────────────────────────────────
 const mentionHooks = {
     id: 'mention-hooks',
-    version: 2,
+    version: 3,
     sharedFile: 'index-bundle',
     apply(controlUiDir) {
         const bundlePath = resolveBundlePath(controlUiDir);
@@ -643,9 +657,9 @@ const mentionHooks = {
         if (!backupFile(bundlePath))
             return false;
         // 注入点 A: handleKeyDown
-        // 匹配 return;if(key===Enter&&!shiftKey){if(isComposing 结构
-        // 兼容 2026.4.x: return;if (无 }) 和旧版 ;return}if (有 })
-        const keydownRe = /;return\}?if\(([a-zA-Z_$][a-zA-Z0-9_$]*)\.key===`Enter`&&!\1\.shiftKey\)\{if\(\1\.isComposing/;
+        // 锚定 ;return}if(X.key===`Enter`&&!X.shiftKey){
+        // 不再依赖内层 isComposing：2026.6.10 已把 isComposing 检查拆到独立 handler
+        const keydownRe = /;return\}if\(([a-zA-Z_$][a-zA-Z0-9_$]*)\.key===`Enter`&&!\1\.shiftKey\)\{/;
         const keydownMatch = content.match(keydownRe);
         if (!keydownMatch) {
             logger.warn('[ui-ext:regex] mention-hooks: keydown anchor not found');
@@ -656,31 +670,40 @@ 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 — 支持两种形态
-        // Shape A (old): .onDraftChange(target.value)}}
-        // Shape B (4.11/latest): .onDraftChange(target.value)  (在 arrow function 内，无 }})
+        // 注入点 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 字面
         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\)\}/;
         let inputMatch = content.match(inputReA);
         let inputShape = 'A';
+        if (!inputMatch) {
+            inputMatch = content.match(inputReC);
+            inputShape = 'C';
+        }
         if (!inputMatch) {
             inputMatch = content.match(inputReB);
             inputShape = 'B';
         }
         if (!inputMatch) {
-            logger.warn('[ui-ext:regex] mention-hooks: input anchor not found (neither Shape A nor B)');
+            logger.warn('[ui-ext:regex] mention-hooks: input anchor not found (Shape A/B/C all missed)');
             return false;
         }
         const targetVar = inputMatch[1];
         const inputAnchorIdx = content.indexOf(inputMatch[0]);
-        // 计算 onDraftChange(x.value) 调用结束位置
+        // Shape A: }} 之前；Shape C: 末尾 } 之前；Shape B: ) 之后
         const draftCallEnd = inputShape === 'A'
-            ? inputAnchorIdx + inputMatch[0].length - 2 // 在 }} 之前
-            : inputAnchorIdx + inputMatch[0].length; // 在 ) 之后
+            ? inputAnchorIdx + inputMatch[0].length - 2
+            : inputShape === 'C'
+                ? inputAnchorIdx + inputMatch[0].length - 1
+                : inputAnchorIdx + inputMatch[0].length;
         const hookB = `;window.__clMention?.onInput?.(${targetVar})`;
         content = content.substring(0, draftCallEnd) + hookB + content.substring(draftCallEnd);
         writeFileSync(bundlePath, content, 'utf-8');
-        logger.info(`[ui-ext:regex] mention-hooks: injected (event=${eventParam}, target=${targetVar})`);
+        logger.info(`[ui-ext:regex] mention-hooks: injected (shape=${inputShape}, event=${eventParam}, target=${targetVar})`);
         return true;
     },
     revert(controlUiDir) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-openagent",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "type": "module",
   "description": "OpenAgent channel plugin for OpenClaw",
   "license": "MIT",
@@ -75,7 +75,7 @@
     "@types/node": "^25.5.0",
     "@types/sql.js": "^1.4.11",
     "@types/yazl": "^3.3.1",
-    "openclaw": "^2026.6.9",
+    "openclaw": "^2026.6.10",
     "tsx": "^4.21.0",
     "typescript": "^6.0.2"
   }

package/src/app/download-file-tool.ts

@@ -93,7 +93,7 @@ export function createDownloadFileTool(): ToolDescriptor {
       }
 
       // ② Resolve download URL
-      const accessBase = rt.config?.accessApiBase;
+      const accessBase = rt.config?.accessApiBase || rt.config?.apiBase;
       const downloadUrl = resolveOasnAccessUrl(accessBase, contentUrl);
 
       logger.info(

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

@@ -349,7 +349,7 @@ export function createCallRemoteAgentTool(): ToolDescriptor {
           // 在 visible_result.webui_continuation 里返回可继续交互的入口。
           if (result.webuiContinuation?.launchUrl) {
             const rawLink = result.webuiContinuation.launchUrl;
-            const accessBase = rt.config?.accessApiBase;
+            const accessBase = rt.config?.accessApiBase || rt.config?.apiBase;
             const link = resolveOasnAccessUrl(accessBase, rawLink);
             const label = result.webuiContinuation.displayName || 'Open WebUI';
             content = content.trim()

package/src/plugin-ui/assets/openagent-override.js

@@ -2,7 +2,7 @@
  * OpenAgent UI Override — Auto-generated, do not edit directly!
  *
  * Source: src/plugin-ui/modules/
- * Built:  2026-06-25T03:47:26.820Z
+ * Built:  2026-06-25T07:10:51.968Z
  *
  * To modify, edit the source modules and run:
  *   npm run build:override
@@ -2891,7 +2891,16 @@ liveTextarea.dispatchEvent(new Event('change', { bubbles: true }));
 // tryInject() 只做 DOM 注入（@ 按钮 + CSS class），不绑定任何事件。
 
 // ── textarea 选择器（全局复用）──
-const _CL_TEXTAREA_SELECTOR = 'textarea[placeholder*="Message"], textarea[placeholder*="Enter to send"]';
+// 多策略回退：v3 "Message..." / v4 "发消息..." / 结构化选择器
+const _CL_TEXTAREA_SELECTOR = [
+  'textarea[placeholder*="发消息"]',
+  'textarea[placeholder*="Message"]',
+  'textarea[placeholder*="Enter to send"]',
+  '.agent-chat__composer-combobox textarea',
+  '.chat-composer textarea',
+  '.chat-input textarea',
+  '[class*="composer"] textarea:not([placeholder*="Search"])',
+].join(', ');
 
 function _getTextarea() {
   return document.querySelector(_CL_TEXTAREA_SELECTOR);
@@ -2929,7 +2938,8 @@ function _isLikelyNativeSendButton(target, textarea) {
   if (!button || !textarea) return false;
   if (button.classList && button.classList.contains('openagent-at-btn')) return false;
 
-  const inputContainer = textarea.closest('.chat-input')
+  const inputContainer = textarea.closest('.agent-chat__composer-combobox')
+                      || textarea.closest('.chat-input')
                       || textarea.closest('[class*="chat-composer"]')
                       || textarea.closest('[class*="chat"]')
                       || textarea.parentElement;
@@ -3086,7 +3096,8 @@ function tryInject() {
   }
 
   // ── 给输入区域加 position: relative 包裹层 ──
-  const inputContainer = textarea.closest('.chat-input')
+  const inputContainer = textarea.closest('.agent-chat__composer-combobox')
+                      || textarea.closest('.chat-input')
                       || textarea.closest('[class*="chat-composer"]')
                       || textarea.closest('[class*="chat"]')
                       || textareaParent?.parentElement

package/src/plugin-ui/modules/agent-book/panel/inject-ui.js

@@ -10,7 +10,16 @@
 // tryInject() 只做 DOM 注入（@ 按钮 + CSS class），不绑定任何事件。
 
 // ── textarea 选择器（全局复用）──
-const _CL_TEXTAREA_SELECTOR = 'textarea[placeholder*="Message"], textarea[placeholder*="Enter to send"]';
+// 多策略回退：v3 "Message..." / v4 "发消息..." / 结构化选择器
+const _CL_TEXTAREA_SELECTOR = [
+  'textarea[placeholder*="发消息"]',
+  'textarea[placeholder*="Message"]',
+  'textarea[placeholder*="Enter to send"]',
+  '.agent-chat__composer-combobox textarea',
+  '.chat-composer textarea',
+  '.chat-input textarea',
+  '[class*="composer"] textarea:not([placeholder*="Search"])',
+].join(', ');
 
 function _getTextarea() {
   return document.querySelector(_CL_TEXTAREA_SELECTOR);
@@ -48,7 +57,8 @@ function _isLikelyNativeSendButton(target, textarea) {
   if (!button || !textarea) return false;
   if (button.classList && button.classList.contains('openagent-at-btn')) return false;
 
-  const inputContainer = textarea.closest('.chat-input')
+  const inputContainer = textarea.closest('.agent-chat__composer-combobox')
+                      || textarea.closest('.chat-input')
                       || textarea.closest('[class*="chat-composer"]')
                       || textarea.closest('[class*="chat"]')
                       || textarea.parentElement;
@@ -205,7 +215,8 @@ function tryInject() {
   }
 
   // ── 给输入区域加 position: relative 包裹层 ──
-  const inputContainer = textarea.closest('.chat-input')
+  const inputContainer = textarea.closest('.agent-chat__composer-combobox')
+                      || textarea.closest('.chat-input')
                       || textarea.closest('[class*="chat-composer"]')
                       || textarea.closest('[class*="chat"]')
                       || textareaParent?.parentElement

package/src/plugin-ui/modules/agent-book/panel/theme-adapter.js

@@ -0,0 +1,86 @@
+// ── OpenAgent Theme Adapter ──
+//
+// 运行时检测 OpenClaw Control UI 主题系统（v4.x vscode tokens / v5.x glassmorphism），
+// 注入 --oa-* CSS 变量供 styles.js 中的 var() fallback 消费。
+//
+// 必须早于 styles.js 加载（由 build.cjs MANIFEST 顺序保证）。
+
+(function _clInitThemeAdapter() {
+  if (window.__openagentThemeAdapterInstalled) return;
+  window.__openagentThemeAdapterInstalled = true;
+
+  /**
+   * 检测当前 OC 主题系统类型。
+   * @returns {{ hasGlass: boolean, hasVscode: boolean, isDark: boolean }}
+   */
+  function detectThemeSystem() {
+    var cs = getComputedStyle(document.documentElement);
+    var hasGlass = !!(cs.getPropertyValue('--glass-surface').trim());
+    var hasKn = !!(cs.getPropertyValue('--kn-bg-primary').trim());
+    var hasVscode = !!(cs.getPropertyValue('--vscode-editor-background').trim());
+
+    // 多策略暗色检测：v4 data-theme-mode / v5 data-theme / prefers-color-scheme
+    var themeMode = document.documentElement.getAttribute('data-theme-mode')  // v4.x
+      || document.documentElement.getAttribute('data-theme')                 // v5.x
+      || '';
+    var isDark = themeMode.indexOf('dark') >= 0
+      || window.matchMedia('(prefers-color-scheme: dark)').matches;
+
+    return {
+      hasGlass: hasGlass || hasKn,
+      hasVscode: hasVscode,
+      isDark: isDark
+    };
+  }
+
+  /**
+   * 注入 --oa-* CSS 变量到 :root。
+   * styles.js 中的 var(--oa-xxx, fallback) 会优先取这些值。
+   */
+  function setupThemeVariables() {
+    var system = detectThemeSystem();
+    var root = document.documentElement;
+
+    if (system.hasGlass) {
+      // v5.x Glassmorphism: 使用 --glass-* / --kn-* token 族
+      root.style.setProperty('--oa-panel-bg', 'var(--glass-surface, var(--card))');
+      root.style.setProperty('--oa-panel-text', 'var(--kn-text-primary, var(--text, #e0e0e0))');
+      root.style.setProperty('--oa-card-bg', 'var(--glass-card, var(--card, #f5f5f5))');
+      root.style.setProperty('--oa-card-hover-bg', 'var(--glass-card-hover, var(--card-hover))');
+      root.style.setProperty('--oa-border', 'var(--glass-border, var(--border, #e5e5e5))');
+      root.style.setProperty('--oa-shadow-color', 'rgba(0, 0, 0, 0.08)');
+      root.style.setProperty('--oa-divider', 'var(--glass-divider, var(--border, #eee))');
+      root.style.setProperty('--oa-muted-text', 'var(--kn-text-secondary, var(--text-secondary, #999))');
+    } else if (system.hasVscode) {
+      // v4.x VSCode tokens: 使用 --vscode-* 变量
+      root.style.setProperty('--oa-panel-bg', 'var(--vscode-editor-background, #fff)');
+      root.style.setProperty('--oa-panel-text', 'var(--vscode-editor-foreground, #2F2F33)');
+      root.style.setProperty('--oa-card-bg', 'var(--vscode-sideBar-background, #f5f5f5)');
+      root.style.setProperty('--oa-card-hover-bg', 'var(--vscode-list-hoverBackground, #f0f0f0)');
+      root.style.setProperty('--oa-border', 'var(--vscode-panel-border, #e5e5e5)');
+      root.style.setProperty('--oa-shadow-color', 'rgba(0, 0, 0, 0.10)');
+      root.style.setProperty('--oa-divider', 'var(--vscode-sideBar-border, #eee)');
+      root.style.setProperty('--oa-muted-text', 'var(--vscode-descriptionForeground, #999)');
+    }
+    // 无特征 → 不注入变量，styles.js 中的 var() 会 fallback 到硬编码值
+
+    // 注入暗色 class 标记供 styles.js 选择器使用
+    if (system.isDark) {
+      root.style.setProperty('--oa-is-dark', '1');
+    } else {
+      root.style.setProperty('--oa-is-dark', '0');
+    }
+  }
+
+  // 立即执行 + 监听主题变更（v5.x 可能运行时切换主题）
+  setupThemeVariables();
+
+  // 监听 data-theme / data-theme-mode 属性变更
+  var themeObserver = new MutationObserver(function () {
+    setupThemeVariables();
+  });
+  themeObserver.observe(document.documentElement, {
+    attributes: true,
+    attributeFilter: ['data-theme', 'data-theme-mode', 'class']
+  });
+})();

package/src/plugin-ui/ui-extension-loader/registry-regex.ts

@@ -288,52 +288,64 @@ const toolcardRender: UIExtension = {
     const toolMessageAnchor = 'toolmsg:${';
     let patchedToolMessageWrapper = false;
     if (content.includes(toolMessageAnchor)) {
+      let toolMessageOk = true;
       const toolMessageFn = findFunctionByAnchor(content, toolMessageAnchor, 8000);
       if (!toolMessageFn) {
         logger.warn('[ui-ext:regex] toolcard-render: tool message wrapper function not found');
-        return false;
+        toolMessageOk = false;
       }
 
-      if (!toolMessageFn.body.includes('chat-tool-msg-collapse--manual')
-          || !toolMessageFn.body.includes('chat-tool-msg-body')) {
+      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');
-        return false;
+        toolMessageOk = false;
       }
 
-      const toolMessageReturnTagMatch = toolMessageFn.body.match(/return\s+([a-zA-Z_$]\w*)\s*`/);
-      if (!toolMessageReturnTagMatch) {
-        logger.warn('[ui-ext:regex] toolcard-render: tool message Lit html tag not found');
-        return false;
+      let toolMessageHtmlVar = '';
+      if (toolMessageOk) {
+        const toolMessageReturnTagMatch = toolMessageFn!.body.match(/return\s+([a-zA-Z_$]\w*)\s*`/);
+        if (!toolMessageReturnTagMatch) {
+          logger.warn('[ui-ext:regex] toolcard-render: tool message Lit html tag not found');
+          toolMessageOk = false;
+        } else {
+          toolMessageHtmlVar = toolMessageReturnTagMatch[1];
+        }
       }
-      const toolMessageHtmlVar = toolMessageReturnTagMatch[1];
 
-      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');
-        return false;
-      }
-      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');
-        return false;
-      }
-      const chatBubbleClassVar = chatBubbleClassMatch[1];
-      const toolMessageParams = toolMessageFn.params.split(',').map((s: string) => 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');
-        return false;
+      if (toolMessageOk) {
+        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');
+          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');
+            toolMessageOk = false;
+          }
+          if (toolMessageOk) {
+            const chatBubbleClassVar = chatBubbleClassMatch![1];
+            const toolMessageParams = toolMessageFn!.params.split(',').map((s: string) => 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;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}`);
     }
 
     writeFileSync(bundlePath, content, 'utf-8');
@@ -440,7 +452,7 @@ const toolcallidPropagate: UIExtension = {
 
     // 计算注入内容
     const marker = makeMarker(this.id);
-    const tcidCapture = `${marker}var __tcid=(typeof ${mVar}.toolCallId==='string'&&${mVar}.toolCallId)||(typeof ${mVar}.tool_call_id==='string'&&${mVar}.tool_call_id)||'';`;
+    const tcidCapture = `${marker}var __tcid=(typeof ${msgParam}.toolCallId==='string'&&${msgParam}.toolCallId)||(typeof ${msgParam}.tool_call_id==='string'&&${msgParam}.tool_call_id)||'';`;
 
     const inlinePatchCall = callLoopVar
       ? `,toolCallId:__tcid||${callLoopVar}.id||${callLoopVar}.toolCallId||${callLoopVar}.tool_call_id||''`
@@ -454,16 +466,16 @@ const toolcallidPropagate: UIExtension = {
     const arrInitPattern = `,${cardsVar}=[];`;
     let arrInitIdx = funcBody.indexOf(arrInitPattern);
     if (arrInitIdx < 0) {
-      // v4.11+: 可能是 ,i=[]（后接分号或逗号之前的位置不同）
+      // v4.11+: 可能是 ,i=[]（后接逗号，如 a=[],o=...），不能直接插 var
       const altPattern = `,${cardsVar}=[]`;
       arrInitIdx = funcBody.indexOf(altPattern);
       if (arrInitIdx < 0) {
         logger.warn('[ui-ext:regex] toolcallid-propagate: cards init not found');
         return false;
       }
-      // 找到 ] 后面的分隔符位置
-      arrInitIdx += altPattern.length;
-      // captureInsertOffset 在 ; 或 , 之后
+      // altPattern 后面是逗号（逗号表达式），var 声明无法插入此处
+      // 改为插入到函数体开头，利用 var 提升特性
+      arrInitIdx = 0;
     } else {
       arrInitIdx += arrInitPattern.length;
     }
@@ -672,7 +684,7 @@ const remoteAgentMessageShortCircuit: UIExtension = {
 
 const mentionHooks: UIExtension = {
   id: 'mention-hooks',
-  version: 2,
+  version: 3,
   sharedFile: 'index-bundle',
 
   apply(controlUiDir: string): boolean {
@@ -683,9 +695,9 @@ const mentionHooks: UIExtension = {
     if (!backupFile(bundlePath)) return false;
 
     // 注入点 A: handleKeyDown
-    // 匹配 return;if(key===Enter&&!shiftKey){if(isComposing 结构
-    // 兼容 2026.4.x: return;if (无 }) 和旧版 ;return}if (有 })
-    const keydownRe = /;return\}?if\(([a-zA-Z_$][a-zA-Z0-9_$]*)\.key===`Enter`&&!\1\.shiftKey\)\{if\(\1\.isComposing/;
+    // 锚定 ;return}if(X.key===`Enter`&&!X.shiftKey){
+    // 不再依赖内层 isComposing：2026.6.10 已把 isComposing 检查拆到独立 handler
+    const keydownRe = /;return\}if\(([a-zA-Z_$][a-zA-Z0-9_$]*)\.key===`Enter`&&!\1\.shiftKey\)\{/;
     const keydownMatch = content.match(keydownRe);
     if (!keydownMatch) {
       logger.warn('[ui-ext:regex] mention-hooks: keydown anchor not found');
@@ -697,34 +709,44 @@ const mentionHooks: UIExtension = {
     const hookA = `${markerA}if(window.__clMention?.onKeyDown(${eventParam}))return;`;
     content = content.substring(0, keydownInsertIdx) + hookA + content.substring(keydownInsertIdx);
 
-    // 注入点 B: handleInput — 支持两种形态
-    // Shape A (old): .onDraftChange(target.value)}}
-    // Shape B (4.11/latest): .onDraftChange(target.value)  (在 arrow function 内，无 }})
+    // 注入点 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 字面
     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\)\}/;
+
     let inputMatch = content.match(inputReA);
-    let inputShape: 'A' | 'B' = 'A';
+    let inputShape: 'A' | 'B' | 'C' = 'A';
 
+    if (!inputMatch) {
+      inputMatch = content.match(inputReC);
+      inputShape = 'C';
+    }
     if (!inputMatch) {
       inputMatch = content.match(inputReB);
       inputShape = 'B';
     }
 
     if (!inputMatch) {
-      logger.warn('[ui-ext:regex] mention-hooks: input anchor not found (neither Shape A nor B)');
+      logger.warn('[ui-ext:regex] mention-hooks: input anchor not found (Shape A/B/C all missed)');
       return false;
     }
     const targetVar = inputMatch[1];
     const inputAnchorIdx = content.indexOf(inputMatch[0]);
-    // 计算 onDraftChange(x.value) 调用结束位置
+    // Shape A: }} 之前；Shape C: 末尾 } 之前；Shape B: ) 之后
     const draftCallEnd = inputShape === 'A'
-      ? inputAnchorIdx + inputMatch[0].length - 2  // 在 }} 之前
-      : inputAnchorIdx + inputMatch[0].length;     // 在 ) 之后
+      ? inputAnchorIdx + inputMatch[0].length - 2
+      : inputShape === 'C'
+        ? inputAnchorIdx + inputMatch[0].length - 1
+        : inputAnchorIdx + inputMatch[0].length;
     const hookB = `;window.__clMention?.onInput?.(${targetVar})`;
     content = content.substring(0, draftCallEnd) + hookB + content.substring(draftCallEnd);
 
     writeFileSync(bundlePath, content, 'utf-8');
-    logger.info(`[ui-ext:regex] mention-hooks: injected (event=${eventParam}, target=${targetVar})`);
+    logger.info(`[ui-ext:regex] mention-hooks: injected (shape=${inputShape}, event=${eventParam}, target=${targetVar})`);
     return true;
   },