@xfxstudio/claworld 0.2.10-beta.1 → 0.2.10-beta.3

package/openclaw.plugin.json

@@ -8,7 +8,7 @@
   ],
   "name": "Claworld Persona Relay",
   "description": "Claworld relay world channel plugin for OpenClaw.",
-  "version": "0.2.10-beta.1",
+  "version": "0.2.10-beta.3",
   "configSchema": {
     "type": "object",
     "additionalProperties": false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xfxstudio/claworld",
-  "version": "0.2.10-beta.1",
+  "version": "0.2.10-beta.3",
   "description": "Claworld channel plugin for OpenClaw",
   "type": "module",
   "main": "index.js",

package/src/openclaw/installer/cli.js

@@ -7,7 +7,7 @@ import {
   CLAWORLD_DOCTOR_COMMAND,
   CLAWORLD_INSTALLER_BIN_NAME,
   CLAWORLD_INSTALLER_COMMAND,
-  CLAWORLD_INSTALLER_PACKAGE_NAME,
+  CLAWORLD_INSTALLER_DEFAULT_PLUGIN_SOURCE,
   CLAWORLD_UNINSTALL_COMMAND,
   CLAWORLD_UPDATE_COMMAND,
 } from './constants.js';
@@ -57,7 +57,7 @@ Install options:
   --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_PACKAGE_NAME})
