openclaw-openagent 1.0.9 → 1.0.11

package/src/plugin-ui/modules/remote-agent/tool-card-model.js

@@ -23,6 +23,8 @@ function _clParseToolCardModel(card) {
   var agentId = args.agent_id || args.agentId || null;
   var agentName = args.agent_name || args.agentName || agentId || 'Remote Agent';
   var agentAvatar = args.agent_avatar || args.agentAvatar || args.avatar || args.avatar_url || args.avatarUrl || null;
+  var agentBio = args.agent_bio || args.agentBio || args.description || args.agent_description || args.MOM || '';
+  var agentStars = args.agent_stars || args.agentStars || args.stars || args.claws || '3.2万';
   var taskText = args.task || args.message || args.instruction || '';
 
   // 从 text 解析思考步骤 / 最终文本
@@ -38,10 +40,14 @@ function _clParseToolCardModel(card) {
     agentId: agentId,
     agentName: agentName,
     agentAvatar: agentAvatar,
+    agentBio: agentBio,
+    agentStars: agentStars,
     taskText: taskText,
     toolCallId: card.toolCallId || '',
     status: hasOutput ? 'completed' : 'executing',
     rawText: rawText,
+    text: rawText,
+    outputText: rawText,
     chunks: chunks,
     isError: isError,
     inferredKind: inferredKind,

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

@@ -18,6 +18,8 @@ import type { UIExtension } from './types.js';
 // ── 常量 ──────────────────────────────────────────────────────────────────
 
 const OVERRIDE_ASSET_URL = new URL('../assets/openagent-override.js', import.meta.url);
+const ICON_ASSET_URL = new URL('../assets/icon.png', import.meta.url);
+const BG_ASSET_URL = new URL('../assets/bg.png', import.meta.url);
 
 function getOverrideAssetHash(): string {
   return createHash('sha256')
@@ -123,6 +125,27 @@ const overrideScript: UIExtension = {
     }
     copyFileSync(OVERRIDE_ASSET_URL, dest);
     logger.info('[ui-ext:regex] override-script: deployed openagent-override.js');
+
+    // Deploy icon.png alongside
+    if (existsSync(ICON_ASSET_URL)) {
+      const iconDest = join(controlUiDir, 'icon.png');
+      try {
+        copyFileSync(ICON_ASSET_URL, iconDest);
+        logger.info('[ui-ext:regex] override-script: deployed icon.png');
+      } catch (err) {
+        logger.warn('[ui-ext:regex] override-script: failed to deploy icon.png');
+      }
+    }
+    if (existsSync(BG_ASSET_URL)) {
+      const bgDest = join(controlUiDir, 'bg.png');
+      try {
+        copyFileSync(BG_ASSET_URL, bgDest);
+        logger.info('[ui-ext:regex] override-script: deployed bg.png');
+      } catch (err) {
+        logger.warn('[ui-ext:regex] override-script: failed to deploy bg.png');
+      }
+    }
+
     return true;
   },
 
@@ -132,6 +155,20 @@ const overrideScript: UIExtension = {
       unlinkSync(dest);
       logger.info('[ui-ext:regex] override-script: removed');
     }
+    const iconDest = join(controlUiDir, 'icon.png');
+    if (existsSync(iconDest)) {
+      try {
+        unlinkSync(iconDest);
+        logger.info('[ui-ext:regex] override-script: removed icon.png');
+      } catch {}
+    }
+    const bgDest = join(controlUiDir, 'bg.png');
+    if (existsSync(bgDest)) {
+      try {
+        unlinkSync(bgDest);
+        logger.info('[ui-ext:regex] override-script: removed bg.png');
+      } catch {}
+    }
   },
 };
 
@@ -139,7 +176,7 @@ const overrideScript: UIExtension = {
 
 const htmlScriptTag: UIExtension = {
   id: 'html-script-tag',
-  version: 4,
+  version: 5,
   alwaysApply: true,
 
   apply(controlUiDir: string): boolean {
@@ -150,12 +187,21 @@ const htmlScriptTag: UIExtension = {
     }
     let html = readFileSync(indexPath, 'utf-8');
     const htmlMarker = `<!--openagent:${this.id}-->`;
+    const markerPattern = /(?:\/\*openagent:html-script-tag\*\/|<!--openagent:html-script-tag-->)/;
     const overrideHash = getOverrideAssetHash();
     const scriptTag = `${htmlMarker}<script src="./openagent-override.js?v=${overrideHash}"></script>`;
     const markedScriptPattern = /(?:\/\*openagent:html-script-tag\*\/|<!--openagent:html-script-tag-->)<script[^>]*openagent-override[^>]*><\/script>\n?\s*/g;
+    const oldScriptPattern = /<script[^>]*openagent-override[^>]*><\/script>\n?\s*/g;
 
-    if (html.includes(htmlMarker) || hasMarker(html, this.id)) {
-      const nextHtml = html.replace(markedScriptPattern, `${scriptTag}\n    `);
+    if (markerPattern.test(html)) {
+      let nextHtml = html.replace(markedScriptPattern, `${scriptTag}\n    `);
+      if (nextHtml === html && !nextHtml.includes('openagent-override.js')) {
+        nextHtml = nextHtml.replace(markerPattern, `${scriptTag}\n    `);
+      } else if (nextHtml === html && nextHtml.includes('openagent-override.js')) {
+        nextHtml = nextHtml
+          .replace(oldScriptPattern, '')
+          .replace(markerPattern, `${scriptTag}\n    `);
+      }
       if (nextHtml === html) {
         logger.debug('[ui-ext:regex] html-script-tag: already applied');
       } else {
@@ -164,7 +210,6 @@ const htmlScriptTag: UIExtension = {
       }
       return true;
     }
-    const oldScriptPattern = /<script[^>]*openagent-override[^>]*><\/script>\n?\s*/g;
     if (oldScriptPattern.test(html)) {
       html = html.replace(oldScriptPattern, '');
     }
@@ -354,7 +399,7 @@ const toolcardRender: UIExtension = {
             }
             if (toolMessageOk) {
               const toolMessageHook =
-                `${marker}/* openagent-media-aware-tool-message */let __openagentToolMsgCard=null;console.log('[openagent] toolMsg hook: cards='+${cardsVar}.length+' mediaVar='+${mediaVar});if(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>\`;`;
+                `${marker}/* openagent-media-aware-tool-message */let __openagentToolMsgCard=null;if(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;