@proletariat/cli 0.3.25 → 0.3.27

package/dist/commands/claude.js

@@ -1,13 +1,13 @@
-import { Command, Flags } from '@oclif/core';
+import { Flags } from '@oclif/core';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import * as os from 'node:os';
 import { execSync } from 'node:child_process';
-import inquirer from 'inquirer';
+import { PromptCommand } from '../lib/prompt-command.js';
 import Database from 'better-sqlite3';
 import { findHQRoot } from '../lib/workspace.js';
 import { getWorkspaceInfo, createEphemeralAgent, } from '../lib/agents/commands.js';
-import { shouldOutputJson, isAgentMode, outputPromptAsJson, outputErrorAsJson, createMetadata, normalizeChoices, } from '../lib/prompt-json.js';
+import { shouldOutputJson, outputErrorAsJson, createMetadata, } 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';
@@ -40,7 +40,7 @@ function isGitRepo(dir) {
         return false;
     }
 }
-export default class Claude extends Command {
+export default class Claude extends PromptCommand {
     static description = 'Quick launch Claude Code for ad-hoc sessions (works anywhere)';
     static examples = [
         '<%= config.bin %> <%= command.id %>',
@@ -90,28 +90,6 @@ 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);
@@ -155,6 +133,8 @@ export default class Claude extends Command {
                     validate: (input) => input.trim() ? true : 'Session name required',
                 },
             ], jsonModeConfig);
+            if (jsonMode)
+                return;
             slug = inputSlug.trim();
         }
         // Determine if devcontainer is available
@@ -300,6 +280,8 @@ export default class Claude extends Command {
                     default: 'terminal',
                 },
             ], jsonModeConfig);
+            if (jsonMode)
+                return;
             displayMode = selectedDisplay;
         }
         // Prompt for permission mode
@@ -320,6 +302,8 @@ export default class Claude extends Command {
                     default: 'danger',
                 },
             ], jsonModeConfig);
+            if (jsonMode)
+                return;
             sandboxed = permissionMode === 'safe';
         }
         // Warn about uncommitted changes in danger mode
@@ -528,6 +512,10 @@ export default class Claude extends Command {
                             })),
                         },
                     ], jsonModeConfig);
+                    if (jsonMode) {
+                        db.close();
+                        return;
+                    }
                     projectId = selectedProject;
                 }
             }
@@ -543,6 +531,10 @@ export default class Claude extends Command {
                         validate: (input) => input.trim() ? true : 'Title required',
                     },
                 ], jsonModeConfig);
+                if (jsonMode) {
+                    db.close();
+                    return;
+                }
                 ticketTitle = inputTitle.trim();
             }
             // Get optional description
@@ -703,6 +695,10 @@ export default class Claude extends Command {
                         default: 'terminal',
                     },
                 ], jsonModeConfig);
+                if (jsonMode) {
+                    db.close();
+                    return;
+                }
                 displayMode = selectedDisplay;
             }
             // Prompt for permission mode
@@ -724,6 +720,10 @@ export default class Claude extends Command {
                         default: 'danger',
                     },
                 ], jsonModeConfig);
+                if (jsonMode) {
+                    db.close();
+                    return;
+                }
                 sandboxed = permissionMode === 'safe';
             }
             // Warn about uncommitted changes in danger mode

package/dist/commands/commit.d.ts

@@ -1,4 +1,4 @@
-import { Command } from '@oclif/core';
+import { PromptCommand } from '../lib/prompt-command.js';
 /**
  * Format context passed to format functions.
  */
@@ -50,7 +50,7 @@ export declare const COMMIT_FORMATS: {
 };
 export type CommitFormat = keyof typeof COMMIT_FORMATS;
 export declare const DEFAULT_COMMIT_FORMAT: CommitFormat;
