openclaw-openagent 1.0.6 → 1.0.8

package/src/plugin-ui/modules/agent-book/panel/styles.js

@@ -111,10 +111,10 @@ function injectStyles() {
     .openagent-agent-panel {
       position: fixed;
       max-height: none;
-      background: #fff;
-      border: 1.2px solid rgba(47, 47, 51, 0.12);
+      background: var(--oa-panel-bg, #fff);
+      border: 1.2px solid var(--oa-border, rgba(47, 47, 51, 0.12));
       border-radius: 18px;
-      box-shadow: 0 -4px 24px rgba(0,0,0,0.08), 0 2px 8px rgba(0,0,0,0.04);
+      box-shadow: 0 -4px 24px var(--oa-shadow-color, rgba(0,0,0,0.08)), 0 2px 8px var(--oa-shadow-color, rgba(0,0,0,0.04));
       z-index: 99999;
       overflow: hidden;
       display: none;
@@ -158,7 +158,7 @@ function injectStyles() {
       flex-shrink: 0;
     }
     .openagent-panel-close {
-      background: rgba(249, 249, 249, 1);
+      background: var(--oa-card-bg, rgba(249, 249, 249, 1));
       border: none;
       color: rgba(47, 47, 51, 0.6);
       cursor: pointer;
@@ -618,41 +618,61 @@ function injectStyles() {
       padding: 32px; text-align: center; color: #aaa; font-size: 13px;
     }
 
-    /* ── 深色主题（统一） ── */
-    [data-theme-mode="dark"] .openagent-agent-panel {
+    /* ── 深色主题（v4: data-theme-mode / v5: data-theme） ── */
+    [data-theme-mode="dark"] .openagent-agent-panel,
+    [data-theme="dark"] .openagent-agent-panel {
       background: #1c1c1c; border-color: rgba(255,255,255,0.12);
       box-shadow: 0 -4px 24px rgba(0,0,0,0.3);
     }
-    [data-theme-mode="dark"] .openagent-panel-head { border-color: #2a2a2a; }
-    [data-theme-mode="dark"] .openagent-panel-title { color: rgba(224, 224, 224, 0.8); }
-    [data-theme-mode="dark"] .openagent-panel-close { background: #2a2a2a; color: #888; }
-    [data-theme-mode="dark"] .openagent-panel-close:hover { background: #333; color: #ccc; }
-    [data-theme-mode="dark"] .openagent-section-heading { color: rgba(224, 224, 224, 0.45); }
-    [data-theme-mode="dark"] .openagent-parent-heading { color: rgba(224, 224, 224, 0.3); }
-    [data-theme-mode="dark"] .openagent-panel-divider { border-color: rgba(255,255,255,0.1); }
-
-    [data-theme-mode="dark"] .agent-card__name { color: #e0e0e0; }
-    [data-theme-mode="dark"] .agent-card__bio { color: rgba(224, 224, 224, 0.7); }
-    [data-theme-mode="dark"] .agent-card__stat { color: #64748b; }
-
-    [data-theme-mode="dark"] .agent-card--mention { background: transparent; }
-    [data-theme-mode="dark"] .agent-card--mention:hover { background: #252525; }
-    [data-theme-mode="dark"] .agent-card--mention .agent-card__action {
+    [data-theme-mode="dark"] .openagent-panel-head,
+    [data-theme="dark"] .openagent-panel-head { border-color: #2a2a2a; }
+    [data-theme-mode="dark"] .openagent-panel-title,
+    [data-theme="dark"] .openagent-panel-title { color: rgba(224, 224, 224, 0.8); }
+    [data-theme-mode="dark"] .openagent-panel-close,
+    [data-theme="dark"] .openagent-panel-close { background: #2a2a2a; color: #888; }
+    [data-theme-mode="dark"] .openagent-panel-close:hover,
+    [data-theme="dark"] .openagent-panel-close:hover { background: #333; color: #ccc; }
+    [data-theme-mode="dark"] .openagent-section-heading,
+    [data-theme="dark"] .openagent-section-heading { color: rgba(224, 224, 224, 0.45); }
+    [data-theme-mode="dark"] .openagent-parent-heading,
+    [data-theme="dark"] .openagent-parent-heading { color: rgba(224, 224, 224, 0.3); }
+    [data-theme-mode="dark"] .openagent-panel-divider,
+    [data-theme="dark"] .openagent-panel-divider { border-color: rgba(255,255,255,0.1); }
+
+    [data-theme-mode="dark"] .agent-card__name,
+    [data-theme="dark"] .agent-card__name { color: #e0e0e0; }
+    [data-theme-mode="dark"] .agent-card__bio,
+    [data-theme="dark"] .agent-card__bio { color: rgba(224, 224, 224, 0.7); }
+    [data-theme-mode="dark"] .agent-card__stat,
+    [data-theme="dark"] .agent-card__stat { color: #64748b; }
+
+    [data-theme-mode="dark"] .agent-card--mention,
+    [data-theme="dark"] .agent-card--mention { background: transparent; }
+    [data-theme-mode="dark"] .agent-card--mention:hover,
+    [data-theme="dark"] .agent-card--mention:hover { background: #252525; }
+    [data-theme-mode="dark"] .agent-card--mention .agent-card__action,
+    [data-theme="dark"] .agent-card--mention .agent-card__action {
       background: #333; border-color: #555; color: #ddd;
     }
-    [data-theme-mode="dark"] .agent-card--mention .agent-card__action:hover { background: #444; }
-    [data-theme-mode="dark"] .agent-card--search:hover { background: #252525; }
-    [data-theme-mode="dark"] .agent-card--search.openagent-card-selected {
+    [data-theme-mode="dark"] .agent-card--mention .agent-card__action:hover,
+    [data-theme="dark"] .agent-card--mention .agent-card__action:hover { background: #444; }
+    [data-theme-mode="dark"] .agent-card--search:hover,
+    [data-theme="dark"] .agent-card--search:hover { background: #252525; }
+    [data-theme-mode="dark"] .agent-card--search.openagent-card-selected,
+    [data-theme="dark"] .agent-card--search.openagent-card-selected {
       background: rgba(99, 102, 241, 0.12);
       outline-color: rgba(99, 102, 241, 0.4);
     }
-    [data-theme-mode="dark"] .agent-card--search .agent-card__action {
+    [data-theme-mode="dark"] .agent-card--search .agent-card__action,
+    [data-theme="dark"] .agent-card--search .agent-card__action {
       background: #333; border-color: #555; color: #ddd;
     }
-    [data-theme-mode="dark"] .agent-card--search .agent-card__action:hover { background: #444; }
+    [data-theme-mode="dark"] .agent-card--search .agent-card__action:hover,
+    [data-theme="dark"] .agent-card--search .agent-card__action:hover { background: #444; }
 
 
-    [data-theme-mode="dark"] .agent-card--inline {
+    [data-theme-mode="dark"] .agent-card--inline,
+    [data-theme="dark"] .agent-card--inline {
       background: linear-gradient(135deg, #1e1b3a 0%, #1a1a2e 100%);
       border-color: #2d2b55;
     }
@@ -662,7 +682,8 @@ function injectStyles() {
     }
     [data-theme-mode="dark"] .agent-card--inline .agent-card__name { color: #e2e8f0; }
     [data-theme-mode="dark"] .agent-card--inline .agent-card__avatar { border-color: #2d2b55; }
-    [data-theme-mode="dark"] .agent-card__loading {
+    [data-theme-mode="dark"] .agent-card__loading,
+    [data-theme="dark"] .agent-card__loading {
       background: #1e1b3a; border-color: #2d2b55; color: #64748b;
     }
   `;

package/src/plugin-ui/modules/remote-agent/native-style-adapter.js

@@ -12,14 +12,20 @@
   var SHELL_SELECTORS = [
     '.chat-tool-card:not(:has(.cl-remote-agent-card))',
     '.chat-tool-msg-collapse:not(:has(.cl-remote-agent-card))',
-    '.chat-tools-collapse:not(:has(.cl-remote-agent-card))'
+    '.chat-tools-collapse:not(:has(.cl-remote-agent-card))',
+    // v5.x+ variants
+    '.tool-card:not(:has(.cl-remote-agent-card))',
+    '.chat-tool-card__wrapper:not(:has(.cl-remote-agent-card))'
   ];
 
   var SUMMARY_SELECTORS = [
     '.chat-tool-card__header',
     '.chat-tool-card__title',
     '.chat-tool-msg-summary:not(.cl-remote-agent-host-shell *)',
-    '.chat-tools-summary:not(.cl-remote-agent-host-shell *)'
+    '.chat-tools-summary:not(.cl-remote-agent-host-shell *)',
+    // v5.x+ variants
+    '.tool-card__header',
+    '.tool-card__title'
   ];
 
   var INDENT_SELECTORS = [

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

@@ -258,27 +258,25 @@ const toolcardRender: UIExtension = {
     if (hasManualCollapseWrapper) {
       const wrapperFn = findFunctionByAnchor(content, wrapperAnchor);
       if (!wrapperFn) {
-        logger.warn('[ui-ext:regex] toolcard-render: manual collapse wrapper function not found');
-        return false;
-      }
-      if (!wrapperFn.body.includes('chat-tool-msg-body') || !wrapperFn.body.includes('onToggleExpanded')) {
-        logger.warn('[ui-ext:regex] toolcard-render: manual collapse wrapper shape mismatch');
-        return false;
-      }
-      const wrapperReturnTagMatch = wrapperFn.body.match(/return\s+([a-zA-Z_$]\w*)\s*`/);
-      if (!wrapperReturnTagMatch) {
-        logger.warn('[ui-ext:regex] toolcard-render: manual collapse Lit html tag not found');
-        return false;
+        logger.warn('[ui-ext:regex] toolcard-render: manual collapse wrapper function not found, skipping wrapper patch');
+      } else if (!wrapperFn.body.includes('chat-tool-msg-body') || !wrapperFn.body.includes('onToggleExpanded')) {
+        logger.warn('[ui-ext:regex] toolcard-render: manual collapse wrapper shape mismatch, skipping wrapper patch');
+      } else {
+        const wrapperReturnTagMatch = wrapperFn.body.match(/return\s+([a-zA-Z_$]\w*)\s*`/);
+        if (!wrapperReturnTagMatch) {
+          logger.warn('[ui-ext:regex] toolcard-render: manual collapse Lit html tag not found, skipping wrapper patch');
+        } else {
+          const wrapperHtmlVar = wrapperReturnTagMatch[1];
+          const wrapperParams = wrapperFn.params.split(',').map((s: string) => s.trim());
+          const wrapperCardParam = wrapperParams[0] || 'e';
+          const wrapperOptionsParam = wrapperParams[1] || '';
+          const wrapperSidebarArg = wrapperOptionsParam ? `${wrapperOptionsParam}&&${wrapperOptionsParam}.onOpenSidebar` : 'undefined';
+          const wrapperHook = `${marker}if(window.__openagentRenderToolCard){let __cl=window.__openagentRenderToolCard(${wrapperCardParam},${wrapperSidebarArg});if(__cl)return ${wrapperHtmlVar}\`\${__cl}\`}`;
+          content = content.substring(0, wrapperFn.bodyStart) + wrapperHook + content.substring(wrapperFn.bodyStart);
+          patchedWrapper = true;
+          logger.info(`[ui-ext:regex] toolcard-render: patched manual wrapper ${wrapperFn.funcName}(${wrapperFn.params.substring(0, 20)}) html=${wrapperHtmlVar}`);
+        }
       }
-      const wrapperHtmlVar = wrapperReturnTagMatch[1];
-      const wrapperParams = wrapperFn.params.split(',').map((s: string) => s.trim());
-      const wrapperCardParam = wrapperParams[0] || 'e';
-      const wrapperOptionsParam = wrapperParams[1] || '';
-      const wrapperSidebarArg = wrapperOptionsParam ? `${wrapperOptionsParam}&&${wrapperOptionsParam}.onOpenSidebar` : 'undefined';
-      const wrapperHook = `${marker}if(window.__openagentRenderToolCard){let __cl=window.__openagentRenderToolCard(${wrapperCardParam},${wrapperSidebarArg});if(__cl)return ${wrapperHtmlVar}\`\${__cl}\`}`;
-      content = content.substring(0, wrapperFn.bodyStart) + wrapperHook + content.substring(wrapperFn.bodyStart);
-      patchedWrapper = true;
-      logger.info(`[ui-ext:regex] toolcard-render: patched manual wrapper ${wrapperFn.funcName}(${wrapperFn.params.substring(0, 20)}) html=${wrapperHtmlVar}`);
     }
 
     // 4.11+ also renders tool-result messages through the grouped message
@@ -291,13 +289,13 @@ const toolcardRender: UIExtension = {
       let toolMessageOk = true;
       const toolMessageFn = findFunctionByAnchor(content, toolMessageAnchor, 8000);
       if (!toolMessageFn) {
-        logger.warn('[ui-ext:regex] toolcard-render: tool message wrapper function not found');
+        logger.warn('[ui-ext:regex] toolcard-render: tool message wrapper function not found, skipping');
         toolMessageOk = false;
       }
 
       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');
+        logger.warn('[ui-ext:regex] toolcard-render: tool message wrapper shape mismatch, skipping');
         toolMessageOk = false;
       }
 
@@ -313,14 +311,33 @@ const toolcardRender: UIExtension = {
       }
 
       if (toolMessageOk) {
+        // 双模式匹配单卡 guard：
+        //   Shape A (2026.4.x): ,Z=X.length===1?X[0]:null,Y=Z&&!A&&!B?
+        //   Shape B (2026.5.x): ,N=u.length===1?u[0]:null,...ae=P?`Tool error`:ne&&!C&&!h?ne:...
         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;
+        let cardsVar = '';
+        let mediaVar = '';
+        if (singleCardMatch) {
+          // Shape A: old bundle
+          cardsVar = singleCardMatch[2];
+          mediaVar = singleCardMatch[4];
+        } else {
+          // Shape B: 2026.5.x bundle
+          const shapeB = toolMessageFn!.body.match(/,(?:let\s+)?([a-zA-Z_$]\w*)=([a-zA-Z_$]\w*)\.length===1\?\2\[0\]:null/);
+          if (!shapeB) {
+            logger.warn('[ui-ext:regex] toolcard-render: tool message single-card guard not found');
+            toolMessageOk = false;
+          } else {
+            cardsVar = shapeB[2];
+            // 从 ae=P?`Tool error`:ne&&!C&&!h 中提取排除变量 C, h
+            const aeMatch = toolMessageFn!.body.match(/,\w+=\w+\?`Tool error`:(\w+)&&!(\w+)&&!(\w+)\?/);
+            if (aeMatch) {
+              mediaVar = `(${aeMatch[2]}||${aeMatch[3]})`;
+            } else {
+              mediaVar = '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');
@@ -337,7 +354,7 @@ const toolcardRender: UIExtension = {
             }
             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>\`;`;
+                `${marker}let __openagentToolMsgCard=null;console.log('[openagent] toolMsg hook: cards='+${cardsVar}.length+' mediaVar='+${mediaVar});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;
@@ -346,9 +363,8 @@ const toolcardRender: UIExtension = {
           }
         }
       }
-    }
 
-    writeFileSync(bundlePath, content, 'utf-8');
+      writeFileSync(bundlePath, content, 'utf-8');
     logger.info(`[ui-ext:regex] toolcard-render: patched ${funcName}(${params.substring(0, 20)}) html=${litHtmlVar}${patchedWrapper ? ' + wrapper' : ''}${patchedToolMessageWrapper ? ' + tool-message' : ''}`);
     return true;
   },
@@ -650,11 +666,41 @@ const remoteAgentMessageShortCircuit: UIExtension = {
       return true;
     }
 
+    // Strategy D (v5.17+ fallback): search for any if-condition referencing
+    // hasToolCards alongside a role-like variable — v5.17+ may replace the
+    // ternary/compound patterns of A/B/C with a different expression shape.
+    const strategyDRe = new RegExp(
+      `if\\(!` + `([a-zA-Z_$][a-zA-Z0-9_$]*)\\s*&&\\s*` +
+      hasToolCardsVar + `\\s*&&\\s*([a-zA-Z_$][a-zA-Z0-9_$]*)\\s*\\)`
+    );
+    const strategyDMatch = content.match(strategyDRe);
+    if (strategyDMatch) {
+      const markdownVarD = strategyDMatch[1]!;
+      const isToolResultVarD = strategyDMatch[2]!;
+      const dMatchFull = strategyDMatch[0];
+      const dIdx = strategyDMatch.index!;
+      const patched = `if(` + marker +
+        `(!` + markdownVarD + `||window.__openagentOwnsToolCards&&window.__openagentOwnsToolCards(` +
+        toolCardsVar + `))&&` + hasToolCardsVar + `&&` + isToolResultVarD + `)`;
+      content = content.substring(0, dIdx) + patched + content.substring(dIdx + dMatchFull.length);
+      writeFileSync(bundlePath, content, 'utf-8');
+      logger.info(`[ui-ext:regex] remote-agent-msg: patched (strategy D, md=${markdownVarD})`);
+      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: all strategies (A/C/B) failed');
+      // All strategies (A/C/D/B) failed — dump context for diagnostics
+      const anchorHintIdx = content.indexOf(hasToolCardsVar);
+      const ctxStart = anchorHintIdx > 200 ? anchorHintIdx - 200 : 0;
+      const ctxEnd = Math.min(anchorHintIdx + 200, content.length);
+      logger.warn(
+        `[ui-ext:regex] remote-agent-msg: all strategies (A/C/D/B) failed for toolCards=${toolCardsVar}. ` +
+        `Context around hasToolCardsVar (at ${anchorHintIdx}): ` +
+        content.substring(ctxStart, ctxEnd)
+      );
       return false;
     }
 
@@ -709,17 +755,18 @@ const mentionHooks: UIExtension = {
     const hookA = `${markerA}if(window.__clMention?.onKeyDown(${eventParam}))return;`;
     content = content.substring(0, keydownInsertIdx) + hookA + content.substring(keydownInsertIdx);
 
-    // 注入点 B: handleInput — 支持三种形态
+    // 注入点 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 字面
+    // Shape C (2026.6.x):  be=t=>{let n=t.target;pL(e,n.value)} — 引入 pL helper
+    // Shape D (generic):   .onDraftChange(任意.target.value) 不加结尾限制
     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\)\}/;
+    const inputReD = /\.onDraftChange\(([a-zA-Z_$][a-zA-Z0-9_$]*)\.target\.value\)/;
 
     let inputMatch = content.match(inputReA);
-    let inputShape: 'A' | 'B' | 'C' = 'A';
+    let inputShape: 'A' | 'B' | 'C' | 'D' = 'A';
 
     if (!inputMatch) {
       inputMatch = content.match(inputReC);
@@ -729,14 +776,26 @@ const mentionHooks: UIExtension = {
       inputMatch = content.match(inputReB);
       inputShape = 'B';
     }
+    if (!inputMatch) {
+      inputMatch = content.match(inputReD);
+      inputShape = 'D';
+    }
 
     if (!inputMatch) {
-      logger.warn('[ui-ext:regex] mention-hooks: input anchor not found (Shape A/B/C all missed)');
+      // All shapes missed — dump context for diagnostics
+      const draftHintIdx = content.indexOf('.onDraftChange');
+      const ctxStart = draftHintIdx > 200 ? draftHintIdx - 200 : 0;
+      const ctxEnd = Math.min(draftHintIdx + 200, content.length);
+      logger.warn(
+        `[ui-ext:regex] mention-hooks: input anchor not found (Shape A/B/C/D all missed). ` +
+        `Context around onDraftChange (at ${draftHintIdx}): ` +
+        content.substring(ctxStart, ctxEnd)
+      );
       return false;
     }
     const targetVar = inputMatch[1];
     const inputAnchorIdx = content.indexOf(inputMatch[0]);
-    // Shape A: }} 之前；Shape C: 末尾 } 之前；Shape B: ) 之后
+    // Shape A: }} 之前；Shape C: 末尾 } 之前；Shape B/D: ) 之后
     const draftCallEnd = inputShape === 'A'
       ? inputAnchorIdx + inputMatch[0].length - 2
       : inputShape === 'C'

package/src/util/url-resolver.ts

@@ -15,3 +15,47 @@ export function resolveOasnAccessUrl(accessApiBase: string | undefined, url: str
     return url;
   }
 }
+
+/**
+ * Resolve a WebUI continuation URL for user-facing browser clicks.
+ *
+ * WebUI auth is Owner-cookie based, so the clickable URL must use the same
+ * public origin as the claim/login flow. API-key calls can use an internal
+ * Access base, but browser links cannot reuse cookies across IP/domain origins.
+ */
+export function resolveOasnWebuiUrl(
+  accessApiBase: string | undefined,
+  claimUrl: string | undefined,
+  url: string,
+): string {
+  if (!url) return url;
+
+  const claimOrigin = originOf(claimUrl);
+  if (!claimOrigin || !isWebuiUrl(url, accessApiBase || claimOrigin)) {
+    return resolveOasnAccessUrl(accessApiBase, url);
+  }
+
+  try {
+    const absolute = new URL(url, accessApiBase || claimOrigin);
+    return new URL(`${absolute.pathname}${absolute.search}${absolute.hash}`, claimOrigin).toString();
+  } catch {
+    return resolveOasnAccessUrl(accessApiBase, url);
+  }
+}
+
+function originOf(value: string | undefined): string | undefined {
+  if (!value) return undefined;
+  try {
+    return new URL(value).origin;
+  } catch {
+    return undefined;
+  }
+}
+
+function isWebuiUrl(url: string, base: string): boolean {
+  try {
+    return new URL(url, base).pathname.startsWith('/webui/');
+  } catch {
+    return false;
+  }
+}