flowstride 1.0.20-rc.2 → 1.0.20

package/dist/adapters/web/playwright.js

@@ -37,6 +37,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebAdapter = void 0;
+const projectPaths_1 = require("../../utils/projectPaths");
 const playwright_1 = require("playwright");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
@@ -51,6 +52,21 @@ class WebAdapter {
     page = null;
     discoveredPages = [];
     dialogHandler = null;
+    pendingSessionStorageRestore = null;
+    async clearSessionStorageRestore() {
+        const pending = this.pendingSessionStorageRestore;
+        this.pendingSessionStorageRestore = null;
+        if (!pending)
+            return;
+        pending.page.off('framenavigated', pending.onNavigation);
+        try {
+            await pending.script.dispose();
+        }
+        catch (error) {
+            if (!pending.page.isClosed())
+                throw error;
+        }
+    }
     constructor(config) {
         this.config = config;
     }
@@ -60,6 +76,7 @@ class WebAdapter {
         return this.page;
     }
     async initialise(audioInjectionPath) {
+        await this.clearSessionStorageRestore();
         const launchArgs = this.config.headless
             ? [
                 "--use-fake-ui-for-media-stream",
@@ -81,7 +98,7 @@ class WebAdapter {
             ...(this.config.ci ? { handleSIGINT: false, handleSIGTERM: false } : {}),
             args: launchArgs,
         });
-        const videoDir = path.join(process.cwd(), ".flowstride", "videos");
+        const videoDir = (0, projectPaths_1.projectPath)(process.cwd(), path.join('.flowstride', 'videos'));
         if (!fs.existsSync(videoDir))
             fs.mkdirSync(videoDir, { recursive: true });
         const profile = this.config.device === 'phone' || this.config.device === 'landscape'
@@ -125,7 +142,7 @@ class WebAdapter {
         };
     }
     async injectAudio(filePath) {
-        const absolutePath = path.resolve(process.cwd(), filePath);
+        const absolutePath = (0, projectPaths_1.projectPath)(process.cwd(), filePath);
         if (!fs.existsSync(absolutePath)) {
             throw new Error(`Audio file not found at: ${absolutePath}`);
         }
@@ -182,9 +199,26 @@ class WebAdapter {
         await this.page.bringToFront();
         await this.page.waitForLoadState("domcontentloaded").catch(() => { });
     }
-    async injectStorage(cookies, localStorage, fallbackDomain) {
+    async injectStorage(cookies, localStorage, fallbackDomain, sessionStorage, storageOrigin) {
         if (!this.context || !this.page)
             return;
+        await this.clearSessionStorageRestore();
+        const page = this.page;
+        const originOf = (value) => {
+            try {
+                const url = new URL(value || '');
+                return ['http:', 'https:'].includes(url.protocol) ? url.origin : undefined;
+            }
+            catch {
+                return undefined;
+            }
+        };
+        const hasSessionStorage = !!sessionStorage && Object.keys(sessionStorage).length > 0;
+        const origin = storageOrigin !== undefined ? originOf(storageOrigin)
+            : originOf(page.url()) || originOf(this.config.baseUrl);
+        if (hasSessionStorage && !origin) {
+            throw new Error('Session storage restoration requires a saved HTTP(S) origin, an open application page, or baseUrl.');
+        }
         if (cookies && cookies.length > 0) {
             const formattedCookies = [];
             for (const cookie of cookies) {
@@ -231,6 +265,32 @@ class WebAdapter {
                 }, localStorage);
             }
         }
+        if (hasSessionStorage) {
+            const restore = (data) => {
+                if (window !== window.top || window.location.origin !== data.origin)
+                    return;
+                for (const [key, value] of Object.entries(data.values))
+                    window.sessionStorage.setItem(key, value);
+            };
+            const data = { origin: origin, values: sessionStorage };
+            if (originOf(page.url()) === origin) {
+                await page.evaluate(restore, data);
+            }
+            else {
+                // Seed before application scripts run; remove the seed after the first
+                // matching document so reloads preserve later application changes.
+                const script = await page.addInitScript(restore, data);
+                const onNavigation = (frame) => {
+                    if (frame !== page.mainFrame() || originOf(frame.url()) !== origin)
+                        return;
+                    void this.clearSessionStorageRestore().catch(() => {
+                        console.warn('[Session]: Could not remove the completed session storage initializer.');
+                    });
+                };
+                this.pendingSessionStorageRestore = { page, script, onNavigation };
+                page.on('framenavigated', onNavigation);
+            }
+        }
     }
     async getState() {
         const cookies = (await this.context?.cookies()) || [];
@@ -249,7 +309,14 @@ class WebAdapter {
                 console.warn("Warning: Could not access storage. Ensure page is loaded.");
             }
         }
-        return { cookies, localStorage, sessionStorage };
+        let storageOrigin;
+        try {
+            const url = new URL(this.page?.url() || '');
+            if (['http:', 'https:'].includes(url.protocol))
+                storageOrigin = url.origin;
+        }
+        catch { }
+        return { cookies, localStorage, sessionStorage, storageOrigin };
     }
     getCurrentUrl() {
         return this.page ? this.page.url() : "about:blank";
@@ -274,7 +341,8 @@ class WebAdapter {
         });
     }
     synthesizeCurl(method, url, headers, postData) {
-        let curl = `curl -X ${method.toUpperCase()} '${url}'`;
+        const safeUrl = url.replace(/'/g, "'\\''");
+        let curl = `curl -X ${method.toUpperCase()} '${safeUrl}'`;
         for (const [key, value] of Object.entries(headers)) {
             if (key.startsWith(":"))
                 continue;
@@ -614,7 +682,7 @@ class WebAdapter {
         const targetLoc = await this.checkAmbiguity(loc, selector);
         await targetLoc.waitFor({ state: "visible" });
         await targetLoc.scrollIntoViewIfNeeded();
-        const absolutePath = path.resolve(process.cwd(), filePath);
+        const absolutePath = (0, projectPaths_1.projectPath)(process.cwd(), filePath);
         if (!fs.existsSync(absolutePath)) {
             throw new Error(`File Upload Error: Could not find the file at "${absolutePath}". Please ensure the file exists in your project directory.`);
         }
@@ -1194,6 +1262,7 @@ class WebAdapter {
     }
     async shutdown(videoTargetPath) {
         try {
+            await this.clearSessionStorageRestore();
             const video = this.page?.video();
             if (this.context) {
                 await this.context.close();

package/dist/ci/config.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isCIEnvironment = isCIEnvironment;
 exports.loadNativeConfig = loadNativeConfig;
+const projectPaths_1 = require("../utils/projectPaths");
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 function isCIEnvironment() {
@@ -12,7 +13,7 @@ function isCIEnvironment() {
         .some(key => !!process.env[key] && process.env[key] !== 'false' && process.env[key] !== '0');
 }
 function loadNativeConfig(root, options) {
-    const file = node_path_1.default.join(root, options.config || 'flowstride.config.json');
+    const file = (0, projectPaths_1.projectPath)(root, options.config || 'flowstride.config.json');
     let input = {};
     if (node_fs_1.default.existsSync(file)) {
         input = JSON.parse(node_fs_1.default.readFileSync(file, 'utf8'));
@@ -21,8 +22,8 @@ function loadNativeConfig(root, options) {
     }
     else if (options.config)
         throw new Error(`Configuration not found: ${file}`);
-    const config = { ...input, timeout: input.timeout ?? 30000, headless: input.headless ?? true,
-        ci: !!options.ci || isCIEnvironment(), device: options.device ?? input.device ?? 'desktop',
+    const config = { ...input, projectRoot: node_path_1.default.resolve(root), timeout: input.timeout ?? 30000, headless: input.headless ?? true,
+        ci: !!options.ci || isCIEnvironment(), bail: options.bail || input.bail || false, device: options.device ?? input.device ?? 'desktop',
         artifactsDir: input.artifactsDir ?? 'flowstride-artifacts', testDir: input.testDir ?? 'flows',
         defaultDialogBehavior: input.defaultDialogBehavior ?? 'dismiss',
         recordVideo: input.recordVideo ?? true, browserErrors: input.browserErrors ?? 'fail',
@@ -50,7 +51,7 @@ function loadNativeConfig(root, options) {
             continue;
         if (typeof config[key] !== 'string' || !config[key].trim())
             throw new Error(`${key} must be a nonempty path.`);
-        const resolved = node_path_1.default.resolve(root, config[key]);
+        const resolved = (0, projectPaths_1.projectPath)(root, config[key]);
         const relative = node_path_1.default.relative(root, resolved);
         if ((key === 'artifactsDir' && !relative) || relative === '..' || relative.startsWith(`..${node_path_1.default.sep}`) || node_path_1.default.isAbsolute(relative))
             throw new Error(`${key} must be a directory inside the project.`);
@@ -67,7 +68,7 @@ function loadNativeConfig(root, options) {
             throw new Error('webServer readiness URL must use local HTTP(S).');
         if (server.timeout !== undefined && (!Number.isSafeInteger(server.timeout) || server.timeout < 1))
             throw new Error('webServer.timeout must be positive.');
-        server.cwd = node_path_1.default.resolve(root, server.cwd || '.');
+        server.cwd = (0, projectPaths_1.projectPath)(root, server.cwd || '.');
         const relative = node_path_1.default.relative(root, server.cwd);
         if (relative === '..' || relative.startsWith(`..${node_path_1.default.sep}`) || node_path_1.default.isAbsolute(relative))
             throw new Error('webServer.cwd must be inside the project.');

package/dist/ci/runtime.js

@@ -4,19 +4,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runNativeCI = runNativeCI;
+const node_crypto_1 = require("node:crypto");
+const projectPaths_1 = require("../utils/projectPaths");
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const node_child_process_1 = require("node:child_process");
 const promises_1 = require("node:timers/promises");
 const lexer_1 = require("../parser/lexer");
 const parser_1 = require("../parser/parser");
-function listFlows(target) {
-    const stat = node_fs_1.default.statSync(target);
-    if (stat.isFile())
-        return target.endsWith('.flow') ? [target] : [];
-    return node_fs_1.default.readdirSync(target).filter(name => name.endsWith('.flow')).sort().map(name => node_path_1.default.join(target, name));
-}
-function safeName(name) { return name.replace(/[^a-zA-Z0-9_.-]/g, '_').slice(0, 150); }
+function safeName(name) { return name.replace(/[^a-zA-Z0-9_.-]/g, '_').slice(0, 120) + '-' + (0, node_crypto_1.createHash)('sha256').update(name).digest('hex').slice(0, 12); }
 function xml(value) { return String(value).replace(/[\x00-\x08\x0b\x0c\x0e-\x1f\x7f]/g, '').replace(/[<>&"']/g, char => ({ '<': '&lt;', '>': '&gt;', '&': '&amp;', '"': '&quot;', "'": '&apos;' }[char])); }
 async function runNativeCI(worker, orchestrator, target, config, engine) {
     const started = Date.now();
@@ -27,6 +23,8 @@ async function runNativeCI(worker, orchestrator, target, config, engine) {
     const steps = new Map();
     const completed = new Set();
     const errors = [];
+    const planned = new Map();
+    let bailed = false;
     let expected = 0;
     let files = [];
     let server;
@@ -36,6 +34,8 @@ async function runNativeCI(worker, orchestrator, target, config, engine) {
         if (!data?.payload)
             return;
         const p = data.payload;
+        if (data.type === 'BAIL')
+            bailed = true;
         if (data.type === 'LOG_EVENT' && p.status === 'error') {
             const active = [...steps.values()].reverse().find(step => step.fileName === p.fileName && step.status === 'running');
             if (active)
@@ -56,6 +56,8 @@ async function runNativeCI(worker, orchestrator, target, config, engine) {
             errors.push(`${p.fileName}: ${p.error || 'Execution failed'}`);
         if (data.type === 'BROWSER_ERROR' && config.browserErrors !== 'record')
             errors.push(`Browser: ${p.message}`);
+        if (data.type === 'CLOUD_SYNC')
+            config.cloudSyncResult = p;
         if (data.type === 'WORKER_ERROR')
             errors.push(p.message || 'Worker failed');
     };
@@ -67,11 +69,18 @@ async function runNativeCI(worker, orchestrator, target, config, engine) {
     process.on('SIGINT', interrupt);
     process.on('SIGTERM', interrupt);
     try {
-        files = listFlows(target);
+        files = (0, projectPaths_1.discoverFlows)(target, config.projectRoot || process.cwd());
+        config.flowRoot = node_fs_1.default.statSync(target).isDirectory() ? target : node_path_1.default.dirname(target);
         if (!files.length)
             throw new Error('No .flow tests found.');
         for (const file of files) {
-            const features = new parser_1.Parser(new lexer_1.Lexer(node_fs_1.default.readFileSync(file, 'utf8')).tokenise()).parse();
+            const features = (0, projectPaths_1.selectedFeatures)(new parser_1.Parser(new lexer_1.Lexer(node_fs_1.default.readFileSync(file, 'utf8')).tokenise()).parse());
+            for (const feature of features)
+                for (const scenario of feature.scenarios)
+                    for (const step of scenario.steps) {
+                        const fileName = (0, projectPaths_1.flowIdentity)(file, config.flowRoot);
+                        planned.set(`${fileName}:${step.id}`, { id: step.id, description: step.blockDescription, command: step.action, fileName, status: 'skipped', reason: 'bail' });
+                    }
             expected += features.reduce((n, feature) => n + feature.scenarios.reduce((m, scenario) => m + scenario.steps.length, 0), 0);
         }
         if (!expected)
@@ -150,26 +159,30 @@ async function runNativeCI(worker, orchestrator, target, config, engine) {
     }
     if (interrupted)
         errors.push('Run interrupted.');
+    if (bailed)
+        for (const [key, step] of planned)
+            if (!steps.has(key))
+                steps.set(key, step);
     const results = [...steps.values()];
     const terminal = results.filter(step => ['passed', 'failed', 'skipped', 'not_tested'].includes(step.status));
     const incomplete = Math.max(0, expected - terminal.length);
     for (const file of files)
-        if (!completed.has(node_path_1.default.basename(file)))
-            errors.push(`Incomplete file: ${node_path_1.default.basename(file)}`);
+        if (!bailed && !completed.has((0, projectPaths_1.flowIdentity)(file, config.flowRoot)))
+            errors.push(`Incomplete file: ${(0, projectPaths_1.flowIdentity)(file, config.flowRoot)}`);
     if (results.some(step => !['passed', 'failed', 'skipped', 'not_tested'].includes(step.status)))
         errors.push('Unfinished test steps.');
     if (terminal.length > expected)
         errors.push('Engine produced an unexpected step count.');
     const metrics = { total: expected, passed: results.filter(s => s.status === 'passed').length,
         failed: results.filter(s => s.status === 'failed').length, skipped: results.filter(s => ['skipped', 'not_tested'].includes(s.status)).length, incomplete };
-    const result = { protocol: 1, engine, status: interrupted ? 'interrupted' : errors.length || metrics.failed || incomplete ? 'failed' : 'passed',
-        duration: Date.now() - started, artifactsDir: directory, files: files.map(file => node_path_1.default.basename(file)), steps: results, errors, metrics };
+    const result = { cloudSync: config.cloudSyncResult, protocol: 1, engine, status: interrupted ? 'interrupted' : errors.length || metrics.failed || incomplete ? 'failed' : 'passed',
+        duration: Date.now() - started, artifactsDir: directory, files: files.map(file => (0, projectPaths_1.flowIdentity)(file, config.flowRoot)), steps: results, errors, metrics };
     // Existing workers finalize videos into these locations. Copy only run files,
     // never the project directory or credentials.
     if (config.recordVideo !== false)
         for (const file of files) {
             for (const folder of ['artifacts', 'mock-cloud']) {
-                const video = node_path_1.default.join(process.cwd(), '.flowstride', folder, node_path_1.default.basename(file, '.flow') + '.webm');
+                const video = node_path_1.default.join(process.cwd(), '.flowstride', folder, (0, projectPaths_1.videoFileName)((0, projectPaths_1.flowIdentity)(file, config.flowRoot)));
                 if (node_fs_1.default.existsSync(video) && node_fs_1.default.statSync(video).mtimeMs >= started) {
                     node_fs_1.default.copyFileSync(video, node_path_1.default.join(directory, node_path_1.default.basename(video)));
                     break;

package/dist/cli/commands/run.js

@@ -34,6 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runAction = runAction;
+const projectPaths_1 = require("../../utils/projectPaths");
 const config_1 = require("../../ci/config");
 const runtime_1 = require("../../ci/runtime");
 const fs = __importStar(require("fs"));
@@ -53,7 +54,7 @@ const api_proxy_1 = require("../../sdk/api_proxy");
 async function runAction(targetPath, options) {
     const root = process.cwd();
     const profileEnvPath = options.env
-        ? path.resolve(root, `.env.${options.env}`)
+        ? (0, projectPaths_1.projectPath)(root, `.env.${options.env}`)
         : null;
     const defaultEnvPath = path.resolve(root, ".env");
     if (profileEnvPath) {

package/dist/cli/index.js

@@ -37,6 +37,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const cloud_1 = require("../utils/cloud");
+const cloudSession_1 = require("./utils/cloudSession");
 const config_1 = require("../ci/config");
 const init_1 = require("../ci/init");
 const commander_1 = require("commander");
@@ -47,16 +49,21 @@ const open_1 = require("./commands/open");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const os = __importStar(require("os"));
-const child_process_1 = require("child_process");
+const proInstaller_1 = require("./utils/proInstaller");
 const prompts_1 = require("@inquirer/prompts");
 const chalk_1 = __importDefault(require("chalk"));
 const ora_1 = __importDefault(require("ora"));
 const program = new commander_1.Command();
-const API_BASE = process.env.FLOWSTRIDE_API_URL || "https://cloud.flowstride.io";
+program.hook('preAction', (_program, command) => {
+    if (['login', 'status', 'run', 'update'].includes(command.name())) {
+        API_BASE = (0, cloudSession_1.loadCloudEnvironment)(process.cwd(), command.opts().env);
+    }
+});
+let API_BASE = (0, cloud_1.cloudApiBase)(process.env);
 program
     .name("flowstride")
     .description("Flowstride: The Enterprise Flow-First Automation CLI")
-    .version("1.0.20-rc.2");
+    .version("1.0.20");
 program
     .command("init")
     .description("Initialise a new Flowstride workspace in the current directory")
@@ -101,6 +108,7 @@ program
         console.error(chalk_1.default.red("✖ Error: A valid Developer Token is required."));
         process.exit(1);
     }
+    console.log(`[Cloud]: ${API_BASE}; login credential source: ${process.env.FLOWSTRIDE_TOKEN ? 'FLOWSTRIDE_TOKEN (environment)' : options.token ? '--token option' : 'interactive prompt'}`);
     const deviceName = os.hostname();
     const spinner = (0, ora_1.default)("Authenticating with Cloud...").start();
     try {
@@ -114,10 +122,11 @@ program
         });
         const data = await response.json();
         if (!response.ok) {
-            spinner.fail(chalk_1.default.red(`Authentication Failed: ${data.error || "Invalid token or network error"}`));
+            spinner.fail(chalk_1.default.red(`Authentication Failed: ${(0, cloud_1.cloudFailure)({ response: { status: response.status, data } }, [token.trim()]).message}`));
             process.exit(1);
         }
         spinner.succeed(chalk_1.default.green("Authentication Successful!"));
+        console.log((0, cloudSession_1.tokenExpiryDescription)(data));
         const configDir = options.global
             ? path.join(os.homedir(), ".flowstride")
             : path.join(process.cwd(), ".flowstride");
@@ -146,42 +155,14 @@ program
                 }
                 if (installPro) {
                     const installSpinner = (0, ora_1.default)("Downloading Enterprise Engine via secure proxy...").start();
-                    const tarballPath = path.join(process.cwd(), "flowstride-pro.tgz");
                     try {
-                        const tarballResponse = await fetch(`${API_BASE}/api/workspace/download-pro`, {
-                            method: "GET",
-                            headers: { Authorization: `Bearer ${token.trim()}` },
-                        });
-                        if (!tarballResponse.ok) {
-                            throw new Error(`Secure proxy rejected request: ${tarballResponse.statusText}`);
-                        }
-                        const buffer = await tarballResponse.arrayBuffer();
-                        fs.writeFileSync(tarballPath, Buffer.from(buffer));
-                        installSpinner.text = "Wiring up Enterprise dependencies...";
-                        installSpinner.color = "cyan";
-                        // Let npm natively handle the extraction and binary symlinking
-                        (0, child_process_1.execSync)(`npm install "${tarballPath}" --no-save`, {
-                            cwd: process.cwd(),
-                            stdio: "ignore",
-                        });
+                        await (0, proInstaller_1.installProEngine)(API_BASE, token.trim());
                         installSpinner.succeed(chalk_1.default.green("Enterprise Engine installed successfully!"));
                     }
-                    catch (installError) {
-                        installSpinner.stop();
-                        console.error(chalk_1.default.bgRed.white("\n[RAW SYSTEM ERROR]:"), installError);
-                        console.log(chalk_1.default.red("\n✖ Failed to install the Enterprise Engine. Please check your internet connection or verify your project configuration."));
-                        if (fs.existsSync(nodeModulesPath)) {
-                            fs.rmSync(nodeModulesPath, { recursive: true, force: true });
-                        }
-                        console.log(chalk_1.default.yellow("⚠️ Reverting login: Enterprise Engine is required to sync."));
-                        if (fs.existsSync(credentialsPath))
-                            fs.unlinkSync(credentialsPath);
-                        process.exit(1);
-                    }
-                    finally {
-                        if (fs.existsSync(tarballPath)) {
-                            fs.unlinkSync(tarballPath);
-                        }
+                    catch (error) {
+                        installSpinner.fail(error instanceof Error ? error.message : "Enterprise installation failed");
+                        console.log(chalk_1.default.yellow("Credentials remain available. You can retry installation; runs can fall back to the Open Source engine."));
+                        process.exitCode = 1;
                     }
                 }
                 else {
@@ -196,7 +177,7 @@ program
         console.log(chalk_1.default.bold.green(`\n✅ Machine synchronized with Flowstride Enterprise.`));
     }
     catch (error) {
-        spinner.fail(chalk_1.default.red(`Network Error: Could not connect to cloud.flowstride.io`));
+        spinner.fail(chalk_1.default.red((0, cloud_1.cloudFailure)(error, [token.trim()]).message));
         process.exit(1);
     }
 });
@@ -204,7 +185,8 @@ program
     .command("status")
     .description("Display the current Flowstride CLI authentication and engine tier")
     .action(async () => {
-    let token = process.env.FLOWSTRIDE_TOKEN || null;
+    console.log((0, cloudSession_1.cloudSessionDescription)(API_BASE));
+    let token = process.env.FLOWSTRIDE_TOKEN?.trim() || 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
@@ -213,7 +195,7 @@ program
             activeCredentialsPath = localCredentialsPath;
             try {
                 const credentials = JSON.parse(fs.readFileSync(localCredentialsPath, "utf8"));
-                token = credentials.machineToken;
+                token = credentials.machineToken?.trim() || null;
             }
             catch (err) { }
         }
@@ -221,7 +203,7 @@ program
             activeCredentialsPath = globalCredentialsPath;
             try {
                 const credentials = JSON.parse(fs.readFileSync(globalCredentialsPath, "utf8"));
-                token = credentials.machineToken;
+                token = credentials.machineToken?.trim() || null;
             }
             catch (err) { }
         }
@@ -243,9 +225,10 @@ program
             method: "GET",
             headers: { Authorization: `Bearer ${token}` },
         });
-        if (response.status === 401) {
-            console.log(chalk_1.default.red("🔴 AUTH EXPIRED: Your device session was revoked or expired."));
-            if (fs.existsSync(activeCredentialsPath))
+        if (response.status === 401 || response.status === 403) {
+            const failureData = await response.json().catch(() => ({}));
+            console.log(chalk_1.default.red((0, cloud_1.cloudFailure)({ response: { status: response.status, data: failureData } }, [token]).message));
+            if (response.status === 401 && !process.env.FLOWSTRIDE_TOKEN && fs.existsSync(activeCredentialsPath))
                 fs.unlinkSync(activeCredentialsPath);
         }
         else if (response.ok) {
@@ -284,7 +267,8 @@ program
     }
     if (options.ci)
         process.env.FLOWSTRIDE_NATIVE_CI = '1';
-    let token = process.env.FLOWSTRIDE_TOKEN || null;
+    console.log((0, cloudSession_1.cloudSessionDescription)(API_BASE));
+    let token = process.env.FLOWSTRIDE_TOKEN?.trim() || null;
     let forceOS = false;
     const localCredentialsPath = path.join(process.cwd(), ".flowstride", "credentials.json");
     const globalCredentialsPath = path.join(os.homedir(), ".flowstride", "credentials.json");
@@ -294,7 +278,7 @@ program
             activeCredentialsPath = localCredentialsPath;
             try {
                 const credentials = JSON.parse(fs.readFileSync(localCredentialsPath, "utf8"));
-                token = credentials.machineToken;
+                token = credentials.machineToken?.trim() || null;
             }
             catch (err) { }
         }
@@ -302,7 +286,7 @@ program
             activeCredentialsPath = globalCredentialsPath;
             try {
                 const credentials = JSON.parse(fs.readFileSync(globalCredentialsPath, "utf8"));
-                token = credentials.machineToken;
+                token = credentials.machineToken?.trim() || null;
             }
             catch (err) { }
         }
@@ -325,9 +309,10 @@ program
                 method: "GET",
                 headers: { Authorization: `Bearer ${token}` },
             });
-            if (response.status === 401) {
-                console.log(chalk_1.default.red("🔴 AUTH EXPIRED: Your device session was revoked or expired."));
-                if (fs.existsSync(activeCredentialsPath))
+            if (response.status === 401 || response.status === 403) {
+                const failureData = await response.json().catch(() => ({}));
+                console.log(chalk_1.default.red((0, cloud_1.cloudFailure)({ response: { status: response.status, data: failureData } }, [token]).message));
+                if (response.status === 401 && !process.env.FLOWSTRIDE_TOKEN && fs.existsSync(activeCredentialsPath))
                     fs.unlinkSync(activeCredentialsPath);
                 forceOS = true;
             }