@proletariat/cli 0.3.27 → 0.3.29

package/bin/dev.js

@@ -2,4 +2,11 @@
 
 import {execute} from '@oclif/core'
 
+// Support -v as shorthand for --version (only when it's the sole argument,
+// to avoid conflicts with command-specific -v flags like repo create --visibility)
+const args = process.argv.slice(2)
+if (args.length === 1 && args[0] === '-v') {
+  process.argv[2] = '--version'
+}
+
 await execute({development: true, dir: import.meta.url})

package/bin/run.js

@@ -2,6 +2,13 @@
 
 import {execute} from '@oclif/core'
 
+// Support -v as shorthand for --version (only when it's the sole argument,
+// to avoid conflicts with command-specific -v flags like repo create --visibility)
+const args = process.argv.slice(2)
+if (args.length === 1 && args[0] === '-v') {
+  process.argv[2] = '--version'
+}
+
 // Handle process termination gracefully
 process.on('SIGINT', () => {
   console.log('\n'); // Add newline for clean exit

package/dist/commands/agent/shell.js

@@ -151,16 +151,30 @@ export default class Shell extends PMOCommand {
         // Interactive mode: Prompt for environment
         let environment = 'host';
         if (hasDevcontainer) {
-            const { selectedEnvironment } = await this.prompt([{
-                    type: 'list',
-                    name: 'selectedEnvironment',
-                    message: 'Where should the shell run?',
-                    choices: [
-                        { name: '🐳 devcontainer (recommended)', value: 'devcontainer', command: '' },
-                        { name: '💻 host (agent worktree on your machine)', value: 'host', command: '' },
-                    ],
-                }], null);
-            environment = selectedEnvironment;
+            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 the shell run?',
+                        choices: [
+                            { name: '🐳 devcontainer (recommended)', value: 'devcontainer', command: '' },
+                            { name: '💻 host (agent worktree on your machine)', value: 'host', command: '' },
+                        ],
+                    }], 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;
+                    }
+                }
+                environment = selectedEnvironment;
+                environmentSelected = true;
+            }
         }
         // Interactive mode: Prompt for display mode
         const { displayMode } = await this.prompt([{

package/dist/commands/claude.js

@@ -145,22 +145,10 @@ export default class Claude extends PromptCommand {
             environment = flags.environment;
         }
         else {
-            // Check devcontainer prerequisites upfront
-            const dockerRunning = isDockerRunning();
-            const devcontainerCliInstalled = isDevcontainerCliInstalled();
-            const devcontainerReady = dockerRunning && devcontainerCliInstalled;
-            // Build devcontainer label with missing requirements
-            let devcontainerLabel = hasProjectDevcontainer
+            // Build devcontainer label
+            const devcontainerLabel = hasProjectDevcontainer
                 ? '🐳 devcontainer (uses project config, sandboxed)'
                 : '🐳 devcontainer (uses catch-all container, sandboxed)';
-            if (!devcontainerReady) {
-                const missing = [];
-                if (!dockerRunning)
-                    missing.push('Docker');
-                if (!devcontainerCliInstalled)
-                    missing.push('devcontainer CLI');
-                devcontainerLabel = `🐳 devcontainer (requires: ${missing.join(', ')})`;
-            }
             // In JSON mode, output environment prompt and exit
             if (jsonMode) {
                 await this.prompt([
@@ -172,7 +160,6 @@ export default class Claude extends PromptCommand {
                             {
                                 name: devcontainerLabel,
                                 value: 'devcontainer',
-                                disabled: !devcontainerReady,
                                 command: `prlt claude --slug "${slug}" --environment devcontainer --json`,
                             },
                             {
@@ -181,7 +168,7 @@ export default class Claude extends PromptCommand {
                                 command: `prlt claude --slug "${slug}" --environment host --json`,
                             },
                         ],
-                        default: devcontainerReady ? 'devcontainer' : 'host',
+                        default: 'devcontainer',
                     },
                 ], jsonModeConfig);
                 return; // unreachable, but satisfies TypeScript
@@ -199,18 +186,17 @@ export default class Claude extends PromptCommand {
                             {
                                 name: devcontainerLabel,
                                 value: 'devcontainer',
-                                disabled: !devcontainerReady,
                             },
                             { name: '💻 host (runs directly on your machine)', value: 'host' },
                         ],
-                        default: devcontainerReady ? 'devcontainer' : 'host',
+                        default: 'devcontainer',
                     },
                 ], null);
                 if (selectedEnv === '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. Please start Docker Desktop or select "host".');
+                        this.warn('Docker is not running. Please start Docker and try again.');
                         this.log('');
                         continue;
                     }
@@ -553,22 +539,10 @@ export default class Claude extends PromptCommand {
             }
             // Prompt for environment first (before creating ticket) so user can cancel early
             const hasProjectDevcontainer = hasDevcontainerConfig(workDir);
-            // Check devcontainer prerequisites upfront
-            const dockerRunning = isDockerRunning();
-            const devcontainerCliInstalled = isDevcontainerCliInstalled();
-            const devcontainerReady = dockerRunning && devcontainerCliInstalled;
-            // Build devcontainer label with missing requirements
-            let devcontainerLabel = hasProjectDevcontainer
+            // Build devcontainer label
+            const devcontainerLabel = hasProjectDevcontainer
                 ? '🐳 devcontainer (uses project config, sandboxed)'
                 : '🐳 devcontainer (uses catch-all container, sandboxed)';
-            if (!devcontainerReady) {
-                const missing = [];
-                if (!dockerRunning)
-                    missing.push('Docker');
-                if (!devcontainerCliInstalled)
-                    missing.push('devcontainer CLI');
-                devcontainerLabel = `🐳 devcontainer (requires: ${missing.join(', ')})`;
-            }
             let environment = 'host';
             if (flags.environment) {
                 environment = flags.environment;
@@ -585,7 +559,6 @@ export default class Claude extends PromptCommand {
                                 {
                                     name: devcontainerLabel,
                                     value: 'devcontainer',
-                                    disabled: !devcontainerReady,
                                     command: `prlt claude --project ${projectId} --title "${ticketTitle}" --environment devcontainer --json`,
                                 },
                                 {
@@ -594,7 +567,7 @@ export default class Claude extends PromptCommand {
                                     command: `prlt claude --project ${projectId} --title "${ticketTitle}" --environment host --json`,
                                 },
                             ],
-                            default: devcontainerReady ? 'devcontainer' : 'host',
+                            default: 'devcontainer',
                         },
                     ], jsonModeConfig);
                     db.close();
