openclaw-openagent 1.0.11 → 1.0.12

package/src/plugin-ui/build.cjs

@@ -13,25 +13,33 @@
 
 const fs = require('fs');
 const path = require('path');
+const crypto = require('crypto');
+const childProcess = require('child_process');
 
 // ── 读取 OpenClaw 版本（用于注入到产物中）──
-function resolveHostVersion() {
+function resolveBuildHostVersion() {
   // 优先使用环境变量
-  if (process.env.OPENCLAW_HOST_VERSION) return process.env.OPENCLAW_HOST_VERSION;
+  if (process.env.OPENCLAW_HOST_VERSION) return normalizeHostVersion(process.env.OPENCLAW_HOST_VERSION);
 
-  // 从 package.json devDependencies 读取
-  try {
-    var pkgPath = path.join(__dirname, '..', 'package.json');
-    if (fs.existsSync(pkgPath)) {
-      var pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
-      var ver = (pkg.devDependencies && pkg.devDependencies.openclaw) || '';
-      // 去掉 ^ 前缀: "^2026.4.22" → "2026.4.22"
-      ver = String(ver).replace(/^[\^~>=<]+/, '').trim();
-      if (ver) return ver;
-    }
-  } catch (e) {}
+  var packageCandidates = [
+    path.join(__dirname, '..', '..', 'node_modules', 'openclaw', 'package.json'),
+    path.join(__dirname, '..', '..', 'package.json'),
+  ];
+  for (var i = 0; i < packageCandidates.length; i++) {
+    try {
+      if (!fs.existsSync(packageCandidates[i])) continue;
+      var candidatePkg = JSON.parse(fs.readFileSync(packageCandidates[i], 'utf-8'));
+      if (candidatePkg && candidatePkg.name === 'openclaw') {
+        var exactVersion = normalizeHostVersion(candidatePkg.version);
+        if (exactVersion) return exactVersion;
+      }
+      var depVersion = candidatePkg && candidatePkg.devDependencies && candidatePkg.devDependencies.openclaw;
+      depVersion = normalizeHostVersion(String(depVersion || '').replace(/^[\^~>=<]+/, '').trim());
+      if (depVersion) return depVersion;
+    } catch (e) {}
+  }
 
-  return '2026.4.22'; // 默认 fallback
+  return '';
 }
 
 // ═══════════════════════════════════════════════════════════════
@@ -78,10 +86,201 @@ const MANIFEST = [
 // ═══════════════════════════════════════════════════════════════
 
 const modulesDir = path.join(__dirname, 'modules');
+const adaptersDir = path.join(__dirname, 'adapters');
 const assetsDir = path.join(__dirname, 'assets');
 const outFile = path.join(assetsDir, 'openagent-override.js');
 const iconFile = path.join(assetsDir, 'icon.png');
 const bgFile = path.join(assetsDir, 'bg.png');
+const HOST_VERSION_TOKEN = "hostVersion: '__OPENCLAW_HOST_VERSION__'";
+const BUILD_ID_TOKEN = "buildId: '__OPENAGENT_BUILD_ID__'";
+const BUILD_ID_ASSIGNMENT_RE = /buildId:\s*(?:"[^"]*"|'[^']*')/;
+const HOST_ADAPTER_START = '/*__OPENAGENT_HOST_ADAPTER_START__*/';
+const HOST_ADAPTER_END = '/*__OPENAGENT_HOST_ADAPTER_END__*/';
+const HOST_ADAPTER_BLOCK_RE = /\/\*__OPENAGENT_HOST_ADAPTER_START__\*\/[\s\S]*?\/\*__OPENAGENT_HOST_ADAPTER_END__\*\//;
+
+function normalizeHostVersion(version) {
+  var match = String(version || '').match(/20\d{2}\.\d{1,2}\.\d{1,2}(?:-[A-Za-z0-9._-]+)?/);
+  return match ? match[0] : '';
+}
+
+function injectHostVersion(content, hostVersion) {
+  hostVersion = normalizeHostVersion(hostVersion);
+  if (!hostVersion) return content;
+  return content.replace(HOST_VERSION_TOKEN, 'hostVersion: ' + JSON.stringify(hostVersion));
+}
+
+function resolveHostAdapterId(hostVersion) {
+  var parsed = normalizeHostVersion(hostVersion).split('.');
+  var year = parseInt(parsed[0], 10);
+  var month = parseInt(parsed[1], 10);
+  if (year === 2026 && month === 4) return 'oc-2026-04';
+  if (year === 2026 && month === 5) return 'oc-2026-05';
+  if (year === 2026 && month === 6) return 'oc-2026-06';
+  return 'oc-unknown';
+}
+
+function getHostAdapterBlock(hostVersion) {
+  var adapterId = resolveHostAdapterId(hostVersion);
+  var adapterPath = path.join(adaptersDir, adapterId + '.js');
+  if (!fs.existsSync(adapterPath)) {
+    adapterId = 'oc-unknown';
+    adapterPath = path.join(adaptersDir, adapterId + '.js');
+  }
+  var adapterContent = fs.readFileSync(adapterPath, 'utf-8').trimEnd();
+  return [
+    HOST_ADAPTER_START,
+    '// HOST ADAPTER: ' + adapterId,
+    adapterContent,
+    HOST_ADAPTER_END,
+  ].join('\n');
+}
+
+function injectHostAdapter(content, hostVersion) {
+  var block = getHostAdapterBlock(hostVersion);
+  if (HOST_ADAPTER_BLOCK_RE.test(content)) {
+    return content.replace(HOST_ADAPTER_BLOCK_RE, block);
+  }
+  return content;
+}
+
+function renderOverrideContent(content, hostVersion) {
+  return injectBuildId(injectHostAdapter(injectHostVersion(content, hostVersion), hostVersion));
+}
+
+function hashContent(content) {
+  return crypto.createHash('sha256').update(content).digest('hex').slice(0, 12);
+}
+
+function injectBuildId(content) {
+  var normalized = content.replace(BUILD_ID_ASSIGNMENT_RE, BUILD_ID_TOKEN);
+  var buildId = hashContent(normalized);
+  return normalized.replace(BUILD_ID_TOKEN, 'buildId: ' + JSON.stringify(buildId));
+}
+
+function resolveControlUiHostVersion(controlUiDir) {
+  if (process.env.OPENCLAW_HOST_VERSION) return normalizeHostVersion(process.env.OPENCLAW_HOST_VERSION);
+
+  var candidates = [
+    path.join(controlUiDir, '..', '..', 'package.json'),
+    path.join(controlUiDir, '..', 'package.json'),
+  ];
+  for (var i = 0; i < candidates.length; i++) {
+    try {
+      if (!fs.existsSync(candidates[i])) continue;
+      var pkg = JSON.parse(fs.readFileSync(candidates[i], 'utf-8'));
+      if (pkg && pkg.name === 'openclaw') return normalizeHostVersion(pkg.version);
+    } catch (e) {}
+  }
+  return '';
+}
+
+function pushUniquePath(list, candidate) {
+  if (!list || !candidate) return;
+  var resolved = path.resolve(candidate);
+  for (var i = 0; i < list.length; i++) {
+    if (path.resolve(list[i]) === resolved) return;
+  }
+  list.push(resolved);
+}
+
+function collectCommandOutputLines(command, args) {
+  try {
+    var result = childProcess.spawnSync(command, args, {
+      encoding: 'utf-8',
+      stdio: ['ignore', 'pipe', 'ignore'],
+    });
+    return String(result.stdout || '')
+      .split(/\r?\n/)
+      .map(function(line) { return line.trim(); })
+      .filter(Boolean);
+  } catch (e) {
+    return [];
+  }
+}
+
+function collectGlobalNodeModuleRoots() {
+  var roots = [];
+
+  try {
+    pushUniquePath(roots, path.join(path.dirname(process.execPath), '..', 'lib', 'node_modules'));
+  } catch (e) {}
+
+  var npmCommand = process.platform === 'win32' ? 'npm.cmd' : 'npm';
+  var npmRoots = collectCommandOutputLines(npmCommand, ['root', '-g']);
+  for (var n = 0; n < npmRoots.length; n++) {
+    pushUniquePath(roots, npmRoots[n]);
+  }
+
+  var openclawLocator = process.platform === 'win32' ? 'where' : 'which';
+  var openclawBins = collectCommandOutputLines(openclawLocator, ['openclaw']);
+  for (var b = 0; b < openclawBins.length; b++) {
+    var binPath = openclawBins[b];
+    try {
+      pushUniquePath(roots, path.join(path.dirname(binPath), '..', 'lib', 'node_modules'));
+    } catch (e) {}
+    try {
+      var realBin = fs.realpathSync(binPath);
+      var needle = path.join('node_modules', 'openclaw');
+      var idx = realBin.lastIndexOf(needle);
+      if (idx >= 0) {
+        pushUniquePath(roots, realBin.substring(0, idx + 'node_modules'.length));
+      }
+    } catch (e) {}
+  }
+
+  return roots;
+}
+
+function addGlobalOpenclawTargets(deployTargets, assetTargets) {
+  var roots = collectGlobalNodeModuleRoots();
+  for (var i = 0; i < roots.length; i++) {
+    var root = roots[i];
+    pushUniquePath(deployTargets, path.join(root, 'openclaw', 'dist', 'control-ui', 'openagent-override.js'));
+    pushUniquePath(deployTargets, path.join(root, 'openclaw-openagent', 'src', 'plugin-ui', 'assets', 'openagent-override.js'));
+    pushUniquePath(deployTargets, path.join(root, 'openclaw-openagent', 'dist', 'src', 'plugin-ui', 'assets', 'openagent-override.js'));
+
+    pushUniquePath(assetTargets, path.join(root, 'openclaw', 'dist', 'control-ui'));
+    pushUniquePath(assetTargets, path.join(root, 'openclaw-openagent', 'src', 'plugin-ui', 'assets'));
+    pushUniquePath(assetTargets, path.join(root, 'openclaw-openagent', 'dist', 'src', 'plugin-ui', 'assets'));
+  }
+}
+
+function updateControlUiIndex(controlUiDir, contentHash, hostVersion) {
+  var indexPath = path.join(controlUiDir, 'index.html');
+  if (!fs.existsSync(indexPath)) return false;
+
+  var html = fs.readFileSync(indexPath, 'utf-8');
+  var htmlMarker = '<!--openagent:html-script-tag-->';
+  var hostVersionAttr = hostVersion ? ' data-openagent-host-version="' + hostVersion + '"' : '';
+  var scriptTag = htmlMarker + '<script src="./openagent-override.js?v=' + contentHash + '"' + hostVersionAttr + '></script>';
+  var markedScriptPattern = /(?:\/\*openagent:html-script-tag\*\/|<!--openagent:html-script-tag-->)<script[^>]*openagent-override[^>]*><\/script>\n?\s*/g;
+  var oldScriptPattern = /<script[^>]*openagent-override[^>]*><\/script>\n?\s*/g;
+  var nextHtml;
+
+  if (/(?:\/\*openagent:html-script-tag\*\/|<!--openagent:html-script-tag-->)/.test(html)) {
+    nextHtml = html.replace(markedScriptPattern, scriptTag + '\n    ');
+    if (nextHtml === html && !nextHtml.includes('openagent-override.js')) {
+      nextHtml = nextHtml.replace(/(?:\/\*openagent:html-script-tag\*\/|<!--openagent:html-script-tag-->)/, scriptTag + '\n    ');
+    } else if (nextHtml === html && nextHtml.includes('openagent-override.js')) {
+      nextHtml = nextHtml.replace(oldScriptPattern, '').replace(/(?:\/\*openagent:html-script-tag\*\/|<!--openagent:html-script-tag-->)/, scriptTag + '\n    ');
+    }
+  } else {
+    nextHtml = html.replace(oldScriptPattern, '');
+    var viteAnchor = '<script type="module" crossorigin src="./assets/index-';
+    var anchorIdx = nextHtml.indexOf(viteAnchor);
+    if (anchorIdx >= 0) {
+      nextHtml = nextHtml.substring(0, anchorIdx) + scriptTag + '\n    ' + nextHtml.substring(anchorIdx);
+    } else {
+      nextHtml = nextHtml.replace('</head>', scriptTag + '\n</head>');
+    }
+  }
+
+  if (nextHtml && nextHtml !== html) {
+    fs.writeFileSync(indexPath, nextHtml, 'utf-8');
+    return true;
+  }
+  return false;
+}
 
 const HEADER = `/**
  * OpenAgent UI Override — Auto-generated, do not edit directly!
@@ -122,6 +321,12 @@ function build() {
     body += `// MODULE: ${file}\n`;
     body += `// ════════════════════════════════════════════════════════════════\n\n`;
     body += content.trimEnd() + '\n';
+    if (file === 'loader/shared-state.js') {
+      body += `\n// ════════════════════════════════════════════════════════════════\n`;
+      body += `// MODULE: host-adapter/selected\n`;
+      body += `// ════════════════════════════════════════════════════════════════\n\n`;
+      body += getHostAdapterBlock('') + '\n';
+    }
   }
 
   if (errors > 0) {
@@ -133,11 +338,12 @@ function build() {
   // ── 不做构建时版本注入，由运行时 DOM/CSS 特征检测 ──
   // （build.cjs 无法知道实际运行的 OpenClaw 版本）
   var output = HEADER + body + FOOTER;
+  var assetOutput = renderOverrideContent(output, '');
 
   fs.mkdirSync(path.dirname(outFile), { recursive: true });
-  fs.writeFileSync(outFile, output, 'utf-8');
+  fs.writeFileSync(outFile, assetOutput, 'utf-8');
 
-  const lineCount = output.split('\n').length;
+  const lineCount = assetOutput.split('\n').length;
   console.log(`✅ Built: ${path.relative(process.cwd(), outFile)} (${lineCount} lines)`);
 
   // ── Auto-deploy to runtime targets ──────────────────────────────────────
@@ -162,19 +368,24 @@ function build() {
     path.join(homedir, '.nvm/versions/node/v22.21.1/lib/node_modules/openclaw-openagent/src/plugin-ui/assets/openagent-override.js'),
     path.join(homedir, '.nvm/versions/node/v22.21.1/lib/node_modules/openclaw-openagent/dist/src/plugin-ui/assets/openagent-override.js'),
   ];
-
-  // 动态发现 control-ui 目录（通过 node 可执行文件路径推断）
-  try {
-    const nodeDir = path.dirname(process.execPath);
-    const controlUiCandidate = path.join(nodeDir, '..', 'lib', 'node_modules', 'openclaw', 'dist', 'control-ui', 'openagent-override.js');
-    DEPLOY_TARGETS.push(path.resolve(controlUiCandidate));
-  } catch {}
+  addGlobalOpenclawTargets(DEPLOY_TARGETS, null);
 
   let deployed = 0;
   for (const target of DEPLOY_TARGETS) {
     try {
       if (fs.existsSync(path.dirname(target))) {
-        fs.copyFileSync(outFile, target);
+        const targetDir = path.dirname(target);
+        const hostVersion = path.basename(targetDir) === 'control-ui'
+          ? resolveControlUiHostVersion(targetDir)
+          : '';
+        const targetOutput = renderOverrideContent(output, hostVersion);
+        fs.writeFileSync(target, targetOutput, 'utf-8');
+        if (hostVersion) {
+          const contentHash = hashContent(targetOutput);
+          if (updateControlUiIndex(targetDir, contentHash, hostVersion)) {
+            console.log(`  ↻ updated index.html cache-bust (${hostVersion}, ${resolveHostAdapterId(hostVersion)}, ${contentHash})`);
+          }
+        }
         console.log(`  → ${path.relative(homedir, target)}`);
         deployed++;
       }
@@ -200,11 +411,7 @@ function build() {
     path.join(homedir, '.nvm/versions/node/v22.21.1/lib/node_modules/openclaw-openagent/src/plugin-ui/assets'),
     path.join(homedir, '.nvm/versions/node/v22.21.1/lib/node_modules/openclaw-openagent/dist/src/plugin-ui/assets'),
   ];
-
-  try {
-    const nodeDir = path.dirname(process.execPath);
-    ASSET_DEPLOY_TARGETS.push(path.resolve(path.join(nodeDir, '..', 'lib', 'node_modules', 'openclaw', 'dist', 'control-ui')));
-  } catch {}
+  addGlobalOpenclawTargets(null, ASSET_DEPLOY_TARGETS);
 
   // ── Deploy image assets (icon.png, bg.png) ──
   const IMAGE_ASSETS = [
@@ -237,16 +444,20 @@ const isWatchMode = process.argv.includes('--watch');
 build();
 
 if (isWatchMode) {
-  console.log(`\n👀 Watching for changes in ${path.relative(process.cwd(), modulesDir)}...`);
+  console.log(`\n👀 Watching for changes in ${path.relative(process.cwd(), modulesDir)} and ${path.relative(process.cwd(), adaptersDir)}...`);
   
   let debounceTimer;
-  fs.watch(modulesDir, { recursive: true }, (eventType, filename) => {
-    // Ignore dot files and non-js files
-    if (!filename || filename.startsWith('.') || !filename.endsWith('.js')) return;
+  function watchSourceDir(sourceDir) {
+    fs.watch(sourceDir, { recursive: true }, (eventType, filename) => {
+      // Ignore dot files and non-js files
+      if (!filename || filename.startsWith('.') || !filename.endsWith('.js')) return;
     
-    clearTimeout(debounceTimer);
-    debounceTimer = setTimeout(() => {
-      build();
-    }, 100);
-  });
+      clearTimeout(debounceTimer);
+      debounceTimer = setTimeout(() => {
+        build();
+      }, 100);
+    });
+  }
+  watchSourceDir(modulesDir);
+  watchSourceDir(adaptersDir);
 }

package/src/plugin-ui/index.ts

@@ -13,6 +13,6 @@ import { loadUIExtensions } from './ui-extension-loader/index.js';
  * 由 index.ts register() 调用。内部通过 Manifest Reconciler
  * 自动完成扩展点的 apply / revert / skip。
  */
-export async function injectControlUiOverride(): Promise<void> {
-  await loadUIExtensions();
+export async function injectControlUiOverride(hostVersion?: string): Promise<void> {
+  await loadUIExtensions({ hostVersion });
 }

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

@@ -6,6 +6,7 @@ let panel = null;
 let backdrop = null;
 
 let inputWrapperRef = null; // 保存输入框包裹层引用
+let panelPositionResizeObserver = null;
 
 // ── 键盘导航状态（§1.5）──
 // 对标 TIM index.ts:13 "let selectedIndex: number = 0"
@@ -40,7 +41,7 @@ panel.className = 'openagent-agent-panel';
 panel.innerHTML = `
   <div class="openagent-panel-head">
     <span class="openagent-panel-title">
-      <svg class="openagent-panel-title-icon" width="28" height="28" viewBox="0 0 56 56" fill="none">
+      <svg class="openagent-panel-title-icon" width="24" height="24" viewBox="0 0 56 56" fill="none">
         <path d="M28 25H32C34.2091 25 36 26.7909 36 29V39C36 41.2091 34.2091 43 32 43H14C11.7909 43 10 41.2091 10 39V29C10 26.7909 11.7909 25 14 25H15" stroke="#12CCF6" stroke-width="3.3" stroke-linecap="round"/>
         <path d="M39 31H42C44.2091 31 46 29.2091 46 27V17C46 14.7909 44.2091 13 42 13H24C21.7909 13 20 14.7909 20 17V27C20 29.2091 21.7909 31 24 31H30.0652C30.236 31 30.3282 31.2004 30.217 31.3302L27.5 34.5" stroke="#12CCF6" stroke-width="3.3" stroke-linecap="round"/>
         <path d="M27 25.5L32.5 21" stroke="#12CCF6" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"/>
@@ -83,12 +84,71 @@ const width = Math.min(rect.width, window.innerWidth - viewportPadding * 2);
 const left = Math.max(viewportPadding, Math.min(rect.left, window.innerWidth - width - viewportPadding));
 panel.style.left = left + 'px';
 panel.style.width = width + 'px';
-panel.style.bottom = (window.innerHeight - rect.top + 8) + 'px';
+const toolbar = _findPanelToolbar();
+const isComposerWrapper = inputWrapperRef.classList
+  && inputWrapperRef.classList.contains('agent-chat__composer-combobox');
+if (isComposerWrapper) {
+  panel.style.bottom = (_readElementHeight(inputWrapperRef) + _readElementHeight(toolbar) + 35) + 'px';
+} else {
+  panel.style.bottom = (window.innerHeight - rect.top + 8) + 'px';
+}
 }
 
 /** resize 时实时跟随输入框 */
 function _onResize() { _positionPanel(); }
 
+function _findPanelToolbar() {
+  if (!inputWrapperRef) return null;
+  var chatInput = inputWrapperRef.closest && inputWrapperRef.closest('.agent-chat__input');
+  if (chatInput) {
+    var toolbar = chatInput.querySelector('.agent-chat__toolbar');
+    if (toolbar) return toolbar;
+  }
+
+  var parentEl = inputWrapperRef.parentElement;
+  if (parentEl) {
+    for (var i = 0; i < parentEl.children.length; i++) {
+      var child = parentEl.children[i];
+      if (child !== inputWrapperRef && child.className && String(child.className).indexOf('agent-chat__toolbar') !== -1) {
+        return child;
+      }
+    }
+  }
+  return null;
+}
+
+function _readElementHeight(el) {
+  if (!el) return 0;
+  var rect = el.getBoundingClientRect ? el.getBoundingClientRect() : null;
+  if (rect && rect.height > 0) return rect.height;
+  return typeof el.offsetHeight === 'number' ? el.offsetHeight : 0;
+}
+
+function _schedulePanelPosition() {
+  window.requestAnimationFrame
+    ? window.requestAnimationFrame(_positionPanel)
+    : setTimeout(_positionPanel, 0);
+}
+
+function _installPanelPositionObservers() {
+  if (panelPositionResizeObserver) {
+    panelPositionResizeObserver.disconnect();
+    panelPositionResizeObserver = null;
+  }
+  if (typeof ResizeObserver !== 'function' || !inputWrapperRef) return;
+
+  panelPositionResizeObserver = new ResizeObserver(_schedulePanelPosition);
+  panelPositionResizeObserver.observe(inputWrapperRef);
+  var toolbar = _findPanelToolbar();
+  if (toolbar) panelPositionResizeObserver.observe(toolbar);
+}
+
+function _teardownPanelPositionObservers() {
+  if (!panelPositionResizeObserver) return;
+  panelPositionResizeObserver.disconnect();
+  panelPositionResizeObserver = null;
+}
+
 // 搜索状态管理
 let currentAbort = null;  // AbortController for in-flight search
 let searchDebounceId = null;
@@ -115,6 +175,7 @@ if (oldEmpty) oldEmpty.remove();
 
 const p = ensurePanel();
 _positionPanel(); // 动态定位到 input 上方
+_installPanelPositionObservers();
 p.classList.add('visible');
 backdrop.classList.add('visible');
 window.addEventListener('resize', _onResize);
@@ -177,6 +238,7 @@ function closePanel() {
 if (panel) panel.classList.remove('visible');
 if (backdrop) backdrop.classList.remove('visible');
 window.removeEventListener('resize', _onResize);
+_teardownPanelPositionObservers();
 // 清理搜索状态
 if (currentAbort) { currentAbort.abort(); currentAbort = null; }
 if (searchDebounceId) { clearTimeout(searchDebounceId); searchDebounceId = null; }
@@ -231,7 +293,6 @@ function _scrollItemIntoView(index) {
 
 function _appendParentSection(container, parentTitle, children, textarea, renderedAgents) {
   const parentSec = _el('section', 'openagent-parent-section');
-  parentSec.appendChild(_text('div', 'openagent-parent-heading', parentTitle));
   children.forEach(function(child) {
     if (child.agents && child.agents.length > 0) {
       _appendAgentSection(parentSec, child.title, child.agents, textarea, renderedAgents);
@@ -306,7 +367,12 @@ function _dismissEmptyToast() {
 }
 
 /** 独立浮层空状态（不在面板内） */
-function _showEmptyToast(query) {
+function _getEmptyMessage(query) {
+  return CL.agentBookLastError ||
+    (query ? '暂未匹配到您想要的Agent 我们将持续上新～' : '暂无在线 Agent，请输入关键词搜索');
+}
+
+function _showEmptyToast(query, message) {
   _dismissEmptyToast();
   var toast = _el('div', 'openagent-empty-toast');
 
@@ -316,8 +382,7 @@ function _showEmptyToast(query) {
     '</svg>';
   toast.appendChild(iconWrap);
 
-  toast.appendChild(_text('span', 'openagent-empty-state__text',
-    query ? '暂未匹配到您想要的Agent 我们将持续上新～' : '暂无在线 Agent，请输入关键词搜索'));
+  toast.appendChild(_text('span', 'openagent-empty-state__text', message || _getEmptyMessage(query)));
 
   var closeBtn = _el('button', 'openagent-empty-state__close');
   closeBtn.innerHTML = '<svg width="12" height="12" viewBox="0 0 12 12" fill="none">' +
@@ -333,12 +398,17 @@ function _showEmptyToast(query) {
     toast.style.left = Math.max(16, rect.left) + 'px';
     toast.style.width = Math.min(rect.width, window.innerWidth - 32) + 'px';
     toast.style.bottom = (window.innerHeight - rect.top + 8) + 'px';
+    // ── V2 版本兼容：v1 bottom 固定 117px ──
+    var isV2Toast = typeof _clIsHostVersionGte === 'function' && _clIsHostVersionGte('2026.6.9');
+    if (!isV2Toast) {
+      toast.style.bottom = '117px';
+    }
     toast.style.zIndex = '100000';
   }
   document.body.appendChild(toast);
 }
 
-function _createEmptyState(query) {
+function _createEmptyState(query, message) {
   var wrapper = _el('div', 'openagent-empty-state');
   var row = _el('div', 'openagent-empty-state__row');
 
@@ -348,8 +418,7 @@ function _createEmptyState(query) {
     '</svg>';
   row.appendChild(iconWrap);
 
-  var text = _text('span', 'openagent-empty-state__text',
-    query ? '暂未匹配到您想要的Agent 我们将持续上新～' : '暂无在线 Agent，请输入关键词搜索');
+  var text = _text('span', 'openagent-empty-state__text', message || _getEmptyMessage(query));
   row.appendChild(text);
 
   var closeBtn = _el('button', 'openagent-empty-state__close');
@@ -367,10 +436,11 @@ function _createEmptyState(query) {
 
 function renderAgentList(container, agents, textarea, query) {
   if (!agents.length) {
+      var emptyMessage = _getEmptyMessage(query);
       _currentAgents = [];
       _currentTextarea = textarea;
       closePanel();
-      _showEmptyToast(query);
+      _showEmptyToast(query, emptyMessage);
       return;
 }
 
@@ -407,6 +477,19 @@ _highlightItem(0);
  * 对齐 openagent-frontend NewChatPanel L92-105：
  * 找到最后一个 @，替换其后内容为 @agentName
  */
+function _pickMentionAgentDescription(agent) {
+  if (!agent || typeof agent !== 'object') return '';
+  if (CL && typeof CL.pickAgentIdentityDescription === 'function') {
+    return CL.pickAgentIdentityDescription(agent);
+  }
+  const keys = ['agent_bio', 'agentBio', 'bio', 'description', 'desc', 'agent_description', 'agentDescription', 'MOM', 'mom'];
+  for (let i = 0; i < keys.length; i++) {
+    const value = agent[keys[i]];
+    if (typeof value === 'string' && value.trim()) return value.trim();
+  }
+  return '';
+}
+
 function insertMention(textarea, agentName, agentData) {
 // 重新查找 textarea（Lit 可能重新渲染导致引用失效）
 const liveTextarea = document.querySelector(
@@ -426,9 +509,11 @@ liveTextarea.focus();
 const agentId = agentData?.agent_id || agentData?.agentId || agentData?.id || agentData?.tag ||
   agentData?.user_id || agentData?.userId || agentData?.identifier || agentData?.tim_user_id || agentData?.timUserId || '';
 const agentAvatar = agentData?.avatar || agentData?.avatar_url || agentData?.avatarUrl || agentData?.image || agentData?.logo || agentData?.photo || null;
+const agentBio = _pickMentionAgentDescription(agentData);
 console.log('[cl-diag][mention-select]', {
   agentName,
   resolvedAgentId: agentId || null,
+  hasAgentBio: !!agentBio,
   rawKeys: Object.keys(agentData || {}),
   rawAgent: agentData,
 });
@@ -437,9 +522,14 @@ if (!agentId) {
   console.warn('[openagent] mention skipped: missing agent identifier for', agentName, agentData);
   return;
 }
-CL.pendingMention = { agent_id: agentId, name: agentName, avatar: agentAvatar };
+CL.pendingMention = { agent_id: agentId, name: agentName, avatar: agentAvatar, agent_bio: agentBio };
 if (CL && typeof CL.storeAgentIdentity === 'function') {
-  CL.storeAgentIdentity({ agent_id: agentId, name: agentName, avatar: agentAvatar });
+  CL.storeAgentIdentity(Object.assign({}, agentData || {}, {
+    agent_id: agentId,
+    name: agentName,
+    avatar: agentAvatar,
+    agent_bio: agentBio,
+  }));
 }
 console.log('[openagent] mention stored:', CL.pendingMention);