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

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;
@@ -1419,9 +1419,11 @@ 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 fullArgs = needWorkdirFlag ? [...args, "--workdir", OPENCLAW_DIR] : 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 });
     if (result.code !== 0) {
       const detail = result.err || result.out;
@@ -1486,11 +1488,11 @@ async function configureOpenClawPlugin({
     agent_prefix: remoteAgentPrefix,
   };
 
-  const setupArgs = [
-    "openviking", "setup",
-    "--base-url", effectiveRuntimeConfig.baseUrl || remoteBaseUrl,
-    "--json",
-  ];
+  const setupArgs = needWorkdirFlag
+    ? ["--workdir", OPENCLAW_DIR, "openviking", "setup"]
+    : ["openviking", "setup"];
+  setupArgs.push("--base-url", effectiveRuntimeConfig.baseUrl || remoteBaseUrl);
+  setupArgs.push("--json");
   if (effectiveRuntimeConfig.apiKey) {
     setupArgs.push("--api-key", effectiveRuntimeConfig.apiKey);
   }
@@ -1504,10 +1506,6 @@ 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",

package/package.json

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