@@ -613,18 +586,17 @@ export default class Claude extends PromptCommand {
                                 {
                                     name: devcontainerLabel,
                                     value: 'devcontainer',
-                                    disabled: !devcontainerReady,
                                 },
                                 { name: '💻 host (runs directly on your machine)', value: 'host' },
                             ],
-                            default: devcontainerReady ? 'devcontainer' : 'host',
+                            default: 'devcontainer',
                         },
                     ], null);
                     if (selectedEnv === '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. Please start Docker Desktop or select "host".');
+                            this.warn('Docker is not running. Please start Docker and try again.');
                             this.log('');
                             continue;
                         }

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
                         }

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/lib/execution/devcontainer.js

@@ -109,6 +109,9 @@ export function generateDevcontainerJson(options, config) {
             // Git identity for commit attribution (detected from host's gh/git config)
             ...(options.gitUserName ? { PRLT_GIT_USER_NAME: options.gitUserName } : {}),
             ...(options.gitUserEmail ? { PRLT_GIT_USER_EMAIL: options.gitUserEmail } : {}),
+            // prlt channel info for version updates at container startup (TKT-954)
+            PRLT_REGISTRY: channel.registry,
+            ...(!useMount ? { PRLT_VERSION: channel.version || 'latest' } : {}),
             // /hq/.proletariat/bin contains prlt wrapper with ESM loader for native modules
             PATH: '/hq/.proletariat/bin:/home/node/.npm-global/bin:/usr/local/bin:/usr/bin:/bin',
         },
@@ -124,7 +127,7 @@ export function generateDevcontainerJson(options, config) {
  */
 export function generateDockerfile(options) {
     const timezone = options.timezone || 'America/Los_Angeles';
-    return `FROM node:20
+    return `FROM node:22
 
 # Ensure we run as root for apt-get and system setup
 USER root
@@ -515,11 +518,30 @@ configure_git_identity() {
 
 configure_git_identity
 
-# Check if prlt is already installed globally (via npm from GitHub Packages)
+# Check if prlt is already installed globally (via npm)
+# TKT-954: Also check for updates - Docker layer caching may have installed an older version
 if command -v prlt &> /dev/null; then
     PRLT_PATH=$(which prlt)
     if [[ "$PRLT_PATH" == "/home/node/.npm-global/bin/prlt" ]]; then
-        echo "prlt installed via npm, no setup needed"
+        DESIRED_VERSION="\${PRLT_VERSION:-latest}"
+        CURRENT_VERSION=$(prlt --version 2>/dev/null | grep -oE '[0-9]+\\.[0-9]+\\.[0-9]+' || echo "unknown")
+
+        # Determine the target version to compare against
+        if [ "$DESIRED_VERSION" = "latest" ] || [ "$DESIRED_VERSION" = "dev" ] || [ "$DESIRED_VERSION" = "next" ]; then
+            # For tags, check npm registry for the actual version number
+            TARGET_VERSION=$(npm view "@proletariat/cli@\${DESIRED_VERSION}" version 2>/dev/null || echo "unknown")
+        else
+            # For pinned versions (e.g., "1.2.3"), use directly
+            TARGET_VERSION="$DESIRED_VERSION"
+        fi
+
+        if [ "$TARGET_VERSION" != "unknown" ] && [ "$CURRENT_VERSION" != "$TARGET_VERSION" ]; then
+            echo "Updating prlt from v\${CURRENT_VERSION} to v\${TARGET_VERSION} (channel: \${DESIRED_VERSION})..."
+            npm install -g "@proletariat/cli@\${DESIRED_VERSION}" 2>&1
+            echo "prlt updated successfully"
+        else
+            echo "prlt v\${CURRENT_VERSION} is up to date"
+        fi
         exit 0
     fi
 fi

package/dist/lib/pmo/types.d.ts

@@ -81,7 +81,7 @@ export declare const LEGACY_PRIORITY_MAP: Record<LegacyPriority, Priority>;
 /**
  * Ticket categories for classification.
  */
-export declare const TICKET_CATEGORIES: readonly ["feature", "bug", "refactor", "docs", "test", "chore", "performance", "ci", "build", "security", "database", "release"];
+export declare const TICKET_CATEGORIES: readonly ["feature", "bug", "refactor", "docs", "test", "chore", "performance", "ci", "build", "security", "database", "release", "adhoc"];
 export type TicketCategory = typeof TICKET_CATEGORIES[number];
 /**
  * Category types (ticket vs status).

package/dist/lib/pmo/types.js

@@ -49,6 +49,7 @@ export const TICKET_CATEGORIES = [
     'security',
     'database',
     'release',
+    'adhoc',
 ];
 /**
  * Check if a string is a valid Priority value.