claude-tempo 0.20.0 → 0.21.0

package/dist/cli/commands.js

@@ -178,6 +178,8 @@ async function start(opts) {
         temporalEnvVars[config_1.ENV.TEMPORAL_TLS_CERT_PATH] = config.temporalTlsCertPath;
     if (config.temporalTlsKeyPath)
         temporalEnvVars[config_1.ENV.TEMPORAL_TLS_KEY_PATH] = config.temporalTlsKeyPath;
+    if (config.claudeBin)
+        temporalEnvVars[config_1.ENV.CLAUDE_BIN] = config.claudeBin;
     if (opts.agent === 'copilot') {
         const { pid } = (0, spawn_1.spawnCopilotBridge)({
             name: opts.name || `copilot-${Date.now()}`,
@@ -212,7 +214,7 @@ async function start(opts) {
             [config_1.ENV.CONDUCTOR]: opts.conductor ? 'true' : '',
             [config_1.ENV.PLAYER_NAME]: sessionName || '',
         };
-        const { pid } = (0, spawn_1.spawnInTerminal)(claudeArgs, workDir, envVars);
+        const { pid } = (0, spawn_1.spawnInTerminal)(claudeArgs, workDir, envVars, { claudeBin: config.claudeBin });
         out.success(`Launched ${role} session${sessionName ? ` "${sessionName}"` : ''} (pid ${pid ?? 'unknown'})`);
     }
     out.log(`  Ensemble: ${opts.ensemble}`);
@@ -668,13 +670,93 @@ async function up(opts) {
     }
     // Resolve conductor agent from lineup or CLI flags
     const conductorAgent = lineup?.conductor?.agent === 'copilot' ? 'copilot' : opts.agent;
-    // Step 5: Connect to Temporal and pre-create conductor workflow before spawning
+    // Step 5: Connect to Temporal and check for existing conductor
     console.log();
-    out.log(`Launching conductor in ensemble ${out.cyan(opts.ensemble)}${conductorAgent === 'copilot' ? out.dim(' (copilot)') : ''}...`);
     const connection = await (0, connection_1.createTemporalConnection)(config);
     const client = new client_1.Client({ connection, namespace: config.temporalNamespace });
-    const sessionName = opts.name || lineup?.conductor?.name || (conductorAgent === 'copilot' ? `${opts.ensemble}-conductor` : 'conductor');
     const conductorWfId = (0, config_1.conductorWorkflowId)(opts.ensemble);
+    // Check if a conductor is already running
+    try {
+        const existingHandle = client.workflow.getHandle(conductorWfId);
+        const desc = await existingHandle.describe();
+        if (desc.status.name === 'RUNNING') {
+            if (!process.stdin.isTTY) {
+                out.error(`A conductor is already running for ensemble "${opts.ensemble}".`);
+                out.log(`  Use ${out.dim('--resume')} to reconnect, or ${out.dim('claude-tempo start')} to join as a player.`);
+                process.exit(1);
+            }
+            out.warn(`A conductor is already running for ensemble "${opts.ensemble}".`);
+            console.log();
+            out.log(`  1) Join as a new player session`);
+            out.log(`  2) Reconnect to the existing conductor (--resume)`);
+            out.log(`  3) Tear down and start fresh`);
+            out.log(`  4) Cancel`);
+            console.log();
+            const choice = await new Promise((res) => {
+                const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+                rl.question(`  ${out.cyan('?')} Choose an option [1-4]: `, (answer) => {
+                    rl.close();
+                    res(answer.trim());
+                });
+            });
+            switch (choice) {
+                case '1':
+                    // Join as a player — delegate to start()
+                    console.log();
+                    out.log('Joining as a player session...');
+                    await start({
+                        ensemble: opts.ensemble,
+                        conductor: false,
+                        name: opts.name,
+                        skipPreflight: true, // infrastructure already verified above
+                        agent: opts.agent,
+                        dir: process.cwd(),
+                    });
+                    return;
+                case '2':
+                    // Reconnect to existing conductor
+                    console.log();
+                    out.log('Reconnecting to existing conductor...');
+                    await start({
+                        ensemble: opts.ensemble,
+                        conductor: true,
+                        resume: true,
+                        name: opts.name,
+                        skipPreflight: true,
+                        agent: opts.agent,
+                        dir: process.cwd(),
+                    });
+                    return;
+                case '3':
+                    // Terminate existing workflows, then fall through to normal up flow
+                    console.log();
+                    try {
+                        await client.workflow.getHandle(conductorWfId).terminate('up: fresh start');
+                    }
+                    catch { /* may not exist */ }
+                    try {
+                        await client.workflow.getHandle((0, config_1.schedulerWorkflowId)(opts.ensemble)).terminate('up: fresh start');
+                    }
+                    catch { /* may not exist */ }
+                    try {
+                        await client.workflow.getHandle((0, config_1.maestroWorkflowId)(opts.ensemble)).terminate('up: fresh start');
+                    }
+                    catch { /* may not exist */ }
+                    out.success('Existing ensemble torn down');
+                    // Fall through to normal up flow below
+                    break;
+                case '4':
+                default:
+                    out.log('Cancelled.');
+                    process.exit(0);
+            }
+        }
+    }
+    catch {
+        // No existing conductor — proceed normally
+    }
+    out.log(`Launching conductor in ensemble ${out.cyan(opts.ensemble)}${conductorAgent === 'copilot' ? out.dim(' (copilot)') : ''}...`);
+    const sessionName = opts.name || lineup?.conductor?.name || (conductorAgent === 'copilot' ? `${opts.ensemble}-conductor` : 'conductor');
     // Resolve conductor agent type from lineup
     const conductorType = lineup?.conductor?.agent && lineup.conductor.agent !== 'default' && lineup.conductor.agent !== 'copilot'
         ? lineup.conductor.agent
@@ -761,7 +843,7 @@ async function up(opts) {
         if (resolvedConductorType || conductorTypeName) {
             conductorEnvVars[config_1.ENV.PLAYER_TYPE] = resolvedConductorType?.name || conductorTypeName || '';
         }
-        ({ pid } = (0, spawn_1.spawnInTerminal)(claudeArgs, process.cwd(), conductorEnvVars));
+        ({ pid } = (0, spawn_1.spawnInTerminal)(claudeArgs, process.cwd(), conductorEnvVars, { claudeBin: config.claudeBin }));
     }
     out.success(`Conductor launched (pid ${pid ?? 'unknown'})`);
     // Step 6: If lineup provided, recruit players and create schedules
@@ -866,7 +948,7 @@ async function up(opts) {
                         if (resolvedPlayerType) {
                             playerEnvVars[config_1.ENV.PLAYER_TYPE] = resolvedPlayerType.name;
                         }
-                        (0, spawn_1.spawnInTerminal)(claudeArgs, playerWorkDir, playerEnvVars);
+                        (0, spawn_1.spawnInTerminal)(claudeArgs, playerWorkDir, playerEnvVars, { claudeBin: config.claudeBin });
                     }
                     out.log(`  ${out.green('ok')} ${out.bold(player.name)} in ${playerWorkDir}`);
                 }
@@ -1685,7 +1767,9 @@ async function encore(opts) {
         envVars[config_1.ENV.TEMPORAL_TLS_CERT_PATH] = config.temporalTlsCertPath;
     if (config.temporalTlsKeyPath)
         envVars[config_1.ENV.TEMPORAL_TLS_KEY_PATH] = config.temporalTlsKeyPath;
-    const { pid } = (0, spawn_1.spawnInTerminal)(spawnArgs, targetMeta.workDir, envVars);
+    if (config.claudeBin)
+        envVars[config_1.ENV.CLAUDE_BIN] = config.claudeBin;
+    const { pid } = (0, spawn_1.spawnInTerminal)(spawnArgs, targetMeta.workDir, envVars, { claudeBin: config.claudeBin });
     out.success(`Encore! "${opts.name}" revived (pid ${pid})`);
     await connection.close();
 }

package/dist/cli/config-command.js

@@ -173,6 +173,8 @@ function configSet(key, value) {
         'temporal-tls-key-path': 'temporalTlsKeyPath',
         defaultAgent: 'defaultAgent',
         'default-agent': 'defaultAgent',
+        claudeBin: 'claudeBin',
+        'claude-bin': 'claudeBin',
     };
     const configKey = keyMap[key];
     if (!configKey) {
@@ -200,6 +202,7 @@ function configShow() {
         { key: 'temporalTlsCertPath', configKey: 'temporalTlsCertPath' },
         { key: 'temporalTlsKeyPath', configKey: 'temporalTlsKeyPath' },
         { key: 'defaultAgent', configKey: 'defaultAgent' },
+        { key: 'claudeBin', configKey: 'claudeBin' },
     ];
     out.log(`  Config file: ${out.dim(config_1.CONFIG_FILE_PATH)}`);
     console.log();

package/dist/config.d.ts

@@ -15,6 +15,7 @@ export declare const ENV: {
     readonly TEMPORAL_TLS_KEY_PATH: "TEMPORAL_TLS_KEY_PATH";
     readonly DEFAULT_AGENT: "CLAUDE_TEMPO_DEFAULT_AGENT";
     readonly PLAYER_TYPE: "CLAUDE_TEMPO_PLAYER_TYPE";
+    readonly CLAUDE_BIN: "CLAUDE_TEMPO_CLAUDE_BIN";
 };
 export interface Config {
     temporalAddress: string;
@@ -23,6 +24,7 @@ export interface Config {
     temporalTlsCertPath?: string;
     temporalTlsKeyPath?: string;
     defaultAgent: AgentType;
+    claudeBin?: string;
     taskQueue: string;
     ensemble: string;
 }
@@ -34,6 +36,7 @@ export interface PersistedConfig {
     temporalTlsCertPath?: string;
     temporalTlsKeyPath?: string;
     defaultAgent?: AgentType;
+    claudeBin?: string;
 }
 export declare const CLAUDE_TEMPO_HOME: string;
 export declare const CONFIG_FILE_PATH: string;

package/dist/config.js

@@ -36,6 +36,7 @@ exports.ENV = {
     TEMPORAL_TLS_KEY_PATH: 'TEMPORAL_TLS_KEY_PATH',
     DEFAULT_AGENT: 'CLAUDE_TEMPO_DEFAULT_AGENT',
     PLAYER_TYPE: 'CLAUDE_TEMPO_PLAYER_TYPE',
+    CLAUDE_BIN: 'CLAUDE_TEMPO_CLAUDE_BIN',
 };
 exports.CLAUDE_TEMPO_HOME = (0, path_1.join)((0, os_1.homedir)(), '.claude-tempo');
 exports.CONFIG_FILE_PATH = (0, path_1.join)(exports.CLAUDE_TEMPO_HOME, 'config.json');
@@ -192,6 +193,7 @@ function getConfig(overrides = {}) {
         defaultAgent: validAgent(overrides.defaultAgent
             || process.env[exports.ENV.DEFAULT_AGENT]
             || configFile.defaultAgent),
+        claudeBin: process.env[exports.ENV.CLAUDE_BIN] || configFile.claudeBin || undefined,
         taskQueue: process.env[exports.ENV.TASK_QUEUE] ?? 'claude-tempo',
         ensemble: process.env[exports.ENV.ENSEMBLE] ?? 'default',
     };
@@ -227,6 +229,7 @@ function getConfigWithSources(overrides = {}) {
     const tlsCert = resolveWithSource('temporalTlsCertPath', overrides.temporalTlsCertPath, exports.ENV.TEMPORAL_TLS_CERT_PATH, configFile.temporalTlsCertPath, temporalCli.temporalTlsCertPath);
     const tlsKey = resolveWithSource('temporalTlsKeyPath', overrides.temporalTlsKeyPath, exports.ENV.TEMPORAL_TLS_KEY_PATH, configFile.temporalTlsKeyPath, temporalCli.temporalTlsKeyPath);
     const defaultAgent = resolveWithSource('defaultAgent', overrides.defaultAgent, exports.ENV.DEFAULT_AGENT, configFile.defaultAgent, undefined, 'claude');
+    const claudeBin = resolveWithSource('claudeBin', undefined, exports.ENV.CLAUDE_BIN, configFile.claudeBin, undefined);
     return {
         config: {
             temporalAddress: address.value,
@@ -235,6 +238,7 @@ function getConfigWithSources(overrides = {}) {
             temporalTlsCertPath: tlsCert.value,
             temporalTlsKeyPath: tlsKey.value,
             defaultAgent: validAgent(defaultAgent.value),
+            claudeBin: claudeBin.value,
             taskQueue: process.env[exports.ENV.TASK_QUEUE] ?? 'claude-tempo',
             ensemble: process.env[exports.ENV.ENSEMBLE] ?? 'default',
         },
@@ -245,6 +249,7 @@ function getConfigWithSources(overrides = {}) {
             temporalTlsCertPath: tlsCert.source,
             temporalTlsKeyPath: tlsKey.source,
             defaultAgent: defaultAgent.source,
+            claudeBin: claudeBin.source,
         },
     };
 }

package/dist/spawn.d.ts

@@ -10,8 +10,17 @@ export declare function resolveIconPath(): string;
 export declare function ensureWindowsTerminalProfile(): boolean;
 /** POSIX shell-safe single-quoting (works in bash, zsh, and fish) */
 export declare function shellQuote(s: string): string;
-/** Resolve the absolute path to the `claude` binary */
-export declare function resolveClaudePath(): string;
+/**
+ * Resolve the path to the `claude` binary.
+ *
+ * Resolution order:
+ *  1. `configBin` parameter (from Config.claudeBin — env var or config file)
+ *  2. `CLAUDE_TEMPO_CLAUDE_BIN` env var (checked directly for spawned processes that
+ *     may not have full config resolution, e.g., activities)
+ *  3. `which claude` / `where claude` lookup
+ *  4. Bare `claude` fallback
+ */
+export declare function resolveClaudePath(configBin?: string): string;
 /**
  * Detect the macOS terminal the user is actually running in.
  *
@@ -38,7 +47,9 @@ export declare function buildClaudeCommand(claudeBin: string, claudeArgs: string
  *  - Windows: shell:true with env vars
  *  - Linux: terminal emulator with -e flag
  */
-export declare function spawnInTerminal(claudeArgs: string[], workDir: string, envVars: Record<string, string>): {
+export declare function spawnInTerminal(claudeArgs: string[], workDir: string, envVars: Record<string, string>, options?: {
+    claudeBin?: string;
+}): {
     pid: number | undefined;
 };
 export interface CopilotBridgeOpts {

package/dist/spawn.js

@@ -130,8 +130,25 @@ function ensureWindowsTerminalProfile() {
 function shellQuote(s) {
     return `'${s.replace(/'/g, "'\\''")}'`;
 }
-/** Resolve the absolute path to the `claude` binary */
-function resolveClaudePath() {
+/**
+ * Resolve the path to the `claude` binary.
+ *
+ * Resolution order:
+ *  1. `configBin` parameter (from Config.claudeBin — env var or config file)
+ *  2. `CLAUDE_TEMPO_CLAUDE_BIN` env var (checked directly for spawned processes that
+ *     may not have full config resolution, e.g., activities)
+ *  3. `which claude` / `where claude` lookup
+ *  4. Bare `claude` fallback
+ */
+function resolveClaudePath(configBin) {
+    // Priority 1: explicit config value
+    if (configBin)
+        return configBin;
+    // Priority 2: env var (may be set by parent process)
+    const envBin = process.env.CLAUDE_TEMPO_CLAUDE_BIN;
+    if (envBin)
+        return envBin;
+    // Priority 3: which/where lookup
     const cmd = process.platform === 'win32' ? 'where' : 'which';
     try {
         return (0, child_process_1.execFileSync)(cmd, ['claude'], { encoding: 'utf8' }).trim().split('\n')[0];
@@ -205,8 +222,10 @@ function buildClaudeCommand(claudeBin, claudeArgs, envVars) {
     const envInline = Object.entries(envVars)
         .map(([k, v]) => `${k}=${shellQuote(v)}`)
         .join(' ');
+    // Quote the binary path if it contains spaces (e.g., "C:\Program Files\...")
+    const quotedBin = claudeBin.includes(' ') ? shellQuote(claudeBin) : claudeBin;
     const args = claudeArgs.map(a => shellQuote(a)).join(' ');
-    return envInline ? `${envInline} ${claudeBin} ${args}` : `${claudeBin} ${args}`;
+    return envInline ? `${envInline} ${quotedBin} ${args}` : `${quotedBin} ${args}`;
 }
 /**
  * Spawn a Claude Code session in a visible terminal window.
@@ -218,8 +237,8 @@ function buildClaudeCommand(claudeBin, claudeArgs, envVars) {
  *  - Windows: shell:true with env vars
  *  - Linux: terminal emulator with -e flag
  */
-function spawnInTerminal(claudeArgs, workDir, envVars) {
-    const claudeBin = resolveClaudePath();
+function spawnInTerminal(claudeArgs, workDir, envVars, options) {
+    const claudeBin = resolveClaudePath(options?.claudeBin);
     const claudeInvocation = buildClaudeCommand(claudeBin, claudeArgs, envVars);
     if (process.platform === 'darwin') {
         const detected = detectMacTerminal();
@@ -308,7 +327,9 @@ function spawnInTerminal(claudeArgs, workDir, envVars) {
             const setCmds = Object.entries(envVars)
                 .map(([k, v]) => `set "${k}=${cmdEscape(v)}"`)
                 .join(' && ');
-            const claudeCmd = `${cmdEscape(claudeBin)} ${claudeArgs.map(a => `"${cmdEscape(a)}"`).join(' ')}`;
+            // Quote the binary path if it contains spaces (e.g., "C:\Program Files\...")
+            const quotedWinBin = claudeBin.includes(' ') ? `"${cmdEscape(claudeBin)}"` : cmdEscape(claudeBin);
+            const claudeCmd = `${quotedWinBin} ${claudeArgs.map(a => `"${cmdEscape(a)}"`).join(' ')}`;
             const innerCmd = setCmds
                 ? `${setCmds} && ${claudeCmd}`
                 : claudeCmd;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-tempo",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "description": "MCP server for multi-session Claude Code coordination via Temporal",
   "keywords": [
     "mcp",