@tolinax/ayoune-cli 2026.3.0 → 2026.4.0

package/lib/commands/createModulesCommand.js

@@ -13,13 +13,19 @@ import { aYOUneModules } from "../../data/modules.js";
 import { getModelsInModules } from "../models/getModelsInModules.js";
 import { apiCallHandler } from "../api/apiCallHandler.js";
 import { handleResponseFormatOptions } from "../helpers/handleResponseFormatOptions.js";
+import { isSuperUser } from "../helpers/tokenPayload.js";
 import { spinner } from "../../index.js";
 import { EXIT_GENERAL_ERROR, EXIT_MISUSE } from "../exitCodes.js";
+import { cliError } from "../helpers/cliError.js";
 const DIRECT_OPERATIONS = ["list", "get", "create", "delete"];
 function resolveModule(input) {
     const lower = input.toLowerCase();
     const match = aYOUneModules.find((m) => m.module === lower || m.label.toLowerCase() === lower);
-    return match ? match.module : null;
+    if (!match)
+        return null;
+    if (match.superuserOnly && !isSuperUser())
+        return null;
+    return match.module;
 }
 function resolveCollection(module, input) {
     const lower = input.toLowerCase();
@@ -55,15 +61,13 @@ Examples:
             if (moduleArg) {
                 const resolved = resolveModule(moduleArg);
                 if (!resolved) {
-                    spinner.error({ text: `Unknown module: ${moduleArg}` });
-                    process.exit(EXIT_MISUSE);
+                    cliError(`Unknown module: ${moduleArg}`, EXIT_MISUSE);
                 }
                 module = resolved;
             }
             else {
                 if (!process.stdin.isTTY) {
-                    spinner.error({ text: "The modules command requires an interactive terminal" });
-                    process.exit(EXIT_MISUSE);
+                    cliError("The modules command requires an interactive terminal", EXIT_MISUSE);
                 }
                 module = await promptModule();
             }
@@ -72,15 +76,13 @@ Examples:
             if (collectionArg) {
                 const resolved = resolveCollection(module, collectionArg);
                 if (!resolved) {
-                    spinner.error({ text: `Unknown collection: ${collectionArg} in module ${module}` });
-                    process.exit(EXIT_MISUSE);
+                    cliError(`Unknown collection: ${collectionArg} in module ${module}`, EXIT_MISUSE);
                 }
                 collection = resolved;
             }
             else {
                 if (!process.stdin.isTTY) {
-                    spinner.error({ text: "Missing required argument: collection" });
-                    process.exit(EXIT_MISUSE);
+                    cliError("Missing required argument: collection", EXIT_MISUSE);
                 }
                 collection = await promptCollectionInModule(module);
             }
@@ -95,8 +97,7 @@ Examples:
                 }
                 if (op === "get") {
                     if (!subjectArg) {
-                        spinner.error({ text: "Missing required argument: id" });
-                        process.exit(EXIT_MISUSE);
+                        cliError("Missing required argument: id", EXIT_MISUSE);
                     }
                     spinner.start({ text: `Getting ${collection} ${subjectArg}...`, color: "magenta" });
                     const res = await apiCallHandler(module, `${collection.toLowerCase()}/${subjectArg}`, "get", null, {
@@ -110,16 +111,14 @@ Examples:
                 }
                 if (op === "create") {
                     if (!subjectArg) {
-                        spinner.error({ text: "Missing required argument: name/subject" });
-                        process.exit(EXIT_MISUSE);
+                        cliError("Missing required argument: name/subject", EXIT_MISUSE);
                     }
                     await handleCreateSingleOperation(module, collection, subjectArg, opts);
                     return;
                 }
                 if (op === "delete") {
                     if (!subjectArg) {
-                        spinner.error({ text: "Missing required argument: id" });
-                        process.exit(EXIT_MISUSE);
+                        cliError("Missing required argument: id", EXIT_MISUSE);
                     }
                     await handleDeleteSingleOperation(module, collection, subjectArg, opts);
                     return;
@@ -127,8 +126,7 @@ Examples:
             }
             // ─── Interactive mode (no operation provided) ────────
             if (!process.stdin.isTTY) {
-                spinner.error({ text: "Interactive mode requires a terminal. Use: ay m <module> <collection> <operation> [subject]" });
-                process.exit(EXIT_MISUSE);
+                cliError("Interactive mode requires a terminal. Use: ay m <module> <collection> <operation> [subject]", EXIT_MISUSE);
             }
             const operation = await promptOperation();
             let entry = "";
@@ -143,8 +141,7 @@ Examples:
             await handleCollectionOperation(module, collection, entry, opts);
         }
         catch (e) {
-            spinner.error({ text: e.message || "An unexpected error occurred" });
-            process.exit(EXIT_GENERAL_ERROR);
+            cliError(e.message || "An unexpected error occurred", EXIT_GENERAL_ERROR);
         }
     });
 }

