@proletariat/cli 0.3.43 → 0.3.45

package/dist/commands/orchestrator/status.js

@@ -0,0 +1,63 @@
+import { Flags } from '@oclif/core';
+import { PromptCommand } from '../../lib/prompt-command.js';
+import { machineOutputFlags } from '../../lib/pmo/index.js';
+import { shouldOutputJson, outputSuccessAsJson, createMetadata, } from '../../lib/prompt-json.js';
+import { styles } from '../../lib/styles.js';
+import { getHostTmuxSessionNames, captureTmuxPane } from '../../lib/execution/session-utils.js';
+import { ORCHESTRATOR_SESSION_NAME } from './start.js';
+export default class OrchestratorStatus extends PromptCommand {
+    static description = 'Check if the orchestrator is running';
+    static examples = [
+        '<%= config.bin %> <%= command.id %>',
+        '<%= config.bin %> <%= command.id %> --peek',
+        '<%= config.bin %> <%= command.id %> --peek --lines 50',
+    ];
+    static flags = {
+        ...machineOutputFlags,
+        peek: Flags.boolean({
+            description: 'Show recent output from the orchestrator',
+            default: false,
+        }),
+        lines: Flags.integer({
+            description: 'Number of lines to show when peeking',
+            default: 20,
+        }),
+    };
+    async run() {
+        const { flags } = await this.parse(OrchestratorStatus);
+        const jsonMode = shouldOutputJson(flags);
+        const hostSessions = getHostTmuxSessionNames();
+        const isRunning = hostSessions.includes(ORCHESTRATOR_SESSION_NAME);
+        let recentOutput = null;
+        if (isRunning && flags.peek) {
+            recentOutput = captureTmuxPane(ORCHESTRATOR_SESSION_NAME, flags.lines);
+        }
+        if (jsonMode) {
+            outputSuccessAsJson({
+                running: isRunning,
+                sessionId: isRunning ? ORCHESTRATOR_SESSION_NAME : null,
+                ...(recentOutput !== null && { recentOutput }),
+            }, createMetadata('orchestrator status', flags));
+            return;
+        }
+        this.log('');
+        if (isRunning) {
+            this.log(styles.success(`Orchestrator is running`));
+            this.log(styles.muted(`   Session: ${ORCHESTRATOR_SESSION_NAME}`));
+            this.log(styles.muted(`   Attach: prlt orchestrator attach`));
+            this.log(styles.muted(`   Poke:   prlt session poke orchestrator "message"`));
+            if (recentOutput) {
+                this.log('');
+                this.log(styles.header('Recent output:'));
+                this.log(styles.muted('─'.repeat(60)));
+                this.log(recentOutput);
+                this.log(styles.muted('─'.repeat(60)));
+            }
+        }
+        else {
+            this.log(styles.muted('Orchestrator is not running.'));
+            this.log(styles.muted('Start it with: prlt orchestrator start'));
+        }
+        this.log('');
+    }
+}

package/dist/commands/orchestrator/stop.d.ts

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

package/dist/commands/orchestrator/stop.js

