@solidactions/cli 1.22.0 → 1.23.1

package/README.md

@@ -44,6 +44,8 @@ You can mix: e.g., set only `SOLIDACTIONS_WORKSPACE_ID` in the environment while
 
 In interactive shells, `login` without `--local`/`--global` prompts for a location. In non-interactive contexts, one of the flags is required.
 
+If the target config file already exists and its contents would change, `login` writes a timestamped backup (e.g. `config.json.bak-2026-07-05T12-30-00Z`) alongside it before overwriting, and prints the backup path. Non-interactive runs proceed automatically (with the backup); an interactive TTY additionally asks a y/N confirmation first.
+
 ### `solidactions logout` flags
 
 - `--local` — remove only the nearest local config (walks up from cwd).
@@ -115,7 +117,7 @@ Use `solidactions <command> --help` for full flag details on any command.
 
 | Command | Key Flags | Description |
 |---------|-----------|-------------|
-| `env set <key> <value>` | `-s`, `-y`, `--staging-value`, `--dev-value` | Set global variable (warns before overwriting) |
+| `env set <key> <value> --global` | `-s`, `-y`, `--staging-value`, `--dev-value`, `--global` | Set global variable (warns before overwriting) |
 | `env set <project> <key> <value>` | `-e`, `-s`, `-y` | Set project variable (warns before overwriting) |
 | `env list [project]` | `-e` | List variables |
 | `env delete <key-or-project> [key]` | `-y` | Delete a variable |

package/dist/commands/env-map.js