package/lib/commands/createMonitorCommand.js

@@ -3,6 +3,7 @@ import { handleResponseFormatOptions } from "../helpers/handleResponseFormatOpti
 import { saveFile } from "../helpers/saveFile.js";
 import { spinner } from "../../index.js";
 import { EXIT_GENERAL_ERROR } from "../exitCodes.js";
+import { cliError } from "../helpers/cliError.js";
 export function createMonitorCommand(program) {
     const monitor = program
         .command("monitor")
@@ -74,8 +75,7 @@ Examples:
                 await saveFile(`monitor-logs-${logType}`, opts, res);
         }
         catch (e) {
-            spinner.error({ text: e.message || "Failed to fetch logs" });
-            process.exit(EXIT_GENERAL_ERROR);
+            cliError(e.message || "Failed to fetch logs", EXIT_GENERAL_ERROR);
         }
     });
     // ay monitor alerts — command group
@@ -125,8 +125,7 @@ Examples:
                 await saveFile("monitor-alerts", opts, res);
         }
         catch (e) {
-            spinner.error({ text: e.message || "Failed to fetch alerts" });
-            process.exit(EXIT_GENERAL_ERROR);
+            cliError(e.message || "Failed to fetch alerts", EXIT_GENERAL_ERROR);
         }
     });
     // ay monitor alerts ack <id>
@@ -146,8 +145,7 @@ Examples:
             spinner.stop();
         }
         catch (e) {
-            spinner.error({ text: e.message || "Failed to acknowledge alert" });
-            process.exit(EXIT_GENERAL_ERROR);
+            cliError(e.message || "Failed to acknowledge alert", EXIT_GENERAL_ERROR);
         }
     });
     // ay monitor alerts resolve <id>
@@ -166,8 +164,7 @@ Examples:
             spinner.stop();
         }
         catch (e) {
-            spinner.error({ text: e.message || "Failed to resolve alert" });
-            process.exit(EXIT_GENERAL_ERROR);
+            cliError(e.message || "Failed to resolve alert", EXIT_GENERAL_ERROR);
         }
     });
     // ay monitor sessions
@@ -193,8 +190,7 @@ Examples:
                 await saveFile("monitor-sessions", opts, res);
         }
         catch (e) {
-            spinner.error({ text: e.message || "Failed to fetch sessions" });
-            process.exit(EXIT_GENERAL_ERROR);
+            cliError(e.message || "Failed to fetch sessions", EXIT_GENERAL_ERROR);
         }
     });
     // ay monitor checks
@@ -220,8 +216,7 @@ Examples:
                 await saveFile("monitor-checks", opts, res);
         }
         catch (e) {
-            spinner.error({ text: e.message || "Failed to fetch checks" });
-            process.exit(EXIT_GENERAL_ERROR);
+            cliError(e.message || "Failed to fetch checks", EXIT_GENERAL_ERROR);
         }
     });
     // ay monitor activeusers