@@ -0,0 +1,104 @@
+import { Flags } from '@oclif/core';
+import { execSync } from 'node:child_process';
+import * as path from 'node:path';
+import * as fs from 'node:fs';
+import Database from 'better-sqlite3';
+import { PromptCommand } from '../../lib/prompt-command.js';
+import { machineOutputFlags } from '../../lib/pmo/index.js';
+import { findHQRoot } from '../../lib/workspace.js';
+import { shouldOutputJson, outputErrorAsJson, outputSuccessAsJson, createMetadata, } from '../../lib/prompt-json.js';
+import { styles } from '../../lib/styles.js';
+import { getHostTmuxSessionNames } from '../../lib/execution/session-utils.js';
+import { ExecutionStorage } from '../../lib/execution/storage.js';
+import { ORCHESTRATOR_SESSION_NAME } from './start.js';
+export default class OrchestratorStop extends PromptCommand {
+    static description = 'Stop the running orchestrator';
+    static examples = [
+        '<%= config.bin %> <%= command.id %>',
+        '<%= config.bin %> <%= command.id %> --force',
+    ];
+    static flags = {
+        ...machineOutputFlags,
+        force: Flags.boolean({
+            char: 'f',
+            description: 'Skip confirmation',
+            default: false,
+        }),
+    };
+    async run() {
+        const { flags } = await this.parse(OrchestratorStop);
+        const jsonMode = shouldOutputJson(flags);
+        // Check if orchestrator session exists
+        const hostSessions = getHostTmuxSessionNames();
+        if (!hostSessions.includes(ORCHESTRATOR_SESSION_NAME)) {
+            if (jsonMode) {
+                outputErrorAsJson('NOT_RUNNING', 'Orchestrator is not running.', createMetadata('orchestrator stop', flags));
+                return;
+            }
+            this.log('');
+            this.log(styles.muted('Orchestrator is not running.'));
+            this.log('');
+            return;
+        }
+        // Confirm unless --force
+        if (!flags.force && !jsonMode) {
+            const { confirmed } = await this.prompt([{
+                    type: 'list',
+                    name: 'confirmed',
+                    message: 'Stop the orchestrator?',
+                    choices: [
+                        { name: 'Yes', value: true },
+                        { name: 'No', value: false },
+                    ],
+                }]);
+            if (!confirmed) {
+                this.log(styles.muted('Cancelled.'));
+                return;
+            }
+        }
+        // Kill the tmux session
+        try {
+            execSync(`tmux kill-session -t "${ORCHESTRATOR_SESSION_NAME}"`, { stdio: 'pipe' });
+        }
+        catch (error) {
+            if (jsonMode) {
+                outputErrorAsJson('KILL_FAILED', `Failed to stop orchestrator: ${error instanceof Error ? error.message : error}`, createMetadata('orchestrator stop', flags));
+                return;
+            }
+            this.error(`Failed to stop orchestrator: ${error instanceof Error ? error.message : error}`);
+        }
+        // Update execution record to stopped
+        const hqPath = findHQRoot(process.cwd());
+        if (hqPath) {
+            const dbPath = path.join(hqPath, '.proletariat', 'workspace.db');
+            if (fs.existsSync(dbPath)) {
+                let db = null;
+                try {
+                    db = new Database(dbPath);
+                    const executionStorage = new ExecutionStorage(db);
+                    const running = executionStorage.listExecutions({ agentName: 'orchestrator', status: 'running' });
+                    const starting = executionStorage.listExecutions({ agentName: 'orchestrator', status: 'starting' });
+                    for (const exec of [...running, ...starting]) {
+                        executionStorage.updateStatus(exec.id, 'stopped');
+                    }
+                }
+                catch {
+                    // Non-fatal
+                }
+                finally {
+                    db?.close();
+                }
+            }
+        }
+        if (jsonMode) {
+            outputSuccessAsJson({
+                sessionId: ORCHESTRATOR_SESSION_NAME,
+                status: 'stopped',
+            }, createMetadata('orchestrator stop', flags));
+            return;
+        }
+        this.log('');
+        this.log(styles.success('Orchestrator stopped.'));
+        this.log('');
+    }
+}

package/dist/commands/staff/list.js

@@ -1,8 +1,7 @@
 import { Command } from '@oclif/core';
 import chalk from 'chalk';
-import * as path from 'node:path';
 import * as fs from 'node:fs';
