@proletariat/cli 0.3.47 → 0.3.49

package/dist/commands/execution/view.js

@@ -93,7 +93,7 @@ export default class ExecutionView extends PMOCommand {
                     executor: execution.executor,
                     environment: execution.environment,
                     displayMode: execution.displayMode,
-                    sandboxed: execution.sandboxed,
+                    permissionMode: execution.permissionMode,
                     status: execution.status,
                     branch: execution.branch || null,
                     pid: execution.pid || null,
@@ -124,7 +124,7 @@ export default class ExecutionView extends PMOCommand {
             const envIcon = getEnvironmentIcon(execution.environment);
             this.log(`${styles.muted('Type:')}         ${envIcon} ${execution.environment}`);
             this.log(`${styles.muted('Display:')}      ${execution.displayMode}`);
-            this.log(`${styles.muted('Permissions:')}  ${execution.sandboxed ? styles.success('sandboxed (safe)') : styles.warning('unrestricted (danger)')}`);
+            this.log(`${styles.muted('Permissions:')}  ${execution.permissionMode === 'safe' ? styles.success('safe') : styles.warning('danger')}`);
             if (execution.branch) {
                 this.log(`${styles.muted('Branch:')}       ${execution.branch}`);
             }

package/dist/commands/init.js

@@ -2,7 +2,7 @@ import { Command, Flags } from '@oclif/core';
 import chalk from 'chalk';
 import * as path from 'node:path';
 import * as fs from 'node:fs';
-import { promptForHQName, promptForHQLocation, initializeHQ, showNextSteps, validateHQLocation } from '../lib/init/index.js';
+import { promptForHQName, promptForHQLocation, initializeHQ, showNextSteps, validateHQLocation, isHQNameTaken, } from '../lib/init/index.js';
 import { promptForAgentsWithTheme } from '../lib/agents/index.js';
 import { promptForRepositories } from '../lib/repos/index.js';
 import { promptForPMOSetup, machineOutputFlags } from '../lib/pmo/index.js';
@@ -90,6 +90,14 @@ export default class Init extends Command {
             outputPromptAsJson(buildPromptConfig('input', 'name', 'Enter a name for your headquarters:', undefined, undefined), createMetadata('init', flags));
         }
         const hqName = flags.name;
+        // Check if HQ name is already in use
+        if (hqName && isHQNameTaken(hqName)) {
+            this.outputJson({
+                success: false,
+                error: `HQ name "${hqName}" is already in use on this machine. Pick another name.`,
+            });
+            this.exit(1);
+        }
         const hqPath = flags.path || path.resolve(`./${hqName}-hq`);
         // Validate HQ path is not inside a git repo
         if (!validateHQLocation(hqPath)) {

package/dist/commands/orchestrator/attach.js

@@ -10,8 +10,10 @@ import { shouldOutputJson, outputErrorAsJson, outputSuccessAsJson, createMetadat
 import { styles } from '../../lib/styles.js';
 import { getHostTmuxSessionNames } from '../../lib/execution/session-utils.js';
 import { getWorkspaceInfo } from '../../lib/agents/commands.js';
+import { findHQRoot } from '../../lib/workspace.js';
+import { getHeadquartersNameFromPath } from '../../lib/machine-config.js';
 import { loadExecutionConfig, shouldUseControlMode, buildTmuxAttachCommand } from '../../lib/execution/index.js';
-import { buildOrchestratorSessionName } from './start.js';
+import { buildOrchestratorSessionName, findRunningOrchestratorSessions } from './start.js';
 /**
  * Detect the terminal emulator from environment variables.
  * Returns a terminal app name suitable for AppleScript tab creation,
@@ -27,8 +29,6 @@ export function detectTerminalApp() {
         return null;
     }
     const termProgram = process.env.TERM_PROGRAM;
-    if (!termProgram)
-        return null;
     switch (termProgram) {
         case 'iTerm.app':
             return 'iTerm';
@@ -38,9 +38,13 @@ export function detectTerminalApp() {
             return 'Terminal';
         case 'WezTerm':
             return 'WezTerm';
-        default:
-            return null;
     }
+    // TERM_PROGRAM is overwritten to 'tmux' inside tmux sessions.
+    // Fall back to vars that persist through tmux to detect the outer terminal.
+    if (process.env.LC_TERMINAL === 'iTerm2' || process.env.ITERM_SESSION_ID) {
+        return 'iTerm';
+    }
+    return null;
 }
 export default class OrchestratorAttach extends PromptCommand {
     static description = 'Attach to the running orchestrator tmux session';
@@ -73,18 +77,50 @@ export default class OrchestratorAttach extends PromptCommand {
     async run() {
         const { flags } = await this.parse(OrchestratorAttach);
         const jsonMode = shouldOutputJson(flags);
-        const sessionName = buildOrchestratorSessionName(flags.name || 'main');
-        // Check if orchestrator session exists
         const hostSessions = getHostTmuxSessionNames();
-        if (!hostSessions.includes(sessionName)) {
-            if (jsonMode) {
-                outputErrorAsJson('NOT_RUNNING', 'Orchestrator is not running. Start it with: prlt orchestrator start', createMetadata('orchestrator attach', flags));
+        // Resolve session name: try HQ-scoped first, fall back to discovery
+        let sessionName;
+        const hqPath = findHQRoot(process.cwd());
+        if (hqPath) {
+            const hqName = getHeadquartersNameFromPath(hqPath);
+            sessionName = buildOrchestratorSessionName(hqName, flags.name || 'main');
+            if (!hostSessions.includes(sessionName)) {
+                sessionName = undefined; // Not running for this HQ
+            }
+        }
+        // If not in HQ or session not found, discover running orchestrator sessions
+        if (!sessionName) {
+            const runningSessions = findRunningOrchestratorSessions(hostSessions);
+            if (runningSessions.length === 0) {
+                if (jsonMode) {
+                    outputErrorAsJson('NOT_RUNNING', 'Orchestrator is not running. Start it with: prlt orchestrator start', createMetadata('orchestrator attach', flags));
+                    return;
+                }
+                this.log('');
+                this.log(styles.warning('Orchestrator is not running.'));
+                this.log(styles.muted('Start it with: prlt orchestrator start'));
+                this.log('');
                 return;
             }
-            this.log('');
-            this.log(styles.warning('Orchestrator is not running.'));
-            this.log(styles.muted('Start it with: prlt orchestrator start'));
-            this.log('');
+            else if (runningSessions.length === 1) {
+                sessionName = runningSessions[0];
+            }
+            else {
+                // Multiple sessions — let user pick
+                const { session } = await this.prompt([{
+                        type: 'list',
+                        name: 'session',
+                        message: 'Multiple orchestrator sessions found. Select one to attach:',
+                        choices: runningSessions.map(s => ({
+                            name: s,
+                            value: s,
+                            command: `prlt orchestrator attach --name "${s}" --json`,
+                        })),
+                    }], jsonMode ? { flags, commandName: 'orchestrator attach' } : null);
+                sessionName = session;
+            }
+        }
+        if (!sessionName) {
             return;
         }
         if (jsonMode) {
@@ -141,6 +177,16 @@ export default class OrchestratorAttach extends PromptCommand {
     }
     attachInCurrentTerminal(useControlMode, sessionName) {
         try {
+            // Set mouse mode based on attach type:
+            // - Plain terminal: mouse on (enables scroll in tmux; hold Shift/Option to bypass)
+            // - iTerm -CC: mouse off (iTerm handles scrolling natively)
+            const mouseMode = useControlMode ? 'off' : 'on';
+            try {
+                execSync(`tmux set-option -t "${sessionName}" mouse ${mouseMode}`, { stdio: 'pipe' });
+            }
+            catch {
+                // Non-fatal: mouse mode is a convenience, don't block attach
+            }
             const tmuxAttach = buildTmuxAttachCommand(useControlMode);
             execSync(`${tmuxAttach} -t "${sessionName}"`, { stdio: 'inherit' });
         }
@@ -152,6 +198,7 @@ export default class OrchestratorAttach extends PromptCommand {
         const title = 'Orchestrator';
         const tmuxAttach = buildTmuxAttachCommand(useControlMode);
         const attachCmd = `${tmuxAttach} -t "${sessionName}"`;
+        const mouseMode = useControlMode ? 'off' : 'on';
         const baseDir = path.join(os.homedir(), '.proletariat', 'scripts');
         fs.mkdirSync(baseDir, { recursive: true });
         const scriptPath = path.join(baseDir, `attach-orch-${Date.now()}.sh`);
@@ -160,6 +207,9 @@ export default class OrchestratorAttach extends PromptCommand {
 echo -ne "\\033]0;${title}\\007"
 echo -ne "\\033]1;${title}\\007"
 
+# Set mouse mode before attaching
+tmux set-option -t "${sessionName}" mouse ${mouseMode} 2>/dev/null || true
+
 echo "Attaching to: ${sessionName}"
 ${attachCmd}
 

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

@@ -1,10 +1,10 @@
 import { PromptCommand } from '../../lib/prompt-command.js';
 /**
- * Build orchestrator tmux session name.
- * Default: 'prlt-orchestrator-main'
- * With --name: 'prlt-orchestrator-{name}'
+ * Build orchestrator tmux session name scoped to the HQ workspace.
+ * Format: 'prlt-orchestrator-{hqName}-{name}'
+ * Example: 'prlt-orchestrator-proletariat-main'
  */
-export declare function buildOrchestratorSessionName(name?: string): string;
+export declare function buildOrchestratorSessionName(hqName: string, name?: string): string;
 /**
  * Find running orchestrator session(s) by prefix match.
  * Returns all tmux session names that start with 'prlt-orchestrator-'.
@@ -18,7 +18,7 @@ export default class OrchestratorStart extends PromptCommand {
         action: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         executor: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'skip-permissions': import("@oclif/core/interfaces").BooleanFlag<boolean>;
-        sandboxed: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        'permission-mode': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         name: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         background: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         foreground: import("@oclif/core/interfaces").BooleanFlag<boolean>;

package/dist/commands/orchestrator/start.js

@@ -5,6 +5,7 @@ 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 { getHeadquartersNameFromPath } from '../../lib/machine-config.js';
 import { shouldOutputJson, outputErrorAsJson, outputSuccessAsJson, createMetadata, buildPromptConfig, outputPromptAsJson, } from '../../lib/prompt-json.js';
 import { styles } from '../../lib/styles.js';
 import { DEFAULT_EXECUTION_CONFIG, } from '../../lib/execution/types.js';
@@ -13,16 +14,23 @@ import { getHostTmuxSessionNames } from '../../lib/execution/session-utils.js';
 import { ExecutionStorage } from '../../lib/execution/storage.js';
 import { loadExecutionConfig, getTerminalApp, getShell, detectShell, detectTerminalApp, } from '../../lib/execution/config.js';
 /**
- * Build orchestrator tmux session name.
- * Default: 'prlt-orchestrator-main'
- * With --name: 'prlt-orchestrator-{name}'
+ * Sanitize a name segment for use in tmux session names.
  */
-export function buildOrchestratorSessionName(name = 'main') {
-    const safeName = name
+function sanitizeName(name) {
+    return name
         .replace(/[^a-zA-Z0-9._-]/g, '-')
         .replace(/-+/g, '-')
         .replace(/^-|-$/g, '');
-    return `prlt-orchestrator-${safeName || 'main'}`;
+}
+/**
+ * Build orchestrator tmux session name scoped to the HQ workspace.
+ * Format: 'prlt-orchestrator-{hqName}-{name}'
+ * Example: 'prlt-orchestrator-proletariat-main'
+ */
+export function buildOrchestratorSessionName(hqName, name = 'main') {
+    const safeHqName = sanitizeName(hqName) || 'default';
+    const safeName = sanitizeName(name) || 'main';
+    return `prlt-orchestrator-${safeHqName}-${safeName}`;
 }
 /**
  * Find running orchestrator session(s) by prefix match.
@@ -36,7 +44,7 @@ export default class OrchestratorStart extends PromptCommand {
     static examples = [
         '<%= config.bin %> <%= command.id %>',
         '<%= config.bin %> <%= command.id %> --executor codex',
-        '<%= config.bin %> <%= command.id %> --skip-permissions',
+        '<%= config.bin %> <%= command.id %> --permission-mode danger',
         '<%= config.bin %> <%= command.id %> --prompt "coordinate all agents on TKT-100"',
         '<%= config.bin %> <%= command.id %> --background',
     ];
@@ -56,13 +64,13 @@ export default class OrchestratorStart extends PromptCommand {
             options: ['claude-code', 'codex', 'aider', 'custom'],
         }),
         'skip-permissions': Flags.boolean({
-            description: 'Run with --dangerously-skip-permissions',
+            description: 'Skip permission checks (shorthand for --permission-mode danger)',
             default: false,
-            exclusive: ['sandboxed'],
+            exclusive: ['permission-mode'],
         }),
-        sandboxed: Flags.boolean({
-            description: 'Run in sandboxed mode (requires approval for dangerous operations)',
-            default: false,
+        'permission-mode': Flags.string({
+            description: 'Permission mode for the orchestrator (danger=skip checks, safe=require approval)',
+            options: ['danger', 'safe'],
             exclusive: ['skip-permissions'],
         }),
         name: Flags.string({
@@ -86,7 +94,18 @@ export default class OrchestratorStart extends PromptCommand {
         const { flags } = await this.parse(OrchestratorStart);
         const jsonMode = shouldOutputJson(flags);
         const orchestratorName = flags.name || 'main';
-        const sessionName = buildOrchestratorSessionName(orchestratorName);
+        // Resolve HQ path first (needed for scoped session name)
+        const hqPath = findHQRoot(process.cwd());
+        if (!hqPath) {
+            if (jsonMode) {
+                outputErrorAsJson('NO_HQ', 'Not in an HQ workspace. Run "prlt init" first.', createMetadata('orchestrator start', flags));
+                return;
+            }
+            this.error('Not in an HQ workspace. Run "prlt init" first.');
+        }
+        // Build session name scoped to this HQ
+        const hqName = getHeadquartersNameFromPath(hqPath);
+        const sessionName = buildOrchestratorSessionName(hqName, orchestratorName);
         // Check if orchestrator is already running
         const hostSessions = getHostTmuxSessionNames();
         if (hostSessions.includes(sessionName)) {
@@ -112,15 +131,6 @@ export default class OrchestratorStart extends PromptCommand {
             }
             return;
         }
-        // Resolve HQ path
-        const hqPath = findHQRoot(process.cwd());
-        if (!hqPath) {
-            if (jsonMode) {
-                outputErrorAsJson('NO_HQ', 'Not in an HQ workspace. Run "prlt init" first.', createMetadata('orchestrator start', flags));
-                return;
-            }
-            this.error('Not in an HQ workspace. Run "prlt init" first.');
-        }
         // Executor selection
         let selectedExecutor;
         if (flags.executor) {
@@ -147,30 +157,30 @@ export default class OrchestratorStart extends PromptCommand {
             selectedExecutor = executor;
         }
         // Permission mode selection
-        let sandboxed;
+        let permissionMode;
         if (flags['skip-permissions']) {
-            sandboxed = false;
+            permissionMode = 'danger';
         }
-        else if (flags.sandboxed) {
-            sandboxed = true;
+        else if (flags['permission-mode']) {
+            permissionMode = flags['permission-mode'];
         }
         else {
             const permissionChoices = [
-                { name: 'Sandboxed (requires approval for dangerous operations)', value: 'sandboxed', command: 'prlt orchestrator start --sandboxed --json' },
-                { name: 'Accept all (--dangerously-skip-permissions)', value: 'skip', command: 'prlt orchestrator start --skip-permissions --json' },
+                { name: '⚠️  danger - Skip permission checks (faster)', value: 'danger', command: 'prlt orchestrator start --permission-mode danger --json' },
+                { name: '🔒 safe   - Requires approval for dangerous operations', value: 'safe', command: 'prlt orchestrator start --permission-mode safe --json' },
             ];
-            const permissionMessage = 'Select permission mode:';
+            const permissionMessage = 'Permission mode:';
             if (jsonMode) {
                 outputPromptAsJson(buildPromptConfig('list', 'permissionMode', permissionMessage, permissionChoices), createMetadata('orchestrator start', flags));
                 return;
             }
-            const { permissionMode } = await this.prompt([{
+            const { permissionMode: selectedMode } = await this.prompt([{
                     type: 'list',
                     name: 'permissionMode',
                     message: permissionMessage,
                     choices: permissionChoices,
                 }]);
-            sandboxed = permissionMode === 'sandboxed';
+            permissionMode = selectedMode;
         }
         // Resolve action prompt
         let actionPrompt = flags.prompt;
@@ -218,7 +228,7 @@ export default class OrchestratorStart extends PromptCommand {
         // Build execution config
         const executionConfig = { ...DEFAULT_EXECUTION_CONFIG };
         executionConfig.outputMode = 'interactive';
-        executionConfig.sandboxed = sandboxed;
+        executionConfig.permissionMode = permissionMode;
         // Load saved preferences from workspace DB
         const dbPath = path.join(hqPath, '.proletariat', 'workspace.db');
         let db = null;
@@ -289,7 +299,7 @@ export default class OrchestratorStart extends PromptCommand {
             this.log('');
             this.log(styles.muted(`   Starting orchestrator...`));
             this.log(styles.muted(`   Executor: ${selectedExecutor}`));
-            this.log(styles.muted(`   Permission mode: ${sandboxed ? 'sandboxed' : 'skip-permissions'}`));
+            this.log(styles.muted(`   Permission mode: ${permissionMode}`));
             this.log(styles.muted(`   Display mode: ${displayMode}`));
             this.log(styles.muted(`   Directory: ${hqPath}`));
             if (orchestratorName !== 'main') {
@@ -315,7 +325,7 @@ export default class OrchestratorStart extends PromptCommand {
                         executor: selectedExecutor,
                         environment: 'host',
                         displayMode,
-                        sandboxed,
+                        permissionMode,
                         sessionId: result.sessionId || sessionName,
                     });
                 }
@@ -327,7 +337,7 @@ export default class OrchestratorStart extends PromptCommand {
                 outputSuccessAsJson({
                     sessionId: result.sessionId || sessionName,
                     executor: selectedExecutor,
-                    sandboxed,
+                    permissionMode,
                     displayMode,
                     directory: hqPath,
                     name: orchestratorName,

package/dist/commands/orchestrator/status.js

@@ -4,7 +4,9 @@ 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 { buildOrchestratorSessionName } from './start.js';
+import { findHQRoot } from '../../lib/workspace.js';
+import { getHeadquartersNameFromPath } from '../../lib/machine-config.js';
+import { buildOrchestratorSessionName, findRunningOrchestratorSessions } from './start.js';
 export default class OrchestratorStatus extends PromptCommand {
     static description = 'Check if the orchestrator is running';
     static examples = [
@@ -30,38 +32,77 @@ export default class OrchestratorStatus extends PromptCommand {
     async run() {
         const { flags } = await this.parse(OrchestratorStatus);
         const jsonMode = shouldOutputJson(flags);
-        const sessionName = buildOrchestratorSessionName(flags.name || 'main');
         const hostSessions = getHostTmuxSessionNames();
-        const isRunning = hostSessions.includes(sessionName);
-        let recentOutput = null;
-        if (isRunning && flags.peek) {
-            recentOutput = captureTmuxPane(sessionName, flags.lines);
+        // Resolve session name: try HQ-scoped first, fall back to discovery
+        let sessionName;
+        const hqPath = findHQRoot(process.cwd());
+        if (hqPath) {
+            const hqName = getHeadquartersNameFromPath(hqPath);
+            sessionName = buildOrchestratorSessionName(hqName, flags.name || 'main');
         }
+        // If in HQ, check specifically for this HQ's session
+        if (sessionName) {
+            const isRunning = hostSessions.includes(sessionName);
+            let recentOutput = null;
+            if (isRunning && flags.peek) {
+                recentOutput = captureTmuxPane(sessionName, flags.lines);
+            }
+            if (jsonMode) {
+                outputSuccessAsJson({
+                    running: isRunning,
+                    sessionId: isRunning ? sessionName : 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: ${sessionName}`));
+                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('');
+            return;
+        }
+        // Not in HQ — discover all running orchestrator sessions
+        const runningSessions = findRunningOrchestratorSessions(hostSessions);
         if (jsonMode) {
             outputSuccessAsJson({
-                running: isRunning,
-                sessionId: isRunning ? sessionName : null,
-                ...(recentOutput !== null && { recentOutput }),
+                running: runningSessions.length > 0,
+                sessions: runningSessions,
             }, createMetadata('orchestrator status', flags));
             return;
         }
         this.log('');
-        if (isRunning) {
-            this.log(styles.success(`Orchestrator is running`));
-            this.log(styles.muted(`   Session: ${sessionName}`));
-            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)));
-            }
+        if (runningSessions.length === 0) {
+            this.log(styles.muted('No orchestrator sessions running.'));
+            this.log(styles.muted('Start one with: prlt orchestrator start'));
         }
         else {
-            this.log(styles.muted('Orchestrator is not running.'));
-            this.log(styles.muted('Start it with: prlt orchestrator start'));
+            this.log(styles.success(`${runningSessions.length} orchestrator session(s) running:`));
+            for (const s of runningSessions) {
+                this.log(styles.muted(`   ${s}`));
+                if (flags.peek) {
+                    const output = captureTmuxPane(s, flags.lines);
+                    if (output) {
+                        this.log(styles.muted('─'.repeat(60)));
+                        this.log(output);
+                        this.log(styles.muted('─'.repeat(60)));
+                    }
+                }
+            }
         }
         this.log('');
     }

package/dist/commands/orchestrator/stop.js

@@ -10,7 +10,8 @@ import { shouldOutputJson, outputErrorAsJson, outputSuccessAsJson, createMetadat
 import { styles } from '../../lib/styles.js';
 import { getHostTmuxSessionNames } from '../../lib/execution/session-utils.js';
 import { ExecutionStorage } from '../../lib/execution/storage.js';
-import { buildOrchestratorSessionName } from './start.js';
+import { buildOrchestratorSessionName, findRunningOrchestratorSessions } from './start.js';
+import { getHeadquartersNameFromPath } from '../../lib/machine-config.js';
 export default class OrchestratorStop extends PromptCommand {
     static description = 'Stop the running orchestrator';
     static examples = [
@@ -32,17 +33,49 @@ export default class OrchestratorStop extends PromptCommand {
     async run() {
         const { flags } = await this.parse(OrchestratorStop);
         const jsonMode = shouldOutputJson(flags);
-        const sessionName = buildOrchestratorSessionName(flags.name || 'main');
-        // Check if orchestrator session exists
         const hostSessions = getHostTmuxSessionNames();
-        if (!hostSessions.includes(sessionName)) {
-            if (jsonMode) {
-                outputErrorAsJson('NOT_RUNNING', 'Orchestrator is not running.', createMetadata('orchestrator stop', flags));
+        // Resolve session name: try HQ-scoped first, fall back to discovery
+        let sessionName;
+        const hqPath = findHQRoot(process.cwd());
+        if (hqPath) {
+            const hqName = getHeadquartersNameFromPath(hqPath);
+            sessionName = buildOrchestratorSessionName(hqName, flags.name || 'main');
+            if (!hostSessions.includes(sessionName)) {
+                sessionName = undefined;
+            }
+        }
+        // If not in HQ or session not found, discover running orchestrator sessions
+        if (!sessionName) {
+            const runningSessions = findRunningOrchestratorSessions(hostSessions);
+            if (runningSessions.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;
             }
-            this.log('');
-            this.log(styles.muted('Orchestrator is not running.'));
-            this.log('');
+            else if (runningSessions.length === 1) {
+                sessionName = runningSessions[0];
+            }
+            else {
+                // Multiple sessions — let user pick
+                const { session } = await this.prompt([{
+                        type: 'list',
+                        name: 'session',
+                        message: 'Multiple orchestrator sessions found. Select one to stop:',
+                        choices: runningSessions.map(s => ({
+                            name: s,
+                            value: s,
+                            command: `prlt orchestrator stop --name "${s}" --force --json`,
+                        })),
+                    }], jsonMode ? { flags, commandName: 'orchestrator stop' } : null);
+                sessionName = session;
+            }
+        }
+        if (!sessionName) {
             return;
         }
         // Confirm unless --force
@@ -50,7 +83,7 @@ export default class OrchestratorStop extends PromptCommand {
             const { confirmed } = await this.prompt([{
                     type: 'list',
                     name: 'confirmed',
-                    message: 'Stop the orchestrator?',
+                    message: `Stop the orchestrator (${sessionName})?`,
                     choices: [
                         { name: 'Yes', value: true },
                         { name: 'No', value: false },
@@ -72,8 +105,7 @@ export default class OrchestratorStop extends PromptCommand {
             }
             this.error(`Failed to stop orchestrator: ${error instanceof Error ? error.message : error}`);
         }
-        // Update execution record to stopped
-        const hqPath = findHQRoot(process.cwd());
+        // Update execution record to stopped (only if in HQ)
         if (hqPath) {
             const dbPath = path.join(hqPath, '.proletariat', 'workspace.db');
             if (fs.existsSync(dbPath)) {