@@ -248,8 +243,7 @@ Examples:
                 await saveFile("monitor-activeusers", opts, res);
         }
         catch (e) {
-            spinner.error({ text: e.message || "Failed to fetch active users" });
-            process.exit(EXIT_GENERAL_ERROR);
+            cliError(e.message || "Failed to fetch active users", EXIT_GENERAL_ERROR);
         }
     });
     // ay monitor pagestats
@@ -276,8 +270,7 @@ Examples:
                 await saveFile("monitor-pagestats", opts, res);
         }
         catch (e) {
-            spinner.error({ text: e.message || "Failed to fetch page stats" });
-            process.exit(EXIT_GENERAL_ERROR);
+            cliError(e.message || "Failed to fetch page stats", EXIT_GENERAL_ERROR);
         }
     });
 }

package/lib/commands/createPermissionsCommand.js

@@ -3,6 +3,7 @@ import { handleResponseFormatOptions } from "../helpers/handleResponseFormatOpti
 import { saveFile } from "../helpers/saveFile.js";
 import { spinner } from "../../index.js";
 import { EXIT_GENERAL_ERROR, EXIT_MISUSE } from "../exitCodes.js";
+import { cliError } from "../helpers/cliError.js";
 export function createPermissionsCommand(program) {
     const perms = program
         .command("permissions")
@@ -43,8 +44,7 @@ export function createPermissionsCommand(program) {
                 await saveFile("permission-requests", opts, res);
         }
         catch (e) {
-            spinner.error({ text: e.message || "Failed to list permission requests" });
-            process.exit(EXIT_GENERAL_ERROR);
+            cliError(e.message || "Failed to list permission requests", EXIT_GENERAL_ERROR);
         }
     });
     // ay permissions requests approve <id>
@@ -61,8 +61,7 @@ export function createPermissionsCommand(program) {
             spinner.stop();
         }
         catch (e) {
-            spinner.error({ text: e.message || "Failed to approve request" });
-            process.exit(EXIT_GENERAL_ERROR);
+            cliError(e.message || "Failed to approve request", EXIT_GENERAL_ERROR);
         }
     });
     // ay permissions requests reject <id>
@@ -83,8 +82,7 @@ export function createPermissionsCommand(program) {
             spinner.stop();
         }
         catch (e) {
-            spinner.error({ text: e.message || "Failed to reject request" });
-            process.exit(EXIT_GENERAL_ERROR);
+            cliError(e.message || "Failed to reject request", EXIT_GENERAL_ERROR);
         }
     });
     // ay permissions requests create
@@ -103,8 +101,7 @@ export function createPermissionsCommand(program) {
                     body = JSON.parse(opts.body);
                 }
                 catch (_a) {
-                    spinner.error({ text: "Invalid JSON in --body" });
-                    process.exit(EXIT_MISUSE);
+                    cliError("Invalid JSON in --body", EXIT_MISUSE);
                 }
             }
             else if (opts.right) {
@@ -113,8 +110,7 @@ export function createPermissionsCommand(program) {
                     body.reason = opts.reason;
             }
             if (!body) {
-                spinner.error({ text: "Provide request via --body or --right" });
-                process.exit(EXIT_MISUSE);
+                cliError("Provide request via --body or --right", EXIT_MISUSE);
             }
             spinner.start({ text: "Creating permission request...", color: "magenta" });
             const res = await apiCallHandler("config", "permissionrequests", "post", body, {
@@ -125,8 +121,7 @@ export function createPermissionsCommand(program) {
             spinner.stop();
         }
         catch (e) {
-            spinner.error({ text: e.message || "Failed to create permission request" });
-            process.exit(EXIT_GENERAL_ERROR);
+            cliError(e.message || "Failed to create permission request", EXIT_GENERAL_ERROR);
         }
     });
     // ── USER RIGHTS ────────────────────────────────────────
@@ -163,8 +158,7 @@ export function createPermissionsCommand(program) {
                 await saveFile("user-rights", opts, res);
         }
         catch (e) {
-            spinner.error({ text: e.message || "Failed to list user rights" });
-            process.exit(EXIT_GENERAL_ERROR);
+            cliError(e.message || "Failed to list user rights", EXIT_GENERAL_ERROR);
         }
     });
     // ay permissions rights get <id>