-import { getWorkspaceInfo, getAllAgentsStatus } from '../../lib/agents/commands.js';
+import { getWorkspaceInfo, getAllAgentsStatus, resolveAgentDir } from '../../lib/agents/commands.js';
 import { shouldOutputJson } from '../../lib/prompt-json.js';
 import { machineOutputFlags } from '../../lib/pmo/index.js';
 export default class List extends Command {
@@ -73,7 +72,7 @@ export default class List extends Command {
                     }
                 }
                 else {
-                    const agentDir = path.join(workspaceInfo.agentsPath, agentStatus.name);
+                    const agentDir = resolveAgentDir(workspaceInfo, agentStatus.name);
                     const dirExists = fs.existsSync(agentDir);
                     if (dirExists) {
                         this.log(chalk.red(`   Invalid or broken worktrees`));

package/dist/commands/work/revise.js

@@ -6,7 +6,7 @@ import Database from 'better-sqlite3';
 import { PMOCommand, pmoBaseFlags, autoExportToBoard } from '../../lib/pmo/index.js';
 import { getWorkColumnSetting, findColumnByName } from '../../lib/pmo/utils.js';
 import { styles } from '../../lib/styles.js';
-import { getWorkspaceInfo } from '../../lib/agents/commands.js';
+import { getWorkspaceInfo, resolveAgentDir } from '../../lib/agents/commands.js';
 import { DEFAULT_EXECUTION_CONFIG, } from '../../lib/execution/types.js';
 import { runExecution, isDockerRunning, isDevcontainerCliInstalled } from '../../lib/execution/runners.js';
 import { ExecutionStorage } from '../../lib/execution/storage.js';
@@ -179,8 +179,8 @@ export default class WorkRevise extends PMOCommand {
                 this.error(`Ticket "${ticketId}" already has work in progress: ${runningExecution.id}\n` +
                     `Stop it first with "prlt work stop ${runningExecution.id}"`);
             }
-            // Find worktree path
-            const agentDir = path.join(workspaceInfo.agentsPath, agentName);
+            // Find worktree path (handles staff and temp agents)
+            const agentDir = resolveAgentDir(workspaceInfo, agentName);
             if (!fs.existsSync(agentDir)) {
                 db.close();
                 this.error(`Agent directory not found at ${agentDir}.`);

package/dist/commands/work/start.js

@@ -9,7 +9,7 @@ import { shouldOutputJson, outputErrorAsJson, createMetadata, outputConfirmation
 import { FlagResolver } from '../../lib/flags/index.js';
 import { getWorkColumnSetting, findColumnByName } from '../../lib/pmo/utils.js';
 import { styles } from '../../lib/styles.js';
-import { getWorkspaceInfo, createEphemeralAgent, getTicketTmuxSession, killTmuxSession, findWorktreeForBranch, } from '../../lib/agents/commands.js';
+import { getWorkspaceInfo, createEphemeralAgent, getTicketTmuxSession, killTmuxSession, findWorktreeForBranch, resolveAgentDir, } from '../../lib/agents/commands.js';
 import { generateBranchName, DEFAULT_EXECUTION_CONFIG, } from '../../lib/execution/types.js';
 import { runExecution, isDockerRunning, isGitHubTokenAvailable, isDevcontainerCliInstalled, dockerCredentialsExist, getDockerCredentialInfo } from '../../lib/execution/runners.js';
 import { ExecutionStorage, ContainerStorage } from '../../lib/execution/storage.js';
@@ -1712,7 +1712,7 @@ export default class WorkStart extends PMOCommand {
         }
         // Check Docker credentials if any agents use devcontainers
         const anyUseDevcontainer = availableAgents.some(agent => {
-            const agentDir = path.join(workspaceInfo.agentsPath, agent.name);
+            const agentDir = resolveAgentDir(workspaceInfo, agent.name);
             return hasDevcontainerConfig(agentDir) && !flags['run-on-host'];
         });
         // Track whether user explicitly chose to use API key instead of OAuth
@@ -1858,8 +1858,8 @@ export default class WorkStart extends PMOCommand {
     async spawnSingleTicket(ticket, agent, workspaceInfo, executionStorage, db, flags) {
         const agentName = agent.name;
         // Note: Ticket assignee update moved to after successful spawn
-        // Find agent directory and worktree
-        const agentDir = path.join(workspaceInfo.agentsPath, agentName);
+        // Find agent directory and worktree (handles staff and temp agents)
+        const agentDir = resolveAgentDir(workspaceInfo, agentName);
         if (!fs.existsSync(agentDir)) {
             throw new Error(`Agent directory not found: ${agentDir}`);
         }

package/dist/commands/work/watch.js

@@ -3,7 +3,7 @@ import * as path from 'node:path';
 import Database from 'better-sqlite3';
 import { PMOCommand, pmoBaseFlags } from '../../lib/pmo/index.js';
 import { styles } from '../../lib/styles.js';
-import { getWorkspaceInfo } from '../../lib/agents/commands.js';
+import { getWorkspaceInfo, resolveAgentDir } from '../../lib/agents/commands.js';
 import { ExecutionStorage } from '../../lib/execution/storage.js';
 import { hasDevcontainerConfig } from '../../lib/execution/devcontainer.js';
 import { spawnForColumn, getAvailableAgents, isDockerRunning, isDevcontainerCliInstalled, } from '../../lib/execution/spawner.js';
@@ -152,7 +152,7 @@ export default class WorkWatch extends PMOCommand {
             }
             // Check if any agent has devcontainer
             const hasDevcontainer = workspaceInfo.agents.some(agent => {
-                const agentDir = path.join(workspaceInfo.agentsPath, agent.name);
+                const agentDir = resolveAgentDir(workspaceInfo, agent.name);
                 return hasDevcontainerConfig(agentDir);
             });
             // Prompt for environment and display mode if not provided

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

@@ -1,4 +1,15 @@
 import { Agent, Repository, MountMode as DBMountMode } from '../database/index.js';
+/**
+ * Resolve the directory for an agent, cascading through resolution strategies.
+ * Handles both staff (persistent) and temp (ephemeral) agents.
+ *
+ * Resolution order:
+ * 1. Check agent's worktree_path from DB (most reliable)
+ * 2. Check ephemeral directory if agent type is ephemeral
+ * 3. Check both directories on disk as fallback
+ * 4. Fall back to staff path (caller handles missing dir error)
+ */
+export declare function resolveAgentDir(workspaceInfo: WorkspaceInfo, agentName: string): string;
 /**
  * Format a list of agents for display in error messages.
  * Truncates long lists to avoid overwhelming output.

package/dist/lib/agents/commands.js

@@ -10,6 +10,43 @@ import { isValidAgentName, getSuggestedAgentNames, generateEphemeralAgentName, g
 import { createDevcontainerConfig } from '../execution/devcontainer.js';
 import { getGitIdentity } from '../pr/index.js';
 import { getPMOContext } from '../pmo/index.js';
+/**
+ * Resolve the directory for an agent, cascading through resolution strategies.
+ * Handles both staff (persistent) and temp (ephemeral) agents.
+ *
+ * Resolution order:
+ * 1. Check agent's worktree_path from DB (most reliable)
+ * 2. Check ephemeral directory if agent type is ephemeral
+ * 3. Check both directories on disk as fallback
+ * 4. Fall back to staff path (caller handles missing dir error)
+ */
+export function resolveAgentDir(workspaceInfo, agentName) {
+    const agent = workspaceInfo.agents.find(a => a.name === agentName);
+    // 1. Check DB worktree_path (most reliable - set during agent creation)
+    if (agent?.worktree_path) {
+        const fullWorktreePath = path.join(workspaceInfo.path, agent.worktree_path);
+        // worktree_path may point to repo subdir (e.g. agents/staff/altman/proletariat)
+        // Go up to the agent dir level
+        const agentDir = path.dirname(fullWorktreePath);
+        if (fs.existsSync(agentDir))
+            return agentDir;
+    }
+    // 2. Check ephemeral directory if agent type is ephemeral
+    if (agent?.type === 'ephemeral') {
+        const ephemeralDir = path.join(workspaceInfo.path, 'agents', workspaceInfo.ephemeralAgentsDir, agentName);
+        if (fs.existsSync(ephemeralDir))
+            return ephemeralDir;
+    }
+    // 3. Check both directories on disk (handles DB inconsistencies)
+    const tempDir = path.join(workspaceInfo.path, 'agents', workspaceInfo.ephemeralAgentsDir, agentName);
+    if (fs.existsSync(tempDir))
+        return tempDir;
+    const staffDir = path.join(workspaceInfo.agentsPath, agentName);
+    if (fs.existsSync(staffDir))
+        return staffDir;
+    // 4. Fall back to staff path - caller will handle the missing dir error
+    return staffDir;
+}
 /**
  * Format a list of agents for display in error messages.
  * Truncates long lists to avoid overwhelming output.
@@ -169,15 +206,8 @@ export function getAgentStatus(workspaceInfo, agentName) {
     const exists = !!agentRecord;
     // Get worktrees from database to find actual agent location
     const worktrees = getAgentWorktrees(workspaceInfo.path, agentName);
-    // Derive agent directory from worktree path, or fall back to default
-    let agentDir = path.join(workspaceInfo.agentsPath, agentName);
-    if (worktrees.length > 0) {
-        // worktree_path is like "agents/staff/altman/proletariat-altman"
-        // Agent dir is the parent: "agents/staff/altman"
-        const worktreePath = worktrees[0].worktree_path;
-        const agentDirRelative = path.dirname(worktreePath);
-        agentDir = path.join(workspaceInfo.path, agentDirRelative);
-    }
+    // Resolve agent directory (handles both staff and temp agents)
+    const agentDir = resolveAgentDir(workspaceInfo, agentName);
     const dirExists = fs.existsSync(agentDir);
     const status = {
         name: agentName,
@@ -314,7 +344,7 @@ export async function removeAgentsFromWorkspace(workspaceInfo, agentNames) {
     const failed = [];
     for (const agentName of agentNames) {
         try {
-            const agentDir = path.join(workspaceInfo.agentsPath, agentName);
+            const agentDir = resolveAgentDir(workspaceInfo, agentName);
             // Stop and remove Docker container if it exists
             try {
                 const containerId = execSync(`docker ps -aq --filter "label=devcontainer.local_folder=${agentDir}"`, { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();

package/dist/lib/execution/runners.js

@@ -100,6 +100,7 @@ export function buildTmuxScript(sessionName, claudeCmd, displayMode) {
 export TERM=xterm-256color
 export COLORTERM=truecolor
 unset CI
+unset CLAUDECODE
 echo "🚀 Starting: ${sessionName}"
 echo ""
 ${claudeCmd}
@@ -112,6 +113,7 @@ kill 1
 export TERM=xterm-256color
 export COLORTERM=truecolor
 unset CI
+unset CLAUDECODE
 echo "🚀 Starting: ${sessionName}"
 echo ""
 ${claudeCmd}
@@ -470,6 +472,8 @@ export async function runHost(context, executor, config, displayMode = 'terminal
     const setTitleCmds = getSetTitleCommands(windowTitle);
     const scriptContent = `#!/bin/bash
 # Auto-generated script for ticket ${context.ticketId}
+unset CI
+unset CLAUDECODE
 SCRIPT_PATH="${scriptPath}"
 PROMPT_PATH="${promptPath}"
 ${setTitleCmds}

package/dist/lib/execution/spawner.js

@@ -9,6 +9,7 @@ import * as path from 'node:path';
 import { execSync } from 'node:child_process';
 import { autoExportToBoard } from '../pmo/index.js';
 import { getWorkColumnSetting, findColumnByName } from '../pmo/utils.js';
+import { resolveAgentDir } from '../agents/commands.js';
 import { findHQRoot } from '../repos/index.js';
 import { hasGitHubRemote } from '../repos/git.js';
 import { hasDevcontainerConfig } from './devcontainer.js';
@@ -182,8 +183,8 @@ export function selectAgent(strategy, availableAgents, executionStorage, roundRo
 export async function spawnAgentForTicket(ticket, agentName, storage, executionStorage, workspaceInfo, db, pmoPath, options = {}) {
     const log = options.log || (() => { });
     const executor = options.executor || DEFAULT_EXECUTION_CONFIG.defaultExecutor;
-    // Determine agent directory and worktree path
-    const agentDir = path.join(workspaceInfo.agentsPath, agentName);
+    // Determine agent directory and worktree path (handles staff and temp agents)
+    const agentDir = resolveAgentDir(workspaceInfo, agentName);
     if (!fs.existsSync(agentDir)) {
         return {
             success: false,

package/dist/lib/themes.js

@@ -80,26 +80,42 @@ export const BUILTIN_THEMES = [
     {
         id: 'billionaires',
         name: 'billionaires',
-        displayName: 'Billionaires & Tech Elite',
+        displayName: 'Billionaires',
         description: 'The ultra-wealthy work for you',
         persistentDir: 'staff',
         ephemeralDir: 'temp',
         names: [
-            // Tech founders & executives
-            'altman', 'andreesen', 'bezos', 'branson', 'brin', 'buffett',
-            'cook', 'dalio', 'dario', 'dorsey', 'ellison', 'gates', 'huang',
-            'iger', 'jobs', 'kalanick', 'karpathy', 'lecun', 'ma', 'musk',
-            'nadella', 'page', 'pichai', 'sandberg', 'schultz', 'sutskever',
-            'thiel', 'wojcicki', 'zuck',
-            // More tech leaders
-            'ballmer', 'benioff', 'chesky', 'collison', 'dell', 'durov',
-            'fink', 'fridman', 'grove', 'hastings', 'hoffman', 'horowitz',
-            'hurd', 'ive', 'khosla', 'knight', 'kutcher', 'levie', 'levinson',
-            'lynch', 'marcus', 'mayer', 'mcnealy', 'morin', 'neumann',
-            'omidyar', 'packard', 'parker', 'powell', 'rabois', 'rometty',
-            'ross', 'schmidt', 'sequoia', 'siebel', 'silbermann', 'sinofsky',
-            'spiegel', 'spolsky', 'sweeney', 'systrom', 'torvalds', 'wales',
-            'wozniak', 'yang', 'yegge', 'zhang', 'zhong'
+            'altman', 'andreesen', 'ballmer', 'benioff', 'bezos', 'branson',
+            'brin', 'buffett', 'chesky', 'collison', 'cook', 'dalio',
+            'dario', 'dell', 'dorsey', 'durov', 'ellison', 'fink',
+            'gates', 'hastings', 'hoffman', 'horowitz', 'huang', 'jobs',
+            'kalanick', 'khosla', 'knight', 'levinson', 'ma', 'mcnealy',
+            'musk', 'nadella', 'neumann', 'omidyar', 'page', 'parker',
+            'pichai', 'sandberg', 'schmidt', 'schultz', 'siebel',
+            'silbermann', 'spiegel', 'sweeney', 'systrom', 'thiel',
+            'wozniak', 'yang', 'zuck'
+        ]
+    },
+    {
+        id: 'cracked-engineers',
+        name: 'cracked-engineers',
+        displayName: 'Cracked Engineers',
+        description: 'AI researchers, engineers, and tech legends',
+        persistentDir: 'staff',
+        ephemeralDir: 'temp',
+        names: [
+            // AI researchers
+            'karpathy', 'lecun', 'sutskever',
+            // Engineers & creators
+            'sinofsky', 'spolsky', 'torvalds', 'yegge',
+            // Investors & operators (non-billionaire)
+            'grove', 'kutcher', 'rabois', 'ross',
+            // Podcasters & educators
+            'fridman',
+            // Other tech figures
+            'hurd', 'iger', 'ive', 'levie', 'lynch', 'marcus', 'mayer',
+            'morin', 'powell', 'rometty', 'wales', 'wojcicki', 'zhang',
+            'zhong'
         ]
     },
     {