openclaw-openagent 1.0.12 → 1.0.14

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

@@ -1,130 +0,0 @@
-// ── OpenAgent Tool Card Model — ToolCard → OpenAgentCardModel 转换 ──
-//
-// 输入:
-//   旧版 OpenClaw ToolCard = { kind, name, args, text }
-//   4.11+ OpenClaw ToolCard = { name, args, inputText, outputText }
-// 输出: OpenAgentCardModel = { agentId, agentName, taskText, status, rawText, chunks, isError }
-
-function _clInferToolCardKind(card) {
-  if (!card) return '';
-  if (card.kind === 'call' || card.kind === 'result') return card.kind;
-
-  var outputText = card.outputText || '';
-  var text = card.text || '';
-  if (String(outputText || text || '').trim()) return 'result';
-  return 'call';
-}
-
-function _clPickAgentDescription(source) {
-  if (!source) return '';
-  var keys = [
-    'agent_bio',
-    'agentBio',
-    'bio',
-    'description',
-    'desc',
-    'agent_description',
-    'agentDescription',
-    'MOM',
-    'mom',
-    'introduction',
-    'summary'
-  ];
-  for (var i = 0; i < keys.length; i++) {
-    var value = source[keys[i]];
-    if (typeof value === 'string' && value.trim()) return value.trim();
-  }
-  return '';
-}
-
-function _clIsFailureStatusValue(value) {
-  var normalized = String(value || '').trim().toLowerCase();
-  return normalized === 'failed'
-    || normalized === 'failure'
-    || normalized === 'error'
-    || normalized === 'errored'
-    || normalized === 'rejected'
-    || normalized === 'cancelled'
-    || normalized === 'canceled';
-}
-
-function _clLooksLikeRemoteFailureText(text) {
-  var value = String(text || '').trim();
-  if (!value || value.length > 300) return false;
-  return /(^|[，。；\s])(调用失败|执行失败|任务失败|远端服务目前连不上|远端服务.*不可用|两次都返回了调用失败)([，。；\s]|$)/.test(value);
-}
-
-function _clInferToolCardError(card, chunks, rawText) {
-  if (chunks && chunks.some(function(c) { return c && c.type === 'error'; })) return true;
-  if (!card) return _clLooksLikeRemoteFailureText(rawText);
-  if (card.isError === true || card.error === true) return true;
-  if (_clIsFailureStatusValue(card.status)
-      || _clIsFailureStatusValue(card.state)
-      || _clIsFailureStatusValue(card.resultStatus)) {
-    return true;
-  }
-  if (card.error && typeof card.error === 'object') return true;
-  return _clLooksLikeRemoteFailureText(rawText);
-}
-
-function _clApplyAgentIdentityToModel(model) {
-  if (!model || typeof CL === 'undefined' || !CL || typeof CL.getAgentIdentity !== 'function') return model;
-  var identity = CL.getAgentIdentity(model.agentId, model.agentName);
-  if (!identity) return model;
-  model.agentId = model.agentId || identity.id || identity.agent_id;
-  if (!model.agentName || model.agentName === 'Remote Agent') {
-    model.agentName = identity.name || model.agentName;
-  }
-  model.agentAvatar = model.agentAvatar || identity.avatar || identity.avatar_url || identity.avatarUrl || null;
-  if (!model.agentBio) {
-    model.agentBio = _clPickAgentDescription(identity);
-  }
-  return model;
-}
-
-function _clParseToolCardModel(card) {
-  var inferredKind = _clInferToolCardKind(card);
-
-  // 从 args 提取 agent 信息
-  var args = (typeof card.args === 'object' && card.args) || {};
-  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 = _clPickAgentDescription(args);
-  var agentStars = args.agent_stars || args.agentStars || args.stars || args.claws || '3.2万';
-  var taskText = args.task || args.message || args.instruction || '';
-
-  // 从 text 解析思考步骤 / 最终文本
-  var rawText = card.text || card.outputText || '';
-  var chunks = _clParseChunks(rawText, {
-    toolCallId: card.toolCallId || '',
-    rawText: rawText
-  });
-  var hasOutput = inferredKind === 'result' && rawText.trim().length > 0;
-  var isError = _clInferToolCardError(card, chunks, rawText);
-
-  var model = {
-    agentId: agentId,
-    agentName: agentName,
-    agentAvatar: agentAvatar,
-    agentBio: agentBio,
-    agentStars: agentStars,
-    taskText: taskText,
-    toolCallId: card.toolCallId || '',
-    status: isError ? 'failed' : (hasOutput ? 'completed' : 'executing'),
-    rawText: rawText,
-    text: rawText,
-    outputText: rawText,
-    chunks: chunks,
-    isError: isError,
-    inferredKind: inferredKind,
-  };
-  _clApplyAgentIdentityToModel(model);
-
-  console.log('[cl-model] parsed:', 'agent=' + model.agentName,
-    'status=' + model.status,
-    'chunks=' + chunks.length,
-    'error=' + isError);
-
-  return model;
-}

