openclaw-openagent 1.0.9 → 1.0.11

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

@@ -14,6 +14,8 @@ import { backupFile, restoreFile } from './backup.js';
 import { makeMarker, hasMarker } 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() {
     return createHash('sha256')
         .update(readFileSync(OVERRIDE_ASSET_URL))
@@ -113,6 +115,27 @@ const overrideScript = {
         }
         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;
     },
     revert(controlUiDir) {
@@ -121,12 +144,28 @@ const overrideScript = {
             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 { }
+        }
     },
 };
 // ── Extension 2: html-script-tag ─────────────────────────────────────────
 const htmlScriptTag = {
     id: 'html-script-tag',
-    version: 4,
+    version: 5,
     alwaysApply: true,
     apply(controlUiDir) {
         const indexPath = join(controlUiDir, 'index.html');
@@ -136,11 +175,21 @@ const htmlScriptTag = {
         }
         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;
-        if (html.includes(htmlMarker) || hasMarker(html, this.id)) {
-            const nextHtml = html.replace(markedScriptPattern, `${scriptTag}\n    `);
+        const oldScriptPattern = /<script[^>]*openagent-override[^>]*><\/script>\n?\s*/g;
+        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');
             }
@@ -150,7 +199,6 @@ const htmlScriptTag = {
             }
             return true;
         }
-        const oldScriptPattern = /<script[^>]*openagent-override[^>]*><\/script>\n?\s*/g;
         if (oldScriptPattern.test(html)) {
             html = html.replace(oldScriptPattern, '');
         }
@@ -333,7 +381,7 @@ const toolcardRender = {
                         toolMessageOk = false;
                     }
                     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>\`;`;
+                        const toolMessageHook = `${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;

package/openclaw.plugin.json

@@ -2,7 +2,7 @@
     "id": "openclaw-openagent",
     "name": "OpenAgent",
     "description": "OpenAgent channel plugin — real-time messaging between AI agents via OASN",
-    "version": "1.0.0",
+    "version": "1.0.10",
     "contracts": {
         "tools": [
             "openagent_call_remote_agent",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-openagent",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "type": "module",
   "description": "OpenAgent channel plugin for OpenClaw",
   "license": "MIT",
@@ -47,13 +47,13 @@
     "node": ">=22"
   },
   "scripts": {
-    "build": "tsc -p tsconfig.build.json && cp -r src/sdk dist/src/sdk && mkdir -p dist/src/plugin-ui/assets && cp src/plugin-ui/assets/openagent-override.js dist/src/plugin-ui/assets/",
+    "build": "tsc -p tsconfig.build.json && cp -r src/sdk dist/src/sdk && mkdir -p dist/src/plugin-ui/assets && cp src/plugin-ui/assets/openagent-override.js src/plugin-ui/assets/icon.png src/plugin-ui/assets/bg.png dist/src/plugin-ui/assets/",
     "build:override": "node ./src/plugin-ui/build.cjs",
     "watch:override": "node ./src/plugin-ui/build.cjs --watch",
     "prepack": "npm run build:override && npm run build && npm run typecheck",
     "typecheck": "tsc --noEmit",
     "prepublishOnly": "npm run typecheck",
-    "test:contract": "node tests/contract.test.mjs && node tests/agent-book-batch-category.test.mjs",
+    "test:contract": "node tests/contract.test.mjs && node tests/agent-book-batch-category.test.mjs && tsx tests/ui-extension-loader.test.mts",
     "test:smoke": "node tests/smoke.test.mjs",
     "test": "npm run test:contract && npm run test:smoke"
   },