@xfxstudio/claworld 0.2.3 → 0.2.5

package/openclaw.plugin.json

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

package/package.json

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

package/src/openclaw/installer/cli.js

@@ -18,6 +18,19 @@ import {
   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]
 
@@ -79,7 +92,7 @@ function nextValue(argv, index) {
 }
 
 export function parseInstallerCliArgs(argv = process.argv.slice(2), env = process.env) {
-  const homeDir = os.homedir();
+  const homeDir = resolveCliHomeDir(env);
   const options = {
     command: null,
     json: false,

package/src/openclaw/installer/core.js

@@ -36,6 +36,81 @@ export const DEFAULT_VERIFICATION_DELAY_MS = 1_000;
 export const seedManagedWorkspace = seedManagedWorkspaceContract;
 const TRACKED_PLUGIN_UPDATEABLE_SOURCES = new Set(['npm', 'marketplace']);
 
+function resolveRequireGatewayRunning(env = process.env) {
+  const normalized = normalizeText(env?.CLAWORLD_INSTALLER_REQUIRE_GATEWAY_RUNNING, null);
+  if (!normalized) return true;
+  const lowered = normalized.toLowerCase();
+  if (['0', 'false', 'no', 'off'].includes(lowered)) return false;
+  if (['1', 'true', 'yes', 'on'].includes(lowered)) return true;
+  return true;
+}
+
+function normalizeComparablePath(value) {
+  if (!value) return null;
+  return path.resolve(String(value));
+}
+
+async function resolveLocalPluginInstallTarget({
+  installMode = 'npm',
+  installSource = CLAWORLD_INSTALLER_PACKAGE_NAME,
+  repoRoot = null,
+  commandRunner = defaultCommandRunner,
+  cwd = process.cwd(),
+  env = process.env,
+  dryRun = false,
+} = {}) {
+  if (installMode === 'npm') {
+    return {
+      installSource,
+      managedRepoRoot: repoRoot,
+      stagedPackageRoot: null,
+    };
+  }
+
+  const resolvedRepoRoot = normalizeComparablePath(repoRoot);
+  const resolvedInstallSource = normalizeComparablePath(installSource);
+  const derivedRepoRoot = resolvedRepoRoot
+    || (
+      resolvedInstallSource?.endsWith(`${path.sep}packages${path.sep}openclaw-plugin`)
+        ? path.resolve(resolvedInstallSource, '..', '..')
+        : null
+    );
+  const shouldStageRepo = Boolean(
+    derivedRepoRoot
+    && (
+      resolvedInstallSource === derivedRepoRoot
+      || resolvedInstallSource === path.join(derivedRepoRoot, 'packages', 'openclaw-plugin')
+      || resolvedInstallSource === CLAWORLD_INSTALLER_PACKAGE_NAME
+    ),
+  );
+
+  if (!shouldStageRepo) {
+    return {
+      installSource,
+      managedRepoRoot: installMode === 'link' ? installSource : repoRoot,
+      stagedPackageRoot: null,
+    };
+  }
+
+  const stagedPackageRoot = path.join(derivedRepoRoot, '.tmp', 'openclaw-plugin-package');
+  const buildScriptPath = path.join(derivedRepoRoot, 'scripts', 'build-openclaw-plugin-package.mjs');
+  if (!dryRun) {
+    await executeCommand({
+      commandRunner,
+      bin: process.execPath,
+      args: [buildScriptPath, '--output-dir', stagedPackageRoot],
+      cwd,
+      env,
+      dryRun,
+    });
+  }
+  return {
+    installSource: stagedPackageRoot,
+    managedRepoRoot: stagedPackageRoot,
+    stagedPackageRoot,
+  };
+}
+
 function listBindings(config = {}) {
   return Array.isArray(config.bindings) ? config.bindings : [];
 }
@@ -829,6 +904,7 @@ export async function ensureClaworldPluginInstalled({
       action: before.installed ? 'refreshed_plugin_install' : 'installed_plugin',
       plugin: after,
       pluginConfig,
+      installSource,
     };
   } finally {
     if (bootstrap) {
@@ -1157,6 +1233,7 @@ export async function verifyClaworldInstall({
   dryRun = false,
   attempts = DEFAULT_VERIFICATION_ATTEMPTS,
   delayMs = DEFAULT_VERIFICATION_DELAY_MS,
+  requireGatewayRunning = resolveRequireGatewayRunning(env),
 } = {}) {
   let lastResult = null;
 
@@ -1216,7 +1293,7 @@ export async function verifyClaworldInstall({
     const bindingReady = Boolean(bindingLine);
 
     lastResult = {
-      ok: pluginReady && gatewayRunning && channelReady && bindingReady,
+      ok: pluginReady && channelReady && bindingReady && (!requireGatewayRunning || gatewayRunning),
       attempt,
       plugin,
       gatewayStatus,
@@ -1226,6 +1303,7 @@ export async function verifyClaworldInstall({
       gatewayRunning,
       channelReady,
       bindingReady,
+      requireGatewayRunning,
     };
 
     if (lastResult.ok) {
@@ -1498,6 +1576,16 @@ export async function runClaworldInstallerInstall({
     );
   }
 
+  const localPluginInstall = await resolveLocalPluginInstallTarget({
+    installMode: pluginInstallMode,
+    installSource: pluginInstallSource,
+    repoRoot,
+    commandRunner,
+    cwd,
+    env,
+    dryRun,
+  });
+
   const plugin = await ensureClaworldPluginInstalled({
     openclawBin,
     configPath: resolvedConfigPath,
@@ -1508,7 +1596,7 @@ export async function runClaworldInstallerInstall({
     env,
     dryRun,
     installMode: pluginInstallMode,
-    installSource: pluginInstallSource,
+    installSource: localPluginInstall.installSource,
     refresh: false,
   });
   const currentConfig = mergePluginMetadata(
@@ -1531,7 +1619,7 @@ export async function runClaworldInstallerInstall({
     toolProfile,
     approvalMode,
     sessionDmScope,
-    repoRoot,
+    repoRoot: localPluginInstall.managedRepoRoot,
     fetchImpl,
     commandRunner,
     cwd,

package/src/openclaw/plugin/claworld-channel-plugin.js

@@ -1488,6 +1488,80 @@ function createDeliveryReplyDispatcher({
   };
 }
 
+async function runDeliveryReplyDispatch({
+  runtime,
+  currentCfg,
+  relayClient,
+  deliveryId,
+  sessionKey,
+  localAgentId,
+  allowReply,
+  logger,
+  runtimeAccountId,
+  inboundCtx,
+} = {}) {
+  const { dispatcher, replyOptions, markDispatchIdle, didReply, getRuntimeOutputSummary } = createDeliveryReplyDispatcher({
+    runtime,
+    currentCfg,
+    relayClient,
+    deliveryId,
+    sessionKey,
+    localAgentId,
+    allowReply,
+    logger,
+    runtimeAccountId,
+  });
+
+  const dispatchResult = await runtime.channel.reply.dispatchReplyFromConfig({
+    ctx: inboundCtx,
+    cfg: currentCfg,
+    dispatcher,
+    replyOptions,
+  });
+  await markDispatchIdle();
+
+  return {
+    dispatchResult,
+    replied: didReply(),
+    runtimeOutputSummary: getRuntimeOutputSummary(),
+  };
+}
+
+function resolveBoundLocalAgentId({ cfg = {}, runtimeConfig = {}, relayClient } = {}) {
+  const accountId = resolveNormalizedText(runtimeConfig.accountId, null);
+  const bindings = Array.isArray(cfg?.bindings) ? cfg.bindings : [];
+  for (const rawBinding of bindings) {
+    const binding = rawBinding && typeof rawBinding === 'object' && !Array.isArray(rawBinding)
+      ? rawBinding
+      : {};
+    const match = binding.match && typeof binding.match === 'object' && !Array.isArray(binding.match)
+      ? binding.match
+      : {};
+    if (
+      resolveNormalizedText(match.channel, null) === 'claworld'
+      && resolveNormalizedText(match.accountId, null) === accountId
+      && resolveNormalizedText(binding.agentId, null)
+    ) {
+      return resolveNormalizedText(binding.agentId, null);
+    }
+  }
+
+  const agentList = Array.isArray(cfg?.agents?.list) ? cfg.agents.list : [];
+  if (agentList.length === 1) {
+    const onlyAgent = agentList[0] && typeof agentList[0] === 'object' && !Array.isArray(agentList[0])
+      ? agentList[0]
+      : {};
+    const onlyAgentId = resolveNormalizedText(onlyAgent.id, null);
+    if (onlyAgentId) {
+      return onlyAgentId;
+    }
+  }
+
+  return resolveNormalizedText(relayClient?.boundAgentId, null)
+    || resolveNormalizedText(runtimeConfig.agentId, null)
+    || 'main';
+}
+
 async function maybeBridgeRuntimeDelivery({
   relayClient,
   runtimeConfig,
@@ -1590,10 +1664,35 @@ async function maybeBridgeRuntimeDelivery({
     RelayFromAgentId: fromAgentId,
     UntrustedContext: ContextLines,
   });
+  const localAgentId = resolveBoundLocalAgentId({
+    cfg: currentCfg,
+    runtimeConfig,
+    relayClient,
+  });
+
+  if (runtime?.channel?.session?.recordInboundSession && runtime?.channel?.session?.resolveStorePath && localAgentId) {
+    const storePath = runtime.channel.session.resolveStorePath(currentCfg.session?.store, {
+      agentId: localAgentId,
+    });
+    await runtime.channel.session.recordInboundSession({
+      storePath,
+      sessionKey: inboundCtx.SessionKey || sessionKey,
+      ctx: inboundCtx,
+      onRecordError: (error) => {
+        logger.error?.(`[claworld:${runtimeAccountId}] failed to record inbound session`, {
+          deliveryId,
+          sessionKey,
+          localAgentId,
+          error: error?.message || String(error),
+        });
+      },
+    });
+  }
 
   logger.info?.(`[claworld:${runtimeAccountId}] routing delivery into runtime session`, {
     deliveryId,
     sessionKey,
+    localAgentId,
     remoteIdentity: remoteAddress,
     routeStatus: routed?.status || null,
     bodyPreview: String(Body || '').slice(0, 240),
@@ -1602,26 +1701,66 @@ async function maybeBridgeRuntimeDelivery({
     commandAuthorized,
   });
 
-  const { dispatcher, replyOptions, markDispatchIdle, didReply, getRuntimeOutputSummary } = createDeliveryReplyDispatcher({
+  let {
+    dispatchResult,
+    replied,
+    runtimeOutputSummary,
+  } = await runDeliveryReplyDispatch({
     runtime,
     currentCfg,
     relayClient,
     deliveryId,
     sessionKey,
-    localAgentId: runtimeConfig.relay?.agentId || relayClient?.boundAgentId || null,
+    localAgentId,
     allowReply: metadata.allowReply !== false,
     logger,
     runtimeAccountId,
+    inboundCtx,
   });
-  const dispatchResult = await runtime.channel.reply.dispatchReplyFromConfig({
-    ctx: inboundCtx,
-    cfg: currentCfg,
-    dispatcher,
-    replyOptions,
-  });
-  await markDispatchIdle();
-  const replied = didReply();
-  const runtimeOutputSummary = getRuntimeOutputSummary();
+
+  const shouldRetryKickoffDispatch = (
+    metadata.deliveryType === 'kickoff'
+    && metadata.allowReply !== false
+    && replied !== true
+    && runtimeOutputSummary.counts.final > 0
+    && runtimeOutputSummary.counts.operationalNotice > 0
+    && runtimeOutputSummary.counts.final === runtimeOutputSummary.counts.operationalNotice
+    && runtimeOutputSummary.counts.block === 0
+    && runtimeOutputSummary.counts.tool === 0
+    && runtimeOutputSummary.counts.partial === 0
+    && runtimeOutputSummary.counts.reasoning === 0
+    && runtimeOutputSummary.counts.toolStart === 0
+    && runtimeOutputSummary.counts.assistantMessageStart === 0
+    && runtimeOutputSummary.counts.reasoningEnd === 0
+    && runtimeOutputSummary.counts.compactionStart === 0
+    && runtimeOutputSummary.counts.compactionEnd === 0
+  );
+
+  if (shouldRetryKickoffDispatch) {
+    logger.warn?.(`[claworld:${runtimeAccountId}] kickoff delivery produced only operational notices; retrying dispatch once`, {
+      deliveryId,
+      sessionKey,
+      localAgentId,
+      runtimeOutputSummary,
+    });
+
+    ({
+      dispatchResult,
+      replied,
+      runtimeOutputSummary,
+    } = await runDeliveryReplyDispatch({
+      runtime,
+      currentCfg,
+      relayClient,
+      deliveryId,
+      sessionKey,
+      localAgentId,
+      allowReply: metadata.allowReply !== false,
+      logger,
+      runtimeAccountId,
+      inboundCtx,
+    }));
+  }
 
   logger.info?.(`[claworld:${runtimeAccountId}] delivery bridge completed`, {
     deliveryId,

package/src/product-shell/worlds/world-admin-service.js

@@ -202,6 +202,7 @@ function buildWorldRecord({
   status = null,
   schemaVersion = 1,
   existingMetrics = null,
+  existingConversationTemplate = null,
 } = {}) {
   const resolvedStatus = status || (enabled ? 'enabled' : 'draft');
   const participantContextField = buildDefaultEntryProfileField();
@@ -489,6 +490,7 @@ export function createWorldAdminService({ worldService, worldAuthorizationServic
             : (normalizeBoolean(enabled, false) ? 'enabled' : 'disabled'),
           schemaVersion: nextSchemaVersion,
           existingMetrics: existingWorld.metrics || null,
+          existingConversationTemplate: existingWorld.conversationTemplate || null,
         });
       } else if (enabled != null) {
         nextRecord = {