@solidactions/cli 1.23.1 → 1.24.0

package/dist/utils/config.js

@@ -151,8 +151,23 @@ function mergeConfigs(env, local, localPath, global, globalPath) {
     };
     const host = pick('host');
     const apiKey = pick('apiKey');
-    const workspace = pick('workspace');
-    const workspaceId = pick('workspaceId');
+    // A local config that defines its own credentials (host or apiKey) is
+    // anchored to a different account/tenant than the global config — its
+    // workspace/workspaceId must never fall back to global (F-C3).
+    // Pure workspace-pin local files (no host/apiKey of their own) keep
+    // inheriting global credentials and so may still inherit the workspace.
+    const localDefinesCreds = !!(local && (local.host !== undefined || local.apiKey !== undefined));
+    const pickWorkspaceField = (key) => {
+        if (env[key] !== undefined)
+            return { value: env[key], source: 'env' };
+        if (local && local[key] !== undefined)
+            return { value: local[key], source: localPath };
+        if (!localDefinesCreds && global && global[key] !== undefined)
+            return { value: global[key], source: globalPath };
+        return { value: undefined, source: null };
+    };
+    const workspace = pickWorkspaceField('workspace');
+    const workspaceId = pickWorkspaceField('workspaceId');
     if (!host.value && !apiKey.value) {
         return null;
     }

package/dist/utils/env.js

@@ -10,6 +10,8 @@ exports.getYamlDeclaredVars = getYamlDeclaredVars;
 exports.loadSolidActionsConfig = loadSolidActionsConfig;
 exports.isReservedEnvName = isReservedEnvName;
 exports.reservedEnvNameError = reservedEnvNameError;
