openclaw-openagent 1.0.12 → 1.0.14

package/src/tim/messages.ts

@@ -1,166 +0,0 @@
-/**
- * TIM Messages — Send and fetch messages via SDK
- *
- * v3: fetchMessages uses SDK getMessageList() instead of REST API.
- * This fixes the v2 bug where non-admin accounts got empty results.
- */
-
-import { logger } from '../util/logger.js';
-import type { TIMClient } from './client.js';
-
-// ── Types ──
-
-export interface HistoryMessage {
-  id: string;
-  from: string;
-  text: string;
-  time: number;
-  seq?: number;
-}
-
-export interface SendResult {
-  ok: boolean;
-  messageId: string;
-}
-
-// ── Functions ──
-
-/**
- * Send a text message to a group channel.
- * Includes a 10s local timeout to catch dead SDK connections.
- *
- * When atUserList is provided, uses TIM createTextAtMessage to set
- * protocol-level @mentions (visible to receivers' atUserList detection).
- * See: docs/audit/012-mention-mode-bot-to-bot-v3.4.4.md
- */
-export async function sendMessage(
-  client: TIMClient,
-  channelId: string,
-  text: string,
-  atUserList?: string[],
-): Promise<SendResult> {
-  const chat = client._chat;
-  if (!chat || !client.isReady) {
-    throw new Error('Not connected');
-  }
-
-  logger.info(`[tim/messages] sendMessage: ch=${channelId} len=${text.length} at=${atUserList?.join(',') ?? 'none'}`);
-
-  const message = (atUserList && atUserList.length > 0)
-    ? chat.createTextAtMessage({
-        to: channelId,
-        conversationType: client._types.CONV_GROUP,
-        payload: { text, atUserList },
-      })
-    : chat.createTextMessage({
-        to: channelId,
-        conversationType: client._types.CONV_GROUP,
-        payload: { text },
-      });
-
-  // CRITICAL: Timer MUST be cleared after race settles.
-  // Without clearTimeout, a successful send leaves an orphan reject()
-  // firing 10s later as an unhandled rejection → gateway crash.
-  let timeoutHandle: ReturnType<typeof setTimeout>;
-  const timeoutPromise = new Promise<never>((_, reject) => {
-    timeoutHandle = setTimeout(
-      () => reject(new Error(`sendMessage timeout (10s) for channel ${channelId}`)),
-      10_000,
-    );
-  });
-
-  try {
-    const res = await Promise.race([chat.sendMessage(message), timeoutPromise]) as {
-      data?: { message?: { ID?: string } };
-    };
-
-    return {
-      ok: true,
-      messageId: res.data?.message?.ID || '',
-    };
-  } catch (err) {
-    const code = (err as { code?: number })?.code;
-    logger.error(`[tim/messages] sendMessage failed: code=${code} msg=${(err as Error).message} ch=${channelId}`);
-    throw err;
-  } finally {
-    clearTimeout(timeoutHandle!);
-  }
-}
-
-/**
- * Fetch message history for a group channel using SDK getMessageList().
- *
- * v3 change: REST API → SDK getMessageList()
- * - Filters non-text messages (system msgs, join/leave notifications)
- * - Maps to HistoryMessage interface
- * - seq from message.sequence (optional)
- * - Works with normal user credentials (fixes v2 empty array bug)
- */
-export async function fetchMessages(
-  client: TIMClient,
-  channelId: string,
-  count = 20,
-): Promise<HistoryMessage[]> {
-  const chat = client._chat;
-  if (!chat || !client.isReady) {
-    throw new Error('Not connected');
-  }
-
-  try {
-    logger.info(`[tim/messages] fetchMessages: ch=${channelId} count=${count}`);
-    const conversationID = `GROUP${channelId}`;
-    const res = await chat.getMessageList({
-      conversationID,
-      count,
-    }) as {
-      data?: {
-        messageList?: Array<{
-          ID?: string;
-          from?: string;
-          type?: string;
-          payload?: { text?: string };
-          time?: number;
-          sequence?: number;
-        }>;
-      };
-    };
-
-    const messageList = res.data?.messageList || [];
-
-    // Filter to text messages only (exclude system messages, join/leave, etc.)
-    return messageList
-      .filter(msg => msg.type === client._types.MSG_TEXT)
-      .map(msg => mapToHistoryMessage(msg, channelId));
-  } catch (err) {
-    logger.error(`[tim/messages] fetchMessages error for ${channelId}: ${(err as Error).message}`);
-    throw err;
-  }
-}
-
-/**
- * Map a single SDK message to HistoryMessage interface.
- * Exported for contract testing.
- */
-export function mapToHistoryMessage(
-  msg: {
-    ID?: string;
-    from?: string;
-    payload?: { text?: string };
-    time?: number;
-    sequence?: number;
-  },
-  channelId: string,
-): HistoryMessage {
-  const result: HistoryMessage = {
-    id: msg.ID || `${channelId}:${msg.sequence || Date.now()}`,
-    from: msg.from || 'unknown',
-    text: msg.payload?.text || '',
-    time: (msg.time || 0) * 1000,
-  };
-
-  if (msg.sequence != null) {
-    result.seq = msg.sequence;
-  }
-
-  return result;
-}

