@solidactions/cli 1.8.0 → 1.9.0

package/dist/commands/deploy.js

@@ -113,6 +113,17 @@ async function pushYamlDeclarations(config, projectSlug, yamlConfig) {
 }
 async function deploy(projectName, sourcePath, options = {}) {
     const config = await (0, api_1.requireConfigWithWorkspace)();
+    let workspaceMismatchPrinted = false;
+    const printWorkspaceMismatchOnce = (error) => {
+        if (workspaceMismatchPrinted)
+            return;
+        const msg = error.response?.data?.message;
+        if (typeof msg === 'string' && /Project .+ not found in your active workspace/.test(msg)) {
+            console.error(chalk_1.default.yellow(msg));
+            console.error('');
+            workspaceMismatchPrinted = true;
+        }
+    };
     const sourceDir = sourcePath ? path_1.default.resolve(sourcePath) : process.cwd();
     // Capture whether -e was explicitly passed by the caller. Commander leaves
     // options.env as undefined when no default is set and the flag is omitted.
@@ -138,6 +149,11 @@ async function deploy(projectName, sourcePath, options = {}) {
     catch (error) {
         if (error.response?.status === 404) {
             productionExists = false;
+            // App PR #128 returns "Project '<slug>' not found in your active workspace '<ws>'." on 404.
+            // The axios interceptor (utils/api.ts) already appended the "Did you mean to switch workspaces?"
+            // hint. Surface that augmented message so the user sees the hint before falling through to
+            // the first-deploy flow.
+            printWorkspaceMismatchOnce(error);
         }
         else {
             // 5xx, network error, auth failure, etc. — fail conservatively rather
@@ -211,6 +227,10 @@ async function deploy(projectName, sourcePath, options = {}) {
     }
     catch (error) {
         if (error.response?.status === 404) {
+            // App PR #128 returns "Project '<slug>' not found in your active workspace '<ws>'." on 404.
+            // Surface the augmented message (axios interceptor already appended the hint) before
+            // falling through to the --create / first-deploy flow.
+            printWorkspaceMismatchOnce(error);
             // For non-production environments, require --create or give a clear hint
             if (environment !== 'production' && !options.create) {
                 console.error(chalk_1.default.red(`\nProject "${projectName}" doesn't have a ${environment} environment.\n`));

package/dist/commands/login.js

@@ -9,13 +9,11 @@ exports.clearConfig = clearConfig;
 exports.login = login;
 exports.logout = logout;
 exports.whoami = whoami;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-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");
 function getConfig() {
     const resolved = (0, config_1.resolveConfig)();
     return resolved ? resolved.config : null;
@@ -28,65 +26,6 @@ function saveConfig(config) {
 function clearConfig() {
     (0, config_1.removeConfigFile)((0, config_1.getGlobalConfigPath)());
 }
-async function promptLocation() {
-    const rl = readline_1.default.createInterface({ input: process.stdin, output: process.stdout });
-    try {
-        while (true) {
-            const answer = await new Promise((resolve) => {
-                rl.question(chalk_1.default.blue('Save config locally (./.solidactions) or globally (~/.solidactions)? [global] '), resolve);
-            });
-            const normalized = answer.trim().toLowerCase();
-            if (normalized === '' || normalized === 'global' || normalized === 'g')
-                return 'global';
-            if (normalized === 'local' || normalized === 'l')
-                return 'local';
-            console.log(chalk_1.default.yellow("Please answer 'local' or 'global' (or press Enter for global)."));
-        }
-    }
-    finally {
-        rl.close();
-    }
-}
-async function ensureGitignoreCovers(targetDir, auto) {
-    const gitignorePath = path_1.default.join(targetDir, '.gitignore');
-    const patternToAdd = '.solidactions/';
-    let existing = '';
-    if (fs_1.default.existsSync(gitignorePath)) {
-        existing = fs_1.default.readFileSync(gitignorePath, 'utf-8');
-        const lines = existing.split('\n').map((l) => l.trim());
-        const isCovered = lines.some((line) => {
-            const normalized = line
-                .replace(/^\*\*\//, '')
-                .replace(/^\//, '')
-                .replace(/\/(\*\*|\*)?$/, '');
-            return normalized === '.solidactions';
-        });
-        if (isCovered) {
-            return; // already covered
-        }
-    }
-    let shouldAdd = auto;
-    if (!shouldAdd && process.stdin.isTTY) {
-        const rl = readline_1.default.createInterface({ input: process.stdin, output: process.stdout });
-        const answer = await new Promise((resolve) => {
-            rl.question(chalk_1.default.yellow(`Local config contains an API key. Add \`.solidactions/\` to ${gitignorePath}? [Y/n] `), resolve);
-        });
-        rl.close();
-        shouldAdd = !(answer.trim().toLowerCase().startsWith('n'));
-    }
-    if (!shouldAdd) {
-        console.log(chalk_1.default.yellow(`Skipping .gitignore update. Remember: ${path_1.default.join(targetDir, '.solidactions', 'config.json')} contains your API key.`));
-        return;
-    }
-    const prefix = existing.length > 0 && !existing.endsWith('\n') ? '\n' : '';
-    try {
-        fs_1.default.writeFileSync(gitignorePath, `${existing}${prefix}${patternToAdd}\n`);
-        console.log(chalk_1.default.green(`Added \`${patternToAdd}\` to ${gitignorePath}.`));
-    }
-    catch (err) {
-        console.log(chalk_1.default.yellow(`Could not update ${gitignorePath}: ${err.message}. Add \`.solidactions/\` to it manually — ${path_1.default.join(targetDir, '.solidactions', 'config.json')} contains your API key.`));
-    }
-}
 async function login(apiKey, options) {
     let host;
     if (options.host) {
@@ -104,25 +43,8 @@ async function login(apiKey, options) {
         process.exit(1);
     }
     // Determine target location.
-    let target;
-    if (options.local && options.global) {
-        console.error(chalk_1.default.red('Error: --local and --global are mutually exclusive.'));
-        process.exit(1);
-    }
-    else if (options.local) {
-        target = 'local';
-    }
-    else if (options.global) {
-        target = 'global';
-    }
-    else if (process.stdin.isTTY) {
-        target = await promptLocation();
-    }
-    else {
-        console.error(chalk_1.default.red('Refusing to init non-interactively. Pass --local or --global.'));
-        process.exit(1);
-    }
-    const targetPath = target === 'local' ? (0, config_1.getLocalConfigPath)() : (0, config_1.getGlobalConfigPath)();
+    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...`));
     console.log(chalk_1.default.gray(`Host: ${host}`));
     if ((0, config_1.readConfigFile)(targetPath)) {
@@ -134,7 +56,7 @@ async function login(apiKey, options) {
     };
     (0, config_1.writeConfigFile)(targetPath, config);
     if (target === 'local') {
-        await ensureGitignoreCovers(process.cwd(), !!options.gitignore);
+        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}`));
@@ -204,12 +126,19 @@ function whoami() {
     const fmt = (src) => {
         if (src === 'env')
             return chalk_1.default.gray('(from $SOLIDACTIONS_* env var)');
+        if (src === 'cli')
+            return chalk_1.default.gray('(from -w flag)');
         if (src === null)
             return chalk_1.default.gray('(unset)');
         return chalk_1.default.gray(`(from ${src})`);
     };
+    const workspaceLabel = config.workspace
+        ? `${config.workspace}${config.workspaceId ? ` (${config.workspaceId})` : ''}`
+        : config.workspaceId
+            ? `${config.workspaceId} (slug unknown — run 'workspace set <slug>' to populate)`
+            : '';
     console.log(chalk_1.default.blue('Current configuration:'));
-    console.log(`  Host:        ${config.host.padEnd(40)} ${fmt(sources.host)}`);
-    console.log(`  API Key:     ${maskedKey.padEnd(40)} ${fmt(sources.apiKey)}`);
-    console.log(`  Workspace:   ${(config.workspaceId ?? '').padEnd(40)} ${fmt(sources.workspaceId)}`);
+    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)}`);
 }

package/dist/commands/workspaces.js

@@ -9,6 +9,8 @@ const axios_1 = __importDefault(require("axios"));
 const chalk_1 = __importDefault(require("chalk"));
 const api_1 = require("../utils/api");
 const config_1 = require("../utils/config");
+const config_write_target_1 = require("../utils/config-write-target");
+const workspace_lookup_1 = require("../utils/workspace-lookup");
 async function workspacesList() {
     const config = (0, api_1.requireConfig)();
     try {
@@ -52,43 +54,20 @@ async function workspacesList() {
         process.exit(1);
     }
 }
-async function workspaceSet(workspaceId) {
+async function workspaceSet(input, options = {}) {
     if (process.env.SOLIDACTIONS_WORKSPACE_ID) {
         console.error(chalk_1.default.red('SOLIDACTIONS_WORKSPACE_ID is set in the environment; the change would not take effect. ' +
             'Unset the env var or edit the config file directly.'));
         process.exit(1);
     }
-    const resolved = (0, api_1.requireResolvedConfig)();
-    const config = resolved.config;
-    try {
-        const response = await axios_1.default.get(`${config.host}/api/v1/workspaces`, {
-            headers: {
-                'Authorization': `Bearer ${config.apiKey}`,
-                'Accept': 'application/json',
-            },
-        });
-        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 workspace list\` to list available workspaces.`));
-            process.exit(1);
-        }
-        const updated = { ...config, workspaceId: workspace.id };
-        (0, config_1.writeConfigFile)(resolved.activePath, updated);
-        console.log(chalk_1.default.green(`Workspace set to: ${workspace.name} (${workspace.id})`));
-        console.log(chalk_1.default.gray(`Saved to ${resolved.activePath}`));
-    }
-    catch (error) {
-        console.error(chalk_1.default.red('Failed to set workspace:'), error.response?.data?.message || error.message);
-        process.exit(1);
+    const config = (0, api_1.requireResolvedConfig)().config;
+    const workspace = await (0, workspace_lookup_1.resolveWorkspaceInput)(config, input);
+    const target = await (0, config_write_target_1.decideWriteTarget)({ local: options.local, global: options.global });
+    const targetPath = (0, config_write_target_1.pathForTarget)(target);
+    (0, config_1.writeWorkspaceToFile)(targetPath, workspace.slug ?? workspace.name, workspace.id);
+    if (target === 'local') {
+        await (0, config_write_target_1.ensureGitignoreCovers)(process.cwd(), !!options.gitignore);
     }
+    console.log(chalk_1.default.green(`Workspace set to: ${workspace.name} (${workspace.id})`));
+    console.log(chalk_1.default.gray(`Saved to ${targetPath}`));
 }

package/dist/index.js

@@ -29,6 +29,7 @@ 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");
+const config_1 = require("./utils/config");
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const pkg = require('../package.json');
 const program = new commander_1.Command();
@@ -58,6 +59,22 @@ 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');
+program.hook('preAction', (thisCommand, actionCommand) => {
+    const opts = thisCommand.opts();
+    const wsOverride = opts.workspace;
+    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.');
+            return;
+        }
+        (0, config_1.setCliWorkspaceOverride)(wsOverride);
+    }
+});
 // =============================================================================
 // Top-level commands
 // =============================================================================
@@ -312,10 +329,13 @@ workspace
 });
 workspace
     .command('set')
-    .description('Set the active workspace for CLI operations')
-    .argument('<workspace-id>', 'Workspace ID, slug, or name')
-    .action((workspaceId) => {
-    (0, workspaces_1.workspaceSet)(workspaceId);
+    .description('Set the active workspace and pin it')
+    .argument('<id-or-slug-or-name>', 'Workspace ID, slug, or name')
+    .option('--local', 'pin to ./.solidactions/config.json')
+    .option('--global', 'pin to ~/.solidactions/config.json')
+    .option('--gitignore', 'auto-add .solidactions/ to local .gitignore (skip prompt)')
+    .action(async (input, opts) => {
+    await (0, workspaces_1.workspaceSet)(input, opts);
 });
 // =============================================================================
 // ai <subcommand>

package/dist/utils/api.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.augmentNotFoundMessage = augmentNotFoundMessage;
 exports.getApiHeaders = getApiHeaders;
 exports.requireResolvedConfig = requireResolvedConfig;
 exports.requireConfig = requireConfig;
@@ -12,6 +13,28 @@ const axios_1 = __importDefault(require("axios"));
 const chalk_1 = __importDefault(require("chalk"));
 const readline_1 = __importDefault(require("readline"));
 const config_1 = require("./config");
+const workspace_lookup_1 = require("./workspace-lookup");
+// Backend (solidactions-app PR #128) returns: "Project '<slug>' not found in your active workspace '<workspace-slug>'."
+// We require the literal single-quotes around the slug so plausible future error messages
+// like "Project files not found ..." don't false-match.
+const NOT_FOUND_IN_WORKSPACE = /Project '.+' not found in your active workspace/;
+/**
+ * Inspect an axios error and, if its response message matches the new
+ * workspace-not-found 404 from solidactions-app PR #128, append a
+ * remediation hint. Exported for unit testing; the live interceptor
+ * below calls it.
+ */
+function augmentNotFoundMessage(error) {
+    const msg = error?.response?.data?.message;
+    if (typeof msg === 'string'
+        && NOT_FOUND_IN_WORKSPACE.test(msg)
+        && !msg.includes('Did you mean to switch workspaces?')) {
+        const hint = "Did you mean to switch workspaces? Run 'solidactions workspace set <name> --local' to pin this directory.";
+        error.response.data.message = `${msg}\n\n${hint}`;
+    }
+    return error;
+}
+axios_1.default.interceptors.response.use((response) => response, (error) => Promise.reject(augmentNotFoundMessage(error)));
 function getApiHeaders(config, contentType) {
     const headers = {
         'Authorization': `Bearer ${config.apiKey}`,
@@ -115,6 +138,15 @@ async function ensureWorkspaceSelected(config) {
     return config;
 }
 async function requireConfigWithWorkspace() {
-    const config = requireConfig();
+    const resolved = requireResolvedConfig();
+    let config = resolved.config;
+    // -w override path: source label 'cli' on the workspace field means
+    // setCliWorkspaceOverride was called. workspaceId was cleared by resolveConfig
+    // because we don't yet know if the input was a slug or UUID. Resolve now.
+    if (resolved.sources.workspace === 'cli' && !config.workspaceId) {
+        const ws = await (0, workspace_lookup_1.resolveWorkspaceInput)(config, config.workspace);
+        config = { ...config, workspace: ws.slug ?? ws.name, workspaceId: ws.id };
+        return config;
+    }
     return ensureWorkspaceSelected(config);
 }

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

@@ -0,0 +1,101 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.decideWriteTarget = decideWriteTarget;
+exports.pathForTarget = pathForTarget;
+exports.ensureGitignoreCovers = ensureGitignoreCovers;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const readline_1 = __importDefault(require("readline"));
+const chalk_1 = __importDefault(require("chalk"));
+const config_1 = require("./config");
+/**
+ * Decide whether a write should target the local or global config file,
+ * mirroring the contract used by `login`:
+ *  - --local / --global mutually exclusive (errors if both set).
+ *  - If exactly one is set, use it.
+ *  - Else if TTY, prompt.
+ *  - Else error and exit.
+ */
+async function decideWriteTarget(options, promptLabel = 'Save config locally (./.solidactions) or globally (~/.solidactions)? [global] ') {
+    if (options.local && options.global) {
+        console.error(chalk_1.default.red('Error: --local and --global are mutually exclusive.'));
+        process.exit(1);
+    }
+    if (options.local)
+        return 'local';
+    if (options.global)
+        return 'global';
+    if (process.stdin.isTTY) {
+        const rl = readline_1.default.createInterface({ input: process.stdin, output: process.stdout });
+        try {
+            while (true) {
+                const answer = await new Promise((resolve) => rl.question(chalk_1.default.blue(promptLabel), resolve));
+                const normalized = answer.trim().toLowerCase();
+                if (normalized === '' || normalized === 'global' || normalized === 'g')
+                    return 'global';
+                if (normalized === 'local' || normalized === 'l')
+                    return 'local';
+                console.log(chalk_1.default.yellow("Please answer 'local' or 'global' (or press Enter for global)."));
+            }
+        }
+        finally {
+            rl.close();
+        }
+    }
+    console.error(chalk_1.default.red('Refusing to write config non-interactively. Pass --local or --global.'));
+    process.exit(1);
+}
+function pathForTarget(target) {
+    return target === 'local' ? (0, config_1.getLocalConfigPath)() : (0, config_1.getGlobalConfigPath)();
+}
+/**
+ * Ensure `.solidactions/` is in the target directory's `.gitignore`.
+ * Idempotent. Skips silently if pattern is already covered.
+ */
+async function ensureGitignoreCovers(targetDir, auto) {
+    const gitignorePath = path_1.default.join(targetDir, '.gitignore');
+    const patternToAdd = '.solidactions/';
+    let existing = '';
+    if (fs_1.default.existsSync(gitignorePath)) {
+        existing = fs_1.default.readFileSync(gitignorePath, 'utf-8');
+        const lines = existing.split('\n').map((l) => l.trim());
+        const isCovered = lines.some((line) => {
+            const normalized = line
+                .replace(/^\*\*\//, '')
+                .replace(/^\//, '')
+                .replace(/\/(\*\*|\*)?$/, '');
+            return normalized === '.solidactions';
+        });
+        if (isCovered)
+            return;
+    }
+    let shouldAdd = auto;
+    if (!shouldAdd && process.stdin.isTTY) {
+        const rl = readline_1.default.createInterface({ input: process.stdin, output: process.stdout });
+        let answer;
+        try {
+            answer = await new Promise((resolve) => {
+                rl.question(chalk_1.default.yellow(`Local config directory may contain secrets. Add \`.solidactions/\` to ${gitignorePath}? [Y/n] `), resolve);
+            });
+        }
+        finally {
+            rl.close();
+        }
+        shouldAdd = !(answer.trim().toLowerCase().startsWith('n'));
+    }
+    if (!shouldAdd) {
+        console.log(chalk_1.default.yellow(`Skipping .gitignore update. Remember: ${path_1.default.join(targetDir, '.solidactions', 'config.json')} may contain your API key.`));
+        return;
+    }
+    const prefix = existing.length > 0 && !existing.endsWith('\n') ? '\n' : '';
+    try {
+        fs_1.default.writeFileSync(gitignorePath, `${existing}${prefix}${patternToAdd}\n`);
+        console.log(chalk_1.default.green(`Added \`${patternToAdd}\` to ${gitignorePath}.`));
+    }
+    catch (err) {
+        console.log(chalk_1.default.yellow(`Could not update ${gitignorePath}: ${err.message}. Add \`.solidactions/\` to it manually.`));
+    }
+}

package/dist/utils/config.js

@@ -3,38 +3,60 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.setCliWorkspaceOverride = setCliWorkspaceOverride;
 exports.getGlobalConfigPath = getGlobalConfigPath;
 exports.getLocalConfigPath = getLocalConfigPath;
 exports.findLocalConfigPath = findLocalConfigPath;
 exports.readConfigFile = readConfigFile;
 exports.writeConfigFile = writeConfigFile;
+exports.writeWorkspaceToFile = writeWorkspaceToFile;
 exports.removeConfigFile = removeConfigFile;
+exports.mergeConfigs = mergeConfigs;
 exports.resolveConfig = resolveConfig;
 // src/utils/config.ts
 const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
-const GLOBAL_DIR = path_1.default.join(os_1.default.homedir(), '.solidactions');
-const GLOBAL_FILE = path_1.default.join(GLOBAL_DIR, 'config.json');
 const LOCAL_DIR_NAME = '.solidactions';
 const LOCAL_FILE_NAME = 'config.json';
+let cliWorkspaceOverride = undefined;
+/**
+ * Set the workspace override from the top-level `-w/--workspace` CLI flag.
+ * Module-level state — set once at CLI startup before any subcommand runs.
+ * Pass `undefined` to clear (used in tests).
+ */
+function setCliWorkspaceOverride(value) {
+    cliWorkspaceOverride = value;
+}
 function getGlobalConfigPath() {
-    return GLOBAL_FILE;
+    return path_1.default.join(os_1.default.homedir(), '.solidactions', 'config.json');
 }
 function getLocalConfigPath(cwd = process.cwd()) {
     return path_1.default.join(cwd, LOCAL_DIR_NAME, LOCAL_FILE_NAME);
 }
 /**
  * Walk up from startDir looking for `.solidactions/config.json`.
- * Stops at filesystem root. **Skips `$HOME` itself** so the global config
- * at `~/.solidactions/config.json` is never matched as a local hit.
+ * Stops at filesystem root.
+ *
+ * Skips both `os.homedir()` (HOME-respecting) and `os.userInfo().homedir`
+ * (OS-level real home) so the global config is never matched as a local hit,
+ * even when `$HOME` is redirected (test fixtures, sandboxes). In normal runtime
+ * the two paths are the same and the Set collapses to one entry.
+ *
  * Returns the absolute path of the nearest local config, or null.
  */
 function findLocalConfigPath(startDir = process.cwd()) {
-    const home = os_1.default.homedir();
+    const skip = new Set([os_1.default.homedir()]);
+    try {
+        skip.add(os_1.default.userInfo().homedir);
+    }
+    catch {
+        // os.userInfo() can throw on some platforms (e.g., uid not in /etc/passwd
+        // inside containers). Treat it as best-effort — fall back to just os.homedir().
+    }
     let dir = path_1.default.resolve(startDir);
     while (true) {
-        if (dir !== home) {
+        if (!skip.has(dir)) {
             const candidate = path_1.default.join(dir, LOCAL_DIR_NAME, LOCAL_FILE_NAME);
             if (fs_1.default.existsSync(candidate)) {
                 return candidate;
@@ -80,6 +102,15 @@ function writeConfigFile(filePath, config) {
     fs_1.default.writeFileSync(tmp, JSON.stringify(config, null, 2), { mode: 0o600 });
     fs_1.default.renameSync(tmp, filePath);
 }
+/**
+ * Write a workspace pin to the given config file path. Shallow-merges over
+ * any existing keys (preserves host/apiKey if already present). Re-uses
+ * writeConfigFile's atomic-write + 0o600 mode contract.
+ */
+function writeWorkspaceToFile(filePath, workspace, workspaceId) {
+    const existing = readConfigFile(filePath) ?? {};
+    writeConfigFile(filePath, { ...existing, workspace, workspaceId });
+}
 function removeConfigFile(filePath) {
     if (!fs_1.default.existsSync(filePath)) {
         return false;
@@ -98,26 +129,29 @@ function readEnvOverrides() {
     return env;
 }
 /**
- * Resolve config by merging three layers field-by-field (env > local > global).
- * Returns null only when no source contributes an apiKey AND host (i.e. nothing usable).
- * `activePath` is the file a write-mutating command should target: nearest local if present, else global.
+ * Pure merge of three config layers. Picks each Config field from the highest
+ * layer that defines it: env > local > global. Returns null only when no source
+ * contributes a host or apiKey (i.e. nothing usable).
+ *
+ * Invariant the caller must uphold: if `local` is non-null, `localPath` must
+ * also be non-null. (`local` is the parsed contents of a file at `localPath`;
+ * the path is required for source attribution.) `global` may be null even when
+ * `globalPath` is provided — `globalPath` is only used as a source label when
+ * `global` contributes a value.
  */
-function resolveConfig(cwd = process.cwd()) {
-    const env = readEnvOverrides();
-    const localPath = findLocalConfigPath(cwd);
-    const local = localPath ? readConfigFile(localPath) : null;
-    const global = readConfigFile(getGlobalConfigPath());
+function mergeConfigs(env, local, localPath, global, globalPath) {
     const pick = (key) => {
         if (env[key] !== undefined)
             return { value: env[key], source: 'env' };
         if (local && local[key] !== undefined)
             return { value: local[key], source: localPath };
         if (global && global[key] !== undefined)
-            return { value: global[key], source: getGlobalConfigPath() };
+            return { value: global[key], source: globalPath };
         return { value: undefined, source: null };
     };
     const host = pick('host');
     const apiKey = pick('apiKey');
+    const workspace = pick('workspace');
     const workspaceId = pick('workspaceId');
     if (!host.value && !apiKey.value) {
         return null;
@@ -126,13 +160,40 @@ function resolveConfig(cwd = process.cwd()) {
         config: {
             host: (host.value ?? ''),
             apiKey: (apiKey.value ?? ''),
+            workspace: workspace.value,
             workspaceId: workspaceId.value,
         },
         sources: {
             host: host.source,
             apiKey: apiKey.source,
+            workspace: workspace.source,
             workspaceId: workspaceId.source,
         },
-        activePath: localPath ?? getGlobalConfigPath(),
+    };
+}
+/**
+ * Resolve config by merging three layers field-by-field (env > local > global).
+ * Returns null only when no source contributes an apiKey AND host (i.e. nothing usable).
+ * `activePath` is the file a write-mutating command should target: nearest local if present, else global.
+ */
+function resolveConfig(cwd = process.cwd()) {
+    const env = readEnvOverrides();
+    const localPath = findLocalConfigPath(cwd);
+    const local = localPath ? readConfigFile(localPath) : null;
+    const globalPath = getGlobalConfigPath();
+    const global = readConfigFile(globalPath);
+    const merged = mergeConfigs(env, local, localPath, global, globalPath);
+    if (!merged)
+        return null;
+    if (cliWorkspaceOverride !== undefined) {
+        merged.config.workspace = cliWorkspaceOverride;
+        merged.config.workspaceId = undefined;
+        merged.sources.workspace = 'cli';
+        merged.sources.workspaceId = 'cli';
+    }
+    return {
+        config: merged.config,
+        sources: merged.sources,
+        activePath: localPath ?? globalPath,
     };
 }

package/dist/utils/workspace-lookup.js

@@ -0,0 +1,62 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.matchWorkspace = matchWorkspace;
+exports.fetchWorkspaces = fetchWorkspaces;
+exports.resolveWorkspaceInput = resolveWorkspaceInput;
+const axios_1 = __importDefault(require("axios"));
+const chalk_1 = __importDefault(require("chalk"));
+/**
+ * Pure: given a list of workspaces and an input string, return the matching
+ * workspace. Match order: id, slug, name (first match wins). Cross-tenant
+ * collisions resolve to the first match in the list (pre-existing behavior;
+ * see sol-r0b-test-todo.md for follow-up).
+ */
+function matchWorkspace(input, workspaces) {
+    return workspaces.find((w) => w.id === input || w.slug === input || w.name === input);
+}
+/**
+ * Network: fetch the full list of workspaces the current API key can see.
+ * Normalizes the API's grouped/array response shapes.
+ */
+async function fetchWorkspaces(config) {
+    const response = await axios_1.default.get(`${config.host}/api/v1/workspaces`, {
+        headers: {
+            'Authorization': `Bearer ${config.apiKey}`,
+            'Accept': 'application/json',
+        },
+    });
+    const grouped = response.data.workspaces || response.data.teams || response.data.data || response.data;
+    const out = [];
+    if (typeof grouped === 'object' && !Array.isArray(grouped)) {
+        for (const orgWorkspaces of Object.values(grouped)) {
+            out.push(...orgWorkspaces);
+        }
+    }
+    else if (Array.isArray(grouped)) {
+        out.push(...grouped);
+    }
+    return out;
+}
+/**
+ * High-level: fetch + match. Errors with a clear CLI message and exits
+ * non-zero if no match is found.
+ */
+async function resolveWorkspaceInput(config, input) {
+    let workspaces;
+    try {
+        workspaces = await fetchWorkspaces(config);
+    }
+    catch (error) {
+        console.error(chalk_1.default.red('Failed to list workspaces:'), error.response?.data?.message || error.message);
+        process.exit(1);
+    }
+    const match = matchWorkspace(input, workspaces);
+    if (!match) {
+        console.error(chalk_1.default.red(`Workspace "${input}" not found. Run \`solidactions workspace list\` to list available workspaces.`));
+        process.exit(1);
+    }
+    return match;
+}

package/package.json

@@ -1,59 +1,62 @@
 {
-    "name": "@solidactions/cli",
-    "version": "1.8.0",
-    "description": "SolidActions CLI - Deploy and manage workflow automation",
-    "main": "dist/index.js",
-    "bin": {
-        "solidactions": "./dist/index.js"
-    },
-    "files": [
-        "dist"
-    ],
-    "publishConfig": {
-        "access": "public"
-    },
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/SolidActions/solidactions-cli.git"
-    },
-    "homepage": "https://github.com/SolidActions/solidactions-cli",
-    "bugs": {
-        "url": "https://github.com/SolidActions/solidactions-cli/issues"
-    },
-    "license": "MIT",
-    "engines": {
-        "node": ">=18.0.0"
-    },
-    "keywords": [
-        "solidactions",
-        "cli",
-        "workflow",
-        "automation",
-        "deploy"
-    ],
-    "scripts": {
-        "build": "tsc",
-        "prepublishOnly": "npm run build"
-    },
-    "dependencies": {
-        "archiver": "^7.0.0",
-        "axios": "^1.6.0",
-        "chalk": "^4.1.2",
-        "commander": "^11.0.0",
-        "dotenv": "^17.3.1",
-        "form-data": "^4.0.0",
-        "fs-extra": "^11.0.0",
-        "js-yaml": "^4.1.0",
-        "prompts": "^2.4.2",
-        "tar": "^7.5.12"
-    },
-    "devDependencies": {
-        "@types/archiver": "^6.0.0",
-        "@types/fs-extra": "^11.0.0",
-        "@types/js-yaml": "^4.0.9",
-        "@types/node": "^20.0.0",
-        "@types/prompts": "^2.4.9",
-        "@types/tar": "^6.1.13",
-        "typescript": "^5.0.0"
-    }
+  "name": "@solidactions/cli",
+  "version": "1.9.0",
+  "description": "SolidActions CLI - Deploy and manage workflow automation",
+  "main": "dist/index.js",
+  "bin": {
+    "solidactions": "./dist/index.js"
+  },
+  "files": [
+    "dist"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/SolidActions/solidactions-cli.git"
+  },
+  "homepage": "https://github.com/SolidActions/solidactions-cli",
+  "bugs": {
+    "url": "https://github.com/SolidActions/solidactions-cli/issues"
+  },
+  "license": "MIT",
+  "engines": {
+    "node": ">=18.0.0"
+  },
+  "keywords": [
+    "solidactions",
+    "cli",
+    "workflow",
+    "automation",
+    "deploy"
+  ],
+  "scripts": {
+    "build": "tsc",
+    "prepublishOnly": "npm run build",
+    "test": "vitest run",
+    "test:watch": "vitest"
+  },
+  "dependencies": {
+    "archiver": "^7.0.0",
+    "axios": "^1.6.0",
+    "chalk": "^4.1.2",
+    "commander": "^11.0.0",
+    "dotenv": "^17.3.1",
+    "form-data": "^4.0.0",
+    "fs-extra": "^11.0.0",
+    "js-yaml": "^4.1.0",
+    "prompts": "^2.4.2",
+    "tar": "^7.5.12"
+  },
+  "devDependencies": {
+    "@types/archiver": "^6.0.0",
+    "@types/fs-extra": "^11.0.0",
+    "@types/js-yaml": "^4.0.9",
+    "@types/node": "^20.0.0",
+    "@types/prompts": "^2.4.9",
+    "@types/tar": "^6.1.13",
+    "typescript": "^5.0.0",
+    "vitest": "^4.1.5"
+  }
 }