@solidactions/cli 0.3.0 → 0.4.1

package/README.md

@@ -35,7 +35,7 @@ solidactions deploy <project-name> <path>
 | `env:list [project]` | List environment variables |
 | `env:delete <key>` | Delete an environment variable |
 | `env:map <project> <key> <global-key>` | Map a global variable to a project |
-| `env:pull <project>` | Pull resolved env vars to a local file |
+| `env:pull <project>` | Pull resolved env vars (including OAuth tokens) to a local file |
 | `schedule:set <project> <cron>` | Set a cron schedule for a workflow |
 | `schedule:list <project>` | List schedules for a project |
 | `schedule:delete <project> <id>` | Delete a schedule |

package/dist/commands/dev.js

@@ -8,6 +8,7 @@ const child_process_1 = require("child_process");
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const chalk_1 = __importDefault(require("chalk"));
+const dotenv_1 = __importDefault(require("dotenv"));
 async function dev(file, options) {
     // Resolve the workflow file path
     const filePath = path_1.default.resolve(file);
@@ -35,6 +36,12 @@ async function dev(file, options) {
         console.log(chalk_1.default.gray('Update to the latest SDK version: npm install @solidactions/sdk@latest'));
         process.exit(1);
     }
+    // Load .env file from project root
+    const envPath = path_1.default.join(projectDir, '.env');
+    if (fs_1.default.existsSync(envPath)) {
+        dotenv_1.default.config({ path: envPath });
+        console.log(chalk_1.default.gray(`Loaded .env from ${projectDir}`));
+    }
     // Validate input JSON if provided
     const input = options.input || '{}';
     try {

package/dist/commands/env-pull.js

@@ -42,7 +42,7 @@ async function envPull(projectName, options = {}) {
     console.log(chalk_1.default.blue(`Pulling environment variables from "${projectName}" (${environment})...`));
     try {
         // First, check if there are any secrets
-        const checkResponse = await axios_1.default.get(`${config.host}/api/v1/projects/${projectSlug}/variable-mappings`, {
+        const checkResponse = await axios_1.default.get(`${config.host}/api/v1/projects/${projectSlug}/variable-mappings?resolve_oauth=true`, {
             headers: {
                 'Authorization': `Bearer ${config.apiKey}`,
                 'Accept': 'application/json',
@@ -53,9 +53,9 @@ async function envPull(projectName, options = {}) {
             console.log(chalk_1.default.yellow('No environment variables found for this project.'));
             process.exit(0);
         }
-        // Check for secrets
+        // Check for secrets (skip confirmation for --update-oauth since OAuth tokens are always secrets)
         const hasSecrets = mappings.some((m) => m.is_secret);
-        if (hasSecrets && !options.yes) {
+        if (hasSecrets && !options.yes && !options.updateOauth) {
             console.log(chalk_1.default.yellow('\nThis project contains secret values.'));
             const confirmed = await confirm('This will expose secret values in plain text. Continue?');
             if (!confirmed) {
@@ -64,14 +64,97 @@ async function envPull(projectName, options = {}) {
             }
         }
         // Now fetch with reveal=true to get actual values
-        const response = await axios_1.default.get(`${config.host}/api/v1/projects/${projectSlug}/variable-mappings?reveal=true`, {
+        const response = await axios_1.default.get(`${config.host}/api/v1/projects/${projectSlug}/variable-mappings?reveal=true&resolve_oauth=true`, {
             headers: {
                 'Authorization': `Bearer ${config.apiKey}`,
                 'Accept': 'application/json',
             },
         });
         const variables = response.data || [];
-        // Build .env file content
+        // --update-oauth: Only pull OAuth tokens and merge into existing .env
+        if (options.updateOauth) {
+            const oauthVars = variables.filter((v) => v.source_type === 'oauth_connection');
+            if (oauthVars.length === 0) {
+                console.log(chalk_1.default.yellow('No OAuth variables found for this project.'));
+                process.exit(0);
+            }
+            // Build OAuth env var names set and their formatted lines
+            const oauthKeySet = new Set(oauthVars.map((v) => v.env_name));
+            const oauthLines = [];
+            for (const variable of oauthVars) {
+                const value = variable.resolved_value ?? variable.value;
+                if (value === null || value === undefined) {
+                    continue;
+                }
+                // Add expiry comment
+                const connName = variable.oauth_connection_name || 'OAuth';
+                if (variable.token_expires_at) {
+                    oauthLines.push(`# OAuth: ${connName} (expires ${variable.token_expires_at})`);
+                }
+                else {
+                    oauthLines.push(`# OAuth: ${connName} (short-lived, re-pull to refresh)`);
+                }
+                // Format value
+                let formattedValue = value;
+                if (typeof value === 'string' && (value.includes(' ') || value.includes('"') || value.includes("'") ||
+                    value.includes('\n') || value.includes('=') || value.includes('#'))) {
+                    formattedValue = `"${value.replace(/"/g, '\\"')}"`;
+                }
+                oauthLines.push(`${variable.env_name}=${formattedValue}`);
+            }
+            if (!fs_1.default.existsSync(outputPath)) {
+                // No .env file — create with just OAuth vars
+                console.log(chalk_1.default.yellow('No .env file found — creating with OAuth vars only. Run a full env:pull for all variables.'));
+                const content = oauthLines.join('\n') + '\n';
+                fs_1.default.writeFileSync(outputPath, content);
+            }
+            else {
+                // Merge into existing .env file
+                const existingContent = fs_1.default.readFileSync(outputPath, 'utf-8');
+                const existingLines = existingContent.split('\n');
+                const preservedLines = [];
+                for (let i = 0; i < existingLines.length; i++) {
+                    const line = existingLines[i];
+                    const nextLine = existingLines[i + 1];
+                    // Skip OAuth comment lines if the next line is a skipped OAuth var
+                    if (line.startsWith('# OAuth:') && nextLine) {
+                        const nextMatch = nextLine.match(/^([A-Za-z_][A-Za-z0-9_]*)=/);
+                        if (nextMatch && oauthKeySet.has(nextMatch[1])) {
+                            continue;
+                        }
+                    }
+                    // Skip existing OAuth var lines
+                    const varMatch = line.match(/^([A-Za-z_][A-Za-z0-9_]*)=/);
+                    if (varMatch && oauthKeySet.has(varMatch[1])) {
+                        continue;
+                    }
+                    // Skip previous "OAuth tokens (updated ...)" header
+                    if (line.startsWith('# OAuth tokens (updated ')) {
+                        continue;
+                    }
+                    preservedLines.push(line);
+                }
+                // Strip trailing blank lines from preserved content
+                while (preservedLines.length > 0 && preservedLines[preservedLines.length - 1].trim() === '') {
+                    preservedLines.pop();
+                }
+                // Append OAuth section
+                preservedLines.push('');
+                preservedLines.push(`# OAuth tokens (updated ${new Date().toISOString()})`);
+                preservedLines.push(...oauthLines);
+                preservedLines.push('');
+                fs_1.default.writeFileSync(outputPath, preservedLines.join('\n'));
+            }
+            console.log(chalk_1.default.green(`\n✓ Updated ${oauthVars.length} OAuth token(s) in ${outputFile}`));
+            // Print any OAuth warnings
+            for (const variable of oauthVars) {
+                if (variable.oauth_warning) {
+                    console.log(chalk_1.default.yellow(`  ⚠ ${variable.env_name}: ${variable.oauth_warning}`));
+                }
+            }
+            return;
+        }
+        // Full pull: Build .env file content
         const lines = [];
         lines.push(`# Environment variables for ${projectName} (${environment})`);
         lines.push(`# Generated by solidactions env:pull on ${new Date().toISOString()}`);
@@ -80,12 +163,22 @@ async function envPull(projectName, options = {}) {
         let secretCount = 0;
         for (const variable of variables) {
             const key = variable.env_name;
-            const value = variable.value;
+            const value = variable.resolved_value ?? variable.value;
             if (value === null || value === undefined) {
                 // Skip variables with no value
                 lines.push(`# ${key}= (no value configured)`);
                 continue;
             }
+            // Add OAuth expiry comment above OAuth-sourced variables
+            if (variable.source_type === 'oauth_connection') {
+                const connName = variable.oauth_connection_name || 'OAuth';
+                if (variable.token_expires_at) {
+                    lines.push(`# OAuth: ${connName} (expires ${variable.token_expires_at})`);
+                }
+                else {
+                    lines.push(`# OAuth: ${connName} (short-lived, re-pull to refresh)`);
+                }
+            }
             // Quote values that contain special characters
             let formattedValue = value;
             if (typeof value === 'string' && (value.includes(' ') ||
@@ -110,6 +203,12 @@ async function envPull(projectName, options = {}) {
         if (secretCount > 0) {
             console.log(chalk_1.default.yellow(`  (includes ${secretCount} secret value${secretCount > 1 ? 's' : ''})`));
         }
+        // Print any OAuth warnings
+        for (const variable of variables) {
+            if (variable.oauth_warning) {
+                console.log(chalk_1.default.yellow(`  ⚠ ${variable.env_name}: ${variable.oauth_warning}`));
+            }
+        }
     }
     catch (error) {
         if (error.response) {

package/dist/index.js

@@ -169,6 +169,7 @@ program
     .option('-e, --env <environment>', 'Environment (production/staging/dev)', 'dev')
     .option('-o, --output <file>', 'Output file path (defaults to .env or .env.{environment})')
     .option('-y, --yes', 'Skip confirmation for secrets')
+    .option('--update-oauth', 'Only pull OAuth tokens and merge into existing .env file')
     .action((project, options) => {
     (0, env_pull_1.envPull)(project, options);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@solidactions/cli",
-    "version": "0.3.0",
+    "version": "0.4.1",
     "description": "SolidActions CLI - Deploy and manage workflow automation",
     "main": "dist/index.js",
     "bin": {
@@ -41,6 +41,7 @@
         "axios": "^1.6.0",
         "chalk": "^4.1.2",
         "commander": "^11.0.0",
+        "dotenv": "^17.3.1",
         "form-data": "^4.0.0",
         "fs-extra": "^11.0.0",
         "js-yaml": "^4.1.0",