@proletariat/cli 0.3.34 → 0.3.36

package/dist/commands/agent/auth.d.ts

@@ -1,5 +1,5 @@
-import { Command } from '@oclif/core';
-export default class Auth extends Command {
+import { PromptCommand } from '../../lib/prompt-command.js';
+export default class Auth extends PromptCommand {
     static description: string;
     static examples: string[];
     static flags: {
@@ -7,7 +7,13 @@ export default class Auth extends Command {
         machine: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         check: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         force: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        'api-key': import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
+    /**
+     * Try to open the workspace database for saving auth preferences.
+     * Returns null if not in an HQ directory (auth still works, just won't save preference).
+     */
+    private tryOpenDb;
     /**
      * Check if the claude-credentials volume exists
      */
@@ -17,7 +23,9 @@ export default class Auth extends Command {
      */
     private createVolume;
     /**
-     * Check if valid credentials exist in the volume
+     * Check if valid credentials exist in the volume.
+     * Don't check expiration - access tokens are short-lived but Claude Code
+     * handles token refresh internally using stored refresh tokens.
      */
     private credentialsExist;
     /**
@@ -28,5 +36,9 @@ export default class Auth extends Command {
      * Run the interactive login flow in a temporary container
      */
     private runLoginFlow;
+    /**
+     * Handle API key authentication flow
+     */
+    private handleApiKey;
     run(): Promise<void>;
 }

package/dist/commands/agent/auth.js

@@ -1,16 +1,22 @@
-import { Command, Flags } from '@oclif/core';
+import { Flags } from '@oclif/core';
 import { execSync, spawnSync } from 'node:child_process';
+import { PromptCommand } from '../../lib/prompt-command.js';
 import { colors } from '../../lib/colors.js';
 import { machineOutputFlags } from '../../lib/pmo/index.js';
 import { isDockerRunning } from '../../lib/execution/runners.js';
 import { shouldOutputJson, outputSuccessAsJson, outputErrorAsJson, createMetadata, } from '../../lib/prompt-json.js';
+import { findHQRoot } from '../../lib/workspace.js';
+import { getWorkspaceDbPath } from '../../lib/workspace.js';
+import { saveAuthMethod } from '../../lib/execution/config.js';
+import Database from 'better-sqlite3';
 const CLAUDE_CREDENTIALS_VOLUME = 'claude-credentials';
-export default class Auth extends Command {
+export default class Auth extends PromptCommand {
     static description = 'Set up Claude Code authentication for Docker containers (one-time setup)';
     static examples = [
         '<%= config.bin %> <%= command.id %>',
         '<%= config.bin %> <%= command.id %> --check',
         '<%= config.bin %> <%= command.id %> --force',
+        '<%= config.bin %> <%= command.id %> --api-key',
     ];
     static flags = {
         check: Flags.boolean({
@@ -21,8 +27,30 @@ export default class Auth extends Command {
             description: 'Force re-authentication even if credentials exist',
             default: false,
         }),
+        'api-key': Flags.boolean({
+            description: 'Use ANTHROPIC_API_KEY instead of OAuth (saves preference)',
+            default: false,
+        }),
         ...machineOutputFlags,
     };
+    /**
+     * Try to open the workspace database for saving auth preferences.
+     * Returns null if not in an HQ directory (auth still works, just won't save preference).
+     */
+    tryOpenDb() {
+        try {
+            const hqPath = findHQRoot();
+            if (!hqPath)
+                return null;
+            const dbPath = getWorkspaceDbPath(hqPath);
+            const db = new Database(dbPath);
+            db.pragma('foreign_keys = ON');
+            return db;
+        }
+        catch {
+            return null;
+        }
+    }
     /**
      * Check if the claude-credentials volume exists
      */
@@ -47,19 +75,16 @@ export default class Auth extends Command {
         }
     }
     /**
-     * Check if valid credentials exist in the volume
+     * Check if valid credentials exist in the volume.
+     * Don't check expiration - access tokens are short-lived but Claude Code
+     * handles token refresh internally using stored refresh tokens.
      */
     credentialsExist() {
         try {
             const result = execSync(`docker run --rm -v ${CLAUDE_CREDENTIALS_VOLUME}:/data alpine cat /data/.credentials.json 2>/dev/null`, { stdio: 'pipe', encoding: 'utf-8' });
-            // Parse and validate the credentials
             const creds = JSON.parse(result);
-            if (creds.claudeAiOauth?.accessToken && creds.claudeAiOauth?.expiresAt) {
-                // Check if expired
-                const expiresAt = creds.claudeAiOauth.expiresAt;
-                if (expiresAt > Date.now()) {
-                    return true;
-                }
+            if (creds.claudeAiOauth?.accessToken) {
+                return true;
             }
             return false;
         }
@@ -93,8 +118,7 @@ export default class Auth extends Command {
         this.log(colors.primary('🔐 Starting Claude Code authentication...'));
         this.log('');
         this.log(colors.text('A temporary container will start with Claude Code.'));
-        this.log(colors.text('When prompted, type: /login'));
-        this.log(colors.text('Then complete the browser authentication.'));
+        this.log(colors.text('Complete the browser authentication when prompted.'));
         this.log('');
         this.log(colors.textSecondary('Press Ctrl+C to cancel.'));
         this.log('');
@@ -108,7 +132,8 @@ export default class Auth extends Command {
                 'node:20',
                 'bash', '-c',
                 // Install as root, then run claude as node user (so credentials have correct ownership)
-                'npm install -g @anthropic-ai/claude-code@latest --silent 2>/dev/null && chown -R node:node /home/node/.claude && echo "" && echo "Type: /login" && echo "" && su -s /bin/bash -c "HOME=/home/node CLAUDE_CONFIG_DIR=/home/node/.claude claude" node'
+                // Pass "/login" as initial prompt so user doesn't have to type it manually
+                'npm install -g @anthropic-ai/claude-code@latest --silent 2>/dev/null && chown -R node:node /home/node/.claude && su -s /bin/bash -c "HOME=/home/node CLAUDE_CONFIG_DIR=/home/node/.claude claude \\"/login\\"" node'
             ], { stdio: 'inherit' });
             return result.status === 0;
         }
@@ -117,12 +142,74 @@ export default class Auth extends Command {
             return false;
         }
     }
+    /**
+     * Handle API key authentication flow
+     */
+    handleApiKey(jsonMode, flags) {
+        const apiKey = process.env.ANTHROPIC_API_KEY;
+        if (!apiKey) {
+            if (jsonMode) {
+                outputErrorAsJson('API_KEY_NOT_SET', 'ANTHROPIC_API_KEY is not set in your environment. Export it and try again.', createMetadata('agent auth', flags));
+            }
+            this.error('ANTHROPIC_API_KEY is not set in your environment.\nExport it with: export ANTHROPIC_API_KEY=sk-ant-...');
+        }
+        // Save preference to config if in an HQ
+        const db = this.tryOpenDb();
+        if (db) {
+            try {
+                saveAuthMethod(db, 'apikey');
+            }
+            finally {
+                db.close();
+            }
+        }
+        if (jsonMode) {
+            outputSuccessAsJson({
+                authenticated: true,
+                method: 'apikey',
+                message: 'ANTHROPIC_API_KEY is set. Auth method saved as default.',
+            }, createMetadata('agent auth', flags));
+            return;
+        }
+        this.log(colors.success('✓ ANTHROPIC_API_KEY is set'));
+        this.log(colors.textSecondary('  Auth method saved as default: apikey'));
+        this.log(colors.textSecondary('  Containers will use your API key for authentication.'));
+        this.log('');
+        this.log(colors.warning('  Note: This uses API credits, not your Max subscription.'));
+        this.log(colors.textSecondary(`  Run "${this.config.bin} agent auth" (without --api-key) to switch to OAuth.`));
+    }
     async run() {
         const { flags } = await this.parse(Auth);
         // Check if JSON output mode is active
         const jsonMode = shouldOutputJson(flags);
-        // Check Docker is running
+        const jsonModeConfig = jsonMode ? { flags, commandName: 'agent auth' } : null;
+        // Handle --api-key shortcut: validate key and save preference
+        if (flags['api-key']) {
+            this.handleApiKey(jsonMode, flags);
+            return;
+        }
+        // Check Docker is running (needed for OAuth flow)
         if (!isDockerRunning()) {
+            // If Docker isn't running, offer API key as alternative
+            const hasApiKey = !!process.env.ANTHROPIC_API_KEY;
+            if (hasApiKey && !flags.check) {
+                this.log(colors.warning('Docker is not running.'));
+                this.log('');
+                const { authChoice } = await this.prompt([{
+                        type: 'list',
+                        name: 'authChoice',
+                        message: 'Docker is required for OAuth. Use API key instead?',
+                        choices: [
+                            { name: 'Use ANTHROPIC_API_KEY instead (API credits)', value: 'apikey', command: `${this.config.bin} agent auth --api-key --json` },
+                            { name: 'Cancel (start Docker first for OAuth)', value: 'cancel' },
+                        ],
+                        default: 'apikey',
+                    }], jsonModeConfig);
+                if (authChoice === 'apikey') {
+                    this.handleApiKey(jsonMode, flags);
+                    return;
+                }
+            }
             if (jsonMode) {
                 outputErrorAsJson('DOCKER_NOT_RUNNING', 'Docker is not running. Please start Docker Desktop and try again.', createMetadata('agent auth', flags));
             }
@@ -144,6 +231,7 @@ export default class Auth extends Command {
                 if (jsonMode) {
                     outputSuccessAsJson({
                         authenticated: true,
+                        method: 'oauth',
                         subscriptionType: info?.subscriptionType || 'unknown',
                         expiresAt: info?.expiresAt.toISOString(),
                     }, createMetadata('agent auth', flags));
@@ -169,6 +257,7 @@ export default class Auth extends Command {
             if (jsonMode) {
                 outputSuccessAsJson({
                     authenticated: true,
+                    method: 'oauth',
                     subscriptionType: info?.subscriptionType || 'unknown',
                     expiresAt: info?.expiresAt.toISOString(),
                     message: 'Credentials already configured. Use --force to re-authenticate.',
@@ -184,17 +273,49 @@ export default class Auth extends Command {
             this.log(colors.text('Use --force to re-authenticate.'));
             return;
         }
+        // Prompt for auth method choice (OAuth or API key)
+        const hasApiKey = !!process.env.ANTHROPIC_API_KEY;
+        // Only prompt if there's a real choice (API key is available)
+        let selectedMethod = 'oauth';
+        if (hasApiKey) {
+            const { selectedMethod: chosen } = await this.prompt([{
+                    type: 'list',
+                    name: 'selectedMethod',
+                    message: 'Which authentication method would you like to use?',
+                    choices: [
+                        { name: 'OAuth (recommended — uses Max subscription)', value: 'oauth', command: `${this.config.bin} agent auth --force --json` },
+                        { name: 'API key (uses API credits, not Max subscription)', value: 'apikey', command: `${this.config.bin} agent auth --api-key --json` },
+                    ],
+                    default: 'oauth',
+                }], jsonModeConfig);
+            selectedMethod = chosen;
+        }
+        if (selectedMethod === 'apikey') {
+            this.handleApiKey(jsonMode, flags);
+            return;
+        }
         // JSON mode cannot handle interactive login flow
         if (jsonMode) {
             outputErrorAsJson('INTERACTIVE_REQUIRED', 'Authentication requires interactive login. Run without --json flag to authenticate.', createMetadata('agent auth', flags));
         }
-        // Run the login flow
+        // Run the OAuth login flow
         const success = this.runLoginFlow();
         if (success && this.credentialsExist()) {
+            // Save OAuth as auth method preference
+            const db = this.tryOpenDb();
+            if (db) {
+                try {
+                    saveAuthMethod(db, 'oauth');
+                }
+                finally {
+                    db.close();
+                }
+            }
             this.log('');
             this.log(colors.success('✓ Authentication successful!'));
             this.log(colors.textSecondary('  Credentials saved to Docker volume: ' + CLAUDE_CREDENTIALS_VOLUME));
             this.log(colors.textSecondary('  All agent containers will share these credentials.'));
+            this.log(colors.textSecondary('  Auth method saved as default: oauth'));
         }
         else {
             this.log('');

package/dist/commands/agent/index.js

@@ -45,6 +45,7 @@ export default class Agent extends PMOCommand {
                     { name: '🗑️  Remove agent', value: 'remove', command: 'prlt agent remove --machine' },
                     // Management group
                     { name: '👔 Manage staff agents', value: 'staff', command: 'prlt agent staff --machine' },
+                    { name: '⏱️  Manage temp agents', value: 'temp', command: 'prlt agent temp --machine' },
                     { name: '🧹 Cleanup agents', value: 'cleanup', command: 'prlt agent cleanup --machine' },
                     { name: '🎨 Manage themes', value: 'themes', command: 'prlt agent themes --machine' },
                     // Operations group
@@ -89,11 +90,19 @@ export default class Agent extends PMOCommand {
                     break;
                 }
                 case 'staff': {
-                    const { default: StaffCommand } = await import('../staff/index.js');
+                    const { default: StaffCommand } = await import('./staff/index.js');
                     const cmd = new StaffCommand([], this.config);
                     await cmd.run();
                     break;
                 }
+                case 'temp': {
+                    // @ts-expect-error -- temp subcommand not yet implemented
+                    // eslint-disable-next-line import/no-unresolved -- temp subcommand not yet implemented
+                    const { default: TempCommand } = await import('./temp/index.js');
+                    const cmd = new TempCommand([], this.config);
+                    await cmd.run();
+                    break;
+                }
                 case 'cleanup': {
                     const { default: CleanupCommand } = await import('./cleanup.js');
                     const cmd = new CleanupCommand([], this.config);
@@ -101,7 +110,7 @@ export default class Agent extends PMOCommand {
                     break;
                 }
                 case 'themes': {
-                    const { default: ThemeCommand } = await import('../theme/index.js');
+                    const { default: ThemeCommand } = await import('./themes/index.js');
                     const cmd = new ThemeCommand([], this.config);
                     await cmd.run();
                     break;

package/dist/commands/agent/list.js

@@ -35,8 +35,8 @@ export default class List extends PMOCommand {
             const activeAgents = workspaceInfo.agents.filter(a => a.status === 'active');
             // Determine type filter - prompt if not provided (but not in JSON mode)
             let typeFilter = flags.type;
-            // In JSON mode without type filter, output all agents grouped by type
-            if (jsonMode && !typeFilter) {
+            // In JSON mode, output agents as JSON respecting the type filter
+            if (jsonMode) {
                 const staffAgents = activeAgents.filter(a => a.type === 'persistent');
                 const tempAgents = activeAgents.filter(a => a.type === 'ephemeral');
                 const agentsStatus = getAllAgentsStatus(workspaceInfo);
@@ -56,11 +56,20 @@ export default class List extends PMOCommand {
                         };
                     });
                 };
-                const output = {
-                    staff: formatAgentJson(staffAgents),
-                    temp: formatAgentJson(tempAgents),
-                    all: formatAgentJson(activeAgents),
-                };
+                let output;
+                if (typeFilter === 'staff') {
+                    output = { staff: formatAgentJson(staffAgents) };
+                }
+                else if (typeFilter === 'temp') {
+                    output = { temp: formatAgentJson(tempAgents) };
+                }
+                else {
+                    // No filter or 'all' - return both groups without redundant combined array
+                    output = {
+                        staff: formatAgentJson(staffAgents),
+                        temp: formatAgentJson(tempAgents),
+                    };
+                }
                 this.log(JSON.stringify(output, null, 2));
                 return;
             }

package/dist/commands/agent/staff/add.d.ts

@@ -0,0 +1 @@
+export { default } from '../../staff/add.js';

package/dist/commands/agent/staff/add.js

@@ -0,0 +1 @@
+export { default } from '../../staff/add.js';

package/dist/commands/agent/staff/index.d.ts

@@ -0,0 +1,15 @@
+import { PMOCommand } from '../../../lib/pmo/index.js';
+export default class AgentStaff extends PMOCommand {
+    static description: string;
+    static examples: string[];
+    static flags: {
+        'no-interactive': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        machine: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        project: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+    };
+    protected getPMOOptions(): {
+        promptIfMultiple: boolean;
+    };
+    execute(): Promise<void>;
+}

package/dist/commands/agent/staff/index.js

@@ -0,0 +1,83 @@
+import { Flags } from '@oclif/core';
+import inquirer from 'inquirer';
+import { colors } from '../../../lib/colors.js';
+import { PMOCommand, pmoBaseFlags } from '../../../lib/pmo/index.js';
+import { shouldOutputJson, outputPromptAsJson, createMetadata, buildPromptConfig, } from '../../../lib/prompt-json.js';
+export default class AgentStaff extends PMOCommand {
+    static description = 'Manage staff (persistent) agents';
+    static examples = [
+        '<%= config.bin %> <%= command.id %> list',
+        '<%= config.bin %> <%= command.id %> add',
+        '<%= config.bin %> <%= command.id %> remove camry',
+    ];
+    static flags = {
+        ...pmoBaseFlags,
+        'no-interactive': Flags.boolean({
+            description: 'Alias for --json flag',
+            default: false,
+        }),
+    };
+    getPMOOptions() {
+        return { promptIfMultiple: false };
+    }
+    async execute() {
+        const { flags } = await this.parse(AgentStaff);
+        const jsonMode = shouldOutputJson(flags);
+        const menuChoices = [
+            { name: 'List staff agents', value: 'list', command: 'prlt agent staff list --machine' },
+            { name: 'Add staff agent', value: 'add', command: 'prlt agent staff add --machine' },
+            { name: 'Remove staff agent', value: 'remove', command: 'prlt agent staff remove --machine' },
+            { name: 'Cancel', value: 'cancel', command: '' },
+        ];
+        const message = 'What would you like to do?';
+        if (jsonMode) {
+            outputPromptAsJson(buildPromptConfig('list', 'action', message, menuChoices), createMetadata('agent staff', flags));
+            return;
+        }
+        this.log(colors.primary('Staff Agents'));
+        this.log(colors.textMuted('Persistent agents with dedicated worktrees.\n'));
+        const { action } = await this.prompt([{
+                type: 'list',
+                name: 'action',
+                message,
+                choices: [
+                    { name: '📋 ' + menuChoices[0].name, value: menuChoices[0].value },
+                    { name: '➕ ' + menuChoices[1].name, value: menuChoices[1].value },
+                    { name: '🗑️  ' + menuChoices[2].name, value: menuChoices[2].value },
+                    new inquirer.Separator(),
+                    { name: '❌ ' + menuChoices[3].name, value: menuChoices[3].value },
+                ]
+            }], null);
+        if (action === 'cancel') {
+            this.log(colors.textMuted('Operation cancelled.'));
+            return;
+        }
+        try {
+            switch (action) {
+                case 'list': {
+                    const { default: ListCommand } = await import('./list.js');
+                    const cmd = new ListCommand([], this.config);
+                    await cmd.run();
+                    break;
+                }
+                case 'add': {
+                    const { default: AddCommand } = await import('./add.js');
+                    const cmd = new AddCommand([], this.config);
+                    await cmd.run();
+                    break;
+                }
+                case 'remove': {
+                    const { default: RemoveCommand } = await import('./remove.js');
+                    const cmd = new RemoveCommand([], this.config);
+                    await cmd.run();
+                    break;
+                }
+                default:
+                    this.error(`Unknown action: ${action}`);
+            }
+        }
+        catch (error) {
+            this.error(`Failed to execute staff ${action}: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    }
+}

package/dist/commands/agent/staff/list.d.ts

@@ -0,0 +1 @@
+export { default } from '../../staff/list.js';

package/dist/commands/agent/staff/list.js

@@ -0,0 +1 @@
+export { default } from '../../staff/list.js';

package/dist/commands/agent/staff/remove.d.ts

@@ -0,0 +1 @@
+export { default } from '../../staff/remove.js';

package/dist/commands/agent/staff/remove.js

@@ -0,0 +1 @@
+export { default } from '../../staff/remove.js';

package/dist/commands/agent/status.js

@@ -1,8 +1,8 @@
 import { Args } from '@oclif/core';
 import { colors, format } from '../../lib/colors.js';
-import { getWorkspaceInfo, getAgentStatus, formatAgentList } from '../../lib/agents/commands.js';
+import { getWorkspaceInfo, getAgentStatus, getAllAgentsStatus, formatAgentList } from '../../lib/agents/commands.js';
 import { PMOCommand, pmoBaseFlags } from '../../lib/pmo/index.js';
-import { shouldOutputJson, outputErrorAsJson, createMetadata, } from '../../lib/prompt-json.js';
+import { shouldOutputJson, outputErrorAsJson, outputSuccessAsJson, createMetadata, } from '../../lib/prompt-json.js';
 export default class Status extends PMOCommand {
     static description = 'Show detailed status for a specific agent';
     static examples = [
@@ -36,6 +36,13 @@ export default class Status extends PMOCommand {
             return;
         }
         let agentName = args.name;
+        // In JSON mode with no agent specified, return all agent statuses
+        if (jsonMode && !agentName) {
+            const allStatuses = getAllAgentsStatus(workspaceInfo);
+            outputSuccessAsJson({
+                agents: allStatuses,
+            }, createMetadata('agent status', flags));
+        }
         // Agent mode config for prompts
         const agentConfig = jsonMode ? { flags, commandName: 'agent status' } : null;
         // Interactive mode if no agent specified
@@ -59,15 +66,36 @@ export default class Status extends PMOCommand {
                 }], agentConfig);
             agentName = selected;
         }
-        await this.showDetailedStatus(workspaceInfo, agentName);
+        await this.showDetailedStatus(workspaceInfo, agentName, jsonMode);
     }
-    async showDetailedStatus(workspaceInfo, agentName) {
+    async showDetailedStatus(workspaceInfo, agentName, jsonMode = false) {
         // Validate agent exists
         const agent = workspaceInfo.agents.find((a) => a.name === agentName);
         if (!agent) {
             this.error(`Agent "${agentName}" not found. Available: ${formatAgentList(workspaceInfo.agents)}`);
         }
         const agentStatus = getAgentStatus(workspaceInfo, agentName);
+        // JSON output mode
+        if (jsonMode) {
+            this.log(JSON.stringify({
+                success: true,
+                agent: {
+                    name: agentName,
+                    type: agent.type,
+                    exists: agentStatus.exists,
+                    path: `${workspaceInfo.agentsPath}/${agentName}`,
+                    branch: agentStatus.branch,
+                    repositories: agentStatus.repositories.map(r => ({
+                        name: r.name,
+                        status: r.status,
+                        commitsAhead: r.commitsAhead,
+                    })),
+                    assignedTickets: agentStatus.assignedTickets,
+                    completedTickets: agentStatus.completedTickets,
+                },
+            }, null, 2));
+            return;
+        }
         this.log(format.title(`🤖 Agent: ${agentName}`));
         // Basic status
         const statusIcon = agentStatus.exists ? '🟢' : '🔴';

package/dist/commands/agent/themes/add-names.d.ts

@@ -0,0 +1 @@
+export { default } from '../../theme/add-names.js';

package/dist/commands/agent/themes/add-names.js

@@ -0,0 +1 @@
+export { default } from '../../theme/add-names.js';

package/dist/commands/agent/themes/create.d.ts

@@ -0,0 +1 @@
+export { default } from '../../theme/create.js';

package/dist/commands/agent/themes/create.js

@@ -0,0 +1 @@
+export { default } from '../../theme/create.js';

package/dist/commands/agent/themes/index.d.ts

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