@proletariat/cli 0.3.34 → 0.3.36

package/dist/commands/claude/open.js

@@ -0,0 +1,175 @@
+import { Flags } from '@oclif/core';
+import * as path from 'node:path';
+import * as fs from 'node:fs';
+import Database from 'better-sqlite3';
+import { PromptCommand } from '../../lib/prompt-command.js';
+import { machineOutputFlags } from '../../lib/pmo/index.js';
+import { findHQRoot } from '../../lib/workspace.js';
+import { getWorkspaceInfo } from '../../lib/agents/commands.js';
+import { shouldOutputJson, outputErrorAsJson, outputSuccessAsJson, createMetadata, } from '../../lib/prompt-json.js';
+import { styles } from '../../lib/styles.js';
+import { DEFAULT_EXECUTION_CONFIG, } from '../../lib/execution/types.js';
+import { runExecution } from '../../lib/execution/runners.js';
+import { loadExecutionConfig, getTerminalApp, promptTerminalPreference, getShell, promptShellPreference, hasTerminalPreference, hasShellPreference, } from '../../lib/execution/config.js';
+export default class Open extends PromptCommand {
+    static description = 'Open Claude Code in a new terminal tab (side-by-side workflow)';
+    static examples = [
+        '<%= config.bin %> <%= command.id %>',
+        '<%= config.bin %> <%= command.id %> --agent altman',
+        '<%= config.bin %> <%= command.id %> --directory /path/to/project',
+        '<%= config.bin %> <%= command.id %> --prompt "help me debug the auth flow"',
+    ];
+    static flags = {
+        ...machineOutputFlags,
+        agent: Flags.string({
+            char: 'a',
+            description: 'Open in an agent\'s workspace directory',
+        }),
+        directory: Flags.string({
+            char: 'C',
+            description: 'Directory to open in (default: current directory)',
+        }),
+        prompt: Flags.string({
+            char: 'p',
+            description: 'Initial prompt for Claude Code',
+        }),
+    };
+    async run() {
+        const { flags } = await this.parse(Open);
+        const jsonMode = shouldOutputJson(flags);
+        // Resolve the target directory
+        let workDir;
+        let label;
+        if (flags.agent) {
+            // Resolve agent workspace directory
+            let workspaceInfo;
+            try {
+                workspaceInfo = getWorkspaceInfo();
+            }
+            catch {
+                if (jsonMode) {
+                    outputErrorAsJson('NO_WORKSPACE', 'Not in an HQ or workspace. --agent requires an HQ.', createMetadata('open', flags));
+                }
+                this.error('Not in an HQ or workspace. --agent requires an HQ.');
+            }
+            const agent = workspaceInfo.agents.find(a => a.name === flags.agent);
+            if (!agent) {
+                const available = workspaceInfo.agents.map(a => a.name).join(', ');
+                const msg = `Agent "${flags.agent}" not found. Available: ${available || 'none'}`;
+                if (jsonMode) {
+                    outputErrorAsJson('AGENT_NOT_FOUND', msg, createMetadata('open', flags));
+                }
+                this.error(msg);
+            }
+            workDir = agent.type === 'ephemeral'
+                ? path.join(workspaceInfo.path, 'agents', workspaceInfo.ephemeralAgentsDir, flags.agent)
+                : path.join(workspaceInfo.path, 'agents', workspaceInfo.persistentAgentsDir, flags.agent);
+            label = flags.agent;
+        }
+        else if (flags.directory) {
+            workDir = path.resolve(flags.directory);
+            label = path.basename(workDir);
+        }
+        else {
+            workDir = process.cwd();
+            label = path.basename(workDir);
+        }
+        // Validate directory exists
+        if (!fs.existsSync(workDir)) {
+            if (jsonMode) {
+                outputErrorAsJson('DIRECTORY_NOT_FOUND', `Directory not found: ${workDir}`, createMetadata('open', flags));
+            }
+            this.error(`Directory not found: ${workDir}`);
+        }
+        // Build execution context
+        const sessionName = `open-${label}`;
+        const context = {
+            ticketId: 'OPEN',
+            ticketTitle: `Open: ${label}`,
+            agentName: label,
+            agentDir: workDir,
+            worktreePath: workDir,
+            branch: 'main',
+            actionName: 'open',
+            actionPrompt: flags.prompt,
+            modifiesCode: false,
+        };
+        // Try to find HQ for execution config, fall back to home dir config
+        const hqPath = findHQRoot(workDir);
+        if (hqPath) {
+            context.hqPath = hqPath;
+        }
+        // Load execution config
+        const executionConfig = { ...DEFAULT_EXECUTION_CONFIG };
+        executionConfig.outputMode = 'interactive';
+        executionConfig.sandboxed = false; // Default to dangerously-skip-permissions for quick open
+        // Try to load saved preferences from workspace DB or home dir
+        const dbPath = hqPath
+            ? path.join(hqPath, '.proletariat', 'workspace.db')
+            : path.join(process.env.HOME || '', '.proletariat', 'adhoc.db');
+        let db = null;
+        try {
+            if (fs.existsSync(dbPath)) {
+                db = new Database(dbPath);
+                const savedConfig = loadExecutionConfig(db);
+                executionConfig.terminal = savedConfig.terminal;
+                executionConfig.shell = savedConfig.shell;
+                executionConfig.tmux = savedConfig.tmux;
+            }
+        }
+        catch {
+            // Ignore config loading errors, use defaults
+        }
+        // If no terminal preference saved, prompt for it (first run only)
+        if (!jsonMode && db) {
+            if (!hasTerminalPreference(db)) {
+                executionConfig.terminal.app = await promptTerminalPreference(db);
+            }
+            else {
+                executionConfig.terminal.app = await getTerminalApp(db);
+            }
+            if (!hasShellPreference(db)) {
+                executionConfig.shell = await promptShellPreference(db);
+            }
+            else {
+                executionConfig.shell = await getShell(db);
+            }
+        }
+        if (db) {
+            db.close();
+        }
+        // Show what we're doing
+        if (!jsonMode) {
+            this.log('');
+            this.log(styles.muted(`   Opening Claude Code in new tab...`));
+            this.log(styles.muted(`   Directory: ${workDir}`));
+            if (flags.prompt) {
+                this.log(styles.muted(`   Prompt: "${flags.prompt.substring(0, 60)}${flags.prompt.length > 60 ? '...' : ''}"`));
+            }
+            this.log('');
+        }
+        // Launch Claude Code in a new terminal tab
+        const result = await runExecution('host', context, 'claude-code', executionConfig, {
+            displayMode: 'terminal',
+        });
+        if (result.success) {
+            if (jsonMode) {
+                outputSuccessAsJson({
+                    directory: workDir,
+                    sessionId: result.sessionId,
+                    sessionName,
+                }, createMetadata('open', flags));
+            }
+            this.log(styles.success(`✓ Claude Code opened in new tab`));
+            if (result.sessionId) {
+                this.log(styles.muted(`   Session: ${result.sessionId}`));
+            }
+        }
+        else {
+            if (jsonMode) {
+                outputErrorAsJson('EXECUTION_FAILED', `Failed to open: ${result.error}`, createMetadata('open', flags));
+            }
+            this.error(`Failed to open: ${result.error}`);
+        }
+    }
+}

