@xfxstudio/claworld 0.2.8 → 0.2.10-beta.0

package/src/openclaw/runtime/tool-contracts.js

@@ -85,6 +85,26 @@ function projectWorldStats(stats = null) {
     totalParticipants: normalizeOptionalInteger(stats.totalParticipants, null),
     activeParticipants: normalizeOptionalInteger(stats.activeParticipants, null),
     totalConversationCount: normalizeOptionalInteger(stats.totalConversationCount, null),
+    totalLikes: normalizeOptionalInteger(stats.totalLikes, null),
+    totalDislikes: normalizeOptionalInteger(stats.totalDislikes, null),
+  };
+}
+
+function projectWorldFeedbackSummary(summary = null) {
+  if (!summary || typeof summary !== 'object' || Array.isArray(summary)) return null;
+  return {
+    likesReceived: normalizeInteger(summary.likesReceived, 0),
+    dislikesReceived: normalizeInteger(summary.dislikesReceived, 0),
+  };
+}
+
+function projectConversationFeedbackSummary(summary = null) {
+  if (!summary || typeof summary !== 'object' || Array.isArray(summary)) return null;
+  return {
+    likeCount: normalizeInteger(summary.likeCount, 0),
+    dislikeCount: normalizeInteger(summary.dislikeCount, 0),
+    viewerGave: normalizeText(summary.viewerGave, null),
+    viewerReceived: normalizeText(summary.viewerReceived, null),
   };
 }
 
@@ -254,6 +274,7 @@ function projectToolCandidateSummary(summary = {}, index = 0) {
     score: normalizeInteger(summary.score, 0) || null,
     summary: normalizeText(summary.summary, null),
     expiresAt: normalizeText(summary.expiresAt, null),
+    worldFeedbackSummary: projectWorldFeedbackSummary(summary.worldFeedbackSummary),
   };
 }
 
@@ -277,6 +298,7 @@ function projectToolCandidateFeed(joinResult = {}) {
         score: candidate.score,
         summary: normalizeText(candidate.deliveryReason?.summary, null),
         expiresAt: candidate.expiresAt,
+        worldFeedbackSummary: candidate.worldFeedbackSummary,
       }, index))
       : [];
 
@@ -354,6 +376,7 @@ export function projectToolSearchWorldResponse(searchResult = {}, { accountId =
       matchReasons: projectSearchMatchReasons(item),
       profileSnippet: summarizeProfileSnippet(item.profileSummary),
       online: item.online === true,
+      worldFeedbackSummary: projectWorldFeedbackSummary(item.worldFeedbackSummary),
     }))
     : [];
 
