openclaw-openagent 1.0.9 → 1.0.12

package/src/plugin-ui/build.cjs

@@ -13,6 +13,34 @@
 
 const fs = require('fs');
 const path = require('path');
+const crypto = require('crypto');
+const childProcess = require('child_process');
+
+// ── 读取 OpenClaw 版本（用于注入到产物中）──
+function resolveBuildHostVersion() {
+  // 优先使用环境变量
+  if (process.env.OPENCLAW_HOST_VERSION) return normalizeHostVersion(process.env.OPENCLAW_HOST_VERSION);
+
+  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 '';
+}
 
 // ═══════════════════════════════════════════════════════════════
 // MANIFEST — 显式构建顺序，不要用 readdir+sort
@@ -58,7 +86,201 @@ const MANIFEST = [
 // ═══════════════════════════════════════════════════════════════
 
 const modulesDir = path.join(__dirname, 'modules');
-const outFile = path.join(__dirname, 'assets', 'openagent-override.js');
+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!
@@ -99,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) {
@@ -107,12 +335,15 @@ function build() {
     return;
   }
 
-  const output = HEADER + body + FOOTER;
+  // ── 不做构建时版本注入，由运行时 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 ──────────────────────────────────────
@@ -123,25 +354,38 @@ function build() {
 
   const DEPLOY_TARGETS = [
     // 插件安装目录（Gateway 启动时从这里读取并复制到 control-ui）
-    // 注意：安装目录仍使用旧路径 src/inject/，下次 npm publish 后才会变
     path.join(homedir, '.openclaw-docker/extensions/openclaw-openagent/src/inject/assets/openagent-override.js'),
     path.join(homedir, '.openclaw-docker/extensions/openclaw-openagent/src/plugin-ui/assets/openagent-override.js'),
     path.join(homedir, '.openclaw/extensions/openclaw-openagent/src/inject/assets/openagent-override.js'),
     path.join(homedir, '.openclaw/extensions/openclaw-openagent/src/plugin-ui/assets/openagent-override.js'),
+    // 本地开发 dist/ 目录
+    path.join(__dirname, '..', '..', 'dist', 'src', 'plugin-ui', 'assets', 'openagent-override.js'),
+    // 本地 node_modules 中的 openclaw control-ui（Gateway 实际运行路径）
+    path.join(__dirname, '..', '..', 'node_modules', 'openclaw', 'dist', 'control-ui', 'openagent-override.js'),
+    // npm 全局安装 + 项目缓存（Gateway 可能从这些路径加载）
+    path.join(homedir, '.openclaw/npm/projects/openclaw-openagent/node_modules/openclaw-openagent/src/plugin-ui/assets/openagent-override.js'),
+    path.join(homedir, '.openclaw/npm/projects/openclaw-openagent/node_modules/openclaw-openagent/dist/src/plugin-ui/assets/openagent-override.js'),
+    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++;
       }
@@ -149,10 +393,48 @@ function build() {
   }
 
   if (deployed > 0) {
-    console.log(`✅ Auto-deployed to ${deployed} target(s)`);
+    console.log(`✅ Auto-deployed override to ${deployed} target(s)`);
   } else {
     console.log('ℹ️  No deploy targets found (standalone build)');
   }
+
+  // ── Shared asset deploy targets (control-ui + extension dirs) ──
+  const ASSET_DEPLOY_TARGETS = [
+    path.join(homedir, '.openclaw-docker/extensions/openclaw-openagent/src/inject/assets'),
+    path.join(homedir, '.openclaw-docker/extensions/openclaw-openagent/src/plugin-ui/assets'),
+    path.join(homedir, '.openclaw/extensions/openclaw-openagent/src/inject/assets'),
+    path.join(homedir, '.openclaw/extensions/openclaw-openagent/src/plugin-ui/assets'),
+    path.join(__dirname, '..', '..', 'dist', 'src', 'plugin-ui', 'assets'),
+    path.join(__dirname, '..', '..', 'node_modules', 'openclaw', 'dist', 'control-ui'),
+    path.join(homedir, '.openclaw/npm/projects/openclaw-openagent/node_modules/openclaw-openagent/src/plugin-ui/assets'),
+    path.join(homedir, '.openclaw/npm/projects/openclaw-openagent/node_modules/openclaw-openagent/dist/src/plugin-ui/assets'),
+    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'),
+  ];
+  addGlobalOpenclawTargets(null, ASSET_DEPLOY_TARGETS);
+
+  // ── Deploy image assets (icon.png, bg.png) ──
+  const IMAGE_ASSETS = [
+    { file: iconFile, name: 'icon.png' },
+    { file: bgFile, name: 'bg.png' },
+  ];
+
+  for (const asset of IMAGE_ASSETS) {
+    if (!fs.existsSync(asset.file)) continue;
+    let deployed = 0;
+    for (const dir of ASSET_DEPLOY_TARGETS) {
+      try {
+        const dest = path.join(dir, asset.name);
+        if (fs.existsSync(dir)) {
+          fs.copyFileSync(asset.file, dest);
+          deployed++;
+        }
+      } catch {}
+    }
+    if (deployed > 0) {
+      console.log(`✅ Auto-deployed ${asset.name} to ${deployed} target(s)`);
+    }
+  }
 }
 
 // ── Execution ──
@@ -162,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 });
 }