openclaw-openagent 1.0.5 → 1.0.7

package/dist/index.js

@@ -20,6 +20,7 @@ import { logger } from './src/util/logger.js';
 // ── Runtime reference ─────────────────────────────────────────────────────
 // Saved from api.runtime during register(), accessible by other modules.
 let _runtime;
+let _fullModeRegistered = false;
 export function getOpenagentRuntime() {
     return _runtime;
 }
@@ -63,8 +64,15 @@ export default {
         logger.info('[entry] Channel adapter registered');
         // P1-2: registrationMode exists in 2026.3.22+; skip heavy registrations in
         // setup-only mode (e.g. `openclaw channels list`).
+        // IMPORTANT: once registered in full mode, a subsequent hot-reload may
+        // re-invoke register() with mode='tool-discovery'. In that case we must
+        // still re-register tools/hooks so the gateway doesn't drop them.
         const mode = api.registrationMode;
-        if (mode && mode !== 'full') {
+        if (mode && mode !== 'full' && _fullModeRegistered) {
+            logger.info(`[entry] Re-registering in ${mode} mode (full mode preserved)`);
+            // Fall through — re-register tools to avoid gateway dropping them.
+        }
+        else if (mode && mode !== 'full') {
             logger.info(`[entry] Setup-only mode (registrationMode=${mode}), skipping tools/hooks`);
             return;
         }
@@ -97,6 +105,7 @@ export default {
             logger.warn(`[entry] Control UI injection failed: ${err.message}`);
         });
         logger.info('[entry] Tools + hooks registered (full mode)');
+        _fullModeRegistered = true;
     },
 };
 // Named exports for direct imports

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

