orcastrator 0.2.12 → 0.2.13

package/README.md

@@ -188,7 +188,7 @@ Global:
 
 - `--anthropic-key <key>`
 - `--openai-key <key>`
-- `--check` (also checks `~/.openclaw/openclaw.json` `env.vars` fallback)
+- `--check` (API key lookup order: CLI flag → process env → `~/.openclaw/openclaw.json` `env.vars` → `~/.claude/.env` → `~/.config/claude/.env` → `./.env`)
 - `--global`
 - `--project`
 

package/dist/cli/commands/setup.js

@@ -48,7 +48,7 @@ function commandExists(command) {
     const result = spawnSync("which", [command], { stdio: "ignore" });
     return result.status === 0;
 }
-export function resolveApiKey(flagValue, envVarName, openclawConfigPath) {
+export function resolveApiKey(flagValue, envVarName, openclawConfigPathOrOptions, maybeOptions) {
     if (flagValue && flagValue.trim().length > 0) {
         return flagValue.trim();
     }
@@ -56,14 +56,25 @@ export function resolveApiKey(flagValue, envVarName, openclawConfigPath) {
     if (envValue && envValue.trim().length > 0) {
         return envValue.trim();
     }
-    const openclawValue = readOpenclawEnvVar(envVarName, openclawConfigPath);
+    const options = typeof openclawConfigPathOrOptions === "string"
+        ? { ...(maybeOptions ?? {}), openclawConfigPath: openclawConfigPathOrOptions }
+        : (openclawConfigPathOrOptions ?? {});
+    const homedir = options.homedir ?? os.homedir();
+    const openclawValue = readOpenclawEnvVar(envVarName, options.openclawConfigPath, homedir);
     if (openclawValue) {
         return openclawValue;
     }
+    const dotenvValue = readDotEnvFallback(envVarName, {
+        cwd: options.cwd ?? process.cwd(),
+        homedir
+    });
+    if (dotenvValue) {
+        return dotenvValue;
+    }
     return undefined;
 }
-function readOpenclawEnvVar(envVarName, openclawConfigPath) {
-    const configPath = openclawConfigPath ?? path.join(os.homedir(), ".openclaw", "openclaw.json");
+function readOpenclawEnvVar(envVarName, openclawConfigPath, homedir = os.homedir()) {
+    const configPath = openclawConfigPath ?? path.join(homedir, ".openclaw", "openclaw.json");
     try {
         const fileText = readFileSync(configPath, "utf8");
         const parsed = JSON.parse(fileText);
@@ -90,6 +101,93 @@ function readOpenclawEnvVar(envVarName, openclawConfigPath) {
     }
     return undefined;
 }
+function readDotEnvFallback(envVarName, options) {
+    const candidatePaths = [
+        path.join(options.homedir, ".claude", ".env"),
+        path.join(options.homedir, ".config", "claude", ".env"),
+        path.join(options.cwd, ".env")
+    ];
+    for (const candidatePath of candidatePaths) {
+        const value = readEnvVarFromDotEnvFile(candidatePath, envVarName);
+        if (value !== undefined) {
+            return value;
+        }
+    }
+    return undefined;
+}
+function readEnvVarFromDotEnvFile(filePath, envVarName) {
+    try {
+        const parsed = parseDotEnv(readFileSync(filePath, "utf8"));
+        const value = parsed[envVarName];
+        if (value !== undefined && value.trim().length > 0) {
+            return value.trim();
+        }
+    }
+    catch {
+        return undefined;
+    }
+    return undefined;
+}
+function parseDotEnv(text) {
+    const values = {};
+    for (const rawLine of text.split(/\r?\n/)) {
+        const line = rawLine.trim();
+        if (!line || line.startsWith("#")) {
+            continue;
+        }
+        const normalized = line.startsWith("export ") ? line.slice(7).trimStart() : line;
+        const separatorIndex = normalized.indexOf("=");
+        if (separatorIndex <= 0) {
+            continue;
+        }
+        const key = normalized.slice(0, separatorIndex).trim();
+        if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(key)) {
+            continue;
+        }
+        let rawValue = normalized.slice(separatorIndex + 1).trim();
+        if (!rawValue) {
+            values[key] = "";
+            continue;
+        }
+        if (rawValue.startsWith('"') || rawValue.startsWith("'")) {
+            const quote = rawValue.charAt(0);
+            const closingQuoteIndex = findClosingQuote(rawValue, quote);
+            if (closingQuoteIndex > 0) {
+                rawValue = rawValue.slice(1, closingQuoteIndex);
+            }
+            else {
+                rawValue = rawValue.slice(1);
+            }
+            values[key] = quote === '"' ? unescapeDoubleQuoted(rawValue) : unescapeSingleQuoted(rawValue);
+            continue;
+        }
+        const commentStart = rawValue.search(/\s#/);
+        if (commentStart >= 0) {
+            rawValue = rawValue.slice(0, commentStart).trimEnd();
+        }
+        values[key] = rawValue;
+    }
+    return values;
+}
+function findClosingQuote(value, quote) {
+    for (let i = 1; i < value.length; i += 1) {
+        if (value[i] === quote && value[i - 1] !== "\\") {
+            return i;
+        }
+    }
+    return -1;
+}
+function unescapeDoubleQuoted(value) {
+    return value
+        .replace(/\\n/g, "\n")
+        .replace(/\\r/g, "\r")
+        .replace(/\\t/g, "\t")
+        .replace(/\\"/g, '"')
+        .replace(/\\\\/g, "\\");
+}
+function unescapeSingleQuoted(value) {
+    return value.replace(/\\'/g, "'").replace(/\\\\/g, "\\");
+}
 export function detectPackageManager(exists = commandExists) {
     if (exists("brew")) {
         return "brew";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orcastrator",
-  "version": "0.2.12",
+  "version": "0.2.13",
   "type": "module",
   "bin": {
     "orca": "dist/cli/index.js"