openclaw-openviking-setup-helper 0.3.0-beta.5 → 0.3.0-beta.7

package/install.js

@@ -874,8 +874,9 @@ function extractRuntimeConfigFromPluginEntry(entryConfig) {
   if (typeof entryConfig.apiKey === "string" && entryConfig.apiKey.trim()) {
     runtime.apiKey = entryConfig.apiKey;
   }
-  if (typeof entryConfig.agent_prefix === "string" && entryConfig.agent_prefix.trim()) {
-    runtime.agent_prefix = entryConfig.agent_prefix.trim();
+  const prefix = entryConfig.agent_prefix || entryConfig.agentId;
+  if (typeof prefix === "string" && prefix.trim()) {
+    runtime.agent_prefix = prefix.trim();
   }
   return runtime;
 }
@@ -1417,9 +1418,11 @@ async function configureOpenClawPlugin({
   const pluginSlot = resolvedPluginSlot;
 
   const ocEnv = getOpenClawEnv();
+  const needWorkdirFlag = OPENCLAW_DIR !== DEFAULT_OPENCLAW_DIR;
 
   const oc = async (args) => {
-    const result = await runCapture("openclaw", args, { env: ocEnv, shell: IS_WIN });
+    const fullArgs = needWorkdirFlag ? [...args, "--workdir", OPENCLAW_DIR] : args;
+    const result = await runCapture("openclaw", fullArgs, { env: ocEnv, shell: IS_WIN });
     if (result.code !== 0) {
       const detail = result.err || result.out;
       throw new Error(`openclaw ${args.join(" ")} failed (exit code ${result.code})${detail ? `: ${detail}` : ""}`);
@@ -1450,20 +1453,26 @@ async function configureOpenClawPlugin({
   // Legacy (memory) plugins still use direct config set
   if (resolvedPluginKind === "memory") {
     if (claimSlot) {
-      await oc(["config", "set", `plugins.slots.${pluginSlot}`, pluginId]);
+      try { await oc(["config", "set", `plugins.slots.${pluginSlot}`, pluginId]); } catch (_e) {
+        warn(tr("Could not activate slot for legacy plugin", "无法为旧版插件激活 slot"));
+      }
     }
     const effectiveRuntimeConfig = runtimeConfig || {
       baseUrl: remoteBaseUrl,
       apiKey: remoteApiKey,
       agent_prefix: remoteAgentPrefix,
     };
-    await oc(["config", "set", `plugins.entries.${pluginId}.config.baseUrl`, effectiveRuntimeConfig.baseUrl || remoteBaseUrl]);
+    const trySet = async (k, v) => {
+      try { await oc(["config", "set", `plugins.entries.${pluginId}.config.${k}`, v]); }
+      catch (_e) { warn(tr(`Could not set ${k} for legacy plugin`, `无法为旧版插件设置 ${k}`)); }
+    };
+    await trySet("baseUrl", effectiveRuntimeConfig.baseUrl || remoteBaseUrl);
     if (effectiveRuntimeConfig.apiKey) {
-      await oc(["config", "set", `plugins.entries.${pluginId}.config.apiKey`, effectiveRuntimeConfig.apiKey]);
+      await trySet("apiKey", effectiveRuntimeConfig.apiKey);
     }
-    await oc(["config", "set", `plugins.entries.${pluginId}.config.targetUri`, "viking://user/memories"]);
-    await oc(["config", "set", `plugins.entries.${pluginId}.config.autoRecall`, "true", "--json"]);
-    await oc(["config", "set", `plugins.entries.${pluginId}.config.autoCapture`, "true", "--json"]);
+    await trySet("targetUri", "viking://user/memories");
+    try { await oc(["config", "set", `plugins.entries.${pluginId}.config.autoRecall`, "true", "--json"]); } catch (_e) { /* optional */ }
+    try { await oc(["config", "set", `plugins.entries.${pluginId}.config.autoCapture`, "true", "--json"]); } catch (_e) { /* optional */ }
     info(tr("OpenClaw plugin configured (legacy mode)", "OpenClaw 插件配置完成（旧版模式）"));
     return;
   }
@@ -1485,6 +1494,9 @@ async function configureOpenClawPlugin({
   if (effectiveRuntimeConfig.apiKey) {
     setupArgs.push("--api-key", effectiveRuntimeConfig.apiKey);
   }
+  if (effectiveRuntimeConfig.agent_prefix) {
+    setupArgs.push("--agent-id", effectiveRuntimeConfig.agent_prefix);
+  }
   if (claimSlot) {
     setupArgs.push("--force-slot");
   }
@@ -1492,6 +1504,10 @@ async function configureOpenClawPlugin({
     setupArgs.push("--allow-offline");
   }
 
+  if (needWorkdirFlag) {
+    setupArgs.push("--workdir", OPENCLAW_DIR);
+  }
+
   info(tr(
     "Delegating configuration to: openclaw openviking setup --json",
     "委托配置给: openclaw openviking setup --json",
@@ -1545,28 +1561,64 @@ async function configureOpenClawPlugin({
       `openclaw openviking setup 退出码 ${setupResult.code}，回退到直接配置。`,
     ));
     // Fallback: direct config set (for backward compat if setup CLI not available)
-    await oc(["config", "set", `plugins.entries.${pluginId}.config.baseUrl`, effectiveRuntimeConfig.baseUrl || remoteBaseUrl]);
+    // Each field is wrapped individually so one schema mismatch does not abort the rest.
+    let fallbackOk = true;
+    const tryConfigSet = async (key, value, altKey) => {
+      try {
+        await oc(["config", "set", `plugins.entries.${pluginId}.config.${key}`, value]);
+      } catch (_e) {
+        if (altKey) {
+          try {
+            await oc(["config", "set", `plugins.entries.${pluginId}.config.${altKey}`, value]);
+            return;
+          } catch (_e2) { /* fall through to warn */ }
+        }
+        fallbackOk = false;
+        warn(tr(
+          `Could not set config field "${key}": schema validation failed (plugin version may not support this field)`,
+          `无法设置配置字段 "${key}"：schema 校验失败（插件版本可能不支持此字段）`,
+        ));
+      }
+    };
+
+    await tryConfigSet("baseUrl", effectiveRuntimeConfig.baseUrl || remoteBaseUrl);
     if (effectiveRuntimeConfig.apiKey) {
-      await oc(["config", "set", `plugins.entries.${pluginId}.config.apiKey`, effectiveRuntimeConfig.apiKey]);
+      await tryConfigSet("apiKey", effectiveRuntimeConfig.apiKey);
     }
     if (effectiveRuntimeConfig.agent_prefix) {
+      await tryConfigSet("agent_prefix", effectiveRuntimeConfig.agent_prefix, "agentId");
+    }
+    if (claimSlot) {
       try {
-        await oc(["config", "set", `plugins.entries.${pluginId}.config.agent_prefix`, effectiveRuntimeConfig.agent_prefix]);
+        await oc(["config", "set", `plugins.slots.${pluginSlot}`, pluginId]);
       } catch (_e) {
-        try {
-          await oc(["config", "set", `plugins.entries.${pluginId}.config.agentId`, effectiveRuntimeConfig.agent_prefix]);
-        } catch (_e2) {
-          warn(tr(
-            `Could not set agent prefix "${effectiveRuntimeConfig.agent_prefix}": config schema may not support this field`,
-            `无法设置 agent prefix "${effectiveRuntimeConfig.agent_prefix}"：配置 schema 可能不支持此字段`,
-          ));
-        }
+        fallbackOk = false;
+        warn(tr(
+          "Could not activate contextEngine slot",
+          "无法激活 contextEngine slot",
+        ));
       }
     }
-    if (claimSlot) {
-      await oc(["config", "set", `plugins.slots.${pluginSlot}`, pluginId]);
+    if (fallbackOk) {
+      info(tr("OpenClaw plugin configured (fallback)", "OpenClaw 插件配置完成（回退模式）"));
+    } else {
+      warn(tr(
+        "OpenClaw plugin partially configured (fallback). Some fields could not be set. Run `openclaw openviking setup` to complete configuration.",
+        "OpenClaw 插件部分配置完成（回退模式）。部分字段未能设置，请运行 `openclaw openviking setup` 完善配置。",
+      ));
+    }
+    if (effectiveRuntimeConfig.apiKey) {
+      warn(tr(
+        "Note: Root API key detection, accountId/userId tenant context, and server version compatibility checks are only available via `openclaw openviking setup`. If you are using a root API key, please upgrade the plugin and re-run setup.",
+        "提示：Root API Key 检测、accountId/userId 租户上下文、服务端版本兼容性检查仅在 `openclaw openviking setup` 中可用。如果您使用的是 root API key，请升级插件后重新执行 setup。",
+      ));
+    }
+    if (effectiveRuntimeConfig.apiKey) {
+      info(tr(
+        "Note: If using a root API key, run `openclaw openviking setup` to configure accountId/userId (required for tenant isolation).",
+        "提示：如果使用的是 root API key，请运行 `openclaw openviking setup` 配置 accountId/userId（多租户隔离必需）。",
+      ));
     }
-    info(tr("OpenClaw plugin configured (fallback)", "OpenClaw 插件配置完成（回退模式）"));
   } else {
     info(tr("OpenClaw plugin configured", "OpenClaw 插件配置完成"));
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-openviking-setup-helper",
-  "version": "0.3.0-beta.5",
+  "version": "0.3.0-beta.7",
   "description": "Setup helper for installing OpenViking memory plugin into OpenClaw",
   "type": "module",
   "bin": {