@@ -21,7 +21,7 @@ import { toolResult, } from './types.js';
 import { sendC2CCustomMessage, waitForC2CReply } from '../tim/c2c.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 ──
 function fail(error) {
     return toolResult(JSON.stringify({ success: false, error }));
@@ -291,7 +291,8 @@ export function createCallRemoteAgentTool() {
                     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/dist/src/compat.d.ts

@@ -10,6 +10,8 @@
  */
 export declare const PLUGIN_VERSION = "1.0.0";
 export declare const SUPPORTED_HOST_MIN = "2026.3.22";
+/** Plugin has been verified up to this OpenClaw host version */
+export declare const MAX_TESTED_VERSION = "2026.6.30";
 export interface OpenClawVersion {
     year: number;
     month: number;

package/dist/src/compat.js

@@ -11,6 +11,8 @@
 import { logger } from './util/logger.js';
 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';
 /**
  * Parse an OpenClaw date version string (e.g. "2026.3.22") into components.
  * Returns null for unparseable strings.
@@ -61,6 +63,13 @@ export function assertHostCompatibility(hostVersion) {
     }
     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(`openclaw-openagent@${PLUGIN_VERSION} requires OpenClaw >=${SUPPORTED_HOST_MIN}, ` +

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-25T07:20:29.082Z
+ * Built:  2026-06-25T09:33:52.490Z
  *
  * To modify, edit the source modules and run:
  *   npm run build:override
@@ -1587,6 +1587,97 @@ function AgentCard(agent, opts = {}) {
   return card;
 }
 
+// ════════════════════════════════════════════════════════════════
+// MODULE: agent-book/panel/theme-adapter.js
+// ════════════════════════════════════════════════════════════════
+
+// ── 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']
+  });
+})();
+
 // ════════════════════════════════════════════════════════════════
 // MODULE: agent-book/panel/styles.js
 // ════════════════════════════════════════════════════════════════
@@ -1704,10 +1795,10 @@ function injectStyles() {
     .openagent-agent-panel {
       position: fixed;
       max-height: none;
-      background: #fff;
-      border: 1.2px solid rgba(47, 47, 51, 0.12);
+      background: var(--oa-panel-bg, #fff);
+      border: 1.2px solid var(--oa-border, rgba(47, 47, 51, 0.12));
       border-radius: 18px;
-      box-shadow: 0 -4px 24px rgba(0,0,0,0.08), 0 2px 8px rgba(0,0,0,0.04);
+      box-shadow: 0 -4px 24px var(--oa-shadow-color, rgba(0,0,0,0.08)), 0 2px 8px var(--oa-shadow-color, rgba(0,0,0,0.04));
       z-index: 99999;
       overflow: hidden;
       display: none;
@@ -1751,7 +1842,7 @@ function injectStyles() {
       flex-shrink: 0;
     }
     .openagent-panel-close {
-      background: rgba(249, 249, 249, 1);
+      background: var(--oa-card-bg, rgba(249, 249, 249, 1));
       border: none;
       color: rgba(47, 47, 51, 0.6);
       cursor: pointer;
@@ -2211,41 +2302,61 @@ function injectStyles() {
       padding: 32px; text-align: center; color: #aaa; font-size: 13px;
     }
 
-    /* ── 深色主题（统一） ── */
-    [data-theme-mode="dark"] .openagent-agent-panel {
+    /* ── 深色主题（v4: data-theme-mode / v5: data-theme） ── */
+    [data-theme-mode="dark"] .openagent-agent-panel,
+    [data-theme="dark"] .openagent-agent-panel {
       background: #1c1c1c; border-color: rgba(255,255,255,0.12);
       box-shadow: 0 -4px 24px rgba(0,0,0,0.3);
     }
-    [data-theme-mode="dark"] .openagent-panel-head { border-color: #2a2a2a; }
-    [data-theme-mode="dark"] .openagent-panel-title { color: rgba(224, 224, 224, 0.8); }
-    [data-theme-mode="dark"] .openagent-panel-close { background: #2a2a2a; color: #888; }
-    [data-theme-mode="dark"] .openagent-panel-close:hover { background: #333; color: #ccc; }
-    [data-theme-mode="dark"] .openagent-section-heading { color: rgba(224, 224, 224, 0.45); }
-    [data-theme-mode="dark"] .openagent-parent-heading { color: rgba(224, 224, 224, 0.3); }
-    [data-theme-mode="dark"] .openagent-panel-divider { border-color: rgba(255,255,255,0.1); }
-
-    [data-theme-mode="dark"] .agent-card__name { color: #e0e0e0; }
-    [data-theme-mode="dark"] .agent-card__bio { color: rgba(224, 224, 224, 0.7); }
-    [data-theme-mode="dark"] .agent-card__stat { color: #64748b; }
-
-    [data-theme-mode="dark"] .agent-card--mention { background: transparent; }
-    [data-theme-mode="dark"] .agent-card--mention:hover { background: #252525; }
-    [data-theme-mode="dark"] .agent-card--mention .agent-card__action {
+    [data-theme-mode="dark"] .openagent-panel-head,
+    [data-theme="dark"] .openagent-panel-head { border-color: #2a2a2a; }
+    [data-theme-mode="dark"] .openagent-panel-title,
+    [data-theme="dark"] .openagent-panel-title { color: rgba(224, 224, 224, 0.8); }
+    [data-theme-mode="dark"] .openagent-panel-close,
+    [data-theme="dark"] .openagent-panel-close { background: #2a2a2a; color: #888; }
+    [data-theme-mode="dark"] .openagent-panel-close:hover,
+    [data-theme="dark"] .openagent-panel-close:hover { background: #333; color: #ccc; }
+    [data-theme-mode="dark"] .openagent-section-heading,
+    [data-theme="dark"] .openagent-section-heading { color: rgba(224, 224, 224, 0.45); }
+    [data-theme-mode="dark"] .openagent-parent-heading,
+    [data-theme="dark"] .openagent-parent-heading { color: rgba(224, 224, 224, 0.3); }
+    [data-theme-mode="dark"] .openagent-panel-divider,
+    [data-theme="dark"] .openagent-panel-divider { border-color: rgba(255,255,255,0.1); }
+
+    [data-theme-mode="dark"] .agent-card__name,
+    [data-theme="dark"] .agent-card__name { color: #e0e0e0; }
+    [data-theme-mode="dark"] .agent-card__bio,
+    [data-theme="dark"] .agent-card__bio { color: rgba(224, 224, 224, 0.7); }
+    [data-theme-mode="dark"] .agent-card__stat,
+    [data-theme="dark"] .agent-card__stat { color: #64748b; }
+
+    [data-theme-mode="dark"] .agent-card--mention,
+    [data-theme="dark"] .agent-card--mention { background: transparent; }
+    [data-theme-mode="dark"] .agent-card--mention:hover,
+    [data-theme="dark"] .agent-card--mention:hover { background: #252525; }
+    [data-theme-mode="dark"] .agent-card--mention .agent-card__action,
+    [data-theme="dark"] .agent-card--mention .agent-card__action {
       background: #333; border-color: #555; color: #ddd;
     }
-    [data-theme-mode="dark"] .agent-card--mention .agent-card__action:hover { background: #444; }
-    [data-theme-mode="dark"] .agent-card--search:hover { background: #252525; }
-    [data-theme-mode="dark"] .agent-card--search.openagent-card-selected {
+    [data-theme-mode="dark"] .agent-card--mention .agent-card__action:hover,
+    [data-theme="dark"] .agent-card--mention .agent-card__action:hover { background: #444; }
+    [data-theme-mode="dark"] .agent-card--search:hover,
+    [data-theme="dark"] .agent-card--search:hover { background: #252525; }
+    [data-theme-mode="dark"] .agent-card--search.openagent-card-selected,
+    [data-theme="dark"] .agent-card--search.openagent-card-selected {
       background: rgba(99, 102, 241, 0.12);
       outline-color: rgba(99, 102, 241, 0.4);
     }
-    [data-theme-mode="dark"] .agent-card--search .agent-card__action {
+    [data-theme-mode="dark"] .agent-card--search .agent-card__action,
+    [data-theme="dark"] .agent-card--search .agent-card__action {
       background: #333; border-color: #555; color: #ddd;
     }
-    [data-theme-mode="dark"] .agent-card--search .agent-card__action:hover { background: #444; }
+    [data-theme-mode="dark"] .agent-card--search .agent-card__action:hover,
+    [data-theme="dark"] .agent-card--search .agent-card__action:hover { background: #444; }
 
 
-    [data-theme-mode="dark"] .agent-card--inline {
+    [data-theme-mode="dark"] .agent-card--inline,
+    [data-theme="dark"] .agent-card--inline {
       background: linear-gradient(135deg, #1e1b3a 0%, #1a1a2e 100%);
       border-color: #2d2b55;
     }
@@ -2255,7 +2366,8 @@ function injectStyles() {
     }
     [data-theme-mode="dark"] .agent-card--inline .agent-card__name { color: #e2e8f0; }
     [data-theme-mode="dark"] .agent-card--inline .agent-card__avatar { border-color: #2d2b55; }
-    [data-theme-mode="dark"] .agent-card__loading {
+    [data-theme-mode="dark"] .agent-card__loading,
+    [data-theme="dark"] .agent-card__loading {
       background: #1e1b3a; border-color: #2d2b55; color: #64748b;
     }
   `;
@@ -2890,8 +3002,8 @@ liveTextarea.dispatchEvent(new Event('change', { bubbles: true }));
 //
 // tryInject() 只做 DOM 注入（@ 按钮 + CSS class），不绑定任何事件。
 
-// ── textarea 选择器（全局复用）──
-// 多策略回退：v3 "Message..." / v4 "发消息..." / 结构化选择器
+// ── textarea 选择器（多版本兼容）──
+// v3 "Message..." / v4 "发消息..." / v5.x 结构化选择器
 const _CL_TEXTAREA_SELECTOR = [
   'textarea[placeholder*="发消息"]',
   'textarea[placeholder*="Message"]',
@@ -2900,6 +3012,8 @@ const _CL_TEXTAREA_SELECTOR = [
   '.chat-composer textarea',
   '.chat-input textarea',
   '[class*="composer"] textarea:not([placeholder*="Search"])',
+  '[class*="chat-input"] textarea',
+  '[data-component="chat-input"] textarea',
 ].join(', ');
 
 function _getTextarea() {
@@ -3015,37 +3129,59 @@ function _installSendClickInterceptor() {
   }, true);
 }
 
-function tryInject() {
-  const textarea = _getTextarea();
-
-  if (!textarea) return false;
-  _installSendClickInterceptor();
-  if (document.querySelector('.openagent-at-btn')) return true; // 已注入
-
-  // ── 定位插入点：麦克风图标所在的 toolbar 行 ──
-  const textareaParent = textarea.parentElement;
-  let toolbarRow = null;
+/**
+ * 多策略定位 textarea 所在输入区域的工具栏行。
+ * v4.x: 工具栏在 textarea.parentElement.children 中
+ * v5.x: 工具栏可能嵌套在祖父容器或包含 toolbar class
+ * 返回 null 表示未找到则回退到 textarea 父级插入
+ */
+function _findToolbarRow(textarea) {
+  var parent = textarea.parentElement;
 
-  if (textareaParent) {
-    for (const child of textareaParent.children) {
-      if (child !== textarea && child.querySelector('svg')) {
-        toolbarRow = child;
-        break;
-      }
+  // 策略 1（v4.x）: textarea 兄弟元素含 SVG 图标
+  if (parent) {
+    for (var i = 0; i < parent.children.length; i++) {
+      if (parent.children[i] !== textarea && parent.children[i].querySelector('svg')) return parent.children[i];
     }
   }
-  if (!toolbarRow && textareaParent) {
-    const grandparent = textareaParent.parentElement;
+
+  // 策略 2（v4.x）: 祖父级兄弟元素含 SVG 图标
+  if (parent) {
+    var grandparent = parent.parentElement;
     if (grandparent) {
-      for (const child of grandparent.children) {
-        if (child !== textareaParent && child.querySelector('svg')) {
-          toolbarRow = child;
-          break;
-        }
+      for (var j = 0; j < grandparent.children.length; j++) {
+        if (grandparent.children[j] !== parent && grandparent.children[j].querySelector('svg')) return grandparent.children[j];
       }
     }
   }
 
+  // 策略 3（v5.x）: 搜索包含 toolbar class 的元素
+  var chatContainer = textarea.closest('[class*="chat"]');
+  if (chatContainer) {
+    var toolbarEl = chatContainer.querySelector('[class*="toolbar"]');
+    if (toolbarEl) return toolbarEl;
+  }
+
+  // 策略 4（v5.x fallback）: 搜索 voice/mic 按钮定位其容器
+  var voiceBtn = document.querySelector(
+    'button[aria-label*="voice"], button[aria-label*="语音"], ' +
+    'button[aria-label*="mic"], button[aria-label*="麦克风"]'
+  );
+  if (voiceBtn) return voiceBtn.parentElement;
+
+  return null;
+}
+
+function tryInject() {
+  const textarea = _getTextarea();
+
+  if (!textarea) return false;
+  _installSendClickInterceptor();
+  if (document.querySelector('.openagent-at-btn')) return true; // 已注入
+
+  // ── 定位插入点：麦克风图标所在的 toolbar 行（多策略）──
+  var toolbarRow = _findToolbarRow(textarea);
+
   // ── 创建 Agent Book 按钮 ──
   const atBtn = document.createElement('button');
   atBtn.className = 'openagent-at-btn';
@@ -3079,10 +3215,15 @@ function tryInject() {
   if (toolbarRow) {
     const toolbarLeft = toolbarRow.querySelector('[class*="toolbar-left"]') || toolbarRow;
     const iconButtons = toolbarLeft.querySelectorAll('button, [role="button"]');
+    // 优先按 aria-label 匹配 voice/mic 按钮，回退到位置假设
     let micBtn = null;
-    if (iconButtons.length >= 2) {
-      micBtn = iconButtons[1];
-    } else if (iconButtons.length === 1) {
+    for (var i = 0; i < iconButtons.length; i++) {
+      var label = (iconButtons[i].getAttribute('aria-label') || '').toLowerCase();
+      if (/voice|mic|语音|麦克风/.test(label)) { micBtn = iconButtons[i]; break; }
+    }
+    if (!micBtn && iconButtons.length >= 2) {
+      micBtn = iconButtons[1]; // fallback: v4.x 中 mic 一般是第 2 个按钮
+    } else if (!micBtn && iconButtons.length === 1) {
       micBtn = iconButtons[0];
     }
 
@@ -3092,16 +3233,19 @@ function tryInject() {
       toolbarLeft.appendChild(atBtn);
     }
   } else {
-    (textareaParent || textarea.parentElement).appendChild(atBtn);
+    // 无工具栏时回退到 textarea 的父级插入
+    var fallbackParent = textarea.parentElement;
+    if (fallbackParent) fallbackParent.appendChild(atBtn);
   }
 
   // ── 给输入区域加 position: relative 包裹层 ──
+  var inputParent = textarea.parentElement;
   const inputContainer = textarea.closest('.agent-chat__composer-combobox')
                       || textarea.closest('.chat-input')
                       || textarea.closest('[class*="chat-composer"]')
                       || textarea.closest('[class*="chat"]')
-                      || textareaParent?.parentElement
-                      || textareaParent;
+                      || (inputParent ? inputParent.parentElement : null)
+                      || inputParent;
   if (inputContainer) {
     inputContainer.classList.add('openagent-input-wrapper');
     inputWrapperRef = inputContainer;
@@ -5418,14 +5562,20 @@ function _clScan() {
   var SHELL_SELECTORS = [
     '.chat-tool-card:not(:has(.cl-remote-agent-card))',
     '.chat-tool-msg-collapse:not(:has(.cl-remote-agent-card))',
-    '.chat-tools-collapse:not(:has(.cl-remote-agent-card))'
+    '.chat-tools-collapse:not(:has(.cl-remote-agent-card))',
+    // v5.x+ variants
+    '.tool-card:not(:has(.cl-remote-agent-card))',
+    '.chat-tool-card__wrapper:not(:has(.cl-remote-agent-card))'
   ];
 
   var SUMMARY_SELECTORS = [
     '.chat-tool-card__header',
     '.chat-tool-card__title',
     '.chat-tool-msg-summary:not(.cl-remote-agent-host-shell *)',
-    '.chat-tools-summary:not(.cl-remote-agent-host-shell *)'
+    '.chat-tools-summary:not(.cl-remote-agent-host-shell *)',
+    // v5.x+ variants
+    '.tool-card__header',
+    '.tool-card__title'
   ];
 
   var INDENT_SELECTORS = [

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 = '';
@@ -613,11 +614,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 +696,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 +716,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'