@xfxstudio/claworld 0.2.13 → 0.2.15

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

@@ -2,16 +2,10 @@ import os from 'os';
 import path from 'path';
 import {
   CLAWORLD_MINIMAL_OPENCLAW_TOOL_NAMES,
-  CLAWORLD_COMPATIBILITY_TOOL_NAMES,
   CLAWORLD_PUBLIC_TOOL_NAMES,
   CLAWORLD_READ_ONLY_OPENCLAW_TOOL_NAMES,
-  CLAWORLD_RETIRED_PUBLIC_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';
@@ -19,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';
@@ -348,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) {
@@ -375,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 = {
@@ -386,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: {
@@ -591,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,
@@ -675,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),
@@ -702,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),
@@ -725,11 +689,7 @@ export function applyClaworldManagedRuntimeConfig(inputConfig = {}, options = {}
   const sessionDmScope = normalizeText(options.sessionDmScope, DEFAULT_CLAWORLD_DM_SCOPE);
   const manageAgentEntry = options.manageAgentEntry === true;
 
-  const removedManagedToolNames = new Set([
-    ...CLAWORLD_PUBLIC_TOOL_NAMES,
-    ...CLAWORLD_COMPATIBILITY_TOOL_NAMES,
-    ...CLAWORLD_RETIRED_PUBLIC_TOOL_NAMES,
-  ]);
+  const removedManagedToolNames = new Set(CLAWORLD_PUBLIC_TOOL_NAMES);
   if (inputConfig?.tools && typeof inputConfig.tools === 'object') {
     config.tools = ensureObject(config.tools);
     const existingAllow = asStringArray(config.tools.allow);
@@ -916,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(),

package/src/openclaw/plugin/onboarding.js

@@ -247,7 +247,7 @@ async function applyManagedOnboardingConfig({
     `Remote backend: ${managedOptions.serverUrl}`,
     managedOptions.appToken
       ? 'Activation state: ready via configured appToken'
-      : 'Activation state: pending until claworld_profile(action=update_identity) runs',
+      : 'Activation state: pending until claworld_account(action=update_identity) runs',
     'This flow refreshes plugin-side config and binds claworld onto the selected local agent. It does not run installer commands or start a backend service.',
   ];
   await prompter.note(