openclaw-openagent 1.0.11 → 1.0.12

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

@@ -17,7 +17,7 @@ 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 } from './types.js';
+import type { UIExtension, UIExtensionContext } from './types.js';
 import type { RemovedUIExtension, RemovedRevertResult } from './removed-extensions.js';
 
 // ── 注入策略：正则模式链（无需 .map，21 版本全仿真验证通过）──────────────────
@@ -53,7 +53,7 @@ function needsChange(
  * 4. 共享文件扩展按组处理：任何一个变更 → 恢复 backup → 重新 apply 全组
  * 5. 写入新 manifest
  */
-export async function loadUIExtensions(): Promise<void> {
+export async function loadUIExtensions(context: UIExtensionContext = {}): Promise<void> {
   const controlUiDir = resolveControlUiDir();
 
   if (!controlUiDir) {
@@ -134,7 +134,7 @@ export async function loadUIExtensions(): Promise<void> {
     }
 
     logger.debug(`[ui-ext] ${ext.id}: apply v${ext.version}`);
-    if (safeApply(ext, controlUiDir)) {
+    if (safeApply(ext, controlUiDir, context)) {
       newExtensions[ext.id] = { version: ext.version };
       applied++;
     }
@@ -200,7 +200,7 @@ export async function loadUIExtensions(): Promise<void> {
     // 重新 apply 全组中所有应保留的扩展
     for (const ext of group) {
       logger.debug(`[ui-ext] ${ext.id}: apply v${ext.version} (group rebuild)`);
-      if (safeApply(ext, controlUiDir)) {
+      if (safeApply(ext, controlUiDir, context)) {
         newExtensions[ext.id] = { version: ext.version };
         applied++;
       }
@@ -249,9 +249,9 @@ export async function unloadUIExtensions(): Promise<void> {
 
 // ── Helpers ──────────────────────────────────────────────────────────────
 
-function safeApply(ext: UIExtension, controlUiDir: string): boolean {
+function safeApply(ext: UIExtension, controlUiDir: string, context: UIExtensionContext): boolean {
   try {
-    return ext.apply(controlUiDir);
+    return ext.apply(controlUiDir, context);
   } catch (err) {
     logger.error(`[ui-ext] Failed to apply '${ext.id}': ${(err as Error).message}`);
     return false;

package/src/plugin-ui/ui-extension-loader/registry-regex.ts

@@ -13,17 +13,87 @@ import { logger } from '../../util/logger.js';
 import { findFileByPrefix } from './locator.js';
 import { backupFile, restoreFile } from './backup.js';
 import { makeMarker, hasMarker } from './types.js';
-import type { UIExtension } from './types.js';
+import type { UIExtension, UIExtensionContext } 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);
+const HOST_ADAPTER_URLS: Record<string, URL> = {
+  'oc-2026-04': new URL('../adapters/oc-2026-04.js', import.meta.url),
+  'oc-2026-05': new URL('../adapters/oc-2026-05.js', import.meta.url),
+  'oc-2026-06': new URL('../adapters/oc-2026-06.js', import.meta.url),
+  'oc-unknown': new URL('../adapters/oc-unknown.js', import.meta.url),
+};
+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__\*\//;
+const BUILD_ID_TOKEN = "buildId: '__OPENAGENT_BUILD_ID__'";
+const BUILD_ID_ASSIGNMENT_RE = /buildId:\s*(?:"[^"]*"|'[^']*')/;
+
+function normalizeHostVersion(hostVersion: string | undefined): string {
+  const value = String(hostVersion || '').trim();
+  if (!value || value === 'unknown') return '';
+  const match = value.match(/20\d{2}\.\d{1,2}\.\d{1,2}(?:-[A-Za-z0-9._-]+)?/);
+  return match ? match[0] : '';
+}
+
+function resolveHostAdapterId(hostVersion: string | undefined): string {
+  const version = normalizeHostVersion(hostVersion);
+  const parts = version.split('.');
+  const year = Number.parseInt(parts[0], 10);
+  const month = Number.parseInt(parts[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: string | undefined): string {
+  let adapterId = resolveHostAdapterId(hostVersion);
+  let adapterUrl = HOST_ADAPTER_URLS[adapterId];
+  if (!adapterUrl || !existsSync(adapterUrl)) {
+    adapterId = 'oc-unknown';
+    adapterUrl = HOST_ADAPTER_URLS[adapterId];
+  }
+  const adapterSource = readFileSync(adapterUrl, 'utf-8').trimEnd();
+  return [
+    HOST_ADAPTER_START,
+    `// HOST ADAPTER: ${adapterId}`,
+    adapterSource,
+    HOST_ADAPTER_END,
+  ].join('\n');
+}
+
+function injectHostAdapter(source: string, hostVersion: string | undefined): string {
+  const block = getHostAdapterBlock(hostVersion);
+  return HOST_ADAPTER_BLOCK_RE.test(source)
+    ? source.replace(HOST_ADAPTER_BLOCK_RE, block)
+    : source;
+}
 
-function getOverrideAssetHash(): string {
+function injectBuildId(source: string): string {
+  const normalized = source.replace(BUILD_ID_ASSIGNMENT_RE, BUILD_ID_TOKEN);
+  const buildId = createHash('sha256').update(normalized).digest('hex').slice(0, 12);
+  return normalized.replace(BUILD_ID_TOKEN, `buildId: ${JSON.stringify(buildId)}`);
+}
+
+function getOverrideAssetContent(context?: UIExtensionContext): string {
+  let source = readFileSync(OVERRIDE_ASSET_URL, 'utf-8');
+  const hostVersion = normalizeHostVersion(context?.hostVersion);
+  if (hostVersion) {
+    source = source.replace(
+      "hostVersion: '__OPENCLAW_HOST_VERSION__'",
+      `hostVersion: ${JSON.stringify(hostVersion)}`,
+    );
+  }
+  return injectBuildId(injectHostAdapter(source, hostVersion));
+}
+
+function getOverrideAssetHash(context?: UIExtensionContext): string {
   return createHash('sha256')
-    .update(readFileSync(OVERRIDE_ASSET_URL))
+    .update(getOverrideAssetContent(context))
     .digest('hex')
     .slice(0, 12);
 }
@@ -109,21 +179,21 @@ const overrideScript: UIExtension = {
   version: 1,
   alwaysApply: true,
 
-  apply(controlUiDir: string): boolean {
+  apply(controlUiDir: string, context?: UIExtensionContext): boolean {
     if (!existsSync(OVERRIDE_ASSET_URL)) {
       logger.warn('[ui-ext:regex] override-script: asset missing');
       return false;
     }
     const dest = join(controlUiDir, 'openagent-override.js');
+    const srcContent = getOverrideAssetContent(context);
     if (existsSync(dest)) {
-      const srcContent = readFileSync(OVERRIDE_ASSET_URL, 'utf-8');
       const destContent = readFileSync(dest, 'utf-8');
       if (srcContent === destContent) {
         logger.debug('[ui-ext:regex] override-script: content unchanged, skip');
         return true;
       }
     }
-    copyFileSync(OVERRIDE_ASSET_URL, dest);
+    writeFileSync(dest, srcContent, 'utf-8');
     logger.info('[ui-ext:regex] override-script: deployed openagent-override.js');
 
     // Deploy icon.png alongside
@@ -179,7 +249,7 @@ const htmlScriptTag: UIExtension = {
   version: 5,
   alwaysApply: true,
 
-  apply(controlUiDir: string): boolean {
+  apply(controlUiDir: string, context?: UIExtensionContext): boolean {
     const indexPath = join(controlUiDir, 'index.html');
     if (!existsSync(indexPath)) {
       logger.warn('[ui-ext:regex] html-script-tag: index.html not found');
@@ -188,8 +258,10 @@ const htmlScriptTag: UIExtension = {
     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 overrideHash = getOverrideAssetHash(context);
+    const hostVersion = normalizeHostVersion(context?.hostVersion);
+    const hostVersionAttr = hostVersion ? ` data-openagent-host-version="${hostVersion}"` : '';
+    const scriptTag = `${htmlMarker}<script src="./openagent-override.js?v=${overrideHash}"${hostVersionAttr}></script>`;
     const markedScriptPattern = /(?:\/\*openagent:html-script-tag\*\/|<!--openagent:html-script-tag-->)<script[^>]*openagent-override[^>]*><\/script>\n?\s*/g;
     const oldScriptPattern = /<script[^>]*openagent-override[^>]*><\/script>\n?\s*/g;
 

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

@@ -37,7 +37,7 @@ export interface UIExtension {
    * 接收 control-ui 目录路径，内部自行决定改什么文件、怎么改。
    * 返回 true 表示成功，false 表示失败（不写入 manifest，下次重试）。
    */
-  apply: (controlUiDir: string) => boolean;
+  apply: (controlUiDir: string, context?: UIExtensionContext) => boolean;
 
   /**
    * 卸载扩展。
@@ -47,6 +47,10 @@ export interface UIExtension {
   revert: (controlUiDir: string) => void;
 }
 
+export interface UIExtensionContext {
+  hostVersion?: string;
+}
+
 /**
  * OpenAgent 标记前缀，注入的代码旁加此注释以标识修改来源。
  * 格式：/*openagent:<extension-id>* /

package/src/state/store.ts

@@ -67,6 +67,22 @@ export interface PendingInvocationRecord {
   updated_at: number;
 }
 
+/**
+ * 远程 ServiceAgent 会话续传记录。
+ *
+ * 一个 OpenClaw 本地会话里，同一个远程 Agent 的第一次 invocation 会返回
+ * session_id；后续 mode='session' 的调用应带回这个 session_id，才能保留
+ * 远端上下文。account_id + openclaw_session_key + target_agent_id 共同隔离，
+ * 避免不同账号、不同本地聊天、不同远程 Agent 之间串 session。
+ */
+export interface RemoteAgentSessionRecord {
+  openclaw_session_key: string;
+  target_agent_id: string;
+  session_id: string;
+  created_at: number;
+  updated_at: number;
+}
+
 interface SqlJsDatabase {
   run(sql: string, params?: unknown[]): void;
   prepare(sql: string): SqlJsStatement;
@@ -291,6 +307,21 @@ export class StateStore {
       CREATE INDEX IF NOT EXISTS idx_pending_invocations_invocation
       ON pending_invocations (account_id, invocation_id)
     `);
+    this.db.run(`
+      CREATE TABLE IF NOT EXISTS remote_agent_sessions (
+        account_id             TEXT NOT NULL,
+        openclaw_session_key   TEXT NOT NULL,
+        target_agent_id        TEXT NOT NULL,
+        session_id             TEXT NOT NULL,
+        created_at             INTEGER NOT NULL DEFAULT 0,
+        updated_at             INTEGER NOT NULL DEFAULT 0,
+        PRIMARY KEY (account_id, openclaw_session_key, target_agent_id)
+      )
+    `);
+    this.db.run(`
+      CREATE INDEX IF NOT EXISTS idx_remote_agent_sessions_updated
+      ON remote_agent_sessions (account_id, updated_at)
+    `);
   }
 
   // ── Write to disk ──
@@ -533,6 +564,55 @@ export class StateStore {
     }
   }
 
+  // ═════════════════════════════════════════════════════════════════
+  // OASN remote_agent_sessions CRUD
+  //
+  // 保存远端 ServiceAgent 返回的 session_id，用于同一 OpenClaw 会话内后续
+  // mode='session' 调用续传。run 模式不读写这张表。
+  // ═════════════════════════════════════════════════════════════════
+
+  getRemoteAgentSession(openclawSessionKey: string, targetAgentId: string): string | null {
+    if (!this.db) return null;
+    const scopeKey = openclawSessionKey.trim();
+    const agentId = targetAgentId.trim();
+    if (!scopeKey || !agentId) return null;
+
+    const stmt = this.db.prepare(
+      `SELECT session_id
+       FROM remote_agent_sessions
+       WHERE account_id = ? AND openclaw_session_key = ? AND target_agent_id = ?`,
+    );
+    stmt.bind([this.accountId, scopeKey, agentId]);
+    const row = stmt.step() ? stmt.getAsObject() : null;
+    stmt.free();
+    const sessionId = row?.['session_id'];
+    return typeof sessionId === 'string' && sessionId.trim() ? sessionId : null;
+  }
+
+  upsertRemoteAgentSession(record: {
+    openclaw_session_key: string;
+    target_agent_id: string;
+    session_id: string;
+  }): void {
+    if (!this.db) return;
+    const scopeKey = record.openclaw_session_key.trim();
+    const agentId = record.target_agent_id.trim();
+    const sessionId = record.session_id.trim();
+    if (!scopeKey || !agentId || !sessionId) return;
+
+    const now = Date.now();
+    this.db.run(
+      `INSERT INTO remote_agent_sessions
+         (account_id, openclaw_session_key, target_agent_id, session_id, created_at, updated_at)
+       VALUES (?, ?, ?, ?, ?, ?)
+       ON CONFLICT(account_id, openclaw_session_key, target_agent_id) DO UPDATE SET
+         session_id = excluded.session_id,
+         updated_at = excluded.updated_at`,
+      [this.accountId, scopeKey, agentId, sessionId, now, now],
+    );
+    this.persist();
+  }
+
   // ═════════════════════════════════════════════════════════════════
   // §11.1 OASN pending_invocations CRUD（OasnInvocation.PendingInvocationStore 适配）
   //

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

@@ -407,15 +407,10 @@ export class OasnInvocation {
       };
     }
 
-    // 失败/超时/取消 —— 文本统一用 user_error.message 兜底
-    const userError = final.userError ?? final.user_error;
-    const inlineResult = final.inlineResult ?? final.inline_result;
-    const visible = final.visibleResult ?? final.visible_result;
-    const message = userError?.message
-      ?? inlineResult?.summary
-      ?? visible?.inlineResultSummary
-      ?? visible?.inline_result_summary
-      ?? `Invocation ended with status=${final.status}`;
+    const message = this._invocationFailureMessage(
+      final,
+      `Invocation ended with status=${final.status}`,
+    );
     return {
       requestId: invocationId,
       status: 'error',
@@ -450,15 +445,55 @@ export class OasnInvocation {
 
   /** 终态错误专用 TransportError，便于上层 catch */
   private _terminalError(final: GetInvocationResponse, handle: TaskHandle): TransportError {
-    const userError = final.userError ?? final.user_error;
-    const code = userError?.code ?? `INVOCATION_${final.status.toUpperCase()}`;
-    const msg = userError?.message ?? `Invocation ${final.status}`;
+    const code = this._invocationFailureCode(final) ?? `INVOCATION_${final.status.toUpperCase()}`;
+    const msg = this._invocationFailureMessage(final, `Invocation ${final.status}`);
     return makeTransportError(code, msg, {
       invocationId: handle.invocationId,
       sessionId: handle.sessionId,
     });
   }
 
+  private _invocationFailureCode(final: GetInvocationResponse): string | undefined {
+    return this._firstText(
+      final.userError?.code,
+      final.user_error?.code,
+      final.userErrorCode,
+      final.user_error_code,
+    );
+  }
+
+  private _invocationFailureMessage(final: GetInvocationResponse, fallback: string): string {
+    const userMessage = this._firstText(
+      final.userError?.message,
+      final.user_error?.message,
+      final.userErrorMessage,
+      final.user_error_message,
+    );
+    if (userMessage) return userMessage;
+
+    const inlineResult = final.inlineResult ?? final.inline_result;
+    const visible = final.visibleResult ?? final.visible_result;
+    const fallbackMessage = this._firstText(
+      inlineResult?.summary,
+      visible?.inlineResultSummary,
+      visible?.inline_result_summary,
+      final.progress?.safeStatusMessage,
+      final.progress?.safe_status_message,
+    );
+    const code = this._invocationFailureCode(final);
+    if (fallbackMessage && code && !fallbackMessage.includes(code)) return `${fallbackMessage} (${code})`;
+    return fallbackMessage ?? code ?? fallback;
+  }
+
+  private _firstText(...values: Array<unknown>): string | undefined {
+    for (const value of values) {
+      if (typeof value !== 'string') continue;
+      const trimmed = value.trim();
+      if (trimmed) return trimmed;
+    }
+    return undefined;
+  }
+
   private _toArtifactRef(art: ArtifactResponse): ArtifactRef {
     return {
       id: art.artifactId ?? art.artifact_id ?? '',

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

@@ -316,8 +316,12 @@ export interface GetInvocationResponse {
   nextPollAfterMs?: number | null;
   next_poll_after_ms?: number | null;
   warnings?: string[];
-  userError?: { code: string; message: string };
-  user_error?: { code: string; message: string };
+  userError?: { code?: string; message?: string | null };
+  user_error?: { code?: string; message?: string | null };
+  userErrorCode?: string;
+  user_error_code?: string;
+  userErrorMessage?: string | null;
+  user_error_message?: string | null;
   createdAt?: string;
   created_at?: string;
   updatedAt?: string;

package/src/types/openclaw-plugin-sdk-media-store.d.ts

@@ -0,0 +1,9 @@
+declare module 'openclaw/plugin-sdk/media-store' {
+  export function saveMediaBuffer(
+    buffer: Buffer,
+    mimeType: string,
+    namespace: string,
+    maxBytes: number,
+    filename?: string,
+  ): Promise<{ id: string }>;
+}