package/src/plugin-ui/postinstall-deploy.cjs

@@ -1,52 +0,0 @@
-#!/usr/bin/env node
-/**
- * Best-effort deploy for npm install/upgrade.
- *
- * The browser cache strategy depends on Control UI index.html carrying the
- * latest openagent-override.js?v=<hash>. Running the override builder here
- * updates reachable OpenClaw Control UI directories immediately after the npm
- * package changes, without making npm install fail if OpenClaw is not present.
- */
-
-const fs = require('fs');
-const path = require('path');
-const { spawnSync } = require('child_process');
-
-function log(message) {
-  console.log('[openagent postinstall] ' + message);
-}
-
-function main() {
-  if (process.env.OPENAGENT_SKIP_POSTINSTALL_DEPLOY === '1') {
-    log('skipped by OPENAGENT_SKIP_POSTINSTALL_DEPLOY=1');
-    return;
-  }
-
-  const buildScript = path.join(__dirname, 'build.cjs');
-  if (!fs.existsSync(buildScript)) {
-    log('build script not found, skipped');
-    return;
-  }
-
-  const result = spawnSync(process.execPath, [buildScript], {
-    cwd: path.join(__dirname, '..', '..'),
-    env: {
-      ...process.env,
-      OPENAGENT_POSTINSTALL_DEPLOY: '1',
-    },
-    stdio: 'inherit',
-  });
-
-  if (result.error) {
-    log('deploy skipped: ' + result.error.message);
-    return;
-  }
-  if (result.status !== 0) {
-    log('deploy exited with code ' + result.status + ' (ignored)');
-    return;
-  }
-
-  log('deployed latest Control UI override where reachable');
-}
-
-main();

package/src/plugin-ui/ui-extension-loader/backup.ts

@@ -1,92 +0,0 @@
-/**
- * Backup — 文件备份与还原
- *
- * 代码级扩展修改宿主 minified bundle 前，先备份原始文件。
- * 卸载时从备份恢复。OC 升级时备份随 control-ui/ 一起被清除。
- */
-
-import { copyFileSync, unlinkSync, existsSync, readFileSync } from 'node:fs';
-import { logger } from '../../util/logger.js';
-
-const BACKUP_SUFFIX = '.openagent-bak';
-
-/** Patterns that indicate openagent modifications in the bundle.
- * NOTE: __openagentMarked is NOT listed here — it's handled by the
- * removed-extensions scanner for marked-expose cleanup. */
-const OPENAGENT_FINGERPRINTS = [
-  '__openagentRenderToolCard',
-  '__openagentOwnsToolCards',
-  '__tcid',
-  '__openagentIsRemoteToolName',
-  '__openagentToolCallIds',
-  '__openagentKeepToolPayload',
-];
-const OPENAGENT_MARKER_PATTERN = '/*openagent:';
-
-/**
- * 检测文件是否包含无 marker 的 openagent 手工补丁。
- * 如果文件包含 openagent 特征字符串但没有对应的 marker 注释，
- * 说明这是一个被手工修改过的文件，不应该作为"原始备份"保存。
- */
-function isDirtyBundle(filepath: string): boolean {
-  try {
-    const content = readFileSync(filepath, 'utf-8');
-    const hasFingerprint = OPENAGENT_FINGERPRINTS.some(fp => content.includes(fp));
-    const hasMarker = content.includes(OPENAGENT_MARKER_PATTERN);
-    // 有 openagent 特征但没有 marker → 手工补丁
-    return hasFingerprint && !hasMarker;
-  } catch {
-    return false;
-  }
-}
-
-/**
- * 备份文件。如果备份已存在则跳过（保持最早的原始版本）。
- * 如果文件包含无 marker 的手工补丁，拒绝备份。
- *
- * @returns true = 备份就绪（已存在或新创建），false = 检测到脏 bundle，调用方必须中止 apply。
- */
-export function backupFile(filepath: string): boolean {
-  const backupPath = filepath + BACKUP_SUFFIX;
-  if (existsSync(backupPath)) {
-    logger.debug(`[ui-ext] Backup already exists: ${backupPath}`);
-    return true;
-  }
-
-  // 检测脏 bundle：包含 openagent 代码但没有 marker
-  if (isDirtyBundle(filepath)) {
-    logger.warn(
-      `[ui-ext] Dirty bundle detected: ${filepath} contains unmarked openagent patches. ` +
-      `Refusing to backup or patch. Please reinstall OpenClaw to get a clean bundle, then restart.`
-    );
-    return false;
-  }
-
-  copyFileSync(filepath, backupPath);
-  logger.debug(`[ui-ext] Backed up: ${filepath}`);
-  return true;
-}
-
-/**
- * 从备份还原文件。
- * 还原后删除备份文件。
- * 如果备份不存在，记录警告但不抛异常。
- */
-export function restoreFile(filepath: string): boolean {
-  const backupPath = filepath + BACKUP_SUFFIX;
-  if (!existsSync(backupPath)) {
-    logger.debug(`[ui-ext] No backup found: ${backupPath}`);
-    return false;
-  }
-  copyFileSync(backupPath, filepath);
-  unlinkSync(backupPath);
-  logger.debug(`[ui-ext] Restored from backup: ${filepath}`);
-  return true;
-}
-
-/**
- * 检查备份是否存在。
- */
-export function hasBackup(filepath: string): boolean {
-  return existsSync(filepath + BACKUP_SUFFIX);
-}

