ardent-cli-beta 0.0.2 → 0.0.4

package/dist/commands/login.d.ts

@@ -2,8 +2,9 @@ import { type Organization } from '../auth/token.js';
 import { ArdentCommand } from '../command.js';
 export default class Login extends ArdentCommand {
     static description: string;
+    static helpGroup: string;
     static flags: {
-        token: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        token: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<{
         authenticated: true;

package/dist/commands/login.js

@@ -2,12 +2,15 @@ import { Flags } from '@oclif/core';
 import { loginWithToken } from '../auth/token.js';
 import { ArdentCommand } from '../command.js';
 export default class Login extends ArdentCommand {
-    static description = 'Log in with an existing Ardent token';
+    static description = 'Log in to Ardent';
+    static helpGroup = 'Authentication';
     static flags = {
-        token: Flags.string({ description: 'Existing Ardent API token', env: 'ARDENT_TOKEN', required: true }),
+        token: Flags.string({ description: 'Existing Ardent API token', env: 'ARDENT_TOKEN' }),
     };
     async run() {
         const { flags } = await this.parse(Login);
+        if (!flags.token)
+            this.error('Interactive login is not implemented yet.');
         const organizations = await loginWithToken(this.config.configDir, flags.token);
         if (!this.jsonEnabled()) {
             this.log('✓ Logged in to Ardent');

package/dist/commands/logout.d.ts

@@ -1,6 +1,7 @@
 import { ArdentCommand } from '../command.js';
 export default class Logout extends ArdentCommand {
     static description: string;
+    static helpGroup: string;
     run(): Promise<{
         authenticated: false;
     }>;

package/dist/commands/logout.js

@@ -1,7 +1,8 @@
 import { clearSession } from '../auth/credentials.js';
 import { ArdentCommand } from '../command.js';
 export default class Logout extends ArdentCommand {
-    static description = 'Remove the locally stored Ardent token';
+    static description = 'Log out of Ardent on this device';
+    static helpGroup = 'Authentication';
     async run() {
         await clearSession(this.config.configDir);
         if (!this.jsonEnabled())

package/dist/commands/status.d.ts

@@ -1,6 +1,7 @@
 import { ArdentCommand } from '../command.js';
 export default class Status extends ArdentCommand {
     static description: string;
+    static helpGroup: string;
     run(): Promise<{
         authenticated: boolean;
     }>;

package/dist/commands/status.js

@@ -1,7 +1,8 @@
 import { loadSession } from '../auth/credentials.js';
 import { ArdentCommand } from '../command.js';
 export default class Status extends ArdentCommand {
-    static description = 'Show the local Ardent login status';
+    static description = 'Show your Ardent login status';
+    static helpGroup = 'Authentication';
     async run() {
         const session = await loadSession(this.config.configDir);
         const result = { authenticated: session !== undefined };

package/dist/help.d.ts

@@ -0,0 +1,6 @@
+import { Help } from '@oclif/core/help';
+export default class ArdentHelp extends Help {
+    showHelp(arguments_: string[]): Promise<void>;
+    private authenticated;
+    private showArdentHelp;
+}

package/dist/help.js

@@ -0,0 +1,52 @@
+import { ux } from '@oclif/core';
+import { getHelpFlagAdditions, Help } from '@oclif/core/help';
+import { loadSession } from './auth/credentials.js';
+export default class ArdentHelp extends Help {
+    async showHelp(arguments_) {
+        const rootHelp = arguments_.every((argument) => getHelpFlagAdditions(this.config).includes(argument));
+        if (!rootHelp)
+            return super.showHelp(arguments_);
+        const authenticated = await this.authenticated();
+        if (arguments_.length > 0 || authenticated) {
+            this.showArdentHelp(authenticated);
+            return;
+        }
+        this.log('Get started:');
+        this.log('');
+        this.log(ux.colorize('green', '  ardent login                    Standard CLI login'));
+        this.log('  ardent login --token <token>    Non-interactive login (CI and automation)');
+        this.log('');
+        this.log('For all commands:');
+        this.log('');
+        this.log('  ardent --help');
+    }
+    async authenticated() {
+        try {
+            return (await loadSession(this.config.configDir)) !== undefined;
+        }
+        catch {
+            return false;
+        }
+    }
+    showArdentHelp(authenticated) {
+        this.log(`Ardent CLI ${ux.colorize('dim', `v${this.config.version}`)}`);
+        this.log('');
+        this.log(this.section('USAGE', '$ ardent <command>'));
+        const groups = new Map();
+        for (const command of this.sortedCommands) {
+            if (command.hidden || command.pluginName !== this.config.name || typeof command.helpGroup !== 'string')
+                continue;
+            const commands = groups.get(command.helpGroup) ?? [];
+            commands.push(command);
+            groups.set(command.helpGroup, commands);
+        }
+        for (const [group, commands] of groups) {
+            const rows = commands.map((command) => {
+                const name = `ardent ${command.id.replaceAll(':', ' ')}`;
+                return [!authenticated && command.id === 'login' ? ux.colorize('green', name) : name, this.summary(command)];
+            });
+            this.log('');
+            this.log(this.section(group.toUpperCase(), rows));
+        }
+    }
+}

package/oclif.manifest.json

@@ -3,7 +3,7 @@
     "login": {
       "aliases": [],
       "args": {},
-      "description": "Log in with an existing Ardent token",
+      "description": "Log in to Ardent",
       "flags": {
         "json": {
           "description": "Format output as json.",
@@ -16,7 +16,6 @@
           "description": "Existing Ardent API token",
           "env": "ARDENT_TOKEN",
           "name": "token",
-          "required": true,
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
@@ -30,6 +29,7 @@
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
+      "helpGroup": "Authentication",
       "isESM": true,
       "relativePath": [
         "dist",
@@ -40,7 +40,7 @@
     "logout": {
       "aliases": [],
       "args": {},
-      "description": "Remove the locally stored Ardent token",
+      "description": "Log out of Ardent on this device",
       "flags": {
         "json": {
           "description": "Format output as json.",
@@ -58,6 +58,7 @@
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
+      "helpGroup": "Authentication",
       "isESM": true,
       "relativePath": [
         "dist",
@@ -68,7 +69,7 @@
     "status": {
       "aliases": [],
       "args": {},
-      "description": "Show the local Ardent login status",
+      "description": "Show your Ardent login status",
       "flags": {
         "json": {
           "description": "Format output as json.",
@@ -86,6 +87,7 @@
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
+      "helpGroup": "Authentication",
       "isESM": true,
       "relativePath": [
         "dist",
@@ -94,5 +96,5 @@
       ]
     }
   },
-  "version": "0.0.2"
+  "version": "0.0.4"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ardent-cli-beta",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "The Ardent command-line interface",
   "license": "Apache-2.0",
   "type": "module",
@@ -25,9 +25,9 @@
     "bin": "ardent",
     "dirname": "ardent",
     "commands": "./dist/commands",
+    "helpClass": "./dist/help",
     "plugins": [
-      "@oclif/plugin-autocomplete",
-      "@oclif/plugin-help"
+      "@oclif/plugin-autocomplete"
     ],
     "topicSeparator": " "
   },
@@ -41,8 +41,7 @@
   },
   "dependencies": {
     "@oclif/core": "^5.0.0",
-    "@oclif/plugin-autocomplete": "^4.0.0",
-    "@oclif/plugin-help": "^7.0.0"
+    "@oclif/plugin-autocomplete": "^4.0.0"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",