openclaw-openagent 1.0.8 → 1.0.11

package/src/auth/config.ts

@@ -10,6 +10,8 @@
  */
 
 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。
  *
@@ -22,6 +24,55 @@ export function isUnconfiguredOasnApiBase(value: string | undefined): boolean {
   return !value || value === DEFAULT_OASN_API_BASE;
 }
 
+function normalizeOasnApiBase(value: unknown): string {
+  const normalized = String(value || '')
+    .trim()
+    .replace(/\/+$/, '')
+    .replace(/\/api$/, '');
+  return normalized === DEFAULT_OASN_API_BASE ? '' : normalized;
+}
+
+function normalizeOasnEnvId(value: unknown): string {
+  const envId = String(value || '').trim();
+  if (!envId) return '';
+  return OASN_ENV_ID_RE.test(envId) ? envId : '';
+}
+
+function oasnPublicBaseFromEnvId(envId: string): string {
+  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,
+}: {
+  accountBase?: unknown;
+  channelBase?: unknown;
+  envBase?: unknown;
+  accountEnvId?: unknown;
+  channelEnvId?: unknown;
+  envEnvId?: unknown;
+  fallbackBase: string;
+}): string {
+  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;
+}
+
 /**
  * Transport 类型 —— v3.9+ 双轨抽象。
  *
@@ -132,19 +183,37 @@ export function resolveOpenagentAccount(
   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) as string;
+  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) as string;
   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) as string;
+  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) as string;
   const claimUrl = (targetAcc['claim_url'] || targetAcc['claimUrl'] || clCfg['claim_url'] || clCfg['claimUrl'] || '') as string;
   const rawStatus = (targetAcc['status'] || targetAcc['claim_status'] || targetAcc['claimStatus'] || clCfg['status'] || '') as string;
   const normalizedStatus = normalizeClaimStatus(rawStatus, agentId, apiKey);

package/src/channel.ts

@@ -13,6 +13,7 @@ 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';
 import * as timMessages from './tim/messages.js';
 
 const API_BASE = 'https://api.clawlink.club';
@@ -544,7 +545,7 @@ async function claimOasnAgent(
   agentId: string,
   ownerEmail: string,
 ): Promise<Record<string, unknown>> {
-  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',