@xfxstudio/claworld 2026.4.22-testing.5 → 2026.4.22-testing.7

package/src/openclaw/runtime/workspace-resolver.js

@@ -0,0 +1,109 @@
+import os from 'os';
+import path from 'path';
+
+function normalizeText(value, fallback = null) {
+  if (value == null) return fallback;
+  const normalized = String(value).trim();
+  return normalized || fallback;
+}
+
+function expandUserPath(inputPath, homeDir = os.homedir()) {
+  const text = normalizeText(inputPath, null);
+  if (!text) return null;
+  if (text === '~') return homeDir;
+  if (text.startsWith('~/') || text.startsWith('~\\')) {
+    return path.join(homeDir, text.slice(2));
+  }
+  return text;
+}
+
+function isObject(value) {
+  return value && typeof value === 'object' && !Array.isArray(value);
+}
+
+export function firstWorkspaceCandidate(...sources) {
+  for (const source of sources) {
+    if (!isObject(source)) continue;
+    const candidates = [
+      source.workspaceRoot,
+      source.workspaceDir,
+      source.workspacePath,
+      source.workspace,
+      source.cwd,
+      source.agent?.workspaceRoot,
+      source.agent?.workspaceDir,
+      source.agent?.workspace,
+      source.context?.workspaceRoot,
+      source.context?.workspaceDir,
+      source.context?.workspace,
+      source.session?.workspaceRoot,
+      source.session?.workspaceDir,
+      source.session?.workspace,
+    ];
+    for (const candidate of candidates) {
+      const normalized = normalizeText(candidate, null);
+      if (normalized) return normalized;
+    }
+  }
+  return null;
+}
+
+export function resolveOpenClawAgentId(...sources) {
+  for (const source of sources) {
+    if (!isObject(source)) continue;
+    const candidates = [
+      source.agentId,
+      source.localAgentId,
+      source.agent?.id,
+      source.agent?.agentId,
+      source.context?.agentId,
+      source.context?.localAgentId,
+      source.session?.agentId,
+      source.session?.localAgentId,
+    ];
+    for (const candidate of candidates) {
+      const normalized = normalizeText(candidate, null);
+      if (normalized) return normalized;
+    }
+  }
+  return null;
+}
+
+export function resolveAgentConfigEntry(config = {}, agentId = null) {
+  const normalizedAgentId = normalizeText(agentId, null);
+  if (!normalizedAgentId || !isObject(config?.agents)) return null;
+
+  const list = config.agents.list;
+  if (Array.isArray(list)) {
+    const arrayEntry = list.find((entry) => (
+      isObject(entry)
+      && normalizeText(entry.id ?? entry.agentId ?? entry.name, null) === normalizedAgentId
+    ));
+    if (arrayEntry) return arrayEntry;
+  } else if (isObject(list) && isObject(list[normalizedAgentId])) {
+    return list[normalizedAgentId];
+  }
+
+  const directEntry = config.agents[normalizedAgentId];
+  return isObject(directEntry) ? directEntry : null;
+}
+
+export function resolveOpenClawWorkspaceCandidate({
+  sources = [],
+  config = {},
+  agentId = null,
+} = {}) {
+  const sourceList = Array.isArray(sources) ? sources : [sources];
+  const directCandidate = firstWorkspaceCandidate(...sourceList);
+  if (directCandidate) return directCandidate;
+
+  const resolvedAgentId = normalizeText(agentId, null) || resolveOpenClawAgentId(...sourceList);
+  const agentEntry = resolveAgentConfigEntry(config, resolvedAgentId);
+  return firstWorkspaceCandidate(agentEntry, config?.agents?.defaults);
+}
+
+export function resolveOpenClawWorkspaceRoot(input = {}, homeDir = os.homedir()) {
+  const candidate = resolveOpenClawWorkspaceCandidate(input);
+  const expanded = expandUserPath(candidate, homeDir);
+  return expanded ? path.resolve(expanded) : null;
+}

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

@@ -167,7 +167,12 @@ function normalizeWorldBroadcastFailureItem(item = {}) {
 
 function normalizeWorldBroadcastResponse(payload = {}) {
   return {
+    accepted: payload.accepted === true,
     status: normalizeText(payload.status, null),
+    commandId: normalizeText(payload.commandId, null),
+    command: payload.command && typeof payload.command === 'object' && !Array.isArray(payload.command)
+      ? payload.command
+      : null,
     worldId: normalizeText(payload.worldId, null),
     senderAgentId: normalizeText(payload.senderAgentId, null),
     senderRole: normalizeWorldRole(payload.senderRole, null),
@@ -175,6 +180,7 @@ function normalizeWorldBroadcastResponse(payload = {}) {
     excludeSelf: normalizeOptionalBoolean(payload.excludeSelf, null),
     eligibility: normalizeText(payload.eligibility, null),
     broadcastId: normalizeText(payload.broadcastId, null),
+    fanoutStatus: normalizeText(payload.fanoutStatus, null),
     totalTargets: normalizeOptionalInteger(payload.totalTargets, null),
     createdCount: normalizeOptionalInteger(payload.createdCount, null),
     failedCount: normalizeOptionalInteger(payload.failedCount, null),
@@ -504,5 +510,9 @@ export async function broadcastModeratedWorld({
     });
   }
 
-  return normalizeWorldBroadcastResponse(result.body);
+  return normalizeWorldBroadcastResponse({
+    ...result.body,
+    worldId: resolvedWorldId,
+    senderAgentId: resolvedAgentId,
+  });
 }

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

@@ -22,11 +22,14 @@ function normalizeStringList(values = []) {
 }
 
 function normalizeBroadcastConfig(broadcast = {}) {
+  const normalized = broadcast && typeof broadcast === 'object' && !Array.isArray(broadcast)
+    ? broadcast
+    : {};
   return {
-    enabled: broadcast.enabled === true,
-    audience: normalizeText(broadcast.audience, 'members'),
-    replyPolicy: normalizeText(broadcast.replyPolicy, 'zero'),
-    excludeSelf: broadcast.excludeSelf !== false,
+    enabled: normalized.enabled === true,
+    audience: normalizeText(normalized.audience, 'members'),
+    replyPolicy: normalizeText(normalized.replyPolicy, 'zero'),
+    excludeSelf: normalized.excludeSelf !== false,
   };
 }