@proletariat/cli 0.3.36 → 0.3.41

package/dist/commands/repo/view.js

@@ -2,7 +2,7 @@ import { Args } from '@oclif/core';
 import { PMOCommand, pmoBaseFlags } from '../../lib/pmo/index.js';
 import { colors, format } from '../../lib/colors.js';
 import { findHQRoot, getWorkspaceRepoInfo, } from '../../lib/repos/index.js';
-import { openWorkspaceDatabase } from '../../lib/database/index.js';
+import { getWorktreesForRepo } from '../../lib/database/index.js';
 import { shouldOutputJson, outputErrorAsJson, createMetadata, } from '../../lib/prompt-json.js';
 import { visualPadEnd } from '../../lib/string-utils.js';
 export default class View extends PMOCommand {
@@ -102,13 +102,7 @@ export default class View extends PMOCommand {
             }
         }
         // Get agent worktree info
-        const db = openWorkspaceDatabase(hqPath);
-        const worktrees = db.prepare(`
-      SELECT agent_name, is_clean, commits_ahead, branch
-      FROM agent_worktrees
-      WHERE repo_name = ?
-    `).all(repoName);
-        db.close();
+        const worktrees = getWorktreesForRepo(hqPath, repoName);
         if (worktrees.length > 0) {
             this.log(format.subtitle('\n👥 Agent Worktrees:'));
             for (const wt of worktrees) {

package/dist/commands/session/attach.js

@@ -7,7 +7,7 @@ import Database from 'better-sqlite3';
 import { styles } from '../../lib/styles.js';
 import { getWorkspaceInfo } from '../../lib/agents/commands.js';
 import { ExecutionStorage } from '../../lib/execution/index.js';
-import { parseSessionName, getHostTmuxSessionNames, getContainerTmuxSessionMap, flattenContainerSessions, findSessionForExecution, } from '../../lib/execution/session-utils.js';
+import { parseSessionName, getHostTmuxSessionNames, getContainerTmuxSessionMap, flattenContainerSessions, findContainerSessionsByPrefix, findSessionForExecution, } from '../../lib/execution/session-utils.js';
 import { PMOCommand, pmoBaseFlags } from '../../lib/pmo/index.js';
 import { shouldOutputJson, outputErrorAsJson, createMetadata, } from '../../lib/prompt-json.js';
 export default class SessionAttach extends PMOCommand {
@@ -154,7 +154,7 @@ export default class SessionAttach extends PMOCommand {
                 // If sessionId is NULL, try to find session by naming convention
                 if (!exec.sessionId) {
                     if (isContainer && exec.containerId) {
-                        const containerSessions = containerTmuxSessions.get(exec.containerId) || [];
+                        const containerSessions = findContainerSessionsByPrefix(containerTmuxSessions, exec.containerId);
                         const match = findSessionForExecution(exec.ticketId, exec.agentName, containerSessions);
                         if (match) {
                             actualSessionId = match;
@@ -177,8 +177,8 @@ export default class SessionAttach extends PMOCommand {
                 else {
                     // sessionId is set, verify it exists
                     if (isContainer && exec.containerId) {
-                        const containerSessions = containerTmuxSessions.get(exec.containerId);
-                        exists = containerSessions?.includes(exec.sessionId) ?? false;
+                        const containerSessions = findContainerSessionsByPrefix(containerTmuxSessions, exec.containerId);
+                        exists = containerSessions.includes(exec.sessionId);
                         containerId = exec.containerId;
                     }
                     else {

package/dist/commands/session/health.js

@@ -5,7 +5,7 @@ import Database from 'better-sqlite3';
 import { styles } from '../../lib/styles.js';
 import { getWorkspaceInfo } from '../../lib/agents/commands.js';
 import { ExecutionStorage } from '../../lib/execution/index.js';
-import { parseSessionName, getHostTmuxSessionNames, getContainerTmuxSessionMap, flattenContainerSessions, findSessionForExecution, captureTmuxPane, } from '../../lib/execution/session-utils.js';
+import { parseSessionName, getHostTmuxSessionNames, getContainerTmuxSessionMap, flattenContainerSessions, findContainerSessionsByPrefix, findSessionForExecution, captureTmuxPane, } from '../../lib/execution/session-utils.js';
 import { PMOCommand, pmoBaseFlags } from '../../lib/pmo/index.js';
 import { visualPadEnd } from '../../lib/string-utils.js';
 import { shouldOutputJson, outputSuccessAsJson, outputErrorAsJson, createMetadata, } from '../../lib/prompt-json.js';
@@ -168,7 +168,7 @@ export default class SessionHealth extends PMOCommand {
                 // Try to find session if sessionId is NULL
                 if (!exec.sessionId) {
                     if (isContainer && exec.containerId) {
-                        const containerSessions = containerTmuxSessions.get(exec.containerId) || [];
+                        const containerSessions = findContainerSessionsByPrefix(containerTmuxSessions, exec.containerId);
                         const match = findSessionForExecution(exec.ticketId, exec.agentName, containerSessions);
                         if (match) {
                             actualSessionId = match;
@@ -188,8 +188,8 @@ export default class SessionHealth extends PMOCommand {
                 }
                 else {
                     if (isContainer && exec.containerId) {
-                        const containerSessions = containerTmuxSessions.get(exec.containerId);
-                        exists = containerSessions?.includes(exec.sessionId) ?? false;
+                        const containerSessions = findContainerSessionsByPrefix(containerTmuxSessions, exec.containerId);
+                        exists = containerSessions.includes(exec.sessionId);
                         containerId = exec.containerId;
                     }
                     else {

package/dist/commands/session/list.js

@@ -4,28 +4,10 @@ import Database from 'better-sqlite3';
 import { styles } from '../../lib/styles.js';
 import { getWorkspaceInfo } from '../../lib/agents/commands.js';
 import { ExecutionStorage } from '../../lib/execution/index.js';
-import { parseSessionName, getHostTmuxSessionNames, getContainerTmuxSessionMap, flattenContainerSessions, findSessionForExecution, } from '../../lib/execution/session-utils.js';
+import { parseSessionName, getHostTmuxSessionNames, getContainerTmuxSessionMap, flattenContainerSessions, findContainerSessionsByPrefix, findSessionForExecution, } from '../../lib/execution/session-utils.js';
 import { PMOCommand, pmoBaseFlags } from '../../lib/pmo/index.js';
 import { shouldOutputJson } from '../../lib/prompt-json.js';
 import { visualPadEnd } from '../../lib/string-utils.js';
-/**
- * Find container sessions using prefix matching.
- * Handles cases where the stored containerId format differs from docker ps output
- * (e.g., full 64-char ID vs 12-char short ID).
- */
-function findContainerSessionsByPrefix(containerTmuxSessions, containerId) {
-    // Try exact match first
-    const exact = containerTmuxSessions.get(containerId);
-    if (exact)
-        return exact;
-    // Fall back to prefix matching (handles short vs full ID mismatches)
-    for (const [key, sessions] of containerTmuxSessions) {
-        if (key.startsWith(containerId) || containerId.startsWith(key)) {
-            return sessions;
-        }
-    }
-    return [];
-}
 export default class SessionList extends PMOCommand {
     static description = 'List active tmux sessions (host and container)';
     static examples = [

package/dist/commands/session/peek.js

@@ -4,7 +4,7 @@ import Database from 'better-sqlite3';
 import { styles } from '../../lib/styles.js';
 import { getWorkspaceInfo } from '../../lib/agents/commands.js';
 import { ExecutionStorage } from '../../lib/execution/index.js';
-import { parseSessionName, getHostTmuxSessionNames, getContainerTmuxSessionMap, flattenContainerSessions, findSessionForExecution, captureTmuxPane, } from '../../lib/execution/session-utils.js';
+import { parseSessionName, getHostTmuxSessionNames, getContainerTmuxSessionMap, flattenContainerSessions, findContainerSessionsByPrefix, findSessionForExecution, captureTmuxPane, } from '../../lib/execution/session-utils.js';
 import { PMOCommand, pmoBaseFlags } from '../../lib/pmo/index.js';
 import { shouldOutputJson, outputSuccessAsJson, outputErrorAsJson, createMetadata, } from '../../lib/prompt-json.js';
 // =============================================================================
@@ -41,7 +41,7 @@ export default class SessionPeek extends PMOCommand {
         const { args, flags } = await this.parse(SessionPeek);
         const jsonMode = shouldOutputJson(flags);
         // Discover all verified sessions
-        const sessions = this.getVerifiedSessions(jsonMode, flags);
+        const sessions = this.getVerifiedSessions();
         if (sessions.length === 0) {
             if (jsonMode) {
                 outputErrorAsJson('NO_SESSIONS', 'No active sessions found.', createMetadata('session peek', flags));
@@ -201,7 +201,7 @@ export default class SessionPeek extends PMOCommand {
      * Get verified sessions from DB that have actual tmux processes.
      * Same discovery pattern as attach.ts and list.ts.
      */
-    getVerifiedSessions(jsonMode, flags) {
+    getVerifiedSessions() {
         const sessions = [];
         let executionStorage = null;
         let db = null;
@@ -232,7 +232,7 @@ export default class SessionPeek extends PMOCommand {
                 let actualSessionId = exec.sessionId;
                 if (!exec.sessionId) {
                     if (isContainer && exec.containerId) {
-                        const containerSessions = containerTmuxSessions.get(exec.containerId) || [];
+                        const containerSessions = findContainerSessionsByPrefix(containerTmuxSessions, exec.containerId);
                         const match = findSessionForExecution(exec.ticketId, exec.agentName, containerSessions);
                         if (match) {
                             actualSessionId = match;
@@ -252,8 +252,8 @@ export default class SessionPeek extends PMOCommand {
                 }
                 else {
                     if (isContainer && exec.containerId) {
-                        const containerSessions = containerTmuxSessions.get(exec.containerId);
-                        exists = containerSessions?.includes(exec.sessionId) ?? false;
+                        const containerSessions = findContainerSessionsByPrefix(containerTmuxSessions, exec.containerId);
+                        exists = containerSessions.includes(exec.sessionId);
                         containerId = exec.containerId;
                     }
                     else {

package/dist/commands/session/poke.js

@@ -5,7 +5,7 @@ import Database from 'better-sqlite3';
 import { styles } from '../../lib/styles.js';
 import { getWorkspaceInfo } from '../../lib/agents/commands.js';
 import { ExecutionStorage } from '../../lib/execution/index.js';
-import { getHostTmuxSessionNames, getContainerTmuxSessionMap, findSessionForExecution, } from '../../lib/execution/session-utils.js';
+import { getHostTmuxSessionNames, getContainerTmuxSessionMap, findContainerSessionsByPrefix, findSessionForExecution, } from '../../lib/execution/session-utils.js';
 import { PMOCommand, pmoBaseFlags } from '../../lib/pmo/index.js';
 import { shouldOutputJson, outputSuccessAsJson, outputErrorAsJson, createMetadata, } from '../../lib/prompt-json.js';
 // =============================================================================
@@ -183,7 +183,7 @@ export default class SessionPoke extends PMOCommand {
         if (!exec.sessionId) {
             if (isContainer && exec.containerId) {
                 const containerTmuxSessions = getContainerTmuxSessionMap();
-                const containerSessions = containerTmuxSessions.get(exec.containerId) || [];
+                const containerSessions = findContainerSessionsByPrefix(containerTmuxSessions, exec.containerId);
                 const match = findSessionForExecution(exec.ticketId, exec.agentName, containerSessions);
                 if (match) {
                     actualSessionId = match;

package/dist/commands/ticket/epic.js

@@ -68,11 +68,10 @@ export default class TicketEpic extends PMOCommand {
         const projectId = await this.requireProject();
         // Get all epics
         const epics = await this.storage.listEpics(projectId);
-        // Get epic_id for each ticket via direct DB query
-        const db = this.storage.db;
+        // Helper to get ticket's epic ID via storage layer
         const getTicketEpicId = (ticketId) => {
-            const row = db.prepare(`SELECT epic_id FROM pmo_tickets WHERE id = ?`).get(ticketId);
-            return row?.epic_id || null;
+            const ticket = allTickets.find((t) => t.id === ticketId);
+            return ticket?.epicId ?? null;
         };
         let ticketId = args.id;
         let epicId = args['epic-id'];
@@ -119,11 +118,7 @@ export default class TicketEpic extends PMOCommand {
             }
             const currentEpic = epics.find(e => e.id === currentEpicId);
             // Update the ticket
-            db.prepare(`
-        UPDATE pmo_tickets
-        SET epic_id = NULL, updated_at = ?
-        WHERE id = ?
-      `).run(Date.now(), ticketId);
+            await this.storage.unlinkTicketFromEpic(ticketId);
             await autoExportToBoard(this.pmoPath, this.storage, (msg) => this.log(styles.muted(msg)));
             this.log(styles.success(`\n✅ Unlinked ${styles.emphasis(ticketId)} from ${currentEpic?.title || currentEpicId}`));
             this.log(styles.muted(`   Title: ${ticket.title}`));
@@ -156,11 +151,7 @@ export default class TicketEpic extends PMOCommand {
             }
             if (selected === '__none__') {
                 // Unlink
-                db.prepare(`
-          UPDATE pmo_tickets
-          SET epic_id = NULL, updated_at = ?
-          WHERE id = ?
-        `).run(Date.now(), ticketId);
+                await this.storage.unlinkTicketFromEpic(ticketId);
                 const currentEpic = epics.find(e => e.id === currentEpicId);
                 await autoExportToBoard(this.pmoPath, this.storage, (msg) => this.log(styles.muted(msg)));
                 this.log(styles.success(`\n✅ Unlinked ${styles.emphasis(ticketId)} from ${currentEpic?.title || currentEpicId}`));
@@ -180,11 +171,7 @@ export default class TicketEpic extends PMOCommand {
             return;
         }
         // Update the ticket
-        db.prepare(`
-      UPDATE pmo_tickets
-      SET epic_id = ?, updated_at = ?
-      WHERE id = ?
-    `).run(epicId, Date.now(), ticketId);
+        await this.storage.linkTicketToEpic(ticketId, epicId);
         await autoExportToBoard(this.pmoPath, this.storage, (msg) => this.log(styles.muted(msg)));
         this.log(styles.success(`\n✅ Linked ${styles.emphasis(ticketId)} to ${styles.emphasis(epicId)}`));
         this.log(styles.muted(`   Title: ${ticket.title}`));
@@ -202,35 +189,21 @@ export default class TicketEpic extends PMOCommand {
             this.log(styles.warning('No tickets found.'));
             return;
         }
-        // Get epics from database
-        const db = this.storage.db;
-        const epics = db.prepare(`
-      SELECT id, title, status FROM pmo_epics
-      WHERE project_id = ?
-      ORDER BY status, title
-    `).all(projectId);
+        // Get epics via storage layer
+        const epics = await this.storage.listEpics(projectId);
         // Filter tickets if --from-epic specified
         let filteredTickets = allTickets;
         if (flags['from-epic']) {
-            // Get tickets with matching epic_id via metadata or direct query
-            const epicTickets = db.prepare(`
-        SELECT id FROM pmo_tickets
-        WHERE project_id = ? AND epic_id = ?
-      `).all(projectId, flags['from-epic']);
-            const epicTicketIds = new Set(epicTickets.map(t => t.id));
-            filteredTickets = allTickets.filter(t => epicTicketIds.has(t.id));
+            filteredTickets = allTickets.filter(t => t.epicId === flags['from-epic']);
         }
         if (filteredTickets.length === 0) {
             this.log(styles.warning('No tickets found matching filter.'));
             return;
         }
-        // Get current epic for each ticket
+        // Get current epic for each ticket (already available on Ticket objects)
         const ticketEpics = new Map();
         for (const ticket of filteredTickets) {
-            const row = db.prepare(`
-        SELECT epic_id FROM pmo_tickets WHERE id = ?
-      `).get(ticket.id);
-            ticketEpics.set(ticket.id, row?.epic_id || null);
+            ticketEpics.set(ticket.id, ticket.epicId ?? null);
         }
         // Select tickets to link
         const { selectedTickets } = await this.prompt([{
@@ -302,11 +275,12 @@ export default class TicketEpic extends PMOCommand {
         let failCount = 0;
         for (const ticketId of selectedTickets) {
             try {
-                db.prepare(`
-          UPDATE pmo_tickets
-          SET epic_id = ?, updated_at = ?
-          WHERE id = ?
-        `).run(targetEpic, Date.now(), ticketId);
+                if (targetEpic) {
+                    await this.storage.linkTicketToEpic(ticketId, targetEpic);
+                }
+                else {
+                    await this.storage.unlinkTicketFromEpic(ticketId);
+                }
                 const action = targetEpic ? `Linked to ${targetEpic}` : 'Removed epic link';
                 this.log(styles.success(`${ticketId}: ${action}`));
                 successCount++;

package/dist/commands/work/spawn-all.js

@@ -24,7 +24,7 @@ export default class WorkSpawnAll extends PMOCommand {
             default: false,
         }),
         'create-pr': Flags.boolean({
-            description: 'Create PR when work is ready',
+            description: 'Create PR when work is ready (canonical flag for PR behavior)',
             default: false,
         }),
         executor: Flags.string({

package/dist/commands/work/spawn.js

@@ -25,6 +25,7 @@ export default class WorkSpawn extends PMOCommand {
         '<%= config.bin %> <%= command.id %> --count 5 --category ship --action implement  # Filtered by category',
         '<%= config.bin %> <%= command.id %> --count 5 --priority P0 --action implement  # Filtered by priority',
         '<%= config.bin %> <%= command.id %> --count 10 --diet --category ship,grow --action groom  # Combined',
+        '<%= config.bin %> <%= command.id %> TKT-001 TKT-002 --create-pr  # Create PR when work is ready',
     ];
     static flags = {
         ...pmoBaseFlags,
@@ -93,11 +94,11 @@ export default class WorkSpawn extends PMOCommand {
             default: false,
         }),
         'create-pr': Flags.boolean({
-            description: 'Create PR when work is ready (batch mode only)',
+            description: 'Create PR when work is ready (canonical flag for PR behavior, batch mode only)',
             default: false,
         }),
         'no-pr': Flags.boolean({
-            description: 'Do not create PR when work is ready (batch mode only)',
+            description: '[deprecated: use --create-pr instead] Skip PR creation (batch mode only)',
             default: false,
         }),
         action: Flags.string({
@@ -153,6 +154,10 @@ export default class WorkSpawn extends PMOCommand {
             }
             this.error(message);
         };
+        // Deprecation guidance for --no-pr
+        if (flags['no-pr']) {
+            this.warn('--no-pr is deprecated. Omit --create-pr instead (PR creation is off by default). --no-pr will continue to work.');
+        }
         // Parse ticket IDs from args (everything after flags)
         const ticketIdArgs = argv;
         // Try to infer project from ticket IDs if provided
@@ -294,6 +299,7 @@ export default class WorkSpawn extends PMOCommand {
                     else if (allFlagsProvided && !flags.yes) {
                         // All flags provided but no --yes: return confirmation_needed with plan
                         const metadata = createMetadata('work spawn', flags);
+                        metadata.resolvedPRMode = flags['create-pr'] ? 'create-pr' : 'no-pr';
                         // Build the confirm command with --yes
                         const ticketIds = ticketsToSpawn.map(t => t.id).join(' ');
                         let confirmCmd = `prlt work spawn ${ticketIds}`;
@@ -594,6 +600,7 @@ export default class WorkSpawn extends PMOCommand {
                 // In JSON mode without --yes, return confirmation_needed
                 if (jsonMode && !flags.yes) {
                     const metadata = createMetadata('work spawn', flags);
+                    metadata.resolvedPRMode = flags['create-pr'] ? 'create-pr' : 'no-pr';
                     const ticketIds = ticketsToSpawn.map(t => t.id).join(' ');
                     let confirmCmd = `prlt work spawn ${ticketIds}`;
                     if (flags.action)
@@ -1394,12 +1401,16 @@ export default class WorkSpawn extends PMOCommand {
             db.close();
             // Output results
             if (jsonMode) {
-                // Output JSON execution results
-                outputExecutionResultAsJson(executionResults, successCount, failCount, createMetadata('work spawn', flags));
+                // Output JSON execution results with resolved PR mode
+                const spawnMetadata = createMetadata('work spawn', flags);
+                spawnMetadata.resolvedPRMode = flags['create-pr'] ? 'create-pr' : 'no-pr';
+                outputExecutionResultAsJson(executionResults, successCount, failCount, spawnMetadata);
             }
             else {
+                const resolvedPRMode = flags['create-pr'] ? 'create-pr' : 'no-pr';
                 this.log('');
                 this.log(styles.success(`✓ Spawn results: ${successCount} started, ${failCount} failed`));
+                this.log(styles.muted(`   PR mode: ${resolvedPRMode}`));
             }
         }
         catch (error) {

package/dist/commands/work/start.js

@@ -71,6 +71,7 @@ export default class WorkStart extends PMOCommand {
     static description = 'Start work on a ticket (launches an agent to implement it)';
     static examples = [
         '<%= config.bin %> <%= command.id %> TKT-001',
+        '<%= config.bin %> <%= command.id %> TKT-001 --create-pr  # Create PR when work is ready',
         '<%= config.bin %> <%= command.id %> TKT-001 --mode foreground',
         '<%= config.bin %> <%= command.id %> TKT-001 --mode tmux',
         '<%= config.bin %> <%= command.id %> TKT-001 --mode terminal',
@@ -137,11 +138,11 @@ export default class WorkStart extends PMOCommand {
             default: false,
         }),
         'create-pr': Flags.boolean({
-            description: 'Create PR when work is ready',
+            description: 'Create PR when work is ready (canonical flag for PR behavior)',
             default: false,
         }),
         'no-pr': Flags.boolean({
-            description: 'Do not create PR when work is ready',
+            description: '[deprecated: use --create-pr instead] Skip PR creation when work is ready',
             default: false,
         }),
         output: Flags.string({
@@ -193,6 +194,10 @@ export default class WorkStart extends PMOCommand {
         if (flags['create-pr'] && flags['no-pr']) {
             this.error('--create-pr and --no-pr are mutually exclusive');
         }
+        // Deprecation guidance for --no-pr
+        if (flags['no-pr']) {
+            this.warn('--no-pr is deprecated. Omit --create-pr instead (PR creation is off by default). --no-pr will continue to work.');
+        }
         // Handle --skip-permissions flag (alias for --permission-mode danger)
         // Check for conflicting flags first
         if (flags['skip-permissions'] && flags['permission-mode']) {
@@ -272,6 +277,7 @@ export default class WorkStart extends PMOCommand {
                 if (allFlagsProvided && !flags.yes) {
                     // All flags provided but no --yes: return confirmation_needed with plan
                     const metadata = createMetadata('work start', flags);
+                    metadata.resolvedPRMode = flags['create-pr'] ? 'create-pr' : 'no-pr';
                     // Build the confirm command with --yes
                     let confirmCmd = `prlt work start ${ticketId}`;
                     if (flags.action)
@@ -1281,9 +1287,7 @@ export default class WorkStart extends PMOCommand {
                     this.log(styles.warning(`   Permissions: ⚠️  danger (--dangerously-skip-permissions)`));
                 }
                 this.log(styles.muted(`   Output: ${outputMode === 'interactive' ? 'streaming (watch Claude work)' : 'print (final result only)'}`));
-                if (ghAvailable) {
-                    this.log(styles.muted(`   Create PR: ${createPR ? 'yes (when work is ready)' : 'no'}`));
-                }
+                this.log(styles.muted(`   PR mode: ${createPR ? 'create-pr' : 'no-pr'}${ghAvailable ? '' : ' (gh CLI not available)'}`));
                 this.log(styles.muted(`   Worktree: ${worktreePath}`));
                 this.log(styles.muted(`   Branch: ${branch}`));
                 this.log('');
@@ -1585,7 +1589,9 @@ export default class WorkStart extends PMOCommand {
                 });
                 // Output results
                 if (jsonMode) {
-                    // Output JSON execution result
+                    // Output JSON execution result with resolved PR mode
+                    const metadata = createMetadata('work start', flags);
+                    metadata.resolvedPRMode = createPR ? 'create-pr' : 'no-pr';
                     outputExecutionResultAsJson([{
                             workId: execution.id,
                             ticketId: ticket.id,
@@ -1593,7 +1599,7 @@ export default class WorkStart extends PMOCommand {
                             sessionId: result.sessionId,
                             containerId: result.containerId,
                             status: 'running',
-                        }], 1, 0, createMetadata('work start', flags));
+                        }], 1, 0, metadata);
                 }
                 else {
                     this.log('');
@@ -1608,13 +1614,15 @@ export default class WorkStart extends PMOCommand {
             else {
                 executionStorage.updateStatus(execution.id, 'failed');
                 if (jsonMode) {
-                    // Output JSON failure result
+                    // Output JSON failure result with resolved PR mode
+                    const failMetadata = createMetadata('work start', flags);
+                    failMetadata.resolvedPRMode = createPR ? 'create-pr' : 'no-pr';
                     outputExecutionResultAsJson([{
                             workId: execution.id,
                             ticketId: ticket.id,
                             agent: assignedAgent,
                             status: 'failed',
-                        }], 0, 1, createMetadata('work start', flags));
+                        }], 0, 1, failMetadata);
                 }
                 else {
                     this.error(`Failed to start work: ${result.error}`);

package/dist/commands/work/watch.js

@@ -60,7 +60,7 @@ export default class WorkWatch extends PMOCommand {
             default: false,
         }),
         'create-pr': Flags.boolean({
-            description: 'Create PR when work is ready',
+            description: 'Create PR when work is ready (canonical flag for PR behavior)',
             default: false,
         }),
     };

package/dist/commands/workspace/prune.js

@@ -29,10 +29,10 @@ export default class WorkspacePrune extends PromptCommand {
     };
     async run() {
         const { flags } = await this.parse(WorkspacePrune);
-        // In non-TTY mode without --json (CI, scripts, piped), default to dry-run unless --force is set.
-        // In --json mode, we use confirmation_needed output instead of auto-dry-run so agents can review and confirm.
+        // In non-TTY mode (CI, scripts, piped), default to dry-run unless --force is set.
+        // This applies regardless of output format (text or JSON).
         const nonTTY = isNonTTY();
-        const effectiveDryRun = flags['dry-run'] || (!shouldOutputJson(flags) && nonTTY && !flags.force);
+        const effectiveDryRun = flags['dry-run'] || (nonTTY && !flags.force);
         // Find stale entries
         const staleWorkspaces = this.findStaleWorkspaces();
         const staleAgents = this.findStaleAgents();

package/dist/hooks/init.js

@@ -8,13 +8,24 @@ import { findHQRoot } from '../lib/workspace.js';
  * - No workspaces are registered in machine config (~/.proletariat/config.json)
  * - AND they're not currently inside a valid HQ directory
  */
-const hook = async function ({ id, config }) {
-    // Skip for init command to avoid infinite loop
-    if (id === 'init') {
+const hook = async function ({ id, argv, config }) {
+    // Skip for commands that work without an HQ
+    const hqOptionalCommands = ['init', 'commit', 'claude', 'pmo:init'];
+    if (id && hqOptionalCommands.some(cmd => id === cmd || id.startsWith(cmd + ':'))) {
         return;
     }
-    // Skip when --help flag is present - help should always be available
-    if (process.argv.includes('--help') || process.argv.includes('-h')) {
+    // Skip when running under oclif tooling (manifest, readme generation)
+    // These run commands to scan metadata and should not trigger the init flow
+    if (process.env.OCLIF_COMPILATION || process.argv[1]?.includes('oclif')) {
+        return;
+    }
+    // Skip when --help or --version flags are present - these should always be available
+    // Check both process.argv (production CLI) and the oclif-provided argv
+    // (programmatic invocation via @oclif/test runCommand)
+    if (process.argv.includes('--help') || process.argv.includes('-h') ||
+        argv?.includes('--help') || argv?.includes('-h') ||
+        process.argv.includes('--version') || process.argv.includes('-v') ||
+        argv?.includes('--version') || argv?.includes('-v')) {
         return;
     }
     // Skip for help-related commands/flags
@@ -22,10 +33,10 @@ const hook = async function ({ id, config }) {
     if (!id || id === 'help') {
         // Check if this is first-time user running bare `prlt`
         if (!id && isFirstTimeUser()) {
-            // Run init command
+            // Run init command - in TTY it prompts interactively,
+            // in non-TTY it outputs a JSON prompt for the HQ name
             const { run } = await import('@oclif/core');
             await run(['init'], config);
-            // Exit after init completes to prevent showing help
             process.exit(0);
         }
         return;
@@ -33,11 +44,11 @@ const hook = async function ({ id, config }) {
     // For all other commands, check if first-time user
     if (isFirstTimeUser()) {
         const chalk = await import('chalk');
-        console.log(chalk.default.yellow('\n⚠️  No workspace found. Let\'s set one up first.\n'));
-        // Run init command
+        console.log(chalk.default.yellow('\n⚠️  No headquarters found. Let\'s set one up first.\n'));
+        // Run init command - in TTY it prompts interactively,
+        // in non-TTY it outputs a JSON prompt for the HQ name
         const { run } = await import('@oclif/core');
         await run(['init'], config);
-        // Exit after init - user should re-run their original command
         console.log(chalk.default.blue(`\n✅ Setup complete! You can now run: prlt ${id}\n`));
         process.exit(0);
     }

package/dist/lib/agents/commands.d.ts

@@ -111,6 +111,11 @@ export interface EphemeralAgentResult {
 /**
  * Create an ephemeral agent on-demand for a spawn operation.
  * Creates worktree in agents/temp/{name}/
+ *
+ * Concurrency-safe: if the generated name collides at the DB level
+ * (e.g. a parallel process inserted the same name first), we clean up
+ * the on-disk artifacts, regenerate a name, and retry up to
+ * EPHEMERAL_CREATE_MAX_RETRIES times.
  */
 export declare function createEphemeralAgent(workspaceInfo: WorkspaceInfo, options?: EphemeralAgentOptions): Promise<EphemeralAgentResult>;
 /**