openclaw-openagent 1.0.1 → 1.0.3

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

@@ -288,52 +288,64 @@ const toolcardRender: UIExtension = {
     const toolMessageAnchor = 'toolmsg:${';
     let patchedToolMessageWrapper = false;
     if (content.includes(toolMessageAnchor)) {
+      let toolMessageOk = true;
       const toolMessageFn = findFunctionByAnchor(content, toolMessageAnchor, 8000);
       if (!toolMessageFn) {
         logger.warn('[ui-ext:regex] toolcard-render: tool message wrapper function not found');
-        return false;
+        toolMessageOk = false;
       }
 
-      if (!toolMessageFn.body.includes('chat-tool-msg-collapse--manual')
-          || !toolMessageFn.body.includes('chat-tool-msg-body')) {
+      if (toolMessageOk && (!toolMessageFn!.body.includes('chat-tool-msg-collapse--manual')
+          || !toolMessageFn!.body.includes('chat-tool-msg-body'))) {
         logger.warn('[ui-ext:regex] toolcard-render: tool message wrapper shape mismatch');
-        return false;
+        toolMessageOk = false;
       }
 
-      const toolMessageReturnTagMatch = toolMessageFn.body.match(/return\s+([a-zA-Z_$]\w*)\s*`/);
-      if (!toolMessageReturnTagMatch) {
-        logger.warn('[ui-ext:regex] toolcard-render: tool message Lit html tag not found');
-        return false;
+      let toolMessageHtmlVar = '';
+      if (toolMessageOk) {
+        const toolMessageReturnTagMatch = toolMessageFn!.body.match(/return\s+([a-zA-Z_$]\w*)\s*`/);
+        if (!toolMessageReturnTagMatch) {
+          logger.warn('[ui-ext:regex] toolcard-render: tool message Lit html tag not found');
+          toolMessageOk = false;
+        } else {
+          toolMessageHtmlVar = toolMessageReturnTagMatch[1];
+        }
       }
-      const toolMessageHtmlVar = toolMessageReturnTagMatch[1];
 
-      const singleCardMatch = toolMessageFn.body.match(/(?:let\s+|,)([a-zA-Z_$]\w*)=([a-zA-Z_$]\w*)\.length===1\?\2\[0\]:null,\w+=\1&&!([a-zA-Z_$]\w*)&&!([a-zA-Z_$]\w*)\?/);
-      if (!singleCardMatch) {
-        logger.warn('[ui-ext:regex] toolcard-render: tool message single-card guard not found');
-        return false;
-      }
-      const cardsVar = singleCardMatch[2];
-      const mediaVar = singleCardMatch[4];
-      const chatBubbleClassMatch = toolMessageFn.body.match(/[,;]([a-zA-Z_$]\w*)=\[`chat-bubble`,/);
-      if (!chatBubbleClassMatch) {
-        logger.warn('[ui-ext:regex] toolcard-render: tool message chat-bubble class var not found');
-        return false;
-      }
-      const chatBubbleClassVar = chatBubbleClassMatch[1];
-      const toolMessageParams = toolMessageFn.params.split(',').map((s: string) => s.trim());
-      const toolMessageSidebarArg = toolMessageParams[3] || 'undefined';
-      const toolMessageReturnIdx = toolMessageFn.body.indexOf(`return ${toolMessageHtmlVar}\``);
-      if (toolMessageReturnIdx < 0) {
-        logger.warn('[ui-ext:regex] toolcard-render: tool message return anchor not found');
-        return false;
+      if (toolMessageOk) {
+        const singleCardMatch = toolMessageFn!.body.match(/(?:let\s+|,)([a-zA-Z_$]\w*)=([a-zA-Z_$]\w*)\.length===1\?\2\[0\]:null,\w+=\1&&!([a-zA-Z_$]\w*)&&!([a-zA-Z_$]\w*)\?/);
+        if (!singleCardMatch) {
+          logger.warn('[ui-ext:regex] toolcard-render: tool message single-card guard not found');
+          toolMessageOk = false;
+        }
+        if (toolMessageOk) {
+          const cardsVar = singleCardMatch![2];
+          const mediaVar = singleCardMatch![4];
+          const chatBubbleClassMatch = toolMessageFn!.body.match(/[,;]([a-zA-Z_$]\w*)=\[`chat-bubble`,/);
+          if (!chatBubbleClassMatch) {
+            logger.warn('[ui-ext:regex] toolcard-render: tool message chat-bubble class var not found');
+            toolMessageOk = false;
+          }
+          if (toolMessageOk) {
+            const chatBubbleClassVar = chatBubbleClassMatch![1];
+            const toolMessageParams = toolMessageFn!.params.split(',').map((s: string) => s.trim());
+            const toolMessageSidebarArg = toolMessageParams[3] || 'undefined';
+            const toolMessageReturnIdx = toolMessageFn!.body.indexOf(`return ${toolMessageHtmlVar}\``);
+            if (toolMessageReturnIdx < 0) {
+              logger.warn('[ui-ext:regex] toolcard-render: tool message return anchor not found');
+              toolMessageOk = false;
+            }
+            if (toolMessageOk) {
+              const toolMessageHook =
+                `${marker}let __openagentToolMsgCard=null;if(!${mediaVar}&&window.__openagentRenderToolCard){for(let __openagentI=${cardsVar}.length-1;__openagentI>=0&&!__openagentToolMsgCard;__openagentI--){let __openagentCandidate=${cardsVar}[__openagentI];if(__openagentCandidate&&(__openagentCandidate.outputText||__openagentCandidate.text))__openagentToolMsgCard=window.__openagentRenderToolCard(__openagentCandidate,${toolMessageSidebarArg})}for(let __openagentI=0;__openagentI<${cardsVar}.length&&!__openagentToolMsgCard;__openagentI++){__openagentToolMsgCard=window.__openagentRenderToolCard(${cardsVar}[__openagentI],${toolMessageSidebarArg})}}if(__openagentToolMsgCard)return ${toolMessageHtmlVar}\`<div class="\${${chatBubbleClassVar}}">\${__openagentToolMsgCard}</div>\`;`;
+              const toolMessageInsertAt = toolMessageFn!.bodyStart + toolMessageReturnIdx;
+              content = content.substring(0, toolMessageInsertAt) + toolMessageHook + content.substring(toolMessageInsertAt);
+              patchedToolMessageWrapper = true;
+              logger.info(`[ui-ext:regex] toolcard-render: patched tool message wrapper ${toolMessageFn!.funcName}(${toolMessageFn!.params.substring(0, 20)}) html=${toolMessageHtmlVar}`);
+            }
+          }
+        }
       }
-
-      const toolMessageHook =
-        `${marker}let __openagentToolMsgCard=null;if(!${mediaVar}&&window.__openagentRenderToolCard){for(let __openagentI=${cardsVar}.length-1;__openagentI>=0&&!__openagentToolMsgCard;__openagentI--){let __openagentCandidate=${cardsVar}[__openagentI];if(__openagentCandidate&&(__openagentCandidate.outputText||__openagentCandidate.text))__openagentToolMsgCard=window.__openagentRenderToolCard(__openagentCandidate,${toolMessageSidebarArg})}for(let __openagentI=0;__openagentI<${cardsVar}.length&&!__openagentToolMsgCard;__openagentI++){__openagentToolMsgCard=window.__openagentRenderToolCard(${cardsVar}[__openagentI],${toolMessageSidebarArg})}}if(__openagentToolMsgCard)return ${toolMessageHtmlVar}\`<div class="\${${chatBubbleClassVar}}">\${__openagentToolMsgCard}</div>\`;`;
-      const toolMessageInsertAt = toolMessageFn.bodyStart + toolMessageReturnIdx;
-      content = content.substring(0, toolMessageInsertAt) + toolMessageHook + content.substring(toolMessageInsertAt);
-      patchedToolMessageWrapper = true;
-      logger.info(`[ui-ext:regex] toolcard-render: patched tool message wrapper ${toolMessageFn.funcName}(${toolMessageFn.params.substring(0, 20)}) html=${toolMessageHtmlVar}`);
     }
 
     writeFileSync(bundlePath, content, 'utf-8');
@@ -440,7 +452,7 @@ const toolcallidPropagate: UIExtension = {
 
     // 计算注入内容
     const marker = makeMarker(this.id);
-    const tcidCapture = `${marker}var __tcid=(typeof ${mVar}.toolCallId==='string'&&${mVar}.toolCallId)||(typeof ${mVar}.tool_call_id==='string'&&${mVar}.tool_call_id)||'';`;
+    const tcidCapture = `${marker}var __tcid=(typeof ${msgParam}.toolCallId==='string'&&${msgParam}.toolCallId)||(typeof ${msgParam}.tool_call_id==='string'&&${msgParam}.tool_call_id)||'';`;
 
     const inlinePatchCall = callLoopVar
       ? `,toolCallId:__tcid||${callLoopVar}.id||${callLoopVar}.toolCallId||${callLoopVar}.tool_call_id||''`
@@ -454,16 +466,16 @@ const toolcallidPropagate: UIExtension = {
     const arrInitPattern = `,${cardsVar}=[];`;
     let arrInitIdx = funcBody.indexOf(arrInitPattern);
     if (arrInitIdx < 0) {
-      // v4.11+: 可能是 ,i=[]（后接分号或逗号之前的位置不同）
+      // v4.11+: 可能是 ,i=[]（后接逗号，如 a=[],o=...），不能直接插 var
       const altPattern = `,${cardsVar}=[]`;
       arrInitIdx = funcBody.indexOf(altPattern);
       if (arrInitIdx < 0) {
         logger.warn('[ui-ext:regex] toolcallid-propagate: cards init not found');
         return false;
       }
-      // 找到 ] 后面的分隔符位置
-      arrInitIdx += altPattern.length;
-      // captureInsertOffset 在 ; 或 , 之后
+      // altPattern 后面是逗号（逗号表达式），var 声明无法插入此处
+      // 改为插入到函数体开头，利用 var 提升特性
+      arrInitIdx = 0;
     } else {
       arrInitIdx += arrInitPattern.length;
     }
@@ -583,7 +595,7 @@ const toolcallidPropagate: UIExtension = {
 };
 
 
-// ── Extension 6: remote-agent-message-short-circuit（正则定位，双策略A+B）─
+// ── Extension 6: remote-agent-message-short-circuit（三策略 A/B/C）───────
 
 const remoteAgentMessageShortCircuit: UIExtension = {
   id: 'remote-agent-message-short-circuit',
@@ -597,16 +609,16 @@ const remoteAgentMessageShortCircuit: UIExtension = {
     if (hasMarker(content, this.id)) { return true; }
     if (!backupFile(bundlePath)) return false;
 
-    // 找 showToolCalls 赋值
+    // 找 showToolCalls 赋值 → 提取 toolCardsVar / hasToolCardsVar
     const assignRe = /(\w+)=\w+\.showToolCalls[^;]*\(\w+(?:,\w+)?\)\s*:\s*\[\]\s*,\s*(\w+)\s*=\s*\1\.length\s*>\s*0/;
     const assignMatch = content.match(assignRe);
     if (!assignMatch) {
-      logger.warn('[ui-ext:regex] remote-agent-msg: showToolCalls pattern not found');
+      logger.warn('[ui-ext:regex] remote-agent-msg: showToolCalls assignment not found');
       return false;
     }
 
-    const toolCardsVar = assignMatch[1];
-    const hasToolCardsVar = assignMatch[2];
+    const toolCardsVar = assignMatch[1]!;
+    const hasToolCardsVar = assignMatch[2]!;
     const marker = makeMarker(this.id);
 
     // 策略A (v3.23~v4.10): if(!markdown&&hasToolCards&&isToolResult)
@@ -614,8 +626,8 @@ const remoteAgentMessageShortCircuit: UIExtension = {
     const ifMatchA = content.match(ifReA);
 
     if (ifMatchA) {
-      const markdownVar = ifMatchA[1];
-      const isToolResultVar = ifMatchA[2];
+      const markdownVar = ifMatchA[1]!;
+      const isToolResultVar = ifMatchA[2]!;
       const patched = `if(${marker}(!${markdownVar}||window.__openagentOwnsToolCards&&window.__openagentOwnsToolCards(${toolCardsVar}))&&${hasToolCardsVar}&&${isToolResultVar})`;
       content = content.substring(0, ifMatchA.index!) + patched + content.substring(ifMatchA.index! + ifMatchA[0].length);
       writeFileSync(bundlePath, content, 'utf-8');
@@ -623,15 +635,30 @@ const remoteAgentMessageShortCircuit: UIExtension = {
       return true;
     }
 
-    // 策略B (v4.11+): compound = hasToolCards && (showToolCalls ?? !0)
+    // 策略C (2026.4.x): if(!VAR.showToolCalls&&...toolresult...)continue
+    // 直接匹配 continue 跳过语句，注入 openagentOwnsToolCards 条件
+    const continueRe = /if\(!(\w+)\.showToolCalls&&(\w+)\.role\.toLowerCase\(\)===`toolresult`\)continue/;
+    const continueMatch = content.match(continueRe);
+
+    if (continueMatch) {
+      const scVar = continueMatch[1]!;
+      const roleVar = continueMatch[2]!;
+      const patched = `if(!${scVar}.showToolCalls&&!window.__openagentOwnsToolCards?.(${toolCardsVar})&&${roleVar}.role.toLowerCase()===\`toolresult\`)continue`;
+      content = content.substring(0, continueMatch.index!) + marker + patched + content.substring(continueMatch.index! + continueMatch[0].length);
+      writeFileSync(bundlePath, content, 'utf-8');
+      logger.info(`[ui-ext:regex] remote-agent-msg: patched (strategy C, sc=${scVar})`);
+      return true;
+    }
+
+    // 策略B (v4.11~v4.1x fallback): compound = hasToolCards && (showToolCalls ?? !0)
     const compoundRe = new RegExp(`(\\w+)=${hasToolCardsVar}&&\\(\\w+\\.showToolCalls\\?\\?!0\\)`);
     const compoundMatch = content.match(compoundRe);
     if (!compoundMatch) {
-      logger.warn('[ui-ext:regex] remote-agent-msg: both strategies failed');
+      logger.warn('[ui-ext:regex] remote-agent-msg: all strategies (A/C/B) failed');
       return false;
     }
 
-    const compoundVar = compoundMatch[1];
+    const compoundVar = compoundMatch[1]!;
     const ifReB = new RegExp(`if\\(!(\\w+)&&!${compoundVar}&&`);
     const ifMatchB = content.match(ifReB);
     if (!ifMatchB) {
@@ -639,7 +666,7 @@ const remoteAgentMessageShortCircuit: UIExtension = {
       return false;
     }
 
-    const markdownVarB = ifMatchB[1];
+    const markdownVarB = ifMatchB[1]!;
     const patchedCond = `if(${marker}(!${markdownVarB}||window.__openagentOwnsToolCards&&window.__openagentOwnsToolCards(${toolCardsVar}))&&!${compoundVar}&&`;
     content = content.substring(0, ifMatchB.index!) + patchedCond + content.substring(ifMatchB.index! + ifMatchB[0].length);
     writeFileSync(bundlePath, content, 'utf-8');
@@ -657,7 +684,7 @@ const remoteAgentMessageShortCircuit: UIExtension = {
 
 const mentionHooks: UIExtension = {
   id: 'mention-hooks',
-  version: 2,
+  version: 3,
   sharedFile: 'index-bundle',
 
   apply(controlUiDir: string): boolean {
@@ -668,46 +695,58 @@ const mentionHooks: UIExtension = {
     if (!backupFile(bundlePath)) return false;
 
     // 注入点 A: handleKeyDown
-    const keydownRe = /;return\}if\(([a-zA-Z_$][a-zA-Z0-9_$]*)\.key===`Enter`&&!\1\.shiftKey\)\{if\(\1\.isComposing/;
+    // 锚定 ;return}if(X.key===`Enter`&&!X.shiftKey){
+    // 不再依赖内层 isComposing：2026.6.10 已把 isComposing 检查拆到独立 handler
+    const keydownRe = /;return\}if\(([a-zA-Z_$][a-zA-Z0-9_$]*)\.key===`Enter`&&!\1\.shiftKey\)\{/;
     const keydownMatch = content.match(keydownRe);
     if (!keydownMatch) {
       logger.warn('[ui-ext:regex] mention-hooks: keydown anchor not found');
       return false;
     }
     const eventParam = keydownMatch[1];
-    const keydownInsertIdx = content.indexOf(keydownMatch[0]) + ';return}'.length;
+    const keydownInsertIdx = content.indexOf(keydownMatch[0]) + keydownMatch[0].indexOf('if(');
     const markerA = makeMarker(this.id);
     const hookA = `${markerA}if(window.__clMention?.onKeyDown(${eventParam}))return;`;
     content = content.substring(0, keydownInsertIdx) + hookA + content.substring(keydownInsertIdx);
 
-    // 注入点 B: handleInput — 支持两种形态
-    // Shape A (old): .onDraftChange(target.value)}}
-    // Shape B (4.11/latest): .onDraftChange(target.value)  (在 arrow function 内，无 }})
+    // 注入点 B: handleInput — 支持三种形态
+    // Shape A (old):       .onDraftChange(target.value)}}
+    // Shape B (4.11~4.x):  .onDraftChange(target.value)        (arrow function 内)
+    // Shape C (2026.6.x):  be=t=>{let n=t.target;pL(e,n.value)} — 引入 pL helper，
+    //                      arrow body 末尾不再出现 onDraftChange 字面
     const inputReA = /\.onDraftChange\(([a-zA-Z_$][a-zA-Z0-9_$]*)\.value\)\}\}/;
     const inputReB = /\.onDraftChange\(([a-zA-Z_$][a-zA-Z0-9_$]*)\.value\)/;
+    const inputReC = /let ([a-zA-Z_$][a-zA-Z0-9_$]*)=[a-zA-Z_$][a-zA-Z0-9_$]*\.target;[a-zA-Z_$][a-zA-Z0-9_$]*\([a-zA-Z_$][a-zA-Z0-9_$]*,\1\.value\)\}/;
+
     let inputMatch = content.match(inputReA);
-    let inputShape: 'A' | 'B' = 'A';
+    let inputShape: 'A' | 'B' | 'C' = 'A';
 
+    if (!inputMatch) {
+      inputMatch = content.match(inputReC);
+      inputShape = 'C';
+    }
     if (!inputMatch) {
       inputMatch = content.match(inputReB);
       inputShape = 'B';
     }
 
     if (!inputMatch) {
-      logger.warn('[ui-ext:regex] mention-hooks: input anchor not found (neither Shape A nor B)');
+      logger.warn('[ui-ext:regex] mention-hooks: input anchor not found (Shape A/B/C all missed)');
       return false;
     }
     const targetVar = inputMatch[1];
     const inputAnchorIdx = content.indexOf(inputMatch[0]);
-    // 计算 onDraftChange(x.value) 调用结束位置
+    // Shape A: }} 之前；Shape C: 末尾 } 之前；Shape B: ) 之后
     const draftCallEnd = inputShape === 'A'
-      ? inputAnchorIdx + inputMatch[0].length - 2  // 在 }} 之前
-      : inputAnchorIdx + inputMatch[0].length;     // 在 ) 之后
+      ? inputAnchorIdx + inputMatch[0].length - 2
+      : inputShape === 'C'
+        ? inputAnchorIdx + inputMatch[0].length - 1
+        : inputAnchorIdx + inputMatch[0].length;
     const hookB = `;window.__clMention?.onInput?.(${targetVar})`;
     content = content.substring(0, draftCallEnd) + hookB + content.substring(draftCallEnd);
 
     writeFileSync(bundlePath, content, 'utf-8');
-    logger.info(`[ui-ext:regex] mention-hooks: injected (event=${eventParam}, target=${targetVar})`);
+    logger.info(`[ui-ext:regex] mention-hooks: injected (shape=${inputShape}, event=${eventParam}, target=${targetVar})`);
     return true;
   },
 

package/src/runtime/account.ts

@@ -39,7 +39,6 @@ import { createTransport } from '../transport/factory.js';
 import type {
   AgentTransport,
   AgentStatusResult,
-  ClaimResult,
   OasnTransport,
   TransportCredentials,
 } from '../transport/types.js';
@@ -310,28 +309,6 @@ export class AccountRuntime {
     this._statusPollTimer = null;
   }
 
-  async claimOwnerEmail(ownerEmail: string): Promise<ClaimResult> {
-    if (this._transportType !== 'oasn') {
-      throw new Error('Agent claim is only available in OASN mode');
-    }
-    await this.ensureConnected();
-    const transport = this.transport;
-    if (!transport || transport.transportType !== 'oasn') {
-      throw new Error('OASN transport not ready');
-    }
-    const oasnTransport = transport as OasnTransport;
-    const result = await oasnTransport.claimAgent({
-      agent_id: this._config?.agentId,
-      owner_email: ownerEmail,
-    });
-    this._claimStatus = 'claim_pending';
-    this._claimExpiresAt = result.expires_at;
-    this._saveOasnAccountConfig({ status: 'claim_pending' });
-    this._scheduleOasnStatusPolling(oasnTransport);
-    logger.info(`[runtime] OASN claim started: agent_id=${result.agent_id} owner=${result.owner_email_masked} expires_at=${result.expires_at}`);
-    return result;
-  }
-
   assertOasnInvocationAllowed(): void {
     if (this._transportType === 'oasn' && this._claimStatus !== 'claimed') {
       throw new Error(`OASN ClientAgent is not claimed yet (status=${this._claimStatus}). Complete claim before calling remote agents.`);

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

@@ -155,11 +155,11 @@ export class OasnFiles {
     );
 
     return {
-      fileRef: resp.file_ref,
-      displayName: resp.display_name,
-      mimeType: resp.mime_type,
-      sizeBytes: resp.size_bytes,
-      expiresAt: this._parseExpiresAt(resp.expires_at),
+      fileRef: resp.fileRef ?? resp.file_ref ?? '',
+      displayName: resp.displayName ?? resp.display_name ?? 'unknown',
+      mimeType: resp.mimeType ?? resp.mime_type ?? 'application/octet-stream',
+      sizeBytes: resp.sizeBytes ?? resp.size_bytes ?? 0,
+      expiresAt: this._parseExpiresAt(resp.expiresAt ?? resp.expires_at ?? ''),
     };
   }
 

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

@@ -38,6 +38,7 @@ import {
   type TaskRequest,
   type TaskResult,
   type TransportError,
+  type WebuiContinuationRef,
 } from '../types.js';
 import type { OasnHttpClient } from './oasn-http.js';
 import {
@@ -48,6 +49,7 @@ import {
   type CreateInvocationResponse,
   type GetInvocationResponse,
   type InvocationStatus,
+  type VisibleResultResponse,
 } from './oasn-types.js';
 
 /** Invocation 持久化钩子（接 StateStore.pending_invocations，§11.1） */
@@ -378,31 +380,71 @@ export class OasnInvocation {
   /**
    * 把终态 Invocation 响应转换为 TaskResult。
    *
-   *   - succeeded → status:'complete' + content=summary + artifacts
+   *   - succeeded → status:'complete' + content=summary + artifacts + webuiContinuation
    *   - 其它终态 → status:'error' + content=user_error.message
+   *
+   * content 的归一路径：
+   *   inlineResult.summary > visible_result.inline_result_summary > ''
+   *
+   * webui_continuation 仅在 succeeded 时抽取（失败场景后端不保证存在）。
    */
   private _toTaskResult(invocationId: string, final: GetInvocationResponse): TaskResult {
+    const webuiContinuation = this._toWebuiContinuation(final);
+
     if (final.status === 'succeeded') {
       const inlineResult = final.inlineResult ?? final.inline_result;
+      const visible = final.visibleResult ?? final.visible_result;
+      const summary = inlineResult?.summary
+        ?? visible?.inlineResultSummary
+        ?? visible?.inline_result_summary
+        ?? '';
       return {
         requestId: invocationId,
         status: 'complete',
-        content: inlineResult?.summary ?? '',
+        content: summary,
         artifacts: (final.artifacts ?? []).map(this._toArtifactRef),
+        webuiContinuation,
       };
     }
 
     // 失败/超时/取消 —— 文本统一用 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}`;
     return {
       requestId: invocationId,
       status: 'error',
       content: message,
       artifacts: (final.artifacts ?? []).map(this._toArtifactRef),
+      webuiContinuation,
+    };
+  }
+
+  /**
+   * 从终态响应里抽取 WebUI continuation（camelCase / snake_case 双归一）。
+   * 缺必要字段（id / launch_url）时返回 undefined，调用方按 falsy 处理即可。
+   */
+  private _toWebuiContinuation(final: GetInvocationResponse): WebuiContinuationRef | undefined {
+    const visible: VisibleResultResponse | undefined =
+      final.visibleResult ?? final.visible_result;
+    const raw = visible?.webuiContinuation ?? visible?.webui_continuation;
+    if (!raw) return undefined;
+
+    const id = raw.continuationId ?? raw.continuation_id;
+    const launchUrl = raw.launchUrl ?? raw.launch_url;
+    if (!id || !launchUrl) return undefined;
+
+    return {
+      id,
+      launchUrl,
+      displayName: raw.displayName ?? raw.display_name ?? 'Open WebUI',
+      visibleState: raw.visibleState ?? raw.visible_state ?? 'available',
+      sessionId: raw.sessionId ?? raw.session_id,
     };
   }
 

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

@@ -3,8 +3,6 @@ import type {
   AgentStatusResult,
   CategoryNode,
   CategoryTree,
-  ClaimResult,
-  RegisterResult,
   SearchResult,
 } from '../types.js';
 import type {
@@ -12,8 +10,6 @@ import type {
   AgentStatusResponse,
   CategoryNodeResponse,
   CategoryTreeResponse,
-  ClaimAgentResponse,
-  RegisterAgentResponse,
   SearchResponse,
 } from './oasn-types.js';
 
@@ -96,28 +92,6 @@ export function normalizeAgentCard(resp: AgentCardResponse | unknown): AgentCard
   };
 }
 
-export function normalizeRegisterResult(resp: RegisterAgentResponse | unknown): RegisterResult {
-  const record = asRecord(resp);
-  return {
-    agent_id: pickString(record, 'agentId', 'agent_id'),
-    agent_type: (pickString(record, 'agentType', 'agent_type') || 'client') as 'client',
-    api_key: pickString(record, 'apiKey', 'api_key'),
-    claim_url: pickString(record, 'claimUrl', 'claim_url'),
-    status: (pickString(record, 'status') || 'unclaimed') as 'unclaimed',
-    agent_card: normalizeAgentCard(pickRecord(record, 'agentCard', 'agent_card')),
-  };
-}
-
-export function normalizeClaimResult(resp: ClaimAgentResponse | unknown): ClaimResult {
-  const record = asRecord(resp);
-  return {
-    agent_id: pickString(record, 'agentId', 'agent_id'),
-    status: (pickString(record, 'status') || 'claim_email_sent') as 'claim_email_sent',
-    owner_email_masked: pickString(record, 'ownerEmailMasked', 'owner_email_masked'),
-    expires_at: pickString(record, 'expiresAt', 'expires_at'),
-  };
-}
-
 export function normalizeAgentStatus(resp: AgentStatusResponse | unknown): AgentStatusResult {
   const record = asRecord(resp);
   return {

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

@@ -1,101 +1,28 @@
 /**
- * OASN Agent 注册与认领
+ * OASN Agent 状态查询
  *
  * 设计依据：
- *   - docs/specs/2026-06-16-oasn-api-module-mapping.md §2.1 / §2.2
+ *   - docs/specs/2026-06-16-oasn-api-module-mapping.md §2.3
  *
- * 调用时机：
- *   - registerAgent：插件首次安装、本地无 agent_id/api_key 时
- *   - claimAgent：用户主动触发认领（带 owner_email）
- *
- * 关键约束：
- *   - register 返回的 api_key **是明文且仅此一次**。调用方必须立即持久化（最好走 keychain，§11.6）
- *   - 当前后端 RegisterAgentCommand 只定义 platform；install_id/device_hint 需先扩展后端契约
+ * 注意：register 和 claim 已迁移到 CLI（openclaw-plugin-openagent-cli），
+ * 本模块仅保留 getStatus（GET /api/agents/{agent_id}）。
  */
 
 import { logger } from '../../util/logger.js';
-import type { AgentStatusResult, ClaimParams, ClaimResult, RegisterResult } from '../types.js';
+import type { AgentStatusResult } from '../types.js';
 import type { OasnHttpClient } from './oasn-http.js';
 import {
   OASN_ENDPOINTS,
-  type ClaimAgentRequest,
-  type ClaimAgentResponse,
   type AgentStatusResponse,
-  type RegisterAgentRequest,
-  type RegisterAgentResponse,
 } from './oasn-types.js';
-import {
-  normalizeAgentStatus,
-  normalizeClaimResult,
-  normalizeRegisterResult,
-} from './oasn-normalize.js';
+import { normalizeAgentStatus } from './oasn-normalize.js';
 
 /**
- * OASN Agent 注册模块。
- *
- * 注意 register 和 claim 是 OASN-only 能力，TIM transport 不暴露这两个方法。
- * AccountRuntime 在 transport-type === 'oasn' 时才能调用。
+ * OASN Agent 状态查询模块。
  */
-export class OasnRegister {
+export class OasnAgentStatus {
   constructor(private readonly _http: OasnHttpClient) {}
 
-  /**
-   * 注册新 Agent（首次安装流程）。
-   *
-   * @param platform OpenClaw 上固定为 "openclaw"
-   * @returns 含一次性明文 api_key 的注册响应。调用方必须立即持久化。
-   */
-  async register(
-    platform: string,
-    _params?: { installId?: string; deviceHint?: string },
-  ): Promise<RegisterResult> {
-    const body: RegisterAgentRequest = { platform };
-
-    logger.info(`[transport/oasn/register] register platform=${platform}`);
-
-    // skipRetry=true：register 是不幂等的写入，重试可能创建多个 agent
-    const resp = await this._http.post<RegisterAgentResponse>(
-      OASN_ENDPOINTS.REGISTER,
-      body,
-      { skipRetry: true },
-    );
-
-    const result = normalizeRegisterResult(resp);
-    logger.info(`[transport/oasn/register] registered agent_id=${result.agent_id} status=${result.status}`);
-    return result;
-  }
-
-  /**
-   * 触发认领邮件发送。
-   * 认证方式由 OasnHttpClient 注入的 Bearer 决定：
-   *   - 带 api_key：传入 { agent_id, owner_email }
-   *   - 不带 api_key（首次进入）：传入 { claim_token, owner_email }
-   */
-  async claim(params: ClaimParams): Promise<ClaimResult> {
-    if (!params.agent_id && !params.claim_token) {
-      throw new Error('OasnRegister.claim: must provide either agent_id or claim_token');
-    }
-    if (!params.owner_email) {
-      throw new Error('OasnRegister.claim: owner_email required');
-    }
-
-    const body: ClaimAgentRequest = {
-      ownerEmail: params.owner_email,
-    };
-    if (params.agent_id) body.agentId = params.agent_id;
-    if (params.claim_token) body.claimToken = params.claim_token;
-
-    logger.info(`[transport/oasn/register] claim email=${params.owner_email.replace(/(.).+(@.+)/, '$1***$2')}`);
-
-    const resp = await this._http.post<ClaimAgentResponse>(
-      OASN_ENDPOINTS.CLAIM,
-      body,
-      { skipRetry: true },
-    );
-
-    return normalizeClaimResult(resp);
-  }
-
   async getStatus(agentId: string): Promise<AgentStatusResult> {
     const resp = await this._http.get<AgentStatusResponse>(
       OASN_ENDPOINTS.AGENT_STATUS(agentId),