@@ -482,7 +505,7 @@ export function projectToolFeedbackSubmissionResponse(result = {}) {
     title: normalizeText(feedback.title, null),
     accountId: normalizeText(feedback.accountId, null),
     reporterAgentId: normalizeText(reporter.agentId, null),
-    reporterAgentCode: normalizeText(reporter.agentCode, null),
+    reporterIdentity: normalizeText(reporter.publicIdentity?.displayIdentity, null),
     worldId: normalizeText(context.worldId, null),
     conversationKey: normalizeText(context.conversationKey, null),
     turnId: normalizeText(context.turnId, null),
@@ -503,9 +526,8 @@ function projectToolAgentSummary(agent = {}) {
   if (!agent || typeof agent !== 'object') return null;
   return {
     agentId: normalizeText(agent.agentId, null),
-    agentCode: normalizeText(agent.agentCode, null),
-    address: normalizeText(agent.address, null),
     displayName: normalizeText(agent.displayName, null),
+    identity: normalizeText(agent.publicIdentity?.displayIdentity, null),
     online: agent.online === true,
     discoverable: typeof agent.discoverable === 'boolean' ? agent.discoverable : null,
     contactable: typeof agent.contactable === 'boolean' ? agent.contactable : null,
@@ -622,6 +644,23 @@ function projectChatRequestItem(request = {}) {
   };
 }
 
+function projectChatInboxChatItem(chat = {}) {
+  if (!chat || typeof chat !== 'object' || Array.isArray(chat)) return null;
+  return {
+    chatRequestId: normalizeText(chat.chatRequestId, null),
+    status: normalizeText(chat.status, null),
+    direction: normalizeText(chat.direction, null),
+    createdAt: normalizeText(chat.createdAt, null),
+    updatedAt: normalizeText(chat.updatedAt, null),
+    lastTurnAt: normalizeText(chat.lastTurnAt, null),
+    conversationKey: normalizeText(chat.conversationKey, null),
+    localSessionKey: normalizeText(chat.localSessionKey, normalizeText(chat.sessionKey, null)),
+    counterparty: projectToolAgentSummary(chat.counterparty),
+    conversation: normalizeConversationScopeDetails(chat.conversation),
+    feedbackSummary: projectConversationFeedbackSummary(chat.feedbackSummary),
+  };
+}
+
 export function projectToolFriendRequestMutationResponse(result = {}, { accountId = null } = {}) {
   return {
     status: result.alreadyFriends === true
@@ -690,3 +729,26 @@ export function projectToolChatRequestListResponse(result = {}, { accountId = nu
     items,
   };
 }
+
+export function projectToolChatInboxResponse(result = {}, { accountId = null } = {}) {
+  const pendingRequests = Array.isArray(result.pendingRequests)
+    ? result.pendingRequests.map((request) => projectChatRequestItem(request)).filter(Boolean)
+    : [];
+  const chats = Array.isArray(result.chats)
+    ? result.chats.map((chat) => projectChatInboxChatItem(chat)).filter(Boolean)
+    : [];
+  return {
+    accountId: normalizeText(accountId, null),
+    counts: result.counts && typeof result.counts === 'object' && !Array.isArray(result.counts)
+      ? {
+          pendingRequestCount: normalizeInteger(result.counts.pendingRequestCount, pendingRequests.length),
+          chatCount: normalizeInteger(result.counts.chatCount, chats.length),
+        }
+      : {
+          pendingRequestCount: pendingRequests.length,
+          chatCount: chats.length,
+        },
+    pendingRequests,
+    chats,
+  };
+}

package/src/openclaw/runtime/tool-inventory.js

@@ -2,7 +2,7 @@ export const CLAWORLD_TOOL_CONTRACT_VERSION = 'v1';
 
 export const CLAWORLD_CHAT_REQUEST_TOOL_NAMES = Object.freeze([
   'claworld_request_chat',
-  'claworld_list_chat_requests',
+  'claworld_chat_inbox',
   'claworld_accept_chat_request',
   'claworld_reject_chat_request',
 ]);
@@ -11,6 +11,11 @@ export const CLAWORLD_BOOTSTRAP_TOOL_NAMES = Object.freeze([
   'claworld_pair_agent',
 ]);
 
+export const CLAWORLD_PROFILE_TOOL_NAMES = Object.freeze([
+  'claworld_get_public_identity',
+  'claworld_update_public_identity',
+]);
+
 export const CLAWORLD_FEEDBACK_TOOL_NAMES = Object.freeze([
   'claworld_submit_feedback',
 ]);
@@ -43,6 +48,7 @@ export const CLAWORLD_RETIRED_PUBLIC_TOOL_NAMES = Object.freeze([
 
 export const CLAWORLD_REGISTERED_TOOL_NAMES = Object.freeze([
   ...CLAWORLD_BOOTSTRAP_TOOL_NAMES,
+  ...CLAWORLD_PROFILE_TOOL_NAMES,
   ...CLAWORLD_WORLD_TOOL_NAMES,
   ...CLAWORLD_WORLD_ADMIN_PUBLIC_TOOL_NAMES,
   ...CLAWORLD_CHAT_REQUEST_TOOL_NAMES,
@@ -67,6 +73,7 @@ export const CLAWORLD_READ_ONLY_OPENCLAW_TOOL_NAMES = Object.freeze([
 
 export const CLAWORLD_PLUGIN_SMOKE_REQUIRED_TOOL_NAMES = Object.freeze([
   ...CLAWORLD_BOOTSTRAP_TOOL_NAMES,
+  ...CLAWORLD_PROFILE_TOOL_NAMES,
   ...CLAWORLD_WORLD_TOOL_NAMES,
   ...CLAWORLD_WORLD_ADMIN_PUBLIC_TOOL_NAMES,
   ...CLAWORLD_CHAT_REQUEST_TOOL_NAMES,

package/src/openclaw/runtime/world-moderation-helper.js

@@ -1,6 +1,7 @@
 import { resolveClaworldRuntimeConfig } from '../plugin/config-schema.js';
 import { buildRuntimeAuthHeaders } from '../plugin/account-identity.js';
 import { createRuntimeBoundaryError } from '../../lib/runtime-errors.js';
+import { extractBackendErrorContext } from './backend-error-context.js';
 
 function normalizeText(value, fallback = null) {
   if (value == null) return fallback;
@@ -36,18 +37,6 @@ function normalizeStringList(values = []) {
   return [...new Set(values.map((value) => normalizeText(value, null)).filter(Boolean))];
 }
 
-function normalizeFieldError(fieldError = {}) {
-  const fieldId = normalizeText(fieldError.fieldId, null);
-  const message = normalizeText(fieldError.message, null);
-  const code = normalizeText(fieldError.code, null);
-  if (!fieldId && !message && !code) return null;
-  return {
-    ...(fieldId ? { fieldId } : {}),
-    ...(message ? { message } : {}),
-    ...(code ? { code } : {}),
-  };
-}
-
 function normalizeParticipantContextField(field = {}, index = 0) {
   return {
     fieldId: normalizeText(field.fieldId, `field_${index + 1}`),
@@ -160,9 +149,6 @@ function inferHttpErrorCategory(status) {
 function createModerationHttpError(action, response, { accountId = null, worldId = null } = {}) {
   const backendCode = normalizeText(response?.body?.error, null);
   const backendMessage = normalizeText(response?.body?.message, `claworld world ${action} failed`);
-  const fieldErrors = Array.isArray(response?.body?.fieldErrors)
-    ? response.body.fieldErrors.map((fieldError) => normalizeFieldError(fieldError)).filter(Boolean)
-    : [];
 
   return createRuntimeBoundaryError({
     code: backendCode || `claworld_world_${action}_failed`,
@@ -176,9 +162,7 @@ function createModerationHttpError(action, response, { accountId = null, worldId
       accountId,
       ...(worldId ? { worldId } : {}),
       httpStatus: response?.status ?? 500,
-      backendCode,
-      backendMessage,
-      ...(fieldErrors.length > 0 ? { fieldErrors } : {}),
+      ...extractBackendErrorContext(response?.body),
     },
   });
 }
@@ -190,7 +174,7 @@ export async function createModeratedWorld({
   agentId = null,
   displayName = null,
   worldContextText = null,
-  enabled = false,
+  enabled = true,
   fetchImpl,
   logger = console,
 } = {}) {

package/src/product-shell/contracts/candidate-feed.js

@@ -12,9 +12,15 @@ export const CANDIDATE_OBJECT_FIELDS = Object.freeze([
   'profileSummary',
   'compatibilitySignals',
   'deliveryReason',
+  'worldFeedbackSummary',
   'expiresAt',
 ]);
 
+export const WORLD_FEEDBACK_SUMMARY_FIELDS = Object.freeze([
+  'likesReceived',
+  'dislikesReceived',
+]);
+
 export const DATING_DEMO_SCORING_FIELDS = Object.freeze([
   'joinedAt',
   'rank',
@@ -282,6 +288,7 @@ export function projectCandidateFeedModel(world) {
     profileSummaryFieldShape: PROFILE_SUMMARY_FIELD_FIELDS,
     compatibilitySignalFields: COMPATIBILITY_SIGNAL_FIELDS,
     deliveryReasonFields: DELIVERY_REASON_FIELDS,
+    worldFeedbackSummaryFields: WORLD_FEEDBACK_SUMMARY_FIELDS,
     requestChatAction: {
       action: 'request_chat',
       requiredFields: ['worldId', 'targetAgentId'],

package/src/product-shell/contracts/world-manifest.js

@@ -124,7 +124,6 @@ function normalizeSearchSchema(searchSchema = {}, joinSchema = {}) {
         'worldId',
         'displayName',
         'headline',
-        'address',
         'online',
         'matchedFieldIds',
         'score',

package/src/product-shell/contracts/world-orchestration.js

@@ -390,7 +390,12 @@ function summarizeProfileFields(fields = []) {
 }
 
 function buildCandidateDeliverySummaryLine(candidateSummary = {}, index = 0) {
-  return `${index + 1}. ${candidateSummary.summary}`;
+  const likesReceived = Number(candidateSummary.worldFeedbackSummary?.likesReceived || 0);
+  const dislikesReceived = Number(candidateSummary.worldFeedbackSummary?.dislikesReceived || 0);
+  const feedbackLine = likesReceived > 0 || dislikesReceived > 0
+    ? ` World feedback in this world: ${likesReceived} like${likesReceived === 1 ? '' : 's'}, ${dislikesReceived} dislike${dislikesReceived === 1 ? '' : 's'}.`
+    : '';
+  return `${index + 1}. ${candidateSummary.summary}${feedbackLine}`;
 }
 
 function formatConversationOverview(detail = {}) {
@@ -697,6 +702,10 @@ export function buildCandidateDeliverySummary(candidateFeed = {}, { worldDetail
       optionalFieldSummary,
       compatibilitySummary,
       deliveryReasonSummary: deliveryReasonSummary || null,
+      worldFeedbackSummary: candidate.worldFeedbackSummary || {
+        likesReceived: 0,
+        dislikesReceived: 0,
+      },
       expiresAt: candidate.expiresAt,
       summary,
     };

package/src/product-shell/conversation-feedback/conversation-feedback-service.js

@@ -0,0 +1,261 @@
+const FEEDBACK_TOKEN_TO_SENTIMENT = Object.freeze({
+  '[[like]]': 'like',
+  '[[dislike]]': 'dislike',
+});
+
+const SENTIMENT_VALUES = Object.freeze(['like', 'dislike']);
+
+function normalizeText(value, fallback = null) {
+  if (value == null) return fallback;
+  const normalized = String(value).trim();
+  return normalized || fallback;
+}
+
+function createConfigurationError() {
+  const error = new Error('conversation_feedback_store_unavailable');
+  error.code = 'conversation_feedback_store_unavailable';
+  error.status = 500;
+  return error;
+}
+
+function createInvalidConversationFeedbackError(fieldId, message = `${fieldId} is required`) {
+  const error = new Error(`invalid_conversation_feedback:${fieldId}`);
+  error.code = 'invalid_conversation_feedback';
+  error.status = 400;
+  error.responseBody = {
+    error: error.code,
+    message: 'conversation feedback request is invalid',
+    fieldErrors: [
+      {
+        fieldId,
+        message,
+      },
+    ],
+  };
+  return error;
+}
+
+function normalizeSentiment(value, fallback = null) {
+  const normalized = normalizeText(value, fallback);
+  return SENTIMENT_VALUES.includes(normalized) ? normalized : fallback;
+}
+
+function resolveSentimentFromToken(token = null) {
+  const normalizedToken = normalizeText(token, null);
+  return normalizedToken ? FEEDBACK_TOKEN_TO_SENTIMENT[normalizedToken] || null : null;
+}
+
+export function parseConversationFeedbackTokens(text = '') {
+  if (typeof text !== 'string' || !text.trim()) {
+    return {
+      tokens: [],
+      sentiment: null,
+      conflict: false,
+    };
+  }
+
+  const matches = [...text.matchAll(/\[\[(like|dislike)\]\]/g)];
+  if (matches.length === 0) {
+    return {
+      tokens: [],
+      sentiment: null,
+      conflict: false,
+    };
+  }
+
+  const tokens = [...new Set(matches.map((match) => `[[${String(match[1] || '').trim().toLowerCase()}]]`))];
+  const sentiments = [...new Set(tokens.map((token) => resolveSentimentFromToken(token)).filter(Boolean))];
+  return {
+    tokens,
+    sentiment: sentiments.length === 1 ? sentiments[0] : null,
+    conflict: sentiments.length > 1,
+  };
+}
+
+function projectFeedbackMark(feedbackMark = {}) {
+  return {
+    feedbackMarkId: normalizeText(feedbackMark.feedbackMarkId, null),
+    conversationKey: normalizeText(feedbackMark.conversationKey, null),
+    worldId: normalizeText(feedbackMark.worldId, null),
+    giverAgentId: normalizeText(feedbackMark.giverAgentId, null),
+    receiverAgentId: normalizeText(feedbackMark.receiverAgentId, null),
+    sourceTurnId: normalizeText(feedbackMark.sourceTurnId, null),
+    sourceDeliveryId: normalizeText(feedbackMark.sourceDeliveryId, null),
+    token: normalizeText(feedbackMark.token, null),
+    sentiment: normalizeSentiment(feedbackMark.sentiment, null),
+    source: normalizeText(feedbackMark.source, 'reply_control_token'),
+    status: normalizeText(feedbackMark.status, 'active'),
+    createdAt: normalizeText(feedbackMark.createdAt, null),
+    updatedAt: normalizeText(feedbackMark.updatedAt, normalizeText(feedbackMark.createdAt, null)),
+  };
+}
+
+function summarizeReceived(items = []) {
+  return {
+    likesReceived: items.filter((item) => item.sentiment === 'like').length,
+    dislikesReceived: items.filter((item) => item.sentiment === 'dislike').length,
+  };
+}
+
+export function createConversationFeedbackService({ store } = {}) {
+  if (
+    !store
+    || typeof store.createConversationFeedbackMark !== 'function'
+    || typeof store.listConversationFeedbackMarks !== 'function'
+    || typeof store.findConversationFeedbackMarkByConversationAndActors !== 'function'
+  ) {
+    throw createConfigurationError();
+  }
+
+  return {
+    parseTokens(text = '') {
+      return parseConversationFeedbackTokens(text);
+    },
+
+    async recordFeedback({
+      conversationKey,
+      worldId = null,
+      giverAgentId,
+      receiverAgentId,
+      sourceTurnId = null,
+      sourceDeliveryId = null,
+      token = null,
+      sentiment = null,
+    } = {}) {
+      const normalizedConversationKey = normalizeText(conversationKey, null);
+      if (!normalizedConversationKey) {
+        throw createInvalidConversationFeedbackError('conversationKey');
+      }
+      const normalizedGiverAgentId = normalizeText(giverAgentId, null);
+      if (!normalizedGiverAgentId) {
+        throw createInvalidConversationFeedbackError('giverAgentId');
+      }
+      const normalizedReceiverAgentId = normalizeText(receiverAgentId, null);
+      if (!normalizedReceiverAgentId) {
+        throw createInvalidConversationFeedbackError('receiverAgentId');
+      }
+      const normalizedToken = normalizeText(token, null);
+      const normalizedSentiment = normalizeSentiment(sentiment, resolveSentimentFromToken(normalizedToken));
+      if (!normalizedSentiment) {
+        throw createInvalidConversationFeedbackError('sentiment', 'sentiment must be like or dislike');
+      }
+
+      const existing = store.findConversationFeedbackMarkByConversationAndActors({
+        conversationKey: normalizedConversationKey,
+        giverAgentId: normalizedGiverAgentId,
+        receiverAgentId: normalizedReceiverAgentId,
+      });
+      if (existing) {
+        return {
+          recorded: false,
+          deduped: true,
+          feedbackMark: projectFeedbackMark(existing),
+        };
+      }
+
+      const feedbackMark = await store.createConversationFeedbackMark({
+        conversationKey: normalizedConversationKey,
+        worldId: normalizeText(worldId, null),
+        giverAgentId: normalizedGiverAgentId,
+        receiverAgentId: normalizedReceiverAgentId,
+        sourceTurnId: normalizeText(sourceTurnId, null),
+        sourceDeliveryId: normalizeText(sourceDeliveryId, null),
+        token: normalizedToken || `[[${normalizedSentiment}]]`,
+        sentiment: normalizedSentiment,
+        source: 'reply_control_token',
+        status: 'active',
+      });
+
+      return {
+        recorded: true,
+        deduped: false,
+        feedbackMark: projectFeedbackMark(feedbackMark),
+      };
+    },
+
+    listFeedbackMarks(filters = {}) {
+      return store.listConversationFeedbackMarks(filters).map((item) => projectFeedbackMark(item));
+    },
+
+    summarizeConversation({ conversationKey, viewerAgentId = null } = {}) {
+      const normalizedConversationKey = normalizeText(conversationKey, null);
+      const normalizedViewerAgentId = normalizeText(viewerAgentId, null);
+      const items = normalizedConversationKey
+        ? this.listFeedbackMarks({ conversationKey: normalizedConversationKey, status: 'active' })
+        : [];
+      const viewerGave = normalizedViewerAgentId
+        ? items.find((item) => item.giverAgentId === normalizedViewerAgentId)?.sentiment || null
+        : null;
+      const viewerReceived = normalizedViewerAgentId
+        ? items.find((item) => item.receiverAgentId === normalizedViewerAgentId)?.sentiment || null
+        : null;
+      return {
+        likeCount: items.filter((item) => item.sentiment === 'like').length,
+        dislikeCount: items.filter((item) => item.sentiment === 'dislike').length,
+        viewerGave,
+        viewerReceived,
+      };
+    },
+
+    summarizeAgent({ agentId } = {}) {
+      const normalizedAgentId = normalizeText(agentId, null);
+      if (!normalizedAgentId) {
+        return {
+          totalLikesReceived: 0,
+          totalDislikesReceived: 0,
+          totalLikesGiven: 0,
+          totalDislikesGiven: 0,
+        };
+      }
+      const received = this.listFeedbackMarks({
+        receiverAgentId: normalizedAgentId,
+        status: 'active',
+      });
+      const given = this.listFeedbackMarks({
+        giverAgentId: normalizedAgentId,
+        status: 'active',
+      });
+
+      return {
+        totalLikesReceived: received.filter((item) => item.sentiment === 'like').length,
+        totalDislikesReceived: received.filter((item) => item.sentiment === 'dislike').length,
+        totalLikesGiven: given.filter((item) => item.sentiment === 'like').length,
+        totalDislikesGiven: given.filter((item) => item.sentiment === 'dislike').length,
+      };
+    },
+
+    summarizeWorldAgent({ worldId, agentId } = {}) {
+      const normalizedWorldId = normalizeText(worldId, null);
+      const normalizedAgentId = normalizeText(agentId, null);
+      if (!normalizedWorldId || !normalizedAgentId) {
+        return {
+          likesReceived: 0,
+          dislikesReceived: 0,
+        };
+      }
+      return summarizeReceived(this.listFeedbackMarks({
+        worldId: normalizedWorldId,
+        receiverAgentId: normalizedAgentId,
+        status: 'active',
+      }));
+    },
+
+    summarizeWorld({ worldId } = {}) {
+      const normalizedWorldId = normalizeText(worldId, null);
+      if (!normalizedWorldId) {
+        return {
+          totalLikes: 0,
+          totalDislikes: 0,
+        };
+      }
+      const items = this.listFeedbackMarks({
+        worldId: normalizedWorldId,
+        status: 'active',
+      });
+      return {
+        totalLikes: items.filter((item) => item.sentiment === 'like').length,
+        totalDislikes: items.filter((item) => item.sentiment === 'dislike').length,
+      };
+    },
+  };
+}

package/src/product-shell/feedback/feedback-routes.js

@@ -57,7 +57,6 @@ export function registerFeedbackRoutes(app, { store, feedbackService }) {
         turnId: req.body?.turnId,
         deliveryId: req.body?.deliveryId,
         targetAgentId: req.body?.targetAgentId,
-        targetAgentCode: req.body?.targetAgentCode,
         tags: req.body?.tags,
         metadata: req.body?.metadata,
         context: req.body?.context,

package/src/product-shell/feedback/feedback-service.js

@@ -2,6 +2,7 @@ import {
   FEEDBACK_CATEGORY_VALUES,
   FEEDBACK_IMPACT_VALUES,
 } from './feedback-contract.js';
+import { resolvePublicIdentity } from '../../lib/public-identity.js';
 
 function normalizeText(value, fallback = null) {
   if (value == null) return fallback;
@@ -111,13 +112,11 @@ function projectFeedback(feedback = {}) {
     reporter: feedback.reporter && typeof feedback.reporter === 'object'
       ? {
           agentId: feedback.reporter.agentId || null,
-          agentCode: feedback.reporter.agentCode || null,
-          address: feedback.reporter.address || null,
+          publicIdentity: feedback.reporter.publicIdentity || null,
         }
       : {
           agentId: null,
-          agentCode: null,
-          address: null,
+          publicIdentity: null,
         },
     context: feedback.context && typeof feedback.context === 'object'
       ? {
@@ -126,7 +125,6 @@ function projectFeedback(feedback = {}) {
           turnId: feedback.context.turnId || null,
           deliveryId: feedback.context.deliveryId || null,
           targetAgentId: feedback.context.targetAgentId || null,
-          targetAgentCode: feedback.context.targetAgentCode || null,
           tags: Array.isArray(feedback.context.tags) ? feedback.context.tags : [],
           metadata: feedback.context.metadata && typeof feedback.context.metadata === 'object'
             ? feedback.context.metadata
@@ -138,7 +136,6 @@ function projectFeedback(feedback = {}) {
           turnId: null,
           deliveryId: null,
           targetAgentId: null,
-          targetAgentCode: null,
           tags: [],
           metadata: {},
         },
@@ -178,8 +175,7 @@ export function createFeedbackService({ store } = {}) {
         accountId: normalizeText(input.accountId, null),
         reporter: {
           agentId: reporter.agentId,
-          agentCode: reporter.agentCode,
-          address: reporter.address,
+          publicIdentity: resolvePublicIdentity(reporter),
         },
         context: {
           worldId: normalizeText(input.worldId, normalizeText(context.worldId, null)),
@@ -187,7 +183,6 @@ export function createFeedbackService({ store } = {}) {
           turnId: normalizeText(input.turnId, normalizeText(context.turnId, null)),
           deliveryId: normalizeText(input.deliveryId, normalizeText(context.deliveryId, null)),
           targetAgentId: normalizeText(input.targetAgentId, normalizeText(context.targetAgentId, null)),
-          targetAgentCode: normalizeText(input.targetAgentCode, normalizeText(context.targetAgentCode, null)),
           tags: normalizeStringList(input.tags || context.tags),
           metadata: normalizePlainObject(input.metadata && Object.keys(input.metadata || {}).length > 0 ? input.metadata : context.metadata),
         },