@@ -184,8 +178,7 @@ export function createPermissionsCommand(program) {
             spinner.stop();
         }
         catch (e) {
-            spinner.error({ text: e.message || "Failed to get user right" });
-            process.exit(EXIT_GENERAL_ERROR);
+            cliError(e.message || "Failed to get user right", EXIT_GENERAL_ERROR);
         }
     });
     // ── AUDIT (ENHANCED) ──────────────────────────────────
@@ -234,8 +227,7 @@ Examples:
                 await saveFile("permissions-audit", opts, res);
         }
         catch (e) {
-            spinner.error({ text: e.message || "Failed to fetch audit logs" });
-            process.exit(EXIT_GENERAL_ERROR);
+            cliError(e.message || "Failed to fetch audit logs", EXIT_GENERAL_ERROR);
         }
     });
 }

package/lib/commands/createProgram.js

@@ -1,5 +1,5 @@
 //Defines the main program structure for command line interface
-import { Option } from "commander";
+import { Command, Option } from "commander";
 import chalk from "chalk";
 import path from "path";
 import os from "os";
@@ -26,7 +26,8 @@ import { createExecCommand } from "./createExecCommand.js";
 import { createAiCommand } from "./createAiCommand.js";
 import { enableDebug } from "../api/apiClient.js";
 import { enableDryRun } from "../api/apiCallHandler.js";
-import { enableJsonErrors } from "../api/handleAPIError.js";
+import { setJsonErrorsEnabled } from "../helpers/cliError.js";
+import { disableContext } from "../helpers/contextInjector.js";
 import { createServicesCommand } from "./createServicesCommand.js";
 import { createDeployCommand } from "./createDeployCommand.js";
 import { createMonitorCommand } from "./createMonitorCommand.js";
@@ -41,12 +42,22 @@ import { createUsersCommand } from "./createUsersCommand.js";
 import { createSyncCommand } from "./createSyncCommand.js";
 import { createPermissionsCommand } from "./createPermissionsCommand.js";
 import { createTemplateCommand } from "./createTemplateCommand.js";
-import { localStorage } from "../helpers/localStorage.js";
+import { createSetupCommand } from "./createSetupCommand.js";
+import { createStatusCommand } from "./createStatusCommand.js";
+import { createSelfHostUpdateCommand } from "./createSelfHostUpdateCommand.js";
+import { createContextCommand } from "./createContextCommand.js";
+import { createAccessCommand } from "./createAccessCommand.js";
+import { secureStorage } from "../helpers/secureStorage.js";
 import { login } from "../api/login.js";
 import { loadConfig } from "../helpers/configLoader.js";
