@proletariat/cli 0.3.16 → 0.3.18

package/dist/commands/execution/logs.js

@@ -2,13 +2,12 @@ import { Args, Flags } from '@oclif/core';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import { spawn } from 'node:child_process';
-import inquirer from 'inquirer';
 import Database from 'better-sqlite3';
 import { styles } from '../../lib/styles.js';
 import { getWorkspaceInfo } from '../../lib/agents/commands.js';
 import { ExecutionStorage } from '../../lib/execution/storage.js';
 import { PMOCommand, pmoBaseFlags } from '../../lib/pmo/index.js';
-import { shouldOutputJson, outputPromptAsJson, outputErrorAsJson, createMetadata, buildPromptConfig, } from '../../lib/prompt-json.js';
+import { outputErrorAsJson, createMetadata, shouldOutputJson, } from '../../lib/prompt-json.js';
 export default class ExecutionLogs extends PMOCommand {
     static description = 'View execution logs';
     static examples = [
@@ -61,9 +60,8 @@ export default class ExecutionLogs extends PMOCommand {
             let execId = args.id;
             if (!execId) {
                 const executions = executionStorage.listExecutions({ limit: 20 });
-                // Check if JSON output mode is active
-                const jsonMode = shouldOutputJson(flags);
                 if (executions.length === 0) {
+                    const jsonMode = shouldOutputJson(flags);
                     if (jsonMode) {
                         outputErrorAsJson('NO_EXECUTIONS', 'No executions found.', createMetadata('execution logs', flags));
                         db.close();
@@ -71,17 +69,8 @@ export default class ExecutionLogs extends PMOCommand {
                     }
                     this.error('No executions found.');
                 }
-                // In JSON mode, output execution selection prompt
-                if (jsonMode) {
-                    const execChoices = executions.map((e) => ({
-                        name: `${e.id} - ${e.ticketId} (${e.agentName}, ${e.status})`,
-                        value: e.id,
-                    }));
-                    outputPromptAsJson(buildPromptConfig('list', 'executionId', 'Select execution to view logs:', execChoices), createMetadata('execution logs', flags));
-                    db.close();
-                    return;
-                }
-                const { selectedId } = await inquirer.prompt([
+                const jsonModeConfig = (flags.json || flags.machine) ? { flags, commandName: 'execution logs' } : null;
+                const { selectedId } = await this.prompt([
                     {
                         type: 'list',
                         name: 'selectedId',
@@ -89,9 +78,10 @@ export default class ExecutionLogs extends PMOCommand {
                         choices: executions.map((e) => ({
                             name: `${e.id} - ${e.ticketId} (${e.agentName}, ${e.status})`,
                             value: e.id,
+                            command: `prlt execution logs ${e.id} --json`,
                         })),
                     },
-                ]);
+                ], jsonModeConfig);
                 execId = selectedId;
             }
             // Get execution

package/dist/commands/execution/stop.d.ts

@@ -10,6 +10,7 @@ export default class ExecutionStop extends PMOCommand {
         all: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         agent: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        machine: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         project: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     protected getPMOOptions(): {

package/dist/commands/execution/stop.js

@@ -1,14 +1,12 @@
 import { Args, Flags } from '@oclif/core';
 import * as path from 'node:path';
 import { execSync } from 'node:child_process';
-import inquirer from 'inquirer';
 import Database from 'better-sqlite3';
 import { styles } from '../../lib/styles.js';
 import { getWorkspaceInfo } from '../../lib/agents/commands.js';
 import { ExecutionStorage } from '../../lib/execution/storage.js';
 import { isDockerRunning } from '../../lib/execution/runners.js';
 import { PMOCommand, pmoBaseFlags } from '../../lib/pmo/index.js';
-import { shouldOutputJson, outputPromptAsJson, createMetadata, buildPromptConfig, } from '../../lib/prompt-json.js';
 export default class ExecutionStop extends PMOCommand {
     static description = 'Stop running execution(s)';
     static examples = [
@@ -139,18 +137,8 @@ export default class ExecutionStop extends PMOCommand {
                 this.log(styles.muted('\nNo running executions found.\n'));
                 return;
             }
-            // Check if JSON output mode is active
-            const jsonMode = shouldOutputJson(flags);
-            // In JSON mode, output execution selection prompt
-            if (jsonMode) {
-                const execChoices = activeExecutions.map((e) => ({
-                    name: `${e.id} - ${e.ticketId} (${e.agentName}, ${e.environment})`,
-                    value: e.id,
-                }));
-                outputPromptAsJson(buildPromptConfig('list', 'executionId', 'Select execution to stop:', execChoices), createMetadata('execution stop', flags));
-                return;
-            }
-            const { selectedId } = await inquirer.prompt([
+            const jsonModeConfig = (flags.json || flags.machine) ? { flags: flags, commandName: 'execution stop' } : null;
+            const { selectedId } = await this.prompt([
                 {
                     type: 'list',
                     name: 'selectedId',
@@ -158,9 +146,10 @@ export default class ExecutionStop extends PMOCommand {
                     choices: activeExecutions.map((e) => ({
                         name: `${e.id} - ${e.ticketId} (${e.agentName}, ${e.environment})`,
                         value: e.id,
+                        command: `prlt execution stop ${e.id} --json`,
                     })),
                 },
-            ]);
+            ], jsonModeConfig);
             id = selectedId;
         }
         // Get execution

package/dist/commands/gh/index.d.ts

@@ -3,6 +3,7 @@ export default class GH extends Command {
     static description: string;
     static examples: string[];
     static flags: {
+        machine: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;

package/dist/commands/gh/index.js

@@ -1,6 +1,6 @@
-import { Command, Flags } from '@oclif/core';
-import inquirer from 'inquirer';
-import { shouldOutputJson, outputPromptAsJson, createMetadata, buildPromptConfig, } from '../../lib/prompt-json.js';
+import { Command } from '@oclif/core';
+import { FlagResolver, shouldOutputJson } from '../../lib/flags/index.js';
+import { machineOutputFlags } from '../../lib/pmo/index.js';
 export default class GH extends Command {
     static description = 'GitHub CLI setup and status for PR workflow';
     static examples = [
@@ -10,35 +10,35 @@ export default class GH extends Command {
         '<%= config.bin %> <%= command.id %> token',
     ];
     static flags = {
-        json: Flags.boolean({
-            description: 'Output prompt configuration as JSON (for AI agents/scripts)',
-            default: false,
-        }),
+        ...machineOutputFlags,
     };
     async run() {
         const { flags } = await this.parse(GH);
         // Check if JSON output mode is active
         const jsonMode = shouldOutputJson(flags);
-        // Define choices once, use for both JSON and interactive modes
-        const menuChoices = [
-            { name: 'Check status', value: 'status' },
-            { name: 'Login to GitHub', value: 'login' },
-            { name: 'Show GH_TOKEN setup', value: 'token' },
-        ];
-        const message = 'GitHub CLI Setup';
-        // In JSON mode, output menu prompt
-        if (jsonMode) {
-            outputPromptAsJson(buildPromptConfig('list', 'action', message, menuChoices), createMetadata('gh', flags));
-            return;
-        }
-        // Interactive menu when no subcommand provided
-        const { action } = await inquirer.prompt([{
-                type: 'list',
-                name: 'action',
-                message,
-                choices: menuChoices,
-            }]);
-        switch (action) {
+        // Use FlagResolver for the menu selection
+        const resolver = new FlagResolver({
+            commandName: 'gh',
+            baseCommand: 'prlt gh',
+            jsonMode,
+            flags: {}, // No flags to resolve from CLI args for this menu command
+        });
+        // Add prompt for action selection
+        resolver.addPrompt({
+            flagName: 'action',
+            type: 'list',
+            message: 'GitHub CLI Setup',
+            choices: () => [
+                { name: 'Check status', value: 'status', command: 'prlt gh status --json' },
+                { name: 'Login to GitHub', value: 'login', command: 'prlt gh login --json' },
+                { name: 'Show GH_TOKEN setup', value: 'token', command: 'prlt gh token --json' },
+            ],
+            skipAutoCommand: true, // Use our custom commands above
+        });
+        // Resolve - in JSON mode this outputs the prompt and exits
+        const resolved = await resolver.resolve();
+        // Execute the selected action
+        switch (resolved.action) {
             case 'status':
                 await this.config.runCommand('gh status');
                 break;

package/dist/commands/gh/login.d.ts

@@ -2,5 +2,9 @@ import { Command } from '@oclif/core';
 export default class GHLogin extends Command {
     static description: string;
     static examples: string[];
+    static flags: {
+        machine: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+    };
     run(): Promise<void>;
 }

package/dist/commands/gh/login.js

@@ -3,14 +3,33 @@ import { spawn } from 'node:child_process';
 import chalk from 'chalk';
 import { styles } from '../../lib/styles.js';
 import { isGHInstalled, isGHAuthenticated, getGHUsername } from '../../lib/pr/index.js';
+import { isMachineOutput, outputErrorAsJson, outputSuccessAsJson, createMetadata, } from '../../lib/prompt-json.js';
+import { machineOutputFlags } from '../../lib/pmo/index.js';
 export default class GHLogin extends Command {
     static description = 'Login to GitHub CLI for PR workflow';
     static examples = [
         '<%= config.bin %> <%= command.id %>',
     ];
+    static flags = {
+        ...machineOutputFlags,
+    };
     async run() {
+        const { flags } = await this.parse(GHLogin);
+        // Check if machine output mode is active
+        const jsonMode = isMachineOutput(flags);
+        // Helper to handle errors in JSON mode
+        const handleError = (code, message) => {
+            if (jsonMode) {
+                outputErrorAsJson(code, message, createMetadata('gh login', flags));
+                this.exit(1);
+            }
+            this.error(message);
+        };
         // Check if gh is installed
         if (!isGHInstalled()) {
+            if (jsonMode) {
+                return handleError('GH_NOT_INSTALLED', 'gh CLI not installed. Install with: brew install gh');
+            }
             this.log(chalk.red('  ✗ gh CLI not installed'));
             this.log(styles.muted(''));
             this.log(styles.muted('    Install with Homebrew:'));
@@ -22,12 +41,24 @@ export default class GHLogin extends Command {
         // Check if already authenticated
         if (isGHAuthenticated()) {
             const username = getGHUsername();
+            if (jsonMode) {
+                outputSuccessAsJson({
+                    authenticated: true,
+                    username: username || null,
+                    message: 'Already authenticated',
+                }, createMetadata('gh login', flags));
+                return;
+            }
             this.log(chalk.green(`Already authenticated${username ? ` as ${chalk.bold(username)}` : ''}`));
             this.log(styles.muted(''));
             this.log(styles.muted('To re-authenticate or switch accounts, run directly:'));
             this.log(chalk.cyan('  gh auth login'));
             return;
         }
+        // In JSON mode, we can't run interactive login - return error
+        if (jsonMode) {
+            return handleError('REQUIRES_INTERACTIVE', 'gh login requires interactive authentication. Run: gh auth login');
+        }
         this.log(styles.muted('Starting GitHub authentication...\n'));
         // Run gh auth login interactively
         const child = spawn('gh', ['auth', 'login'], {

package/dist/commands/gh/status.d.ts

@@ -2,5 +2,9 @@ import { Command } from '@oclif/core';
 export default class GHStatus extends Command {
     static description: string;
     static examples: string[];
+    static flags: {
+        machine: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+    };
     run(): Promise<void>;
 }

package/dist/commands/gh/status.js

@@ -2,15 +2,39 @@ import { Command } from '@oclif/core';
 import chalk from 'chalk';
 import { styles } from '../../lib/styles.js';
 import { isGHInstalled, isGHAuthenticated, getGHUsername, isGHTokenInEnv } from '../../lib/pr/index.js';
+import { isMachineOutput, outputSuccessAsJson, createMetadata, } from '../../lib/prompt-json.js';
+import { machineOutputFlags } from '../../lib/pmo/index.js';
 export default class GHStatus extends Command {
     static description = 'Check GitHub CLI status for PR workflow';
     static examples = [
         '<%= config.bin %> <%= command.id %>',
     ];
+    static flags = {
+        ...machineOutputFlags,
+    };
     async run() {
+        const { flags } = await this.parse(GHStatus);
+        // Check if machine output mode is active
+        const jsonMode = isMachineOutput(flags);
+        // Gather status information
+        const ghInstalled = isGHInstalled();
+        const ghAuthenticated = ghInstalled && isGHAuthenticated();
+        const username = ghAuthenticated ? getGHUsername() : null;
+        const ghTokenSet = isGHTokenInEnv();
+        // In JSON mode, output status as JSON
+        if (jsonMode) {
+            outputSuccessAsJson({
+                ghInstalled,
+                ghAuthenticated,
+                username,
+                ghTokenSet,
+                ready: ghInstalled && ghAuthenticated && ghTokenSet,
+            }, createMetadata('gh status', flags));
+            return;
+        }
         this.log(styles.muted('Checking GitHub CLI status...\n'));
         // Check if gh is installed
-        if (!isGHInstalled()) {
+        if (!ghInstalled) {
             this.log(chalk.red('  ✗ gh CLI not installed'));
             this.log(styles.muted(''));
             this.log(styles.muted('    Install with Homebrew:'));
@@ -21,7 +45,7 @@ export default class GHStatus extends Command {
         }
         this.log(chalk.green('  ✓ gh CLI installed'));
         // Check if gh is authenticated
-        if (!isGHAuthenticated()) {
+        if (!ghAuthenticated) {
             this.log(chalk.yellow('  ⚠ gh CLI not authenticated'));
             this.log(styles.muted(''));
             this.log(styles.muted('    Run to authenticate:'));
@@ -29,10 +53,9 @@ export default class GHStatus extends Command {
             this.log(styles.muted(''));
             return;
         }
-        const username = getGHUsername();
         this.log(chalk.green(`  ✓ Authenticated${username ? ` as ${chalk.bold(username)}` : ''}`));
         // Check if GH_TOKEN is available for devcontainers
-        if (isGHTokenInEnv()) {
+        if (ghTokenSet) {
             this.log(chalk.green('  ✓ GH_TOKEN available for devcontainers'));
             this.log(styles.muted(''));
             this.log(chalk.green('All set! PR creation will work in both host and devcontainers.'));

package/dist/commands/gh/token.d.ts

@@ -2,5 +2,9 @@ import { Command } from '@oclif/core';
 export default class GHToken extends Command {
     static description: string;
     static examples: string[];
+    static flags: {
+        machine: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+    };
     run(): Promise<void>;
 }

package/dist/commands/gh/token.js

@@ -3,14 +3,33 @@ import { execSync } from 'node:child_process';
 import chalk from 'chalk';
 import { styles } from '../../lib/styles.js';
 import { isGHInstalled, isGHAuthenticated, isGHTokenInEnv } from '../../lib/pr/index.js';
+import { isMachineOutput, outputErrorAsJson, outputSuccessAsJson, createMetadata, } from '../../lib/prompt-json.js';
+import { machineOutputFlags } from '../../lib/pmo/index.js';
 export default class GHToken extends Command {
     static description = 'Show GH_TOKEN setup for devcontainer PR creation';
     static examples = [
         '<%= config.bin %> <%= command.id %>',
     ];
+    static flags = {
+        ...machineOutputFlags,
+    };
     async run() {
+        const { flags } = await this.parse(GHToken);
+        // Check if machine output mode is active
+        const jsonMode = isMachineOutput(flags);
+        // Helper to handle errors in JSON mode
+        const handleError = (code, message) => {
+            if (jsonMode) {
+                outputErrorAsJson(code, message, createMetadata('gh token', flags));
+                this.exit(1);
+            }
+            this.error(message);
+        };
         // Check if gh is installed
         if (!isGHInstalled()) {
+            if (jsonMode) {
+                return handleError('GH_NOT_INSTALLED', 'gh CLI not installed. Install with: brew install gh');
+            }
             this.log(chalk.red('  ✗ gh CLI not installed'));
             this.log(styles.muted(''));
             this.log(styles.muted('    Install first:'));
@@ -19,30 +38,55 @@ export default class GHToken extends Command {
         }
         // Check if gh is authenticated
         if (!isGHAuthenticated()) {
+            if (jsonMode) {
+                return handleError('GH_NOT_AUTHENTICATED', 'gh CLI not authenticated. Run: prlt gh login');
+            }
             this.log(chalk.yellow('  ⚠ gh CLI not authenticated'));
             this.log(styles.muted(''));
             this.log(styles.muted('    Authenticate first:'));
             this.log(chalk.cyan('      prlt gh login'));
             return;
         }
+        // Detect shell
+        const shell = process.env.SHELL || '/bin/zsh';
+        const rcFile = shell.includes('zsh') ? '~/.zshrc' : shell.includes('bash') ? '~/.bashrc' : '~/.profile';
         // Check if already set
         if (isGHTokenInEnv()) {
+            if (jsonMode) {
+                outputSuccessAsJson({
+                    ghTokenSet: true,
+                    message: 'GH_TOKEN is already set in your environment',
+                }, createMetadata('gh token', flags));
+                return;
+            }
             this.log(chalk.green('  ✓ GH_TOKEN is already set in your environment'));
             this.log(styles.muted(''));
             this.log(styles.muted('    PR creation will work in devcontainers.'));
             return;
         }
-        // Detect shell
-        const shell = process.env.SHELL || '/bin/zsh';
-        const rcFile = shell.includes('zsh') ? '~/.zshrc' : shell.includes('bash') ? '~/.bashrc' : '~/.profile';
+        // Get setup command
+        const setupCommand = `echo 'export GH_TOKEN=$(gh auth token 2>/dev/null)' >> ${rcFile}`;
+        const sourceCommand = `source ${rcFile}`;
+        // In JSON mode, output setup instructions
+        if (jsonMode) {
+            outputSuccessAsJson({
+                ghTokenSet: false,
+                shell,
+                rcFile,
+                setupCommand,
+                sourceCommand,
+                message: 'GH_TOKEN not set. Follow setup instructions to enable PR creation from devcontainers.',
+            }, createMetadata('gh token', flags));
+            return;
+        }
         this.log(chalk.yellow('  ⚠ GH_TOKEN not set'));
         this.log(styles.muted(''));
         this.log(styles.muted('    To enable PR creation from devcontainers, add this to your shell profile:'));
         this.log(styles.muted(''));
-        this.log(chalk.cyan(`      echo 'export GH_TOKEN=$(gh auth token 2>/dev/null)' >> ${rcFile}`));
+        this.log(chalk.cyan(`      ${setupCommand}`));
         this.log(styles.muted(''));
         this.log(styles.muted('    Then restart your terminal or run:'));
-        this.log(chalk.cyan(`      source ${rcFile}`));
+        this.log(chalk.cyan(`      ${sourceCommand}`));
         this.log(styles.muted(''));
         // Show current token (masked) for verification
         try {

package/dist/commands/phase/create.d.ts

@@ -11,6 +11,7 @@ export default class PhaseCreate extends PMOCommand {
         description: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         default: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         interactive: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        machine: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         project: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
@@ -18,5 +19,4 @@ export default class PhaseCreate extends PMOCommand {
         promptIfMultiple: boolean;
     };
     execute(): Promise<void>;
-    private promptPhaseData;
 }