flowstride 1.0.15 → 1.0.16

package/dist/cli/index.js

@@ -54,7 +54,7 @@ const API_BASE = process.env.FLOWSTRIDE_API_URL || "https://cloud.flowstride.io"
 program
     .name("flowstride")
     .description("Flowstride: The Enterprise Flow-First Automation CLI")
-    .version("1.0.15");
+    .version("1.0.16");
 program
     .command("init")
     .description("Initialise a new Flowstride workspace in the current directory")
@@ -64,33 +64,40 @@ program
 program
     .command("login")
     .description("Authenticate this machine with Flowstride Enterprise Cloud")
-    .action(async () => {
+    .option("-t, --token <token>", "Enterprise Developer Token")
+    .option("-g, --global", "Save the token globally for all projects on this machine", false)
+    .action(async (options) => {
     const localPackageJsonPath = path.join(process.cwd(), "package.json");
-    if (!fs.existsSync(localPackageJsonPath)) {
-        console.error(chalk_1.default.red("✖ Error: Please navigate to a valid Flowstride project directory before logging in."));
-        process.exit(1);
-    }
-    const pkg = JSON.parse(fs.readFileSync(localPackageJsonPath, "utf8"));
-    const deps = {
-        ...(pkg.dependencies || {}),
-        ...(pkg.devDependencies || {}),
-    };
-    if (!deps["flowstride"] && !deps["flowstride-os"]) {
-        console.error(chalk_1.default.red("✖ Error: Please navigate to a valid Flowstride project directory before logging in."));
-        process.exit(1);
+    // Enforce valid project directory ONLY if doing a local login
+    if (!options.global) {
+        if (!fs.existsSync(localPackageJsonPath)) {
+            console.error(chalk_1.default.red("✖ Error: Please navigate to a valid Flowstride project directory before logging in locally, or use --global."));
+            process.exit(1);
+        }
+        const pkg = JSON.parse(fs.readFileSync(localPackageJsonPath, "utf8"));
+        const deps = {
+            ...(pkg.dependencies || {}),
+            ...(pkg.devDependencies || {}),
+        };
+        if (!deps["flowstride"] && !deps["flowstride-os"]) {
+            console.error(chalk_1.default.red("✖ Error: Please navigate to a valid Flowstride project directory before logging in locally, or use --global."));
+            process.exit(1);
+        }
     }
     console.log(chalk_1.default.bold.blue("\n🌐 Flowstride Enterprise Cloud Sync\n"));
-    let authHeader = "";
-    if (process.env.FLOWSTRIDE_API_KEY) {
-        console.log(chalk_1.default.yellow("🤖 CI/CD Environment Detected. Authenticating via API Key..."));
-        authHeader = `Bearer ${process.env.FLOWSTRIDE_API_KEY}`;
+    let token = process.env.FLOWSTRIDE_TOKEN || options.token;
+    if (process.env.FLOWSTRIDE_TOKEN) {
+        console.log(chalk_1.default.yellow("🤖 CI/CD Environment Detected. Authenticating via FLOWSTRIDE_TOKEN..."));
     }
-    else {
-        const userEmail = await (0, prompts_1.input)({
-            message: "Enter your Flowstride email:",
+    else if (!token) {
+        token = await (0, prompts_1.password)({
+            message: "Paste your Enterprise Developer Token:",
+            mask: "*",
         });
-        const userPass = await (0, prompts_1.password)({ message: "Enter your password:" });
-        authHeader = `Basic ${Buffer.from(`${userEmail}:${userPass}`).toString("base64")}`;
+    }
+    if (!token || token.trim().length === 0) {
+        console.error(chalk_1.default.red("✖ Error: A valid Developer Token is required."));
+        process.exit(1);
     }
     const deviceName = os.hostname();
     const spinner = (0, ora_1.default)("Authenticating with Cloud...").start();
@@ -99,34 +106,37 @@ program
             method: "POST",
             headers: {
                 "Content-Type": "application/json",
-                Authorization: authHeader,
+                Authorization: `Bearer ${token.trim()}`,
             },
             body: JSON.stringify({ deviceName }),
         });
         const data = await response.json();
         if (!response.ok) {
-            spinner.fail(chalk_1.default.red(`Authentication Failed: ${data.error || "Unknown error"}`));
+            spinner.fail(chalk_1.default.red(`Authentication Failed: ${data.error || "Invalid token or network error"}`));
             process.exit(1);
         }
         spinner.succeed(chalk_1.default.green("Authentication Successful!"));
-        const configDir = path.join(process.cwd(), ".flowstride", "login");
+        const configDir = options.global
+            ? path.join(os.homedir(), ".flowstride")
+            : path.join(process.cwd(), ".flowstride");
         if (!fs.existsSync(configDir)) {
             fs.mkdirSync(configDir, { recursive: true });
         }
-        const credentialsPath = path.join(configDir, "login.json");
+        const credentialsPath = path.join(configDir, "credentials.json");
         fs.writeFileSync(credentialsPath, JSON.stringify({
-            machineToken: data.machineToken,
+            machineToken: data.machineToken || token.trim(),
             workspaceId: data.workspaceId,
             deviceName: deviceName,
             syncedAt: new Date().toISOString(),
         }, null, 2));
-        console.log(chalk_1.default.gray(`\nCredentials securely scoped to ${credentialsPath}`));
+        const scopeText = options.global ? "GLOBALLY" : "LOCALLY to this project";
+        console.log(chalk_1.default.gray(`\nCredentials securely scoped ${scopeText} at: ${credentialsPath}`));
         if (data.isProEligible) {
             console.log(chalk_1.default.yellow(`\n⚙️ System Check: You have access to Enterprise features (AI Healing, Parallel Workers).`));
             const nodeModulesPath = path.join(process.cwd(), "node_modules", "@flowstride", "pro");
             if (!fs.existsSync(nodeModulesPath)) {
                 let installPro = true;
-                if (!process.env.FLOWSTRIDE_API_KEY && !process.env.CI) {
+                if (!process.env.FLOWSTRIDE_TOKEN && !process.env.CI) {
                     installPro = await (0, prompts_1.confirm)({
                         message: "The Pro Engine is not installed in this project. Would you like Flowstride to automatically install it now?",
                         default: true,
@@ -138,7 +148,7 @@ program
                     try {
                         const tarballResponse = await fetch(`${API_BASE}/api/workspace/download-pro`, {
                             method: "GET",
-                            headers: { Authorization: `Bearer ${data.machineToken}` },
+                            headers: { Authorization: `Bearer ${token.trim()}` },
                         });
                         if (!tarballResponse.ok) {
                             throw new Error(`Secure proxy rejected request: ${tarballResponse.statusText}`);
@@ -200,21 +210,34 @@ program
     .command("status")
     .description("Display the current Flowstride CLI authentication and engine tier")
     .action(async () => {
-    let token = process.env.FLOWSTRIDE_API_KEY || null;
-    const credentialsPath = path.join(process.cwd(), ".flowstride", "login", "login.json");
-    const nodeModulesPath = path.join(process.cwd(), "node_modules", "@flowstride", "pro");
-    if (!token && fs.existsSync(credentialsPath)) {
-        try {
-            const credentials = JSON.parse(fs.readFileSync(credentialsPath, "utf8"));
-            token = credentials.machineToken;
+    let token = process.env.FLOWSTRIDE_TOKEN || null;
+    const localCredentialsPath = path.join(process.cwd(), ".flowstride", "credentials.json");
+    const globalCredentialsPath = path.join(os.homedir(), ".flowstride", "credentials.json");
+    let activeCredentialsPath = localCredentialsPath; // Default for cleanup
+    if (!token) {
+        if (fs.existsSync(localCredentialsPath)) {
+            activeCredentialsPath = localCredentialsPath;
+            try {
+                const credentials = JSON.parse(fs.readFileSync(localCredentialsPath, "utf8"));
+                token = credentials.machineToken;
+            }
+            catch (err) { }
+        }
+        else if (fs.existsSync(globalCredentialsPath)) {
+            activeCredentialsPath = globalCredentialsPath;
+            try {
+                const credentials = JSON.parse(fs.readFileSync(globalCredentialsPath, "utf8"));
+                token = credentials.machineToken;
+            }
+            catch (err) { }
         }
-        catch (err) { }
     }
-    if (!process.env.FLOWSTRIDE_API_KEY &&
+    const nodeModulesPath = path.join(process.cwd(), "node_modules", "@flowstride", "pro");
+    if (!process.env.FLOWSTRIDE_TOKEN &&
         token &&
         !fs.existsSync(nodeModulesPath)) {
-        if (fs.existsSync(credentialsPath))
-            fs.unlinkSync(credentialsPath);
+        if (fs.existsSync(activeCredentialsPath))
+            fs.unlinkSync(activeCredentialsPath);
         token = null;
     }
     if (!token) {
@@ -228,8 +251,8 @@ program
         });
         if (response.status === 401) {
             console.log(chalk_1.default.red("🔴 AUTH EXPIRED: Your device session was revoked or expired."));
-            if (fs.existsSync(credentialsPath))
-                fs.unlinkSync(credentialsPath);
+            if (fs.existsSync(activeCredentialsPath))
+                fs.unlinkSync(activeCredentialsPath);
         }
         else if (response.ok) {
             const data = await response.json();
@@ -261,22 +284,35 @@ program
         options = targetPath;
         targetPath = undefined;
     }
-    let token = process.env.FLOWSTRIDE_API_KEY || null;
+    let token = process.env.FLOWSTRIDE_TOKEN || null;
     let forceOS = false;
-    const credentialsPath = path.join(process.cwd(), ".flowstride", "login", "login.json");
-    const nodeModulesPath = path.join(process.cwd(), "node_modules", "@flowstride", "pro");
-    if (!token && fs.existsSync(credentialsPath)) {
-        try {
-            const credentials = JSON.parse(fs.readFileSync(credentialsPath, "utf8"));
-            token = credentials.machineToken;
+    const localCredentialsPath = path.join(process.cwd(), ".flowstride", "credentials.json");
+    const globalCredentialsPath = path.join(os.homedir(), ".flowstride", "credentials.json");
+    let activeCredentialsPath = localCredentialsPath;
+    if (!token) {
+        if (fs.existsSync(localCredentialsPath)) {
+            activeCredentialsPath = localCredentialsPath;
+            try {
+                const credentials = JSON.parse(fs.readFileSync(localCredentialsPath, "utf8"));
+                token = credentials.machineToken;
+            }
+            catch (err) { }
+        }
+        else if (fs.existsSync(globalCredentialsPath)) {
+            activeCredentialsPath = globalCredentialsPath;
+            try {
+                const credentials = JSON.parse(fs.readFileSync(globalCredentialsPath, "utf8"));
+                token = credentials.machineToken;
+            }
+            catch (err) { }
         }
-        catch (err) { }
     }
-    if (!process.env.FLOWSTRIDE_API_KEY &&
+    const nodeModulesPath = path.join(process.cwd(), "node_modules", "@flowstride", "pro");
+    if (!process.env.FLOWSTRIDE_TOKEN &&
         token &&
         !fs.existsSync(nodeModulesPath)) {
-        if (fs.existsSync(credentialsPath))
-            fs.unlinkSync(credentialsPath);
+        if (fs.existsSync(activeCredentialsPath))
+            fs.unlinkSync(activeCredentialsPath);
         token = null;
     }
     if (!token) {
@@ -291,8 +327,8 @@ program
             });
             if (response.status === 401) {
                 console.log(chalk_1.default.red("🔴 AUTH EXPIRED: Your device session was revoked or expired."));
-                if (fs.existsSync(credentialsPath))
-                    fs.unlinkSync(credentialsPath);
+                if (fs.existsSync(activeCredentialsPath))
+                    fs.unlinkSync(activeCredentialsPath);
                 forceOS = true;
             }
             else if (response.ok) {
@@ -328,7 +364,7 @@ program
 });
 async function handleOfflinePrompt() {
     console.log(chalk_1.default.yellow("🛜 OFFLINE: Unable to reach Flowstride Cloud. Enterprise Sync paused."));
-    if (process.env.CI || process.env.FLOWSTRIDE_API_KEY) {
+    if (process.env.CI || process.env.FLOWSTRIDE_TOKEN) {
         console.log(chalk_1.default.yellow("⚠️ CI/CD Environment: Automatically falling back to OS Engine."));
         return true;
     }

package/dist/parser/parser.js

@@ -357,7 +357,6 @@ class Parser {
                     throw new Error(`Line ${viaToken.line}: Expected 'via'`);
                 payload.verb = this.consume(lexer_1.TokenType.COMMAND, "Expected API verb (e.g. POST)").value.toLowerCase();
                 payload.url = this.consume(lexer_1.TokenType.STRING, "Endpoint URL expected").value;
-                // --- ENSURE ARRAY FORMAT FOR API CLIENT ---
                 payload.headers = [];
                 this.parseApiModifiers(payload);
                 break;
@@ -368,7 +367,6 @@ class Parser {
             case "delete":
             case "graphql":
                 payload.url = this.consume(lexer_1.TokenType.STRING, "Endpoint URL expected").value;
-                // --- ENSURE ARRAY FORMAT FOR API CLIENT ---
                 payload.headers = [];
                 this.parseApiModifiers(payload);
                 break;
@@ -617,16 +615,13 @@ class Parser {
                     throw new Error(`Syntax Error on line ${targetToken.line}: Invalid keyword '${target}'. Flowstride uses strict camelCase. Did you mean 'reqHeader'?`);
                 }
                 if (target === "reqHeader") {
-                    // --- THE NEW MULTI-FORMAT HEADER PARSER ---
                     const firstToken = this.consume(lexer_1.TokenType.STRING, "Header key or JSON block expected");
-                    // Lookahead: If the next token is ALSO a string, use the legacy Key-Value parsing
                     if (!this.isAtEnd() && this.peek().type === lexer_1.TokenType.STRING) {
                         const hKey = firstToken.value;
                         const hVal = this.advance().value;
                         payload.headers.push({ key: hKey, value: hVal });
                     }
                     else {
-                        // Otherwise, it must be the new multi-line JSON Block format
                         try {
                             const headerObj = JSON.parse(firstToken.value);
                             if (typeof headerObj !== "object" ||
@@ -634,7 +629,6 @@ class Parser {
                                 Array.isArray(headerObj)) {
                                 throw new Error("Parsed JSON is not a Key-Value object.");
                             }
-                            // Loop through the parsed block and push them into the array for the API client
                             for (const [k, v] of Object.entries(headerObj)) {
                                 payload.headers.push({ key: k, value: String(v) });
                             }
@@ -643,7 +637,6 @@ class Parser {
                             throw new Error(`Line ${firstToken.line}: Invalid JSON format for reqHeader block. Ensure it is a valid JSON object, or use the legacy format with two strings (Key and Value).`);
                         }
                     }
-                    // ------------------------------------------
                 }
                 else if (target === "reqBody") {
                     payload.body = this.consume(lexer_1.TokenType.STRING, "Body content expected").value;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flowstride",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "description": "An opensource flowfirst test automation framework",
   "workspaces": [
     "packages/flowstride_report"