openclaw-openagent 1.0.12 → 1.0.14

package/src/plugin-ui/ui-extension-loader/removed-extensions.ts

@@ -1,70 +0,0 @@
-import { readFileSync } from 'node:fs';
-import { join } from 'node:path';
-import { logger } from '../../util/logger.js';
-import { findFileByPrefix, resolveOpenClawDistDir } from './locator.js';
-import { restoreFile } from './backup.js';
-
-export type RemovedRevertResult = 'none' | 'restored' | 'failed';
-
-export type RemovedUIExtension = {
-  id: string;
-  /** Which shared file group this removed extension belongs to (if any). */
-  sharedFile?: string;
-  revert(controlUiDir: string): RemovedRevertResult;
-};
-
-function fileNeedsRemoval(filepath: string, id: string, fingerprints: string[]): boolean {
-  const content = readFileSync(filepath, 'utf-8');
-  return content.includes(`/*openagent:${id}`) || fingerprints.some(fp => content.includes(fp));
-}
-
-function restoreRemovedPatch(filepath: string | null, id: string, fingerprints: string[]): RemovedRevertResult {
-  if (!filepath) return 'none';
-  if (!fileNeedsRemoval(filepath, id, fingerprints)) return 'none';
-
-  const restored = restoreFile(filepath);
-  if (!restored) {
-    logger.warn(`[ui-ext] ${id}: removed extension is present but no backup exists; refusing to continue`);
-    return 'failed';
-  }
-
-  logger.info(`[ui-ext] ${id}: removed extension reverted from backup`);
-  return 'restored';
-}
-
-export const REMOVED_UI_EXTENSIONS: RemovedUIExtension[] = [
-  {
-    id: 'gateway-openagent-tool-payload',
-    revert(controlUiDir: string): RemovedRevertResult {
-      const distDir = resolveOpenClawDistDir(controlUiDir);
-      const gatewayPath = distDir ? findFileByPrefix(distDir, 'gateway-cli-') : null;
-      return restoreRemovedPatch(gatewayPath, this.id, [
-        '__openagentToolCallIds',
-        '__openagentKeepToolPayload',
-        '__openagentEffectiveToolVerbose',
-      ]);
-    },
-  },
-  {
-    id: 'agent-event-openagent-tool-result',
-    revert(controlUiDir: string): RemovedRevertResult {
-      const distDir = resolveOpenClawDistDir(controlUiDir);
-      const agentBundlePath = distDir ? findFileByPrefix(distDir, 'auth-profiles-') : null;
-      return restoreRemovedPatch(agentBundlePath, this.id, [
-        '__openagentIsRemoteToolName',
-      ]);
-    },
-  },
-  {
-    id: 'marked-expose',
-    sharedFile: 'index-bundle',
-    revert(controlUiDir: string): RemovedRevertResult {
-      const assetsDir = join(controlUiDir, 'assets');
-      const bundlePath = findFileByPrefix(assetsDir, 'index-');
-      return restoreRemovedPatch(bundlePath, this.id, [
-        'window.__openagentMarked=',
-        '__openagentMarked',
-      ]);
-    },
-  },
-];

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

