@proletariat/cli 0.3.109 → 0.3.111

package/dist/commands/orchestrator/status.js

@@ -3,15 +3,16 @@ 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 { findHQRoot } from '../../lib/workspace.js';
-import { getHeadquartersNameFromPath } from '../../lib/machine-config.js';
+import { captureTmuxPane } from '../../lib/execution/session-utils.js';
 import { execSync } from 'node:child_process';
-import { buildOrchestratorSessionName, buildOrchestratorContainerName, findRunningOrchestratorSessions, findHQOrchestratorSessions, findHQOrchestratorContainers, findRunningOrchestratorContainers, extractOrchestratorNameFromSession, getOrchestratorContainerId, } from './start.js';
+import { collectAllSessions, groupSessionsByHQ, bucketElsewhereByHq, tildifyPath, } from '../../lib/session/renderer.js';
+import { findHQRoot } from '../../lib/workspace.js';
 export default class OrchestratorStatus extends PromptCommand {
-    static description = 'Check if the orchestrator is running';
+    static description = 'Check orchestrator sessions across the entire machine, grouped by HQ.';
     static examples = [
         '<%= config.bin %> <%= command.id %>',
+        '<%= config.bin %> <%= command.id %> --here',
+        '<%= config.bin %> <%= command.id %> --hq ~/Projects/backend-hq',
         '<%= config.bin %> <%= command.id %> --peek',
         '<%= config.bin %> <%= command.id %> --peek --lines 50',
     ];
@@ -19,10 +20,19 @@ export default class OrchestratorStatus extends PromptCommand {
         ...machineOutputFlags,
         name: Flags.string({
             char: 'n',
-            description: 'Name of the orchestrator session to check (default: main)',
+            description: 'Filter to a single orchestrator by name (matches agentName)',
+        }),
+        here: Flags.boolean({
+            description: 'Filter to orchestrators in the current HQ only',
+            default: false,
+            exclusive: ['hq'],
+        }),
+        hq: Flags.string({
+            description: 'Filter to orchestrators in a specific HQ path',
+            exclusive: ['here'],
         }),
         peek: Flags.boolean({
-            description: 'Show recent output from the orchestrator',
+            description: 'Show recent output from each orchestrator',
             default: false,
         }),
         lines: Flags.integer({
@@ -44,142 +54,106 @@ export default class OrchestratorStatus extends PromptCommand {
     async run() {
         const { flags } = await this.parse(OrchestratorStatus);
         const jsonMode = shouldOutputJson(flags);
-        const hostSessions = getHostTmuxSessionNames();
-        // Resolve session name: try HQ-scoped first, fall back to discovery
-        const hqPath = findHQRoot(process.cwd());
-        if (hqPath) {
-            const hqName = getHeadquartersNameFromPath(hqPath);
-            if (flags.name) {
-                // Explicit --name: check that specific orchestrator (host tmux + Docker)
-                const sessionName = buildOrchestratorSessionName(hqName, flags.name);
-                const isHostRunning = hostSessions.includes(sessionName);
-                const containerName = buildOrchestratorContainerName(hqName, flags.name);
-                const dockerContainerId = getOrchestratorContainerId(containerName);
-                const isDockerRunning = !!dockerContainerId;
-                const isRunning = isHostRunning || isDockerRunning;
-                const environment = isDockerRunning ? 'docker' : 'host';
-                let recentOutput = null;
-                if (isRunning && flags.peek) {
-                    if (isDockerRunning && dockerContainerId) {
-                        recentOutput = this.captureDockerTmuxPane(dockerContainerId, containerName, flags.lines);
-                    }
-                    else {
-                        recentOutput = captureTmuxPane(sessionName, flags.lines);
-                    }
-                }
-                if (jsonMode) {
-                    outputSuccessAsJson({
-                        running: isRunning,
-                        sessionId: isRunning ? (isDockerRunning ? containerName : sessionName) : null,
-                        containerId: dockerContainerId || null,
-                        environment,
-                        name: flags.name,
-                        ...(recentOutput !== null && { recentOutput }),
-                    }, createMetadata('orchestrator status', flags));
-                    return;
-                }
-                this.log('');
-                if (isRunning) {
-                    this.log(styles.success(`Orchestrator "${flags.name}" is running${isDockerRunning ? ' (Docker)' : ''}`));
-                    this.log(styles.muted(`   Session: ${isDockerRunning ? containerName : sessionName}`));
-                    if (dockerContainerId) {
-                        this.log(styles.muted(`   Container: ${dockerContainerId}`));
-                    }
-                    this.log(styles.muted(`   Attach: prlt orchestrator attach --name ${flags.name}`));
-                    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 "${flags.name}" is not running.`));
-                    this.log(styles.muted('Start it with: prlt orchestrator start'));
-                }
-                this.log('');
-                return;
-            }
-            // No --name: show status for ALL orchestrators in this HQ (host + Docker)
-            const hqSessions = findHQOrchestratorSessions(hostSessions, hqName);
-            const hqContainers = findHQOrchestratorContainers(hqName);
-            const allSessions = [
-                ...hqSessions.map(s => ({ sessionId: s, name: extractOrchestratorNameFromSession(s, hqName) || s, environment: 'host', containerId: null })),
-                ...hqContainers.map(c => ({ sessionId: c, name: extractOrchestratorNameFromSession(c, hqName) || c, environment: 'docker', containerId: getOrchestratorContainerId(c) })),
-            ];
-            if (jsonMode) {
-                outputSuccessAsJson({
-                    running: allSessions.length > 0,
-                    sessions: allSessions,
-                }, createMetadata('orchestrator status', flags));
-                return;
-            }
-            this.log('');
-            if (allSessions.length === 0) {
-                this.log(styles.muted('No orchestrator sessions running.'));
-                this.log(styles.muted('Start one with: prlt orchestrator start'));
-            }
-            else {
-                this.log(styles.success(`${allSessions.length} orchestrator session(s) running:`));
-                for (const s of allSessions) {
-                    const envLabel = s.environment === 'docker' ? ' (Docker)' : '';
-                    this.log(styles.muted(`   ${s.name}${envLabel} (${s.sessionId})`));
-                    this.log(styles.muted(`     Attach: prlt orchestrator attach --name ${s.name}`));
-                    if (flags.peek) {
-                        let output = null;
-                        if (s.environment === 'docker' && s.containerId) {
-                            output = this.captureDockerTmuxPane(s.containerId, s.sessionId, flags.lines);
-                        }
-                        else {
-                            output = captureTmuxPane(s.sessionId, flags.lines);
-                        }
-                        if (output) {
-                            this.log(styles.muted('─'.repeat(60)));
-                            this.log(output);
-                            this.log(styles.muted('─'.repeat(60)));
-                        }
-                    }
-                }
-            }
-            this.log('');
-            return;
+        // Resolve HQ filter
+        let hqPathFilter;
+        if (flags.here) {
+            const cwdHq = findHQRoot(process.cwd());
+            if (cwdHq)
+                hqPathFilter = cwdHq;
         }
-        // Not in HQ — discover all running orchestrator sessions globally (host + Docker)
-        const runningSessions = findRunningOrchestratorSessions(hostSessions);
-        const runningContainers = findRunningOrchestratorContainers();
-        const allSessions = [
-            ...runningSessions.map(s => ({ name: s, environment: 'host' })),
-            ...runningContainers.map(c => ({ name: `${c} (Docker)`, environment: 'docker' })),
-        ];
+        else if (flags.hq) {
+            hqPathFilter = flags.hq;
+        }
+        // Always query machine-wide for orchestrator role.
+        let orchestrators = collectAllSessions({
+            hqPathFilter,
+            roleFilter: 'orchestrator',
+            includeAll: false,
+        });
+        // Optional --name filter (substring match against agentName/sessionId)
+        if (flags.name) {
+            const needle = flags.name.toLowerCase();
+            orchestrators = orchestrators.filter(s => s.agentName.toLowerCase().includes(needle) ||
+                s.sessionId.toLowerCase().includes(needle));
+        }
+        const grouped = groupSessionsByHQ(orchestrators);
         if (jsonMode) {
             outputSuccessAsJson({
-                running: allSessions.length > 0,
-                sessions: allSessions,
+                running: orchestrators.length > 0,
+                sessions: orchestrators.map(toJsonOrchestrator),
+                grouped: {
+                    current_hq: grouped.currentHq ? tildifyPath(grouped.currentHq) : null,
+                    here: grouped.here.map(toJsonOrchestrator),
+                    elsewhere: grouped.elsewhere.map(toJsonOrchestrator),
+                },
             }, createMetadata('orchestrator status', flags));
             return;
         }
         this.log('');
-        if (allSessions.length === 0) {
+        if (orchestrators.length === 0) {
             this.log(styles.muted('No orchestrator sessions running.'));
             this.log(styles.muted('Start one with: prlt orchestrator start'));
+            this.log('');
+            return;
+        }
+        // Render current HQ
+        if (grouped.currentHq) {
+            this.log(styles.header(`Current HQ: ${tildifyPath(grouped.currentHq)} (${grouped.here.length} orchestrator${grouped.here.length === 1 ? '' : 's'})`));
+            if (grouped.here.length === 0) {
+                this.log(styles.muted('  (none)'));
+            }
+            else {
+                this.renderOrchestratorRows(grouped.here, flags.peek, flags.lines, /* dim */ false);
+            }
+            this.log('');
         }
-        else {
-            this.log(styles.success(`${allSessions.length} orchestrator session(s) running:`));
-            for (const s of allSessions) {
-                this.log(styles.muted(`   ${s.name}`));
-                if (flags.peek && s.environment === 'host') {
-                    // Can only peek at host sessions with captureTmuxPane
-                    const output = captureTmuxPane(s.name, flags.lines);
-                    if (output) {
-                        this.log(styles.muted('─'.repeat(60)));
-                        this.log(output);
-                        this.log(styles.muted('─'.repeat(60)));
-                    }
+        // Render elsewhere
+        if (grouped.elsewhere.length > 0) {
+            this.log(styles.muted(`Other locations (${grouped.elsewhere.length} orchestrator${grouped.elsewhere.length === 1 ? '' : 's'})`));
+            const buckets = bucketElsewhereByHq(grouped.elsewhere);
+            for (const bucket of buckets) {
+                const hqLabel = bucket.hqPath ? tildifyPath(bucket.hqPath) : '(no HQ)';
+                this.log(styles.muted(`  ${bucket.hqName} — ${hqLabel}`));
+                this.renderOrchestratorRows(bucket.sessions, flags.peek, flags.lines, /* dim */ true);
+            }
+            this.log('');
+        }
+    }
+    renderOrchestratorRows(sessions, peek, lines, dim) {
+        for (const s of sessions) {
+            const envLabel = s.environment === 'container' ? ' (Docker)' : '';
+            const line = `   ${s.agentName}${envLabel} (${s.sessionId})`;
+            this.log(dim ? styles.muted(line) : styles.muted(line));
+            const attachCmd = s.agentName === 'main'
+                ? '     Attach: prlt orchestrator attach'
+                : `     Attach: prlt orchestrator attach --name ${s.agentName}`;
+            this.log(styles.muted(attachCmd));
+            if (peek) {
+                let output = null;
+                if (s.environment === 'container' && s.containerId) {
+                    output = this.captureDockerTmuxPane(s.containerId, s.sessionId, lines);
+                }
+                else {
+                    output = captureTmuxPane(s.sessionId, lines);
+                }
+                if (output) {
+                    this.log(styles.muted('─'.repeat(60)));
+                    this.log(output);
+                    this.log(styles.muted('─'.repeat(60)));
                 }
             }
         }
-        this.log('');
     }
 }
+function toJsonOrchestrator(s) {
+    return {
+        sessionId: s.sessionId,
+        name: s.agentName,
+        environment: s.environment === 'container' ? 'docker' : 'host',
+        containerId: s.containerId ?? null,
+        hqPath: s.hqPath ?? null,
+        hqName: s.hqName ?? null,
+        status: s.status,
+    };
+}
 //# sourceMappingURL=status.js.map

package/dist/commands/orchestrator/status.js.map

@@ -1 +1 @@
-{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../src/commands/orchestrator/status.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../src/commands/orchestrator/status.ts"],"names":[],"mappings":"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"}

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

@@ -4,6 +4,8 @@ export default class OrchestratorStop extends PromptCommand {
     static examples: string[];
     static flags: {
         name: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        here: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        hq: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         force: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         machine: import("@oclif/core/interfaces").BooleanFlag<boolean>;

package/dist/commands/orchestrator/stop.js

@@ -6,10 +6,9 @@ import { machineOutputFlags } from '../../lib/pmo/index.js';
 import { findHQRoot } from '../../lib/workspace.js';
 import { shouldOutputJson, outputErrorAsJson, outputSuccessAsJson, outputPromptAsJson, buildPromptConfig, 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 { buildOrchestratorSessionName, buildOrchestratorContainerName, findRunningOrchestratorSessions, findHQOrchestratorSessions, findHQOrchestratorContainers, findRunningOrchestratorContainers, extractOrchestratorNameFromSession, getOrchestratorContainerId, } from './start.js';
-import { getHeadquartersNameFromPath } from '../../lib/machine-config.js';
+import { MachineDB } from '../../lib/machine-db.js';
+import { collectAllSessions, groupSessionsByHQ, tildifyPath, } from '../../lib/session/renderer.js';
 export default class OrchestratorStop extends PromptCommand {
     static description = 'Stop the running orchestrator';
     static examples = [
@@ -20,7 +19,16 @@ export default class OrchestratorStop extends PromptCommand {
         ...machineOutputFlags,
         name: Flags.string({
             char: 'n',
-            description: 'Name of the orchestrator session to stop (default: main)',
+            description: 'Name of the orchestrator to stop (matches agentName)',
+        }),
+        here: Flags.boolean({
+            description: 'Filter to orchestrators in the current HQ only',
+            default: false,
+            exclusive: ['hq'],
+        }),
+        hq: Flags.string({
+            description: 'Filter to orchestrators in a specific HQ path',
+            exclusive: ['here'],
         }),
         force: Flags.boolean({
             char: 'f',
@@ -31,118 +39,84 @@ export default class OrchestratorStop extends PromptCommand {
     async run() {
         const { flags } = await this.parse(OrchestratorStop);
         const jsonMode = shouldOutputJson(flags);
-        const hostSessions = getHostTmuxSessionNames();
-        // Track whether the resolved session is in a Docker container
-        let isDockerSession = false;
-        // Resolve session name: try HQ-scoped first, fall back to discovery
-        let sessionName;
-        let orchestratorName;
-        const hqPath = findHQRoot(process.cwd());
-        if (hqPath) {
-            const hqName = getHeadquartersNameFromPath(hqPath);
-            if (flags.name) {
-                // Explicit --name: look for that specific orchestrator (host tmux first, then Docker)
-                sessionName = buildOrchestratorSessionName(hqName, flags.name);
-                orchestratorName = flags.name;
-                if (!hostSessions.includes(sessionName)) {
-                    // Check Docker
-                    const containerName = buildOrchestratorContainerName(hqName, flags.name);
-                    const containerId = getOrchestratorContainerId(containerName);
-                    if (containerId) {
-                        sessionName = containerName;
-                        isDockerSession = true;
-                    }
-                    else {
-                        sessionName = undefined;
-                    }
-                }
-            }
-            else {
-                // No --name: discover ALL orchestrators in this HQ (host + Docker)
-                const hqSessions = findHQOrchestratorSessions(hostSessions, hqName);
-                const hqContainers = findHQOrchestratorContainers(hqName);
-                const allSessions = [
-                    ...hqSessions.map(s => ({ name: extractOrchestratorNameFromSession(s, hqName) || s, value: s, isDocker: false })),
-                    ...hqContainers.map(c => ({ name: extractOrchestratorNameFromSession(c, hqName) || c, value: c, isDocker: true })),
-                ];
-                if (allSessions.length === 1) {
-                    sessionName = allSessions[0].value;
-                    orchestratorName = allSessions[0].name;
-                    isDockerSession = allSessions[0].isDocker;
-                }
-                else if (allSessions.length > 1) {
-                    const sessionChoices = allSessions.map(s => ({
-                        name: `${s.name}${s.isDocker ? ' (Docker)' : ''}`,
-                        value: s.value,
-                        command: `prlt orchestrator stop --name "${s.name}" --force --json`,
-                    }));
-                    const selectMessage = 'Multiple orchestrator sessions found. Select one to stop:';
-                    if (jsonMode) {
-                        outputPromptAsJson(buildPromptConfig('list', 'session', selectMessage, sessionChoices), createMetadata('orchestrator stop', flags));
-                        return;
-                    }
-                    const { session } = await this.prompt([{
-                            type: 'list',
-                            name: 'session',
-                            message: selectMessage,
-                            choices: sessionChoices,
-                        }]);
-                    sessionName = session;
-                    const matched = allSessions.find(s => s.value === session);
-                    orchestratorName = matched?.name;
-                    isDockerSession = matched?.isDocker || false;
-                }
-                // If 0 found, fall through to global discovery below
+        // Resolve HQ filter
+        let hqPathFilter;
+        if (flags.here) {
+            const cwdHq = findHQRoot(process.cwd());
+            if (cwdHq)
+                hqPathFilter = cwdHq;
+        }
+        else if (flags.hq) {
+            hqPathFilter = flags.hq;
+        }
+        // Always query machine-wide for orchestrators.
+        let orchestrators = collectAllSessions({
+            hqPathFilter,
+            roleFilter: 'orchestrator',
+            includeAll: false,
+        });
+        // Optional --name filter
+        if (flags.name) {
+            const needle = flags.name.toLowerCase();
+            orchestrators = orchestrators.filter(s => s.agentName.toLowerCase() === needle ||
+                s.agentName.toLowerCase().includes(needle) ||
+                s.sessionId.toLowerCase().includes(needle));
+        }
+        if (orchestrators.length === 0) {
+            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;
         }
-        // If not in HQ or session not found, discover running orchestrator sessions globally
-        if (!sessionName) {
-            const runningSessions = findRunningOrchestratorSessions(hostSessions);
-            const runningContainers = findRunningOrchestratorContainers();
-            const allSessions = [
-                ...runningSessions.map(s => ({ name: s, value: s, isDocker: false })),
-                ...runningContainers.map(c => ({ name: `${c} (Docker)`, value: c, isDocker: true })),
-            ];
-            if (allSessions.length === 0) {
-                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('');
+        // Pick a single orchestrator. Prefer current-HQ when multiple exist.
+        let picked;
+        if (orchestrators.length === 1) {
+            picked = orchestrators[0];
+        }
+        else {
+            const grouped = groupSessionsByHQ(orchestrators);
+            const ordered = [...grouped.here, ...grouped.elsewhere];
+            const selectMessage = 'Multiple orchestrator sessions found. Select one to stop:';
+            const sessionChoices = ordered.map(s => {
+                const hqLabel = s.hqPath ? tildifyPath(s.hqPath) : '(no HQ)';
+                const tag = s.environment === 'container' ? ' (Docker)' : '';
+                return {
+                    name: `${s.agentName}${tag} — ${hqLabel}`,
+                    value: s.sessionId,
+                    command: `prlt orchestrator stop --name "${s.agentName}" --force --json`,
+                };
+            });
+            if (jsonMode) {
+                outputPromptAsJson(buildPromptConfig('list', 'session', selectMessage, sessionChoices), createMetadata('orchestrator stop', flags));
                 return;
             }
-            else if (allSessions.length === 1) {
-                sessionName = allSessions[0].value;
-                isDockerSession = allSessions[0].isDocker;
+            // Print a grouped preview banner above the picker.
+            if (grouped.currentHq) {
+                this.log('');
+                this.log(styles.header(`Current HQ: ${tildifyPath(grouped.currentHq)} (${grouped.here.length} orchestrator${grouped.here.length === 1 ? '' : 's'})`));
             }
-            else {
-                // Multiple sessions — let user pick
-                const sessionChoices = allSessions.map(s => ({
-                    name: s.name,
-                    value: s.value,
-                    command: `prlt orchestrator stop --name "${s.value}" --force --json`,
-                }));
-                const selectMessage = 'Multiple orchestrator sessions found. Select one to stop:';
-                if (jsonMode) {
-                    outputPromptAsJson(buildPromptConfig('list', 'session', selectMessage, sessionChoices), createMetadata('orchestrator stop', flags));
-                    return;
-                }
-                const { session } = await this.prompt([{
-                        type: 'list',
-                        name: 'session',
-                        message: selectMessage,
-                        choices: sessionChoices,
-                    }]);
-                sessionName = session;
-                const matched = allSessions.find(s => s.value === session);
-                isDockerSession = matched?.isDocker || false;
+            if (grouped.elsewhere.length > 0) {
+                this.log(styles.muted(`Other locations: ${grouped.elsewhere.length} orchestrator${grouped.elsewhere.length === 1 ? '' : 's'}`));
             }
+            const { session } = await this.prompt([{
+                    type: 'list',
+                    name: 'session',
+                    message: selectMessage,
+                    choices: sessionChoices,
+                }]);
+            picked = ordered.find(s => s.sessionId === session);
         }
-        if (!sessionName) {
+        if (!picked) {
             return;
         }
+        const sessionName = picked.sessionId;
+        const isDockerSession = picked.environment === 'container';
+        const orchestratorName = picked.agentName;
+        const hqPath = picked.hqPath ?? findHQRoot(process.cwd());
         // Confirm unless --force
         if (!flags.force && !jsonMode) {
             const { confirmed } = await this.prompt([{
@@ -203,6 +177,30 @@ export default class OrchestratorStop extends PromptCommand {
                 db?.close();
             }
         }
+        // PRLT-1275: Update the machine.db mirror row so cross-HQ consumers
+        // (e.g. prlt session list from /tmp, the renderer) see the orchestrator
+        // as stopped. Non-fatal — machine.db is secondary.
+        try {
+            const machineDb = new MachineDB();
+            try {
+                const match = machineDb.findBySessionId(sessionName);
+                if (match) {
+                    machineDb.updateStatus(match.id, 'stopped');
+                }
+                else if (orchestratorName) {
+                    const rows = machineDb.getActiveByAgentPrefix(`orchestrator-${orchestratorName}`);
+                    for (const row of rows) {
+                        machineDb.updateStatus(row.id, 'stopped');
+                    }
+                }
+            }
+            finally {
+                machineDb.close();
+            }
+        }
+        catch {
+            // Non-fatal
+        }
         if (jsonMode) {
             outputSuccessAsJson({
                 sessionId: sessionName,