@proletariat/cli 0.3.35 → 0.3.40

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

@@ -1,12 +1,11 @@
 import { Flags } from '@oclif/core';
-import * as path from 'node:path';
-import Database from 'better-sqlite3';
 import inquirer from 'inquirer';
 import { PMOCommand, pmoBaseFlags } from '../../lib/pmo/index.js';
 import { styles } from '../../lib/styles.js';
 import { getWorkspaceInfo } from '../../lib/agents/commands.js';
+import { openWorkspaceDatabase } from '../../lib/database/index.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 +36,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);
@@ -76,8 +53,7 @@ export default class ExecutionConfig extends PMOCommand {
             this.error('Not in a workspace. Run "prlt init" first.');
         }
         // Open database
-        const dbPath = path.join(workspaceInfo.path, '.proletariat', 'workspace.db');
-        const db = new Database(dbPath);
+        const db = openWorkspaceDatabase(workspaceInfo.path);
         try {
             // Load current config
             const config = loadExecutionConfig(db);
@@ -101,7 +77,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 +137,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 +181,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 +199,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 +217,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 +241,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 +259,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 +278,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 +296,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',
@@ -410,20 +386,12 @@ export default class ExecutionConfig extends PMOCommand {
      * Save output mode to workspace settings
      */
     setOutputMode(db, mode) {
-        db.prepare(`
-      INSERT INTO workspace_settings (key, value)
-      VALUES (?, ?)
-      ON CONFLICT(key) DO UPDATE SET value = excluded.value
-    `).run('execution.output_mode', mode);
+        saveExecutionSetting(db, 'outputMode', mode);
     }
     /**
      * Save sandboxed preference to workspace settings
      */
     setSandboxed(db, sandboxed) {
-        db.prepare(`
-      INSERT INTO workspace_settings (key, value)
-      VALUES (?, ?)
-      ON CONFLICT(key) DO UPDATE SET value = excluded.value
-    `).run('execution.sandboxed', sandboxed.toString());
+        saveExecutionSetting(db, 'sandboxed', sandboxed.toString());
     }
 }

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',
@@ -90,6 +90,12 @@ export default class ExecutionLogs extends PMOCommand {
             if (!execution.logPath) {
                 this.log(styles.muted(`\nNo log file for execution ${execId}`));
                 this.log(styles.muted(`Environment: ${execution.environment}`));
+                // Show error message if available (TKT-1082)
+                if (execution.errorMessage) {
+                    this.log('');
+                    this.log(styles.error('Error:'));
+                    this.log(styles.error(`  ${execution.errorMessage}`));
+                }
                 if (execution.sessionId) {
                     this.log('');
                     this.log(styles.muted('View in tmux:'));

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',

package/dist/commands/execution/view.js

@@ -6,7 +6,7 @@ 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 { outputErrorAsJson, createMetadata, shouldOutputJson, } from '../../lib/prompt-json.js';
+import { outputErrorAsJson, outputSuccessAsJson, createMetadata, shouldOutputJson, } from '../../lib/prompt-json.js';
 export default class ExecutionView extends PMOCommand {
     static description = 'View details of a specific execution';
     static examples = [
@@ -63,7 +63,7 @@ export default class ExecutionView extends PMOCommand {
                     this.log(styles.muted('\nNo executions found.\n'));
                     return;
                 }
-                const jsonModeConfig = (flags.json || flags.machine) ? { flags, commandName: 'execution view' } : null;
+                const jsonModeConfig = shouldOutputJson(flags) ? { flags, commandName: 'execution view' } : null;
                 const { selectedId } = await this.prompt([
                     {
                         type: 'list',
@@ -85,30 +85,27 @@ export default class ExecutionView extends PMOCommand {
             }
             // If JSON mode with ID provided, output the execution data as JSON
             if (jsonMode && args.id) {
-                console.log(JSON.stringify({
-                    success: true,
-                    data: {
-                        id: execution.id,
-                        ticketId: execution.ticketId,
-                        agentName: execution.agentName,
-                        executor: execution.executor,
-                        environment: execution.environment,
-                        displayMode: execution.displayMode,
-                        sandboxed: execution.sandboxed,
-                        status: execution.status,
-                        branch: execution.branch || null,
-                        pid: execution.pid || null,
-                        containerId: execution.containerId || null,
-                        sessionId: execution.sessionId || null,
-                        host: execution.host || null,
-                        logPath: execution.logPath || null,
-                        startedAt: execution.startedAt.toISOString(),
-                        completedAt: execution.completedAt?.toISOString() || null,
-                        exitCode: execution.exitCode ?? null,
-                    },
-                    metadata: createMetadata('execution view', flags),
-                }, null, 2));
-                return;
+                db.close();
+                outputSuccessAsJson({
+                    id: execution.id,
+                    ticketId: execution.ticketId,
+                    agentName: execution.agentName,
+                    executor: execution.executor,
+                    environment: execution.environment,
+                    displayMode: execution.displayMode,
+                    sandboxed: execution.sandboxed,
+                    status: execution.status,
+                    branch: execution.branch || null,
+                    pid: execution.pid || null,
+                    containerId: execution.containerId || null,
+                    sessionId: execution.sessionId || null,
+                    host: execution.host || null,
+                    logPath: execution.logPath || null,
+                    startedAt: execution.startedAt.toISOString(),
+                    completedAt: execution.completedAt?.toISOString() || null,
+                    exitCode: execution.exitCode ?? null,
+                    errorMessage: execution.errorMessage || null,
+                }, createMetadata('execution view', flags));
             }
             // Display execution details
             this.log('');
@@ -164,6 +161,13 @@ export default class ExecutionView extends PMOCommand {
                 this.log(`${styles.muted('Exit Code:')}    ${exitStyle(execution.exitCode.toString())}`);
             }
             this.log('');
+            // Error details (TKT-1082)
+            if (execution.errorMessage) {
+                this.log(styles.header('Error'));
+                this.log('─'.repeat(40));
+                this.log(styles.error(execution.errorMessage));
+                this.log('');
+            }
             // Logs summary
             if (execution.logPath) {
                 this.log(styles.header('Logs'));

package/dist/commands/init.js

@@ -6,6 +6,7 @@ import { promptForHQName, promptForHQLocation, initializeHQ, showNextSteps, vali
 import { promptForAgentsWithTheme } from '../lib/agents/index.js';
 import { promptForRepositories } from '../lib/repos/index.js';
 import { promptForPMOSetup, machineOutputFlags } from '../lib/pmo/index.js';
+import { shouldOutputJson } from '../lib/prompt-json.js';
 export default class Init extends Command {
     static description = 'Initialize an HQ (headquarters) for managing repositories, agents, and projects';
     static examples = [
@@ -41,27 +42,9 @@ export default class Init extends Command {
     };
     async run() {
         const { flags } = await this.parse(Init);
-        if (flags.json || flags.machine) {
+        if (shouldOutputJson(flags)) {
             await this.runAgentMode(flags);
         }
-        else if (!process.stdin.isTTY) {
-            // Non-interactive environment (likely an AI agent)
-            // Output guidance as JSON
-            this.outputJson({
-                success: false,
-                error: 'Interactive mode requires a TTY. Use --json flag for agent mode.',
-                hint: 'Run: prlt init --json --name <hq-name> [--path <path>] [--agents a1,a2] [--no-pmo]',
-                flags: {
-                    '--json': 'Enable agent mode with JSON output',
-                    '--name, -n': 'HQ name (required)',
-                    '--path, -p': 'HQ path (defaults to ./{name}-hq)',
-                    '--agents, -a': 'Comma-separated agent names',
-                    '--repos, -r': 'Comma-separated repo paths',
-                    '--pmo/--no-pmo': 'Include PMO (default: true)',
-                },
-            });
-            this.exit(1);
-        }
         else {
             await this.runHumanMode();
         }

package/dist/commands/label/create.js

@@ -1,5 +1,6 @@
 import { Args, Flags } from '@oclif/core';
 import { PMOCommand, pmoBaseFlags } from '../../lib/pmo/index.js';
+import { shouldOutputJson } from '../../lib/prompt-json.js';
 import { styles } from '../../lib/styles.js';
 export default class LabelCreate extends PMOCommand {
     static description = 'Create a new label';
@@ -40,7 +41,7 @@ export default class LabelCreate extends PMOCommand {
             description: flags.description,
             groupId: flags.group,
         });
-        if (flags.machine || flags.json) {
+        if (shouldOutputJson(flags)) {
             this.log(JSON.stringify(label, null, 2));
             return;
         }

package/dist/commands/label/delete.js

@@ -1,5 +1,6 @@
 import { Args } from '@oclif/core';
 import { PMOCommand, pmoBaseFlags } from '../../lib/pmo/index.js';
+import { shouldOutputJson } from '../../lib/prompt-json.js';
 import { styles } from '../../lib/styles.js';
 export default class LabelDelete extends PMOCommand {
     static description = 'Delete a label (removes from all tickets)';
@@ -21,7 +22,7 @@ export default class LabelDelete extends PMOCommand {
     async execute() {
         const { args, flags } = await this.parse(LabelDelete);
         await this.storage.deleteLabel(args.id);
-        if (flags.machine || flags.json) {
+        if (shouldOutputJson(flags)) {
             this.log(JSON.stringify({ success: true, deleted: args.id }));
             return;
         }

package/dist/commands/label/group/create.js

@@ -1,5 +1,6 @@
 import { Args, Flags } from '@oclif/core';
 import { PMOCommand, pmoBaseFlags } from '../../../lib/pmo/index.js';
+import { shouldOutputJson } from '../../../lib/prompt-json.js';
 import { styles } from '../../../lib/styles.js';
 export default class LabelGroupCreate extends PMOCommand {
     static description = 'Create a new label group';
@@ -41,7 +42,7 @@ export default class LabelGroupCreate extends PMOCommand {
             isExclusive: flags.exclusive,
             isRequired: flags.required,
         });
-        if (flags.machine || flags.json) {
+        if (shouldOutputJson(flags)) {
             this.log(JSON.stringify(group, null, 2));
             return;
         }

package/dist/commands/label/group/list.js

@@ -1,5 +1,6 @@
 import { Flags } from '@oclif/core';
 import { PMOCommand, pmoBaseFlags } from '../../../lib/pmo/index.js';
+import { shouldOutputJson } from '../../../lib/prompt-json.js';
 import { styles } from '../../../lib/styles.js';
 export default class LabelGroupList extends PMOCommand {
     static description = 'List label groups';
@@ -20,7 +21,7 @@ export default class LabelGroupList extends PMOCommand {
     async execute() {
         const { flags } = await this.parse(LabelGroupList);
         const groups = await this.storage.listLabelGroups();
-        if (flags.json || flags.machine) {
+        if (shouldOutputJson(flags)) {
             this.log(JSON.stringify(groups, null, 2));
             return;
         }

package/dist/commands/label/list.js

@@ -1,5 +1,6 @@
 import { Flags } from '@oclif/core';
 import { PMOCommand, pmoBaseFlags } from '../../lib/pmo/index.js';
+import { shouldOutputJson } from '../../lib/prompt-json.js';
 import { styles } from '../../lib/styles.js';
 export default class LabelList extends PMOCommand {
     static description = 'List labels, optionally filtered by group';
@@ -27,7 +28,7 @@ export default class LabelList extends PMOCommand {
         const labels = await this.storage.listLabels({
             groupId: flags.group,
         });
-        if (flags.json || flags.machine) {
+        if (shouldOutputJson(flags)) {
             this.log(JSON.stringify(labels, null, 2));
             return;
         }

package/dist/commands/mcp-server.js

@@ -18,8 +18,11 @@ import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
 import { execSync } from 'node:child_process';
 import * as path from 'node:path';
+import Database from 'better-sqlite3';
 import { getPMOContext } from '../lib/pmo/pmo-context.js';
-import { registerTicketTools, registerProjectTools, registerBoardTools, registerSpecTools, registerEpicTools, registerWorkTools, registerWorkflowTools, registerStatusTools, registerPhaseTools, registerActionTools, registerRoadmapTools, registerCategoryTools, registerTemplateTools, registerViewTools, registerDietTools, registerLabelTools, registerAgentTools, registerDockerTools, registerRepoTools, registerBranchTools, registerGitHubTools, registerInitTools, registerUtilityTools, } from '../lib/mcp/index.js';
+import { getWorkspaceInfo } from '../lib/agents/commands.js';
+import { ExecutionStorage } from '../lib/execution/storage.js';
+import { registerTicketTools, registerProjectTools, registerBoardTools, registerSpecTools, registerEpicTools, registerWorkTools, registerWorkflowTools, registerStatusTools, registerPhaseTools, registerActionTools, registerRoadmapTools, registerCategoryTools, registerTemplateTools, registerViewTools, registerDietTools, registerLabelTools, registerTmuxTools, registerAgentTools, registerDockerTools, registerRepoTools, registerBranchTools, registerGitHubTools, registerInitTools, registerUtilityTools, } from '../lib/mcp/index.js';
 export default class McpServerCommand extends Command {
     static description = 'Start MCP server for AI agent integration (exposes all prlt commands as tools)';
     static hidden = true;
@@ -38,6 +41,25 @@ export default class McpServerCommand extends Command {
             name: 'prlt',
             version: this.config.version,
         });
+        // Try to initialize workspace context for execution support
+        let workspaceContext = null;
+        try {
+            const workspaceInfo = getWorkspaceInfo();
+            if (workspaceInfo && pmoContext) {
+                const dbPath = path.join(workspaceInfo.path, '.proletariat', 'workspace.db');
+                const db = new Database(dbPath);
+                const executionStorage = new ExecutionStorage(db);
+                workspaceContext = {
+                    workspaceInfo,
+                    executionStorage,
+                    db,
+                    pmoPath: pmoContext.pmoPath,
+                };
+            }
+        }
+        catch {
+            // Not in a workspace — workspace context will be null
+        }
         // Create tool context
         const ctx = {
             get storage() {
@@ -68,6 +90,9 @@ export default class McpServerCommand extends Command {
                     throw error;
                 }
             },
+            getWorkspaceContext: workspaceContext
+                ? () => workspaceContext
+                : undefined,
         };
         // Register all tool categories
         registerTicketTools(server, ctx);
@@ -86,6 +111,7 @@ export default class McpServerCommand extends Command {
         registerViewTools(server, ctx);
         registerDietTools(server, ctx);
         registerLabelTools(server, ctx);
+        registerTmuxTools(server, ctx);
         registerAgentTools(server, ctx);
         registerDockerTools(server, ctx);
         registerRepoTools(server, ctx);

package/dist/commands/phase/template/list.js

@@ -1,5 +1,6 @@
 import { Flags } from '@oclif/core';
 import { PMOCommand, pmoBaseFlags } from '../../../lib/pmo/index.js';
+import { shouldOutputJson } from '../../../lib/prompt-json.js';
 import { styles } from '../../../lib/styles.js';
 export default class PhaseTemplateList extends PMOCommand {
     static description = 'List phase templates';
@@ -30,7 +31,7 @@ export default class PhaseTemplateList extends PMOCommand {
         if (flags.custom)
             builtinFilter = { isBuiltin: false };
         const templates = await this.storage.listPhaseTemplates(builtinFilter);
-        if (flags.json) {
+        if (shouldOutputJson(flags)) {
             this.log(JSON.stringify(templates, null, 2));
             return;
         }

package/dist/commands/pmo/init.js

@@ -4,7 +4,7 @@ import * as path from 'node:path';
 import { execSync } from 'node:child_process';
 import chalk from 'chalk';
 import { PromptCommand } from '../../lib/prompt-command.js';
-import Database from 'better-sqlite3';
+import { checkPMOExists, getPMOSetting, dropPMOTables } from '../../lib/database/index.js';
 import { SQLiteStorage, getColumnsForTemplate, createPMO, promptForPMOLocation, promptForBoardTemplate, promptForBoardName, promptForCustomColumns, determinePMOPath, getPickerTemplates, machineOutputFlags, } from '../../lib/pmo/index.js';
 import { styles } from '../../lib/styles.js';
 import { isGHInstalled, isGHAuthenticated, getGHUsername, isGHTokenInEnv } from '../../lib/pr/index.js';
@@ -56,17 +56,10 @@ export default class PMOInit extends PromptCommand {
             const dbPath = path.join(hqRoot, '.proletariat', 'workspace.db');
             if (fs.existsSync(dbPath)) {
                 try {
-                    const db = new Database(dbPath);
-                    const result = db.prepare("SELECT name FROM sqlite_master WHERE type='table' AND name='pmo_projects'").get();
-                    if (result !== undefined) {
-                        existingPMO = true;
-                        // Get counts
-                        const projectCountResult = db.prepare('SELECT COUNT(*) as count FROM pmo_projects').get();
-                        const ticketCountResult = db.prepare('SELECT COUNT(*) as count FROM pmo_tickets').get();
-                        projectCount = projectCountResult.count;
-                        ticketCount = ticketCountResult.count;
-                    }
-                    db.close();
+                    const pmoStatus = checkPMOExists(dbPath);
+                    existingPMO = pmoStatus.exists;
+                    projectCount = pmoStatus.projectCount;
+                    ticketCount = pmoStatus.ticketCount;
                 }
                 catch (error) {
                     // Log error for debugging
@@ -243,16 +236,9 @@ export default class PMOInit extends PromptCommand {
         // Find PMO location from database
         const dbPath = path.join(hqRoot, '.proletariat', 'workspace.db');
         let pmoPath = path.join(hqRoot, 'pmo'); // Default fallback
-        try {
-            const db = new Database(dbPath);
-            const result = db.prepare('SELECT value FROM pmo_settings WHERE key = ?').get('pmo_path');
-            if (result) {
-                pmoPath = result.value;
-            }
-            db.close();
-        }
-        catch {
-            // Use default if table doesn't exist
+        const savedPmoPath = getPMOSetting(dbPath, 'pmo_path');
+        if (savedPmoPath) {
+            pmoPath = savedPmoPath;
         }
         // Define choices once, use for both JSON and interactive modes
         const actionChoices = [
@@ -336,30 +322,16 @@ export default class PMOInit extends PromptCommand {
         const dbPath = path.join(hqRoot, '.proletariat', 'workspace.db');
         let pmoPath = path.join(hqRoot, 'pmo'); // Default fallback
         if (fs.existsSync(dbPath)) {
-            const db = new Database(dbPath);
             // Get PMO path from database before deleting
-            try {
-                const result = db.prepare('SELECT value FROM pmo_settings WHERE key = ?').get('pmo_path');
-                if (result) {
-                    pmoPath = result.value;
-                }
-            }
-            catch {
-                // Ignore - table might not exist, use default
+            const savedPmoPath = getPMOSetting(dbPath, 'pmo_path');
+            if (savedPmoPath) {
+                pmoPath = savedPmoPath;
             }
             // Drop all pmo_* tables
             const tables = ['pmo_ticket_specs', 'pmo_ticket_metadata', 'pmo_subtasks', 'pmo_tickets',
                 'pmo_columns', 'pmo_specs', 'pmo_epics', 'pmo_projects',
                 'pmo_initiatives', 'pmo_ticket_assignments', 'pmo_cache_metadata', 'pmo_settings'];
-            for (const table of tables) {
-                try {
-                    db.prepare(`DROP TABLE IF EXISTS ${table}`).run();
-                }
-                catch {
-                    // Ignore errors - table might not exist
-                }
-            }
-            db.close();
+            dropPMOTables(dbPath, tables);
             this.log(chalk.green('  ✓ Dropped database tables'));
         }
         // Delete pmo/ directory (using path from database or default)