package/src/tim/sdk-logger-init.ts

@@ -1,50 +0,0 @@
-/**
- * TIM SDK Logger Bridge — 副作用模块
- *
- * 将腾讯云 IM SDK 的内部日志输出重定向到 OpenAgent 的 logger 组件。
- * SDK 内部原本直接调用 console.log/warn/error，此模块通过
- * globalThis.__OPENAGENT_SDK_LOGGER 注入自定义 logger 适配器，
- * 使 SDK 日志走文件输出而非 stdout，避免污染 Gateway JSON 通道。
- *
- * 必须在 @tencentcloud/chat 之前 import（副作用 import）：
- *   import './sdk-logger-init.js';
- *   import TencentCloudChat from '@tencentcloud/chat';
- */
-
-// node-polyfill.js removed — SDK now uses native Node.js APIs directly
-import { logger } from '../util/logger.js';
-
-function formatArgs(...args: unknown[]): string {
-  return args
-    .map((a) => (typeof a === 'string' ? a : JSON.stringify(a)))
-    .join(' ');
-}
-
-/**
- * SDK 内部 logger（变量 qe/Ye）期望的接口：
- *   qe.log(...)   — 普通日志
- *   qe.warn(...)  — 警告
- *   qe.error(...) — 错误
- *   qe.info(...)  — 信息
- *   qe.debug(...) — 调试
- */
-const sdkLoggerAdapter = {
-  log(...args: unknown[]): void {
-    logger.debug(`[tim-sdk] ${formatArgs(...args)}`);
-  },
-  warn(...args: unknown[]): void {
-    logger.warn(`[tim-sdk] ${formatArgs(...args)}`);
-  },
-  error(...args: unknown[]): void {
-    logger.error(`[tim-sdk] ${formatArgs(...args)}`);
-  },
-  info(...args: unknown[]): void {
-    logger.info(`[tim-sdk] ${formatArgs(...args)}`);
-  },
-  debug(...args: unknown[]): void {
-    logger.debug(`[tim-sdk] ${formatArgs(...args)}`);
-  },
-};
-
-// 注入到 globalThis，SDK 加载时会检查此变量
-(globalThis as Record<string, unknown>).__OPENAGENT_SDK_LOGGER = sdkLoggerAdapter;

package/src/tools.ts

@@ -1,10 +0,0 @@
-/**
- * OpenAgent Tools — re-export from app/ module
- *
- * This file exists for backward compatibility.
- * The actual tool implementations live in app/channel-tools.ts,
- * app/messaging-tools.ts, and app/ops-tools.ts.
- */
-
-export { registerTools } from './app/index.js';
-export type { ToolDescriptor, ToolFactory } from './app/types.js';