+  --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
@@ -118,7 +118,7 @@ export function parseInstallerCliArgs(argv = process.argv.slice(2), env = proces
       displayName: null,
       repoRoot: null,
       pluginInstallMode: 'npm',
-      pluginInstallSource: CLAWORLD_INSTALLER_PACKAGE_NAME,
+      pluginInstallSource: CLAWORLD_INSTALLER_DEFAULT_PLUGIN_SOURCE,
       toolProfile: null,
     },
     update: {
@@ -266,7 +266,7 @@ export function parseInstallerCliArgs(argv = process.argv.slice(2), env = proces
     options.command === 'install'
     && options.install.pluginInstallMode === 'link'
     && !options.install.repoRoot
-    && options.install.pluginInstallSource === CLAWORLD_INSTALLER_PACKAGE_NAME
+    && options.install.pluginInstallSource === CLAWORLD_INSTALLER_DEFAULT_PLUGIN_SOURCE
   ) {
     throw new Error('Link install mode requires --repo-root or --plugin-source <local-path>.');
   }
@@ -274,7 +274,7 @@ export function parseInstallerCliArgs(argv = process.argv.slice(2), env = proces
     options.command === 'install'
     && options.install.pluginInstallMode === 'copy'
     && !options.install.repoRoot
-    && options.install.pluginInstallSource === CLAWORLD_INSTALLER_PACKAGE_NAME
+    && options.install.pluginInstallSource === CLAWORLD_INSTALLER_DEFAULT_PLUGIN_SOURCE
   ) {
     throw new Error('Copy install mode requires --repo-root or --plugin-source <local-path>.');
   }
@@ -283,7 +283,7 @@ export function parseInstallerCliArgs(argv = process.argv.slice(2), env = proces
     options.command === 'install'
     && options.install.pluginInstallMode !== 'npm'
     && options.install.repoRoot
-    && options.install.pluginInstallSource === CLAWORLD_INSTALLER_PACKAGE_NAME
+    && options.install.pluginInstallSource === CLAWORLD_INSTALLER_DEFAULT_PLUGIN_SOURCE
   ) {
     options.install.pluginInstallSource = options.install.repoRoot;
   }

package/src/openclaw/installer/constants.js

@@ -1,5 +1,12 @@
+import { createRequire } from 'module';
+
+const require = createRequire(import.meta.url);
+const installerPackageJson = require('../../../package.json');
+
 export const CLAWORLD_INSTALLER_BIN_NAME = 'claworld';
 export const CLAWORLD_INSTALLER_PACKAGE_NAME = '@xfxstudio/claworld';
+export const CLAWORLD_INSTALLER_PACKAGE_VERSION = installerPackageJson.version;
+export const CLAWORLD_INSTALLER_DEFAULT_PLUGIN_SOURCE = `${CLAWORLD_INSTALLER_PACKAGE_NAME}@${CLAWORLD_INSTALLER_PACKAGE_VERSION}`;
 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';

package/src/openclaw/installer/core.js

@@ -5,10 +5,10 @@ import path from 'path';
 import { spawnSync } from 'child_process';
 import vm from 'vm';
 import {
+  applyClaworldBootstrapConfig,
   DEFAULT_CLAWORLD_ACCOUNT_ID,
   DEFAULT_CLAWORLD_AGENT_ID,
   DEFAULT_CLAWORLD_SERVER_URL,
-  applyClaworldManagedRuntimeConfig,
   ensureObject,
   expandUserPath,
   findClaworldManagedRuntimeBackup,
@@ -24,6 +24,7 @@ import {
 } from '../plugin/config-schema.js';
 import {
   CLAWORLD_INSTALLER_COMMAND,
+  CLAWORLD_INSTALLER_DEFAULT_PLUGIN_SOURCE,
   CLAWORLD_INSTALLER_PACKAGE_NAME,
   CLAWORLD_OPENCLAW_MIN_HOST_VERSION,
   CLAWORLD_UNINSTALL_COMMAND,
@@ -32,6 +33,7 @@ import {
 import { seedManagedWorkspaceContract } from './workspace-contract.js';
 
 export const DEFAULT_OPENCLAW_BIN = 'openclaw';
+const DEFAULT_NPM_BIN = process.platform === 'win32' ? 'npm.cmd' : 'npm';
 export const DEFAULT_OPENCLAW_CONFIG_PATH = '~/.openclaw/openclaw.json';
 export const DEFAULT_OPENCLAW_STATE_DIR = null;
 export const DEFAULT_INSTALL_TIMEOUT_MS = 15_000;
@@ -54,9 +56,28 @@ function normalizeComparablePath(value) {
   return path.resolve(String(value));
 }
 
+function splitPackageNameSegments(packageName = CLAWORLD_INSTALLER_PACKAGE_NAME) {
+  const normalized = String(packageName || '').trim();
+  if (!normalized) return ['claworld'];
+  return normalized.split('/').filter(Boolean);
+}
+
+function resolveInstallerManagedPluginInstallRoot(configPath = DEFAULT_OPENCLAW_CONFIG_PATH) {
+  const resolvedConfigPath = path.resolve(expandUserPath(configPath, os.homedir()));
+  return path.join(path.dirname(resolvedConfigPath), 'extensions', 'claworld');
+}
+
+function resolveInstallerManagedPluginSourcePath(installRoot, packageName = CLAWORLD_INSTALLER_PACKAGE_NAME) {
+  return path.join(installRoot, 'node_modules', ...splitPackageNameSegments(packageName));
+}
+
+async function readJsonFile(filePath) {
+  return JSON.parse(await fs.readFile(filePath, 'utf8'));
+}
+
 async function resolveLocalPluginInstallTarget({
   installMode = 'npm',
-  installSource = CLAWORLD_INSTALLER_PACKAGE_NAME,
+  installSource = CLAWORLD_INSTALLER_DEFAULT_PLUGIN_SOURCE,
   repoRoot = null,
   commandRunner = defaultCommandRunner,
   cwd = process.cwd(),
@@ -85,6 +106,7 @@ async function resolveLocalPluginInstallTarget({
       resolvedInstallSource === derivedRepoRoot
       || resolvedInstallSource === path.join(derivedRepoRoot, 'packages', 'openclaw-plugin')
       || resolvedInstallSource === CLAWORLD_INSTALLER_PACKAGE_NAME
+      || resolvedInstallSource === CLAWORLD_INSTALLER_DEFAULT_PLUGIN_SOURCE
     ),
   );
 
@@ -432,18 +454,44 @@ function parseBindingLine(text = '', { agentId, accountId } = {}) {
     .find((line) => line === `- ${agentId} <- claworld accountId=${accountId}`) || null;
 }
 
+function normalizePathSuffix(value = '') {
+  return String(value || '').replace(/\\/g, '/').replace(/\/+$/, '');
+}
+
+function isInstallerManagedLocalSourceRecord(installRecord = {}) {
+  const source = normalizeText(installRecord.source, null);
+  if (source !== 'path') {
+    return false;
+  }
+  const spec = normalizeText(installRecord.spec, null) || normalizeText(installRecord.resolvedSpec, null);
+  if (!spec || !spec.startsWith('@xfxstudio/claworld@')) {
+    return false;
+  }
+  const installPath = normalizePathSuffix(installRecord.installPath);
+  const sourcePath = normalizePathSuffix(installRecord.sourcePath);
+  return (
+    installPath.endsWith('/extensions/claworld')
+    && sourcePath.endsWith('/extensions/claworld/node_modules/@xfxstudio/claworld')
+  );
+}
+
 function inspectTrackedClaworldPluginInstall(config = {}) {
   const installRecord = ensureObject(config?.plugins?.installs?.claworld);
   const tracked = Object.keys(installRecord).length > 0;
-  const source = normalizeText(installRecord.source, null);
+  const recordedSource = normalizeText(installRecord.source, null);
+  const source = isInstallerManagedLocalSourceRecord(installRecord)
+    ? 'installer_npm'
+    : recordedSource;
   return {
     tracked,
     updateable: tracked && TRACKED_PLUGIN_UPDATEABLE_SOURCES.has(source),
     source,
+    recordedSource,
     spec: normalizeText(installRecord.spec, null),
     resolvedSpec: normalizeText(installRecord.resolvedSpec, null),
     resolvedVersion: normalizeText(installRecord.resolvedVersion, null),
     installPath: normalizeText(installRecord.installPath, null),
+    sourcePath: normalizeText(installRecord.sourcePath, null),
     record: tracked ? installRecord : null,
   };
 }
@@ -527,6 +575,67 @@ function mergePluginMetadata(config = {}, pluginConfig = {}) {
   return next;
 }
 
+async function installPublishedClaworldPackageToLocalSource({
+  installSource = CLAWORLD_INSTALLER_DEFAULT_PLUGIN_SOURCE,
+  configPath = DEFAULT_OPENCLAW_CONFIG_PATH,
+  commandRunner = defaultCommandRunner,
+  cwd = process.cwd(),
+  env = process.env,
+  dryRun = false,
+  refresh = false,
+} = {}) {
+  const installRoot = resolveInstallerManagedPluginInstallRoot(configPath);
+  const sourcePath = resolveInstallerManagedPluginSourcePath(installRoot);
+  if (!dryRun && refresh) {
+    await fs.rm(installRoot, { recursive: true, force: true });
+  }
+  if (!dryRun) {
+    await fs.mkdir(installRoot, { recursive: true });
+  }
+
+  await executeCommand({
+    commandRunner,
+    bin: DEFAULT_NPM_BIN,
+    args: [
+      'install',
+      '--ignore-scripts',
+      '--no-package-lock',
+      '--omit=dev',
+      '--prefix',
+      installRoot,
+      installSource,
+    ],
+    cwd,
+    env,
+    dryRun,
+    capture: false,
+  });
+
+  let resolvedVersion = null;
+  if (!dryRun) {
+    const sourcePackageJson = await readJsonFile(path.join(sourcePath, 'package.json'));
+    resolvedVersion = normalizeText(sourcePackageJson?.version, null);
+  }
+
+  return {
+    installRoot,
+    sourcePath,
+    resolvedVersion,
+    pluginConfig: {
+        installs: {
+          claworld: {
+          source: 'path',
+          spec: installSource,
+          resolvedSpec: installSource,
+          ...(resolvedVersion ? { resolvedVersion } : {}),
+          installPath: installRoot,
+          sourcePath,
+        },
+      },
+    },
+  };
+}
+
 function defaultCommandRunner({
   bin,
   args,
@@ -863,9 +972,10 @@ export async function ensureClaworldPluginInstalled({
   env = process.env,
   dryRun = false,
   installMode = 'npm',
-  installSource = CLAWORLD_INSTALLER_PACKAGE_NAME,
+  installSource = CLAWORLD_INSTALLER_DEFAULT_PLUGIN_SOURCE,
   refresh = false,
 } = {}) {
+  const trackedInstall = inspectTrackedClaworldPluginInstall(config);
   const bootstrap = await preparePluginBootstrapConfig({
     configPath,
     config,
@@ -883,7 +993,18 @@ export async function ensureClaworldPluginInstalled({
       env,
       dryRun,
     });
-    if (before.installed && !refresh) {
+    const reusableInstallerManagedNpmInstall = (
+      installMode === 'npm'
+      && trackedInstall.tracked
+      && trackedInstall.source === 'installer_npm'
+      && trackedInstall.recordedSource === 'path'
+      && normalizeText(trackedInstall.sourcePath, null)
+    );
+    if (
+      before.installed
+      && !refresh
+      && (installMode !== 'npm' || reusableInstallerManagedNpmInstall)
+    ) {
       return {
         changed: false,
         action: 'reused_existing_plugin_install',
@@ -901,6 +1022,37 @@ export async function ensureClaworldPluginInstalled({
       };
     }
 
+    if (installMode === 'npm') {
+      const localInstall = await installPublishedClaworldPackageToLocalSource({
+        installSource,
+        configPath,
+        commandRunner,
+        cwd,
+        env,
+        dryRun,
+        refresh,
+      });
+      return {
+        changed: true,
+        action: reusableInstallerManagedNpmInstall ? 'refreshed_local_plugin_source' : 'staged_local_plugin_source',
+        plugin: before,
+        pluginConfig: {
+          ...ensureObject(bootstrap?.pluginConfig),
+          ...ensureObject(localInstall.pluginConfig),
+          entries: {
+            ...ensureObject(bootstrap?.pluginConfig?.entries),
+            ...ensureObject(localInstall.pluginConfig?.entries),
+          },
+          installs: {
+            ...ensureObject(bootstrap?.pluginConfig?.installs),
+            ...ensureObject(localInstall.pluginConfig?.installs),
+          },
+        },
+        installSource,
+        managedRepoRoot: localInstall.sourcePath,
+      };
+    }
+
     if (before.installed && refresh && installMode === 'copy') {
       await executeCommand({
         commandRunner,
@@ -990,6 +1142,26 @@ export async function updateTrackedClaworldPluginInstall({
     );
   }
 
+  if (trackedInstall.source === 'installer_npm') {
+    const localInstall = await installPublishedClaworldPackageToLocalSource({
+      installSource: trackedInstall.spec || CLAWORLD_INSTALLER_DEFAULT_PLUGIN_SOURCE,
+      configPath,
+      commandRunner,
+      cwd,
+      env,
+      dryRun,
+      refresh: true,
+    });
+    return {
+      changed: true,
+      action: dryRun ? 'dry_run_updated_local_plugin_source' : 'updated_local_plugin_source',
+      trackedInstall,
+      plugin: before,
+      pluginConfig: localInstall.pluginConfig,
+      managedRepoRoot: localInstall.sourcePath,
+    };
+  }
+
   if (!trackedInstall.tracked) {
     return {
       changed: false,
@@ -1467,8 +1639,8 @@ async function reconcileManagedClaworldRuntime({
     },
   });
 
-  const transformed = applyClaworldManagedRuntimeConfig(currentConfig, managedOptions);
-  const configChanged = JSON.stringify(currentConfig) !== JSON.stringify(transformed.config);
+  const transformed = applyClaworldBootstrapConfig(currentConfig, managedOptions);
+  const configChanged = JSON.stringify(currentConfigState.config) !== JSON.stringify(transformed.config);
   const backupPath = configChanged
     ? await backupConfigIfPresent(configPath, currentConfigState.existed, dryRun)
     : null;
@@ -1560,7 +1732,7 @@ export async function runClaworldInstallerInstall({
   sessionDmScope = null,
   repoRoot = null,
   pluginInstallMode = 'npm',
-  pluginInstallSource = CLAWORLD_INSTALLER_PACKAGE_NAME,
+  pluginInstallSource = CLAWORLD_INSTALLER_DEFAULT_PLUGIN_SOURCE,
   fetchImpl = globalThis.fetch?.bind(globalThis),
   commandRunner = defaultCommandRunner,
   cwd = process.cwd(),
@@ -1639,7 +1811,7 @@ export async function runClaworldInstallerInstall({
     toolProfile,
     approvalMode,
     sessionDmScope,
-    repoRoot: localPluginInstall.managedRepoRoot,
+    repoRoot: plugin.managedRepoRoot || localPluginInstall.managedRepoRoot,
     fetchImpl,
     commandRunner,
     cwd,
@@ -1717,7 +1889,7 @@ export async function runClaworldInstallerUpdate({
   });
 
   const refreshedConfigState = await loadConfigFromDisk(resolvedConfigPath);
-  const currentConfig = mergePluginMetadata(refreshedConfigState.config, null);
+  const currentConfig = mergePluginMetadata(refreshedConfigState.config, plugin.pluginConfig || null);
   const lifecycle = await reconcileManagedClaworldRuntime({
     openclawBin,
     configPath: resolvedConfigPath,
@@ -1736,6 +1908,7 @@ export async function runClaworldInstallerUpdate({
     toolProfile,
     approvalMode,
     sessionDmScope,
+    repoRoot: plugin.managedRepoRoot || null,
     fetchImpl,
     commandRunner,
     cwd,
@@ -1778,6 +1951,7 @@ export async function runClaworldInstallerUninstall({
   const currentConfigState = await loadConfigFromDisk(resolvedConfigPath);
   const currentInstallerState = (await loadInstallerStateFromDisk(installerStatePath)).state;
   const currentConfig = currentConfigState.config;
+  const trackedInstall = inspectTrackedClaworldPluginInstall(currentConfig);
   const host = await detectOpenclawHost({
     openclawBin,
     commandRunner,
@@ -1841,7 +2015,20 @@ export async function runClaworldInstallerUninstall({
 
   let pluginAction = 'plugin_already_absent';
   try {
-    if (pluginBefore.installed) {
+    if (trackedInstall.source === 'installer_npm') {
+      const localInstallPath = normalizeText(trackedInstall.installPath, null) || normalizeText(trackedInstall.sourcePath, null);
+      if (!localInstallPath) {
+        throw createInstallerError(
+          'claworld_installer_managed_source_missing',
+          'Installer-managed Claworld source is missing its local install path.',
+          { trackedInstall },
+        );
+      }
+      if (!dryRun) {
+        await fs.rm(localInstallPath, { recursive: true, force: true });
+      }
+      pluginAction = 'removed_local_plugin_source';
+    } else if (pluginBefore.installed) {
       await executeCommand({
         commandRunner,
         bin: openclawBin,
@@ -1881,7 +2068,7 @@ export async function runClaworldInstallerUninstall({
     env,
     dryRun,
   });
-  if (pluginBefore.installed && pluginAfter.installed) {
+  if ((pluginBefore.installed || trackedInstall.source === 'installer_npm') && pluginAfter.installed) {
     throw createInstallerError(
       'claworld_plugin_uninstall_failed',
       'OpenClaw still reports the claworld plugin as installed after uninstall.',