openclaw-openviking-setup-helper 0.2.16-dev.4 → 0.3.0-beta.10

package/install.js

@@ -97,9 +97,9 @@ let rollbackLastUpgrade = false;
 let showCurrentVersion = false;
 
 const selectedMode = "remote";
-let remoteBaseUrl = "http://127.0.0.1:1933";
-let remoteApiKey = "";
-let remoteAgentPrefix = "";
+let remoteBaseUrl = (process.env.OPENVIKING_BASE_URL || "http://127.0.0.1:1933").trim();
+let remoteApiKey = (process.env.OPENVIKING_API_KEY || "").trim();
+let remoteAgentPrefix = (process.env.OPENVIKING_AGENT_PREFIX || "").trim();
 let upgradeRuntimeConfig = null;
 let installedUpgradeState = null;
 let upgradeAudit = null;
@@ -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,6 +1418,7 @@ 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 });
@@ -1427,24 +1429,59 @@ 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]);
-  if (claimSlot) {
-    await oc(["config", "set", `plugins.slots.${pluginSlot}`, 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 {
-    warn(
-      tr(
-        `Skipped claiming plugins.slots.${pluginSlot}; it is currently owned by another plugin.`,
-        `已跳过设置 plugins.slots.${pluginSlot}，当前该 slot 由其他插件占用。`,
-      ),
-    );
+    info(tr("Using direct config write for non-default workdir", "非默认目录，使用直接配置写入"));
+    const cfg = await readCfg();
+    await ensurePluginRegistered(cfg);
+    await writeCfg(cfg);
   }
 
   if (preserveExistingConfig) {
+    if (claimSlot) {
+      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(
         `Preserved existing plugin runtime config for ${pluginId}`,
@@ -1454,28 +1491,129 @@ async function configureOpenClawPlugin({
     return;
   }
 
+  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,
+    };
+    const pluginConfig = {
+      baseUrl: effectiveRuntimeConfig.baseUrl || remoteBaseUrl,
+      targetUri: "viking://user/memories",
+      autoRecall: true,
+      autoCapture: true,
+    };
+    if (effectiveRuntimeConfig.apiKey) {
+      pluginConfig.apiKey = effectiveRuntimeConfig.apiKey;
+    }
+    await writeConfigDirect(pluginConfig, claimSlot ? pluginId : null);
+    info(tr("OpenClaw plugin configured (legacy mode)", "OpenClaw 插件配置完成（旧版模式）"));
+    return;
+  }
+
+  // Current (context-engine) plugins: delegate to `openclaw openviking setup --json`
+  // This reuses the same validation logic (health check, version compat, root key
+  // detection, slot protection, ensureInstallRecord) from commands/setup.ts
   const effectiveRuntimeConfig = runtimeConfig || {
     baseUrl: remoteBaseUrl,
     apiKey: remoteApiKey,
     agent_prefix: remoteAgentPrefix,
   };
 
-  await oc(["config", "set", `plugins.entries.${pluginId}.config.baseUrl`, effectiveRuntimeConfig.baseUrl || remoteBaseUrl]);
+  const setupArgs = needWorkdirFlag
+    ? ["--workdir", OPENCLAW_DIR, "openviking", "setup"]
+    : ["openviking", "setup"];
+  setupArgs.push("--base-url", effectiveRuntimeConfig.baseUrl || remoteBaseUrl);
+  setupArgs.push("--json");
   if (effectiveRuntimeConfig.apiKey) {
-    await oc(["config", "set", `plugins.entries.${pluginId}.config.apiKey`, effectiveRuntimeConfig.apiKey]);
+    setupArgs.push("--api-key", effectiveRuntimeConfig.apiKey);
   }
   if (effectiveRuntimeConfig.agent_prefix) {
-    await oc(["config", "set", `plugins.entries.${pluginId}.config.agent_prefix`, effectiveRuntimeConfig.agent_prefix]);
+    setupArgs.push("--agent-id", effectiveRuntimeConfig.agent_prefix);
+  }
+  if (claimSlot) {
+    setupArgs.push("--force-slot");
+  }
+  if (installYes) {
+    setupArgs.push("--allow-offline");
   }
 
-  // Legacy (memory) plugins need explicit targetUri/autoRecall/autoCapture (new version has defaults in config.ts)
-  if (resolvedPluginKind === "memory") {
-    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"]);
+  info(tr(
+    "Delegating configuration to: openclaw openviking setup --json",
+    "委托配置给: openclaw openviking setup --json",
+  ));
+
+  const setupResult = await runCapture("openclaw", setupArgs, { env: ocEnv, shell: IS_WIN });
+
+  let parsed = null;
+  try {
+    parsed = JSON.parse(setupResult.out.trim());
+  } catch {
+    // If JSON parse fails, fall back to checking exit code
   }
 
-  info(tr("OpenClaw plugin configured", "OpenClaw 插件配置完成"));
+  if (parsed) {
+    if (parsed.success) {
+      info(tr("OpenClaw plugin configured via setup", "OpenClaw 插件通过 setup 配置完成"));
+      if (parsed.health?.ok) {
+        info(tr(
+          `Server health: OK${parsed.health.version ? ` (version: ${parsed.health.version})` : ""}`,
+          `服务端健康: OK${parsed.health.version ? `（版本: ${parsed.health.version}）` : ""}`,
+        ));
+      }
+      if (parsed.health?.compatibility === "server_too_old") {
+        warn(tr(
+          "Server version may be too old for this plugin version",
+          "服务端版本可能低于此插件版本要求",
+        ));
+      }
+      if (parsed.slot?.activated) {
+        info(tr(`contextEngine slot activated`, `contextEngine slot 已激活`));
+      }
+    } else {
+      // Setup returned success: false
+      if (parsed.action === "slot_blocked") {
+        warn(tr(
+          `Config saved but contextEngine slot is owned by "${parsed.slot?.previousOwner}". Use --force-slot to override.`,
+          `配置已保存，但 contextEngine slot 被 "${parsed.slot?.previousOwner}" 占用。使用 --force-slot 覆盖。`,
+        ));
+      } else {
+        err(tr(
+          `Setup failed: ${parsed.error || "unknown error"}`,
+          `配置失败: ${parsed.error || "未知错误"}`,
+        ));
+      }
+    }
+  } else if (setupResult.code !== 0) {
+    // 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 JSON config write.`,
+      `openclaw openviking setup 退出码 ${setupResult.code}，回退到直接写入 JSON 配置。`,
+    ));
+    const pluginConfig = {
+      baseUrl: effectiveRuntimeConfig.baseUrl || remoteBaseUrl,
+      apiKey: effectiveRuntimeConfig.apiKey || "",
+      agent_prefix: effectiveRuntimeConfig.agent_prefix || "",
+    };
+    await writeConfigDirect(pluginConfig, claimSlot ? pluginId : null);
+    info(tr(
+      `OpenClaw plugin configured (direct write): baseUrl=${pluginConfig.baseUrl}, apiKey=${pluginConfig.apiKey ? "***" : "(empty)"}, agent_prefix=${pluginConfig.agent_prefix || "(empty)"}`,
+      `OpenClaw 插件配置完成（直接写入）: baseUrl=${pluginConfig.baseUrl}, apiKey=${pluginConfig.apiKey ? "***" : "(空)"}, agent_prefix=${pluginConfig.agent_prefix || "(空)"}`,
+    ));
+  } else {
+    info(tr("OpenClaw plugin configured", "OpenClaw 插件配置完成"));
+  }
 }
 
 async function writeOpenvikingEnv() {

package/package.json

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