@proletariat/cli 0.3.26 → 0.3.28

package/dist/commands/ticket/list.js

@@ -3,6 +3,7 @@ import { pmoBaseFlags } from '../../lib/pmo/index.js';
 import { PRIORITIES } from '../../lib/pmo/types.js';
 import { getPMOContext } from '../../lib/pmo/pmo-context.js';
 import { styles, formatPriority, formatCategory, getColumnStyle, getColumnEmoji, divider, getPriorityStyle, } from '../../lib/styles.js';
+import { isNonTTY } from '../../lib/prompt-json.js';
 // Priority order for grouping: P0, P1, P2, P3, None
 const PRIORITY_ORDER = ['P0', 'P1', 'P2', 'P3', 'None'];
 export default class TicketList extends Command {
@@ -67,6 +68,10 @@ export default class TicketList extends Command {
     };
     async run() {
         const { flags } = await this.parse(TicketList);
+        // Default format to 'json' in non-TTY environments (piped output, CI, agents)
+        if (flags.format === 'table' && isNonTTY()) {
+            flags.format = 'json';
+        }
         // When --all is set, we don't need to select a specific project
         // Otherwise, use the normal project selection flow
         // Get PMO context - no project selection needed
@@ -110,10 +115,12 @@ export default class TicketList extends Command {
                 // Get the project board to validate the column
                 const targetProjectId = projectId || (await pmoContext.storage.listProjectSummaries())[0]?.id;
                 if (targetProjectId) {
-                    const board = await pmoContext.storage.getBoard(targetProjectId);
-                    const validColumns = board.columns.map(c => c.name);
-                    if (!validColumns.includes(flags.column)) {
-                        this.error(`Column "${flags.column}" not found. Valid columns: ${validColumns.join(', ')}`);
+                    const board = await pmoContext.storage.getProjectBoard(targetProjectId);
+                    if (board) {
+                        const validColumns = board.columns.map(c => c.name);
+                        if (!validColumns.includes(flags.column)) {
+                            this.error(`Column "${flags.column}" not found. Valid columns: ${validColumns.join(', ')}`);
+                        }
                     }
                 }
             }
@@ -149,7 +156,19 @@ export default class TicketList extends Command {
                     this.log(styles.warning('No project found.'));
                     return;
                 }
-                const board = await pmoContext.storage.getBoard(actualProjectId);
+                const board = await pmoContext.storage.getProjectBoard(actualProjectId);
+                if (!board) {
+                    // Project doesn't exist (orphaned tickets) - fall back to cross-project view
+                    this.log(styles.warning(`Project "${actualProjectId}" not found. Showing tickets without board layout.`));
+                    switch (flags.format) {
+                        case 'json':
+                            this.log(JSON.stringify(tickets, null, 2));
+                            break;
+                        default:
+                            this.outputCrossProjectTable(tickets, groupBy);
+                    }
+                    return;
+                }
                 const columns = board.columns.map(col => col.name);
                 switch (flags.format) {
                     case 'json':

package/dist/commands/ticket/move.js

@@ -216,7 +216,10 @@ export default class TicketMove extends PMOCommand {
             this.log(styles.emphasis('📦 Move Multiple Tickets\n'));
         }
         // Get columns
-        const board = await this.storage.getBoard(projectId);
+        const board = await this.storage.getProjectBoard(projectId);
+        if (!board) {
+            this.error(`Project "${projectId}" not found. The ticket may belong to an orphaned project.`);
+        }
         const columns = board.columns.map(col => col.name);
         // Agent mode config for prompts
         const jsonModeConfig = flags.json ? { flags, commandName: 'ticket move --bulk' } : null;

package/dist/commands/ticket/view.js

@@ -63,11 +63,13 @@ export default class TicketView extends PMOCommand {
         if (!ticket) {
             this.error(`Ticket "${ticketId}" not found.`);
         }
-        const board = await this.storage.getBoard(ticket.projectId);
+        // Get project board (may be null if project was deleted/orphaned)
+        const board = ticket.projectId ? await this.storage.getProjectBoard(ticket.projectId) : null;
+        const projectName = board?.name || ticket.projectId || 'Unknown';
         // Display ticket details
         this.log(`\n${styles.header('📄 Ticket')} ${styles.emphasis(ticket.id)}\n`);
         this.log(`${styles.header('Title:')}       ${ticket.title}`);
-        this.log(`${styles.header('Project:')}     ${board.name}`);
+        this.log(`${styles.header('Project:')}     ${projectName}`);
         this.log(`${styles.header('Status:')}      ${ticket.statusName}`);
         this.log(`${styles.header('Priority:')}    ${ticket.priority || 'none'}`);
         this.log(`${styles.header('Category:')}    ${ticket.category || 'none'}`);

package/dist/commands/whoami.d.ts

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

package/dist/commands/whoami.js

@@ -4,18 +4,39 @@ import * as fs from 'node:fs';
 import { execSync } from 'node:child_process';
 import { colors } from '../lib/colors.js';
 import { getAgentByPath } from '../lib/database/index.js';
+import { shouldOutputJson } from '../lib/prompt-json.js';
+import { machineOutputFlags } from '../lib/pmo/index.js';
 export default class Whoami extends Command {
     static description = 'Show current agent/environment context';
     static examples = [
         '<%= config.bin %> <%= command.id %>',
     ];
+    static flags = {
+        ...machineOutputFlags,
+    };
     async run() {
-        await this.parse(Whoami);
+        const { flags } = await this.parse(Whoami);
+        const jsonMode = shouldOutputJson(flags);
         const isDevcontainer = process.env.DEVCONTAINER === 'true';
         const agentName = this.detectAgentName();
         const repoName = this.detectRepoName();
         const branch = this.getCurrentBranch();
         const hqPath = process.env.PRLT_HQ_PATH;
+        const pmoPath = process.env.PRLT_PMO_PATH;
+        const hostPath = process.env.PRLT_HOST_PATH;
+        if (jsonMode) {
+            this.log(JSON.stringify({
+                agent: agentName,
+                repository: repoName,
+                branch,
+                environment: isDevcontainer ? 'devcontainer' : 'host',
+                workingDir: process.cwd(),
+                hqPath: hqPath || null,
+                pmoPath: pmoPath || null,
+                hostPath: hostPath || null,
+            }, null, 2));
+            return;
+        }
         this.log('');
         this.log(colors.primary('🔍 Proletariat Context'));
         this.log('');
@@ -41,13 +62,9 @@ export default class Whoami extends Command {
         if (hqPath) {
             this.log(`  HQ path:     ${colors.textMuted(hqPath)}`);
         }
-        // Show PMO path if available
-        const pmoPath = process.env.PRLT_PMO_PATH;
         if (pmoPath) {
             this.log(`  PMO path:    ${colors.textMuted(pmoPath)}`);
         }
-        // Show host path if available (set in devcontainer for agent identity)
-        const hostPath = process.env.PRLT_HOST_PATH;
         if (hostPath) {
             this.log(`  Host path:   ${colors.textMuted(hostPath)}`);
         }

package/dist/commands/work/complete.js

@@ -91,8 +91,8 @@ export default class WorkComplete extends PMOCommand {
             }
             // Get configured column name (from pmo_settings or default)
             const targetColumnName = getWorkColumnSetting(db, 'done');
-            const board = await this.storage.getBoard(ticket.projectId);
-            const columnNames = board.columns.map(col => col.name);
+            const board = ticket.projectId ? await this.storage.getProjectBoard(ticket.projectId) : null;
+            const columnNames = board ? board.columns.map(col => col.name) : [];
             const doneColumn = findColumnByName(columnNames, targetColumnName);
             if (!doneColumn) {
                 db.close();

package/dist/commands/work/ready.js

@@ -113,8 +113,8 @@ export default class WorkReady extends PMOCommand {
             // Get configured column name (from pmo_settings or default)
             // "ready" moves ticket to Review column (work complete moves to Done)
             const targetColumnName = getWorkColumnSetting(db, 'review');
-            const board = await this.storage.getBoard(ticket.projectId);
-            const columnNames = board.columns.map(col => col.name);
+            const board = ticket.projectId ? await this.storage.getProjectBoard(ticket.projectId) : null;
+            const columnNames = board ? board.columns.map(col => col.name) : [];
             const reviewColumn = findColumnByName(columnNames, targetColumnName);
             if (!reviewColumn) {
                 db.close();

package/dist/commands/work/revise.js

@@ -304,8 +304,8 @@ export default class WorkRevise extends PMOCommand {
             this.log('');
             // Move ticket back to In Progress column
             const inProgressColumnName = getWorkColumnSetting(db, 'in_progress');
-            const board = await this.storage.getBoard(ticket.projectId);
-            const columnNames = board.columns.map(col => col.name);
+            const board = ticket.projectId ? await this.storage.getProjectBoard(ticket.projectId) : null;
+            const columnNames = board ? board.columns.map(col => col.name) : [];
             const inProgressColumn = findColumnByName(columnNames, inProgressColumnName);
             if (inProgressColumn && ticket.statusName !== inProgressColumn) {
                 await this.storage.moveTicket(ticket.projectId, ticket.id, inProgressColumn);

package/dist/commands/work/spawn.js

@@ -743,22 +743,9 @@ export default class WorkSpawn extends PMOCommand {
                 }
                 // Prompt for environment (devcontainer vs host) if devcontainer available and not already set
                 if (hasDevcontainer && !batchRunOnHost && !batchDisplay) {
-                    // Check devcontainer prerequisites upfront
-                    const dockerRunning = isDockerRunning();
-                    const devcontainerCliInstalled = isDevcontainerCliInstalled();
-                    const devcontainerReady = dockerRunning && devcontainerCliInstalled;
-                    // Build missing requirements message for devcontainer option
-                    let devcontainerLabel = '🐳 devcontainer (sandboxed, recommended)';
-                    if (!devcontainerReady) {
-                        const missing = [];
-                        if (!dockerRunning)
-                            missing.push('Docker');
-                        if (!devcontainerCliInstalled)
-                            missing.push('devcontainer CLI');
-                        devcontainerLabel = `🐳 devcontainer (requires: ${missing.join(', ')})`;
-                    }
+                    const devcontainerLabel = '🐳 devcontainer (sandboxed, recommended)';
                     const envChoices = [
-                        { name: devcontainerLabel, value: 'devcontainer', disabled: !devcontainerReady },
+                        { name: devcontainerLabel, value: 'devcontainer' },
                         { name: '💻 host (runs directly on your machine)', value: 'host' },
                         { name: '✗  cancel', value: 'cancel' },
                     ];
@@ -774,7 +761,7 @@ export default class WorkSpawn extends PMOCommand {
                             flagName: 'selectedEnvironment',
                             type: 'list',
                             message: 'Where should agents run?',
-                            default: devcontainerReady ? 'devcontainer' : 'host',
+                            default: 'devcontainer',
                             choices: () => envChoices,
                         });
                         await envResolver.resolve();
@@ -791,7 +778,7 @@ export default class WorkSpawn extends PMOCommand {
                                 name: 'selectedEnvironment',
                                 message: 'Where should agents run?',
                                 choices: envChoices,
-                                default: devcontainerReady ? 'devcontainer' : 'host',
+                                default: 'devcontainer',
                             },
                         ], spawnJsonModeConfig);
                         if (selectedEnvironment === 'cancel') {
@@ -800,12 +787,10 @@ export default class WorkSpawn extends PMOCommand {
                             return;
                         }
                         if (selectedEnvironment === 'devcontainer') {
-                            // Double-check prerequisites (in case user retried after starting Docker)
+                            // Dynamically check Docker when selected (user may have started it)
                             if (!isDockerRunning()) {
                                 this.log('');
-                                this.warn('Docker is not running.\n' +
-                                    'Docker is required for devcontainer execution.\n' +
-                                    'Please start Docker Desktop or select "host" to run directly on your machine.');
+                                this.warn('Docker is not running. Please start Docker and try again.');
                                 this.log('');
                                 continue;
                             }

package/dist/commands/work/start.js

@@ -768,22 +768,9 @@ export default class WorkStart extends PMOCommand {
             let sandboxed = false; // Whether --dangerously-skip-permissions is NOT used
             if (hasDevcontainer && !flags.display && !flags['run-on-host']) {
                 // Agent has devcontainer - prompt for environment choice
-                // Check devcontainer prerequisites upfront
-                const dockerRunning = isDockerRunning();
-                const devcontainerCliInstalled = isDevcontainerCliInstalled();
-                const devcontainerReady = dockerRunning && devcontainerCliInstalled;
-                // Build missing requirements message for devcontainer option
-                let devcontainerLabel = '🐳 devcontainer (sandboxed, recommended)';
-                if (!devcontainerReady) {
-                    const missing = [];
-                    if (!dockerRunning)
-                        missing.push('Docker');
-                    if (!devcontainerCliInstalled)
-                        missing.push('devcontainer CLI');
-                    devcontainerLabel = `🐳 devcontainer (requires: ${missing.join(', ')})`;
-                }
+                const devcontainerLabel = '🐳 devcontainer (sandboxed, recommended)';
                 const envChoices = [
-                    { name: devcontainerLabel, value: 'devcontainer', disabled: !devcontainerReady },
+                    { name: devcontainerLabel, value: 'devcontainer' },
                     { name: '💻 host (runs directly on your machine)', value: 'host' },
                     { name: '✗  cancel', value: 'cancel' },
                 ];
@@ -799,7 +786,7 @@ export default class WorkStart extends PMOCommand {
                         flagName: 'selectedEnvironment',
                         type: 'list',
                         message: 'Where should the agent run?',
-                        default: devcontainerReady ? 'devcontainer' : 'host',
+                        default: 'devcontainer',
                         choices: () => envChoices,
                     });
                     await envResolver.resolve();
@@ -817,7 +804,7 @@ export default class WorkStart extends PMOCommand {
                             name: 'selectedEnvironment',
                             message: 'Where should the agent run?',
                             choices: envChoices,
-                            default: devcontainerReady ? 'devcontainer' : 'host',
+                            default: 'devcontainer',
                         },
                     ], jsonModeConfig);
                     if (selectedEnvironment === 'cancel') {
@@ -826,12 +813,10 @@ export default class WorkStart extends PMOCommand {
                         return;
                     }
                     if (selectedEnvironment === 'devcontainer') {
-                        // Double-check prerequisites (in case user retried after starting Docker)
+                        // Dynamically check Docker when selected (user may have started it)
                         if (!isDockerRunning()) {
                             this.log('');
-                            this.warn('Docker is not running.\n' +
-                                'Docker is required for devcontainer execution.\n' +
-                                'Please start Docker Desktop or select "host" to run directly on your machine.');
+                            this.warn('Docker is not running. Please start Docker and try again.');
                             this.log('');
                             continue; // Re-prompt for environment selection
                         }
@@ -1452,8 +1437,8 @@ export default class WorkStart extends PMOCommand {
                 // Move ticket to target column based on action's defaultMoveToCategory
                 // If action has a target category, find the matching column; otherwise use "started" default
                 const targetCategory = selectedAction?.defaultMoveToCategory || 'started';
-                const board = await this.storage.getBoard(ticket.projectId);
-                const columnNames = board.columns.map(col => col.name);
+                const board = ticket.projectId ? await this.storage.getProjectBoard(ticket.projectId) : null;
+                const columnNames = board ? board.columns.map(col => col.name) : [];
                 // Map category to column type for lookup
                 const columnType = targetCategory === 'started' ? 'in_progress' :
                     targetCategory === 'unstarted' ? 'planned' :
@@ -1868,8 +1853,8 @@ export default class WorkStart extends PMOCommand {
             }
             // Move ticket to In Progress column ONLY after successful spawn
             const targetColumnName = getWorkColumnSetting(db, 'in_progress');
-            const board = await this.storage.getBoard(ticket.projectId);
-            const columnNames = board.columns.map(col => col.name);
+            const board = ticket.projectId ? await this.storage.getProjectBoard(ticket.projectId) : null;
+            const columnNames = board ? board.columns.map(col => col.name) : [];
             const inProgressColumn = findColumnByName(columnNames, targetColumnName);
             if (inProgressColumn && ticket.status !== inProgressColumn) {
                 await this.storage.moveTicket(ticket.projectId, ticket.id, inProgressColumn);

package/dist/commands/work/watch.js

@@ -161,42 +161,66 @@ export default class WorkWatch extends PMOCommand {
                 const agentDir = path.join(workspaceInfo.agentsPath, agent.name);
                 return hasDevcontainerConfig(agentDir);
             });
-            // Docker check
-            const dockerRunning = isDockerRunning();
-            if (hasDevcontainer && !dockerRunning) {
-                this.warn('Docker is not running. Agents will run on host instead of devcontainer.\n' +
-                    'Start Docker Desktop for sandboxed execution.');
-            }
-            // Devcontainer CLI check
-            const devcontainerCliInstalled = isDevcontainerCliInstalled();
-            if (hasDevcontainer && dockerRunning && !devcontainerCliInstalled) {
-                this.warn('devcontainer CLI is not installed. Agents will run on host instead of devcontainer.\n' +
-                    'Install with: npm install -g @devcontainers/cli');
-            }
             // Prompt for environment and display mode if not provided
             this.environment = 'host';
             this.displayMode = 'terminal';
             if (!flags.mode) {
-                if (hasDevcontainer && dockerRunning && devcontainerCliInstalled) {
-                    // Use FlagResolver for environment selection
-                    const envResolver = new FlagResolver({
-                        commandName: 'work watch',
-                        baseCommand: 'prlt work watch',
-                        jsonMode,
-                        flags: {},
-                    });
-                    envResolver.addPrompt({
-                        flagName: 'selectedEnvironment',
-                        type: 'list',
-                        message: 'Where should agents run?',
-                        default: 'devcontainer',
-                        choices: () => [
-                            { name: '🐳 devcontainer (sandboxed, recommended)', value: 'devcontainer' },
-                            { name: '💻 host (runs directly on your machine)', value: 'host' },
-                        ],
-                    });
-                    const envResult = await envResolver.resolve();
-                    this.environment = envResult.selectedEnvironment;
+                if (hasDevcontainer) {
+                    const envChoices = [
+                        { name: '🐳 devcontainer (sandboxed, recommended)', value: 'devcontainer' },
+                        { name: '💻 host (runs directly on your machine)', value: 'host' },
+                    ];
+                    if (jsonMode) {
+                        // In JSON mode, use FlagResolver (outputs prompt and exits)
+                        const envResolver = new FlagResolver({
+                            commandName: 'work watch',
+                            baseCommand: 'prlt work watch',
+                            jsonMode,
+                            flags: {},
+                        });
+                        envResolver.addPrompt({
+                            flagName: 'selectedEnvironment',
+                            type: 'list',
+                            message: 'Where should agents run?',
+                            default: 'devcontainer',
+                            choices: () => envChoices,
+                        });
+                        await envResolver.resolve();
+                        return; // unreachable, but satisfies TypeScript
+                    }
+                    // Interactive mode: loop to handle Docker not running
+                    let environmentSelected = false;
+                    while (!environmentSelected) {
+                        // eslint-disable-next-line no-await-in-loop -- Interactive loop with retry on Docker check
+                        const { selectedEnvironment } = await this.prompt([
+                            {
+                                type: 'list',
+                                name: 'selectedEnvironment',
+                                message: 'Where should agents run?',
+                                choices: envChoices,
+                                default: 'devcontainer',
+                            },
+                        ], null);
+                        if (selectedEnvironment === 'devcontainer') {
+                            // Dynamically check Docker when selected (user may have started it)
+                            if (!isDockerRunning()) {
+                                this.log('');
+                                this.warn('Docker is not running. Please start Docker and try again.');
+                                this.log('');
+                                continue;
+                            }
+                            if (!isDevcontainerCliInstalled()) {
+                                this.log('');
+                                this.warn('devcontainer CLI is not installed.\n' +
+                                    'Install with: npm install -g @devcontainers/cli\n' +
+                                    'Or select "host" to run directly on your machine.');
+                                this.log('');
+                                continue;
+                            }
+                        }
+                        this.environment = selectedEnvironment;
+                        environmentSelected = true;
+                    }
                 }
                 // Use FlagResolver for display mode
                 const displayResolver = new FlagResolver({
@@ -220,7 +244,7 @@ export default class WorkWatch extends PMOCommand {
             }
             else {
                 this.displayMode = flags.mode;
-                this.environment = hasDevcontainer && dockerRunning ? 'devcontainer' : 'host';
+                this.environment = hasDevcontainer && isDockerRunning() ? 'devcontainer' : 'host';
             }
             // Prompt for execution settings (terminal, output mode, permissions, PR creation)
             const promptResult = await promptExecutionSettings(db, {

package/dist/commands/workspace/prune.d.ts

@@ -1,9 +1,10 @@
-import { Command } from '@oclif/core';
-export default class WorkspacePrune extends Command {
+import { PromptCommand } from '../../lib/prompt-command.js';
+export default class WorkspacePrune extends PromptCommand {
     static description: string;
     static examples: string[];
     static flags: {
         'dry-run': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        force: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;

package/dist/commands/workspace/prune.js

@@ -1,14 +1,17 @@
-import { Command, Flags } from '@oclif/core';
+import { Flags } from '@oclif/core';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
+import { PromptCommand } from '../../lib/prompt-command.js';
 import { styles } from '../../lib/styles.js';
 import { getRegisteredHeadquarters, unregisterHeadquarters, } from '../../lib/machine-config.js';
 import { getWorkspaceAgents, removeAgentsFromDatabase, getDatabasePath, } from '../../lib/database/index.js';
-export default class WorkspacePrune extends Command {
+import { outputConfirmationNeededAsJson, createMetadata, } from '../../lib/prompt-json.js';
+export default class WorkspacePrune extends PromptCommand {
     static description = 'Remove stale workspace entries and agents with deleted worktrees';
     static examples = [
         '<%= config.bin %> <%= command.id %> --dry-run',
         '<%= config.bin %> <%= command.id %>',
+        '<%= config.bin %> <%= command.id %> --force',
     ];
     static flags = {
         'dry-run': Flags.boolean({
@@ -16,6 +19,11 @@ export default class WorkspacePrune extends Command {
             description: 'Show what would be removed without removing',
             default: false,
         }),
+        force: Flags.boolean({
+            char: 'f',
+            description: 'Skip confirmation prompt and prune immediately',
+            default: false,
+        }),
         json: Flags.boolean({
             description: 'Output as JSON',
             default: false,
@@ -23,6 +31,10 @@ export default class WorkspacePrune extends Command {
     };
     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.
+        const isNonTTY = !process.stdout.isTTY;
+        const effectiveDryRun = flags['dry-run'] || (!flags.json && isNonTTY && !flags.force);
         // Find stale entries
         const staleWorkspaces = this.findStaleWorkspaces();
         const staleAgents = this.findStaleAgents();
@@ -30,7 +42,7 @@ export default class WorkspacePrune extends Command {
         // JSON output
         if (flags.json) {
             const output = {
-                dryRun: flags['dry-run'],
+                dryRun: effectiveDryRun,
                 staleWorkspaces: staleWorkspaces.map(w => ({
                     name: w.name,
                     path: w.path,
@@ -40,13 +52,22 @@ export default class WorkspacePrune extends Command {
                     agentName: a.agentName,
                     expectedPath: a.expectedPath,
                 })),
-                totalRemoved: flags['dry-run'] ? 0 : totalStale,
+                totalRemoved: effectiveDryRun ? 0 : totalStale,
                 totalFound: totalStale,
             };
-            this.log(JSON.stringify(output, null, 2));
-            if (!flags['dry-run'] && totalStale > 0) {
+            if (!effectiveDryRun && totalStale > 0 && !flags.force) {
+                // In JSON mode without --force, output confirmation needed
+                outputConfirmationNeededAsJson({
+                    staleWorkspaces: staleWorkspaces.map(w => ({ name: w.name, path: w.path })),
+                    staleAgents: staleAgents.map(a => ({ workspaceName: a.workspaceName, agentName: a.agentName })),
+                    totalFound: totalStale,
+                }, 'prlt workspace prune --force --json', `Found ${totalStale} stale entries. Run with --force to remove them.`, createMetadata('workspace prune', flags));
+                return;
+            }
+            if (!effectiveDryRun && totalStale > 0) {
                 this.performPrune(staleWorkspaces, staleAgents);
             }
+            this.log(JSON.stringify(output, null, 2));
             return;
         }
         // Human-readable output
@@ -84,7 +105,7 @@ export default class WorkspacePrune extends Command {
         }
         // Summary
         this.log('');
-        if (flags['dry-run']) {
+        if (effectiveDryRun) {
             this.log(styles.warning(`[DRY RUN] Would remove:`));
             if (staleWorkspaces.length > 0) {
                 this.log(styles.muted(`  • ${staleWorkspaces.length} workspace registration(s)`));
@@ -93,10 +114,15 @@ export default class WorkspacePrune extends Command {
                 this.log(styles.muted(`  • ${staleAgents.length} agent record(s)`));
             }
             this.log('');
-            this.log(styles.muted('Run without --dry-run to remove these entries.'));
+            if (isNonTTY) {
+                this.log(styles.muted('Non-TTY environment detected. Run with --force to remove these entries.'));
+            }
+            else {
+                this.log(styles.muted('Run without --dry-run to remove these entries.'));
+            }
         }
-        else {
-            // Perform the actual prune
+        else if (flags.force) {
+            // --force: skip confirmation
             this.performPrune(staleWorkspaces, staleAgents);
             this.log(styles.success('Pruned:'));
             if (staleWorkspaces.length > 0) {
@@ -106,6 +132,40 @@ export default class WorkspacePrune extends Command {
                 this.log(styles.muted(`  • ${staleAgents.length} agent record(s)`));
             }
         }
+        else {
+            // Interactive confirmation
+            const summary = [];
+            if (staleWorkspaces.length > 0) {
+                summary.push(`${staleWorkspaces.length} workspace registration(s)`);
+            }
+            if (staleAgents.length > 0) {
+                summary.push(`${staleAgents.length} agent record(s)`);
+            }
+            const choices = [
+                { name: 'Yes', value: true },
+                { name: 'No', value: false },
+            ];
+            const message = `Remove ${summary.join(' and ')}?`;
+            const { confirmed } = await this.prompt([{
+                    type: 'list',
+                    name: 'confirmed',
+                    message,
+                    choices,
+                }], { flags: flags, commandName: 'workspace prune' });
+            if (confirmed) {
+                this.performPrune(staleWorkspaces, staleAgents);
+                this.log(styles.success('\nPruned:'));
+                if (staleWorkspaces.length > 0) {
+                    this.log(styles.muted(`  • ${staleWorkspaces.length} workspace registration(s)`));
+                }
+                if (staleAgents.length > 0) {
+                    this.log(styles.muted(`  • ${staleAgents.length} agent record(s)`));
+                }
+            }
+            else {
+                this.log(styles.muted('\nPrune cancelled.'));
+            }
+        }
         this.log('');
     }
     findStaleWorkspaces() {

package/dist/lib/agents/commands.js

@@ -8,6 +8,7 @@ import inquirer from 'inquirer';
 import { getWorkspaceConfig, getWorkspaceAgents, getWorkspaceRepositories, getAgentWorktrees, addAgentsToDatabase, removeAgentsFromDatabase, addEphemeralAgentToDatabase, getEphemeralAgentNames, getActiveTheme, markAgentCleaned, discoverAgentsOnDisk } from '../database/index.js';
 import { isValidAgentName, getSuggestedAgentNames, generateEphemeralAgentName, getThemePersistentDir, getThemeEphemeralDir, extractBaseName, getAgentBaseName, } from '../themes.js';
 import { createDevcontainerConfig } from '../execution/devcontainer.js';
+import { getGitIdentity } from '../pr/index.js';
 import { getPMOContext } from '../pmo/index.js';
 /**
  * Format a list of agents for display in error messages.
@@ -508,11 +509,14 @@ export async function createEphemeralAgent(workspaceInfo, options) {
     if (!options?.skipDevcontainer) {
         const devcontainerDir = path.join(agentDir, '.devcontainer');
         if (!fs.existsSync(devcontainerDir)) {
+            const gitIdentity = getGitIdentity();
             createDevcontainerConfig({
                 agentName,
                 agentDir,
                 repoWorktrees: mountMode === 'worktree' ? workspaceInfo.repositories.map(r => r.name) : undefined,
                 mountMode,
+                gitUserName: gitIdentity.name || undefined,
+                gitUserEmail: gitIdentity.email || undefined,
             });
         }
     }