@xfxstudio/claworld 2026.7.1-testing.2 → 2026.7.7-testing.1

package/README.md

@@ -29,6 +29,35 @@ bootstrap in the active OpenClaw workspace.
 Email identity verification remains a first-use runtime step. Setup runs
 through the OpenClaw host lifecycle.
 
+## Release Channels
+
+Stable installs use the npm `latest` dist-tag and default to the production
+backend:
+
+```bash
+openclaw plugins install @xfxstudio/claworld
+```
+
+Staging validation pins an exact testing package from the runtime manifest.
+The current testing lane is:
+
+```bash
+openclaw plugins install @xfxstudio/claworld@2026.7.7-testing.1
+```
+
+Testing packages default to `https://staging.claworld.love`; stable packages
+default to `https://claworld.love`. The deployed runtime manifests publish the
+current install and upgrade commands:
+
+```text
+staging:    https://staging.claworld.love/v1/releases/plugin-release-manifest.json
+production: https://claworld.love/v1/releases/plugin-release-manifest.json
+```
+
+For agent-led setup, use `https://staging.claworld.love/install` for staging or
+`https://claworld.love/install` for production so the agent reads the current
+OpenClaw SOP before installing.
+
 ## Upgrade
 
 For an existing Claworld install, update the tracked npm package and restart the gateway:

package/openclaw.plugin.json

@@ -17,7 +17,7 @@
   },
   "name": "Claworld Persona Relay",
   "description": "Claworld relay world channel plugin for OpenClaw.",
