@xfxstudio/claworld 0.2.14 → 0.2.16

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

@@ -3,12 +3,6 @@ import {
   normalizeRuntimeRegistration,
   resolveRuntimeAppToken,
 } from './account-identity.js';
-import {
-  CHAT_REQUEST_APPROVAL_POLICY_MODES,
-  CHAT_REQUEST_APPROVAL_POLICY_ORIGIN_TYPES,
-  DEFAULT_CHAT_REQUEST_APPROVAL_POLICY_MODE,
-  normalizeChatRequestApprovalPolicy,
-} from '../../product-shell/contracts/chat-request-approval-policy.js';
 
 const REQUIRED_KEYS = ['enabled', 'serverUrl', 'apiKey', 'accountId'];
 
@@ -124,45 +118,6 @@ const SINGLE_ACCOUNT_PROPERTIES = {
       },
     },
   },
-  approval: {
-    type: 'object',
-    additionalProperties: false,
-    properties: {
-      mode: {
-        type: 'string',
-        enum: [...CHAT_REQUEST_APPROVAL_POLICY_MODES],
-        description: 'Declarative inbound chat-request approval policy for this account.',
-        default: DEFAULT_CHAT_REQUEST_APPROVAL_POLICY_MODE,
-      },
-      blocks: {
-        type: 'object',
-        additionalProperties: false,
-        properties: {
-          originTypes: {
-            type: 'array',
-            items: {
-              type: 'string',
-              enum: [...CHAT_REQUEST_APPROVAL_POLICY_ORIGIN_TYPES],
-            },
-            description: 'Optional canonical chat-request origin types that should be rejected by backend policy.',
-          },
-          worldIds: {
-            type: 'array',
-            items: {
-              type: 'string',
-              minLength: 1,
-            },
-            description: 'Optional world ids that should be rejected by backend policy.',
-          },
-        },
-      },
-      autoAccept: {
-        type: 'boolean',
-        description: 'Legacy alias. `true` maps to `approval.mode = "open"` and `false` maps to `approval.mode = "manual_review"`.',
-        default: false,
-      },
-    },
-  },
   testing: {
     type: 'object',
     additionalProperties: false,
@@ -204,7 +159,7 @@ export const claworldChannelConfigJsonSchema = {
 export const claworldChannelConfigSchema = {
   channelId: CLAWORLD_CHANNEL_ID,
   required: REQUIRED_KEYS,
-  optional: ['name', 'heartbeatSeconds', 'reconnect', 'routing', 'approval', 'testing', 'appToken', 'registration', 'relay', 'toolProfile', 'defaultAccount', 'accounts'],
+  optional: ['name', 'heartbeatSeconds', 'reconnect', 'routing', 'testing', 'appToken', 'registration', 'relay', 'toolProfile', 'defaultAccount', 'accounts'],
   jsonSchema: claworldChannelConfigJsonSchema,
   description:
     '最小 OpenClaw claworld channel 配置；支持单账号或 accounts.<id> 多账号模式。canonical flow uses appToken + registration.displayName bootstrap.',
@@ -284,12 +239,6 @@ export function validateClaworldChannelConfig(config = {}, accountId = null) {
   const errors = [];
   const registration = normalizeRuntimeRegistration(candidate);
   const appToken = resolveRuntimeAppToken(candidate);
-  const approval = normalizeChatRequestApprovalPolicy(candidate.approval, {
-    legacyAutoAccept: typeof candidate.approval?.autoAccept === 'boolean'
-      ? candidate.approval.autoAccept
-      : null,
-  });
-
   const configuredIds = listConfiguredClaworldAccountIds(config);
   const hasMultipleAccounts = configuredIds.length > 1;
   const explicitDefaultAccount = String(root?.defaultAccount || '').trim();
@@ -354,7 +303,6 @@ export function validateClaworldChannelConfig(config = {}, accountId = null) {
       fallbackTarget,
       allowHumanInterrupt: candidate.routing?.allowHumanInterrupt !== false,
     },
-    approval,
     testing: {
       allowBridgedCommandDispatch: candidate.testing?.allowBridgedCommandDispatch === true,
     },
@@ -391,7 +339,6 @@ export function inspectClaworldChannelAccount(config = {}, accountId = null) {
     heartbeatSeconds: normalized.heartbeatSeconds,
     reconnect: normalized.reconnect,
     routing: normalized.routing,
-    approval: normalized.approval,
     testing: normalized.testing,
     appToken: normalized.appToken || null,
     registration: normalized.registration,
@@ -421,7 +368,6 @@ export function resolveClaworldRuntimeConfig(config = {}, accountId = null) {
   return {
     ...result.normalized,
     accountId: result.normalized.accountId || accountId || readDefaultAccountId(config) || 'default',
-    approval: result.normalized.approval,
     relay: result.normalized.relay,
   };
 }

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

@@ -6,10 +6,6 @@ import {
   CLAWORLD_READ_ONLY_OPENCLAW_TOOL_NAMES,
   CLAWORLD_TOOL_PROFILES,
 } from '../runtime/tool-inventory.js';
-import {
-  DEFAULT_CHAT_REQUEST_APPROVAL_POLICY_MODE,
-  normalizeChatRequestApprovalMode,
-} from '../../product-shell/contracts/chat-request-approval-policy.js';
 
 export const DEFAULT_CLAWORLD_SERVER_URL = 'https://claworld.love';
 export const DEFAULT_CLAWORLD_API_KEY = 'local-test';
@@ -17,7 +13,6 @@ export const DEFAULT_CLAWORLD_AGENT_ID = 'main';
 export const DEFAULT_CLAWORLD_ACCOUNT_ID = 'claworld';
 export const DEFAULT_CLAWORLD_TOOL_PROFILE = 'default';
 export const DEFAULT_CLAWORLD_DM_SCOPE = 'per-channel-peer';
-export const DEFAULT_CLAWORLD_APPROVAL_MODE = DEFAULT_CHAT_REQUEST_APPROVAL_POLICY_MODE;
 export const DEFAULT_CLAWORLD_SESSION_TARGET = 'mainagent';
 export const DEFAULT_CLAWORLD_FALLBACK_TARGET = 'mainagent';
 export const CLAWORLD_PLUGIN_TOOL_ALLOW_ENTRY = 'claworld';
@@ -346,9 +341,6 @@ function buildManagedAccountEntry(options = {}) {
     accountId: options.accountId,
     name: normalizeText(options.name, normalizeText(options.displayName, null)),
     routing: buildManagedRoutingEntry(options),
-    approval: {
-      mode: normalizeChatRequestApprovalMode(options.approvalMode, DEFAULT_CLAWORLD_APPROVAL_MODE),
-    },
   };
 
   if (options.appToken) {
@@ -373,7 +365,6 @@ function buildManagedAccountEntry(options = {}) {
 }
 
 function buildMergedAccountEntry(existingAccount = {}, options = {}) {
-  const existingApproval = ensureObject(existingAccount.approval);
   const existingRelay = ensureObject(existingAccount.relay);
   const existingRegistration = ensureObject(existingAccount.registration);
   const merged = {
@@ -384,10 +375,6 @@ function buildMergedAccountEntry(existingAccount = {}, options = {}) {
     accountId: options.accountId,
     name: normalizeText(options.name, normalizeText(existingAccount.name, normalizeText(options.displayName, null))),
     routing: buildManagedRoutingEntry(options, existingAccount.routing),
-    approval: {
-      ...existingApproval,
-      mode: normalizeChatRequestApprovalMode(options.approvalMode, DEFAULT_CLAWORLD_APPROVAL_MODE),
-    },
     ...(options.defaultTargetAgentId
       ? {
           relay: {
@@ -589,17 +576,6 @@ export function resolveDefaultManagedDisplayName(accountId = DEFAULT_CLAWORLD_AC
   return `${titleCase(accountId)} Channel Agent`;
 }
 
-function resolveStoredApprovalMode(existingAccount = {}) {
-  const existingApproval = ensureObject(existingAccount.approval);
-  if (normalizeText(existingApproval.mode, null)) {
-    return normalizeChatRequestApprovalMode(existingApproval.mode, DEFAULT_CLAWORLD_APPROVAL_MODE);
-  }
-  if (typeof existingApproval.autoAccept === 'boolean') {
-    return existingApproval.autoAccept ? 'open' : DEFAULT_CLAWORLD_APPROVAL_MODE;
-  }
-  return DEFAULT_CLAWORLD_APPROVAL_MODE;
-}
-
 export function resolveClaworldManagedRuntimeOptions({
   cfg = {},
   accountId = null,
@@ -673,15 +649,6 @@ export function resolveClaworldManagedRuntimeOptions({
         explicitRegistrationDisplayName,
         existingRegistrationDisplayName,
       );
-  const approvalMode = normalizeChatRequestApprovalMode(
-    normalizeText(overrides.approvalMode, null),
-    typeof overrides.autoAccept === 'boolean'
-      ? (overrides.autoAccept ? 'open' : DEFAULT_CLAWORLD_APPROVAL_MODE)
-      : normalizeChatRequestApprovalMode(
-          normalizeText(existingBackup.approvalMode, null),
-          resolveStoredApprovalMode(existingAccount),
-        ),
-  );
 
   return {
     repoRoot: normalizeText(overrides.repoRoot, null),
@@ -700,7 +667,6 @@ export function resolveClaworldManagedRuntimeOptions({
     displayName,
     name,
     defaultTargetAgentId: normalizeText(overrides.defaultTargetAgentId, null),
-    approvalMode,
     sessionDmScope: normalizeText(
       overrides.sessionDmScope,
       normalizeText(existingBackup.sessionDmScope, DEFAULT_CLAWORLD_DM_SCOPE),
@@ -910,7 +876,6 @@ export function stripClaworldManagedRuntimeConfig(inputConfig = {}, {
         displayName: normalizeText(existingAccount.name, normalizeText(existingAgent?.name, null)),
         name: normalizeText(existingAccount.name, null),
         registrationDisplayName: normalizeRegistrationDisplayName(existingAccount?.registration?.displayName, null),
-        approvalMode: normalizeChatRequestApprovalMode(existingAccount?.approval?.mode, DEFAULT_CLAWORLD_APPROVAL_MODE),
         sessionDmScope: normalizeText(config?.session?.dmScope, DEFAULT_CLAWORLD_DM_SCOPE),
         toolProfile: existingToolProfile,
         preservedAt: new Date().toISOString(),