@@ -1,72 +0,0 @@
-/**
- * UIExtension 类型定义与注册表
- *
- * 每个 UIExtension 是一个独立的、可增删的扩展点。
- * 框架只关心 id 和 version，具体操作由 apply/revert 内部处理。
- */
-
-export interface UIExtension {
-  /** 唯一标识（如 'override-script'、'html-script-tag'） */
-  id: string;
-
-  /** 内容版本，改了 apply 逻辑就递增 */
-  version: number;
-
-  /**
-   * 共享文件标识（可选）。
-   *
-   * 多个扩展修改同一文件时（如 toolcard-render 和 toolcallid-propagate 都改 index-*.js），
-   * 设置相同的 sharedFile 值。reconciler 会把它们作为一组处理：
-   * 任何一个需要变更 → 恢复 backup → 重新 apply 全组中应保留的扩展。
-   *
-   * 不设置此字段的扩展独立 apply/revert，不受其他扩展影响。
-   */
-  sharedFile?: string;
-
-  /**
-   * 每次启动都调用 apply（可选）。
-   *
-   * 默认行为：manifest version 匹配时跳过 apply。
-   * 设为 true 后：即使 version 不变也调用 apply，由 apply 内部判断是否需要操作。
-   * 适用于内容可能独立于 version 变化的扩展（如 override-script 的产物文件）。
-   */
-  alwaysApply?: boolean;
-
-  /**
-   * 加载扩展。
-   * 接收 control-ui 目录路径，内部自行决定改什么文件、怎么改。
-   * 返回 true 表示成功，false 表示失败（不写入 manifest，下次重试）。
-   */
-  apply: (controlUiDir: string, context?: UIExtensionContext) => boolean;
-
-  /**
-   * 卸载扩展。
-   * 还原 apply 所做的全部修改。
-   * 注意：共享文件的扩展不应单独调用 revert，由 reconciler 统一处理。
-   */
-  revert: (controlUiDir: string) => void;
-}
-
-export interface UIExtensionContext {
-  hostVersion?: string;
-}
-
-/**
- * OpenAgent 标记前缀，注入的代码旁加此注释以标识修改来源。
- * 格式：/*openagent:<extension-id>* /
- */
-export const OPENAGENT_MARKER_PREFIX = '/*openagent:';
-
-/**
- * 生成标记注释。
- */
-export function makeMarker(extensionId: string): string {
-  return `/*openagent:${extensionId}*/`;
-}
-
-/**
- * 检查内容中是否包含指定扩展点的标记。
- */
-export function hasMarker(content: string, extensionId: string): boolean {
-  return content.includes(makeMarker(extensionId));
-}

package/src/proxy/auth-proxy.ts