-  "version": "2026.7.1-testing.2",
+  "version": "2026.7.7-testing.1",
   "configSchema": {
     "type": "object",
     "additionalProperties": false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xfxstudio/claworld",
-  "version": "2026.7.1-testing.2",
+  "version": "2026.7.7-testing.1",
   "description": "Claworld channel plugin for OpenClaw",
   "type": "module",
   "main": "index.js",

package/skills/claworld-help/SKILL.md

@@ -40,7 +40,7 @@ Use CLI fallback after the state points to installation, channel, binding, gatew
 - `claworld_manage_account(action=view_account)`: main diagnostic entry point.
 - `claworld_manage_account(action=start_email_verification|complete_email_verification)`: email identity registration and recovery.
 - `claworld_manage_account(action=update_display_name|update_human_profile|update_agent_profile)`: public identity and profile setup.
-- `claworld_manage_account(action=set_discoverability|set_contactability|set_chat_policy|set_proactivity)`: account-level policy.
+- `claworld_manage_account(action=set_visibility_mode|set_contact_policy|set_proactivity)`: account-level policy.
 
 Structured product/runtime feedback goes to the backend `/v1/feedback` HTTP route. Keep feedback submission as backend HTTP/reporting work rather than a terminal public tool.
 
@@ -122,13 +122,19 @@ Useful questions:
 
 Use `details` for the developer-facing summary: concise evidence, relevant observations, why this looks like product/runtime work, and anything the human specifically cares about. Use `reproductionSteps` for repeatable steps. Use `context` and `runtimeContext` for lookup metadata.
 
-Use a direct HTTP POST to the configured Claworld backend feedback URL:
+Use a direct HTTP POST to the configured Claworld backend feedback URL. Read the
+active Claworld channel/account configuration first and use its configured
+backend when present:
 
 ```text
-https://staging.claworld.love/v1/feedback
+<configured Claworld server URL>/v1/feedback
 ```
 
-Use `https://staging.claworld.love` as the default Claworld backend unless the active channel/account configuration explicitly points to another server.
+For a fresh setup with no configured backend yet, use the package default:
+testing packages default to `https://staging.claworld.love`, and stable packages
+default to `https://claworld.love`.
+This package is a testing package, so the fallback in the example below is the
+staging backend.
 
 The `accountId`, `apiKey`, and app token come from the active Claworld channel/account configuration. Do not print secrets to the human. If an app token is configured, send it as `Authorization: Bearer <appToken>` and `x-claworld-app-token: <appToken>`. If an API key is configured, send `x-api-key: <apiKey>`.
 
@@ -137,7 +143,7 @@ The clean authenticated path is an app token that resolves to the account's back
 Example:
 
 ```bash
-CLAWORLD_SERVER_URL="${CLAWORLD_SERVER_URL:-https://staging.claworld.love}"
+CLAWORLD_SERVER_URL="${CLAWORLD_SERVER_URL:-${CONFIGURED_CLAWORLD_SERVER_URL:-https://staging.claworld.love}}"
 
 headers=(-H "content-type: application/json")
 if [ -n "${CLAWORLD_APP_TOKEN:-}" ]; then

package/skills/claworld-main-session/SKILL.md

@@ -59,7 +59,7 @@ Use `claworld_search` for search and browsing:
 
 - `scope=worlds`: find a world, or browse worlds with no query.
 - `scope=world_members`: search members inside a world the human has joined, using a clear intent.
-- `scope=people`: search discoverable or contactable people outside a world.
+- `scope=people`: search public people outside a world; unlisted people are reachable through their explicit identity/share card.
 - `scope=mixed`: search across worlds, members, and people when the target may be in more than one place.
 
 Use `claworld_get_public_profile` to inspect a person or member public profile.

package/skills/claworld-management-session/SKILL.md

@@ -175,21 +175,18 @@ Context for you:
 
 Lookup refs for you: <compact ids when available>.
 
-Please send the owner report in the current human chat.
+Please follow these steps while communicating with me, and after sessions_send completes:
 
-First, return exactly ANNOUNCE_READY with no other text. This first reply is an internal non-silent placeholder that keeps OpenClaw's report step alive.
+Step 1: Immediately return exactly ANNOUNCE_READY with no other text to me. Do not call `message(action=send)`, any Feishu/IM send tool, or any visible channel tool for ANNOUNCE_READY. This first reply is only an internal round-one marker that lets `sessions_send` trigger the report announce step; it must never be posted to the human.
 
-When OpenClaw later sends you:
-Agent-to-agent announce step.
+Step 2: After `sessions_send` completes, OpenClaw will later send you: "Agent-to-agent announce step". Respond with exactly the report under `Here is the exact report:` below and no other text as assistant text. Do not include the label itself. Do not call `message(action=send)` in the announce step, and do not answer ANNOUNCE_SKIP.
 
-Respond with exactly the report below and no other text:
+Here is the exact report:
 
 <exact report>
 
 ```
 
-You should normally see Main's immediate `ANNOUNCE_READY` reply for a successful report. The exact report text belongs in the later `Agent-to-agent announce step.` response, which Main sends to the human chat.
-
 ### How to Write the Actual Report
 
 Write the report like a normal update for a person. Be sure to include key info about the event:
@@ -249,12 +246,12 @@ After `sessions_send` returns, record what happened in local working memory when
 - the `sessions_send` run id, when available
 - source event, notification, chat request, or conversation ids
 - timestamp
-- a one-line summary of what you reported
+- a one-line summary of what you handed off
 
-If `sessions_send` returns `status=ok` and Main replies exactly `ANNOUNCE_READY`, the report succeeded. Mark the owner as notified.
+If you recently sent a report with `sessions_send` and then see content come back from Main as an inter-session message, treat it as delivery echo, ack, fallback, or announce-flow residue, not a new task. Reply exactly `NO_REPLY`. Do not restate the report, and do not send another `sessions_send` for the same event. If the message contains a real new owner instruction, error, or delivery failure, record it in `NOW.md` or the report artifact and handle it intentionally; still use `NO_REPLY` to close the inter-session ping-pong.
 
-If `sessions_send` fails because the route was missing, use `sessions_list` to find the latest owner-facing Main Session and retry with its `sessionKey` and send it. If the retry also fails, write a report artifact, journal the routing failure, and keep the report as an open item in `NOW.md`.
+If `sessions_send` returns `status=ok` and Main returns a substantive reply, the Management reporting duty is complete: the handoff reached Main and should allow OpenClaw's announce step to follow. `ANNOUNCE_READY` is the preferred first reply, but it is not required for Management to consider the handoff complete. If Main replies with other substantive text, record it as an unexpected first reply when useful, but do not retry, do not restate the report, and do not mark the handoff as failed. Management usually does not see the later announce-step delivery result; final visible delivery is Main/OpenClaw's responsibility.
 
-If Main replies with anything other than `ANNOUNCE_READY`, treat the report as failed. Record the unexpected reply, write a report artifact when useful, and keep the report as an open item in `NOW.md`.
+If `sessions_send` returns `status=ok` but no `reply`, times out, errors, or Main replies only with a non-deliverable control token such as `NO_REPLY`, `REPLY_SKIP`, `ANNOUNCE_SKIP`, or `HEARTBEAT_OK`, treat the handoff as incomplete because the announce step may not be triggered. Record the pending state, keep the report as an open item in `NOW.md`, and avoid sending another placeholder.
 
-If you recently sent a report with `sessions_send` and then see stuff come back to you as an inter-session message, treat it as delivery echo or ack. Reply exactly `NO_REPLY` unless the echo or ack contains a new owner instruction, an error, or a delivery failure.
+If `sessions_send` fails because the route was missing, use `sessions_list` to find the latest owner-facing Main Session and retry with its `sessionKey` and send it. If the retry also fails, write a report artifact, journal the routing failure, and keep the report as an open item in `NOW.md`.

package/src/openclaw/plugin/account-identity.js

@@ -1,6 +1,10 @@
 import {
+  CLAWORLD_CLIENT_CHANNEL_HEADER,
+  CLAWORLD_CLIENT_HEADER,
+  CLAWORLD_CLIENT_VERSION_HEADER,
+  CLAWORLD_OPENCLAW_PLUGIN_CLIENT,
   CLAWORLD_PLUGIN_CURRENT_VERSION,
-  CLAWORLD_PLUGIN_VERSION_HEADER,
+  inferClaworldClientChannel,
 } from '../plugin-version.js';
 
 function normalizeText(value, fallback = null) {
@@ -59,7 +63,9 @@ export function buildRuntimeAuthHeaders(runtimeConfig = {}, headers = {}) {
   const appToken = resolveRuntimeAppToken(runtimeConfig);
   const nextHeaders = {
     ...headers,
-    [CLAWORLD_PLUGIN_VERSION_HEADER]: CLAWORLD_PLUGIN_CURRENT_VERSION,
+    [CLAWORLD_CLIENT_HEADER]: CLAWORLD_OPENCLAW_PLUGIN_CLIENT,
+    [CLAWORLD_CLIENT_VERSION_HEADER]: CLAWORLD_PLUGIN_CURRENT_VERSION,
+    [CLAWORLD_CLIENT_CHANNEL_HEADER]: inferClaworldClientChannel(),
   };
   if (!appToken) return nextHeaders;
   return {

package/src/openclaw/plugin/claworld-channel-plugin.js

@@ -247,8 +247,8 @@ function buildRelayAgentSummary(item = {}) {
     agentId: normalizedAgentId,
     displayName: normalizeClaworldText(item?.displayName, null),
     publicIdentity: item?.publicIdentity && typeof item.publicIdentity === 'object' ? item.publicIdentity : null,
-    discoverable: typeof item?.discoverable === 'boolean' ? item.discoverable : null,
-    contactable: typeof item?.contactable === 'boolean' ? item.contactable : null,
+    visibilityMode: normalizeClaworldText(item?.visibilityMode, null),
+    contactPolicy: normalizeClaworldText(item?.contactPolicy, null),
     online: typeof item?.online === 'boolean' ? item.online : null,
   };
 }
@@ -1404,7 +1404,7 @@ async function fetchPublicIdentity({
   }
 
   const baseUrl = normalizeRelayHttpBaseUrl(runtimeConfig.serverUrl);
-  const result = await fetchJson(fetchImpl, `${baseUrl}/v1/profile`, {
+  const result = await fetchJson(fetchImpl, `${baseUrl}/v1/account`, {
     method: 'POST',
     headers: {
       'content-type': 'application/json',
@@ -1415,7 +1415,7 @@ async function fetchPublicIdentity({
       accountId: runtimeConfig.accountId || null,
       ...(agentId ? { agentId } : {}),
       action: 'view',
-      ...(generateShareCard === true ? { generateShareCard: true } : {}),
+      generateShareCard: generateShareCard === true,
       ...(normalizeClaworldText(shareCardVariant, null) ? { shareCardVariant: normalizeClaworldText(shareCardVariant, null) } : {}),
       ...(normalizeClaworldInteger(expiresInSeconds, null) > 0
         ? { expiresInSeconds: normalizeClaworldInteger(expiresInSeconds, null) }
@@ -1614,53 +1614,6 @@ async function completeEmailVerification({
   return result.body || {};
 }
 
-async function updateChatRequestApprovalPolicy({
-  runtimeConfig,
-  agentId = null,
-  chatRequestApprovalPolicy = null,
-  fetchImpl,
-}) {
-  if (!resolveRuntimeAppToken(runtimeConfig)) {
-    throw createRuntimeBoundaryError({
-      code: 'claworld_identity_unverified',
-      category: 'conflict',
-      status: 409,
-      message: 'claworld email verification must be completed before updating chat policy',
-      publicMessage: 'complete Claworld email verification before changing chat policy',
-      recoverable: true,
-    });
-  }
-
-  const baseUrl = normalizeRelayHttpBaseUrl(runtimeConfig.serverUrl);
-  const result = await fetchJson(fetchImpl, `${baseUrl}/v1/profile`, {
-    method: 'POST',
-    headers: {
-      'content-type': 'application/json',
-      ...(runtimeConfig.apiKey ? { 'x-api-key': runtimeConfig.apiKey } : {}),
-      ...buildRuntimeAuthHeaders(runtimeConfig),
-    },
-    body: JSON.stringify({
-      accountId: runtimeConfig.accountId || null,
-      ...(agentId ? { agentId } : {}),
-      action: 'update_chat_policy',
-      chatRequestApprovalPolicy,
-    }),
-  });
-  if (!result.ok) {
-    createRelayRouteError({
-      result,
-      runtimeConfig,
-      code: 'chat_request_approval_policy_update_failed',
-      publicMessage: 'failed to update chat policy',
-      context: {
-        accountId: runtimeConfig.accountId || null,
-        agentId: normalizeClaworldText(agentId, null),
-      },
-    });
-  }
-  return result.body || {};
-}
-
 async function updateGlobalProfile({
   runtimeConfig,
   agentId = null,
@@ -1763,8 +1716,8 @@ async function resolveRelayAgentSummary({
     agentId: normalizedAgentId,
     displayName: normalizeClaworldText(runtimeConfig.registration?.displayName, null),
     publicIdentity: null,
-    discoverable: null,
-    contactable: null,
+    visibilityMode: null,
+    contactPolicy: null,
     online: null,
     resolved: false,
     resolutionSource: 'fallback',
@@ -1812,9 +1765,8 @@ async function executeRuntimeAccountAction({
   profile = undefined,
   humanProfile = undefined,
   agentProfile = undefined,
-  discoverable = undefined,
-  contactable = undefined,
-  chatRequestApprovalPolicy = null,
+  visibilityMode = undefined,
+  contactPolicy = undefined,
   proactivitySettings = undefined,
   generateShareCard = false,
   expiresInSeconds = null,
@@ -1848,9 +1800,8 @@ async function executeRuntimeAccountAction({
       ...(profile !== undefined ? { profile } : {}),
       ...(humanProfile !== undefined ? { humanProfile } : {}),
       ...(agentProfile !== undefined ? { agentProfile } : {}),
-      ...(discoverable !== undefined ? { discoverable } : {}),
-      ...(contactable !== undefined ? { contactable } : {}),
-      ...(chatRequestApprovalPolicy ? { chatRequestApprovalPolicy } : {}),
+      ...(visibilityMode !== undefined ? { visibilityMode } : {}),
+      ...(contactPolicy !== undefined ? { contactPolicy } : {}),
       ...(proactivitySettings !== undefined ? { proactivitySettings } : {}),
       ...(generateShareCard === true ? { generateShareCard: true } : {}),
       ...(normalizeClaworldText(shareCardVariant, null) ? { shareCardVariant: normalizeClaworldText(shareCardVariant, null) } : {}),
@@ -4367,19 +4318,16 @@ async function getRuntimeIdentityStatus(context = {}) {
     email: normalizeClaworldText(account.email, null),
     verifiedAt: normalizeClaworldText(account.verifiedAt, null),
     reason: emailVerified ? null : 'no_email_identity',
+    relay: accountView?.relay && typeof accountView.relay === 'object' && !Array.isArray(accountView.relay)
+      ? accountView.relay
+      : null,
+    diagnostics: accountView?.diagnostics && typeof accountView.diagnostics === 'object' && !Array.isArray(accountView.diagnostics)
+      ? accountView.diagnostics
+      : null,
+    accountView,
   };
 }
 
-async function updateRuntimeChatRequestApprovalPolicy(context = {}) {
-  const resolvedContext = await resolveBoundRuntimeContext(context);
-  return updateChatRequestApprovalPolicy({
-    runtimeConfig: resolvedContext.runtimeConfig,
-    agentId: resolvedContext.agentId || null,
-    chatRequestApprovalPolicy: context.chatRequestApprovalPolicy || null,
-    fetchImpl,
-  });
-}
-
 async function updateRuntimeProfile(context = {}) {
   const resolvedContext = await resolveBoundRuntimeContext(context);
   return updateGlobalProfile({
@@ -4670,9 +4618,8 @@ async function generateRuntimeProfileCard(context = {}) {
             profile: Object.prototype.hasOwnProperty.call(context, 'profile') ? context.profile : undefined,
             humanProfile: Object.prototype.hasOwnProperty.call(context, 'humanProfile') ? context.humanProfile : undefined,
             agentProfile: Object.prototype.hasOwnProperty.call(context, 'agentProfile') ? context.agentProfile : undefined,
-            discoverable: Object.prototype.hasOwnProperty.call(context, 'discoverable') ? context.discoverable : undefined,
-            contactable: Object.prototype.hasOwnProperty.call(context, 'contactable') ? context.contactable : undefined,
-            chatRequestApprovalPolicy: context.chatRequestApprovalPolicy || null,
+            visibilityMode: Object.prototype.hasOwnProperty.call(context, 'visibilityMode') ? context.visibilityMode : undefined,
+            contactPolicy: Object.prototype.hasOwnProperty.call(context, 'contactPolicy') ? context.contactPolicy : undefined,
             proactivitySettings: Object.prototype.hasOwnProperty.call(context, 'proactivitySettings') ? context.proactivitySettings : undefined,
             generateShareCard: context.generateShareCard === true,
             expiresInSeconds: context.expiresInSeconds ?? null,
@@ -4682,7 +4629,6 @@ async function generateRuntimeProfileCard(context = {}) {
         },
         updatePublicIdentity: updateRuntimePublicIdentity,
         updateProfile: updateRuntimeProfile,
-        updateChatRequestApprovalPolicy: updateRuntimeChatRequestApprovalPolicy,
         generateShareCard: generateRuntimeProfileCard,
       },
       identity: {
@@ -5059,9 +5005,8 @@ async function generateRuntimeProfileCard(context = {}) {
               profile: Object.prototype.hasOwnProperty.call(context, 'profile') ? context.profile : undefined,
               humanProfile: Object.prototype.hasOwnProperty.call(context, 'humanProfile') ? context.humanProfile : undefined,
               agentProfile: Object.prototype.hasOwnProperty.call(context, 'agentProfile') ? context.agentProfile : undefined,
-              discoverable: Object.prototype.hasOwnProperty.call(context, 'discoverable') ? context.discoverable : undefined,
-              contactable: Object.prototype.hasOwnProperty.call(context, 'contactable') ? context.contactable : undefined,
-              chatRequestApprovalPolicy: context.chatRequestApprovalPolicy || null,
+              visibilityMode: Object.prototype.hasOwnProperty.call(context, 'visibilityMode') ? context.visibilityMode : undefined,
+              contactPolicy: Object.prototype.hasOwnProperty.call(context, 'contactPolicy') ? context.contactPolicy : undefined,
               proactivitySettings: Object.prototype.hasOwnProperty.call(context, 'proactivitySettings') ? context.proactivitySettings : undefined,
               generateShareCard: context.generateShareCard === true,
               expiresInSeconds: context.expiresInSeconds ?? null,
@@ -5071,7 +5016,6 @@ async function generateRuntimeProfileCard(context = {}) {
           },
           updatePublicIdentity: updateRuntimePublicIdentity,
           updateProfile: updateRuntimeProfile,
-          updateChatRequestApprovalPolicy: updateRuntimeChatRequestApprovalPolicy,
           generateShareCard: generateRuntimeProfileCard,
         },
         identity: {

package/src/openclaw/plugin/managed-config.js

@@ -1,5 +1,9 @@
 import os from 'os';
 import path from 'path';
+import {
+  CLAWORLD_PLUGIN_CURRENT_VERSION,
+  normalizeClaworldPluginVersion,
+} from '../plugin-version.js';
 import {
   CLAWORLD_MINIMAL_OPENCLAW_TOOL_NAMES,
   CLAWORLD_PUBLIC_TOOL_NAMES,
@@ -7,7 +11,18 @@ import {
   CLAWORLD_TOOL_PROFILES,
 } from '../runtime/tool-inventory.js';
 
-export const DEFAULT_CLAWORLD_SERVER_URL = 'https://staging.claworld.love';
+export const CLAWORLD_STAGING_SERVER_URL = 'https://staging.claworld.love';
+export const CLAWORLD_PRODUCTION_SERVER_URL = 'https://claworld.love';
+export function isClaworldTestingPluginVersion(version = CLAWORLD_PLUGIN_CURRENT_VERSION) {
+  const normalized = normalizeClaworldPluginVersion(version, null);
+  return Boolean(normalized && /-testing(?:\.|$)/.test(normalized));
+}
+export function resolveDefaultClaworldServerUrl(version = CLAWORLD_PLUGIN_CURRENT_VERSION) {
+  return isClaworldTestingPluginVersion(version)
+    ? CLAWORLD_STAGING_SERVER_URL
+    : CLAWORLD_PRODUCTION_SERVER_URL;
+}
+export const DEFAULT_CLAWORLD_SERVER_URL = resolveDefaultClaworldServerUrl();
 export const DEFAULT_CLAWORLD_API_KEY = 'local-test';
 export const DEFAULT_CLAWORLD_AGENT_ID = 'main';
 export const DEFAULT_CLAWORLD_ACCOUNT_ID = 'claworld';

package/src/openclaw/plugin/register-tooling.js

@@ -496,7 +496,6 @@ export const ACCOUNT_ACTIONS = Object.freeze([
   'view',
   'update_identity',
   'update_profile',
-  'update_chat_policy',
 ]);
 
 function normalizeAccountAction(value, fallback = null) {
@@ -509,7 +508,6 @@ export function inferAccountAction(params = {}) {
   if (explicitAction) return explicitAction;
   if (normalizeText(params.displayName, null)) return 'update_identity';
   if (Object.prototype.hasOwnProperty.call(params, 'profile')) return 'update_profile';
-  if (normalizeObject(params.chatRequestApprovalPolicy, null)) return 'update_chat_policy';
   return 'view';
 }
 
@@ -629,31 +627,12 @@ function projectToolAccountProfileState(identityPayload = null) {
   };
 }
 
-function projectToolChatRequestApprovalPolicy(payload = null) {
-  const policy = normalizeObject(payload, null);
-  if (!policy) return null;
-  return {
-    agentId: normalizeText(policy.agentId, null),
-    schemaVersion: Number.isInteger(policy.schemaVersion) ? policy.schemaVersion : null,
-    syncedAt: normalizeText(policy.syncedAt, null),
-    credentialId: normalizeText(policy.credentialId, null),
-    source: normalizeObject(policy.source, {})
-      ? {
-          channel: normalizeText(policy.source?.channel, null),
-          integration: normalizeText(policy.source?.integration, null),
-          accountId: normalizeText(policy.source?.accountId, null),
-        }
-      : {},
-    policy: normalizeObject(policy.policy, {})
-      ? {
-          mode: normalizeText(policy.policy?.mode, null),
-          blocks: {
-            originTypes: Array.isArray(policy.policy?.blocks?.originTypes) ? policy.policy.blocks.originTypes : [],
-            worldIds: Array.isArray(policy.policy?.blocks?.worldIds) ? policy.policy.blocks.worldIds : [],
-          },
-        }
-      : null,
-  };
+function resolveToolPublicIdentityReady(identityPayload = null, publicIdentityState = {}) {
+  const diagnostics = normalizeObject(identityPayload?.diagnostics, null);
+  if (typeof diagnostics?.publicIdentityReady === 'boolean') return diagnostics.publicIdentityReady;
+  const identityStatus = normalizeText(publicIdentityState?.publicIdentity?.status, null);
+  if (identityStatus) return identityStatus === 'ready';
+  return identityPayload?.ready === true;
 }
 
 function projectToolPluginVersionStatus(payload = null) {
@@ -685,11 +664,34 @@ export function projectToolAccountViewResponse({
   accountId = null,
   pairingPayload = null,
   identityPayload = null,
+  accountPayload = null,
 } = {}) {
   const publicIdentityState = projectToolAccountIdentityFields(identityPayload);
   const accountProfile = projectToolAccountProfileState(identityPayload);
-  const publicIdentityReady = identityPayload?.ready === true;
-  const accountProfileReady = accountProfile.ready === true;
+  const accountView = normalizeObject(accountPayload, null);
+  const accountRecord = normalizeObject(accountView?.account, null);
+  const accountRelay = normalizeObject(accountView?.relay, null);
+  const accountDiagnostics = normalizeObject(accountView?.diagnostics, null);
+  const publicIdentityReady = resolveToolPublicIdentityReady(identityPayload, publicIdentityState);
+  const accountProfileReady = accountProfile.ready === true
+    || accountRecord?.profileReady === true
+    || accountDiagnostics?.accountProfileReady === true;
+  const resolvedAccountProfile = accountProfile.ready === true
+    ? accountProfile
+    : {
+        ...accountProfile,
+        status: accountProfileReady ? 'ready' : accountProfile.status,
+        ready: accountProfileReady,
+        profile: normalizeText(
+          accountRecord?.agentProfile,
+          normalizeText(accountRecord?.profile, accountProfile.profile),
+        ),
+        reason: accountProfileReady ? null : accountProfile.reason,
+        requiredAction: accountProfileReady ? null : accountProfile.requiredAction,
+        nextAction: accountProfileReady ? null : accountProfile.nextAction,
+        nextTool: accountProfileReady ? null : accountProfile.nextTool,
+        missingFields: accountProfileReady ? [] : accountProfile.missingFields,
+      };
   const emailVerified = pairingPayload?.emailVerified === true;
   const runtimePaired = pairingPayload?.status === 'paired';
   const bindingReady = typeof pairingPayload?.bindingReady === 'boolean'
@@ -720,11 +722,11 @@ export function projectToolAccountViewResponse({
       }
     : !accountProfileReady
       ? {
-          requiredAction: accountProfile.requiredAction,
-          nextAction: accountProfile.nextAction,
-          nextTool: accountProfile.nextTool,
-          missingFields: accountProfile.missingFields,
-          reason: accountProfile.reason,
+            requiredAction: resolvedAccountProfile.requiredAction,
+            nextAction: resolvedAccountProfile.nextAction,
+            nextTool: resolvedAccountProfile.nextTool,
+            missingFields: resolvedAccountProfile.missingFields,
+            reason: resolvedAccountProfile.reason,
         }
       : {
           requiredAction: null,
@@ -733,8 +735,17 @@ export function projectToolAccountViewResponse({
           missingFields: [],
           reason: null,
         };
-  const relayResolved = pairingPayload?.relayAgent?.resolved ?? null;
-  const relayOnline = pairingPayload?.relayAgent?.online ?? null;
+  const relayIdentityResolved = typeof pairingPayload?.relayAgent?.resolved === 'boolean'
+    ? pairingPayload.relayAgent.resolved
+    : null;
+  const relayOnline = typeof accountRelay?.online === 'boolean'
+    ? accountRelay.online
+    : (typeof accountDiagnostics?.relayOnline === 'boolean'
+        ? accountDiagnostics.relayOnline
+        : (typeof pairingPayload?.relayAgent?.online === 'boolean' ? pairingPayload.relayAgent.online : null));
+  const relayResolved = typeof accountRelay?.resolved === 'boolean'
+    ? accountRelay.resolved
+    : (typeof relayOnline === 'boolean');
   const resolvedShareCard = identityPayload && Object.prototype.hasOwnProperty.call(identityPayload, 'shareCard')
     ? projectToolShareCard(identityPayload.shareCard)
     : undefined;
@@ -765,6 +776,7 @@ export function projectToolAccountViewResponse({
       bindingStatus,
       publicIdentityReady,
       accountProfileReady,
+      relayIdentityResolved,
       relayPresenceResolved: relayResolved,
       relayOnline,
     },
@@ -774,21 +786,20 @@ export function projectToolAccountViewResponse({
         normalizeText(pairingPayload?.relayAgent?.agentId, null),
       ),
       displayName: normalizeText(pairingPayload?.relayAgent?.displayName, null),
-      discoverable: pairingPayload?.relayAgent?.discoverable ?? null,
-      contactable: pairingPayload?.relayAgent?.contactable ?? null,
+      visibilityMode: normalizeText(pairingPayload?.relayAgent?.visibilityMode, null),
+      contactPolicy: normalizeText(pairingPayload?.relayAgent?.contactPolicy, null),
       online: relayOnline,
       resolved: relayResolved,
       bindingStatus,
     },
-    profile: accountProfile.profile,
+    profile: resolvedAccountProfile.profile,
     ...publicIdentityState,
-    accountProfile,
+    accountProfile: resolvedAccountProfile,
     requiredAction: blockedAction.requiredAction,
     nextAction: blockedAction.nextAction,
     nextTool: blockedAction.nextTool,
     missingFields: blockedAction.missingFields,
     pluginVersionStatus: projectToolPluginVersionStatus(identityPayload?.pluginVersionStatus),
-    chatRequestApprovalPolicy: projectToolChatRequestApprovalPolicy(identityPayload?.chatRequestApprovalPolicy),
     ...(resolvedShareCard !== undefined ? { shareCard: resolvedShareCard } : {}),
   };
 }
@@ -807,7 +818,7 @@ export function projectToolAccountMutationResponse({
     : (identityPayload && Object.prototype.hasOwnProperty.call(identityPayload, 'shareCard')
         ? projectToolShareCard(identityPayload.shareCard)
         : undefined);
-  const publicIdentityReady = identityPayload?.ready === true;
+  const publicIdentityReady = resolveToolPublicIdentityReady(identityPayload, publicIdentityState);
   const accountProfileReady = accountProfile.ready === true;
   const emailVerificationPayload = normalizeObject(identityPayload?.emailVerification, null);
   const emailVerified = identityPayload?.emailVerified === true
@@ -875,7 +886,6 @@ export function projectToolAccountMutationResponse({
     missingFields: blockedAction.missingFields,
     reason: blockedAction.reason,
     pluginVersionStatus: projectToolPluginVersionStatus(identityPayload?.pluginVersionStatus),
-    chatRequestApprovalPolicy: projectToolChatRequestApprovalPolicy(identityPayload?.chatRequestApprovalPolicy),
     ...(resolvedShareCard !== undefined ? { shareCard: resolvedShareCard } : {}),
     ...(runtimeIdentity ? { runtimeIdentity } : {}),
     ...(action === 'update_identity'
@@ -888,10 +898,6 @@ export function projectToolAccountMutationResponse({
         ? {
             updated: ['profile'],
           }
-        : action === 'update_chat_policy'
-          ? {
-              updated: ['chatRequestApprovalPolicy'],
-            }
           : {}),
   };
 }