openclaw-openagent 1.0.8 → 1.0.11

package/dist/src/app/remote-agent-tool.js

@@ -77,6 +77,102 @@ function isTextArtifact(candidate) {
 function artifactContentToText(content) {
     return Buffer.from(content).toString('utf8').trim();
 }
+const OPENAGENT_MEDIA_DIR = '/tmp/openclaw/openagent-media';
+const EXT_BY_MIME = {
+    'application/json': '.json',
+    'text/markdown': '.md',
+    'text/plain': '.txt',
+    'application/pdf': '.pdf',
+    'image/png': '.png',
+    'image/jpeg': '.jpg',
+    'image/gif': '.gif',
+    'image/webp': '.webp',
+    'application/zip': '.zip',
+    'application/vnd.openxmlformats-officedocument.presentationml.presentation': '.pptx',
+    'application/vnd.openxmlformats-officedocument.wordprocessingml.document': '.docx',
+    'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': '.xlsx',
+};
+function sanitizeMediaFileName(name) {
+    const base = nodePath.basename(name || 'artifact');
+    return base
+        .replace(/[\0\r\n]/g, '')
+        .replace(/[/:\\]/g, '_')
+        .replace(/^\.+$/, 'artifact')
+        .slice(0, 180) || 'artifact';
+}
+function inferExtension(buffer, mimeType) {
+    const mime = mimeType.split(';')[0]?.trim().toLowerCase() || '';
+    const byMime = EXT_BY_MIME[mime];
+    if (byMime)
+        return byMime;
+    if (buffer.subarray(0, 2).toString('latin1') === 'PK') {
+        const zipNames = buffer.toString('latin1');
+        if (zipNames.includes('[Content_Types].xml') && zipNames.includes('ppt/'))
+            return '.pptx';
+        if (zipNames.includes('[Content_Types].xml') && zipNames.includes('word/'))
+            return '.docx';
+        if (zipNames.includes('[Content_Types].xml') && zipNames.includes('xl/'))
+            return '.xlsx';
+        return '.zip';
+    }
+    if (buffer.subarray(0, 4).toString('latin1') === '%PDF')
+        return '.pdf';
+    if (buffer.subarray(0, 8).equals(Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a])))
+        return '.png';
+    if (buffer.subarray(0, 3).equals(Buffer.from([0xff, 0xd8, 0xff])))
+        return '.jpg';
+    return '.bin';
+}
+function buildOasnMediaFileName(artifact, buffer, downloadedName, downloadedMime) {
+    const preferredName = downloadedName && downloadedName !== 'artifact'
+        ? downloadedName
+        : artifact.displayName && artifact.displayName !== 'artifact'
+            ? artifact.displayName
+            : artifact.id || 'artifact';
+    let safeName = sanitizeMediaFileName(preferredName);
+    if (!nodePath.extname(safeName)) {
+        safeName += inferExtension(buffer, downloadedMime || artifact.mimeType);
+    }
+    return safeName;
+}
+async function cacheOasnArtifactsForMedia(oasnTransport, artifacts) {
+    const localPaths = [];
+    for (const artifact of artifacts) {
+        const ref = artifact.contentUrl || artifact.id;
+        if (!ref)
+            continue;
+        try {
+            const downloaded = await oasnTransport.downloadArtifact(ref);
+            const buffer = Buffer.from(downloaded.content);
+            const fileName = buildOasnMediaFileName(artifact, buffer, downloaded.displayName, downloaded.mimeType);
+            const filePath = nodePath.join(OPENAGENT_MEDIA_DIR, fileName);
+            fs.mkdirSync(nodePath.dirname(filePath), { recursive: true });
+            fs.writeFileSync(filePath, buffer);
+            localPaths.push(filePath);
+            logger.info(`[remote-tool] Cached OASN artifact for media: id=${artifact.id} file=${filePath} size=${buffer.byteLength}`);
+        }
+        catch (err) {
+            logger.warn(`[remote-tool] Failed to cache OASN artifact ${artifact.id || ref}: ${err.message}`);
+        }
+    }
+    return localPaths;
+}
+function mediaDownloadLabel(url) {
+    let fileName = 'artifact';
+    try {
+        fileName = decodeURIComponent(new URL(url).pathname.split('/').pop() || fileName);
+    }
+    catch {
+        fileName = decodeURIComponent(url.split('?')[0]?.split('/').pop() || fileName);
+    }
+    return sanitizeMediaFileName(fileName).replace(/[[\]\r\n]/g, ' ') || 'artifact';
+}
+function formatMediaDownloadLines(urls) {
+    const lines = urls
+        .filter((url) => typeof url === 'string' && url.trim())
+        .map((url) => `- [${mediaDownloadLabel(url)}](${url})`);
+    return lines.length ? `下载链接:\n${lines.join('\n')}` : '';
+}
 function normalizeRemoteToolExecuteArgs(signalOrUpdate, onUpdateOrContext, legacySignal) {
     if (typeof signalOrUpdate === 'function') {
         return {
@@ -265,7 +361,7 @@ export function createCallRemoteAgentTool() {
                     });
                     const artifacts = result.artifacts ?? [];
                     let content = result.content;
-                    let mediaUrls = artifacts.map((a) => a.contentUrl).filter(Boolean);
+                    let mediaUrls = [];
                     if (!content.trim()) {
                         for (const textArtifact of artifacts) {
                             if (!textArtifact.contentUrl && !textArtifact.contentAvailable)
@@ -274,10 +370,6 @@ export function createCallRemoteAgentTool() {
                                 const downloaded = await oasnTransport.downloadArtifact(textArtifact.contentUrl || textArtifact.id);
                                 if (isTextArtifact(downloaded)) {
                                     content = artifactContentToText(downloaded.content);
-                                    mediaUrls = artifacts
-                                        .filter((a) => a.id !== textArtifact.id)
-                                        .map((a) => a.contentUrl)
-                                        .filter(Boolean);
                                     break;
                                 }
                             }
@@ -316,12 +408,15 @@ export function createCallRemoteAgentTool() {
                             ? `${content}\n\nFiles from remote agent (use openagent_download_file to save):\n${artifactLines.join('\n')}`
                             : `Files from remote agent:\n${artifactLines.join('\n')}`;
                     }
+                    if (artifacts.length > 0) {
+                        mediaUrls = await cacheOasnArtifactsForMedia(oasnTransport, artifacts);
+                    }
                     // Resolve OASN-relative URLs in content (remote agent may have embedded
                     // /webui/continuations/... or /api/artifacts/... in its output text).
                     if (content && accessBase) {
                         content = content.replace(/(?<![a-zA-Z0-9])(\/webui\/[^\s"')\]]+|\/api\/[^\s"')\]]+)/g, (match) => resolveOasnAccessUrl(accessBase, match));
                     }
-                    // OASN 的非文本 artifacts 暂继续复用 ArtifactRef.contentUrl 作为 mediaUrls。
+                    // OASN artifacts are cached locally before being handed to Gateway media rendering.
                     reply = {
                         status: 'complete',
                         content,
@@ -405,13 +500,16 @@ export function createCallRemoteAgentTool() {
                         return `${baseUrl}/plugins/openagent/media/${encodeURIComponent(fileName)}`;
                     });
                 }
-                // Path 1: MEDIA: lines in text for Gateway MEDIA: parser + LLM echo
+                // Path 1: explicit markdown links + MEDIA: lines for Gateway parser.
+                // The markdown block makes the link visible even when the host does not
+                // render MEDIA: attachments in assistant/tool-result bubbles.
+                const downloadLines = formatMediaDownloadLines(httpMediaUrls);
                 const mediaLines = httpMediaUrls
                     .map((url) => `MEDIA:${url}`)
                     .join('\n');
-                const textWithMedia = reply.content
-                    ? `${reply.content}\n${mediaLines}`
-                    : mediaLines;
+                const textWithMedia = [reply.content.trim(), downloadLines, mediaLines]
+                    .filter(Boolean)
+                    .join('\n\n');
                 return {
                     content: [{ type: 'text', text: textWithMedia }],
                     // Path 2: details.media for v2026.4.11+ native attachment rendering

package/dist/src/auth/config.js

@@ -9,6 +9,8 @@
  * See §0.1 of refactoring-plan.md.
  */
 const DEFAULT_API_BASE = 'https://api.openagent.club';
+const DEFAULT_OASN_PUBLIC_ROOT = 'https://oasn-test.haimawan.com';
+const OASN_ENV_ID_RE = /^[A-Za-z0-9_-]+$/;
 /**
  * OASN 默认 API base。
  *
@@ -19,6 +21,41 @@ export const DEFAULT_OASN_API_BASE = 'https://oasn.invalid/CONFIGURE_ME';
 export function isUnconfiguredOasnApiBase(value) {
     return !value || value === DEFAULT_OASN_API_BASE;
 }
+function normalizeOasnApiBase(value) {
+    const normalized = String(value || '')
+        .trim()
+        .replace(/\/+$/, '')
+        .replace(/\/api$/, '');
+    return normalized === DEFAULT_OASN_API_BASE ? '' : normalized;
+}
+function normalizeOasnEnvId(value) {
+    const envId = String(value || '').trim();
+    if (!envId)
+        return '';
+    return OASN_ENV_ID_RE.test(envId) ? envId : '';
+}
+function oasnPublicBaseFromEnvId(envId) {
+    const normalized = normalizeOasnEnvId(envId);
+    if (!normalized)
+        return '';
+    const root = normalizeOasnApiBase(process.env.OASN_PUBLIC_ROOT || process.env.OPENAGENT_OASN_PUBLIC_ROOT || DEFAULT_OASN_PUBLIC_ROOT);
+    return `${root}/e/${normalized}`;
+}
+function resolveOasnBase({ accountBase, channelBase, envBase, accountEnvId, channelEnvId, envEnvId, fallbackBase, }) {
+    const configuredBase = normalizeOasnApiBase(accountBase) || normalizeOasnApiBase(channelBase);
+    if (configuredBase)
+        return configuredBase;
+    const configuredEnvId = normalizeOasnEnvId(accountEnvId) || normalizeOasnEnvId(channelEnvId);
+    if (configuredEnvId)
+        return oasnPublicBaseFromEnvId(configuredEnvId);
+    const ambientBase = normalizeOasnApiBase(envBase);
+    if (ambientBase)
+        return ambientBase;
+    const ambientEnvId = normalizeOasnEnvId(envEnvId);
+    if (ambientEnvId)
+        return oasnPublicBaseFromEnvId(ambientEnvId);
+    return fallbackBase;
+}
 /**
  * Extract the OpenAgent-specific config block from the full OpenClaw config.
  * Handles multiple config key locations that have drifted across versions.
@@ -75,19 +112,37 @@ export function resolveOpenagentAccount(cfg, accountId) {
     const envApiBase = transport === 'oasn'
         ? (process.env.OASN_API_BASE || process.env.OPENAGENT_OASN_API_BASE || '')
         : '';
-    const apiBase = (targetAcc['api_base'] || targetAcc['apiBase']
-        || clCfg['api_base']
-        || clCfg['apiBase']
-        || envApiBase
-        || fallbackApiBase);
+    const apiBase = transport === 'oasn'
+        ? resolveOasnBase({
+            accountBase: targetAcc['api_base'] || targetAcc['apiBase'],
+            channelBase: clCfg['api_base'] || clCfg['apiBase'],
+            envBase: envApiBase,
+            accountEnvId: targetAcc['oasn_env_id'] || targetAcc['oasnEnvId'] || targetAcc['env_id'] || targetAcc['envId'],
+            channelEnvId: clCfg['oasn_env_id'] || clCfg['oasnEnvId'] || clCfg['env_id'] || clCfg['envId'],
+            envEnvId: process.env.OASN_ENV_ID || process.env.OPENAGENT_OASN_ENV_ID,
+            fallbackBase: fallbackApiBase,
+        })
+        : (targetAcc['api_base'] || targetAcc['apiBase']
+            || clCfg['api_base']
+            || clCfg['apiBase']
+            || fallbackApiBase);
     const envAccessApiBase = transport === 'oasn'
         ? (process.env.OASN_ACCESS_API_BASE || process.env.OPENAGENT_OASN_ACCESS_API_BASE || '')
         : '';
-    const accessApiBase = (targetAcc['access_api_base'] || targetAcc['accessApiBase']
-        || clCfg['access_api_base']
-        || clCfg['accessApiBase']
-        || envAccessApiBase
-        || apiBase);
+    const accessApiBase = transport === 'oasn'
+        ? resolveOasnBase({
+            accountBase: targetAcc['access_api_base'] || targetAcc['accessApiBase'],
+            channelBase: clCfg['access_api_base'] || clCfg['accessApiBase'],
+            envBase: envAccessApiBase,
+            accountEnvId: targetAcc['oasn_env_id'] || targetAcc['oasnEnvId'] || targetAcc['env_id'] || targetAcc['envId'],
+            channelEnvId: clCfg['oasn_env_id'] || clCfg['oasnEnvId'] || clCfg['env_id'] || clCfg['envId'],
+            envEnvId: process.env.OASN_ENV_ID || process.env.OPENAGENT_OASN_ENV_ID,
+            fallbackBase: apiBase,
+        })
+        : (targetAcc['access_api_base'] || targetAcc['accessApiBase']
+            || clCfg['access_api_base']
+            || clCfg['accessApiBase']
+            || apiBase);
     const claimUrl = (targetAcc['claim_url'] || targetAcc['claimUrl'] || clCfg['claim_url'] || clCfg['claimUrl'] || '');
     const rawStatus = (targetAcc['status'] || targetAcc['claim_status'] || targetAcc['claimStatus'] || clCfg['status'] || '');
     const normalizedStatus = normalizeClaimStatus(rawStatus, agentId, apiKey);

package/dist/src/channel.js

@@ -11,6 +11,7 @@ import { isUnconfiguredOasnApiBase, resolveOpenagentAccount, getOpenagentConfig
 import { registry } from './runtime/registry.js';
 import { AccountRuntime } from './runtime/account.js';
 import { logger } from './util/logger.js';
+import { resolveOasnRelativeUrl } from './util/url-resolver.js';
 const API_BASE = 'https://api.clawlink.club';
 const OASN_TRANSPORT = 'oasn';
 // ── Channel adapter meta ──
@@ -467,7 +468,7 @@ function compactConfig(input) {
     return Object.fromEntries(Object.entries(input).filter(([, value]) => value !== undefined && value !== ''));
 }
 async function claimOasnAgent(apiBase, apiKey, agentId, ownerEmail) {
-    const res = await fetch(new URL('/api/agents/claim', apiBase), {
+    const res = await fetch(resolveOasnRelativeUrl(apiBase, '/api/agents/claim'), {
         method: 'POST',
         headers: {
             'Content-Type': 'application/json',