@xfxstudio/claworld 0.2.10-beta.2 → 0.2.11

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.2",
+  "version": "0.2.11",
   "configSchema": {
     "type": "object",
     "additionalProperties": false,

package/package.json

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

package/src/openclaw/installer/cli.js

@@ -131,6 +131,7 @@ export function parseInstallerCliArgs(argv = process.argv.slice(2), env = proces
       agentId: 'main',
       workspace: null,
       displayName: null,
+      pluginInstallSource: CLAWORLD_INSTALLER_DEFAULT_PLUGIN_SOURCE,
       toolProfile: null,
     },
     doctor: {
@@ -234,6 +235,7 @@ export function parseInstallerCliArgs(argv = process.argv.slice(2), env = proces
         break;
       case '--plugin-source':
         options.install.pluginInstallSource = nextValue(remaining, index);
+        options.update.pluginInstallSource = options.install.pluginInstallSource;
         index += 1;
         break;
       case '--json':

package/src/openclaw/installer/core.js

@@ -454,14 +454,39 @@ 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),
@@ -597,9 +622,9 @@ async function installPublishedClaworldPackageToLocalSource({
     sourcePath,
     resolvedVersion,
     pluginConfig: {
-      installs: {
-        claworld: {
-          source: 'installer_npm',
+        installs: {
+          claworld: {
+          source: 'path',
           spec: installSource,
           resolvedSpec: installSource,
           ...(resolvedVersion ? { resolvedVersion } : {}),
@@ -972,6 +997,7 @@ export async function ensureClaworldPluginInstalled({
       installMode === 'npm'
       && trackedInstall.tracked
       && trackedInstall.source === 'installer_npm'
+      && trackedInstall.recordedSource === 'path'
       && normalizeText(trackedInstall.sourcePath, null)
     );
     if (
@@ -1092,6 +1118,7 @@ export async function updateTrackedClaworldPluginInstall({
   configPath = null,
   stateDir = DEFAULT_OPENCLAW_STATE_DIR,
   config = {},
+  installSource = null,
   commandRunner = defaultCommandRunner,
   cwd = process.cwd(),
   env = process.env,
@@ -1118,7 +1145,10 @@ export async function updateTrackedClaworldPluginInstall({
 
   if (trackedInstall.source === 'installer_npm') {
     const localInstall = await installPublishedClaworldPackageToLocalSource({
-      installSource: trackedInstall.spec || CLAWORLD_INSTALLER_DEFAULT_PLUGIN_SOURCE,
+      installSource: normalizeText(
+        installSource,
+        trackedInstall.spec || CLAWORLD_INSTALLER_DEFAULT_PLUGIN_SOURCE,
+      ),
       configPath,
       commandRunner,
       cwd,
@@ -1614,7 +1644,7 @@ async function reconcileManagedClaworldRuntime({
   });
 
   const transformed = applyClaworldBootstrapConfig(currentConfig, managedOptions);
-  const configChanged = JSON.stringify(currentConfig) !== JSON.stringify(transformed.config);
+  const configChanged = JSON.stringify(currentConfigState.config) !== JSON.stringify(transformed.config);
   const backupPath = configChanged
     ? await backupConfigIfPresent(configPath, currentConfigState.existed, dryRun)
     : null;
@@ -1816,6 +1846,7 @@ export async function runClaworldInstallerUpdate({
   agentId = DEFAULT_CLAWORLD_AGENT_ID,
   workspace = null,
   displayName = null,
+  pluginInstallSource = null,
   toolProfile = null,
   approvalMode = null,
   sessionDmScope = null,
@@ -1856,6 +1887,7 @@ export async function runClaworldInstallerUpdate({
     configPath: resolvedConfigPath,
     stateDir: resolvedStateDir,
     config: currentConfigState.config,
+    installSource: pluginInstallSource,
     commandRunner,
     cwd,
     env,