@@ -1,409 +0,0 @@
-/**
- * Auth API Proxy — Gateway-side reverse proxy for auth.ai-talk.live
- *
- * Eliminates CSP connect-src patching by proxying browser requests
- * through a same-origin plugin HTTP route:
- *
- *   Browser: fetch('/plugins/openagent/api/agents')
- *     → Gateway plugin-http stage
- *     → this handler
- *     → fetch('https://auth.ai-talk.live/api/agents')
- *     → response back to browser
- *
- * Registered via api.registerHttpRoute() in index.ts.
- * See: docs/audit/022-A-loader-audit-v1.md §4.7–4.10
- */
-
-import type { IncomingMessage, ServerResponse } from 'node:http';
-import fs from 'node:fs';
-import nodePath from 'node:path';
-import { logger } from '../util/logger.js';
-import { registry } from '../runtime/registry.js';
-import { isUnconfiguredOasnApiBase } from '../auth/config.js';
-import { resolveOasnRelativeUrl } from '../util/url-resolver.js';
-
-/** TIM 路径默认上游（兼容旧版） */
-const AUTH_UPSTREAM_TIM = 'https://auth.ai-talk.live';
-const PROXY_TIMEOUT_MS = 15_000;
-const MAX_BODY_BYTES = 64 * 1024; // 64KB — tagline API body is ~100 bytes
-
-/**
- * 获取当前 OASN access API base URL，用于解析响应中的相对路径。
- */
-function getOasnAccessBase(): string {
-  const rt = registry.getDefault();
-  if (rt?.transportType !== 'oasn') return '';
-  return (rt.config?.accessApiBase || rt.config?.apiBase || '').replace(/\/+$/, '');
-}
-
-/**
- * 根据当前 active runtime 的 transport 类型决定上游。
- *
- *   - transport='oasn'：Discovery/onboarding 用 account.apiBase；
- *     Access-layer endpoint 用 account.accessApiBase（未配置时回落到 apiBase）
- *   - transport='tim' 或无 active runtime：fallback 到 AUTH_UPSTREAM_TIM
- *
- * 浏览器侧 Agent Book 通过 /plugins/openagent/api/* 统一访问，由此处分流。
- */
-function pickUpstream(method: string, pathname: string): string | null {
-  const rt = registry.getDefault();
-  if (rt?.transportType === 'oasn') {
-    const apiBase = rt.config?.apiBase;
-    const accessApiBase = rt.config?.accessApiBase || apiBase;
-    const upstream = isAccessLayerProxyPath(method, pathname) ? accessApiBase : apiBase;
-    return isUnconfiguredOasnApiBase(upstream) ? null : upstream ?? null;
-  }
-  return AUTH_UPSTREAM_TIM;
-}
-
-// ── Gateway base URL detection ──────────────────────────────────────────
-// Captured from the first incoming HTTP request's Host header.
-// Handles Docker port mapping: container port ≠ host port.
-let _gatewayBaseUrl: string | undefined;
-
-/** Returns the gateway base URL as seen by the browser (e.g. http://localhost:18794). */
-export function getGatewayBaseUrl(): string {
-  return _gatewayBaseUrl ?? 'http://localhost:18794';
-}
-
-// ── Handler factory ─────────────────────────────────────────────────────
-
-export function createAuthProxyHandler() {
-  return async (req: IncomingMessage, res: ServerResponse): Promise<boolean> => {
-    // Gateway strips the matched prefix; req.url is the path after prefix removal.
-    // E.g. /plugins/openagent/api/agents → req.url = /api/agents
-    const url = new URL(req.url ?? '/', `http://${req.headers.host ?? 'localhost'}`);
-    logger.info(`[proxy] RECEIVED: ${req.method} ${req.url}`);
-
-    // Capture the gateway's external base URL from the browser's request.
-    // Reads standard reverse-proxy headers for correct protocol/host detection:
-    //   - Local:  http://localhost:18794
-    //   - Docker: http://127.0.0.1:18794  (port mapped)
-    //   - Nginx:  https://oc6.openagent.club (X-Forwarded-Proto/Host)
-    if (!_gatewayBaseUrl && req.headers.host) {
-      const proto = (req.headers['x-forwarded-proto'] as string)?.split(',')[0]?.trim() || 'http';
-      const host = (req.headers['x-forwarded-host'] as string)?.split(',')[0]?.trim() || req.headers.host;
-      _gatewayBaseUrl = `${proto}://${host}`;
-      logger.info(`[proxy] Gateway base URL detected: ${_gatewayBaseUrl}`);
-    }
-
-    // req.url may or may not have the /plugins/openagent prefix stripped by Gateway
-    // (behavior varies across Gateway versions), so strip it defensively.
-    let targetPath = url.pathname;
-    if (targetPath.startsWith('/plugins/openagent')) {
-      targetPath = targetPath.slice('/plugins/openagent'.length);
-    }
-    // ── T4: Serve local media files from /tmp/openclaw/openagent-media/ ──
-    // Files downloaded from remote agents are stored here. The media route must
-    // be detected after prefix normalization because Gateway versions disagree
-    // on whether /plugins/openagent has already been stripped.
-    if (targetPath.startsWith('/media/')) {
-      return serveLocalMedia(targetPath, res);
-    }
-    // v3.9+ 双轨抽象：上游按当前 transport 切换（OASN → api.oasn.ai；TIM → auth.ai-talk.live）
-    const method = req.method ?? 'GET';
-    const rt = registry.getDefault();
-    if (!rt && isOasnProxyPath(method, targetPath)) {
-      writeJson(res, 503, {
-        error: 'OASN account is not configured',
-        detail: 'Run openclaw-plugin-openagent-cli install to register this device before opening Agent Book.',
-      });
-      return true;
-    }
-    if (rt && rt.transportType !== 'oasn' && isOasnProxyPath(method, targetPath)) {
-      writeJson(res, 503, {
-        error: 'OASN transport is not active',
-        detail: 'Agent Book discovery requires an installed OASN account.',
-      });
-      return true;
-    }
-    if (rt?.transportType === 'oasn' && !isAllowedOasnProxyRequest(method, targetPath)) {
-      logger.warn(`[proxy] blocked OASN proxy path: ${method} ${targetPath}`);
-      writeJson(res, 403, { error: 'proxy path not allowed' });
-      return true;
-    }
-
-    const upstreamBase = pickUpstream(method, targetPath);
-    if (!upstreamBase) {
-      writeJson(res, 503, { error: 'OASN api_base is not configured' });
-      return true;
-    }
-    const targetUrl = resolveOasnProxyTargetUrl(upstreamBase, targetPath, url.search);
-
-    logger.info(`[proxy] ${method} ${url.pathname} → ${targetUrl}`);
-
-    try {
-      // Read request body for non-GET methods
-      let body: string | undefined;
-      if (method !== 'GET' && method !== 'HEAD') {
-        body = await readBody(req, MAX_BODY_BYTES);
-      }
-
-      // Forward to upstream with timeout
-      const upstream = await fetch(targetUrl, {
-        method,
-        headers: buildUpstreamHeaders(req),
-        body,
-        signal: AbortSignal.timeout(PROXY_TIMEOUT_MS),
-      });
-
-      // Relay response (binary-safe for images)
-      res.statusCode = upstream.status;
-      const contentType = upstream.headers.get('content-type');
-      if (contentType) res.setHeader('Content-Type', contentType);
-
-      let buf = Buffer.from(await upstream.arrayBuffer());
-
-      // Resolve OASN-relative URLs in GET invocation responses so the
-      // frontend receives absolute URLs (launch_url, content_url, etc.).
-      if (method === 'GET' && /^\/api\/invocations\/[^/]+$/.test(targetPath) && buf.length > 0) {
-        try {
-          const isJson = contentType?.includes('json');
-          if (isJson) {
-            const oasnBase = getOasnAccessBase();
-            if (oasnBase) {
-              const text = buf.toString('utf-8');
-              const resolved = text.replace(
-                /"(launch_url|content_url)":"(\/[^"]+)"/g,
-                (_m: string, key: string, path: string) => {
-                  try {
-                    return `"${key}":"${new URL(path, oasnBase).toString()}"`;
-                  } catch { return _m; }
-                },
-              );
-              buf = Buffer.from(resolved, 'utf-8');
-            }
-          }
-        } catch { /* best-effort; don't break proxy on parse errors */ }
-      }
-
-      res.end(buf);
-
-      logger.info(`[proxy] ${method} ${url.pathname} → ${upstream.status} (${buf.length} bytes)`);
-    } catch (err) {
-      const msg = (err as Error).message;
-      logger.warn(`[proxy] ${method} ${targetUrl} failed: ${msg}`);
-
-      if (!res.headersSent) {
-        writeJson(res, 502, { error: 'proxy upstream failed', detail: msg });
-      }
-    }
-
-    return true;
-  };
-}
-
-export function resolveOasnProxyTargetUrl(upstreamBase: string, targetPath: string, search = ''): string {
-  return resolveOasnRelativeUrl(upstreamBase, `${targetPath}${search}`);
-}
-
-// ── T4: Local media serve ────────────────────────────────────────────────
-
-const MEDIA_DIR = '/tmp/openclaw/openagent-media';
-
-/** MIME type lookup for common media extensions. */
-const MIME_MAP: Record<string, string> = {
-  '.mp3': 'audio/mpeg',
-  '.wav': 'audio/wav',
-  '.ogg': 'audio/ogg',
-  '.m4a': 'audio/mp4',
-  '.mp4': 'video/mp4',
-  '.webm': 'video/webm',
-  '.png': 'image/png',
-  '.jpg': 'image/jpeg',
-  '.jpeg': 'image/jpeg',
-  '.gif': 'image/gif',
-  '.webp': 'image/webp',
-  '.pdf': 'application/pdf',
-  '.txt': 'text/plain',
-  '.md': 'text/markdown; charset=utf-8',
-  '.json': 'application/json; charset=utf-8',
-  '.zip': 'application/zip',
-  '.pptx': 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
-  '.docx': 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-  '.xlsx': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-};
-
-/**
- * Serve a file from the local openagent-media directory.
- * Used by T4 remote file transfer — tool result references files as
- * MEDIA:http://localhost:PORT/plugins/openagent/media/{filename}
- *
- * @returns true (request handled)
- */
-function serveLocalMedia(pathname: string, res: ServerResponse): true {
-  // /media/{filename} → {filename}  (prefix already stripped by Gateway)
-  const raw = pathname.replace('/media/', '');
-  const fileName = decodeURIComponent(raw);
-
-  // Security: block path traversal, null bytes, and directory components
-  if (!fileName || fileName.includes('..') || fileName.includes('/') || fileName.includes('\\') || fileName.includes('\0')) {
-    logger.warn(`[proxy/media] Blocked unsafe path: ${raw}`);
-    res.statusCode = 400;
-    res.end('Bad request');
-    return true;
-  }
-
-  const filePath = nodePath.join(MEDIA_DIR, fileName);
-
-  // Double-check: resolved path must stay within MEDIA_DIR
-  if (!nodePath.resolve(filePath).startsWith(nodePath.resolve(MEDIA_DIR) + nodePath.sep) &&
-      nodePath.resolve(filePath) !== nodePath.resolve(MEDIA_DIR)) {
-    logger.warn(`[proxy/media] Path escape attempt: ${fileName} → ${filePath}`);
-    res.statusCode = 400;
-    res.end('Bad request');
-    return true;
-  }
-
-  if (!fs.existsSync(filePath)) {
-    logger.debug(`[proxy/media] File not found: ${filePath}`);
-    res.statusCode = 404;
-    res.end('Not found');
-    return true;
-  }
-
-  try {
-    const ext = nodePath.extname(fileName).toLowerCase();
-    const contentType = MIME_MAP[ext] ?? 'application/octet-stream';
-    const stat = fs.statSync(filePath);
-
-    res.setHeader('Content-Type', contentType);
-    res.setHeader('Content-Length', stat.size);
-    if (shouldDownloadAsAttachment(contentType)) {
-      res.setHeader('Content-Disposition', `attachment; filename*=UTF-8''${encodeURIComponent(fileName)}`);
-    }
-    // Allow browser to cache media for 1 hour
-    res.setHeader('Cache-Control', 'private, max-age=3600');
-
-    const stream = fs.createReadStream(filePath);
-    stream.pipe(res);
-    stream.on('error', (err) => {
-      logger.error(`[proxy/media] Stream error: ${err.message} file=${fileName}`);
-      if (!res.headersSent) {
-        res.statusCode = 500;
-        res.end('Internal error');
-      }
-    });
-
-    logger.info(`[proxy/media] Serving ${fileName} (${contentType}, ${stat.size} bytes)`);
-  } catch (err) {
-    logger.error(`[proxy/media] Error serving ${fileName}: ${(err as Error).message}`);
-    if (!res.headersSent) {
-      res.statusCode = 500;
-      res.end('Internal error');
-    }
-  }
-
-  return true;
-}
-
-function shouldDownloadAsAttachment(contentType: string): boolean {
-  return !contentType.startsWith('image/')
-    && !contentType.startsWith('audio/')
-    && !contentType.startsWith('video/')
-    && !contentType.startsWith('text/plain');
-}
-
-// ── Helpers ──────────────────────────────────────────────────────────────
-
-/**
- * Build headers for the upstream request.
- * Forwards Content-Type and Authorization (needed by tagline API).
- *
- * OASN 模式：浏览器端没有 api_key，代理自动注入 Bearer token。
- * TIM 模式：转发浏览器自带的 Authorization（如有）。
- */
-function buildUpstreamHeaders(req: IncomingMessage): Record<string, string> {
-  const headers: Record<string, string> = {};
-
-  const ct = req.headers['content-type'];
-  if (ct) headers['Content-Type'] = ct;
-
-  const rt = registry.getDefault();
-  if (rt?.transportType === 'oasn') {
-    if (rt.config?.apiKey) headers['Authorization'] = `Bearer ${rt.config.apiKey}`;
-    return headers;
-  }
-
-  // TIM mode: keep forwarding browser Authorization for the legacy auth API.
-  const auth = req.headers['authorization'];
-  if (auth) {
-    headers['Authorization'] = auth;
-  }
-
-  return headers;
-}
-
-export function isAllowedOasnProxyRequest(method: string, pathname: string): boolean {
-  const m = method.toUpperCase();
-  const p = pathname.startsWith('/') ? pathname : `/${pathname}`;
-  const isRead = m === 'GET' || m === 'HEAD';
-
-  if (isRead && p === '/api/agent-card-categories') return true;
-  if (isRead && /^\/api\/agent-cards\/[^/]+$/.test(p)) return true;
-  if (m === 'POST' && /^\/api\/agent-cards\/search\/(by-query|by-category|by-tags)$/.test(p)) return true;
-  if (isRead && /^\/api\/agents\/[^/]+$/.test(p)) return true;
-  if (m === 'POST' && p === '/api/agents/claim') return true;
-  if (m === 'POST' && p === '/api/invocations') return true;
-  if (isRead && /^\/api\/invocations\/[^/]+$/.test(p)) return true;
-  if (m === 'POST' && p === '/api/files') return true;
-  if (isRead && /^\/api\/artifacts\/[^/]+\/content$/.test(p)) return true;
-  if (isRead && p.startsWith('/avatars/')) return true;
-  return false;
-}
-
-function isAccessLayerProxyPath(method: string, pathname: string): boolean {
-  const m = method.toUpperCase();
-  const p = pathname.startsWith('/') ? pathname : `/${pathname}`;
-  const isRead = m === 'GET' || m === 'HEAD';
-  if (m === 'POST' && p === '/api/invocations') return true;
-  if (isRead && /^\/api\/invocations\/[^/]+$/.test(p)) return true;
-  if (m === 'POST' && p === '/api/files') return true;
-  if (isRead && /^\/api\/artifacts\/[^/]+\/content$/.test(p)) return true;
-  return false;
-}
-
-function isOasnProxyPath(method: string, pathname: string): boolean {
-  const m = method.toUpperCase();
-  const p = pathname.startsWith('/') ? pathname : `/${pathname}`;
-  const isRead = m === 'GET' || m === 'HEAD';
-  if (isRead && p === '/api/agent-card-categories') return true;
-  if (isRead && /^\/api\/agent-cards\/[^/]+$/.test(p)) return true;
-  if (m === 'POST' && /^\/api\/agent-cards\/search\/(by-query|by-category|by-tags)$/.test(p)) return true;
-  if (isRead && /^\/api\/agents\/[^/]+$/.test(p)) return true;
-  if (m === 'POST' && p === '/api/agents/claim') return true;
-  if (m === 'POST' && p === '/api/invocations') return true;
-  if (isRead && /^\/api\/invocations\/[^/]+$/.test(p)) return true;
-  if (m === 'POST' && p === '/api/files') return true;
-  if (isRead && /^\/api\/artifacts\/[^/]+\/content$/.test(p)) return true;
-  return false;
-}
-
-function writeJson(res: ServerResponse, statusCode: number, body: Record<string, unknown>): void {
-  res.statusCode = statusCode;
-  res.setHeader('Content-Type', 'application/json');
-  res.end(JSON.stringify(body));
-}
-
-/**
- * Read the request body with a size limit.
- */
-function readBody(req: IncomingMessage, maxBytes: number): Promise<string> {
-  return new Promise((resolve, reject) => {
-    const chunks: Buffer[] = [];
-    let total = 0;
-
-    req.on('data', (chunk: Buffer) => {
-      total += chunk.length;
-      if (total > maxBytes) {
-        req.destroy();
-        reject(new Error(`Request body exceeds ${maxBytes} bytes`));
-        return;
-      }
-      chunks.push(chunk);
-    });
-
-    req.on('end', () => resolve(Buffer.concat(chunks).toString('utf-8')));
-    req.on('error', reject);
-  });
-}