openclaw-openviking-setup-helper 0.3.0-beta.8 → 0.3.0-beta.9

package/install.js

@@ -1419,12 +1419,9 @@ async function configureOpenClawPlugin({
 
   const ocEnv = getOpenClawEnv();
   const needWorkdirFlag = OPENCLAW_DIR !== DEFAULT_OPENCLAW_DIR;
-  const workdirCmds = new Set(["config", "openviking", "status", "gateway", "logs"]);
 
   const oc = async (args) => {
-    const useWorkdir = needWorkdirFlag && args.length > 0 && workdirCmds.has(args[0]);
-    const fullArgs = useWorkdir ? ["--workdir", OPENCLAW_DIR, ...args] : args;
-    const result = await runCapture("openclaw", fullArgs, { env: ocEnv, shell: IS_WIN });
+    const result = await runCapture("openclaw", args, { 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}` : ""}`);
@@ -1432,16 +1429,58 @@ async function configureOpenClawPlugin({
     return result;
   };
 
+  // Direct file manipulation for config (reliable across all OpenClaw versions and --workdir scenarios).
+  // OpenClaw CLI's --workdir / OPENCLAW_STATE_DIR support is inconsistent, so we read/write openclaw.json directly.
+  const configPath = getOpenClawConfigPath();
+  const readCfg = async () => {
+    if (!existsSync(configPath)) return {};
+    try { return JSON.parse(await readFile(configPath, "utf8")); } catch { return {}; }
+  };
+  const writeCfg = async (cfg) => {
+    const out = JSON.stringify(cfg, null, 2) + "\n";
+    const tmp = `${configPath}.ov-install-tmp.${process.pid}`;
+    await writeFile(tmp, out, "utf8");
+    await rename(tmp, configPath);
+  };
+  const ensurePluginRegistered = async (cfg) => {
+    if (!cfg.plugins) cfg.plugins = {};
+    const p = cfg.plugins;
+    if (!p.entries) p.entries = {};
+    if (!p.entries[pluginId]) p.entries[pluginId] = {};
+    if (!p.entries[pluginId].config) p.entries[pluginId].config = {};
+    if (!Array.isArray(p.allow)) p.allow = [];
+    if (!p.allow.includes(pluginId)) p.allow.push(pluginId);
+    return cfg;
+  };
+
   if (!preserveExistingConfig) {
     await scrubStaleOpenClawPluginRegistration();
   }
 
-  // Enable plugin (files already deployed to extensions dir by deployPlugin)
-  await oc(["plugins", "enable", pluginId]);
+  // Enable plugin: try CLI first (default path), fall back to direct file for --workdir
+  if (!needWorkdirFlag) {
+    try {
+      await oc(["plugins", "enable", pluginId]);
+    } catch (_e) {
+      info(tr("plugins enable via CLI failed, registering directly", "CLI plugins enable 失败，直接注册"));
+      const cfg = await readCfg();
+      await ensurePluginRegistered(cfg);
+      await writeCfg(cfg);
+    }
+  } else {
+    info(tr("Using direct config write for non-default workdir", "非默认目录，使用直接配置写入"));
+    const cfg = await readCfg();
+    await ensurePluginRegistered(cfg);
+    await writeCfg(cfg);
+  }
 
   if (preserveExistingConfig) {
     if (claimSlot) {
-      await oc(["config", "set", `plugins.slots.${pluginSlot}`, pluginId]);
+      const cfg = await readCfg();
+      if (!cfg.plugins) cfg.plugins = {};
+      if (!cfg.plugins.slots) cfg.plugins.slots = {};
+      cfg.plugins.slots[pluginSlot] = pluginId;
+      await writeCfg(cfg);
     }
     info(
       tr(
@@ -1452,29 +1491,33 @@ async function configureOpenClawPlugin({
     return;
   }
 
-  // Legacy (memory) plugins still use direct config set
-  if (resolvedPluginKind === "memory") {
-    if (claimSlot) {
-      try { await oc(["config", "set", `plugins.slots.${pluginSlot}`, pluginId]); } catch (_e) {
-        warn(tr("Could not activate slot for legacy plugin", "无法为旧版插件激活 slot"));
-      }
+  const writeConfigDirect = async (pluginConfig, slotValue) => {
+    const cfg = await readCfg();
+    await ensurePluginRegistered(cfg);
+    Object.assign(cfg.plugins.entries[pluginId].config, pluginConfig);
+    if (slotValue) {
+      if (!cfg.plugins.slots) cfg.plugins.slots = {};
+      cfg.plugins.slots[pluginSlot] = slotValue;
     }
+    await writeCfg(cfg);
+  };
+
+  // Legacy (memory) plugins: direct JSON write
+  if (resolvedPluginKind === "memory") {
     const effectiveRuntimeConfig = runtimeConfig || {
       baseUrl: remoteBaseUrl,
       apiKey: remoteApiKey,
-      agent_prefix: remoteAgentPrefix,
     };
-    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}`)); }
+    const pluginConfig = {
+      baseUrl: effectiveRuntimeConfig.baseUrl || remoteBaseUrl,
+      targetUri: "viking://user/memories",
+      autoRecall: true,
+      autoCapture: true,
     };
-    await trySet("baseUrl", effectiveRuntimeConfig.baseUrl || remoteBaseUrl);
     if (effectiveRuntimeConfig.apiKey) {
-      await trySet("apiKey", effectiveRuntimeConfig.apiKey);
+      pluginConfig.apiKey = effectiveRuntimeConfig.apiKey;
     }
-    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 */ }
+    await writeConfigDirect(pluginConfig, claimSlot ? pluginId : null);
     info(tr("OpenClaw plugin configured (legacy mode)", "OpenClaw 插件配置完成（旧版模式）"));
     return;
   }
@@ -1553,68 +1596,26 @@ async function configureOpenClawPlugin({
       }
     }
   } else if (setupResult.code !== 0) {
-    // JSON parse failed and non-zero exit
+    // JSON parse failed and non-zero exit — setup CLI not available (old plugin version)
     warn(tr(
-      `openclaw openviking setup exited with code ${setupResult.code}. Falling back to direct config.`,
-      `openclaw openviking setup 退出码 ${setupResult.code}，回退到直接配置。`,
+      `openclaw openviking setup exited with code ${setupResult.code}. Falling back to direct JSON config write.`,
+      `openclaw openviking setup 退出码 ${setupResult.code}，回退到直接写入 JSON 配置。`,
     ));
-    // Fallback: direct config set (for backward compat if setup CLI not available)
-    // 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 校验失败（插件版本可能不支持此字段）`,
-        ));
-      }
+    const pluginConfig = {
+      baseUrl: effectiveRuntimeConfig.baseUrl || remoteBaseUrl,
     };
-
-    await tryConfigSet("baseUrl", effectiveRuntimeConfig.baseUrl || remoteBaseUrl);
     if (effectiveRuntimeConfig.apiKey) {
-      await tryConfigSet("apiKey", effectiveRuntimeConfig.apiKey);
+      pluginConfig.apiKey = effectiveRuntimeConfig.apiKey;
     }
     if (effectiveRuntimeConfig.agent_prefix) {
-      await tryConfigSet("agent_prefix", effectiveRuntimeConfig.agent_prefix, "agentId");
-    }
-    if (claimSlot) {
-      try {
-        await oc(["config", "set", `plugins.slots.${pluginSlot}`, pluginId]);
-      } catch (_e) {
-        fallbackOk = false;
-        warn(tr(
-          "Could not activate contextEngine slot",
-          "无法激活 contextEngine slot",
-        ));
-      }
-    }
-    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。",
-      ));
+      pluginConfig.agent_prefix = effectiveRuntimeConfig.agent_prefix;
     }
+    await writeConfigDirect(pluginConfig, claimSlot ? pluginId : null);
+    info(tr("OpenClaw plugin configured (direct write)", "OpenClaw 插件配置完成（直接写入）"));
     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（多租户隔离必需）。",
+        "Note: Root API key detection and tenant context are only available via `openclaw openviking setup`. If using a root API key, upgrade the plugin and re-run setup.",
+        "提示：Root API Key 检测和租户上下文仅在 `openclaw openviking setup` 中可用。如果使用 root API key，请升级插件后重新执行 setup。",
       ));
     }
   } else {

package/package.json

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