package/src/transport/factory.ts

@@ -1,95 +0,0 @@
-/**
- * Transport 工厂 —— 按配置创建 AgentTransport 实例
- *
- * 设计依据：docs/specs/2026-06-16-oasn-transport-abstraction-design.md §3.1
- *
- * 调用方（AccountRuntime）通过 transportType 字段决定走 OASN 还是 TIM 路径，
- * 工厂内部 lazy-import 各自的实现模块，确保「未启用的 transport 不进入运行时」。
- *   - 选 OASN 时不加载 TIM SDK（节省启动内存 & 避免无意义的 WebSocket 探测）
- *   - 选 TIM  时不加载 OASN HTTP 客户端（更小的攻击面）
- *
- * 注意：transport 实例创建后必须显式调用 ready(credentials) 才能使用，
- * 工厂只负责实例化，不负责凭证校验和连接。
- */
-
-import type { AgentTransport, OasnTransport, TimTransport } from './types.js';
-import type { PendingInvocationStore } from './oasn/index.js';
-
-/** 工厂入参 */
-export interface CreateTransportOptions {
-  /** 选择的 transport 类型 */
-  transportType: 'oasn' | 'tim';
-  /**
-   * OASN API base URL（仅 OASN 路径必填）。
-   * 形如：`https://api.oasn.ai`，不含尾斜杠和 `/api/*` 前缀。
-   */
-  apiBase?: string;
-  /** Optional Access-layer API base URL for invocation/file/artifact endpoints. */
-  accessApiBase?: string;
-  /**
-   * Agent id（仅 OASN 路径使用，TIM 路径从 credentials.userId 拿）。
-   * 用于实例标识 + 401 撤销时定位本地存储。
-   */
-  agentId?: string;
-  /**
-   * 多账户场景下的逻辑 id。
-   * 默认与 agentId 相同；当一个 OpenClaw 实例跑多个 OASN/TIM 账号时由调用方传入。
-   */
-  accountId?: string;
-  /**
-   * §11.1 OASN-only：把 SQLite-backed PendingInvocationStore 注入 OasnInvocation。
-   *
-   *   - 不传：OasnInvocation 退化为「无持久化」模式（idempotency 仍然在内存生效，但跨进程重启丢失）
-   *   - 传入：sendTask 时按 toolCallId 复用 idempotency_key，崩溃恢复时可由
-   *           StateStore.listUnsettledInvocations 续轮询
-   *
-   * 仅当 transportType='oasn' 时有意义；TIM 路径忽略此字段。
-   */
-  pendingStore?: PendingInvocationStore;
-}
-
-/**
- * 创建 transport 实例。
- *
- * 关键设计：返回类型是 union `AgentTransport`，调用方需用 `transportType` 字段 narrow：
- *
- * ```ts
- * const t = await createTransport({ transportType: 'oasn', apiBase, agentId });
- * if (t.transportType === 'oasn') {
- *   // 这里 TypeScript 知道 t 是 OasnTransport —— 可以调 t.registerAgent()
- *   await t.registerAgent('openclaw');
- * }
- * ```
- *
- * @throws 当 OASN 路径但缺少 apiBase 时
- */
-export async function createTransport(
-  options: CreateTransportOptions,
-): Promise<AgentTransport> {
-  if (options.transportType === 'oasn') {
-    if (!options.apiBase) {
-      throw new Error('createTransport: apiBase is required for OASN transport');
-    }
-    // lazy import：选 OASN 时才加载 OASN 模块（OASN HTTP 客户端不依赖 TIM SDK）
-    const { OasnTransportImpl } = await import('./oasn/oasn-transport.js');
-    return new OasnTransportImpl({
-      apiBase: options.apiBase,
-      accessApiBase: options.accessApiBase,
-      agentId: options.agentId ?? '',
-      accountId: options.accountId ?? options.agentId ?? 'default',
-      // §11.1 持久化挂载点：仅当上层提供 pendingStore 时启用
-      ...(options.pendingStore ? { pendingStore: options.pendingStore } : {}),
-    }) satisfies OasnTransport;
-  }
-
-  if (options.transportType === 'tim') {
-    // lazy import：选 TIM 时才加载 TIM SDK（避免 OASN 路径下加载 ~2MB 的 SDK）
-    const { TimTransportImpl } = await import('./tim/tim-transport.js');
-    return new TimTransportImpl({
-      accountId: options.accountId ?? 'default',
-    }) satisfies TimTransport;
-  }
-
-  // 编译期已是 'oasn' | 'tim' 的 union，运行期还能到这里说明配置异常
-  throw new Error(`createTransport: unknown transportType "${(options as { transportType: string }).transportType}"`);
-}