+import { getLogo, getDescription, BRAND_BLUE } from "../helpers/logo.js";
+import { checkForUpdates } from "../helpers/updateNotifier.js";
+import { createRequire } from "module";
+const require = createRequire(import.meta.url);
+const pkg = require("../../../package.json");
 export function createProgram(program) {
     program
-        .version("2024.8.0")
+        .version(pkg.version || "0.0.0")
         .addOption(new Option("-r, --responseFormat <format>", "Set the output format")
         .choices(["json", "csv", "yaml", "table"])
         .default("json"))
@@ -68,7 +79,9 @@ export function createProgram(program) {
         .addOption(new Option("--columns <fields>", "Comma-separated list of columns to display"))
         .addOption(new Option("--no-color", "Disable colored output"))
         .addOption(new Option("--json-errors", "Output errors as JSON to stderr (for AI agents/scripts)"))
-        .description("aYOUne - Business as a Service Command Line Interface");
+        .addOption(new Option("--token <jwt>", "Authenticate with a JWT token for this session"))
+        .addOption(new Option("--no-context", "Disable context injection for this command"))
+        .description(getDescription());
     program.showHelpAfterError();
     program.showSuggestionAfterError(true);
     createModulesCommand(program);
@@ -101,23 +114,26 @@ export function createProgram(program) {
     createSyncCommand(program);
     createPermissionsCommand(program);
     createTemplateCommand(program);
+    createAccessCommand(program);
+    createSetupCommand(program);
+    createStatusCommand(program);
+    createSelfHostUpdateCommand(program);
+    createContextCommand(program);
     createCompletionsCommand(program);
     createAliasCommand(program);
     createConfigCommand(program);
     registerUserAliases(program);
     createLoginCommand(program);
-    program.addHelpText("beforeAll", `
-     __     ______  _    _            
-     \\ \\   / / __ \\| |  | |           
-   __ \\ \\_/ / |  | | |  | |_ __   ___ 
-  / _\` \\   /| |  | | |  | | '_ \\ / _ \\
- | (_| || | | |__| | |__| | | | |  __/
-  \\__,_||_|  \\____/ \\____/|_| |_|\\___|
-`);
+    program.addHelpText("beforeAll", getLogo());
+    program.addHelpText("afterAll", chalk.dim("\n  Run ay <command> --help for more info\n"));
     program.configureHelp({
         sortOptions: true,
         sortSubcommands: true,
         showGlobalOptions: true,
+        formatHelp: (cmd, helper) => {
+            const defaultHelp = Command.prototype.createHelp().formatHelp(cmd, helper);
+            return defaultHelp.replace(/^(Usage:|Commands:|Options:|Global Options:)/gm, (match) => chalk.hex(BRAND_BLUE).bold(match));
+        },
     });
     // Respect NO_COLOR env var (no-color.org standard)
     if (process.env.NO_COLOR !== undefined) {
@@ -154,7 +170,10 @@ export function createProgram(program) {
             enableDryRun();
         }
         if (opts.jsonErrors) {
-            enableJsonErrors();
+            setJsonErrorsEnabled(true);
+        }
+        if (opts.context === false) {
+            disableContext();
         }
         if (opts.quiet) {
             spinner.start = () => spinner;
@@ -163,22 +182,29 @@ export function createProgram(program) {
             spinner.stop = () => spinner;
             // spinner.error left intact
         }
-        // Token from env var (headless/AI agent mode) — takes precedence over stored token
-        const envToken = process.env.AYOUNE_TOKEN;
-        if (envToken && !localStorage.getItem("token")) {
-            localStorage.setItem("token", envToken);
+        // Token from --token flag (highest priority), then env var, then stored token
+        if (opts.token) {
+            secureStorage.setItem("token", opts.token);
+        }
+        else {
+            const envToken = process.env.AYOUNE_TOKEN;
+            if (envToken && !secureStorage.getItem("token")) {
+                secureStorage.setItem("token", envToken);
+            }
         }
         // First-run onboarding: auto-login if no token stored
         const cmdName = thisCommand.name();
-        const skipAuth = ["login", "logout", "whoami", "completions", "alias", "config", "help"];
+        const skipAuth = ["login", "logout", "whoami", "completions", "alias", "config", "help", "setup", "status", "self-host-update", "context"];
         if (!skipAuth.includes(cmdName) && process.stdin.isTTY) {
-            const token = localStorage.getItem("token");
+            const token = secureStorage.getItem("token");
             if (!token) {
-                console.error(chalk.cyan.bold("\n  Welcome to aYOUne CLI!\n"));
+                console.error(chalk.hex('#2B8DC6').bold("\n  Welcome to aYOUne CLI!\n"));
                 console.error(chalk.dim("  You need to authenticate before using this command.\n"));
                 await login();
             }
         }
+        // Non-blocking update check (throttled, silent on errors)
+        checkForUpdates(pkg.version || "0.0.0");
     });
     //Parse command line arguments
     program.parse(process.argv);