@mixio-pro/kalaasetu-mcp 2.2.7-exp → 2.2.8-exp

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mixio-pro/kalaasetu-mcp",
-  "version": "2.2.7-exp",
+  "version": "2.2.8-exp",
   "description": "A powerful Model Context Protocol server providing AI tools for content generation and analysis",
   "type": "module",
   "module": "src/index.ts",

package/src/utils/remote-config.ts

@@ -32,45 +32,48 @@ export async function loadRemoteConfig() {
     let clientId = process.env.CLIENT_ID?.trim();
     let projectId = process.env.PROJECT_ID?.trim();
 
-    if (!token) {
-      const vscodeCwd = process.env.VSCODE_CWD;
-      if (vscodeCwd) {
-        const envLocalPath = join(vscodeCwd, ".env.local");
-        if (existsSync(envLocalPath)) {
-          try {
-            const content = readFileSync(envLocalPath, "utf-8");
-            const lines = content.split(/\r?\n/);
-
-            for (const line of lines) {
-              const trimmedLine = line.trim();
-              if (!trimmedLine || trimmedLine.startsWith("#")) continue;
-
-              const match = trimmedLine.match(/^\s*([^=]+)\s*=\s*(.*)$/);
-              if (match && match[1] !== undefined && match[2] !== undefined) {
-                const key = match[1].trim();
-                const value = match[2].trim().replace(/^(['"])(.*)\1$/, "$2");
-
-                // Load into process.env if not already set manually in current execution
-                if (!process.env[key]) {
-                  process.env[key] = value;
-                }
-
-                if (key === "MIXIO_TOKEN" || key === "MIXIO_CONFIG_JWT") {
-                  if (!token) token = value;
-                }
-                if (key === "CLIENT_ID") {
-                  if (!clientId) clientId = value;
-                }
-                if (key === "PROJECT_ID") {
-                  if (!projectId) projectId = value;
-                }
+    const cwd = process.env.VSCODE_CWD || process.cwd();
+    if (cwd) {
+      // Check .env.local first, then .env
+      const envLocalPath = join(cwd, ".env.local");
+      const envPath = join(cwd, ".env");
+      let targetPath = existsSync(envLocalPath)
+        ? envLocalPath
+        : existsSync(envPath)
+          ? envPath
+          : null;
+
+      if (targetPath) {
+        try {
+          const content = readFileSync(targetPath, "utf-8");
+          const lines = content.split(/\r?\n/);
+
+          for (const line of lines) {
+            const trimmedLine = line.trim();
+            if (!trimmedLine || trimmedLine.startsWith("#")) continue;
+
+            const match = trimmedLine.match(/^\s*([^=]+)\s*=\s*(.*)$/);
+            if (match && match[1] !== undefined && match[2] !== undefined) {
+              const key = match[1].trim();
+              const value = match[2].trim().replace(/^(['"])(.*)\1$/, "$2");
+
+              // Load into process.env if not already set manually in current execution
+              if (!process.env[key]) {
+                process.env[key] = value;
               }
             }
-
-            logger.info("🔑 Loaded environment details from .env.local");
-          } catch (err) {
-            logger.warn(`Failed to read .env.local in VSCODE_CWD: ${err}`);
           }
+
+          // Re-evaluate variables after loading from file
+          token =
+            (process.env.MIXIO_TOKEN || process.env.MIXIO_CONFIG_JWT)?.trim() ||
+            token;
+          clientId = process.env.CLIENT_ID?.trim() || clientId;
+          projectId = process.env.PROJECT_ID?.trim() || projectId;
+
+          logger.info(`🔑 Loaded environment details from ${targetPath}`);
+        } catch (err) {
+          logger.warn(`Failed to read env file: ${err}`);
         }
       }
     }
@@ -94,10 +97,14 @@ export async function loadRemoteConfig() {
       }
     }
 
-    // Ensure CLIENT_ID and PROJECT_ID are in process.env
+    // Ensure CLIENT_ID and PROJECT_ID are forcefully populated into process.env if derived
     if (clientId) process.env.CLIENT_ID = clientId;
     if (projectId) process.env.PROJECT_ID = projectId;
 
+    logger.info(
+      `🔍 Config check: CLIENT_ID=${process.env.CLIENT_ID}, PROJECT_ID=${process.env.PROJECT_ID}`,
+    );
+
     if (!token || !clientId || !projectId) {
       logger.info(
         `ℹ️ Remote config skipped: token=${!!token}, client=${clientId || "missing"}, project=${projectId || "missing"}. Continuing with local env.`,