package/dist/commands/diet.js

@@ -1,5 +1,6 @@
 import { Flags } from '@oclif/core';
 import { PMOCommand, pmoBaseFlags } from '../lib/pmo/base-command.js';
+import { shouldOutputJson } from '../lib/prompt-json.js';
 import { styles, divider } from '../lib/styles.js';
 import { loadDietConfig, saveDietConfig, parseDietString, formatDietConfig, } from '../lib/pmo/diet.js';
 export default class Diet extends PMOCommand {
@@ -23,6 +24,7 @@ export default class Diet extends PMOCommand {
     };
     async execute() {
         const { flags } = await this.parse(Diet);
+        const jsonMode = shouldOutputJson(flags);
         const projectId = await this.requireProject();
         const db = this.storage.getDatabase();
         // Handle --set
@@ -30,7 +32,12 @@ export default class Diet extends PMOCommand {
             try {
                 const newConfig = parseDietString(flags.set);
                 saveDietConfig(db, newConfig);
-                this.log(styles.success(`Diet updated: ${formatDietConfig(newConfig)}`));
+                if (jsonMode) {
+                    this.log(JSON.stringify({ type: 'success', result: { action: 'set', diet: newConfig } }, null, 2));
+                }
+                else {
+                    this.log(styles.success(`Diet updated: ${formatDietConfig(newConfig)}`));
+                }
             }
             catch (error) {
                 const message = error instanceof Error ? error.message : String(error);
@@ -42,12 +49,21 @@ export default class Diet extends PMOCommand {
         if (flags.reset) {
             const { DEFAULT_DIET_CONFIG } = await import('../lib/pmo/diet.js');
             saveDietConfig(db, DEFAULT_DIET_CONFIG);
-            this.log(styles.success(`Diet reset to defaults: ${formatDietConfig(DEFAULT_DIET_CONFIG)}`));
+            if (jsonMode) {
+                this.log(JSON.stringify({ type: 'success', result: { action: 'reset', diet: DEFAULT_DIET_CONFIG } }, null, 2));
+            }
+            else {
+                this.log(styles.success(`Diet reset to defaults: ${formatDietConfig(DEFAULT_DIET_CONFIG)}`));
+            }
             return;
         }
         // Show diet report
         const dietConfig = loadDietConfig(db);
         const report = await this.buildDietReport(projectId, dietConfig);
+        if (jsonMode) {
+            this.log(JSON.stringify({ type: 'success', result: { diet: dietConfig, report } }, null, 2));
+            return;
+        }
         this.displayDietReport(report, dietConfig);
     }
     /**

package/dist/commands/docker/logs.js

@@ -8,6 +8,7 @@ import { ExecutionStorage } from '../../lib/execution/storage.js';
 import { isDockerRunning } from '../../lib/execution/runners.js';
 import { resolveContainerId } from '../../lib/docker/resolve.js';
 import { machineOutputFlags } from '../../lib/pmo/index.js';
+import { shouldOutputJson } from '../../lib/prompt-json.js';
 export default class DockerLogs extends Command {
     static description = 'View logs from a container (by execution ID, agent name, or container ID)';
     static examples = [
@@ -42,6 +43,7 @@ export default class DockerLogs extends Command {
     };
     async run() {
         const { args, flags } = await this.parse(DockerLogs);
+        const jsonMode = shouldOutputJson(flags);
         if (!isDockerRunning()) {
             this.error('Docker is not running. Start Docker Desktop or the Docker daemon first.');
         }
@@ -81,9 +83,11 @@ export default class DockerLogs extends Command {
                 dockerArgs.push('--timestamps');
             }
             dockerArgs.push(result.containerId);
-            this.log(`\n${styles.header(`Logs for ${result.displayName}`)}`);
-            this.log(styles.muted(`Container: ${result.containerId}`));
-            this.log('─'.repeat(60) + '\n');
+            if (!jsonMode) {
+                this.log(`\n${styles.header(`Logs for ${result.displayName}`)}`);
+                this.log(styles.muted(`Container: ${result.containerId}`));
+                this.log('─'.repeat(60) + '\n');
+            }
             db.close();
             if (flags.follow) {
                 // Stream logs

package/dist/commands/docker/shell.js

@@ -8,6 +8,7 @@ import { ExecutionStorage } from '../../lib/execution/storage.js';
 import { isDockerRunning } from '../../lib/execution/runners.js';
 import { resolveContainerId, isContainerRunning } from '../../lib/docker/resolve.js';
 import { machineOutputFlags } from '../../lib/pmo/index.js';
+import { shouldOutputJson } from '../../lib/prompt-json.js';
 export default class DockerShell extends Command {
     static description = 'Open a shell in a running container (by execution ID, agent name, or container ID)';
     static examples = [
@@ -39,6 +40,11 @@ export default class DockerShell extends Command {
     };
     async run() {
         const { args, flags } = await this.parse(DockerShell);
+        if (shouldOutputJson(flags)) {
+            this.log(JSON.stringify({ type: 'error', error: { code: 'REQUIRES_TTY', message: 'docker shell requires an interactive terminal' } }));
+            this.exit(1);
+            return;
+        }
         if (!isDockerRunning()) {
             this.error('Docker is not running. Start Docker Desktop or the Docker daemon first.');
         }

package/dist/commands/docker/start.js

@@ -8,6 +8,7 @@ import { ExecutionStorage } from '../../lib/execution/storage.js';
 import { isDockerRunning } from '../../lib/execution/runners.js';
 import { resolveContainerId, isContainerRunning, sanitizeContainerId } from '../../lib/docker/resolve.js';
 import { machineOutputFlags } from '../../lib/pmo/index.js';
+import { shouldOutputJson } from '../../lib/prompt-json.js';
 export default class DockerStart extends Command {
     static description = 'Start a stopped container (by execution ID, agent name, or container ID)';
     static examples = [
@@ -31,6 +32,7 @@ export default class DockerStart extends Command {
     };
     async run() {
         const { args, flags } = await this.parse(DockerStart);
+        const jsonMode = shouldOutputJson(flags);
         if (!isDockerRunning()) {
             this.error('Docker is not running. Start Docker Desktop or the Docker daemon first.');
         }
@@ -60,15 +62,24 @@ export default class DockerStart extends Command {
             }
             // Check if container is already running
             if (isContainerRunning(result.containerId)) {
+                if (jsonMode) {
+                    this.log(JSON.stringify({ type: 'success', result: { containerId: result.containerId, displayName: result.displayName, executionId: result.executionId, status: 'already_running' } }, null, 2));
+                    db.close();
+                    return;
+                }
                 this.log(`\n${styles.warning(`Container ${result.displayName} is already running`)}\n`);
                 db.close();
                 return;
             }
-            this.log(`\n${styles.header('Start Container')}`);
-            this.log(styles.muted(`Target: ${result.displayName}`));
-            this.log(styles.muted(`Container: ${result.containerId.substring(0, 12)}\n`));
+            if (!jsonMode) {
+                this.log(`\n${styles.header('Start Container')}`);
+                this.log(styles.muted(`Target: ${result.displayName}`));
+                this.log(styles.muted(`Container: ${result.containerId.substring(0, 12)}\n`));
+            }
             // Start container
-            this.log(styles.muted('Starting container...'));
+            if (!jsonMode) {
+                this.log(styles.muted('Starting container...'));
+            }
             try {
                 const attachFlag = flags.attach ? '-a' : '';
                 const safeId = sanitizeContainerId(result.containerId);
@@ -79,6 +90,11 @@ export default class DockerStart extends Command {
                 if (result.executionId) {
                     executionStorage.updateStatus(result.executionId, 'running');
                 }
+                if (jsonMode) {
+                    this.log(JSON.stringify({ type: 'success', result: { containerId: result.containerId, displayName: result.displayName, executionId: result.executionId, status: 'started' } }, null, 2));
+                    db.close();
+                    return;
+                }
                 this.log(`${styles.success('Container started successfully')}\n`);
             }
             catch (error) {

package/dist/commands/docker/sync.d.ts

@@ -2,6 +2,10 @@ import { Command } from '@oclif/core';
 export default class DockerSync extends Command {
     static description: string;
     static examples: string[];
+    static flags: {
+        json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        machine: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+    };
     run(): Promise<void>;
     /**
      * Get raw container info from Docker

package/dist/commands/docker/sync.js

@@ -7,12 +7,19 @@ import { getWorkspaceInfo } from '../../lib/agents/commands.js';
 import { ContainerStorage } from '../../lib/execution/storage.js';
 import { isDockerRunning } from '../../lib/execution/runners.js';
 import { visualPadEnd } from '../../lib/string-utils.js';
+import { shouldOutputJson } from '../../lib/prompt-json.js';
+import { machineOutputFlags } from '../../lib/pmo/index.js';
 export default class DockerSync extends Command {
     static description = 'Sync container status from Docker into the database';
     static examples = [
         '<%= config.bin %> <%= command.id %>',
     ];
+    static flags = {
+        ...machineOutputFlags,
+    };
     async run() {
+        const { flags } = await this.parse(DockerSync);
+        const jsonMode = shouldOutputJson(flags);
         if (!isDockerRunning()) {
             this.error('Docker is not running. Start Docker Desktop or the Docker daemon first.');
         }
@@ -37,8 +44,10 @@ export default class DockerSync extends Command {
             const containerStorage = new ContainerStorage(db);
             // Get devcontainers from Docker
             const dockerContainers = this.getDockerContainers();
-            this.log(`\n${styles.header('Syncing Containers')}`);
-            this.log(styles.muted(`Found ${dockerContainers.length} devcontainers in Docker\n`));
+            if (!jsonMode) {
+                this.log(`\n${styles.header('Syncing Containers')}`);
+                this.log(styles.muted(`Found ${dockerContainers.length} devcontainers in Docker\n`));
+            }
             // Add agent name from image (only used for new containers)
             const containersWithAgent = dockerContainers.map(c => ({
                 ...c,
@@ -46,6 +55,25 @@ export default class DockerSync extends Command {
             }));
             // Sync with database
             const result = containerStorage.syncFromDocker(containersWithAgent);
+            if (jsonMode) {
+                const containers = containerStorage.listContainers({ limit: 20 });
+                this.log(JSON.stringify({
+                    type: 'success',
+                    result: {
+                        added: result.added,
+                        updated: result.updated,
+                        removed: result.removed,
+                        containers: containers.map(c => ({
+                            id: c.id,
+                            agentName: c.agentName,
+                            status: c.status,
+                            dockerId: c.dockerId,
+                        })),
+                    },
+                }, null, 2));
+                db.close();
+                return;
+            }
             this.log(styles.success('✓ Sync complete'));
             this.log(styles.muted(`  Added: ${result.added}`));
             this.log(styles.muted(`  Updated: ${result.updated}`));

package/dist/commands/epic/show.d.ts

@@ -0,0 +1,13 @@
+import EpicView from './view.js';
+export default class EpicShow extends EpicView {
+    static description: string;
+    static hidden: boolean;
+    static args: {
+        id: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
+    };
+    static flags: {
+        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>;
+    };
+}

package/dist/commands/epic/show.js

@@ -0,0 +1,16 @@
+import { Args } from '@oclif/core';
+import { pmoBaseFlags } from '../../lib/pmo/index.js';
+import EpicView from './view.js';
+export default class EpicShow extends EpicView {
+    static description = 'View epic details and linked tickets (alias for epic view)';
+    static hidden = true;
+    static args = {
+        id: Args.string({
+            description: 'Epic ID',
+            required: false,
+        }),
+    };
+    static flags = {
+        ...pmoBaseFlags,
+    };
+}

package/dist/commands/epic/view.js

@@ -76,6 +76,33 @@ export default class EpicView extends PMOCommand {
             specTitle = spec?.title;
         }
         const projectName = await this.getProjectName(projectId);
+        // JSON output mode
+        if (jsonMode) {
+            this.log(JSON.stringify({
+                success: true,
+                epic: {
+                    id: epic.id,
+                    title: epic.title,
+                    status: epic.status,
+                    description: epic.description,
+                    projectId,
+                    specId: epic.specId,
+                    createdAt: epic.createdAt.toISOString(),
+                    updatedAt: epic.updatedAt?.toISOString(),
+                    ticketCount: tickets.length,
+                    doneCount: doneTickets,
+                    progress: percent,
+                    tickets: tickets.map((t) => ({
+                        id: t.id,
+                        title: t.title,
+                        statusName: t.statusName,
+                        statusCategory: t.statusCategory,
+                        priority: t.priority,
+                    })),
+                },
+            }, null, 2));
+            return;
+        }
         this.log(`\n🎯 Epic: ${styles.emphasis(epic.id)} - ${epic.title}`);
         this.log('═'.repeat(55));
         this.log(`ID: ${epic.id}`);

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

@@ -13,10 +13,6 @@ export default class ExecutionConfig extends PMOCommand {
     protected getPMOOptions(): {
         promptIfMultiple: boolean;
     };
-    /**
-     * Prompt wrapper - drop-in replacement for inquirer.prompt
-     */
-    private promptUser;
     execute(): Promise<void>;
     /**
      * Handle a specific setting's sub-prompt

package/dist/commands/execution/config.js

@@ -6,7 +6,7 @@ import { PMOCommand, pmoBaseFlags } from '../../lib/pmo/index.js';
 import { styles } from '../../lib/styles.js';
 import { getWorkspaceInfo } from '../../lib/agents/commands.js';
 import { loadExecutionConfig, saveTerminalApp, saveTerminalOpenInBackground, saveTmuxControlMode, saveShell, saveExecutionSetting, } from '../../lib/execution/config.js';
-import { shouldOutputJson, isAgentMode, outputPromptAsJson, outputSuccessAsJson, outputErrorAsJson, createMetadata, normalizeChoices, } from '../../lib/prompt-json.js';
+import { shouldOutputJson, outputSuccessAsJson, outputErrorAsJson, createMetadata, } from '../../lib/prompt-json.js';
 export default class ExecutionConfig extends PMOCommand {
     static description = 'View and update execution preferences';
     static examples = [
@@ -37,28 +37,6 @@ export default class ExecutionConfig extends PMOCommand {
     getPMOOptions() {
         return { promptIfMultiple: false };
     }
-    /**
-     * Prompt wrapper - drop-in replacement for inquirer.prompt
-     */
-    async promptUser(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 execute() {
         const { flags } = await this.parse(ExecutionConfig);
         const jsonMode = shouldOutputJson(flags);
@@ -101,7 +79,7 @@ export default class ExecutionConfig extends PMOCommand {
                 return;
             }
             // Handle --list or --json flag without --setting (just show config)
-            if ((flags.list || (flags.json || flags.machine)) && !flags.setting) {
+            if ((flags.list || shouldOutputJson(flags)) && !flags.setting) {
                 if (jsonMode) {
                     outputSuccessAsJson({
                         terminal: {
@@ -161,7 +139,7 @@ export default class ExecutionConfig extends PMOCommand {
                 { name: `Shell: ${config.shell}`, value: 'shell', command: 'prlt execution config --setting shell --json' },
                 { name: `Tmux Control Mode: ${config.tmux.controlMode}`, value: 'tmux.controlMode', command: 'prlt execution config --setting tmux.controlMode --json' },
             ];
-            const { setting } = await this.promptUser([
+            const { setting } = await this.prompt([
                 {
                     type: 'list',
                     name: 'setting',
@@ -205,7 +183,7 @@ export default class ExecutionConfig extends PMOCommand {
                     { name: 'docker - Run in a Docker container', value: 'docker', command: 'prlt execution config --set "defaultEnvironment docker" --json' },
                     { name: 'vm - Run on a remote VM', value: 'vm', command: 'prlt execution config --set "defaultEnvironment vm" --json' },
                 ];
-                const { newEnv } = await this.promptUser([
+                const { newEnv } = await this.prompt([
                     {
                         type: 'list',
                         name: 'newEnv',
@@ -223,7 +201,7 @@ export default class ExecutionConfig extends PMOCommand {
                     { name: 'interactive - Watch Claude work in real-time (streaming UI)', value: 'interactive', command: 'prlt execution config --set "outputMode interactive" --json' },
                     { name: 'print - Show final result only (better for logs)', value: 'print', command: 'prlt execution config --set "outputMode print" --json' },
                 ];
-                const { newOutput } = await this.promptUser([
+                const { newOutput } = await this.prompt([
                     {
                         type: 'list',
                         name: 'newOutput',
@@ -241,7 +219,7 @@ export default class ExecutionConfig extends PMOCommand {
                     { name: 'safe - Requires approval for dangerous operations (recommended)', value: 'true', command: 'prlt execution config --set "sandboxed true" --json' },
                     { name: 'danger - Skip permission checks (--dangerously-skip-permissions)', value: 'false', command: 'prlt execution config --set "sandboxed false" --json' },
                 ];
-                const { newPerm } = await this.promptUser([
+                const { newPerm } = await this.prompt([
                     {
                         type: 'list',
                         name: 'newPerm',
@@ -265,7 +243,7 @@ export default class ExecutionConfig extends PMOCommand {
                     { name: 'Warp', value: 'Warp', command: 'prlt execution config --set "terminal.app Warp" --json' },
                     { name: 'tmux', value: 'tmux', command: 'prlt execution config --set "terminal.app tmux" --json' },
                 ];
-                const { newApp } = await this.promptUser([
+                const { newApp } = await this.prompt([
                     {
                         type: 'list',
                         name: 'newApp',
@@ -283,7 +261,7 @@ export default class ExecutionConfig extends PMOCommand {
                     { name: 'Yes - Open tabs in background (don\'t steal focus)', value: 'true', command: 'prlt execution config --set "terminal.openInBackground true" --json' },
                     { name: 'No - Bring terminal to foreground when opening tabs', value: 'false', command: 'prlt execution config --set "terminal.openInBackground false" --json' },
                 ];
-                const { openInBg } = await this.promptUser([
+                const { openInBg } = await this.prompt([
                     {
                         type: 'list',
                         name: 'openInBg',
@@ -302,7 +280,7 @@ export default class ExecutionConfig extends PMOCommand {
                     { name: 'bash', value: 'bash', command: 'prlt execution config --set "shell bash" --json' },
                     { name: 'fish', value: 'fish', command: 'prlt execution config --set "shell fish" --json' },
                 ];
-                const { newShell } = await this.promptUser([
+                const { newShell } = await this.prompt([
                     {
                         type: 'list',
                         name: 'newShell',
@@ -320,7 +298,7 @@ export default class ExecutionConfig extends PMOCommand {
                     { name: 'Yes - Use tmux -CC for native iTerm integration', value: 'true', command: 'prlt execution config --set "tmux.controlMode true" --json' },
                     { name: 'No - Standard tmux interface', value: 'false', command: 'prlt execution config --set "tmux.controlMode false" --json' },
                 ];
-                const { controlMode } = await this.promptUser([
+                const { controlMode } = await this.prompt([
                     {
                         type: 'list',
                         name: 'controlMode',

package/dist/commands/execution/index.js

@@ -1,5 +1,6 @@
 import inquirer from 'inquirer';
 import { PMOCommand, pmoBaseFlags } from '../../lib/pmo/index.js';
+import { shouldOutputJson } from '../../lib/prompt-json.js';
 export default class Execution extends PMOCommand {
     static description = 'Single execution operations (view, logs, stop)';
     static examples = [
@@ -16,7 +17,7 @@ export default class Execution extends PMOCommand {
     }
     async execute() {
         const { flags } = await this.parse(Execution);
-        const jsonModeConfig = (flags.json || flags.machine) ? { flags, commandName: 'execution' } : null;
+        const jsonModeConfig = shouldOutputJson(flags) ? { flags, commandName: 'execution' } : null;
         const { action } = await this.prompt([
             {
                 type: 'list',

package/dist/commands/execution/logs.js

@@ -66,7 +66,7 @@ export default class ExecutionLogs extends PMOCommand {
                     }
                     this.error('No executions found.');
                 }
-                const jsonModeConfig = (flags.json || flags.machine) ? { flags, commandName: 'execution logs' } : null;
+                const jsonModeConfig = shouldOutputJson(flags) ? { flags, commandName: 'execution logs' } : null;
                 const { selectedId } = await this.prompt([
                     {
                         type: 'list',

package/dist/commands/execution/stop.js

@@ -7,6 +7,7 @@ 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 } from '../../lib/prompt-json.js';
 export default class ExecutionStop extends PMOCommand {
     static description = 'Stop running execution(s)';
     static examples = [
@@ -133,7 +134,7 @@ export default class ExecutionStop extends PMOCommand {
                 this.log(styles.muted('\nNo running executions found.\n'));
                 return;
             }
-            const jsonModeConfig = (flags.json || flags.machine) ? { flags: flags, commandName: 'execution stop' } : null;
+            const jsonModeConfig = shouldOutputJson(flags) ? { flags: flags, commandName: 'execution stop' } : null;
             const { selectedId } = await this.prompt([
                 {
                     type: 'list',