-export default class Commit extends Command {
+export default class Commit extends PromptCommand {
     static description: string;
     static examples: string[];
     static args: {
@@ -66,12 +66,6 @@ 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 {};

package/dist/commands/commit.js

@@ -1,9 +1,9 @@
-import { Command, Args, Flags } from '@oclif/core';
+import { Args, Flags } from '@oclif/core';
 import { execSync } from 'node:child_process';
-import inquirer from 'inquirer';
+import { PromptCommand } from '../lib/prompt-command.js';
 import { validateBranchName } from '../lib/branch/index.js';
 import { styles } from '../lib/styles.js';
-import { shouldOutputJson, isAgentMode, outputPromptAsJson, outputErrorAsJson, createMetadata, normalizeChoices, } from '../lib/prompt-json.js';
+import { shouldOutputJson, outputErrorAsJson, createMetadata, } from '../lib/prompt-json.js';
 /**
  * Commit message format presets.
  */
@@ -140,7 +140,7 @@ function branchTypeToCommitType(branchType) {
     };
     return mapping[branchType] || branchType;
 }
-export default class Commit extends Command {
+export default class Commit extends PromptCommand {
     static description = 'Create a commit with ticket ID from branch name';
     static examples = [
         '<%= config.bin %> <%= command.id %>                               # interactive mode',
@@ -197,28 +197,6 @@ export default class Commit extends Command {
             default: false,
         }),
     };
-    /**
-     * 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 { args, flags } = await this.parse(Commit);
         // Check if JSON output mode is active

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

@@ -1,5 +1,5 @@
-import { Command } from '@oclif/core';
-export default class Config extends Command {
+import { PromptCommand } from '../../lib/prompt-command.js';
+export default class Config extends PromptCommand {
     static description: string;
     static examples: string[];
     static flags: {
@@ -8,14 +8,6 @@ export default class Config extends Command {
         list: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         setting: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
-    /**
-     * Prompt wrapper - drop-in replacement for inquirer.prompt
-     *
-     * Works in BOTH modes:
-     * - Interactive mode: calls inquirer.prompt normally (human sees menu)
-     * - JSON/Agent mode: outputs prompt as structured JSON and exits
-     */
-    private promptUser;
     run(): Promise<void>;
     /**
      * Handle a specific setting's sub-prompt

package/dist/commands/config/index.js

@@ -2,12 +2,12 @@ import { Flags } from '@oclif/core';
 import * as path from 'node:path';
 import Database from 'better-sqlite3';
 import inquirer from 'inquirer';
-import { Command } from '@oclif/core';
+import { PromptCommand } from '../../lib/prompt-command.js';
 import { styles } from '../../lib/styles.js';
 import { getWorkspaceInfo } from '../../lib/agents/commands.js';
 import { loadExecutionConfig, saveTerminalApp, saveTerminalOpenInBackground, saveTmuxControlMode, saveShell, } from '../../lib/execution/config.js';
-import { shouldOutputJson, isAgentMode, isNonTTY, outputPromptAsJson, outputSuccessAsJson, outputErrorAsJson, createMetadata, normalizeChoices, } from '../../lib/prompt-json.js';
-export default class Config extends Command {
+import { shouldOutputJson, isNonTTY, outputSuccessAsJson, outputErrorAsJson, createMetadata, } from '../../lib/prompt-json.js';
+export default class Config extends PromptCommand {
     static description = 'View and update workspace configuration';
     static examples = [
         '<%= config.bin %> <%= command.id %>                    # Interactive menu',
@@ -37,32 +37,6 @@ export default class Config extends Command {
             description: 'Navigate to a specific setting prompt (for agent navigation)',
         }),
     };
-    /**
-     * Prompt wrapper - drop-in replacement for inquirer.prompt
-     *
-     * Works in BOTH modes:
-     * - Interactive mode: calls inquirer.prompt normally (human sees menu)
-     * - JSON/Agent mode: outputs prompt as structured JSON and exits
-     */
-    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 run() {
         const { flags } = await this.parse(Config);
         const jsonMode = shouldOutputJson(flags);
@@ -163,7 +137,7 @@ export default class Config extends Command {
                 { name: `Shell: ${config.shell}`, value: 'shell', command: 'prlt config --setting shell --json' },
                 { name: `Tmux Control Mode (iTerm -CC): ${config.tmux.controlMode}`, value: 'tmux.controlMode', command: 'prlt config --setting tmux.controlMode --json' },
             ];
-            const { setting } = await this.promptUser([
+            const { setting } = await this.prompt([
                 {
                     type: 'list',
                     name: 'setting',
@@ -209,7 +183,7 @@ export default class Config extends Command {
                     { name: 'Warp', value: 'Warp', command: 'prlt config --set "terminal.app Warp" --json' },
                     { name: 'tmux', value: 'tmux', command: 'prlt config --set "terminal.app tmux" --json' },
                 ];
-                const { newApp } = await this.promptUser([
+                const { newApp } = await this.prompt([
                     {
                         type: 'list',
                         name: 'newApp',
@@ -227,7 +201,7 @@ export default class Config extends Command {
                     { name: 'Yes - Open tabs in background (don\'t steal focus)', value: 'true', command: 'prlt config --set "terminal.openInBackground true" --json' },
                     { name: 'No - Bring terminal to foreground when opening tabs', value: 'false', command: 'prlt config --set "terminal.openInBackground false" --json' },
                 ];
-                const { openInBg } = await this.promptUser([
+                const { openInBg } = await this.prompt([
                     {
                         type: 'list',
                         name: 'openInBg',
@@ -246,7 +220,7 @@ export default class Config extends Command {
                     { name: 'bash', value: 'bash', command: 'prlt config --set "shell bash" --json' },
                     { name: 'fish', value: 'fish', command: 'prlt config --set "shell fish" --json' },
                 ];
-                const { newShell } = await this.promptUser([
+                const { newShell } = await this.prompt([
                     {
                         type: 'list',
                         name: 'newShell',
@@ -264,7 +238,7 @@ export default class Config extends Command {
                     { name: 'Yes - Use tmux -CC for native iTerm integration', value: 'true', command: 'prlt config --set "tmux.controlMode true" --json' },
                     { name: 'No - Standard tmux interface', value: 'false', command: 'prlt config --set "tmux.controlMode false" --json' },
                 ];
-                const { controlMode } = await this.promptUser([
+                const { controlMode } = await this.prompt([
                     {
                         type: 'list',
                         name: 'controlMode',

package/dist/commands/docker/clean.js

@@ -9,6 +9,7 @@ import { isDockerRunning } from '../../lib/execution/runners.js';
 import { sanitizeContainerId } from '../../lib/docker/resolve.js';
 import { FlagResolver, shouldOutputJson } from '../../lib/flags/index.js';
 import { machineOutputFlags } from '../../lib/pmo/base-command.js';
+import { visualPadEnd } from '../../lib/string-utils.js';
 export default class DockerClean extends Command {
     static description = 'Remove orphaned containers (containers without running agents)';
     static examples = [
@@ -72,15 +73,15 @@ export default class DockerClean extends Command {
             // Display orphaned containers
             this.log(`\n${styles.header('Orphaned Containers')}`);
             this.log('='.repeat(80));
-            this.log(styles.muted(padEnd('Container ID', 15) +
-                padEnd('Name', 30) +
-                padEnd('Status', 15) +
+            this.log(styles.muted(visualPadEnd('Container ID', 15) +
+                visualPadEnd('Name', 30) +
+                visualPadEnd('Status', 15) +
                 'Reason'));
             this.log('-'.repeat(80));
             for (const container of orphanedContainers) {
-                this.log(padEnd(container.id, 15) +
-                    padEnd(truncate(container.name, 28), 30) +
-                    padEnd(container.status, 15) +
+                this.log(visualPadEnd(container.id, 15) +
+                    visualPadEnd(truncate(container.name, 28), 30) +
+                    visualPadEnd(container.status, 15) +
                     styles.muted(container.reason));
             }
             if (flags['dry-run']) {
@@ -205,9 +206,6 @@ export default class DockerClean extends Command {
         }
     }
 }
-function padEnd(str, length) {
-    return str.padEnd(length);
-}
 function truncate(str, maxLength) {
     if (str.length <= maxLength)
         return str;

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

@@ -1,5 +1,5 @@
-import { Command } from '@oclif/core';
-export default class Docker extends Command {
+import { PromptCommand } from '../../lib/prompt-command.js';
+export default class Docker extends PromptCommand {
     static description: string;
     static examples: string[];
     static flags: {

package/dist/commands/docker/index.js

@@ -1,5 +1,5 @@
-import { Command } from '@oclif/core';
 import inquirer from 'inquirer';
+import { PromptCommand } from '../../lib/prompt-command.js';
 import { execSync } from 'node:child_process';
 import * as path from 'node:path';
 import Database from 'better-sqlite3';
@@ -9,7 +9,8 @@ import { ExecutionStorage, ContainerStorage } from '../../lib/execution/storage.
 import { isDockerRunning } from '../../lib/execution/runners.js';
 import { FlagResolver, shouldOutputJson } from '../../lib/flags/index.js';
 import { machineOutputFlags } from '../../lib/pmo/base-command.js';
-export default class Docker extends Command {
+import { visualPadEnd } from '../../lib/string-utils.js';
+export default class Docker extends PromptCommand {
     static description = 'Manage Docker containers used by agents';
     static examples = [
         '<%= config.bin %> <%= command.id %>',
@@ -127,7 +128,7 @@ export default class Docker extends Command {
             // Build choices
             const choices = [];
             // Column header
-            const header = styles.muted(`  ${'ID'.padEnd(14)} ${'Agent'.padEnd(15)} Status`);
+            const header = styles.muted(`  ${visualPadEnd('ID', 14)} ${visualPadEnd('Agent', 15)} Status`);
             // Add active executions first (with container info from DB)
             const activeExecutions = trackedExecutions.filter(e => e.status === 'running' || e.status === 'starting');
             if (activeExecutions.length > 0) {
@@ -143,7 +144,7 @@ export default class Docker extends Command {
                     const statusIcon = isRunning ? styles.success('●') : styles.warning('◐');
                     // Use agent name from execution record (DB source of truth)
                     choices.push({
-                        name: `${statusIcon} ${exec.id.padEnd(14)} ${exec.agentName.padEnd(15)} ${styles.success(exec.status)}`,
+                        name: `${statusIcon} ${visualPadEnd(exec.id, 14)} ${visualPadEnd(exec.agentName, 15)} ${styles.success(exec.status)}`,
                         value: exec.id,
                     });
                     if (exec.containerId) {
@@ -167,7 +168,7 @@ export default class Docker extends Command {
                     const statusText = isRunning ? styles.success('running') : styles.muted(container.status);
                     // Agent name from DB (source of truth)
                     choices.push({
-                        name: `${statusIcon} ${container.dockerId.substring(0, 12).padEnd(14)} ${container.agentName.padEnd(15)} ${statusText}`,
+                        name: `${statusIcon} ${visualPadEnd(container.dockerId.substring(0, 12), 14)} ${visualPadEnd(container.agentName, 15)} ${statusText}`,
                         value: container.dockerId,
                     });
                     addedDockerIds.add(container.dockerId.substring(0, 12));
@@ -185,7 +186,7 @@ export default class Docker extends Command {
                     // Parse agent from image only for untracked containers
                     const agentName = this.extractAgentFromImage(container.image);
                     choices.push({
-                        name: `${statusIcon} ${container.id.substring(0, 12).padEnd(14)} ${agentName.padEnd(15)} ${statusText}`,
+                        name: `${statusIcon} ${visualPadEnd(container.id.substring(0, 12), 14)} ${visualPadEnd(agentName, 15)} ${statusText}`,
                         value: container.id,
                     });
                 }
@@ -198,17 +199,17 @@ export default class Docker extends Command {
                 db.close();
             if (choices.length <= 2) {
                 // Only manual option, just ask for input
-                const { target } = await inquirer.prompt([
+                const { target } = await this.prompt([
                     {
                         type: 'input',
                         name: 'target',
                         message: 'No containers found. Enter container ID:',
                         validate: (input) => input.trim().length > 0 || 'Target is required',
                     },
-                ]);
+                ], null);
                 return target.trim();
             }
-            const { target } = await inquirer.prompt([
+            const { target } = await this.prompt([
                 {
                     type: 'list',
                     name: 'target',
@@ -216,19 +217,19 @@ export default class Docker extends Command {
                     choices,
                     pageSize: 15,
                 },
-            ]);
+            ], null);
             if (target === '__cancel__') {
                 return null;
             }
             if (target === '__manual__') {
-                const { manualTarget } = await inquirer.prompt([
+                const { manualTarget } = await this.prompt([
                     {
                         type: 'input',
                         name: 'manualTarget',
                         message: 'Enter execution ID (WORK-XXX), agent name, or container ID:',
                         validate: (input) => input.trim().length > 0 || 'Target is required',
                     },
-                ]);
+                ], null);
                 return manualTarget.trim();
             }
             return target;

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

@@ -5,6 +5,7 @@ export default class DockerList extends Command {
     static flags: {
         all: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         running: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
     private getTrackedContainers;

package/dist/commands/docker/list.js

@@ -6,6 +6,9 @@ import { styles } from '../../lib/styles.js';
 import { getWorkspaceInfo } from '../../lib/agents/commands.js';
 import { ExecutionStorage, ContainerStorage } from '../../lib/execution/storage.js';
 import { isDockerRunning } from '../../lib/execution/runners.js';
+import { shouldOutputJson } from '../../lib/prompt-json.js';
+import { machineOutputFlags } from '../../lib/pmo/index.js';
+import { visualPadEnd } from '../../lib/string-utils.js';
 export default class DockerList extends Command {
     static description = 'Show Docker containers from agent_work table with status';
     static examples = [
@@ -14,6 +17,7 @@ export default class DockerList extends Command {
         '<%= config.bin %> <%= command.id %> --running',
     ];
     static flags = {
+        ...machineOutputFlags,
         all: Flags.boolean({
             char: 'a',
             description: 'Show all containers (including non-devcontainer)',
@@ -27,8 +31,13 @@ export default class DockerList extends Command {
     };
     async run() {
         const { flags } = await this.parse(DockerList);
+        const jsonMode = shouldOutputJson(flags);
         // Check Docker status first
         if (!isDockerRunning()) {
+            if (jsonMode) {
+                this.log(JSON.stringify({ error: 'Docker is not running' }, null, 2));
+                return;
+            }
             this.log(`\n${styles.error('Docker is not running')}`);
             this.log(`${styles.muted('Start Docker Desktop or the Docker daemon first.')}\n`);
             return;
@@ -59,16 +68,24 @@ export default class DockerList extends Command {
             const dbContainers = containerStorage.listContainers({ limit: 50 });
             // Get running docker containers
             const runningContainers = this.getDockerContainers(workspaceInfo.agentsPath, flags.all);
+            if (jsonMode) {
+                this.log(JSON.stringify({
+                    executions: trackedExecutions,
+                    containers: runningContainers,
+                }, null, 2));
+                db.close();
+                return;
+            }
             this.log(`\n${styles.header('Docker Containers')}`);
             this.log('='.repeat(100));
             // Display active executions from database
             const activeExecutions = trackedExecutions.filter(e => e.status === 'running' || e.status === 'starting');
             if (activeExecutions.length > 0) {
                 this.log(styles.subheader('\nActive Executions:'));
-                this.log(styles.muted(padEnd('ID', 15) +
-                    padEnd('Agent', 15) +
-                    padEnd('Ticket', 12) +
-                    padEnd('Status', 12) +
+                this.log(styles.muted(visualPadEnd('ID', 15) +
+                    visualPadEnd('Agent', 15) +
+                    visualPadEnd('Ticket', 12) +
+                    visualPadEnd('Status', 12) +
                     'Container'));
                 this.log('-'.repeat(80));
                 for (const exec of activeExecutions) {
@@ -80,10 +97,10 @@ export default class DockerList extends Command {
                         const isRunning = runningContainers.some(c => c.id.startsWith(exec.containerId.substring(0, 12)));
                         containerStatus = isRunning ? styles.success(' (up)') : styles.warning(' (down)');
                     }
-                    this.log(padEnd(exec.id, 15) +
-                        padEnd(exec.agentName, 15) +
-                        padEnd(exec.ticketId, 12) +
-                        statusColor(padEnd(exec.status, 12)) +
+                    this.log(visualPadEnd(exec.id, 15) +
+                        visualPadEnd(exec.agentName, 15) +
+                        visualPadEnd(exec.ticketId, 12) +
+                        statusColor(visualPadEnd(exec.status, 12)) +
                         containerId + containerStatus);
                 }
             }
@@ -93,9 +110,9 @@ export default class DockerList extends Command {
                 : runningContainers;
             if (filteredContainers.length > 0) {
                 this.log(styles.subheader('\nDocker Containers' + (flags.all ? ' (all)' : ' (devcontainers)') + ':'));
-                this.log(styles.muted(padEnd('Container ID', 15) +
-                    padEnd('Agent', 15) +
-                    padEnd('Status', 15) +
+                this.log(styles.muted(visualPadEnd('Container ID', 15) +
+                    visualPadEnd('Agent', 15) +
+                    visualPadEnd('Status', 15) +
                     'Uptime'));
                 this.log('-'.repeat(70));
                 for (const container of filteredContainers) {
@@ -103,9 +120,9 @@ export default class DockerList extends Command {
                     // Look up agent name from DB (source of truth)
                     const dbContainer = dbContainers.find(c => c.dockerId.startsWith(container.id.substring(0, 12)));
                     const agentName = dbContainer?.agentName || this.extractAgentFromImage(container.image) || container.name;
-                    this.log(padEnd(container.id, 15) +
-                        padEnd(agentName, 15) +
-                        statusColor(padEnd(container.status, 15)) +
+                    this.log(visualPadEnd(container.id, 15) +
+                        visualPadEnd(agentName, 15) +
+                        statusColor(visualPadEnd(container.status, 15)) +
                         styles.muted(container.uptime));
                 }
             }
@@ -174,9 +191,6 @@ export default class DockerList extends Command {
         return match ? match[1] : null;
     }
 }
-function padEnd(str, length) {
-    return str.padEnd(length);
-}
 function getStatusColor(status) {
     switch (status) {
         case 'running':

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

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

package/dist/commands/docker/status.js

@@ -2,16 +2,42 @@ import { Command } from '@oclif/core';
 import { execSync } from 'node:child_process';
 import { styles } from '../../lib/styles.js';
 import { isDockerRunning } from '../../lib/execution/runners.js';
+import { shouldOutputJson } from '../../lib/prompt-json.js';
+import { machineOutputFlags } from '../../lib/pmo/index.js';
 export default class DockerStatus extends Command {
     static description = 'Check if Docker daemon is running';
     static examples = [
         '<%= config.bin %> <%= command.id %>',
     ];
-    static flags = {};
+    static flags = {
+        ...machineOutputFlags,
+    };
     async run() {
+        const { flags } = await this.parse(DockerStatus);
+        const jsonMode = shouldOutputJson(flags);
+        const running = isDockerRunning();
+        if (jsonMode) {
+            const result = { running };
+            if (running) {
+                try {
+                    result.version = execSync('docker version --format "{{.Server.Version}}"', {
+                        encoding: 'utf-8',
+                        stdio: ['pipe', 'pipe', 'pipe'],
+                    }).trim();
+                    result.info = execSync('docker info --format "{{.Containers}} containers ({{.ContainersRunning}} running)"', {
+                        encoding: 'utf-8',
+                        stdio: ['pipe', 'pipe', 'pipe'],
+                    }).trim();
+                }
+                catch {
+                    // Ignore errors getting additional info
+                }
+            }
+            this.log(JSON.stringify(result, null, 2));
+            return;
+        }
         this.log(`\n${styles.header('Docker Status')}`);
         this.log('─'.repeat(50));
-        const running = isDockerRunning();
         if (running) {
             this.log(`${styles.success('Running')} Docker daemon is available`);
             // Get more details