@solidactions/cli 0.7.0 → 0.7.3

package/dist/commands/deploy.js

@@ -11,8 +11,8 @@ const axios_1 = __importDefault(require("axios"));
 const form_data_1 = __importDefault(require("form-data"));
 const chalk_1 = __importDefault(require("chalk"));
 const js_yaml_1 = __importDefault(require("js-yaml"));
-const init_1 = require("./init");
 const env_1 = require("../utils/env");
+const api_1 = require("../utils/api");
 /**
  * Validate project structure before deployment.
  * Checks for required files and SDK dependency.
@@ -89,7 +89,7 @@ function validateProject(sourceDir) {
  * Push YAML env declarations to the project.
  * This registers all YAML-declared vars and their mappings.
  */
-async function pushYamlDeclarations(host, apiKey, projectSlug, yamlConfig) {
+async function pushYamlDeclarations(config, projectSlug, yamlConfig) {
     const parsedVars = (0, env_1.parseYamlEnvVars)(yamlConfig);
     if (parsedVars.length === 0) {
         return;
@@ -102,12 +102,8 @@ async function pushYamlDeclarations(host, apiKey, projectSlug, yamlConfig) {
         source: 'yaml',
     }));
     try {
-        await axios_1.default.post(`${host}/api/v1/projects/${projectSlug}/variable-mappings/sync-yaml`, { declarations }, {
-            headers: {
-                'Authorization': `Bearer ${apiKey}`,
-                'Accept': 'application/json',
-                'Content-Type': 'application/json',
-            },
+        await axios_1.default.post(`${config.host}/api/v1/projects/${projectSlug}/variable-mappings/sync-yaml`, { declarations }, {
+            headers: (0, api_1.getApiHeaders)(config, 'application/json'),
         });
         console.log(chalk_1.default.gray(`Synced ${declarations.length} YAML env declarations`));
     }
@@ -116,11 +112,7 @@ async function pushYamlDeclarations(host, apiKey, projectSlug, yamlConfig) {
     }
 }
 async function deploy(projectName, sourcePath, options = {}) {
-    const config = (0, init_1.getConfig)();
-    if (!config?.apiKey) {
-        console.error(chalk_1.default.red('Not initialized. Run `solidactions init <api-key>` first.'));
-        process.exit(1);
-    }
+    const config = await (0, api_1.requireConfigWithWorkspace)();
     const sourceDir = sourcePath ? path_1.default.resolve(sourcePath) : process.cwd();
     const environment = options.env || 'dev';
     if (!fs_1.default.existsSync(sourceDir)) {
@@ -165,10 +157,7 @@ async function deploy(projectName, sourcePath, options = {}) {
             ? projectName
             : `${projectName}-${environment}`;
         const checkResponse = await axios_1.default.get(`${config.host}/api/v1/projects/${lookupSlug}`, {
-            headers: {
-                'Authorization': `Bearer ${config.apiKey}`,
-                'Accept': 'application/json',
-            },
+            headers: (0, api_1.getApiHeaders)(config),
         });
         projectSlug = checkResponse.data.slug || checkResponse.data.name;
     }
@@ -187,11 +176,7 @@ async function deploy(projectName, sourcePath, options = {}) {
                     slug: projectName.toLowerCase().replace(/[^a-z0-9-]/g, '-') + (environment !== 'production' ? `-${environment}` : ''),
                     environment: environment,
                 }, {
-                    headers: {
-                        'Authorization': `Bearer ${config.apiKey}`,
-                        'Accept': 'application/json',
-                        'Content-Type': 'application/json',
-                    },
+                    headers: (0, api_1.getApiHeaders)(config, 'application/json'),
                 });
                 projectSlug = createResponse.data.slug || createResponse.data.name;
                 console.log(chalk_1.default.green(`Project "${projectName}"${envLabel} created.`));
@@ -218,8 +203,7 @@ async function deploy(projectName, sourcePath, options = {}) {
             await axios_1.default.post(`${config.host}/api/v1/projects/${projectSlug}/deploy`, form, {
                 headers: {
                     ...form.getHeaders(),
-                    'Accept': 'application/json',
-                    'Authorization': `Bearer ${config.apiKey}`,
+                    ...(0, api_1.getApiHeaders)(config),
                 },
                 maxContentLength: Infinity,
                 maxBodyLength: Infinity
@@ -228,13 +212,13 @@ async function deploy(projectName, sourcePath, options = {}) {
             console.log(chalk_1.default.yellow('Waiting for build to complete...\n'));
             // Poll for completion
             let attempts = 0;
-            const maxAttempts = 120; // 2 minutes timeout
+            const maxAttempts = 600; // 10 minutes of inactivity timeout
             let lastLogLength = 0;
             const poll = setInterval(async () => {
                 try {
                     attempts++;
                     const statusRes = await axios_1.default.get(`${config.host}/api/v1/projects/${projectSlug}`, {
-                        headers: { 'Authorization': `Bearer ${config.apiKey}` }
+                        headers: (0, api_1.getApiHeaders)(config),
                     });
                     const { status, build_log } = statusRes.data;
                     // Stream new log content
@@ -245,13 +229,18 @@ async function deploy(projectName, sourcePath, options = {}) {
                             process.stdout.write('\n');
                         }
                         lastLogLength = build_log.length;
+                        attempts = 0; // Reset timeout — build is still progressing
+                    }
+                    // Periodic waiting indicator when no logs yet
+                    if (attempts > 0 && attempts % 15 === 0 && lastLogLength === 0) {
+                        console.log(chalk_1.default.gray('Still waiting for build to start...'));
                     }
                     if (status === 'deployed') {
                         clearInterval(poll);
                         console.log(chalk_1.default.green(`\n✓ Deployed to ${projectSlug}${envLabel}!`));
                         // Always sync YAML declarations (registers env vars and their mappings)
                         if (yamlConfig) {
-                            await pushYamlDeclarations(config.host, config.apiKey, projectSlug, yamlConfig);
+                            await pushYamlDeclarations(config, projectSlug, yamlConfig);
                         }
                         fs_1.default.unlinkSync(archivePath);
                         process.exit(0);

package/dist/commands/env-delete.js

@@ -7,13 +7,9 @@ exports.envDelete = envDelete;
 const axios_1 = __importDefault(require("axios"));
 const chalk_1 = __importDefault(require("chalk"));
 const prompts_1 = __importDefault(require("prompts"));
-const init_1 = require("./init");
+const api_1 = require("../utils/api");
 async function envDelete(keyOrProject, keyIfProject, options = {}) {
-    const config = (0, init_1.getConfig)();
-    if (!config?.apiKey) {
-        console.error(chalk_1.default.red('Not initialized. Run "solidactions init <api-key>" first.'));
-        process.exit(1);
-    }
+    const config = await (0, api_1.requireConfigWithWorkspace)();
     // Determine mode: if keyIfProject is provided, it's project mapping delete
     const isProjectMode = keyIfProject !== undefined;
     const projectName = isProjectMode ? keyOrProject : undefined;
@@ -24,10 +20,7 @@ async function envDelete(keyOrProject, keyIfProject, options = {}) {
             console.log(chalk_1.default.blue(`Deleting variable mapping "${key}" from project "${projectName}"...`));
             // First, get the mapping to find its ID
             const listResponse = await axios_1.default.get(`${config.host}/api/v1/projects/${projectName}/variable-mappings`, {
-                headers: {
-                    'Authorization': `Bearer ${config.apiKey}`,
-                    'Accept': 'application/json',
-                },
+                headers: (0, api_1.getApiHeaders)(config),
             });
             const mappings = listResponse.data || [];
             const mapping = mappings.find((m) => m.env_name === key);
@@ -52,10 +45,7 @@ async function envDelete(keyOrProject, keyIfProject, options = {}) {
             }
             // Delete the mapping
             await axios_1.default.delete(`${config.host}/api/v1/projects/${projectName}/variable-mappings/${mapping.id}`, {
-                headers: {
-                    'Authorization': `Bearer ${config.apiKey}`,
-                    'Accept': 'application/json',
-                },
+                headers: (0, api_1.getApiHeaders)(config),
             });
             if (mapping.is_yaml_declared) {
                 console.log(chalk_1.default.green(`Variable mapping "${key}" cleared successfully.`));
@@ -69,10 +59,7 @@ async function envDelete(keyOrProject, keyIfProject, options = {}) {
             console.log(chalk_1.default.blue(`Deleting global variable "${key}"...`));
             // First, get the variable to find its ID
             const listResponse = await axios_1.default.get(`${config.host}/api/v1/variables`, {
-                headers: {
-                    'Authorization': `Bearer ${config.apiKey}`,
-                    'Accept': 'application/json',
-                },
+                headers: (0, api_1.getApiHeaders)(config),
             });
             const variables = listResponse.data?.data || [];
             const variable = variables.find((v) => v.key === key);
@@ -95,10 +82,7 @@ async function envDelete(keyOrProject, keyIfProject, options = {}) {
             }
             // Delete the variable
             await axios_1.default.delete(`${config.host}/api/v1/variables/${variable.id}`, {
-                headers: {
-                    'Authorization': `Bearer ${config.apiKey}`,
-                    'Accept': 'application/json',
-                },
+                headers: (0, api_1.getApiHeaders)(config),
             });
             console.log(chalk_1.default.green(`Global variable "${key}" deleted successfully.`));
         }

package/dist/commands/env-list.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.envList = envList;
 const axios_1 = __importDefault(require("axios"));
 const chalk_1 = __importDefault(require("chalk"));
-const init_1 = require("./init");
+const api_1 = require("../utils/api");
 /**
  * Format a value for display, with inherited badge if applicable.
  */
@@ -27,11 +27,7 @@ function formatEnvValue(value, source, isSecret) {
     return displayValue;
 }
 async function envList(projectName, options = {}) {
-    const config = (0, init_1.getConfig)();
-    if (!config?.apiKey) {
-        console.error(chalk_1.default.red('Not initialized. Run "solidactions init <api-key>" first.'));
-        process.exit(1);
-    }
+    const config = await (0, api_1.requireConfigWithWorkspace)();
     try {
         if (projectName) {
             // List project variable mappings
@@ -41,10 +37,7 @@ async function envList(projectName, options = {}) {
                 : `${projectName}-${environment}`;
             console.log(chalk_1.default.blue(`Environment variables for project "${projectName}" (${environment}):`));
             const response = await axios_1.default.get(`${config.host}/api/v1/projects/${projectSlug}/variable-mappings`, {
-                headers: {
-                    'Authorization': `Bearer ${config.apiKey}`,
-                    'Accept': 'application/json',
-                },
+                headers: (0, api_1.getApiHeaders)(config),
             });
             const mappings = response.data || [];
             if (mappings.length === 0) {
@@ -99,10 +92,7 @@ async function envList(projectName, options = {}) {
             // List global variables with per-environment values
             console.log(chalk_1.default.blue('Global environment variables:'));
             const response = await axios_1.default.get(`${config.host}/api/v1/variables`, {
-                headers: {
-                    'Authorization': `Bearer ${config.apiKey}`,
-                    'Accept': 'application/json',
-                },
+                headers: (0, api_1.getApiHeaders)(config),
             });
             const variables = response.data?.data || [];
             if (variables.length === 0) {

package/dist/commands/env-map.js

@@ -6,21 +6,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.envMap = envMap;
 const axios_1 = __importDefault(require("axios"));
 const chalk_1 = __importDefault(require("chalk"));
-const init_1 = require("./init");
+const api_1 = require("../utils/api");
 async function envMap(projectName, projectKey, globalKey) {
-    const config = (0, init_1.getConfig)();
-    if (!config?.apiKey) {
-        console.error(chalk_1.default.red('Not initialized. Run "solidactions init <api-key>" first.'));
-        process.exit(1);
-    }
+    const config = await (0, api_1.requireConfigWithWorkspace)();
     console.log(chalk_1.default.blue(`Mapping global variable "${globalKey}" to project key "${projectKey}" in "${projectName}"...`));
     try {
         // First, get the global variable ID by key
         const varsResponse = await axios_1.default.get(`${config.host}/api/v1/variables`, {
-            headers: {
-                'Authorization': `Bearer ${config.apiKey}`,
-                'Accept': 'application/json',
-            },
+            headers: (0, api_1.getApiHeaders)(config),
         });
         const variables = varsResponse.data.data || varsResponse.data;
         const globalVar = variables.find((v) => v.key === globalKey);
@@ -34,11 +27,7 @@ async function envMap(projectName, projectKey, globalKey) {
             project_key: projectKey,
             global_variable_id: globalVar.id,
         }, {
-            headers: {
-                'Authorization': `Bearer ${config.apiKey}`,
-                'Accept': 'application/json',
-                'Content-Type': 'application/json',
-            },
+            headers: (0, api_1.getApiHeaders)(config, 'application/json'),
         });
         console.log(chalk_1.default.green(`Variable mapping created!`));
         console.log(chalk_1.default.gray(`  ${globalKey} -> ${projectKey} (in ${projectName})`));

package/dist/commands/env-pull.js

@@ -9,7 +9,7 @@ const path_1 = __importDefault(require("path"));
 const axios_1 = __importDefault(require("axios"));
 const chalk_1 = __importDefault(require("chalk"));
 const readline_1 = __importDefault(require("readline"));
-const init_1 = require("./init");
+const api_1 = require("../utils/api");
 /**
  * Prompt the user for confirmation (unless --yes flag is set).
  */
@@ -26,11 +26,7 @@ async function confirm(message) {
     });
 }
 async function envPull(projectName, options = {}) {
-    const config = (0, init_1.getConfig)();
-    if (!config?.apiKey) {
-        console.error(chalk_1.default.red('Not initialized. Run "solidactions init <api-key>" first.'));
-        process.exit(1);
-    }
+    const config = await (0, api_1.requireConfigWithWorkspace)();
     const environment = options.env || 'dev';
     // Build the project slug for lookup
     const projectSlug = environment === 'production'
@@ -43,10 +39,7 @@ async function envPull(projectName, options = {}) {
     try {
         // First, check if there are any secrets
         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',
-            },
+            headers: (0, api_1.getApiHeaders)(config),
         });
         const mappings = checkResponse.data || [];
         if (mappings.length === 0) {
@@ -65,10 +58,7 @@ 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&resolve_oauth=true`, {
-            headers: {
-                'Authorization': `Bearer ${config.apiKey}`,
-                'Accept': 'application/json',
-            },
+            headers: (0, api_1.getApiHeaders)(config),
         });
         const variables = response.data || [];
         // --update-oauth: Only pull OAuth tokens and merge into existing .env

package/dist/commands/env-push.js

@@ -9,14 +9,10 @@ const path_1 = __importDefault(require("path"));
 const axios_1 = __importDefault(require("axios"));
 const chalk_1 = __importDefault(require("chalk"));
 const prompts_1 = __importDefault(require("prompts"));
-const init_1 = require("./init");
+const api_1 = require("../utils/api");
 const env_1 = require("../utils/env");
 async function envPush(projectName, sourcePath, options = {}) {
-    const config = (0, init_1.getConfig)();
-    if (!config?.apiKey) {
-        console.error(chalk_1.default.red('Not initialized. Run "solidactions init <api-key>" first.'));
-        process.exit(1);
-    }
+    const config = await (0, api_1.requireConfigWithWorkspace)();
     const sourceDir = path_1.default.resolve(sourcePath);
     const environment = options.env || 'dev';
     // Read solidactions.yaml
@@ -85,10 +81,7 @@ async function envPush(projectName, sourcePath, options = {}) {
     let serverMappings = [];
     try {
         const response = await axios_1.default.get(`${config.host}/api/v1/projects/${projectSlug}/variable-mappings`, {
-            headers: {
-                'Authorization': `Bearer ${config.apiKey}`,
-                'Accept': 'application/json',
-            },
+            headers: (0, api_1.getApiHeaders)(config),
         });
         serverMappings = response.data || [];
     }
@@ -191,11 +184,7 @@ async function envPush(projectName, sourcePath, options = {}) {
     }));
     try {
         const response = await axios_1.default.post(`${config.host}/api/v1/projects/${projectSlug}/variable-mappings/bulk`, { variables }, {
-            headers: {
-                'Authorization': `Bearer ${config.apiKey}`,
-                'Accept': 'application/json',
-                'Content-Type': 'application/json',
-            },
+            headers: (0, api_1.getApiHeaders)(config, 'application/json'),
         });
         const { created, updated } = response.data;
         console.log(chalk_1.default.green(`\n✓ Pushed ${toPush.length} variable(s) to ${projectSlug}`));

package/dist/commands/env-set.js

@@ -6,13 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.envSet = envSet;
 const axios_1 = __importDefault(require("axios"));
 const chalk_1 = __importDefault(require("chalk"));
-const init_1 = require("./init");
+const api_1 = require("../utils/api");
 async function envSet(keyOrProject, valueOrKey, valueIfProject, options = {}) {
-    const config = (0, init_1.getConfig)();
-    if (!config?.apiKey) {
-        console.error(chalk_1.default.red('Not initialized. Run "solidactions init <api-key>" first.'));
-        process.exit(1);
-    }
+    const config = await (0, api_1.requireConfigWithWorkspace)();
     // Detect mode based on arguments
     const isProjectMode = valueIfProject !== undefined;
     if (isProjectMode) {
@@ -36,11 +32,7 @@ async function envSet(keyOrProject, valueOrKey, valueIfProject, options = {}) {
                         is_secret: isSecret,
                     }]
             }, {
-                headers: {
-                    'Authorization': `Bearer ${config.apiKey}`,
-                    'Accept': 'application/json',
-                    'Content-Type': 'application/json',
-                },
+                headers: (0, api_1.getApiHeaders)(config, 'application/json'),
             });
             const { created, updated } = response.data;
             const action = created > 0 ? 'created' : 'updated';
@@ -100,31 +92,20 @@ async function envSet(keyOrProject, valueOrKey, valueIfProject, options = {}) {
         try {
             // Check if variable already exists
             const getResponse = await axios_1.default.get(`${config.host}/api/v1/variables`, {
-                headers: {
-                    'Authorization': `Bearer ${config.apiKey}`,
-                    'Accept': 'application/json',
-                },
+                headers: (0, api_1.getApiHeaders)(config),
             });
             const variables = getResponse.data?.data || [];
             const existing = variables.find((v) => v.key === key);
             let action;
             if (existing) {
                 await axios_1.default.put(`${config.host}/api/v1/variables/${existing.id}`, body, {
-                    headers: {
-                        'Authorization': `Bearer ${config.apiKey}`,
-                        'Accept': 'application/json',
-                        'Content-Type': 'application/json',
-                    },
+                    headers: (0, api_1.getApiHeaders)(config, 'application/json'),
                 });
                 action = 'updated';
             }
             else {
                 await axios_1.default.post(`${config.host}/api/v1/variables`, body, {
-                    headers: {
-                        'Authorization': `Bearer ${config.apiKey}`,
-                        'Accept': 'application/json',
-                        'Content-Type': 'application/json',
-                    },
+                    headers: (0, api_1.getApiHeaders)(config, 'application/json'),
                 });
                 action = 'created';
             }

package/dist/commands/init.js

@@ -13,6 +13,8 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const os_1 = __importDefault(require("os"));
 const chalk_1 = __importDefault(require("chalk"));
+const api_1 = require("../utils/api");
+const workspaces_1 = require("./workspaces");
 const CONFIG_DIR = path_1.default.join(os_1.default.homedir(), '.solidactions');
 const CONFIG_FILE = path_1.default.join(CONFIG_DIR, 'config.json');
 function getConfig() {
@@ -63,13 +65,27 @@ async function init(apiKey, options) {
     console.log(chalk_1.default.blue(`Initializing SolidActions CLI...`));
     console.log(chalk_1.default.gray(`Host: ${host}`));
     // Save the configuration
-    saveConfig({
+    const config = {
         host,
         apiKey: apiKey.trim(),
-    });
+    };
+    saveConfig(config);
     console.log(chalk_1.default.green('CLI initialized successfully!'));
     console.log(chalk_1.default.gray(`Configuration saved to ${CONFIG_FILE}`));
     console.log('');
+    // Set workspace — explicit flag or interactive prompt
+    try {
+        if (options.workspace) {
+            await (0, workspaces_1.workspaceSet)(options.workspace);
+        }
+        else {
+            await (0, api_1.ensureWorkspaceSelected)(config);
+        }
+    }
+    catch {
+        console.log(chalk_1.default.yellow('Could not set workspace. Run `solidactions workspace:set` later.'));
+    }
+    console.log('');
     console.log(chalk_1.default.blue('Quick start:'));
     console.log(chalk_1.default.gray('  solidactions deploy <project-name>    Deploy current directory'));
     console.log(chalk_1.default.gray('  solidactions run <project> <workflow> Run a workflow'));

package/dist/commands/logs-build.js

@@ -6,20 +6,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.logsBuild = logsBuild;
 const axios_1 = __importDefault(require("axios"));
 const chalk_1 = __importDefault(require("chalk"));
-const init_1 = require("./init");
+const api_1 = require("../utils/api");
 async function logsBuild(projectName) {
-    const config = (0, init_1.getConfig)();
-    if (!config?.apiKey) {
-        console.error(chalk_1.default.red('Not initialized. Run "solidactions init <api-key>" first.'));
-        process.exit(1);
-    }
+    const config = await (0, api_1.requireConfigWithWorkspace)();
     console.log(chalk_1.default.blue(`Fetching build logs for project "${projectName}"...`));
     try {
         const response = await axios_1.default.get(`${config.host}/api/v1/projects/${projectName}/build-log`, {
-            headers: {
-                'Authorization': `Bearer ${config.apiKey}`,
-                'Accept': 'application/json',
-            },
+            headers: (0, api_1.getApiHeaders)(config),
         });
         const buildLog = response.data.build_log || response.data;
         if (!buildLog || buildLog.length === 0) {

package/dist/commands/logs.js

@@ -6,31 +6,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.logs = logs;
 const axios_1 = __importDefault(require("axios"));
 const chalk_1 = __importDefault(require("chalk"));
-const init_1 = require("./init");
+const api_1 = require("../utils/api");
 async function logs(runId, options) {
-    const config = (0, init_1.getConfig)();
-    if (!config?.apiKey) {
-        console.error(chalk_1.default.red('Not initialized. Run "solidactions init <api-key>" first.'));
-        process.exit(1);
-    }
+    const config = await (0, api_1.requireConfigWithWorkspace)();
     console.log(chalk_1.default.blue(`Fetching logs for run: ${runId}...`));
     try {
         // Get the run status first
         const runResponse = await axios_1.default.get(`${config.host}/api/v1/runs/${runId}`, {
-            headers: {
-                'Authorization': `Bearer ${config.apiKey}`,
-                'Accept': 'application/json',
-            },
+            headers: (0, api_1.getApiHeaders)(config),
         });
         const runData = runResponse.data;
         console.log(chalk_1.default.gray(`Status: ${runData.status}`));
         console.log(chalk_1.default.gray('---'));
         // Get the logs for this run
         const logsResponse = await axios_1.default.get(`${config.host}/api/v1/runs/${runId}/logs`, {
-            headers: {
-                'Authorization': `Bearer ${config.apiKey}`,
-                'Accept': 'application/json',
-            },
+            headers: (0, api_1.getApiHeaders)(config),
         });
         const errors = logsResponse.data.errors || [];
         if (errors.length > 0) {
@@ -46,10 +36,7 @@ async function logs(runId, options) {
             const pollInterval = setInterval(async () => {
                 try {
                     const refreshResponse = await axios_1.default.get(`${config.host}/api/v1/runs/${runId}/logs`, {
-                        headers: {
-                            'Authorization': `Bearer ${config.apiKey}`,
-                            'Accept': 'application/json',
-                        },
+                        headers: (0, api_1.getApiHeaders)(config),
                     });
                     const newLogData = refreshResponse.data.logs || '';
                     if (newLogData.length > printed) {
@@ -58,10 +45,7 @@ async function logs(runId, options) {
                     }
                     // Check if run is complete
                     const runStatus = await axios_1.default.get(`${config.host}/api/v1/runs/${runId}`, {
-                        headers: {
-                            'Authorization': `Bearer ${config.apiKey}`,
-                            'Accept': 'application/json',
-                        },
+                        headers: (0, api_1.getApiHeaders)(config),
                     });
                     if (['completed', 'failed', 'acknowledged'].includes(runStatus.data.status)) {
                         clearInterval(pollInterval);

package/dist/commands/pull.js

@@ -9,21 +9,14 @@ const path_1 = __importDefault(require("path"));
 const axios_1 = __importDefault(require("axios"));
 const chalk_1 = __importDefault(require("chalk"));
 const adm_zip_1 = __importDefault(require("adm-zip"));
-const init_1 = require("./init");
+const api_1 = require("../utils/api");
 async function pull(projectName, destPath) {
-    const config = (0, init_1.getConfig)();
-    if (!config?.apiKey) {
-        console.error(chalk_1.default.red('Not initialized. Run `solidactions init <api-key>` first.'));
-        process.exit(1);
-    }
+    const config = await (0, api_1.requireConfigWithWorkspace)();
     const destination = destPath ? path_1.default.resolve(destPath) : process.cwd();
     console.log(chalk_1.default.blue(`Pulling project "${projectName}"...`));
     try {
         const response = await axios_1.default.get(`${config.host}/api/v1/projects/${projectName}/source`, {
-            headers: {
-                'Authorization': `Bearer ${config.apiKey}`,
-                'Accept': 'application/octet-stream',
-            },
+            headers: { ...(0, api_1.getApiHeaders)(config), 'Accept': 'application/octet-stream' },
             responseType: 'arraybuffer',
         });
         const zipBuffer = Buffer.from(response.data);

package/dist/commands/run.js

@@ -6,13 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.run = run;
 const axios_1 = __importDefault(require("axios"));
 const chalk_1 = __importDefault(require("chalk"));
-const init_1 = require("./init");
+const api_1 = require("../utils/api");
 async function run(projectName, workflowName, options) {
-    const config = (0, init_1.getConfig)();
-    if (!config?.apiKey) {
-        console.error(chalk_1.default.red('Not initialized. Run "solidactions init <api-key>" first.'));
-        process.exit(1);
-    }
+    const config = await (0, api_1.requireConfigWithWorkspace)();
     const environment = options.env || 'dev';
     const projectSlug = environment === 'production'
         ? projectName
@@ -30,11 +26,7 @@ async function run(projectName, workflowName, options) {
     }
     try {
         const response = await axios_1.default.post(`${config.host}/api/v1/projects/${projectSlug}/workflows/${workflowName}/trigger`, { input: inputData }, {
-            headers: {
-                'Authorization': `Bearer ${config.apiKey}`,
-                'Accept': 'application/json',
-                'Content-Type': 'application/json',
-            },
+            headers: (0, api_1.getApiHeaders)(config, 'application/json'),
         });
         const runData = response.data.run || response.data;
         console.log(chalk_1.default.green(`Workflow triggered! Run ID: ${runData.id}`));
@@ -46,10 +38,7 @@ async function run(projectName, workflowName, options) {
                 try {
                     attempts++;
                     const statusResponse = await axios_1.default.get(`${config.host}/api/v1/runs/${runData.id}`, {
-                        headers: {
-                            'Authorization': `Bearer ${config.apiKey}`,
-                            'Accept': 'application/json',
-                        },
+                        headers: (0, api_1.getApiHeaders)(config),
                     });
                     const status = statusResponse.data.status;
                     if (status === 'completed') {

package/dist/commands/runs.js

@@ -6,13 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.runs = runs;
 const axios_1 = __importDefault(require("axios"));
 const chalk_1 = __importDefault(require("chalk"));
-const init_1 = require("./init");
+const api_1 = require("../utils/api");
 async function runs(projectName, options = {}) {
-    const config = (0, init_1.getConfig)();
-    if (!config?.apiKey) {
-        console.error(chalk_1.default.red('Not initialized. Run "solidactions init <api-key>" first.'));
-        process.exit(1);
-    }
+    const config = await (0, api_1.requireConfigWithWorkspace)();
     const limit = options.limit || 20;
     console.log(chalk_1.default.blue(projectName ? `Recent runs for "${projectName}":` : 'Recent runs:'));
     try {
@@ -21,10 +17,7 @@ async function runs(projectName, options = {}) {
             params.project = projectName;
         }
         const response = await axios_1.default.get(`${config.host}/api/v1/runs`, {
-            headers: {
-                'Authorization': `Bearer ${config.apiKey}`,
-                'Accept': 'application/json',
-            },
+            headers: (0, api_1.getApiHeaders)(config),
             params,
         });
         const runsList = response.data.data || response.data;

package/dist/commands/schedule-delete.js

@@ -7,21 +7,14 @@ exports.scheduleDelete = scheduleDelete;
 const axios_1 = __importDefault(require("axios"));
 const chalk_1 = __importDefault(require("chalk"));
 const prompts_1 = __importDefault(require("prompts"));
-const init_1 = require("./init");
+const api_1 = require("../utils/api");
 async function scheduleDelete(projectName, scheduleId, options = {}) {
-    const config = (0, init_1.getConfig)();
-    if (!config?.apiKey) {
-        console.error(chalk_1.default.red('Not initialized. Run "solidactions init <api-key>" first.'));
-        process.exit(1);
-    }
+    const config = await (0, api_1.requireConfigWithWorkspace)();
     console.log(chalk_1.default.blue(`Deleting schedule ${scheduleId} from project "${projectName}"...`));
     try {
         // First, get the schedule details for confirmation
         const listResponse = await axios_1.default.get(`${config.host}/api/v1/projects/${projectName}/schedules`, {
-            headers: {
-                'Authorization': `Bearer ${config.apiKey}`,
-                'Accept': 'application/json',
-            },
+            headers: (0, api_1.getApiHeaders)(config),
         });
         const schedules = listResponse.data || [];
         const schedule = schedules.find((s) => s.id?.toString() === scheduleId);
@@ -44,10 +37,7 @@ async function scheduleDelete(projectName, scheduleId, options = {}) {
         }
         // Delete the schedule
         await axios_1.default.delete(`${config.host}/api/v1/projects/${projectName}/schedules/${scheduleId}`, {
-            headers: {
-                'Authorization': `Bearer ${config.apiKey}`,
-                'Accept': 'application/json',
-            },
+            headers: (0, api_1.getApiHeaders)(config),
         });
         console.log(chalk_1.default.green(`Schedule ${scheduleId} deleted successfully.`));
         console.log(chalk_1.default.gray(`  Workflow: ${schedule.workflow_name || schedule.workflow_slug}`));

package/dist/commands/schedule-list.js

@@ -6,20 +6,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.scheduleList = scheduleList;
 const axios_1 = __importDefault(require("axios"));
 const chalk_1 = __importDefault(require("chalk"));
-const init_1 = require("./init");
+const api_1 = require("../utils/api");
 async function scheduleList(projectName) {
-    const config = (0, init_1.getConfig)();
-    if (!config?.apiKey) {
-        console.error(chalk_1.default.red('Not initialized. Run "solidactions init <api-key>" first.'));
-        process.exit(1);
-    }
+    const config = await (0, api_1.requireConfigWithWorkspace)();
     console.log(chalk_1.default.blue(`Schedules for project "${projectName}":`));
     try {
         const response = await axios_1.default.get(`${config.host}/api/v1/projects/${projectName}/schedules`, {
-            headers: {
-                'Authorization': `Bearer ${config.apiKey}`,
-                'Accept': 'application/json',
-            },
+            headers: (0, api_1.getApiHeaders)(config),
         });
         const schedules = response.data || [];
         if (schedules.length === 0) {

package/dist/commands/schedule-set.js

@@ -6,13 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.scheduleSet = scheduleSet;
 const axios_1 = __importDefault(require("axios"));
 const chalk_1 = __importDefault(require("chalk"));
-const init_1 = require("./init");
+const api_1 = require("../utils/api");
 async function scheduleSet(projectName, cron, options) {
-    const config = (0, init_1.getConfig)();
-    if (!config?.apiKey) {
-        console.error(chalk_1.default.red('Not initialized. Run "solidactions init <api-key>" first.'));
-        process.exit(1);
-    }
+    const config = await (0, api_1.requireConfigWithWorkspace)();
     console.log(chalk_1.default.blue(`Setting schedule for project "${projectName}"...`));
     // Parse input JSON if provided
     let inputData;
@@ -36,11 +32,7 @@ async function scheduleSet(projectName, cron, options) {
             payload.input = inputData;
         }
         await axios_1.default.post(`${config.host}/api/v1/projects/${projectName}/schedules`, payload, {
-            headers: {
-                'Authorization': `Bearer ${config.apiKey}`,
-                'Accept': 'application/json',
-                'Content-Type': 'application/json',
-            },
+            headers: (0, api_1.getApiHeaders)(config, 'application/json'),
         });
         console.log(chalk_1.default.green(`Schedule set successfully!`));
         console.log(chalk_1.default.gray(`  Cron: ${cron}`));

package/dist/commands/steps.js

@@ -6,13 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.steps = steps;
 const axios_1 = __importDefault(require("axios"));
 const chalk_1 = __importDefault(require("chalk"));
-const init_1 = require("./init");
+const api_1 = require("../utils/api");
 async function steps(runId, options) {
-    const config = (0, init_1.getConfig)();
-    if (!config?.apiKey) {
-        console.error(chalk_1.default.red('Not initialized. Run "solidactions init <api-key>" first.'));
-        process.exit(1);
-    }
+    const config = await (0, api_1.requireConfigWithWorkspace)();
     // Flag validation: --follow and --step are incompatible
     if (options.follow && options.step) {
         console.error(chalk_1.default.red('Cannot use --follow with --step.'));
@@ -20,10 +16,7 @@ async function steps(runId, options) {
     }
     try {
         const response = await axios_1.default.get(`${config.host}/api/v1/runs/${runId}/steps`, {
-            headers: {
-                'Authorization': `Bearer ${config.apiKey}`,
-                'Accept': 'application/json',
-            },
+            headers: (0, api_1.getApiHeaders)(config),
         });
         const data = response.data;
         // --json mode: output raw JSON and exit
@@ -68,16 +61,10 @@ async function steps(runId, options) {
             const pollInterval = setInterval(async () => {
                 try {
                     const refreshResponse = await axios_1.default.get(`${config.host}/api/v1/runs/${runId}/steps`, {
-                        headers: {
-                            'Authorization': `Bearer ${config.apiKey}`,
-                            'Accept': 'application/json',
-                        },
+                        headers: (0, api_1.getApiHeaders)(config),
                     });
                     const runStatus = await axios_1.default.get(`${config.host}/api/v1/runs/${runId}`, {
-                        headers: {
-                            'Authorization': `Bearer ${config.apiKey}`,
-                            'Accept': 'application/json',
-                        },
+                        headers: (0, api_1.getApiHeaders)(config),
                     });
                     console.clear();
                     displayAllSteps(runId, refreshResponse.data);

package/dist/commands/webhooks.js

@@ -6,13 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.webhookList = webhookList;
 const axios_1 = __importDefault(require("axios"));
 const chalk_1 = __importDefault(require("chalk"));
-const init_1 = require("./init");
+const api_1 = require("../utils/api");
 async function webhookList(projectName, options = {}) {
-    const config = (0, init_1.getConfig)();
-    if (!config?.apiKey) {
-        console.error(chalk_1.default.red('Not initialized. Run "solidactions init <api-key>" first.'));
-        process.exit(1);
-    }
+    const config = await (0, api_1.requireConfigWithWorkspace)();
     const environment = options.env || 'dev';
     const projectSlug = environment === 'production' ? projectName : `${projectName}-${environment}`;
     console.log(chalk_1.default.blue(`Webhooks for project "${projectName}"${environment !== 'production' ? ` (${environment})` : ''}:`));
@@ -22,10 +18,7 @@ async function webhookList(projectName, options = {}) {
             params.show_secrets = 'true';
         }
         const response = await axios_1.default.get(`${config.host}/api/v1/projects/${projectSlug}/webhooks`, {
-            headers: {
-                'Authorization': `Bearer ${config.apiKey}`,
-                'Accept': 'application/json',
-            },
+            headers: (0, api_1.getApiHeaders)(config),
             params,
         });
         const webhooks = response.data || [];

package/dist/commands/workspaces.js

@@ -0,0 +1,89 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.workspacesList = workspacesList;
+exports.workspaceSet = workspaceSet;
+const axios_1 = __importDefault(require("axios"));
+const chalk_1 = __importDefault(require("chalk"));
+const api_1 = require("../utils/api");
+const init_1 = require("./init");
+async function workspacesList() {
+    const config = (0, api_1.requireConfig)();
+    try {
+        const response = await axios_1.default.get(`${config.host}/api/v1/workspaces`, {
+            headers: {
+                'Authorization': `Bearer ${config.apiKey}`,
+                'Accept': 'application/json',
+            },
+        });
+        // API returns { workspaces: { "Org Name": [{ id, name, role, tenant_name, ... }] } }
+        const grouped = response.data.workspaces || response.data.data || response.data;
+        let hasWorkspaces = false;
+        console.log(chalk_1.default.blue(`\nYour workspaces:\n`));
+        if (typeof grouped === 'object' && !Array.isArray(grouped)) {
+            for (const orgName of Object.keys(grouped)) {
+                console.log(`  ${chalk_1.default.white(orgName)}`);
+                for (const ws of grouped[orgName]) {
+                    hasWorkspaces = true;
+                    const current = config.workspaceId === ws.id ? chalk_1.default.green(' ← current') : '';
+                    console.log(`    ${chalk_1.default.white(ws.name)} ${chalk_1.default.gray(`(${ws.role})`)}${current}`);
+                    console.log(chalk_1.default.gray(`      ID: ${ws.id}`));
+                }
+            }
+        }
+        else if (Array.isArray(grouped)) {
+            for (const ws of grouped) {
+                hasWorkspaces = true;
+                const current = config.workspaceId === ws.id ? chalk_1.default.green(' ← current') : '';
+                console.log(`  ${chalk_1.default.white(ws.name)} ${chalk_1.default.gray(`(${ws.org_name || ''}, ${ws.role})`)}${current}`);
+                console.log(chalk_1.default.gray(`    ID: ${ws.id}`));
+            }
+        }
+        if (!hasWorkspaces) {
+            console.log(chalk_1.default.yellow('No workspaces found.'));
+            return;
+        }
+        console.log('');
+    }
+    catch (error) {
+        console.error(chalk_1.default.red('Failed to list workspaces:'), error.response?.data?.message || error.message);
+        process.exit(1);
+    }
+}
+async function workspaceSet(workspaceId) {
+    const config = (0, api_1.requireConfig)();
+    // Validate the workspace exists and user has access
+    try {
+        const response = await axios_1.default.get(`${config.host}/api/v1/workspaces`, {
+            headers: {
+                'Authorization': `Bearer ${config.apiKey}`,
+                'Accept': 'application/json',
+            },
+        });
+        // Flatten grouped response
+        const grouped = response.data.workspaces || response.data.data || response.data;
+        let allWorkspaces = [];
+        if (typeof grouped === 'object' && !Array.isArray(grouped)) {
+            for (const orgWorkspaces of Object.values(grouped)) {
+                allWorkspaces.push(...orgWorkspaces);
+            }
+        }
+        else if (Array.isArray(grouped)) {
+            allWorkspaces = grouped;
+        }
+        const workspace = allWorkspaces.find((w) => w.id === workspaceId || w.slug === workspaceId || w.name === workspaceId);
+        if (!workspace) {
+            console.error(chalk_1.default.red(`Workspace "${workspaceId}" not found. Run \`solidactions workspaces\` to list available workspaces.`));
+            process.exit(1);
+        }
+        config.workspaceId = workspace.id;
+        (0, init_1.saveConfig)(config);
+        console.log(chalk_1.default.green(`Workspace set to: ${workspace.name} (${workspace.id})`));
+    }
+    catch (error) {
+        console.error(chalk_1.default.red('Failed to set workspace:'), error.response?.data?.message || error.message);
+        process.exit(1);
+    }
+}

package/dist/index.js

@@ -23,6 +23,7 @@ const webhooks_1 = require("./commands/webhooks");
 const dev_1 = require("./commands/dev");
 const ai_init_1 = require("./commands/ai-init");
 const ai_examples_1 = require("./commands/ai-examples");
+const workspaces_1 = require("./commands/workspaces");
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const pkg = require('../package.json');
 const program = new commander_1.Command();
@@ -39,6 +40,7 @@ program
     .argument('<api-key>', 'Your SolidActions API key')
     .option('--dev', 'Use local development server (http://localhost:8000)')
     .option('--host <url>', 'Custom API host URL')
+    .option('--workspace <name-or-id>', 'Set workspace by name, slug, or ID (skips interactive prompt)')
     .action((apiKey, options) => {
     (0, init_1.init)(apiKey, options);
 });
@@ -243,6 +245,22 @@ program
     (0, webhooks_1.webhookList)(project, options);
 });
 // =============================================================================
+// Workspaces
+// =============================================================================
+program
+    .command('workspaces')
+    .description('List your workspaces across all organizations')
+    .action(() => {
+    (0, workspaces_1.workspacesList)();
+});
+program
+    .command('workspace:set')
+    .description('Set the active workspace for CLI operations')
+    .argument('<workspace-id>', 'Workspace ID, slug, or name')
+    .action((workspaceId) => {
+    (0, workspaces_1.workspaceSet)(workspaceId);
+});
+// =============================================================================
 // AI Helper
 // =============================================================================
 program

package/dist/utils/api.js

@@ -0,0 +1,129 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getApiHeaders = getApiHeaders;
+exports.ensureWorkspaceSelected = ensureWorkspaceSelected;
+exports.requireConfig = requireConfig;
+exports.requireConfigWithWorkspace = requireConfigWithWorkspace;
+const axios_1 = __importDefault(require("axios"));
+const chalk_1 = __importDefault(require("chalk"));
+const readline_1 = __importDefault(require("readline"));
+const init_1 = require("../commands/init");
+/**
+ * Get standard API headers including X-Workspace-Id if configured.
+ */
+function getApiHeaders(config, contentType) {
+    const headers = {
+        'Authorization': `Bearer ${config.apiKey}`,
+        'Accept': 'application/json',
+    };
+    if (contentType) {
+        headers['Content-Type'] = contentType;
+    }
+    if (config.workspaceId) {
+        headers['X-Workspace-Id'] = config.workspaceId;
+    }
+    return headers;
+}
+/**
+ * Ensure a workspace is selected. If not configured, fetches workspaces and auto-selects
+ * (if only one) or prompts the user to choose.
+ *
+ * Returns the config with workspaceId set, or exits if no workspaces available.
+ */
+async function ensureWorkspaceSelected(config) {
+    if (config.workspaceId) {
+        return config;
+    }
+    // Fetch workspaces from API (this endpoint doesn't require X-Workspace-Id)
+    let workspaces;
+    try {
+        const response = await axios_1.default.get(`${config.host}/api/v1/workspaces`, {
+            headers: {
+                'Authorization': `Bearer ${config.apiKey}`,
+                'Accept': 'application/json',
+            },
+        });
+        // API returns { workspaces: { "Org Name": [{ id, name, role, tenant_name, ... }] } }
+        // Flatten the grouped structure into a flat array
+        const grouped = response.data.workspaces || response.data.teams || response.data.data || response.data;
+        if (typeof grouped === 'object' && !Array.isArray(grouped)) {
+            workspaces = [];
+            for (const orgName of Object.keys(grouped)) {
+                for (const ws of grouped[orgName]) {
+                    workspaces.push({
+                        id: ws.id,
+                        name: ws.name,
+                        org_name: ws.tenant_name || orgName,
+                        role: ws.role,
+                    });
+                }
+            }
+        }
+        else {
+            workspaces = Array.isArray(grouped) ? grouped : [];
+        }
+    }
+    catch (error) {
+        if (error.response?.status === 401) {
+            console.error(chalk_1.default.red('Authentication failed. Run `solidactions init <api-key>` to reconfigure.'));
+        }
+        else {
+            console.error(chalk_1.default.red('Failed to fetch workspaces:'), error.response?.data?.message || error.message);
+        }
+        process.exit(1);
+    }
+    if (workspaces.length === 0) {
+        console.error(chalk_1.default.red('No workspaces found. Create a workspace at your SolidActions dashboard first.'));
+        process.exit(1);
+    }
+    let selected;
+    if (workspaces.length === 1) {
+        selected = workspaces[0];
+        console.log(chalk_1.default.gray(`Auto-selected workspace: ${selected.name}`));
+    }
+    else {
+        // Prompt user to select
+        console.log(chalk_1.default.blue('\nSelect a workspace:\n'));
+        workspaces.forEach((ws, i) => {
+            console.log(`  ${chalk_1.default.white(`${i + 1}.`)} ${ws.name} ${chalk_1.default.gray(`(${ws.org_name}, ${ws.role})`)}`);
+        });
+        console.log('');
+        const rl = readline_1.default.createInterface({ input: process.stdin, output: process.stdout });
+        const answer = await new Promise((resolve) => {
+            rl.question(chalk_1.default.blue('Enter number: '), resolve);
+        });
+        rl.close();
+        const index = parseInt(answer, 10) - 1;
+        if (isNaN(index) || index < 0 || index >= workspaces.length) {
+            console.error(chalk_1.default.red('Invalid selection.'));
+            process.exit(1);
+        }
+        selected = workspaces[index];
+    }
+    // Save workspace selection to config
+    config.workspaceId = selected.id;
+    (0, init_1.saveConfig)(config);
+    console.log(chalk_1.default.green(`Workspace set: ${selected.name}`));
+    return config;
+}
+/**
+ * Get config and ensure it's initialized. Exits if not.
+ */
+function requireConfig() {
+    const config = (0, init_1.getConfig)();
+    if (!config?.apiKey) {
+        console.error(chalk_1.default.red('Not initialized. Run `solidactions init <api-key>` first.'));
+        process.exit(1);
+    }
+    return config;
+}
+/**
+ * Get config with workspace selected. Use this for any command that needs workspace context.
+ */
+async function requireConfigWithWorkspace() {
+    const config = requireConfig();
+    return ensureWorkspaceSelected(config);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@solidactions/cli",
-    "version": "0.7.0",
+    "version": "0.7.3",
     "description": "SolidActions CLI - Deploy and manage workflow automation",
     "main": "dist/index.js",
     "bin": {