@solidactions/cli 1.23.0 → 1.24.0

package/dist/commands/login.js

@@ -7,15 +7,17 @@ exports.getConfig = getConfig;
 exports.saveConfig = saveConfig;
 exports.clearConfig = clearConfig;
 exports.resolveLoginHost = resolveLoginHost;
+exports.backupPathFor = backupPathFor;
 exports.loginHostLines = loginHostLines;
 exports.login = login;
 exports.logout = logout;
 exports.whoami = whoami;
+const fs_1 = __importDefault(require("fs"));
+const readline_1 = __importDefault(require("readline"));
 const chalk_1 = __importDefault(require("chalk"));
-const api_1 = require("../utils/api");
-const workspaces_1 = require("./workspaces");
 const config_1 = require("../utils/config");
 const config_write_target_1 = require("../utils/config-write-target");
+const workspace_lookup_1 = require("../utils/workspace-lookup");
 function getConfig() {
     const resolved = (0, config_1.resolveConfig)();
     return resolved ? resolved.config : null;
@@ -37,6 +39,18 @@ function resolveLoginHost(options) {
     }
     return { host: 'https://app.solidactions.com', isDefault: true };
 }
+/**
+ * Path for a timestamped backup of `targetPath`, e.g.
+ * `config.json.bak-2026-07-05T12-30-00Z`. Pure — takes `now` so tests are
+ * deterministic.
+ */
+function backupPathFor(targetPath, now = new Date()) {
+    const timestamp = now.toISOString().replace(/\.\d{3}Z$/, 'Z').replace(/:/g, '-');
+    return `${targetPath}.bak-${timestamp}`;
+}
+const LOGIN_REFUSAL_MESSAGE = 'Refusing to write config non-interactively. Pass --global to update the machine-wide config ' +
+    'at ~/.solidactions/config.json (a backup is kept if one exists), or --local to write ' +
+    './.solidactions/config.json for just this directory.';
 function loginHostLines(resolved) {
     if (resolved.isDefault) {
         return [
@@ -46,6 +60,36 @@ function loginHostLines(resolved) {
     }
     return [`Host: ${resolved.host}`];
 }
+/**
+ * Prompt the user to pick a workspace from an already-fetched list. Auto-
+ * selects when there's exactly one. Returns undefined if none exist.
+ */
+async function selectWorkspaceInteractively(workspaces) {
+    if (workspaces.length === 0) {
+        console.log(chalk_1.default.yellow('No workspaces found. Create one at your SolidActions dashboard, then run `solidactions workspace set <name>`.'));
+        return undefined;
+    }
+    if (workspaces.length === 1) {
+        console.log(chalk_1.default.gray(`Auto-selected workspace: ${workspaces[0].name}`));
+        return workspaces[0];
+    }
+    console.log(chalk_1.default.blue('\nSelect a workspace:\n'));
+    workspaces.forEach((ws, i) => {
+        console.log(`  ${chalk_1.default.white(`${i + 1}.`)} ${ws.name}`);
+    });
+    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);
+    }
+    return workspaces[index];
+}
 async function login(apiKey, options) {
     const resolved = resolveLoginHost(options);
     const host = resolved.host;
@@ -54,39 +98,71 @@ async function login(apiKey, options) {
         console.log(chalk_1.default.gray('Generate an API key at: ') + chalk_1.default.blue(`${host}/settings/api-keys`));
         process.exit(1);
     }
-    // Determine target location.
-    const target = await (0, config_write_target_1.decideWriteTarget)({ local: options.local, global: options.global });
-    const targetPath = (0, config_write_target_1.pathForTarget)(target);
     console.log(chalk_1.default.blue(`Initializing SolidActions CLI...`));
     for (const line of loginHostLines(resolved)) {
         console.log(resolved.isDefault ? chalk_1.default.yellow(line) : chalk_1.default.gray(line));
     }
-    if ((0, config_1.readConfigFile)(targetPath)) {
-        console.log(chalk_1.default.yellow(`Existing config at ${targetPath} will be overwritten.`));
-    }
     const config = {
         host,
         apiKey: apiKey.trim(),
     };
-    (0, config_1.writeConfigFile)(targetPath, config);
-    if (target === 'local') {
-        await (0, config_write_target_1.ensureGitignoreCovers)(process.cwd(), !!options.gitignore);
-    }
-    console.log(chalk_1.default.green('Logged in successfully!'));
-    console.log(chalk_1.default.gray(`Configuration saved to ${targetPath}`));
-    console.log('');
-    // Workspace selection — ensureWorkspaceSelected writes to the right file via the resolver.
+    // 1. Validate the key BEFORE any disk write.
+    let workspaces;
     try {
-        if (options.workspace) {
-            await (0, workspaces_1.workspaceSet)(options.workspace);
+        workspaces = await (0, workspace_lookup_1.fetchWorkspaces)(config);
+    }
+    catch (e) {
+        if (e.response?.status === 401) {
+            console.error(chalk_1.default.red(`Invalid API key for ${host}.`));
         }
         else {
-            await (0, api_1.ensureWorkspaceSelected)(config);
+            console.error(chalk_1.default.red(`Could not reach ${host}: ${e.message}`));
+        }
+        process.exit(1);
+        return;
+    }
+    // 2. Resolve the workspace (still before writing).
+    if (options.workspace) {
+        const match = (0, workspace_lookup_1.matchWorkspace)(options.workspace, workspaces);
+        if (!match) {
+            console.error(chalk_1.default.red(`Workspace "${options.workspace}" not found. Run \`solidactions workspace list\` to list available workspaces.`));
+            process.exit(1);
+            return;
+        }
+        config.workspace = match.slug ?? match.name;
+        config.workspaceId = match.id;
+    }
+    else if (process.stdin.isTTY) {
+        const selected = await selectWorkspaceInteractively(workspaces);
+        if (selected) {
+            config.workspace = selected.slug ?? selected.name;
+            config.workspaceId = selected.id;
         }
     }
-    catch {
-        console.log(chalk_1.default.yellow('Could not set workspace. Run `solidactions workspace set` later.'));
+    else {
+        console.log(chalk_1.default.yellow('No workspace set — run `solidactions workspace set <name>` later.'));
     }
+    // 3. Determine target location, back up if needed, and write ONCE.
+    const target = await (0, config_write_target_1.decideWriteTarget)({ local: options.local, global: options.global }, undefined, LOGIN_REFUSAL_MESSAGE);
+    const targetPath = (0, config_write_target_1.pathForTarget)(target);
+    const existingRaw = fs_1.default.existsSync(targetPath) ? fs_1.default.readFileSync(targetPath, 'utf-8') : null;
+    const wouldChange = existingRaw !== null && existingRaw.trim() !== JSON.stringify(config, null, 2).trim();
+    if (wouldChange) {
+        const backupPath = backupPathFor(targetPath);
+        const proceed = await (0, config_write_target_1.confirmOverwrite)(targetPath, backupPath);
+        if (!proceed) {
+            console.log(chalk_1.default.yellow('Aborted. No changes were made.'));
+            process.exit(0);
+        }
+        fs_1.default.copyFileSync(targetPath, backupPath);
+        console.log(chalk_1.default.gray(`Backup saved to ${backupPath}`));
+    }
+    (0, config_1.writeConfigFile)(targetPath, config);
+    if (target === 'local') {
+        await (0, config_write_target_1.ensureGitignoreCovers)(process.cwd(), !!options.gitignore);
+    }
+    console.log(chalk_1.default.green('Logged in successfully!'));
+    console.log(chalk_1.default.gray(`Configuration saved to ${targetPath}`));
     console.log('');
     console.log(chalk_1.default.blue('Next step — scaffold a new project (includes AI tooling):'));
     console.log(chalk_1.default.gray('  solidactions init <project-name>      Creates ./<project-name>/ with scaffold + AI skills'));
@@ -123,7 +199,8 @@ function logout(options = {}) {
         console.log(chalk_1.default.green(`Logged out. Removed ${targetPath}`));
     }
     else {
-        console.log(chalk_1.default.gray(`Not logged in (no config at ${targetPath}).`));
+        console.log(chalk_1.default.gray(`Not logged in (no config at ${targetPath}) — nothing to remove.`));
+        process.exit(0);
     }
 }
 function whoami() {
@@ -151,8 +228,10 @@ function whoami() {
         : config.workspaceId
             ? `${config.workspaceId} (slug unknown — run 'workspace set <slug>' to populate)`
             : '';
+    const isFileSource = (src) => src !== null && src !== 'env' && src !== 'cli';
+    const workspaceInheritedFromOtherFile = isFileSource(sources.workspaceId) && sources.workspaceId !== sources.apiKey;
     console.log(chalk_1.default.blue('Current configuration:'));
     console.log(`  Host:        ${config.host.padEnd(50)} ${fmt(sources.host)}`);
     console.log(`  API Key:     ${maskedKey.padEnd(50)} ${fmt(sources.apiKey)}`);
-    console.log(`  Workspace:   ${workspaceLabel.padEnd(50)} ${fmt(sources.workspaceId)}`);
+    console.log(`  Workspace:   ${workspaceLabel.padEnd(50)} ${fmt(sources.workspaceId)}${workspaceInheritedFromOtherFile ? chalk_1.default.yellow(' (inherited from a different config file)') : ''}`);
 }

package/dist/commands/oauth-actions-list.js

@@ -23,7 +23,7 @@ async function oauthActionsList(platform, options) {
             return;
         }
         if (actions.length === 0) {
-            console.log('No actions found.');
+            console.log(`No actions found for "${platform}" — check the platform name and that a connection exists (\`solidactions env pull --update-oauth\` syncs connections).`);
             return;
         }
         for (const a of actions) {

package/dist/commands/oauth-actions-search.js

@@ -27,7 +27,7 @@ async function oauthActionsSearch(platform, query, options) {
             return;
         }
         if (actions.length === 0) {
-            console.log('No actions found.');
+            console.log(`No actions found for "${platform}" — check the platform name and that a connection exists (\`solidactions env pull --update-oauth\` syncs connections).`);
             return;
         }
         for (const a of actions) {

package/dist/commands/project-list.js

@@ -7,30 +7,36 @@ exports.projectList = projectList;
 const axios_1 = __importDefault(require("axios"));
 const chalk_1 = __importDefault(require("chalk"));
 const api_1 = require("../utils/api");
-async function projectList() {
+const table_1 = require("../utils/table");
+async function projectList(options = {}) {
     const config = await (0, api_1.requireConfigWithWorkspace)();
-    console.log(chalk_1.default.blue('Projects:\n'));
     try {
         const response = await axios_1.default.get(`${config.host}/api/v1/projects`, {
             headers: (0, api_1.getApiHeaders)(config),
         });
         const projects = response.data.data || [];
+        if (options.json) {
+            console.log(JSON.stringify(projects, null, 2));
+            return;
+        }
+        // Header is only printed after the fetch succeeds — an auth/network
+        // failure used to print "Projects:" followed immediately by the error.
+        console.log(chalk_1.default.blue('Projects:\n'));
         if (projects.length === 0) {
             console.log(chalk_1.default.gray('No projects found.'));
             return;
         }
-        console.log(chalk_1.default.gray('NAME'.padEnd(25) + 'STATUS'.padEnd(15) + 'SNAPSHOT'.padEnd(30) + 'ENVIRONMENTS'));
-        console.log(chalk_1.default.gray('-'.repeat(100)));
-        for (const project of projects) {
-            const name = (project.name || '?').padEnd(25);
-            const status = project.status || '?';
-            const statusColor = status === 'ready' ? chalk_1.default.green : status === 'building' ? chalk_1.default.yellow : chalk_1.default.gray;
-            const snapshot = (project.snapshot_name || '-').padEnd(30);
+        const rows = projects.map((project) => {
             const envs = (project.environments || [project.environment || 'production']).join(', ');
-            console.log(name +
-                statusColor(status.padEnd(15)) +
-                chalk_1.default.gray(snapshot) +
-                chalk_1.default.gray(envs));
+            return [project.name || '?', project.status || '?', project.snapshot_name || '-', envs];
+        });
+        const lines = (0, table_1.renderTable)(['NAME', 'STATUS', 'SNAPSHOT', 'ENVIRONMENTS'], rows, {
+            minWidths: [25, 15, 30],
+        });
+        console.log(chalk_1.default.gray(lines[0]));
+        console.log(chalk_1.default.gray(lines[1]));
+        for (const line of lines.slice(2)) {
+            console.log(line);
         }
         console.log('');
         console.log(chalk_1.default.gray(`${projects.length} project(s)`));

package/dist/commands/pull.js

@@ -45,8 +45,23 @@ async function pull(projectName, destPath, options = {}) {
         console.log(chalk_1.default.gray(`Downloaded ${buffer.length} bytes`));
         console.log(chalk_1.default.yellow(`Extracting to ${destination}...`));
         fs_1.default.mkdirSync(destination, { recursive: true });
+        // The server streams back the exact archive `deploy` uploaded: a
+        // root-level Dockerfile plus every project file nested under
+        // tenantcode/ (see deploy.ts:510-527). Unwrap it here so the pulled
+        // project's files land at dest root, matching what the user actually
+        // wrote — dropping the generated Dockerfile and any noCache
+        // cache-buster entries (deploy.ts's cacheBusterEntry).
         const readable = stream_1.Readable.from(buffer);
-        await (0, promises_1.pipeline)(readable, (0, zlib_1.createGunzip)(), (0, tar_1.extract)({ cwd: destination, strip: 0 }));
+        await (0, promises_1.pipeline)(readable, (0, zlib_1.createGunzip)(), (0, tar_1.extract)({
+            cwd: destination,
+            strip: 1,
+            // `filter` receives the pre-strip path (verified against this
+            // version of the `tar` package).
+            filter: (entryPath) => {
+                const top = entryPath.split('/')[0];
+                return top === 'tenantcode' && !/\/sa-nocache-[0-9a-f-]+$/.test(entryPath);
+            },
+        }));
         console.log(chalk_1.default.green(`Project "${projectName}" pulled successfully!`));
     }
     catch (error) {

package/dist/commands/role-push.js

@@ -69,7 +69,7 @@ async function rolePushWithConfig(dir, options, config) {
             readResult = await (0, mcp_1.callCrewsTool)(config, 'roles', { action: 'read', name });
         }
         catch (e) {
-            process.stderr.write(chalk_1.default.red(`error: MCP request failed — ${e.message}\n`));
+            process.stderr.write(chalk_1.default.red(`error: ${e.message}\n`));
             process.exit(1);
         }
         if (!readResult.ok) {
@@ -110,7 +110,7 @@ async function rolePushWithConfig(dir, options, config) {
         });
     }
     catch (e) {
-        process.stderr.write(chalk_1.default.red(`error: MCP request failed — ${e.message}\n`));
+        process.stderr.write(chalk_1.default.red(`error: ${e.message}\n`));
         process.exit(1);
     }
     // On name collision, switch to the edit path.
@@ -126,7 +126,7 @@ async function rolePushWithConfig(dir, options, config) {
             });
         }
         catch (e) {
-            process.stderr.write(chalk_1.default.red(`error: MCP request failed — ${e.message}\n`));
+            process.stderr.write(chalk_1.default.red(`error: ${e.message}\n`));
             process.exit(1);
         }
         if (!result.ok) {

package/dist/commands/run-list.js

@@ -10,6 +10,7 @@ exports.detailedOutcomeTag = detailedOutcomeTag;
 const axios_1 = __importDefault(require("axios"));
 const chalk_1 = __importDefault(require("chalk"));
 const api_1 = require("../utils/api");
+const table_1 = require("../utils/table");
 /**
  * Build the params object for GET /api/v1/runs.
  * Extracted as a pure function so it can be unit-tested without mocking axios.
@@ -124,19 +125,30 @@ function displaySummaryTable(runsList, projectName) {
     const header = projectName ? `Recent runs for "${projectName}":` : 'Recent runs:';
     console.log(chalk_1.default.blue(header));
     console.log('');
-    console.log(chalk_1.default.gray('ID'.padEnd(8) + 'WORKFLOW'.padEnd(25) + 'STATUS'.padEnd(12) + 'TRIGGERED'.padEnd(22) + 'TRIGGERED BY'));
-    console.log(chalk_1.default.gray('-'.repeat(90)));
-    for (const run of runsList) {
-        const id = String(run.id || '?').padEnd(8);
-        const workflow = truncate(run.workflow_name || '?', 24).padEnd(25);
-        const { label: status, attention } = summaryStatusLabel(run);
-        const statusColor = attention ? chalk_1.default.yellow : getStatusColor(status);
+    const headers = ['ID', 'WORKFLOW', 'STATUS', 'TRIGGERED', 'TRIGGERED BY'];
+    const rows = runsList.map((run) => {
+        const { label: status } = summaryStatusLabel(run);
         const triggeredAt = run.triggered_at ? new Date(run.triggered_at).toLocaleString() : '-';
-        const triggeredBy = run.triggered_by || '-';
-        console.log(chalk_1.default.gray(id) +
-            workflow +
-            statusColor(status.padEnd(12)) +
-            chalk_1.default.gray(triggeredAt.padEnd(22)) +
+        return [
+            String(run.id || '?'),
+            (0, table_1.sanitizeCell)((0, table_1.truncateCell)(run.workflow_name || '?', 24)),
+            status,
+            triggeredAt,
+            (0, table_1.sanitizeCell)(run.triggered_by || '-'),
+        ];
+    });
+    const widths = (0, table_1.computeColumnWidths)(headers, rows, { minWidths: [8, 25, 12, 22, 0] });
+    console.log(chalk_1.default.gray(headers.map((h, i) => h.padEnd(widths[i])).join('')));
+    console.log(chalk_1.default.gray('-'.repeat(widths.reduce((a, b) => a + b, 0))));
+    for (let i = 0; i < runsList.length; i++) {
+        const run = runsList[i];
+        const [id, workflow, status, triggeredAt, triggeredBy] = rows[i];
+        const { attention } = summaryStatusLabel(run);
+        const statusColor = attention ? chalk_1.default.yellow : getStatusColor(status);
+        console.log(chalk_1.default.gray(id.padEnd(widths[0])) +
+            workflow.padEnd(widths[1]) +
+            statusColor(status.padEnd(widths[2])) +
+            chalk_1.default.gray(triggeredAt.padEnd(widths[3])) +
             chalk_1.default.gray(triggeredBy));
     }
     console.log('');

package/dist/commands/run-start.js

@@ -72,7 +72,13 @@ async function run(projectName, workflowName, options) {
                 console.error(chalk_1.default.red('Authentication failed. Run "solidactions login <api-key>" to re-configure.'));
             }
             else if (error.response.status === 404) {
-                console.error(chalk_1.default.red('Project or workflow not found.'));
+                const envsList = await (0, api_1.describeProjectEnvironments)(config, projectName);
+                if (envsList) {
+                    console.error(chalk_1.default.red(`Project "${projectName}" has no ${environment} environment (exists in: ${envsList}). Pass -e <env> to target a different environment.`));
+                }
+                else {
+                    console.error(chalk_1.default.red('Project or workflow not found.'));
+                }
             }
             else if (error.response.status === 422) {
                 console.error(chalk_1.default.red('Validation error:'), error.response.data.message);

package/dist/commands/run-view.js

@@ -12,6 +12,11 @@ const axios_1 = __importDefault(require("axios"));
 const chalk_1 = __importDefault(require("chalk"));
 const api_1 = require("../utils/api");
 async function runView(runId, options) {
+    if (!/^\d+$/.test(runId)) {
+        console.error(chalk_1.default.red(`Invalid run id: "${runId}" (run ids are numeric — see \`solidactions run list\`).`));
+        process.exit(1);
+        return;
+    }
     const config = await (0, api_1.requireConfigWithWorkspace)();
     try {
         // Fetch run data (includes session timing)

package/dist/commands/skill-pull.js

@@ -42,7 +42,7 @@ async function skillPullWithConfig(name, dest, options, config) {
         result = await (0, mcp_1.callCrewsTool)(config, 'skills', { action: 'read', identifier: name });
     }
     catch (e) {
-        process.stderr.write(chalk_1.default.red(`error: MCP request failed — ${e.message}\n`));
+        process.stderr.write(chalk_1.default.red(`error: ${e.message}\n`));
         process.exit(1);
     }
     if (!result.ok) {

package/dist/commands/skill-push.js

@@ -193,7 +193,7 @@ async function pushParsedSkill(payload, options, config) {
             readResult = await (0, mcp_1.callCrewsTool)(config, tool, readArgs);
         }
         catch (e) {
-            throw new Error(`MCP request failed — ${e.message}`);
+            throw new Error(`${e.message}`);
         }
         if (!readResult.ok) {
             const code = readResult.data?.code;
@@ -215,7 +215,7 @@ async function pushParsedSkill(payload, options, config) {
         result = await (0, mcp_1.callCrewsTool)(config, tool, createArgs);
     }
     catch (e) {
-        throw new Error(`MCP request failed — ${e.message}`);
+        throw new Error(`${e.message}`);
     }
     // On name collision, switch to the edit path. properties → properties_patch.
     if (!result.ok && result.data?.code === 'name_collision') {
@@ -226,7 +226,7 @@ async function pushParsedSkill(payload, options, config) {
             result = await (0, mcp_1.callCrewsTool)(config, tool, editArgs);
         }
         catch (e) {
-            throw new Error(`MCP request failed — ${e.message}`);
+            throw new Error(`${e.message}`);
         }
         if (!result.ok) {
             const errData = result.data;

package/dist/index.js

@@ -71,17 +71,23 @@ program
     .name('solidactions')
     .description('SolidActions CLI - Deploy and manage workflow automation')
     .version(pkg.version);
-program.option('-w, --workspace <id-or-slug-or-name>', 'override active workspace for this command');
+// Long form is --workspace-override (NOT --workspace) — `login` already owns
+// `--workspace` for its own purpose (set the workspace at login time), and
+// commander silently drops a subcommand option whose long name collides with
+// a parent option of the same name, so `login --workspace <x>` was being
+// swallowed by this global flag instead of reaching login()'s own option.
+// The short form `-w` is unaffected and remains the primary way to use this.
+program.option('-w, --workspace-override <id-or-slug-or-name>', 'Override active workspace for this command (short form: -w)');
 program.hook('preAction', (thisCommand, actionCommand) => {
     const opts = thisCommand.opts();
-    const wsOverride = opts.workspace;
+    const wsOverride = opts.workspaceOverride;
     if (wsOverride) {
         // workspace set is a write — -w is for read-paths only.
         const fullName = actionCommand.name();
         const parentName = actionCommand.parent?.name?.();
         const isWorkspaceSet = fullName === 'set' && parentName === 'workspace';
         if (isWorkspaceSet) {
-            console.error(chalk_1.default.yellow('warn:') + ' -w/--workspace is ignored on `workspace set`; the positional argument is the new workspace.');
+            console.error(chalk_1.default.yellow('warn:') + ' -w/--workspace-override is ignored on `workspace set`; the positional argument is the new workspace.');
             return;
         }
         (0, config_1.setCliWorkspaceOverride)(wsOverride);
@@ -96,7 +102,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)')
+    .option('--workspace <name-or-id>', 'Set workspace by name, slug, or ID (skips interactive prompt). Non-interactive logins without this flag leave the workspace unset.')
     .option('--local', 'Save config to ./.solidactions/config.json in the current folder')
     .option('--global', 'Save config to ~/.solidactions/config.json (default if prompted)')
     .option('--gitignore', 'With --local, add .solidactions/ to .gitignore without prompting')
@@ -180,15 +186,18 @@ project
     .command('logs')
     .description('View build/deployment logs for a project')
     .argument('<project>', 'Project name (or family name with -e)')
-    .option('-e, --environment <environment>', 'Environment to resolve (production/staging/dev)')
+    .option('-e, --env <environment>', 'Environment to resolve (production/staging/dev)')
+    .addOption(new commander_1.Option('--environment <environment>', 'Alias of --env').hideHelp())
     .action((projectName, options) => {
-    (0, project_logs_1.logsBuild)(projectName, options.environment);
+    const environment = options.env ?? options.environment;
+    (0, project_logs_1.logsBuild)(projectName, environment);
 });
 project
     .command('list')
     .description('List all projects')
-    .action(() => {
-    (0, project_list_1.projectList)();
+    .option('--json', 'Output as JSON')
+    .action((options) => {
+    (0, project_list_1.projectList)(options);
 });
 // =============================================================================
 // run <subcommand>
@@ -217,8 +226,10 @@ runCmd
     .option('--detailed', 'Include timeline, steps, and logs per run (default limit: 5)')
     .option('--has-errors', 'Show only runs with errors (step errors, retries, or degraded results)')
     .option('--json', 'Output as JSON')
-    .option('-e, --environment <environment>', 'Environment to filter by (production/staging/dev)')
+    .option('-e, --env <environment>', 'Environment to filter by (production/staging/dev)')
+    .addOption(new commander_1.Option('--environment <environment>', 'Alias of --env').hideHelp())
     .action((projectName, options) => {
+    options.environment = options.env ?? options.environment;
     (0, run_list_1.runs)(projectName, options);
 });
 runCmd
@@ -235,10 +246,10 @@ runCmd
 // =============================================================================
 // env <subcommand>
 // =============================================================================
-const env = program.command('env').description('Manage environment variables');
+const env = program.command('env').description('Manage variables');
 env
     .command('set')
-    .description('Set an environment variable (create or update, global or project)')
+    .description('Set a variable (create or update, global or project)')
     .argument('<key-or-project>', 'Variable key (global) or project name')
     .argument('<value-or-key>', 'Variable value (global) or variable key (project)')
     .argument('[value]', 'Variable value (when first arg is project)')
@@ -256,17 +267,19 @@ env
 });
 env
     .command('list')
-    .description('List environment variables')
+    .description('List variables')
     .argument('[project]', 'Project name (omit for global variables)')
     .option('-e, --env <environment>', 'Filter by environment (production/staging/dev)')
+    .option('--json', 'Output as JSON')
     .action((projectName, options) => {
     (0, env_list_1.envList)(projectName, options);
 });
 env
     .command('delete')
-    .description('Delete an environment variable')
+    .description('Delete a variable')
     .argument('<key-or-project>', 'Variable key (global) or project name')
     .argument('[key]', 'Variable key (if first arg is project)')
+    .option('-e, --env <environment>', 'Environment to delete from', 'dev')
     .option('-y, --yes', 'Skip confirmation prompt')
     .action((keyOrProject, key, options) => {
     (0, env_delete_1.envDelete)(keyOrProject, key, options);
@@ -283,7 +296,7 @@ env
 });
 env
     .command('pull')
-    .description('Pull resolved environment variables to a local file')
+    .description('Pull resolved variables to a local file')
     .argument('<project>', 'Project name')
     .option('-e, --env <environment>', 'Environment (production/staging/dev)', 'dev')
     .option('-o, --output <file>', 'Output file path (defaults to .env or .env.{environment})')
@@ -294,7 +307,7 @@ env
 });
 env
     .command('push')
-    .description('Push environment variables from .env file to a project')
+    .description('Push variables from .env file to a project')
     .argument('<project>', 'Project name')
     .argument('[path]', 'Source directory with solidactions.yaml and .env file', '.')
     .option('-e, --env <environment>', 'Target environment (production/staging/dev)', 'dev')
@@ -313,7 +326,7 @@ schedule
     .description('Set a cron schedule for a workflow')
     .argument('<project>', 'Project name')
     .argument('<cron>', 'Cron expression (e.g., "0 9 * * *" for daily at 9am)')
-    .option('-w, --workflow <name>', 'Workflow name (if project has multiple)')
+    .option('--workflow <name>', 'Workflow name (if project has multiple)')
     .option('-i, --input <json>', 'JSON input to pass to scheduled runs')
     .option('-z, --timezone <iana>', 'IANA timezone the cron is evaluated in (e.g. America/Chicago); defaults to UTC')
     .option('-y, --yes', 'Skip confirmation if schedule already exists')