@@ -25,7 +25,7 @@ async function envMap(projectName, projectKey, globalKey, options = {}) {
         const globalVar = variables.find((v) => v.key === globalKey);
         if (!globalVar) {
             console.error(chalk_1.default.red(`Global variable "${globalKey}" not found.`));
-            console.log(chalk_1.default.gray('Create it with: solidactions env set ' + globalKey + ' <value>'));
+            console.log(chalk_1.default.gray('Create it with: solidactions env set ' + globalKey + ' <value> --global'));
             process.exit(1);
         }
         // Check if project key already has a mapping

package/dist/commands/env-set.js

@@ -17,15 +17,33 @@ function isNonTty() {
 }
 /** Printed before a 2-arg (global-scope) write — Jordan's runs 3-7 footgun. */
 exports.GLOBAL_ENV_SCOPE_NOTE = [
-    'Note: no project specified — creating a GLOBAL variable.',
+    'Note: --global specified — creating a GLOBAL variable.',
     "  Global variables are NOT visible to a project's plain `env:` YAML declarations",
     '  unless you map them (`solidactions env map …`).',
     '  For a project variable, use: solidactions env set <project> KEY value',
 ].join('\n');
 async function envSet(keyOrProject, valueOrKey, valueIfProject, options = {}) {
-    const config = await (0, api_1.requireConfigWithWorkspace)();
     // Detect mode based on arguments
     const isProjectMode = valueIfProject !== undefined;
+    // Jordan Wall #4 (Sweep C, → 1.23.0): a 2-positional-arg call used to fall
+    // through to GLOBAL scope silently, so a typo'd `env set KEY VALUE` (meant
+    // for a project) wrote a global var the workflow never reads. Global
+    // writes now require an explicit --global. Runs before any
+    // config/network work so a plain argument mistake never needs a login.
+    if (!isProjectMode && !options.global) {
+        process.stderr.write(chalk_1.default.red('env set needs either a project or --global — pick one:\n' +
+            '  solidactions env set KEY VALUE --global      (global variable)\n' +
+            '  solidactions env set <project> KEY VALUE     (project variable)\n'));
+        process.exit(1);
+    }
+    // --global never takes a project positional — reject the ambiguous combo too.
+    if (isProjectMode && options.global) {
+        process.stderr.write(chalk_1.default.red('env set: --global does not take a project argument — pick one:\n' +
+            '  solidactions env set KEY VALUE --global      (global variable)\n' +
+            '  solidactions env set <project> KEY VALUE     (project variable)\n'));
+        process.exit(1);
+    }
+    const config = await (0, api_1.requireConfigWithWorkspace)();
     if (isProjectMode) {
         // Project mode: solidactions env set <project> <key> <value>
         const projectName = keyOrProject;

package/dist/commands/login.js

@@ -7,10 +7,12 @@ 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 chalk_1 = __importDefault(require("chalk"));
 const api_1 = require("../utils/api");
 const workspaces_1 = require("./workspaces");
@@ -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 [
@@ -55,19 +69,28 @@ async function login(apiKey, options) {
         process.exit(1);
     }
     // Determine target location.
-    const target = await (0, config_write_target_1.decideWriteTarget)({ local: options.local, global: options.global });
+    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);
     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(),
     };
+    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);

package/dist/index.js

@@ -244,6 +244,7 @@ env
     .argument('[value]', 'Variable value (when first arg is project)')
     .option('-s, --secret', 'Mark as encrypted secret')
     .option('-e, --env <environment>', 'Target environment (production/staging/dev)', 'dev')
+    .option('--global', 'Set a global variable (no project) — required for the 2-arg form')
     .option('--staging-value <value>', 'Staging environment value (global only)')
     .option('--dev-value <value>', 'Dev environment value (global only)')
     .option('--staging-inherit', 'Staging inherits from production (global only)')

package/dist/utils/config-write-target.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.decideWriteTarget = decideWriteTarget;
 exports.pathForTarget = pathForTarget;
+exports.confirmOverwrite = confirmOverwrite;
 exports.ensureGitignoreCovers = ensureGitignoreCovers;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
@@ -19,7 +20,7 @@ const config_1 = require("./config");
  *  - Else if TTY, prompt.
  *  - Else error and exit.
  */
-async function decideWriteTarget(options, promptLabel = 'Save config locally (./.solidactions) or globally (~/.solidactions)? [global] ') {
+async function decideWriteTarget(options, promptLabel = 'Save config locally (./.solidactions) or globally (~/.solidactions)? [global] ', refusalMessage = 'Refusing to write config non-interactively. Pass --local or --global.') {
     if (options.local && options.global) {
         console.error(chalk_1.default.red('Error: --local and --global are mutually exclusive.'));
         process.exit(1);
@@ -45,12 +46,34 @@ async function decideWriteTarget(options, promptLabel = 'Save config locally (./
             rl.close();
         }
     }
-    console.error(chalk_1.default.red('Refusing to write config non-interactively. Pass --local or --global.'));
+    console.error(chalk_1.default.red(refusalMessage));
     process.exit(1);
 }
 function pathForTarget(target) {
     return target === 'local' ? (0, config_1.getLocalConfigPath)() : (0, config_1.getGlobalConfigPath)();
 }
+/**
+ * Notify (and, on a TTY, confirm) that an existing config file is about to be
+ * overwritten. A backup will be written to `backupPath` regardless of mode —
+ * this always says so. Non-interactive callers (CI, agents) proceed
+ * automatically so they never wedge; an interactive TTY additionally asks a
+ * y/N confirm (default N).
+ */
+async function confirmOverwrite(existingPath, backupPath) {
+    const notice = `Existing config at ${existingPath} will be overwritten (backup will be saved to ${backupPath}).`;
+    if (!process.stdin.isTTY) {
+        console.log(chalk_1.default.yellow(notice));
+        return true;
+    }
+    const rl = readline_1.default.createInterface({ input: process.stdin, output: process.stdout });
+    try {
+        const answer = await new Promise((resolve) => rl.question(chalk_1.default.yellow(`${notice} Continue? [y/N] `), resolve));
+        return answer.trim().toLowerCase().startsWith('y');
+    }
+    finally {
+        rl.close();
+    }
+}
 /**
  * Ensure `.solidactions/` is in the target directory's `.gitignore`.
  * Idempotent. Skips silently if pattern is already covered.

package/package.json

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