+exports.isValidEnvName = isValidEnvName;
+exports.envNameError = envNameError;
 const fs_1 = __importDefault(require("fs"));
 const js_yaml_1 = __importDefault(require("js-yaml"));
 /**
@@ -81,7 +83,7 @@ function parseYamlEnvVars(config) {
 }
 /**
  * Extract declared variable keys from solidactions.yaml env config.
- * Returns a set of env var keys that are declared in YAML.
+ * Returns a set of variable keys that are declared in YAML.
  */
 function getYamlDeclaredVars(config) {
     const parsedVars = parseYamlEnvVars(config);
@@ -103,10 +105,20 @@ function loadSolidActionsConfig(yamlPath) {
  * matching the server-side rule (App\Support\ReservedEnvNames).
  */
 exports.RESERVED_ENV_PREFIX = 'SOLIDACTIONS_';
+/** Case-insensitive: the server rejects any casing of the prefix, not just uppercase. */
 function isReservedEnvName(key) {
-    return key.startsWith(exports.RESERVED_ENV_PREFIX);
+    return key.toUpperCase().startsWith(exports.RESERVED_ENV_PREFIX);
 }
 function reservedEnvNameError(key) {
-    const suggestion = key.replace(/^SOLIDACTIONS_/, 'MY_');
+    const suggestion = key.replace(/^SOLIDACTIONS_/i, 'MY_');
     return `"${key}" uses the reserved ${exports.RESERVED_ENV_PREFIX} prefix. These names are set by the platform at runtime (API credentials, run context) and a custom variable would clobber them, causing authentication failures. Choose a different name (e.g. "${suggestion}").`;
 }
+/** Env/variable key naming rule: letters, digits, underscore; no leading digit. */
+function isValidEnvName(key) {
+    return /^[A-Za-z_][A-Za-z0-9_]*$/.test(key);
+}
+function envNameError(key) {
+    if (key.trim() === '')
+        return 'Variable key is required.';
+    return `Invalid variable name "${key}" — names must match [A-Za-z_][A-Za-z0-9_]* (letters, digits, underscore; no leading digit).`;
+}

package/dist/utils/mcp.js

@@ -46,6 +46,9 @@ const http = __importStar(require("http"));
 const https = __importStar(require("https"));
 const url_1 = require("url");
 const api_1 = require("./api");
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const pkg = require('../../package.json');
+const CLI_VERSION = pkg.version;
 /**
  * Internal: call a single MCP tool on the given endpoint path.
  *
@@ -85,7 +88,10 @@ async function callMcpTool(config, endpointPath, toolName, args) {
             let raw = '';
             res.on('data', (chunk) => { raw += chunk; });
             res.on('end', () => {
-                if (res.statusCode && res.statusCode >= 400) {
+                if (res.statusCode === 404) {
+                    reject(new Error(`MCP request failed: ${parsed.host} has no ${endpointPath} endpoint — the server may be older or newer than this CLI (${CLI_VERSION}). Raw: HTTP 404 ${raw}`));
+                }
+                else if (res.statusCode && res.statusCode >= 400) {
                     reject(new Error(`MCP request failed with HTTP ${res.statusCode}: ${raw}`));
                 }
                 else {
@@ -116,15 +122,19 @@ async function callMcpTool(config, endpointPath, toolName, args) {
     }
     return { ok: !isError, data: toolData };
 }
+const UNIFIED_MCP_PATH = '/mcp';
+// Server consolidated per-domain MCP servers into one endpoint with namespaced tools.
+const CREWS_TOOL_NAMES = { skills: 'crews_skills', roles: 'crews_roles' };
 /**
- * Call a single MCP tool on /mcp/crews.
+ * Call a single MCP tool on the unified /mcp endpoint, mapping legacy crews
+ * tool names ('skills'/'roles') to their namespaced equivalents.
  */
 async function callCrewsTool(config, toolName, args) {
-    return callMcpTool(config, '/mcp/crews', toolName, args);
+    return callMcpTool(config, UNIFIED_MCP_PATH, CREWS_TOOL_NAMES[toolName] ?? toolName, args);
 }
 /**
- * Call a single MCP tool on /mcp/docs.
+ * Call a single MCP tool on the unified /mcp endpoint.
  */
 async function callDocsTool(config, toolName, args) {
-    return callMcpTool(config, '/mcp/docs', toolName, args);
+    return callMcpTool(config, UNIFIED_MCP_PATH, toolName, args);
 }

package/dist/utils/table.js

@@ -0,0 +1,62 @@
+"use strict";
+// src/utils/table.ts
+//
+// Shared plain-text table renderer (extracted from webhook-formatters.ts's
+// columnWidth helper) used by project-list, env-list, and run-list.
+//
+// Operates on PLAIN (uncolored) cell values only — chalk ANSI escape codes
+// count toward a JS string's .length, so colorizing a cell before padding
+// would corrupt the alignment math. Callers that want color should apply it
+// to the whole rendered line (e.g. chalk.gray(lines[i])), not to individual
+// cell values passed in here.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sanitizeCell = sanitizeCell;
+exports.truncateCell = truncateCell;
+exports.computeColumnWidths = computeColumnWidths;
+exports.renderTable = renderTable;
+const DEFAULT_MAX_WIDTH = 60;
+/** Escape embedded newlines so a row can never span multiple terminal lines. */
+function sanitizeCell(value) {
+    return value.replace(/\r?\n/g, '\\n');
+}
+function truncateCell(value, maxWidth = DEFAULT_MAX_WIDTH) {
+    if (value.length <= maxWidth)
+        return value;
+    return value.slice(0, Math.max(0, maxWidth - 1)) + '…';
+}
+/**
+ * Compute per-column widths (`max(minWidth, longest sanitized+truncated cell) + 2`)
+ * without rendering — for callers (e.g. run-list) that need to colorize a
+ * cell's text with chalk AFTER padding (coloring first would corrupt the
+ * alignment math, since ANSI escape codes count toward a JS string's .length).
+ */
+function computeColumnWidths(headers, rows, opts = {}) {
+    const maxWidth = opts.maxWidth ?? DEFAULT_MAX_WIDTH;
+    const minWidths = opts.minWidths ?? [];
+    const clean = (v) => truncateCell(sanitizeCell(v), maxWidth);
+    return headers.map((h, i) => {
+        const longest = Math.max(clean(h).length, ...rows.map((r) => clean(r[i] ?? '').length));
+        return Math.max(minWidths[i] ?? 0, longest) + 2;
+    });
+}
+/**
+ * Render a simple aligned table as an array of lines: `[header, divider, ...rows]`.
+ * Column widths are dynamic — `max(minWidth, longest cell in that column) + 2`.
+ */
+function renderTable(headers, rows, opts = {}) {
+    const maxWidth = opts.maxWidth ?? DEFAULT_MAX_WIDTH;
+    const minWidths = opts.minWidths ?? [];
+    const cleanHeaders = headers.map((h) => truncateCell(sanitizeCell(h), maxWidth));
+    const cleanRows = rows.map((row) => row.map((cell) => truncateCell(sanitizeCell(cell), maxWidth)));
+    const widths = cleanHeaders.map((h, i) => {
+        const longest = Math.max(h.length, ...cleanRows.map((r) => r[i]?.length ?? 0));
+        return Math.max(minWidths[i] ?? 0, longest) + 2;
+    });
+    const renderRow = (cells) => cells.map((cell, i) => (i === cells.length - 1 ? cell : (cell ?? '').padEnd(widths[i]))).join('');
+    const totalWidth = widths.reduce((a, b) => a + b, 0);
+    return [
+        renderRow(cleanHeaders),
+        '-'.repeat(totalWidth),
+        ...cleanRows.map(renderRow),
+    ];
+}

package/package.json

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