package/src/transport/oasn/index.ts

@@ -1,17 +0,0 @@
-/**
- * OASN transport 子模块统一出口。
- *
- * 设计依据：docs/specs/2026-06-16-oasn-transport-abstraction-design.md §3.1
- *
- * 仅 re-export 实现类与跨模块共用类型。OASN 内部 API 类型（snake_case 协议字段）
- * 不导出到外层 —— 上层应面向 src/transport/types.ts 的通用类型编程。
- */
-
-export { OasnTransportImpl } from './oasn-transport.js';
-export type { OasnTransportInitOptions } from './oasn-transport.js';
-
-// §11.1 持久化钩子（StateStore 接入用）
-export type { PendingInvocationStore } from './oasn-invocation.js';
-
-// HTTP 错误体类型（plugin-ui 错误展示可能用得上）
-export type { OasnErrorBody } from './oasn-types.js';

package/src/transport/oasn/oasn-agent-card.ts

@@ -1,111 +0,0 @@
-/**
- * OASN AgentCard CRUD + Owner 查询
- *
- * 设计依据：
- *   - docs/specs/2026-06-16-oasn-api-module-mapping.md §2.7 / §2.8 / §2.9
- *
- * 端点：
- *   - GET   /api/agent-cards/{agent_id}    公开查询（claimed+active+public 才 200）
- *   - PATCH /api/agent-cards/{agent_id}    Owner 或 Agent 更新
- *   - GET   /api/users/me                  当前 Owner（Owner access token 场景）
- */
-
-import { logger } from '../../util/logger.js';
-import type { AgentCard, AgentCardPatch, OwnerInfo } from '../types.js';
-import type { OasnHttpClient } from './oasn-http.js';
-import {
-  OASN_ENDPOINTS,
-  type AgentCardResponse,
-  type OwnerInfoResponse,
-  type UpdateAgentCardRequest,
-} from './oasn-types.js';
-import type { TransportError } from '../types.js';
-import { normalizeAgentCard } from './oasn-normalize.js';
-
-export class OasnAgentCard {
-  constructor(private readonly _http: OasnHttpClient) {}
-
-  /**
-   * 查询 AgentCard 公开信息。
-   *
-   * 用途：
-   *   1. `connect()` 时验证 api_key 有效性（即使返回 404 也能确认 Bearer 没被 401）
-   *   2. UI 展示其他 Agent 的详情
-   *
-   * 404 时返回 null（agent 不存在、未认领、或 private）。
-   */
-  async get(agentId: string): Promise<AgentCard | null> {
-    try {
-      const resp = await this._http.get<AgentCardResponse>(
-        OASN_ENDPOINTS.AGENT_CARD(agentId),
-      );
-      return this._toAgentCard(resp);
-    } catch (err) {
-      const te = err as TransportError;
-      if (te.code === 'HTTP_404' || te.code === 'AGENT_CARD_NOT_FOUND') {
-        logger.info(`[transport/oasn/agent-card] get(${agentId}) → 404 not found`);
-        return null;
-      }
-      throw err;
-    }
-  }
-
-  /**
-   * 更新 AgentCard。
-   * PATCH 语义：省略字段不变，显式 null 清空。
-   */
-  async update(agentId: string, patch: AgentCardPatch): Promise<AgentCard> {
-    const body: UpdateAgentCardRequest = {};
-    // 只复制存在的字段（undefined 不发，null 显式发出）
-    if ('name' in patch) body.name = patch.name;
-    if ('description' in patch) body.description = patch.description;
-    if ('MOM' in patch) body.MOM = patch.MOM;
-    if ('tags' in patch) body.tags = patch.tags;
-    if ('category' in patch) body.category = patch.category;
-    if ('avatar_ref' in patch) body.avatarRef = patch.avatar_ref;
-    if ('visibility' in patch) body.visibility = patch.visibility;
-    if ('public_metadata' in patch) body.publicMetadata = patch.public_metadata;
-
-    logger.info(`[transport/oasn/agent-card] update agent=${agentId} fields=${Object.keys(body).join(',')}`);
-
-    const resp = await this._http.patch<AgentCardResponse>(
-      OASN_ENDPOINTS.AGENT_CARD(agentId),
-      body,
-    );
-    return this._toAgentCard(resp);
-  }
-
-  /**
-   * 查询当前 Owner（仅当 Bearer 是 Owner access token 时可用）。
-   * Agent api_key 调用此接口可能返回 403。
-   */
-  async getCurrentOwner(): Promise<OwnerInfo | null> {
-    try {
-      const resp = await this._http.get<OwnerInfoResponse>(OASN_ENDPOINTS.USERS_ME);
-      return {
-        owner_id: resp.ownerId ?? resp.owner_id ?? '',
-        owner_type: resp.ownerType ?? resp.owner_type ?? '',
-        display_name: resp.displayName ?? resp.display_name ?? '',
-        email_masked: resp.emailMasked ?? resp.email_masked ?? '',
-        ...((resp.emailVerifiedAt ?? resp.email_verified_at)
-          ? { email_verified_at: resp.emailVerifiedAt ?? resp.email_verified_at }
-          : {}),
-        status: resp.status,
-      };
-    } catch (err) {
-      const te = err as TransportError;
-      if (te.code === 'HTTP_401' || te.code === 'HTTP_403' || te.code === 'UNAUTHENTICATED') {
-        return null;
-      }
-      throw err;
-    }
-  }
-
-  // ─────────────────────────────────────────────────────────────
-  // 工具
-  // ─────────────────────────────────────────────────────────────
-
-  private _toAgentCard(resp: AgentCardResponse): AgentCard {
-    return normalizeAgentCard(resp);
-  }
-}

