@xfxstudio/claworld 0.2.12 → 0.2.13

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

@@ -1,16 +1,16 @@
 import {
-  CLAWORLD_DOCTOR_COMMAND,
-  CLAWORLD_INSTALLER_COMMAND,
   CLAWORLD_INSTALLER_PACKAGE_NAME,
   CLAWORLD_OPENCLAW_MIN_HOST_VERSION,
-  CLAWORLD_UNINSTALL_COMMAND,
-  CLAWORLD_UPDATE_COMMAND,
 } from '../../openclaw/installer/constants.js';
 
 const DEFAULT_INSTALL_CHANNEL_ID = 'claworld';
 const DEFAULT_INSTALL_ACCOUNT_ID = 'claworld';
 const DEFAULT_INSTALL_LOCAL_AGENT_ID = 'main';
 const DEFAULT_ACTIVATION_DISPLAY_NAME = 'Claworld Agent';
+const CLAWORLD_HOST_NATIVE_INSTALL_COMMAND = `openclaw plugins install ${CLAWORLD_INSTALLER_PACKAGE_NAME}`;
+const CLAWORLD_HOST_NATIVE_SETUP_COMMAND = 'openclaw channels add --channel claworld';
+const CLAWORLD_HOST_NATIVE_ONBOARD_COMMAND = 'openclaw onboard';
+const CLAWORLD_HOST_NATIVE_INSPECT_COMMAND = 'openclaw plugins info claworld';
 
 function normalizeText(value, fallback = null) {
   if (value == null) return fallback;
@@ -107,15 +107,15 @@ export function createOnboardingService({ worldService, store = null } = {}) {
         product: 'claworld',
         mode: 'agent_install',
         installer: {
-          command: CLAWORLD_INSTALLER_COMMAND,
+          command: CLAWORLD_HOST_NATIVE_INSTALL_COMMAND,
           packageName: CLAWORLD_INSTALLER_PACKAGE_NAME,
           minHostVersion: CLAWORLD_OPENCLAW_MIN_HOST_VERSION,
-          canonicalFlow: 'installer_first',
+          canonicalFlow: 'host_native_setup',
           lifecycle: {
-            install: CLAWORLD_INSTALLER_COMMAND,
-            doctor: CLAWORLD_DOCTOR_COMMAND,
-            update: CLAWORLD_UPDATE_COMMAND,
-            uninstall: CLAWORLD_UNINSTALL_COMMAND,
+            install: CLAWORLD_HOST_NATIVE_INSTALL_COMMAND,
+            configure: CLAWORLD_HOST_NATIVE_SETUP_COMMAND,
+            onboard: CLAWORLD_HOST_NATIVE_ONBOARD_COMMAND,
+            inspect: CLAWORLD_HOST_NATIVE_INSPECT_COMMAND,
           },
         },
         plugin: {
@@ -139,10 +139,11 @@ export function createOnboardingService({ worldService, store = null } = {}) {
         },
         compatibility: {
           nativeOpenclaw: {
-            status: 'compatibility_only',
+            status: 'preferred',
             commands: [
-              'openclaw onboard',
-              'openclaw channels add claworld --app-token <token>',
+              CLAWORLD_HOST_NATIVE_INSTALL_COMMAND,
+              CLAWORLD_HOST_NATIVE_SETUP_COMMAND,
+              CLAWORLD_HOST_NATIVE_ONBOARD_COMMAND,
             ],
           },
         },
@@ -160,14 +161,14 @@ export function createOnboardingService({ worldService, store = null } = {}) {
           expectedBinding: 'runtime_bound_by_app_token',
         },
         steps: [
-          `run ${CLAWORLD_INSTALLER_COMMAND}`,
-          'installer validates OpenClaw availability and minimum host version',
-          'installer verifies or installs the claworld OpenClaw plugin package',
-          'installer writes or refreshes the managed claworld channel config and binds it to the local main agent by default',
-          'installer reloads or starts the runtime and verifies the managed channel shape without requiring backend activation',
-          'first-run readiness goes through claworld_pair_agent and then claworld_profile with action=update_identity',
-          'claworld_profile(action=update_identity) performs activation when needed and completes the public displayName#code identity',
-          `ongoing lifecycle uses ${CLAWORLD_UPDATE_COMMAND} for tracked package updates plus managed repair, then ${CLAWORLD_DOCTOR_COMMAND} for health confirmation`,
+          `run ${CLAWORLD_HOST_NATIVE_INSTALL_COMMAND}`,
+          `configure one account with ${CLAWORLD_HOST_NATIVE_SETUP_COMMAND} or ${CLAWORLD_HOST_NATIVE_ONBOARD_COMMAND}`,
+          'host-native setup writes or refreshes the claworld channel config and binding without requiring backend activation',
+          `inspect plugin install state with ${CLAWORLD_HOST_NATIVE_INSPECT_COMMAND} when setup needs verification`,
+          'ask once for the desired public display name after setup completes',
+          'claworld_profile(action=update_identity) performs activation when needed, persists the returned appToken, and completes the public displayName#code identity',
+          'use claworld_pair_agent when runtime readiness still looks unhealthy after setup or initialization',
+          'ongoing package updates and removal stay on the OpenClaw host plugin lifecycle instead of a plugin-owned installer CLI',
         ],
         recommendedWorlds,
         status: 'ready',
@@ -181,10 +182,11 @@ export function createOnboardingService({ worldService, store = null } = {}) {
       return {
         selectedWorld: selectedWorld ? { worldId: selectedWorld.worldId, displayName: selectedWorld.displayName } : null,
         actions: [
-          'install the claworld plugin and write the managed config shape',
-          'run claworld_pair_agent to confirm readiness after install',
-          'if public identity is pending, call claworld_profile with action=update_identity',
-          'claworld_profile(action=update_identity) activates the backend binding when needed and persists the returned appToken',
+          'install the claworld plugin through the OpenClaw host',
+          'configure the claworld channel account and local binding through host-native setup',
+          'ask once for the desired public display name',
+          'call claworld_profile with action=update_identity to finish activation and public naming',
+          'use claworld_pair_agent only when the runtime still needs diagnosis after setup or initialization',
           'collect required world profile fields',
           'validate world membership eligibility',
           'start the first A2A loop or deliver world content',

package/bin/claworld.mjs

@@ -1,9 +0,0 @@
-#!/usr/bin/env node
-
-import { runInstallerCli } from '../src/openclaw/installer/cli.js';
-
-runInstallerCli().catch((error) => {
-  console.error('Claworld CLI failed');
-  console.error(error.message || error);
-  process.exit(1);
-});

package/src/openclaw/installer/cli.js

@@ -1,406 +0,0 @@
-import os from 'os';
-import path from 'path';
-import {
-  expandUserPath,
-} from '../plugin/managed-config.js';
-import {
-  CLAWORLD_DOCTOR_COMMAND,
-  CLAWORLD_INSTALLER_BIN_NAME,
-  CLAWORLD_INSTALLER_COMMAND,
-  CLAWORLD_INSTALLER_DEFAULT_PLUGIN_SOURCE,
-  CLAWORLD_UNINSTALL_COMMAND,
-  CLAWORLD_UPDATE_COMMAND,
-} from './constants.js';
-import { formatClaworldDoctorReport, runClaworldDoctor } from './doctor.js';
-import {
-  DEFAULT_OPENCLAW_BIN,
-  DEFAULT_OPENCLAW_CONFIG_PATH,
-  runClaworldInstallerInstall,
-  runClaworldInstallerUninstall,
-  runClaworldInstallerUpdate,
-} from './core.js';
-
-function resolveCliHomeDir(env = process.env) {
-  const envHomeDir = String(
-    env.HOME
-    || env.USERPROFILE
-    || (
-      env.HOMEDRIVE && env.HOMEPATH
-        ? path.join(env.HOMEDRIVE, env.HOMEPATH)
-        : ''
-    ),
-  ).trim();
-  return envHomeDir || os.homedir();
-}
-
-function printHelp() {
-  console.log(`Usage: ${CLAWORLD_INSTALLER_BIN_NAME} <command> [options]
-
-Commands:
-  install                     Run the installer-first Claworld setup flow
-  doctor                      Validate the managed Claworld install health
-  update                      Update the tracked Claworld plugin, refresh managed state, and run doctor
-  uninstall                   Safely remove the managed Claworld runtime and uninstall the plugin
-  upgrade                     Alias for update
-  help                        Show this help
-
-Install options:
-  --config <path>             OpenClaw config path (default: ${DEFAULT_OPENCLAW_CONFIG_PATH})
-  --state-dir <path>          Optional OPENCLAW_STATE_DIR for OpenClaw commands
-  --openclaw-bin <path>       OpenClaw CLI binary (default: ${DEFAULT_OPENCLAW_BIN})
-  --server-url <url>          Override the Claworld backend URL
-  --api-key <value>           Override the Claworld backend API key
-  --account-id <id>           Managed Claworld account id (default: claworld)
-  --agent-id <id>             Local OpenClaw agent id to bind claworld onto (default: main)
-  --workspace <path>          Optional dedicated workspace path for claworld-specific bootstrap files
-  --display-name <name>       Managed display name override
-  --tool-profile <profile>    minimal | default | full | world
-  --repo-root <path>          Local repo root when using --plugin-install-mode link|copy
-  --plugin-install-mode <m>   npm | link | copy | skip (default: npm)
-  --plugin-source <value>     npm package or local path (default: ${CLAWORLD_INSTALLER_DEFAULT_PLUGIN_SOURCE})
-Update options:
-  --config <path>             OpenClaw config path (default: ${DEFAULT_OPENCLAW_CONFIG_PATH})
-  --state-dir <path>          Optional OPENCLAW_STATE_DIR for OpenClaw commands
-  --openclaw-bin <path>       OpenClaw CLI binary (default: ${DEFAULT_OPENCLAW_BIN})
-  --server-url <url>          Override the Claworld backend URL
-  --api-key <value>           Override the Claworld backend API key
-  --account-id <id>           Managed Claworld account id (default: claworld)
-  --agent-id <id>             Local OpenClaw agent id bound to claworld (default: main)
-  --workspace <path>          Optional dedicated workspace path for claworld-specific bootstrap files
-  --display-name <name>       Managed display name override
-  --tool-profile <profile>    minimal | default | full | world
-Doctor options:
-  --config <path>             OpenClaw config path (default: ${DEFAULT_OPENCLAW_CONFIG_PATH})
-  --state-dir <path>          Optional OPENCLAW_STATE_DIR for OpenClaw commands
-  --openclaw-bin <path>       OpenClaw CLI binary (default: ${DEFAULT_OPENCLAW_BIN})
-  --server-url <url>          Override the Claworld backend URL
-  --account-id <id>           Managed Claworld account id (default: claworld)
-  --agent-id <id>             Local OpenClaw agent id bound to claworld (default: main)
-  --workspace <path>          Optional dedicated workspace path override
-Uninstall options:
-  --config <path>             OpenClaw config path (default: ${DEFAULT_OPENCLAW_CONFIG_PATH})
-  --state-dir <path>          Optional OPENCLAW_STATE_DIR for OpenClaw commands
-  --openclaw-bin <path>       OpenClaw CLI binary (default: ${DEFAULT_OPENCLAW_BIN})
-  --account-id <id>           Managed Claworld account id (default: claworld)
-  --agent-id <id>             Local OpenClaw agent id bound to claworld (default: main)
-  --json                      Print machine-readable result
-  --help, -h                  Show this help
-
-Canonical commands:
-  ${CLAWORLD_INSTALLER_COMMAND}
-  ${CLAWORLD_DOCTOR_COMMAND}
-  ${CLAWORLD_UPDATE_COMMAND}
-  ${CLAWORLD_UNINSTALL_COMMAND}
-`);
-}
-
-function nextValue(argv, index) {
-  if (index + 1 >= argv.length) {
-    throw new Error(`Missing value for ${argv[index]}`);
-  }
-  return argv[index + 1];
-}
-
-export function parseInstallerCliArgs(argv = process.argv.slice(2), env = process.env) {
-  const homeDir = resolveCliHomeDir(env);
-  const options = {
-    command: null,
-    json: false,
-    install: {
-      openclawBin: env.OPENCLAW_BIN || DEFAULT_OPENCLAW_BIN,
-      configPath: expandUserPath(env.OPENCLAW_CONFIG_PATH || DEFAULT_OPENCLAW_CONFIG_PATH, homeDir),
-      stateDir: env.OPENCLAW_STATE_DIR ? expandUserPath(env.OPENCLAW_STATE_DIR, homeDir) : null,
-      serverUrl: null,
-      apiKey: null,
-      accountId: 'claworld',
-      agentId: 'main',
-      workspace: null,
-      displayName: null,
-      repoRoot: null,
-      pluginInstallMode: 'npm',
-      pluginInstallSource: CLAWORLD_INSTALLER_DEFAULT_PLUGIN_SOURCE,
-      toolProfile: null,
-    },
-    update: {
-      openclawBin: env.OPENCLAW_BIN || DEFAULT_OPENCLAW_BIN,
-      configPath: expandUserPath(env.OPENCLAW_CONFIG_PATH || DEFAULT_OPENCLAW_CONFIG_PATH, homeDir),
-      stateDir: env.OPENCLAW_STATE_DIR ? expandUserPath(env.OPENCLAW_STATE_DIR, homeDir) : null,
-      serverUrl: null,
-      apiKey: null,
-      accountId: 'claworld',
-      agentId: 'main',
-      workspace: null,
-      displayName: null,
-      pluginInstallSource: CLAWORLD_INSTALLER_DEFAULT_PLUGIN_SOURCE,
-      toolProfile: null,
-    },
-    doctor: {
-      openclawBin: env.OPENCLAW_BIN || DEFAULT_OPENCLAW_BIN,
-      configPath: expandUserPath(env.OPENCLAW_CONFIG_PATH || DEFAULT_OPENCLAW_CONFIG_PATH, homeDir),
-      stateDir: env.OPENCLAW_STATE_DIR ? expandUserPath(env.OPENCLAW_STATE_DIR, homeDir) : null,
-      serverUrl: null,
-      accountId: 'claworld',
-      agentId: 'main',
-      workspace: null,
-    },
-    uninstall: {
-      openclawBin: env.OPENCLAW_BIN || DEFAULT_OPENCLAW_BIN,
-      configPath: expandUserPath(env.OPENCLAW_CONFIG_PATH || DEFAULT_OPENCLAW_CONFIG_PATH, homeDir),
-      stateDir: env.OPENCLAW_STATE_DIR ? expandUserPath(env.OPENCLAW_STATE_DIR, homeDir) : null,
-      accountId: 'claworld',
-      agentId: 'main',
-    },
-  };
-
-  if (argv.length === 0) {
-    printHelp();
-    return { ...options, command: 'help' };
-  }
-
-  options.command = argv[0] === 'upgrade' ? 'update' : argv[0];
-  const remaining = argv.slice(1);
-
-  for (let index = 0; index < remaining.length; index += 1) {
-    const arg = remaining[index];
-    switch (arg) {
-      case '--config':
-        options.install.configPath = expandUserPath(nextValue(remaining, index), homeDir);
-        options.update.configPath = options.install.configPath;
-        options.doctor.configPath = options.install.configPath;
-        options.uninstall.configPath = options.install.configPath;
-        index += 1;
-        break;
-      case '--state-dir':
-        options.install.stateDir = expandUserPath(nextValue(remaining, index), homeDir);
-        options.update.stateDir = options.install.stateDir;
-        options.doctor.stateDir = options.install.stateDir;
-        options.uninstall.stateDir = options.install.stateDir;
-        index += 1;
-        break;
-      case '--openclaw-bin':
-        options.install.openclawBin = nextValue(remaining, index);
-        options.update.openclawBin = options.install.openclawBin;
-        options.doctor.openclawBin = options.install.openclawBin;
-        options.uninstall.openclawBin = options.install.openclawBin;
-        index += 1;
-        break;
-      case '--server-url':
-        options.install.serverUrl = nextValue(remaining, index);
-        options.update.serverUrl = options.install.serverUrl;
-        options.doctor.serverUrl = options.install.serverUrl;
-        index += 1;
-        break;
-      case '--api-key':
-        options.install.apiKey = nextValue(remaining, index);
-        options.update.apiKey = options.install.apiKey;
-        index += 1;
-        break;
-      case '--account-id':
-        options.install.accountId = nextValue(remaining, index);
-        options.update.accountId = options.install.accountId;
-        options.doctor.accountId = options.install.accountId;
-        options.uninstall.accountId = options.install.accountId;
-        index += 1;
-        break;
-      case '--agent-id':
-        options.install.agentId = nextValue(remaining, index);
-        options.update.agentId = options.install.agentId;
-        options.doctor.agentId = options.install.agentId;
-        options.uninstall.agentId = options.install.agentId;
-        index += 1;
-        break;
-      case '--workspace':
-        options.install.workspace = expandUserPath(nextValue(remaining, index), homeDir);
-        options.update.workspace = options.install.workspace;
-        options.doctor.workspace = options.install.workspace;
-        index += 1;
-        break;
-      case '--display-name':
-        options.install.displayName = nextValue(remaining, index);
-        options.update.displayName = options.install.displayName;
-        index += 1;
-        break;
-      case '--tool-profile':
-        options.install.toolProfile = nextValue(remaining, index);
-        options.update.toolProfile = options.install.toolProfile;
-        index += 1;
-        break;
-      case '--repo-root':
-        options.install.repoRoot = path.resolve(expandUserPath(nextValue(remaining, index), homeDir));
-        index += 1;
-        break;
-      case '--plugin-install-mode':
-        options.install.pluginInstallMode = nextValue(remaining, index);
-        index += 1;
-        break;
-      case '--plugin-source':
-        options.install.pluginInstallSource = nextValue(remaining, index);
-        options.update.pluginInstallSource = options.install.pluginInstallSource;
-        index += 1;
-        break;
-      case '--json':
-        options.json = true;
-        break;
-      case '--help':
-      case '-h':
-        printHelp();
-        return { ...options, command: 'help' };
-      default:
-        throw new Error(`Unknown argument: ${arg}`);
-    }
-  }
-
-  if (!['install', 'update', 'uninstall', 'doctor', 'help'].includes(options.command)) {
-    throw new Error(`Unknown command: ${options.command}`);
-  }
-  if (options.command === 'install' && !['npm', 'link', 'copy', 'skip'].includes(options.install.pluginInstallMode)) {
-    throw new Error(`Unsupported plugin install mode: ${options.install.pluginInstallMode}`);
-  }
-  if (
-    options.command === 'install'
-    && options.install.pluginInstallMode !== 'npm'
-    && !options.install.repoRoot
-    && !options.install.pluginInstallSource
-  ) {
-    throw new Error('Local plugin install mode requires --repo-root or --plugin-source.');
-  }
-  if (
-    options.command === 'install'
-    && options.install.pluginInstallMode === 'link'
-    && !options.install.repoRoot
-    && options.install.pluginInstallSource === CLAWORLD_INSTALLER_DEFAULT_PLUGIN_SOURCE
-  ) {
-    throw new Error('Link install mode requires --repo-root or --plugin-source <local-path>.');
-  }
-  if (
-    options.command === 'install'
-    && options.install.pluginInstallMode === 'copy'
-    && !options.install.repoRoot
-    && options.install.pluginInstallSource === CLAWORLD_INSTALLER_DEFAULT_PLUGIN_SOURCE
-  ) {
-    throw new Error('Copy install mode requires --repo-root or --plugin-source <local-path>.');
-  }
-
-  if (
-    options.command === 'install'
-    && options.install.pluginInstallMode !== 'npm'
-    && options.install.repoRoot
-    && options.install.pluginInstallSource === CLAWORLD_INSTALLER_DEFAULT_PLUGIN_SOURCE
-  ) {
-    options.install.pluginInstallSource = options.install.repoRoot;
-  }
-
-  return options;
-}
-
-function printInstallSummary(result) {
-  console.log('');
-  console.log('Claworld installer complete');
-  console.log('===========================');
-  console.log(`Managed account:    ${result.transformed?.config?.channels?.claworld?.defaultAccount || 'claworld'}`);
-  console.log(`OpenClaw version:   ${result.host?.version || '(unknown)'}`);
-  console.log(`Plugin action:      ${result.plugin?.action || 'unknown'}`);
-  console.log(`Activation:         ${result.activationStatus === 'ready' ? 'ready' : 'pending via claworld_profile'}`);
-  console.log(`Runtime refresh:    ${result.runtimeRefresh?.action || 'unknown'}`);
-  console.log(`Config path:        ${result.configPath}`);
-  console.log(`Backup path:        ${result.backupPath || '(unchanged or new file)'}`);
-  console.log('');
-}
-
-function printUpdateSummary(result, doctorResult) {
-  const trackedInstall = result.plugin?.trackedInstall || null;
-  const trackedSummary = trackedInstall?.tracked
-    ? `${trackedInstall.source || 'tracked'}${trackedInstall.spec ? ` (${trackedInstall.spec})` : ''}`
-    : 'not recorded';
-  console.log('');
-  console.log('Claworld update complete');
-  console.log('========================');
-  console.log(`Managed account:    ${result.managedOptions?.accountId || 'claworld'}`);
-  console.log(`OpenClaw version:   ${result.host?.version || '(unknown)'}`);
-  console.log(`Plugin action:      ${result.plugin?.action || 'unknown'}`);
-  console.log(`Tracked install:    ${trackedSummary}`);
-  console.log(`Activation:         ${result.activationStatus === 'ready' ? 'ready' : 'pending via claworld_profile'}`);
-  console.log(`Runtime refresh:    ${result.runtimeRefresh?.action || 'unknown'}`);
-  console.log(`Doctor status:      ${doctorResult?.status || 'unknown'}`);
-  console.log(`Config path:        ${result.configPath}`);
-  console.log(`Backup path:        ${result.backupPath || '(unchanged or new file)'}`);
-  console.log('');
-}
-
-function printUninstallSummary(result) {
-  console.log('');
-  console.log('Claworld uninstall complete');
-  console.log('===========================');
-  console.log(`Managed account:    ${result.transformed?.backup?.accountId || 'claworld'}`);
-  console.log(`OpenClaw version:   ${result.host?.version || '(unknown)'}`);
-  console.log(`Plugin action:      ${result.plugin?.action || 'unknown'}`);
-  console.log(`Runtime refresh:    ${result.runtimeRefresh?.action || 'unknown'}`);
-  console.log(`Config path:        ${result.configPath}`);
-  console.log(`Backup path:        ${result.backupPath || '(unchanged or new file)'}`);
-  console.log('');
-}
-
-export async function runInstallerCli(argv = process.argv.slice(2), env = process.env) {
-  const parsed = parseInstallerCliArgs(argv, env);
-  if (parsed.command === 'help') {
-    return { ok: true, command: 'help' };
-  }
-
-  if (parsed.command === 'install') {
-    const result = await runClaworldInstallerInstall(parsed.install);
-    if (parsed.json) {
-      console.log(JSON.stringify(result, null, 2));
-    } else {
-      printInstallSummary(result);
-    }
-    return result;
-  }
-
-  if (parsed.command === 'update') {
-    const result = await runClaworldInstallerUpdate(parsed.update);
-    const doctorResult = await runClaworldDoctor({
-      ...parsed.doctor,
-      configPath: result.configPath,
-      stateDir: result.stateDir,
-      serverUrl: result.effectiveServerUrl || parsed.doctor.serverUrl,
-      accountId: result.managedOptions?.accountId || parsed.doctor.accountId,
-      agentId: result.managedOptions?.agentId || parsed.doctor.agentId,
-      workspace: result.managedOptions?.workspace || parsed.doctor.workspace,
-    });
-    if (parsed.json) {
-      console.log(JSON.stringify({ ...result, doctor: doctorResult }, null, 2));
-    } else {
-      printUpdateSummary(result, doctorResult);
-      process.stdout.write(formatClaworldDoctorReport(doctorResult));
-    }
-    if (!doctorResult.ok) {
-      process.exitCode = 1;
-    }
-    return {
-      ...result,
-      doctor: doctorResult,
-      ok: doctorResult.ok,
-    };
-  }
-
-  if (parsed.command === 'uninstall') {
-    const result = await runClaworldInstallerUninstall(parsed.uninstall);
-    if (parsed.json) {
-      console.log(JSON.stringify(result, null, 2));
-    } else {
-      printUninstallSummary(result);
-    }
-    return result;
-  }
-
-  const result = await runClaworldDoctor(parsed.doctor);
-  if (parsed.json) {
-    console.log(JSON.stringify(result, null, 2));
-  } else {
-    process.stdout.write(formatClaworldDoctorReport(result));
-  }
-  if (!result.ok) {
-    process.exitCode = 1;
-  }
-  return result;
-}