helixmind 0.5.26 → 0.6.0

package/dist/cli/commands/chat.js

@@ -70,6 +70,8 @@ import { AGENT_IDENTITIES } from '../agent/plan-types.js';
 import { SwarmController } from '../agent/swarm.js';
 import { TaskOrchestrator } from '../jarvis/orchestrator.js';
 import { ParallelExecutor } from '../jarvis/parallel.js';
+import { WorktreeManager } from '../worktree/manager.js';
+import { prepareExecutionRuntime } from '../worktree/runtime.js';
 import chalk from 'chalk';
 const HELP_CATEGORIES = [
     {
@@ -171,6 +173,8 @@ const HELP_CATEGORIES = [
             { cmd: '/undo', label: '/undo', description: 'Undo file changes' },
             { cmd: '/diff', label: '/diff', description: 'Show uncommitted git changes' },
             { cmd: '/git', label: '/git', description: 'Show git branch & status' },
+            { cmd: '/worktree', label: '/worktree', description: 'Show isolated worktree status' },
+            { cmd: '/worktree auto', label: '/worktree auto', description: 'Enable isolated worktrees for risky runs' },
             { cmd: '/project', label: '/project', description: 'Show project info' },
             { cmd: '/export', label: '/export', description: 'Export spiral as ZIP' },
         ],
@@ -257,12 +261,14 @@ ${chalk.hex('#00cc66').bold('  Validation Matrix')}
   ${theme.primary('/validation strict'.padEnd(22))} ${theme.dim('Treat warnings as errors')}
   ${theme.primary('/validation stats'.padEnd(22))} ${theme.dim('Show validation statistics')}
 
-${chalk.hex('#8a2be2').bold('  Code & Git')}
-  ${theme.primary('/undo [n|list]'.padEnd(22))} ${theme.dim('Undo last n file changes (or list history)')}
-  ${theme.primary('/diff'.padEnd(22))} ${theme.dim('Show all uncommitted git changes')}
-  ${theme.primary('/git'.padEnd(22))} ${theme.dim('Show git branch & status')}
-  ${theme.primary('/project'.padEnd(22))} ${theme.dim('Show detected project info')}
-  ${theme.primary('/export [dir]'.padEnd(22))} ${theme.dim('Export spiral as ZIP archive')}
+${chalk.hex('#8a2be2').bold('  Code & Git')}
+  ${theme.primary('/undo [n|list]'.padEnd(22))} ${theme.dim('Undo last n file changes (or list history)')}
+  ${theme.primary('/diff'.padEnd(22))} ${theme.dim('Show all uncommitted git changes')}
+  ${theme.primary('/git'.padEnd(22))} ${theme.dim('Show git branch & status')}
+  ${theme.primary('/worktree'.padEnd(22))} ${theme.dim('Show isolated worktree status')}
+  ${theme.primary('/worktree auto'.padEnd(22))} ${theme.dim('Enable worktrees for risky agent runs')}
+  ${theme.primary('/project'.padEnd(22))} ${theme.dim('Show detected project info')}
+  ${theme.primary('/export [dir]'.padEnd(22))} ${theme.dim('Export spiral as ZIP archive')}
 
 ${chalk.hex('#6c757d').bold('  Navigation')}
   ${theme.primary('/exit /quit'.padEnd(22))} ${theme.dim('Exit HelixMind')}
@@ -274,6 +280,26 @@ export async function chatCommand(options) {
     const configDir = join(homedir(), '.helixmind');
     const store = new ConfigStore(configDir);
     let config = store.getAll();
+    const projectRoot = process.cwd();
+    const createWorktreeManager = () => new WorktreeManager(config.worktree);
+    const activeWorktreeRuntimes = new Map();
+    const prepareSessionRuntime = async (reason, sessionId, onStatus) => {
+        const runtime = await prepareExecutionRuntime(createWorktreeManager(), { reason, sessionId, projectRoot }, onStatus);
+        if (runtime.isolated) {
+            activeWorktreeRuntimes.set(sessionId, runtime);
+        }
+        let released = false;
+        return {
+            ...runtime,
+            release: async () => {
+                if (released)
+                    return;
+                released = true;
+                activeWorktreeRuntimes.delete(sessionId);
+                await runtime.release();
+            },
+        };
+    };
     // Collect startup banner — written into scroll region AFTER screen activation
     // so content sits directly above the input frame (no gap).
     const startupBannerParts = [renderLogo(), renderVersion(VERSION) + '\n\n'];
@@ -1017,13 +1043,22 @@ export async function chatCommand(options) {
                     autonomousMode = true;
                     (async () => {
                         const completed = [];
+                        const runtime = await prepareSessionRuntime('autonomous', bgSession.id, (message) => {
+                            bgSession.capture(message);
+                        });
+                        if (runtime.worktree) {
+                            bgSession.worktree = {
+                                root: runtime.executionRoot,
+                                reason: runtime.worktree.reason,
+                            };
+                        }
                         try {
                             await runAutonomousLoop({
                                 sendMessage: async (prompt) => {
                                     bgSession.controller.reset();
                                     const resultTextHolder = { text: '' };
                                     bgSession.buffer.onSummary = (t) => { resultTextHolder.text = t; };
-                                    await sendAgentMessage(prompt, bgSession.history, provider, project, spiralEngine, config, permissions, bgSession.undoStack, checkpointStore, bgSession.controller, new ActivityIndicator(), bgSession.buffer, (inp, out) => { sessionTokensInput += inp; sessionTokensOutput += out; }, () => { sessionToolCalls++; }, undefined, { enabled: false, verbose: false, strict: false });
+                                    await sendAgentMessage(prompt, bgSession.history, provider, project, spiralEngine, config, permissions, bgSession.undoStack, checkpointStore, bgSession.controller, new ActivityIndicator(), bgSession.buffer, (inp, out) => { sessionTokensInput += inp; sessionTokensOutput += out; }, () => { sessionToolCalls++; }, undefined, { enabled: false, verbose: false, strict: false }, undefined, undefined, undefined, undefined, undefined, undefined, undefined, runtime);
                                     bgSession.buffer.onSummary = undefined;
                                     return resultTextHolder.text;
                                 },
@@ -1045,6 +1080,9 @@ export async function chatCommand(options) {
                                 bgSession.capture(`Error: ${err}`);
                             }
                         }
+                        finally {
+                            await runtime.release();
+                        }
                         autonomousMode = false;
                         sessionMgr.complete(bgSession.id, {
                             text: completed.join('\n'),
@@ -1572,9 +1610,23 @@ export async function chatCommand(options) {
                             onStatusChange: () => { updateStatusBar(); },
                             runWorkerSession: async (session, prompt, agentIdentity) => {
                                 const bgActivity = new ActivityIndicator();
+                                const runtime = await prepareSessionRuntime('swarm_worker', session.id, (message) => {
+                                    session.capture(message);
+                                });
+                                if (runtime.worktree) {
+                                    session.worktree = {
+                                        root: runtime.executionRoot,
+                                        reason: runtime.worktree.reason,
+                                    };
+                                }
                                 session.onCapture = (line, index) => { pushOutputLine(session.id, line, index); };
                                 pushSessionCreated(serializeSession(session));
-                                await sendAgentMessage(prompt, session.history, provider, project, spiralEngine, config, permissions, session.undoStack, checkpointStore, session.controller, bgActivity, session.buffer, (inp, out) => { sessionTokensInput += inp; sessionTokensOutput += out; }, () => { sessionToolCalls++; roundToolCalls++; }, undefined, { enabled: validationEnabled, verbose: validationVerbose, strict: validationStrict });
+                                try {
+                                    await sendAgentMessage(prompt, session.history, provider, project, spiralEngine, config, permissions, session.undoStack, checkpointStore, session.controller, bgActivity, session.buffer, (inp, out) => { sessionTokensInput += inp; sessionTokensOutput += out; }, () => { sessionToolCalls++; roundToolCalls++; }, undefined, { enabled: validationEnabled, verbose: validationVerbose, strict: validationStrict }, undefined, undefined, undefined, undefined, undefined, undefined, undefined, runtime);
+                                }
+                                finally {
+                                    await runtime.release();
+                                }
                                 const text = session.buffer.buildContext();
                                 const errors = session.buffer.getRecentErrors().map(e => e.summary);
                                 return { text, errors };
@@ -1910,6 +1962,10 @@ export async function chatCommand(options) {
             activeMode: jarvisDaemonSession && jarvisDaemonSession.status === 'running'
                 ? 'jarvis'
                 : autonomousMode ? 'monitor' : 'cli',
+            worktree: {
+                mode: config.worktree.mode,
+                active: activeWorktreeRuntimes.size,
+            },
             jarvisName: jarvisDaemonSession && jarvisDaemonSession.status === 'running'
                 ? jarvisIdentity.getIdentity().name
                 : undefined,
@@ -2246,54 +2302,22 @@ export async function chatCommand(options) {
             }
             // Command suggestions are now handled by InputManager's built-in _interceptTtyWrite.
             // The panel opens/updates/closes automatically as the user types slash commands.
-            // === ESC detection ===
+            // === ESC detection (single ESC = stop for normal agents) ===
             // Double-ESC (rewind browser) is handled by the raw data listener below.
             // Skip if a full-screen browser (Rewind/Plan) is open — it handles ESC itself.
             // Skip if ESC was used to close the suggestion panel (panelJustClosed flag)
             //
-            // Special modes (Jarvis daemon, autonomous) require DELIBERATE double-ESC
-            // with >1s gap to stop — prevents accidental kills. Quick double-ESC (<800ms)
-            // opens Rewind instead. Single ESC is ignored for special modes.
+            // Special modes (Jarvis, autonomous): ESC is handled ENTIRELY by the raw
+            // data listener below — the keypress handler does NOTHING for them.
+            // This prevents conflicts between the two handlers and avoids cursor jumps
+            // from hint messages. See raw data listener for: quick double-ESC → Rewind,
+            // deliberate double-ESC (>1s gap) → stop special mode.
             if (key.name === 'escape' && !fullScreenBrowserOpen && !panelJustClosed) {
                 const jarvisRunning = jarvisDaemonSession && jarvisDaemonSession.status === 'running';
                 const specialMode = jarvisRunning || autonomousMode;
                 const normalRunning = agentRunning || sessionMgr.hasBackgroundTasks;
-                if (specialMode) {
-                    // Special modes: single ESC is ignored.
-                    // Stopping requires deliberate double-ESC (>1s gap) — handled below.
-                    const now = Date.now();
-                    if (lastSpecialEscTime > 0 && (now - lastSpecialEscTime) >= 1000) {
-                        // Deliberate double-ESC (>1s gap) → STOP special mode
-                        lastSpecialEscTime = 0;
-                        closeSuggestionPanel();
-                        activity.stop('Stopped');
-                        agentController.abort();
-                        sessionMgr.abortAll();
-                        if (activeSwarm) {
-                            activeSwarm.abort();
-                            activeSwarm = null;
-                        }
-                        autonomousMode = false;
-                        if (jarvisRunning) {
-                            jarvisDaemonSession.abort();
-                            jarvisDaemonSession = null;
-                            jarvisQueue.setDaemonState('stopped');
-                            jarvisPaused = false;
-                            releaseJarvisSlot();
-                        }
-                        typeAheadBuffer.length = 0;
-                        agentRunning = false;
-                        process.stdout.write('\n');
-                        renderInfo(chalk.red('\u23F9 STOPPED') + chalk.dim(' \u2014 Special mode exited (deliberate double-ESC).'));
-                        showPrompt();
-                    }
-                    else {
-                        // First ESC or too fast — record time, show hint
-                        lastSpecialEscTime = now;
-                        screen.writeOutput(chalk.dim('  \u23F8 ESC registered \u2014 press ESC again after 1s to stop, or quick double-ESC for Rewind\n'));
-                    }
-                }
-                else if (normalRunning) {
+                // Special modes: skip entirely — raw data handler manages ESC
+                if (!specialMode && normalRunning) {
                     // Normal agent work: single ESC = immediate stop (unchanged)
                     closeSuggestionPanel();
                     activity.stop('Stopped');
@@ -2381,21 +2405,58 @@ export async function chatCommand(options) {
             // Bare ESC = exactly 1 byte: \x1b
             // Double ESC = exactly 2 bytes: \x1b\x1b
             // Anything else starting with \x1b is an ANSI escape sequence → ignore
+            // Detect special mode (Jarvis/autonomous) — ESC handling is done entirely here
+            const isSpecialMode = !!(jarvisDaemonSession && jarvisDaemonSession.status === 'running') || autonomousMode;
             if (bytes.length === 2 && bytes[0] === 0x1b && bytes[1] === 0x1b) {
-                // Double-ESC in one chunk → open rewind immediately
+                // Double-ESC in one chunk → open rewind immediately (all modes)
                 lastRawEscTime = 0;
+                lastSpecialEscTime = 0;
                 await openRewindBrowser();
                 return;
             }
             if (bytes.length === 1 && bytes[0] === 0x1b) {
-                // Single bare ESC — check timing for double-ESC
                 const now = Date.now();
+                // Quick double-ESC detection (<800ms) → Rewind (all modes)
                 if (now - lastRawEscTime < RAW_ESC_THRESHOLD && lastRawEscTime > 0) {
                     lastRawEscTime = 0;
+                    lastSpecialEscTime = 0;
                     await openRewindBrowser();
+                    return;
                 }
-                else {
-                    lastRawEscTime = now;
+                // Special mode: deliberate double-ESC (>1s gap) → stop
+                if (isSpecialMode && lastSpecialEscTime > 0 && (now - lastSpecialEscTime) >= 1000) {
+                    lastSpecialEscTime = 0;
+                    lastRawEscTime = 0;
+                    activity.stop('Stopped');
+                    agentController.abort();
+                    sessionMgr.abortAll();
+                    if (activeSwarm) {
+                        activeSwarm.abort();
+                        activeSwarm = null;
+                    }
+                    autonomousMode = false;
+                    const jarvisRunning = jarvisDaemonSession && jarvisDaemonSession.status === 'running';
+                    if (jarvisRunning) {
+                        jarvisDaemonSession.abort();
+                        jarvisDaemonSession = null;
+                        jarvisQueue.setDaemonState('stopped');
+                        jarvisPaused = false;
+                        releaseJarvisSlot();
+                    }
+                    typeAheadBuffer.length = 0;
+                    agentRunning = false;
+                    renderInfo(chalk.red('\u23F9 STOPPED') + chalk.dim(' \u2014 Special mode exited.'));
+                    showPrompt();
+                    return;
+                }
+                // Record ESC time for next detection
+                lastRawEscTime = now;
+                if (isSpecialMode) {
+                    lastSpecialEscTime = now;
+                    // Brief hint via chrome row (no scroll region write = no cursor jump)
+                    chrome.setRow(0, chalk.dim('\u23F8 ESC \u2014 double-ESC: Rewind | wait 1s + ESC: stop'));
+                    // Auto-restore chrome row 0 after 2 seconds
+                    setTimeout(() => { chrome.drawFrameBottom(); }, 2000);
                 }
                 return;
             }
@@ -2925,6 +2986,15 @@ export async function chatCommand(options) {
                     // Run in background — user keeps their prompt
                     (async () => {
                         const completed = [];
+                        const runtime = await prepareSessionRuntime('autonomous', bgSession.id, (message) => {
+                            bgSession.capture(message);
+                        });
+                        if (runtime.worktree) {
+                            bgSession.worktree = {
+                                root: runtime.executionRoot,
+                                reason: runtime.worktree.reason,
+                            };
+                        }
                         try {
                             await runAutonomousLoop({
                                 sendMessage: async (prompt) => {
@@ -2953,6 +3023,9 @@ export async function chatCommand(options) {
                                 bgSession.capture(`Error: ${err}`);
                             }
                         }
+                        finally {
+                            await runtime.release();
+                        }
                         autonomousMode = false;
                         sessionMgr.complete(bgSession.id, {
                             text: completed.join('\n'),
@@ -3140,6 +3213,12 @@ export async function chatCommand(options) {
                 engine: planEngine,
                 getState: () => planModeState,
                 setState: (s) => { planModeState = s; },
+            }, {
+                listActive: () => Array.from(activeWorktreeRuntimes.entries()).map(([sessionId, runtime]) => ({
+                    sessionId,
+                    reason: runtime.worktree?.reason ?? 'unknown',
+                    root: runtime.executionRoot,
+                })),
             });
             if (handled === 'exit') {
                 spiralEngine?.close();
@@ -3245,43 +3324,61 @@ export async function chatCommand(options) {
                     planEngine.approve(plan.id);
                     renderInfo(chalk.green('\u2713 Plan approved — executing...'));
                     updateStatusBar();
-                    await executePlan({
-                        plan,
-                        planEngine,
-                        agentLoopOptions: {
-                            provider,
-                            systemPrompt: assembleSystemPrompt(project.name !== 'unknown' ? project : null, { level_1: [], level_2: [], level_3: [], level_4: [], level_5: [], total_tokens: 0, node_count: 0 }, sessionBuffer.buildContext() || undefined, { provider: provider.name, model: provider.model }),
-                            permissions,
-                            toolContext: {
-                                projectRoot: process.cwd(),
-                                undoStack,
-                                spiralEngine,
-                                bugJournal,
-                                browserController,
-                                visionProcessor,
-                                learningJournal: jarvisLearning,
-                            },
-                            checkpointStore,
-                            sessionBuffer,
-                            agentIdentity: AGENT_IDENTITIES.main,
-                        },
-                        controller: agentController,
-                        conversationHistory: agentHistory,
-                        callbacks: {
-                            onPlanStepStart: (step, idx, total) => {
-                                renderPlanStepStart(step, idx, total, 'main');
-                                activity.setPlanProgress(idx, total, step.title);
-                            },
-                            onPlanStepEnd: (step, status) => {
-                                const idx = plan.steps.indexOf(step) + 1;
-                                renderPlanStepEnd(step, idx, plan.steps.length, status);
-                                activity.clearPlanProgress();
+                    const runtime = await prepareSessionRuntime('plan_execution', plan.id, (message) => {
+                        renderInfo(chalk.dim(message));
+                    });
+                    const mainSession = sessionMgr.main;
+                    if (runtime.worktree) {
+                        mainSession.worktree = {
+                            root: runtime.executionRoot,
+                            reason: runtime.worktree.reason,
+                        };
+                    }
+                    try {
+                        await executePlan({
+                            plan,
+                            planEngine,
+                            agentLoopOptions: {
+                                provider,
+                                systemPrompt: assembleSystemPrompt(project.name !== 'unknown' ? project : null, { level_1: [], level_2: [], level_3: [], level_4: [], level_5: [], total_tokens: 0, node_count: 0 }, sessionBuffer.buildContext() || undefined, { provider: provider.name, model: provider.model }),
+                                permissions,
+                                toolContext: {
+                                    projectRoot,
+                                    executionRoot: runtime.executionRoot,
+                                    undoStack,
+                                    spiralEngine,
+                                    bugJournal,
+                                    browserController,
+                                    visionProcessor,
+                                    learningJournal: jarvisLearning,
+                                    worktree: runtime.worktree,
+                                },
+                                checkpointStore,
+                                sessionBuffer,
+                                agentIdentity: AGENT_IDENTITIES.main,
                             },
-                            onPlanComplete: (completedPlan) => {
-                                renderPlanComplete(completedPlan);
+                            controller: agentController,
+                            conversationHistory: agentHistory,
+                            callbacks: {
+                                onPlanStepStart: (step, idx, total) => {
+                                    renderPlanStepStart(step, idx, total, 'main');
+                                    activity.setPlanProgress(idx, total, step.title);
+                                },
+                                onPlanStepEnd: (step, status) => {
+                                    const idx = plan.steps.indexOf(step) + 1;
+                                    renderPlanStepEnd(step, idx, plan.steps.length, status);
+                                    activity.clearPlanProgress();
+                                },
+                                onPlanComplete: (completedPlan) => {
+                                    renderPlanComplete(completedPlan);
+                                },
                             },
-                        },
-                    });
+                        });
+                    }
+                    finally {
+                        delete mainSession.worktree;
+                        await runtime.release();
+                    }
                     if (choice === 'approve_auto')
                         permissions.setSkipPermissions(false);
                 }
@@ -3322,12 +3419,26 @@ export async function chatCommand(options) {
                     onStatusChange: (_active, _total) => { updateStatusBar(); },
                     runWorkerSession: async (session, prompt, agentIdentity) => {
                         const bgActivity = new ActivityIndicator();
+                        const runtime = await prepareSessionRuntime('swarm_worker', session.id, (message) => {
+                            session.capture(message);
+                        });
+                        if (runtime.worktree) {
+                            session.worktree = {
+                                root: runtime.executionRoot,
+                                reason: runtime.worktree.reason,
+                            };
+                        }
                         // Wire output streaming to brain
                         session.onCapture = (line, index) => {
                             _pushOutputLine(session.id, line, index);
                         };
                         _pushSessionCreated(_serializeSession(session));
-                        await sendAgentMessage(prompt, session.history, provider, project, spiralEngine, config, permissions, session.undoStack, checkpointStore, session.controller, bgActivity, session.buffer, (inp, out) => { sessionTokensInput += inp; sessionTokensOutput += out; }, () => { sessionToolCalls++; roundToolCalls++; }, undefined, { enabled: validationEnabled, verbose: validationVerbose, strict: validationStrict }, bugJournal, undefined, undefined, undefined, null, undefined, undefined);
+                        try {
+                            await sendAgentMessage(prompt, session.history, provider, project, spiralEngine, config, permissions, session.undoStack, checkpointStore, session.controller, bgActivity, session.buffer, (inp, out) => { sessionTokensInput += inp; sessionTokensOutput += out; }, () => { sessionToolCalls++; roundToolCalls++; }, undefined, { enabled: validationEnabled, verbose: validationVerbose, strict: validationStrict }, bugJournal, undefined, undefined, undefined, null, undefined, undefined, runtime);
+                        }
+                        finally {
+                            await runtime.release();
+                        }
                         const text = session.buffer.buildContext();
                         const errors = session.buffer.getRecentErrors().map(e => e.summary);
                         return { text, errors };
@@ -3601,13 +3712,14 @@ async function runBackgroundSession(session, prompt, provider, project, spiralEn
         durationMs: session.elapsed,
     };
 }
-async function sendAgentMessage(input, agentHistory, provider, project, spiralEngine, config, permissions, undoStack, checkpointStore, controller, activity, sessionBuffer, onTokens, onToolCall, onAgentStart, validationOpts, bugJournal, browserController, visionProcessor, onBrowserScreenshot, jarvisContext, onStepInfo, learningJournal) {
+async function sendAgentMessage(input, agentHistory, provider, project, spiralEngine, config, permissions, undoStack, checkpointStore, controller, activity, sessionBuffer, onTokens, onToolCall, onAgentStart, validationOpts, bugJournal, browserController, visionProcessor, onBrowserScreenshot, jarvisContext, onStepInfo, learningJournal, runtime) {
     // User message was rendered by renderUserMessage() in the caller before entering here.
+    const executionRoot = runtime?.executionRoot ?? process.cwd();
     // Intent Detection: Check if user wants to feed the codebase
     const feedIntent = detectFeedIntent(input);
     if (feedIntent.detected && feedIntent.confidence > 0.7 && spiralEngine) {
         renderInfo('\u{1F300} Analyzing project in the background...\n');
-        const rootDir = process.cwd();
+        const rootDir = executionRoot;
         // Background feed runs silently (no progress output) to avoid colliding
         // with the activity indicator which also writes \r\x1b[K on the same line.
         runFeedPipeline(rootDir, spiralEngine, {
@@ -3691,6 +3803,7 @@ async function sendAgentMessage(input, agentHistory, provider, project, spiralEn
             permissions,
             toolContext: {
                 projectRoot: process.cwd(),
+                executionRoot,
                 undoStack,
                 spiralEngine,
                 bugJournal,
@@ -3698,6 +3811,7 @@ async function sendAgentMessage(input, agentHistory, provider, project, spiralEn
                 visionProcessor,
                 onBrowserScreenshot: onBrowserScreenshot ?? undefined,
                 learningJournal,
+                worktree: runtime?.worktree,
             },
             checkpointStore,
             sessionBuffer,
@@ -3894,7 +4008,7 @@ function showFullAutonomousWarning() {
     process.stdout.write(d('\u2502  ') + d('ESC = stop agent if needed.') + d('              \u2502') + '\n');
     process.stdout.write(d('\u2570\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u256F') + '\n\n');
 }
-async function handleSlashCommand(input, messages, agentHistory, config, spiralEngine, store, rl, permissions, undoStack, checkpointStore, sessionBuffer, sessionTokens, sessionToolCalls, onProviderSwitch, onBrainSwitch, currentBrainScope, onAutonomous, onValidation, sessionManager, onRegisterBrainHandlers, onSubPrompt, bugJournal, jarvisCtx, onModeChange, chrome, planCtx) {
+async function handleSlashCommand(input, messages, agentHistory, config, spiralEngine, store, rl, permissions, undoStack, checkpointStore, sessionBuffer, sessionTokens, sessionToolCalls, onProviderSwitch, onBrainSwitch, currentBrainScope, onAutonomous, onValidation, sessionManager, onRegisterBrainHandlers, onSubPrompt, bugJournal, jarvisCtx, onModeChange, chrome, planCtx, worktreeCtx) {
     const parts = input.split(/\s+/);
     let cmd = parts[0].toLowerCase();
     // ─── Chrome-aware selectMenu ───────────────────────────
@@ -3998,7 +4112,7 @@ async function handleSlashCommand(input, messages, agentHistory, config, spiralE
             rl.resume();
             if (helpIdx >= 0 && helpCmds[helpIdx]) {
                 // Execute the selected command
-                return handleSlashCommand(helpCmds[helpIdx], messages, agentHistory, config, spiralEngine, store, rl, permissions, undoStack, checkpointStore, sessionBuffer, sessionTokens, sessionToolCalls, onProviderSwitch, onBrainSwitch, currentBrainScope, onAutonomous, onValidation, sessionManager, onRegisterBrainHandlers, onSubPrompt, bugJournal, jarvisCtx, onModeChange, chrome, planCtx);
+                return handleSlashCommand(helpCmds[helpIdx], messages, agentHistory, config, spiralEngine, store, rl, permissions, undoStack, checkpointStore, sessionBuffer, sessionTokens, sessionToolCalls, onProviderSwitch, onBrainSwitch, currentBrainScope, onAutonomous, onValidation, sessionManager, onRegisterBrainHandlers, onSubPrompt, bugJournal, jarvisCtx, onModeChange, chrome, planCtx, worktreeCtx);
             }
             break;
         }
@@ -4559,6 +4673,70 @@ async function handleSlashCommand(input, messages, agentHistory, config, spiralE
                 renderInfo('Not a git repository.');
             }
             break;
+        case '/worktree': {
+            const arg = parts[1]?.toLowerCase();
+            const cleanupArg = parts[2]?.toLowerCase();
+            const current = store.getAll().worktree;
+            const active = worktreeCtx?.listActive() ?? [];
+            const renderWorktreeStatus = () => {
+                const modeColor = current.mode === 'force'
+                    ? chalk.hex('#FF6600')
+                    : current.mode === 'auto'
+                        ? chalk.cyan
+                        : chalk.dim;
+                renderInfo(`Worktree mode: ${modeColor(current.mode)} | cleanup: ${current.cleanup} | branch prefix: ${current.branchPrefix} | max age: ${current.maxAgeHours}h`);
+                if (active.length === 0) {
+                    renderInfo(chalk.dim('No active isolated runs.'));
+                }
+                else {
+                    renderInfo(`Active isolated runs: ${active.length}`);
+                    for (const runtime of active.slice(0, 8)) {
+                        renderInfo(`  ${runtime.reason} [${runtime.sessionId}] -> ${runtime.root}`);
+                    }
+                }
+                renderInfo(chalk.dim('Usage: /worktree [status|auto|force|off|cleanup keep|cleanup remove|list]'));
+            };
+            if (!arg || arg === 'status' || arg === 'show') {
+                renderWorktreeStatus();
+                break;
+            }
+            if (arg === 'list') {
+                if (active.length === 0) {
+                    renderInfo(chalk.dim('No active isolated runs.'));
+                }
+                else {
+                    renderInfo(`Active isolated runs: ${active.length}`);
+                    for (const runtime of active) {
+                        renderInfo(`  ${runtime.reason} [${runtime.sessionId}] -> ${runtime.root}`);
+                    }
+                }
+                break;
+            }
+            if (arg === 'on') {
+                store.set('worktree.mode', 'auto');
+                renderInfo(chalk.cyan('Worktree mode set to auto') + chalk.dim(' — future /auto, /plan and /swarm runs use isolated worktrees.'));
+                onModeChange?.();
+                break;
+            }
+            if (arg === 'off' || arg === 'auto' || arg === 'force') {
+                store.set('worktree.mode', arg);
+                renderInfo(`Worktree mode set to ${arg}.`);
+                onModeChange?.();
+                break;
+            }
+            if (arg === 'cleanup') {
+                if (cleanupArg === 'keep' || cleanupArg === 'remove') {
+                    store.set('worktree.cleanup', cleanupArg);
+                    renderInfo(`Worktree cleanup set to ${cleanupArg}.`);
+                }
+                else {
+                    renderInfo('Usage: /worktree cleanup [keep|remove]');
+                }
+                break;
+            }
+            renderWorktreeStatus();
+            break;
+        }
         case '/export': {
             const outputDir = parts[1] || process.cwd();
             if (spiralEngine) {