package/src/transport/oasn/oasn-discovery.ts

@@ -1,108 +0,0 @@
-/**
- * OASN Discovery —— Agent 搜索 + Category 树
- *
- * 设计依据：docs/specs/2026-06-16-oasn-api-module-mapping.md §2.10 ~ §2.13
- *
- * 三种搜索方式，按非空字段路由到对应端点：
- *   - query   → POST /api/agent-cards/search/by-query    （自然语言）
- *   - category→ POST /api/agent-cards/search/by-category （分类浏览）
- *   - tags    → POST /api/agent-cards/search/by-tags     （标签筛选）
- *
- * 当前 OASN search 仅支持 agent_types=['service']（详见设计文档 §九 风险表）。
- */
-
-import { logger } from '../../util/logger.js';
-import type { CategoryTree, SearchQuery, SearchResult } from '../types.js';
-import type { OasnHttpClient } from './oasn-http.js';
-import {
-  OASN_ENDPOINTS,
-  type CategoryTreeResponse,
-  type SearchByCategoryRequest,
-  type SearchByQueryRequest,
-  type SearchByTagsRequest,
-  type SearchResponse,
-} from './oasn-types.js';
-import { normalizeCategoryTree, normalizeSearchResponse } from './oasn-normalize.js';
-
-export class OasnDiscovery {
-  constructor(private readonly _http: OasnHttpClient) {}
-
-  /**
-   * 路由到对应搜索端点。
-   *
-   * 优先级（互斥使用）：query > category > tags。
-   * 当多个字段都传入时，以 query 为准并 logger.warn 提示。
-   */
-  async search(query: SearchQuery): Promise<SearchResult> {
-    const hasQuery = !!query.query && query.query.trim().length > 0;
-    const hasCategory = !!query.category && query.category.length > 0;
-    const hasTags = !!query.tags && query.tags.length > 0;
-
-    if ([hasQuery, hasCategory, hasTags].filter(Boolean).length > 1) {
-      logger.warn('[transport/oasn/discovery] multiple search criteria provided, prioritising query > category > tags');
-    }
-
-    if (hasQuery) return this._searchByQuery(query);
-    if (hasCategory) return this._searchByCategory(query);
-    if (hasTags) return this._searchByTags(query);
-
-    // 都为空：默认走 query=""（服务端可能拒绝，但 transport 不主动推断）
-    throw new Error('OasnDiscovery.search: at least one of query/category/tags must be provided');
-  }
-
-  private async _searchByQuery(q: SearchQuery): Promise<SearchResult> {
-    const body: SearchByQueryRequest = {
-      query: q.query!.trim(),
-      agentTypes: q.agentTypes ?? ['service'],
-    };
-    if (q.sort) body.sort = q.sort;
-    if (q.pageSize !== undefined) body.pageSize = q.pageSize;
-    if (q.pageNum !== undefined) body.pageNum = q.pageNum;
-
-    const resp = await this._http.post<SearchResponse>(OASN_ENDPOINTS.SEARCH_BY_QUERY, body);
-    return this._toSearchResult(resp);
-  }
-
-  private async _searchByCategory(q: SearchQuery): Promise<SearchResult> {
-    const body: SearchByCategoryRequest = {
-      category: q.category!,
-      agentTypes: q.agentTypes ?? ['service'],
-    };
-    if (q.sort) body.sort = q.sort;
-    if (q.pageSize !== undefined) body.pageSize = q.pageSize;
-    if (q.pageNum !== undefined) body.pageNum = q.pageNum;
-
-    const resp = await this._http.post<SearchResponse>(OASN_ENDPOINTS.SEARCH_BY_CATEGORY, body);
-    return this._toSearchResult(resp);
-  }
-
-  private async _searchByTags(q: SearchQuery): Promise<SearchResult> {
-    const body: SearchByTagsRequest = {
-      tags: q.tags!,
-      agentTypes: q.agentTypes ?? ['service'],
-    };
-    if (q.sort) body.sort = q.sort;
-    if (q.pageSize !== undefined) body.pageSize = q.pageSize;
-    if (q.pageNum !== undefined) body.pageNum = q.pageNum;
-
-    const resp = await this._http.post<SearchResponse>(OASN_ENDPOINTS.SEARCH_BY_TAGS, body);
-    return this._toSearchResult(resp);
-  }
-
-  /** 获取 category 树（用于 Agent Book UI 的分类浏览面板） */
-  async getCategories(params?: { agentType?: string }): Promise<CategoryTree> {
-    const qs = params?.agentType ? `?agent_type=${encodeURIComponent(params.agentType)}` : '';
-    const resp = await this._http.get<CategoryTreeResponse>(
-      `${OASN_ENDPOINTS.CATEGORIES}${qs}`,
-    );
-    return normalizeCategoryTree(resp);
-  }
-
-  // ─────────────────────────────────────────────────────────────
-  // 工具
-  // ─────────────────────────────────────────────────────────────
-
-  private _toSearchResult(resp: SearchResponse): SearchResult {
-    return normalizeSearchResponse(resp);
-  }
-}