@xfxstudio/claworld 0.2.9 → 0.2.10-beta.1

package/src/openclaw/installer/cli.js

@@ -8,6 +8,7 @@ import {
   CLAWORLD_INSTALLER_BIN_NAME,
   CLAWORLD_INSTALLER_COMMAND,
   CLAWORLD_INSTALLER_PACKAGE_NAME,
+  CLAWORLD_UNINSTALL_COMMAND,
   CLAWORLD_UPDATE_COMMAND,
 } from './constants.js';
 import { formatClaworldDoctorReport, runClaworldDoctor } from './doctor.js';
@@ -15,6 +16,7 @@ import {
   DEFAULT_OPENCLAW_BIN,
   DEFAULT_OPENCLAW_CONFIG_PATH,
   runClaworldInstallerInstall,
+  runClaworldInstallerUninstall,
   runClaworldInstallerUpdate,
 } from './core.js';
 
@@ -38,6 +40,7 @@ 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
 
@@ -74,6 +77,12 @@ Doctor options:
   --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
 
@@ -81,6 +90,7 @@ Canonical commands:
   ${CLAWORLD_INSTALLER_COMMAND}
   ${CLAWORLD_DOCTOR_COMMAND}
   ${CLAWORLD_UPDATE_COMMAND}
+  ${CLAWORLD_UNINSTALL_COMMAND}
 `);
 }
 
@@ -132,6 +142,13 @@ export function parseInstallerCliArgs(argv = process.argv.slice(2), env = proces
       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) {
@@ -149,18 +166,21 @@ export function parseInstallerCliArgs(argv = process.argv.slice(2), env = proces
         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':
@@ -178,12 +198,14 @@ export function parseInstallerCliArgs(argv = process.argv.slice(2), env = proces
         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':
@@ -226,7 +248,7 @@ export function parseInstallerCliArgs(argv = process.argv.slice(2), env = proces
     }
   }
 
-  if (!['install', 'update', 'doctor', 'help'].includes(options.command)) {
+  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)) {
@@ -274,10 +296,9 @@ function printInstallSummary(result) {
   console.log('Claworld installer complete');
   console.log('===========================');
   console.log(`Managed account:    ${result.transformed?.config?.channels?.claworld?.defaultAccount || 'claworld'}`);
-  console.log(`Canonical agentId:  ${result.activation?.agentId || '(unknown)'}`);
   console.log(`OpenClaw version:   ${result.host?.version || '(unknown)'}`);
   console.log(`Plugin action:      ${result.plugin?.action || 'unknown'}`);
-  console.log(`Activation mode:    ${result.activationMode}`);
+  console.log(`Activation:         ${result.activationStatus === 'ready' ? 'ready' : 'pending via claworld_update_public_identity'}`);
   console.log(`Runtime refresh:    ${result.runtimeRefresh?.action || 'unknown'}`);
   console.log(`Config path:        ${result.configPath}`);
   console.log(`Backup path:        ${result.backupPath || '(unchanged or new file)'}`);
@@ -293,10 +314,10 @@ function printUpdateSummary(result, doctorResult) {
   console.log('Claworld update complete');
   console.log('========================');
   console.log(`Managed account:    ${result.managedOptions?.accountId || 'claworld'}`);
-  console.log(`Canonical agentId:  ${result.activation?.agentId || '(unknown)'}`);
   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_update_public_identity'}`);
   console.log(`Runtime refresh:    ${result.runtimeRefresh?.action || 'unknown'}`);
   console.log(`Doctor status:      ${doctorResult?.status || 'unknown'}`);
   console.log(`Config path:        ${result.configPath}`);
@@ -304,6 +325,19 @@ function printUpdateSummary(result, doctorResult) {
   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') {
@@ -347,6 +381,16 @@ export async function runInstallerCli(argv = process.argv.slice(2), env = proces
     };
   }
 
+  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));

package/src/openclaw/installer/constants.js

@@ -3,4 +3,5 @@ export const CLAWORLD_INSTALLER_PACKAGE_NAME = '@xfxstudio/claworld';
 export const CLAWORLD_INSTALLER_COMMAND = 'npx -y @xfxstudio/claworld install';
 export const CLAWORLD_DOCTOR_COMMAND = 'npx -y @xfxstudio/claworld doctor';
 export const CLAWORLD_UPDATE_COMMAND = 'npx -y @xfxstudio/claworld update';
+export const CLAWORLD_UNINSTALL_COMMAND = 'npx -y @xfxstudio/claworld uninstall';
 export const CLAWORLD_OPENCLAW_MIN_HOST_VERSION = '>=2026.3.22';