@proletariat/cli 0.3.16 → 0.3.18

package/dist/commands/pr/create.js

@@ -1,13 +1,10 @@
-import { Command, Args, Flags } from '@oclif/core';
-import * as path from 'node:path';
-import Database from 'better-sqlite3';
-import inquirer from 'inquirer';
-import { getPMOContext } from '../../lib/pmo/index.js';
+import { Args, Flags } from '@oclif/core';
+import { PMOCommand, pmoBaseFlags, } from '../../lib/pmo/index.js';
 import { styles } from '../../lib/styles.js';
-import { getWorkspaceInfo } from '../../lib/agents/commands.js';
 import { isGHInstalled, isGHAuthenticated, getCurrentBranch, getDefaultBaseBranch, hasBranchBeenPushed, pushBranch, hasUnpushedCommits, getCommitLog, createPR, getPRForBranch, generatePRTitle, generatePRBody, } from '../../lib/pr/index.js';
-import { shouldOutputJson, outputPromptAsJson, outputErrorAsJson, createMetadata, buildPromptConfig, } from '../../lib/prompt-json.js';
-export default class PRCreate extends Command {
+import { shouldOutputJson, outputErrorAsJson, createMetadata, } from '../../lib/prompt-json.js';
+import { FlagResolver } from '../../lib/flags/index.js';
+export default class PRCreate extends PMOCommand {
     static description = 'Create a GitHub pull request from the current branch';
     static examples = [
         '<%= config.bin %> <%= command.id %>',
@@ -22,6 +19,7 @@ export default class PRCreate extends Command {
         }),
     };
     static flags = {
+        ...pmoBaseFlags,
         base: Flags.string({
             char: 'b',
             description: 'Base branch for the PR (defaults to main/master)',
@@ -42,12 +40,26 @@ export default class PRCreate extends Command {
         body: Flags.string({
             description: 'PR body/description',
         }),
-        json: Flags.boolean({
-            description: 'Output prompt configuration as JSON (for AI agents/scripts)',
-            default: false,
+        ticket: Flags.string({
+            description: 'Ticket ID to link (alternative to positional arg)',
         }),
     };
-    async run() {
+    // Flag to track if PMO is available (for graceful degradation)
+    hasPMO = true;
+    /**
+     * Override init to gracefully handle missing PMO
+     * PR creation should work even without PMO (just without ticket linking)
+     */
+    async init() {
+        try {
+            await super.init();
+        }
+        catch {
+            // PMO not available - that's fine, we can still create PRs
+            this.hasPMO = false;
+        }
+    }
+    async execute() {
         const { args, flags } = await this.parse(PRCreate);
         // Check if JSON output mode is active
         const jsonMode = shouldOutputJson(flags);
@@ -84,159 +96,130 @@ export default class PRCreate extends Command {
             this.log(styles.muted(`   URL: ${existingPR.url}`));
             return;
         }
-        // Get workspace and PMO context (optional - PR creation works without it)
-        let workspaceInfo;
-        let storage = null;
-        let db = null;
-        try {
-            workspaceInfo = getWorkspaceInfo();
-            const pmoContext = await getPMOContext({
-                logger: (msg) => this.log(styles.muted(msg)),
-            });
-            storage = pmoContext.storage;
-            db = new Database(path.join(workspaceInfo.path, '.proletariat', 'workspace.db'));
-        }
-        catch {
-            // No workspace - that's fine, we can still create PRs
+        // Log if PMO is not available
+        if (!this.hasPMO) {
             this.log(styles.muted('   No workspace found - creating PR without ticket linking'));
         }
-        try {
-            // Determine ticket ID
-            let ticketId = args.ticketId;
-            if (!ticketId && !flags['no-link'] && storage) {
-                // Try to extract ticket ID from branch name (e.g., feat/agent/TKT-001-description)
-                const ticketMatch = currentBranch.match(/(TKT-\d+)/i);
-                if (ticketMatch) {
-                    ticketId = ticketMatch[1].toUpperCase();
-                    this.log(styles.muted(`   Auto-detected ticket: ${ticketId}`));
-                }
+        // Determine ticket ID from args or flags
+        let ticketId = args.ticketId || flags.ticket;
+        if (!ticketId && !flags['no-link'] && this.hasPMO) {
+            // Try to extract ticket ID from branch name (e.g., feat/agent/TKT-001-description)
+            const ticketMatch = currentBranch.match(/(TKT-\d+)/i);
+            if (ticketMatch) {
+                ticketId = ticketMatch[1].toUpperCase();
+                this.log(styles.muted(`   Auto-detected ticket: ${ticketId}`));
             }
-            // Get ticket info if available
-            let ticket = null;
-            if (ticketId && storage) {
-                ticket = await storage.getTicket(ticketId);
-                if (!ticket) {
-                    this.warn(`Ticket "${ticketId}" not found. Continuing without ticket link.`);
-                    ticketId = undefined;
-                }
+        }
+        // Get ticket info if available
+        let ticket = null;
+        if (ticketId && this.hasPMO) {
+            ticket = await this.storage.getTicket(ticketId);
+            if (!ticket) {
+                this.warn(`Ticket "${ticketId}" not found. Continuing without ticket link.`);
+                ticketId = undefined;
             }
-            // If no ticket, prompt for selection (only if we have storage)
-            if (!ticketId && !flags['no-link'] && storage) {
-                const projectId = flags.project;
-                const allTickets = await storage.listTickets(projectId);
-                const inProgressTickets = allTickets.filter(t => t.statusName && t.statusName.toLowerCase().includes('progress'));
-                if (inProgressTickets.length > 0) {
-                    // Build choices once, use for both JSON and interactive modes
-                    const ticketChoices = [
+        }
+        // If no ticket, prompt for selection (only if we have PMO)
+        if (!ticketId && !flags['no-link'] && this.hasPMO) {
+            const projectId = flags.project;
+            const allTickets = await this.storage.listTickets(projectId);
+            const inProgressTickets = allTickets.filter(t => t.statusName && t.statusName.toLowerCase().includes('progress'));
+            if (inProgressTickets.length > 0) {
+                // Use FlagResolver for ticket selection
+                const resolver = new FlagResolver({
+                    commandName: 'pr create',
+                    baseCommand: 'prlt pr create',
+                    jsonMode,
+                    flags: { ticket: ticketId },
+                });
+                resolver.addPrompt({
+                    flagName: 'ticket',
+                    type: 'list',
+                    message: 'Link PR to a ticket?',
+                    choices: () => [
                         ...inProgressTickets.map(t => ({
                             name: `${t.id} - ${t.title}`,
                             value: t.id,
                         })),
                         { name: 'Skip - create PR without linking', value: '__skip__' },
-                    ];
-                    const message = 'Link PR to a ticket?';
-                    // In JSON mode, output ticket selection prompt and exit
-                    if (jsonMode) {
-                        outputPromptAsJson(buildPromptConfig('list', 'ticketId', message, ticketChoices), createMetadata('pr create', flags));
-                    }
-                    const { selectedTicketId } = await inquirer.prompt([
-                        {
-                            type: 'list',
-                            name: 'selectedTicketId',
-                            message,
-                            choices: [
-                                ...ticketChoices.slice(0, -1),
-                                new inquirer.Separator(),
-                                ticketChoices[ticketChoices.length - 1],
-                            ],
-                        },
-                    ]);
-                    if (selectedTicketId !== '__skip__') {
-                        ticketId = selectedTicketId;
-                        ticket = await storage.getTicket(ticketId);
-                    }
-                }
-            }
-            // Generate PR title and body
-            let prTitle = flags.title;
-            let prBody = flags.body;
-            if (!prTitle) {
-                if (ticket) {
-                    prTitle = generatePRTitle(ticket.id, ticket.title);
-                }
-                else {
-                    // Use branch name as title
-                    const branchParts = currentBranch.split('/');
-                    prTitle = branchParts[branchParts.length - 1].replace(/-/g, ' ');
-                }
-            }
-            if (!prBody && ticket) {
-                const commits = getCommitLog(baseBranch);
-                prBody = generatePRBody({
-                    ticketId: ticket.id,
-                    ticketTitle: ticket.title,
-                    ticketDescription: ticket.description,
-                    commits: commits.slice(0, 10), // Limit to 10 commits
+                    ],
+                    when: (ctx) => !ctx.flags.ticket,
                 });
-            }
-            // Push branch if not pushed
-            if (!hasBranchBeenPushed(currentBranch)) {
-                this.log(styles.muted(`   Pushing branch to origin...`));
-                if (!pushBranch(currentBranch)) {
-                    this.error('Failed to push branch to origin.');
+                const resolved = await resolver.resolve();
+                if (resolved.ticket && resolved.ticket !== '__skip__') {
+                    ticketId = resolved.ticket;
+                    ticket = await this.storage.getTicket(ticketId);
                 }
             }
-            else if (hasUnpushedCommits(currentBranch)) {
-                this.log(styles.muted(`   Pushing unpushed commits...`));
-                if (!pushBranch(currentBranch)) {
-                    this.error('Failed to push commits to origin.');
-                }
+        }
+        // Generate PR title and body
+        let prTitle = flags.title;
+        let prBody = flags.body;
+        if (!prTitle) {
+            if (ticket) {
+                prTitle = generatePRTitle(ticket.id, ticket.title);
             }
-            // Create PR
-            this.log('');
-            this.log(styles.header('Creating Pull Request'));
-            this.log(styles.muted(`   Branch: ${currentBranch}`));
-            this.log(styles.muted(`   Base: ${baseBranch}`));
-            this.log(styles.muted(`   Title: ${prTitle}`));
-            if (flags.draft) {
-                this.log(styles.muted(`   Draft: yes`));
+            else {
+                // Use branch name as title
+                const branchParts = currentBranch.split('/');
+                prTitle = branchParts[branchParts.length - 1].replace(/-/g, ' ');
             }
-            const result = createPR({
-                title: prTitle,
-                body: prBody,
-                base: baseBranch,
-                draft: flags.draft,
+        }
+        if (!prBody && ticket) {
+            const commits = getCommitLog(baseBranch);
+            prBody = generatePRBody({
+                ticketId: ticket.id,
+                ticketTitle: ticket.title,
+                ticketDescription: ticket.description,
+                commits: commits.slice(0, 10), // Limit to 10 commits
             });
-            if (!result.success) {
-                this.error(`Failed to create PR: ${result.error}`);
-            }
-            // Store PR URL in ticket metadata
-            if (ticket && result.url && storage) {
-                await storage.updateTicket(ticket.id, {
-                    metadata: {
-                        pr_url: result.url,
-                        pr_number: String(result.number),
-                    },
-                });
+        }
+        // Push branch if not pushed
+        if (!hasBranchBeenPushed(currentBranch)) {
+            this.log(styles.muted(`   Pushing branch to origin...`));
+            if (!pushBranch(currentBranch)) {
+                this.error('Failed to push branch to origin.');
             }
-            if (storage)
-                await storage.close();
-            if (db)
-                db.close();
-            this.log('');
-            this.log(styles.success(`Pull request created!`));
-            this.log(styles.muted(`   PR #${result.number}`));
-            this.log(styles.muted(`   URL: ${result.url}`));
-            if (ticket) {
-                this.log(styles.muted(`   Linked to: ${ticket.id}`));
+        }
+        else if (hasUnpushedCommits(currentBranch)) {
+            this.log(styles.muted(`   Pushing unpushed commits...`));
+            if (!pushBranch(currentBranch)) {
+                this.error('Failed to push commits to origin.');
             }
         }
-        catch (error) {
-            if (storage)
-                await storage.close();
-            if (db)
-                db.close();
-            throw error;
+        // Create PR
+        this.log('');
+        this.log(styles.header('Creating Pull Request'));
+        this.log(styles.muted(`   Branch: ${currentBranch}`));
+        this.log(styles.muted(`   Base: ${baseBranch}`));
+        this.log(styles.muted(`   Title: ${prTitle}`));
+        if (flags.draft) {
+            this.log(styles.muted(`   Draft: yes`));
+        }
+        const result = createPR({
+            title: prTitle,
+            body: prBody,
+            base: baseBranch,
+            draft: flags.draft,
+        });
+        if (!result.success) {
+            this.error(`Failed to create PR: ${result.error}`);
+        }
+        // Store PR URL in ticket metadata
+        if (ticket && result.url && this.hasPMO) {
+            await this.storage.updateTicket(ticket.id, {
+                metadata: {
+                    pr_url: result.url,
+                    pr_number: String(result.number),
+                },
+            });
+        }
+        this.log('');
+        this.log(styles.success(`Pull request created!`));
+        this.log(styles.muted(`   PR #${result.number}`));
+        this.log(styles.muted(`   URL: ${result.url}`));
+        if (ticket) {
+            this.log(styles.muted(`   Linked to: ${ticket.id}`));
         }
     }
 }

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

@@ -1,9 +1,12 @@
-import { Command } from '@oclif/core';
-export default class PR extends Command {
+import { PMOCommand } from '../../lib/pmo/index.js';
+export default class PR extends PMOCommand {
     static description: string;
     static examples: string[];
     static flags: {
+        action: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        machine: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        project: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
-    run(): Promise<void>;
+    execute(): Promise<void>;
 }

package/dist/commands/pr/index.js

@@ -1,59 +1,61 @@
-import { Command, Flags } from '@oclif/core';
-import inquirer from 'inquirer';
-import { findPMO } from '../../lib/pmo/index.js';
-import { shouldOutputJson, outputPromptAsJson, outputErrorAsJson, createMetadata, buildPromptConfig, } from '../../lib/prompt-json.js';
-export default class PR extends Command {
+import { Flags } from '@oclif/core';
+import { PMOCommand, pmoBaseFlags, } from '../../lib/pmo/index.js';
+import { shouldOutputJson, outputErrorAsJson, createMetadata, } from '../../lib/prompt-json.js';
+import { FlagResolver } from '../../lib/flags/index.js';
+export default class PR extends PMOCommand {
     static description = 'Interactive menu for pull request operations';
     static examples = [
         '<%= config.bin %> <%= command.id %>',
     ];
     static flags = {
-        json: Flags.boolean({
-            description: 'Output prompt configuration as JSON (for AI agents/scripts)',
-            default: false,
+        ...pmoBaseFlags,
+        action: Flags.string({
+            char: 'a',
+            description: 'Action to perform (create, link, status)',
+            options: ['create', 'link', 'status'],
         }),
     };
-    async run() {
+    async execute() {
         const { flags } = await this.parse(PR);
         // Check if JSON output mode is active
         const jsonMode = shouldOutputJson(flags);
-        const pmoPath = findPMO();
-        if (!pmoPath) {
+        // Helper to handle errors in JSON mode
+        const handleError = (code, message) => {
             if (jsonMode) {
-                outputErrorAsJson('PMO_NOT_FOUND', 'PMO not found. Run "prlt pmo init" first.', createMetadata('pr', flags));
+                outputErrorAsJson(code, message, createMetadata('pr', flags));
                 this.exit(1);
             }
-            this.error('PMO not found. Run "prlt pmo init" first.');
+            this.error(message);
+        };
+        // PMOCommand base class ensures PMO context is available
+        if (!this.storage) {
+            return handleError('PMO_NOT_FOUND', 'PMO not found. Run "prlt pmo init" first.');
         }
-        // Define choices once, use for both JSON and interactive modes
-        const menuChoices = [
-            { name: 'Create PR from current branch', value: 'create' },
-            { name: 'Link existing PR to ticket', value: 'link' },
-            { name: 'View PR status for ticket', value: 'status' },
-            { name: 'Cancel', value: 'cancel' },
-        ];
-        const message = 'Pull Request Operations - What would you like to do?';
-        // In JSON mode, output menu prompt
-        if (jsonMode) {
-            outputPromptAsJson(buildPromptConfig('list', 'action', message, menuChoices), createMetadata('pr', flags));
-            return;
-        }
-        // Show interactive menu (with separator before Cancel)
-        const { action } = await inquirer.prompt([{
-                type: 'list',
-                name: 'action',
-                message,
-                choices: [
-                    ...menuChoices.slice(0, -1),
-                    new inquirer.Separator('──────────────'),
-                    menuChoices[menuChoices.length - 1],
-                ],
-            }]);
-        if (action === 'cancel') {
+        // Use FlagResolver for action selection
+        const resolver = new FlagResolver({
+            commandName: 'pr',
+            baseCommand: 'prlt pr',
+            jsonMode,
+            flags: { action: flags.action },
+        });
+        resolver.addPrompt({
+            flagName: 'action',
+            type: 'list',
+            message: 'Pull Request Operations - What would you like to do?',
+            choices: () => [
+                { name: 'Create PR from current branch', value: 'create' },
+                { name: 'Link existing PR to ticket', value: 'link' },
+                { name: 'View PR status for ticket', value: 'status' },
+                { name: 'Cancel', value: 'cancel' },
+            ],
+            when: (ctx) => !ctx.flags.action,
+        });
+        const resolved = await resolver.resolve();
+        if (!resolved.action || resolved.action === 'cancel') {
             return;
         }
         // Run the selected subcommand
-        switch (action) {
+        switch (resolved.action) {
             case 'create':
                 await this.config.runCommand('pr:create', []);
                 break;

package/dist/commands/pr/link.d.ts

@@ -1,5 +1,5 @@
-import { Command } from '@oclif/core';
-export default class PRLink extends Command {
+import { PMOCommand } from '../../lib/pmo/index.js';
+export default class PRLink extends PMOCommand {
     static description: string;
     static examples: string[];
     static args: {
@@ -8,7 +8,11 @@ export default class PRLink extends Command {
     static flags: {
         pr: import("@oclif/core/interfaces").OptionFlag<number | undefined, import("@oclif/core/interfaces").CustomOptions>;
         url: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        ticket: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        confirm: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        machine: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        project: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
-    run(): Promise<void>;
+    execute(): Promise<void>;
 }