package/src/plugin-ui/ui-extension-loader/index.ts

@@ -1,276 +0,0 @@
-/**
- * UIExtensionLoader — 主流程
- *
- * Manifest Reconciler：对比注册表（期望状态）与清单文件（当前状态），
- * 自动完成扩展点的 apply / revert / skip。
- *
- * 共享文件的扩展按组处理：任何一个需要变更 → 恢复 backup → 重新 apply 全组。
- *
- * 每次 Gateway 启动时调用 loadUIExtensions()。
- */
-
-import { join } from 'node:path';
-import { logger } from '../../util/logger.js';
-import { resolveControlUiDir, findFileByPrefix, extractBundleHash } from './locator.js';
-import { readManifest, writeManifest, removeManifest } from './manifest.js';
-import { restoreFile } from './backup.js';
-import { UI_EXTENSIONS } from './registry-regex.js';
-import { REMOVED_UI_EXTENSIONS } from './removed-extensions.js';
-import type { ManifestData } from './manifest.js';
-import type { UIExtension, UIExtensionContext } from './types.js';
-import type { RemovedUIExtension, RemovedRevertResult } from './removed-extensions.js';
-
-// ── 注入策略：正则模式链（无需 .map，21 版本全仿真验证通过）──────────────────
-
-/**
- * 获取当前 bundle 的 hash（用于检测 OC 升级）。
- */
-function getCurrentBundleHash(controlUiDir: string): string {
-  const assetsDir = join(controlUiDir, 'assets');
-  const bundlePath = findFileByPrefix(assetsDir, 'index-');
-  return bundlePath ? extractBundleHash(bundlePath) : 'unknown';
-}
-
-/**
- * 判断一个扩展是否需要变更（新增、更新、或删除）。
- */
-function needsChange(
-  ext: UIExtension | null,   // null = 已从注册表删除
-  oldVersion: number | null  // null = manifest 中不存在
-): boolean {
-  if (ext === null) return true;       // 需要删除
-  if (oldVersion === null) return true; // 需要新增
-  return ext.version !== oldVersion;   // 需要更新
-}
-
-/**
- * 加载全部 UI 扩展。
- *
- * Reconciliation 流程：
- * 1. 读取 manifest（不存在视为空）
- * 2. 检测 bundleHash：不同 → OC 升级 → 全部重新 apply
- * 3. 独立扩展逐个 apply/revert
- * 4. 共享文件扩展按组处理：任何一个变更 → 恢复 backup → 重新 apply 全组
- * 5. 写入新 manifest
- */
-export async function loadUIExtensions(context: UIExtensionContext = {}): Promise<void> {
-  const controlUiDir = resolveControlUiDir();
-
-  if (!controlUiDir) {
-    logger.warn('[ui-ext] control-ui directory not found, skipping');
-    return;
-  }
-
-  logger.info(`[ui-ext] control-ui located: ${controlUiDir}`);
-
-  const currentHash = getCurrentBundleHash(controlUiDir);
-  const manifest = readManifest(controlUiDir);
-  const removedIds = new Set(REMOVED_UI_EXTENSIONS.map(ext => ext.id));
-
-  // bundleHash 不同 → OC 升级了
-  const isOcUpgrade = manifest !== null && manifest.bundleHash !== currentHash;
-  const needFullReapply = isOcUpgrade;
-  if (isOcUpgrade) {
-    logger.info(`[ui-ext] OC upgrade detected (${manifest!.bundleHash} → ${currentHash}), re-applying all`);
-  }
-
-  // These are removed backend dist patches from the previous SSE strategy.
-  // Scan every startup regardless of manifest state: migration sites may have
-  // missing manifests, stale backups, or hand-applied copies.
-  // Track which shared files were restored so we force those groups to rebuild.
-  const forceSharedRebuild = new Set<string>();
-
-  for (const ext of REMOVED_UI_EXTENSIONS) {
-    const result = safeRevertRemoved(ext, controlUiDir);
-    if (result === 'failed') {
-      logger.error(`[ui-ext] ${ext.id}: removed backend patch could not be reverted; aborting UI extension load`);
-      return;
-    }
-    if (result === 'restored' && ext.sharedFile) {
-      forceSharedRebuild.add(ext.sharedFile);
-      logger.info(`[ui-ext] ${ext.id}: shared file '${ext.sharedFile}' restored, will force group rebuild`);
-    }
-  }
-
-  const oldExtensions = (manifest && !needFullReapply)
-    ? Object.fromEntries(Object.entries(manifest.extensions).filter(([id]) => !removedIds.has(id)))
-    : {};
-
-  // ── 分组：独立扩展 vs 共享文件扩展 ──
-
-  const independentExts: UIExtension[] = [];
-  const sharedGroups = new Map<string, UIExtension[]>();
-
-  for (const ext of UI_EXTENSIONS) {
-    if (ext.sharedFile) {
-      const group = sharedGroups.get(ext.sharedFile) ?? [];
-      group.push(ext);
-      sharedGroups.set(ext.sharedFile, group);
-    } else {
-      independentExts.push(ext);
-    }
-  }
-
-  const newExtensions: Record<string, { version: number }> = {};
-  let applied = 0;
-  let skipped = 0;
-
-  // ── 处理独立扩展（逐个 apply/revert）──
-
-  for (const ext of independentExts) {
-    const old = oldExtensions[ext.id];
-
-    if (old && old.version === ext.version && !ext.alwaysApply) {
-      skipped++;
-      newExtensions[ext.id] = { version: ext.version };
-      logger.debug(`[ui-ext] ${ext.id}: skip (v${ext.version} unchanged)`);
-      continue;
-    }
-
-    if (old && old.version !== ext.version) {
-      // 版本变了，先 revert
-      logger.debug(`[ui-ext] ${ext.id}: revert (v${old.version} → v${ext.version})`);
-      safeRevert(ext, controlUiDir);
-    }
-
-    logger.debug(`[ui-ext] ${ext.id}: apply v${ext.version}`);
-    if (safeApply(ext, controlUiDir, context)) {
-      newExtensions[ext.id] = { version: ext.version };
-      applied++;
-    }
-  }
-
-  // ── 处理共享文件扩展（按组批量 reconcile）──
-
-  for (const [sharedFile, group] of sharedGroups) {
-    // 检查这个组里是否有任何扩展需要变更
-    let groupNeedsChange = forceSharedRebuild.has(sharedFile);
-    if (groupNeedsChange) {
-      logger.info(`[ui-ext] Shared group '${sharedFile}': forced rebuild due to removed extension cleanup`);
-    }
-
-    if (!groupNeedsChange) {
-      for (const ext of group) {
-        const old = oldExtensions[ext.id];
-        if (needsChange(ext, old?.version ?? null)) {
-          groupNeedsChange = true;
-          break;
-        }
-      }
-    }
-
-    // 检查是否有被删除的扩展（在 manifest 中属于该组但不在当前注册表中）
-    // 如果有，必须触发组重建以清除残留补丁
-    const groupRegistryIds = new Set(group.map(e => e.id));
-    for (const oldId of Object.keys(oldExtensions)) {
-      // 只关心曾经属于本组的扩展（不在当前注册表中 + 不在当前组中）
-      if (!groupRegistryIds.has(oldId) && !UI_EXTENSIONS.some(e => e.id === oldId)) {
-        // 无法确定旧扩展属于哪个组（manifest 不记录 sharedFile），保守触发重建
-        logger.info(`[ui-ext] Orphaned extension '${oldId}' found, triggering group '${sharedFile}' rebuild`);
-        groupNeedsChange = true;
-        break;
-      }
-    }
-
-    if (!groupNeedsChange) {
-      // 全组无变更，跳过
-      for (const ext of group) {
-        newExtensions[ext.id] = { version: ext.version };
-        skipped++;
-        logger.debug(`[ui-ext] ${ext.id}: skip (shared group '${sharedFile}' unchanged)`);
-      }
-      continue;
-    }
-
-    // 有变更 → 恢复 backup → 重新 apply 全组
-    logger.info(`[ui-ext] Shared group '${sharedFile}': changes detected, rebuilding`);
-
-    // 恢复 backup（仅当之前有补丁时才需要还原）
-    const assetsDir = join(controlUiDir, 'assets');
-    const bundlePath = findFileByPrefix(assetsDir, 'index-');
-    if (bundlePath) {
-      const restored = restoreFile(bundlePath);
-      if (restored) {
-        logger.debug(`[ui-ext] Restored backup for shared group '${sharedFile}'`);
-      } else {
-        logger.debug(`[ui-ext] No backup to restore (first install or OC upgrade)`);
-      }
-    }
-
-    // 重新 apply 全组中所有应保留的扩展
-    for (const ext of group) {
-      logger.debug(`[ui-ext] ${ext.id}: apply v${ext.version} (group rebuild)`);
-      if (safeApply(ext, controlUiDir, context)) {
-        newExtensions[ext.id] = { version: ext.version };
-        applied++;
-      }
-    }
-  }
-
-  // ── 写入新 manifest ──
-
-  const newManifest: ManifestData = {
-    bundleHash: currentHash,
-    strategy: 'regex',
-    extensions: newExtensions,
-  };
-  writeManifest(controlUiDir, newManifest);
-
-  logger.info(`[ui-ext] Done: ${applied} applied, ${skipped} skipped`);
-}
-
-/**
- * 卸载全部 UI 扩展（插件卸载时调用）。
- *
- * 共享文件扩展：恢复 backup 即可（一次还原覆盖所有修改）。
- * 独立扩展：逐个 revert。
- */
-export async function unloadUIExtensions(): Promise<void> {
-  const controlUiDir = resolveControlUiDir();
-  if (!controlUiDir) return;
-
-  // 先恢复共享文件的 backup
-  const assetsDir = join(controlUiDir, 'assets');
-  const bundlePath = findFileByPrefix(assetsDir, 'index-');
-  if (bundlePath) {
-    restoreFile(bundlePath);
-  }
-
-  // 再逆序 revert 独立扩展
-  for (const ext of UI_EXTENSIONS.slice().reverse()) {
-    if (!ext.sharedFile) {
-      safeRevert(ext, controlUiDir);
-    }
-  }
-
-  removeManifest(controlUiDir);
-  logger.info('[ui-ext] All UI extensions unloaded');
-}
-
-// ── Helpers ──────────────────────────────────────────────────────────────
-
-function safeApply(ext: UIExtension, controlUiDir: string, context: UIExtensionContext): boolean {
-  try {
-    return ext.apply(controlUiDir, context);
-  } catch (err) {
-    logger.error(`[ui-ext] Failed to apply '${ext.id}': ${(err as Error).message}`);
-    return false;
-  }
-}
-
-function safeRevert(ext: UIExtension, controlUiDir: string): void {
-  try {
-    ext.revert(controlUiDir);
-  } catch (err) {
-    logger.error(`[ui-ext] Failed to revert '${ext.id}': ${(err as Error).message}`);
-  }
-}
-
-function safeRevertRemoved(ext: RemovedUIExtension, controlUiDir: string): RemovedRevertResult {
-  try {
-    return ext.revert(controlUiDir);
-  } catch (err) {
-    logger.error(`[ui-ext] Failed to revert removed extension '${ext.id}': ${(err as Error).message}`);
-    return 'failed';
-  }
-}