@proletariat/cli 0.3.16 → 0.3.18

package/dist/commands/claude.js

@@ -7,7 +7,7 @@ import inquirer from 'inquirer';
 import Database from 'better-sqlite3';
 import { findHQRoot } from '../lib/workspace.js';
 import { getWorkspaceInfo, createEphemeralAgent, } from '../lib/agents/commands.js';
-import { shouldOutputJson, outputPromptAsJson, outputErrorAsJson, createMetadata, buildPromptConfig, } from '../lib/prompt-json.js';
+import { shouldOutputJson, isAgentMode, outputPromptAsJson, outputErrorAsJson, createMetadata, normalizeChoices, } from '../lib/prompt-json.js';
 import { styles } from '../lib/styles.js';
 import { DEFAULT_EXECUTION_CONFIG, } from '../lib/execution/types.js';
 import { runExecution, isDockerRunning, isGitHubTokenAvailable, isDevcontainerCliInstalled } from '../lib/execution/runners.js';
@@ -88,6 +88,28 @@ export default class Claude extends Command {
             description: 'Ticket title (inside HQ only)',
         }),
     };
+    /**
+     * Prompt wrapper - handles both JSON mode and interactive mode.
+     * In JSON mode: outputs prompt as JSON and exits.
+     * In interactive mode: calls inquirer.prompt normally.
+     */
+    async prompt(questions, jsonModeConfig) {
+        if (jsonModeConfig && isAgentMode(jsonModeConfig.flags)) {
+            const firstQuestion = questions[0];
+            if (firstQuestion) {
+                const choices = firstQuestion.choices ? normalizeChoices(firstQuestion.choices) : undefined;
+                outputPromptAsJson({
+                    type: firstQuestion.type,
+                    name: firstQuestion.name,
+                    message: firstQuestion.message,
+                    choices,
+                    default: firstQuestion.default,
+                }, createMetadata(jsonModeConfig.commandName, jsonModeConfig.flags));
+            }
+            return {};
+        }
+        return inquirer.prompt(questions);
+    }
     async run() {
         const { flags } = await this.parse(Claude);
         const jsonMode = shouldOutputJson(flags);
@@ -119,16 +141,10 @@ export default class Claude extends Command {
         this.log(styles.muted('   No HQ detected - running without tracking'));
         this.log('');
         // Prompt for slug (session name)
+        const jsonModeConfig = jsonMode ? { flags: flags, commandName: 'claude' } : null;
         let slug = flags.slug;
         if (!slug) {
-            if (jsonMode) {
-                outputPromptAsJson({
-                    type: 'input',
-                    name: 'slug',
-                    message: 'Session name (for tab/pane title):',
-                }, createMetadata('claude', flags));
-            }
-            const { inputSlug } = await inquirer.prompt([
+            const { inputSlug } = await this.prompt([
                 {
                     type: 'input',
                     name: 'inputSlug',
@@ -136,7 +152,7 @@ export default class Claude extends Command {
                     default: path.basename(workDir),
                     validate: (input) => input.trim() ? true : 'Session name required',
                 },
-            ]);
+            ], jsonModeConfig);
             slug = inputSlug.trim();
         }
         // Determine if devcontainer is available
@@ -146,7 +162,7 @@ export default class Claude extends Command {
         if (flags.environment) {
             environment = flags.environment;
         }
-        else if (!jsonMode) {
+        else {
             // Check devcontainer prerequisites upfront
             const dockerRunning = isDockerRunning();
             const devcontainerCliInstalled = isDevcontainerCliInstalled();
@@ -163,11 +179,36 @@ export default class Claude extends Command {
                     missing.push('devcontainer CLI');
                 devcontainerLabel = `🐳 devcontainer (requires: ${missing.join(', ')})`;
             }
-            // Loop to handle Docker not running
+            // In JSON mode, output environment prompt and exit
+            if (jsonMode) {
+                await this.prompt([
+                    {
+                        type: 'list',
+                        name: 'selectedEnv',
+                        message: 'Where should Claude run?',
+                        choices: [
+                            {
+                                name: devcontainerLabel,
+                                value: 'devcontainer',
+                                disabled: !devcontainerReady,
+                                command: `prlt claude --slug "${slug}" --environment devcontainer --json`,
+                            },
+                            {
+                                name: '💻 host (runs directly on your machine)',
+                                value: 'host',
+                                command: `prlt claude --slug "${slug}" --environment host --json`,
+                            },
+                        ],
+                        default: devcontainerReady ? 'devcontainer' : 'host',
+                    },
+                ], jsonModeConfig);
+                return; // unreachable, but satisfies TypeScript
+            }
+            // Interactive mode: loop to handle Docker not running
             let environmentSelected = false;
             while (!environmentSelected) {
                 // eslint-disable-next-line no-await-in-loop -- Interactive user prompt in loop
-                const { selectedEnv } = await inquirer.prompt([
+                const { selectedEnv } = await this.prompt([
                     {
                         type: 'list',
                         name: 'selectedEnv',
@@ -182,7 +223,7 @@ export default class Claude extends Command {
                         ],
                         default: devcontainerReady ? 'devcontainer' : 'host',
                     },
-                ]);
+                ], null);
                 if (selectedEnv === 'devcontainer') {
                     // Double-check prerequisites (in case user retried after starting Docker)
                     if (!isDockerRunning()) {
@@ -202,22 +243,18 @@ export default class Claude extends Command {
                     // Check GitHub token is available for git push operations
                     if (!isGitHubTokenAvailable()) {
                         const tokenChoices = [
-                            { name: 'Yes, continue anyway (git push may fail)', value: 'continue' },
+                            { name: 'Yes, continue anyway (git push may fail)', value: 'continue', command: `prlt claude --slug "${slug}" --environment devcontainer --json` },
                             { name: 'No, let me run gh auth login first', value: 'cancel' },
-                            { name: 'Switch to host mode instead', value: 'host' },
+                            { name: 'Switch to host mode instead', value: 'host', command: `prlt claude --slug "${slug}" --environment host --json` },
                         ];
                         const tokenMessage = 'GitHub token not found. Git push may fail. Continue without token?';
-                        if (jsonMode) {
-                            outputPromptAsJson(buildPromptConfig('list', 'tokenAction', tokenMessage, tokenChoices), createMetadata('claude', flags));
-                            return;
-                        }
                         this.log('');
                         this.warn('GitHub token not found.\n' +
                             'Git push operations may fail inside the container.\n' +
                             'Run `gh auth login` to authenticate, or continue without token.');
                         this.log('');
                         // eslint-disable-next-line no-await-in-loop -- Interactive user prompt in loop
-                        const { tokenAction } = await inquirer.prompt([
+                        const { tokenAction } = await this.prompt([
                             {
                                 type: 'list',
                                 name: 'tokenAction',
@@ -225,7 +262,7 @@ export default class Claude extends Command {
                                 choices: tokenChoices,
                                 default: 'continue',
                             },
-                        ]);
+                        ], null);
                         if (tokenAction === 'cancel') {
                             this.log(styles.muted('Run `gh auth login` and try again.'));
                             return;
@@ -247,20 +284,20 @@ export default class Claude extends Command {
         if (flags['display-mode']) {
             displayMode = flags['display-mode'];
         }
-        else if (!jsonMode) {
-            const { selectedDisplay } = await inquirer.prompt([
+        else {
+            const { selectedDisplay } = await this.prompt([
                 {
                     type: 'list',
                     name: 'selectedDisplay',
                     message: 'How should output be displayed?',
                     choices: [
-                        { name: '🖥️  New tab      - Opens in new terminal tab (recommended)', value: 'terminal' },
-                        { name: '▶️  Foreground  - Run in current terminal (blocking)', value: 'foreground' },
-                        { name: '📦 Background  - Runs detached, reattach later', value: 'background' },
+                        { name: '🖥️  New tab      - Opens in new terminal tab (recommended)', value: 'terminal', command: `prlt claude --slug "${slug}" --environment ${environment} --display-mode terminal --json` },
+                        { name: '▶️  Foreground  - Run in current terminal (blocking)', value: 'foreground', command: `prlt claude --slug "${slug}" --environment ${environment} --display-mode foreground --json` },
+                        { name: '📦 Background  - Runs detached, reattach later', value: 'background', command: `prlt claude --slug "${slug}" --environment ${environment} --display-mode background --json` },
                     ],
                     default: 'terminal',
                 },
-            ]);
+            ], jsonModeConfig);
             displayMode = selectedDisplay;
         }
         // Prompt for permission mode
@@ -268,19 +305,19 @@ export default class Claude extends Command {
         if (flags['permission-mode']) {
             sandboxed = flags['permission-mode'] === 'safe';
         }
-        else if (!jsonMode) {
-            const { permissionMode } = await inquirer.prompt([
+        else {
+            const { permissionMode } = await this.prompt([
                 {
                     type: 'list',
                     name: 'permissionMode',
                     message: 'Permission mode:',
                     choices: [
-                        { name: '⚠️  danger - Skip permission checks (faster)', value: 'danger' },
-                        { name: '🔒 safe   - Requires approval for dangerous operations', value: 'safe' },
+                        { name: '⚠️  danger - Skip permission checks (faster)', value: 'danger', command: `prlt claude --slug "${slug}" --environment ${environment} --display-mode ${displayMode} --permission-mode danger --json` },
+                        { name: '🔒 safe   - Requires approval for dangerous operations', value: 'safe', command: `prlt claude --slug "${slug}" --environment ${environment} --display-mode ${displayMode} --permission-mode safe --json` },
                     ],
                     default: 'danger',
                 },
-            ]);
+            ], jsonModeConfig);
             sandboxed = permissionMode === 'safe';
         }
         // Warn about uncommitted changes in danger mode
@@ -289,23 +326,21 @@ export default class Claude extends Command {
             this.warn('Running in danger mode with uncommitted changes!');
             this.log(styles.muted('   Consider committing or stashing changes first.'));
             this.log('');
-            if (!jsonMode) {
-                const { proceed } = await inquirer.prompt([
-                    {
-                        type: 'list',
-                        name: 'proceed',
-                        message: 'Continue anyway?',
-                        choices: [
-                            { name: 'Yes, proceed', value: true },
-                            { name: 'No, cancel', value: false },
-                        ],
-                        default: true,
-                    },
-                ]);
-                if (!proceed) {
-                    this.log(styles.muted('Cancelled.'));
-                    return;
-                }
+            const { proceed } = await this.prompt([
+                {
+                    type: 'list',
+                    name: 'proceed',
+                    message: 'Continue anyway?',
+                    choices: [
+                        { name: 'Yes, proceed', value: 'true' },
+                        { name: 'No, cancel', value: 'false' },
+                    ],
+                    default: 'true',
+                },
+            ], null);
+            if (proceed !== 'true') {
+                this.log(styles.muted('Cancelled.'));
+                return;
             }
         }
         // Build session name
@@ -463,6 +498,7 @@ export default class Claude extends Command {
                 this.error('PMO not found. Run "prlt pmo init" first.');
             }
             // Select project
+            const jsonModeConfig = jsonMode ? { flags: flags, commandName: 'claude' } : null;
             let projectId = flags.project;
             if (!projectId) {
                 const projects = await storage.listProjects();
@@ -474,35 +510,29 @@ export default class Claude extends Command {
                     }
                     this.error('No projects found. Create a project first.');
                 }
-                if (jsonMode) {
-                    outputPromptAsJson({
-                        type: 'list',
-                        name: 'project',
-                        message: 'Select project for adhoc ticket:',
-                        choices: projects.map((p) => ({ name: `${p.name} (${p.id})`, value: p.id })),
-                    }, createMetadata('claude', flags));
+                if (projects.length === 1) {
+                    projectId = projects[0].id;
+                }
+                else {
+                    const { selectedProject } = await this.prompt([
+                        {
+                            type: 'list',
+                            name: 'selectedProject',
+                            message: 'Select project for adhoc ticket:',
+                            choices: projects.map((p) => ({
+                                name: `${p.name} (${p.id})`,
+                                value: p.id,
+                                command: `prlt claude --project ${p.id} --json`,
+                            })),
+                        },
+                    ], jsonModeConfig);
+                    projectId = selectedProject;
                 }
-                const { selectedProject } = await inquirer.prompt([
-                    {
-                        type: 'list',
-                        name: 'selectedProject',
-                        message: 'Select project for adhoc ticket:',
-                        choices: projects.map((p) => ({ name: `${p.name} (${p.id})`, value: p.id })),
-                    },
-                ]);
-                projectId = selectedProject;
             }
             // Get ticket title
             let ticketTitle = flags.title;
             if (!ticketTitle) {
-                if (jsonMode) {
-                    outputPromptAsJson({
-                        type: 'input',
-                        name: 'title',
-                        message: 'Ticket title:',
-                    }, createMetadata('claude', flags));
-                }
-                const { inputTitle } = await inquirer.prompt([
+                const { inputTitle } = await this.prompt([
                     {
                         type: 'input',
                         name: 'inputTitle',
@@ -510,19 +540,19 @@ export default class Claude extends Command {
                         default: `Ad-hoc session: ${path.basename(workDir)}`,
                         validate: (input) => input.trim() ? true : 'Title required',
                     },
-                ]);
+                ], jsonModeConfig);
                 ticketTitle = inputTitle.trim();
             }
             // Get optional description
             let ticketDescription;
             if (!jsonMode) {
-                const { inputDesc } = await inquirer.prompt([
+                const { inputDesc } = await this.prompt([
                     {
                         type: 'input',
                         name: 'inputDesc',
                         message: 'Description (optional):',
                     },
-                ]);
+                ], null);
                 if (inputDesc.trim()) {
                     ticketDescription = inputDesc.trim();
                 }
@@ -549,11 +579,38 @@ export default class Claude extends Command {
             if (flags.environment) {
                 environment = flags.environment;
             }
-            else if (!jsonMode) {
+            else {
+                // In JSON mode, output environment prompt and exit
+                if (jsonMode) {
+                    await this.prompt([
+                        {
+                            type: 'list',
+                            name: 'selectedEnv',
+                            message: 'Where should Claude run?',
+                            choices: [
+                                {
+                                    name: devcontainerLabel,
+                                    value: 'devcontainer',
+                                    disabled: !devcontainerReady,
+                                    command: `prlt claude --project ${projectId} --title "${ticketTitle}" --environment devcontainer --json`,
+                                },
+                                {
+                                    name: '💻 host (runs directly on your machine)',
+                                    value: 'host',
+                                    command: `prlt claude --project ${projectId} --title "${ticketTitle}" --environment host --json`,
+                                },
+                            ],
+                            default: devcontainerReady ? 'devcontainer' : 'host',
+                        },
+                    ], jsonModeConfig);
+                    db.close();
+                    return; // unreachable, but satisfies TypeScript
+                }
+                // Interactive mode: loop to handle Docker not running
                 let environmentSelected = false;
                 while (!environmentSelected) {
                     // eslint-disable-next-line no-await-in-loop -- Interactive user prompt in loop
-                    const { selectedEnv } = await inquirer.prompt([
+                    const { selectedEnv } = await this.prompt([
                         {
                             type: 'list',
                             name: 'selectedEnv',
@@ -568,7 +625,7 @@ export default class Claude extends Command {
                             ],
                             default: devcontainerReady ? 'devcontainer' : 'host',
                         },
-                    ]);
+                    ], null);
                     if (selectedEnv === 'devcontainer') {
                         // Double-check prerequisites (in case user retried after starting Docker)
                         if (!isDockerRunning()) {
@@ -593,18 +650,13 @@ export default class Claude extends Command {
                                 { name: 'Switch to host mode instead', value: 'host' },
                             ];
                             const tokenMessage = 'GitHub token not found. Git push may fail. Continue without token?';
-                            if (jsonMode) {
-                                outputPromptAsJson(buildPromptConfig('list', 'tokenAction', tokenMessage, tokenChoices), createMetadata('claude', flags));
-                                db.close();
-                                return;
-                            }
                             this.log('');
                             this.warn('GitHub token not found.\n' +
                                 'Git push operations may fail inside the container.\n' +
                                 'Run `gh auth login` to authenticate, or continue without token.');
                             this.log('');
                             // eslint-disable-next-line no-await-in-loop -- Interactive user prompt in loop
-                            const { tokenAction } = await inquirer.prompt([
+                            const { tokenAction } = await this.prompt([
                                 {
                                     type: 'list',
                                     name: 'tokenAction',
@@ -612,7 +664,7 @@ export default class Claude extends Command {
                                     choices: tokenChoices,
                                     default: 'continue',
                                 },
-                            ]);
+                            ], null);
                             if (tokenAction === 'cancel') {
                                 db.close();
                                 this.log(styles.muted('Run `gh auth login` and try again.'));
@@ -635,20 +687,20 @@ export default class Claude extends Command {
             if (flags['display-mode']) {
                 displayMode = flags['display-mode'];
             }
-            else if (!jsonMode) {
-                const { selectedDisplay } = await inquirer.prompt([
+            else {
+                const { selectedDisplay } = await this.prompt([
                     {
                         type: 'list',
                         name: 'selectedDisplay',
                         message: 'How should output be displayed?',
                         choices: [
-                            { name: '🖥️  New tab      - Opens in new terminal tab (recommended)', value: 'terminal' },
-                            { name: '▶️  Foreground  - Run in current terminal (blocking)', value: 'foreground' },
-                            { name: '📦 Background  - Runs detached, reattach later', value: 'background' },
+                            { name: '🖥️  New tab      - Opens in new terminal tab (recommended)', value: 'terminal', command: `prlt claude --project ${projectId} --title "${ticketTitle}" --environment ${environment} --display-mode terminal --json` },
+                            { name: '▶️  Foreground  - Run in current terminal (blocking)', value: 'foreground', command: `prlt claude --project ${projectId} --title "${ticketTitle}" --environment ${environment} --display-mode foreground --json` },
+                            { name: '📦 Background  - Runs detached, reattach later', value: 'background', command: `prlt claude --project ${projectId} --title "${ticketTitle}" --environment ${environment} --display-mode background --json` },
                         ],
                         default: 'terminal',
                     },
-                ]);
+                ], jsonModeConfig);
                 displayMode = selectedDisplay;
             }
             // Prompt for permission mode
@@ -656,20 +708,20 @@ export default class Claude extends Command {
             if (flags['permission-mode']) {
                 sandboxed = flags['permission-mode'] === 'safe';
             }
-            else if (!jsonMode) {
+            else {
                 const containerNote = environment === 'devcontainer' ? ' (container provides additional isolation)' : '';
-                const { permissionMode } = await inquirer.prompt([
+                const { permissionMode } = await this.prompt([
                     {
                         type: 'list',
                         name: 'permissionMode',
                         message: `Permission mode${containerNote}:`,
                         choices: [
-                            { name: '⚠️  danger - Skip permission checks (faster)', value: 'danger' },
-                            { name: '🔒 safe   - Requires approval for dangerous operations', value: 'safe' },
+                            { name: '⚠️  danger - Skip permission checks (faster)', value: 'danger', command: `prlt claude --project ${projectId} --title "${ticketTitle}" --environment ${environment} --display-mode ${displayMode} --permission-mode danger --json` },
+                            { name: '🔒 safe   - Requires approval for dangerous operations', value: 'safe', command: `prlt claude --project ${projectId} --title "${ticketTitle}" --environment ${environment} --display-mode ${displayMode} --permission-mode safe --json` },
                         ],
                         default: 'danger',
                     },
-                ]);
+                ], jsonModeConfig);
                 sandboxed = permissionMode === 'safe';
             }
             // Warn about uncommitted changes in danger mode
@@ -678,24 +730,22 @@ export default class Claude extends Command {
                 this.warn('Running in danger mode with uncommitted changes!');
                 this.log(styles.muted('   Consider committing or stashing changes first.'));
                 this.log('');
-                if (!jsonMode) {
-                    const { proceed } = await inquirer.prompt([
-                        {
-                            type: 'list',
-                            name: 'proceed',
-                            message: 'Continue anyway?',
-                            choices: [
-                                { name: 'Yes, proceed', value: true },
-                                { name: 'No, cancel', value: false },
-                            ],
-                            default: true,
-                        },
-                    ]);
-                    if (!proceed) {
-                        this.log(styles.muted('Cancelled.'));
-                        db.close();
-                        return;
-                    }
+                const { proceed } = await this.prompt([
+                    {
+                        type: 'list',
+                        name: 'proceed',
+                        message: 'Continue anyway?',
+                        choices: [
+                            { name: 'Yes, proceed', value: 'true' },
+                            { name: 'No, cancel', value: 'false' },
+                        ],
+                        default: 'true',
+                    },
+                ], null);
+                if (proceed !== 'true') {
+                    this.log(styles.muted('Cancelled.'));
+                    db.close();
+                    return;
                 }
             }
             // Now create ticket (after all prompts so user can cancel early without orphaned ticket)

package/dist/commands/commit.d.ts

@@ -66,6 +66,12 @@ export default class Commit extends Command {
         'dry-run': import("@oclif/core/interfaces").BooleanFlag<boolean>;
         json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
+    /**
+     * Prompt wrapper - handles both JSON mode and interactive mode.
+     * In JSON mode: outputs prompt as JSON and exits.
+     * In interactive mode: calls inquirer.prompt normally.
+     */
+    private prompt;
     run(): Promise<void>;
 }
 export {};