byterover-cli 1.0.5 → 1.2.0

package/dist/infra/usecase/init-use-case.js

@@ -5,34 +5,30 @@ import { ACE_DIR, BRV_CONFIG_VERSION, BRV_DIR, DEFAULT_BRANCH, PROJECT_CONFIG_FI
 import { AGENT_VALUES } from '../../core/domain/entities/agent.js';
 import { BrvConfig } from '../../core/domain/entities/brv-config.js';
 import { BrvConfigVersionError } from '../../core/domain/errors/brv-config-version-error.js';
-import { AGENT_RULE_CONFIGS } from '../rule/agent-rule-config.js';
-import { BRV_RULE_MARKERS, BRV_RULE_TAG } from '../rule/constants.js';
 import { WorkspaceDetectorService } from '../workspace/workspace-detector-service.js';
 export class InitUseCase {
     cogitPullService;
+    connectorManager;
     contextTreeService;
     contextTreeSnapshotService;
     contextTreeWriterService;
     fileService;
-    legacyRuleDetector;
     projectConfigStore;
     spaceService;
     teamService;
-    templateService;
     terminal;
     tokenStore;
     trackingService;
     constructor(options) {
         this.cogitPullService = options.cogitPullService;
+        this.connectorManager = options.connectorManager;
         this.contextTreeService = options.contextTreeService;
         this.contextTreeSnapshotService = options.contextTreeSnapshotService;
         this.contextTreeWriterService = options.contextTreeWriterService;
         this.fileService = options.fileService;
-        this.legacyRuleDetector = options.legacyRuleDetector;
         this.projectConfigStore = options.projectConfigStore;
         this.spaceService = options.spaceService;
         this.teamService = options.teamService;
-        this.templateService = options.templateService;
         this.terminal = options.terminal;
         this.tokenStore = options.tokenStore;
         this.trackingService = options.trackingService;
@@ -126,78 +122,6 @@ export class InitUseCase {
         this.terminal.log();
         return this.promptForTeamSelection(teams);
     }
-    async generateRulesForAgent(selectedAgent) {
-        this.terminal.log(`Generating rules for: ${selectedAgent}`);
-        // try {
-        //   await ruleWriterService.writeRule(agent, false)
-        //   this.log(`✅ Successfully generated rule file for ${agent}`)
-        // } catch (error) {
-        //   if (error instanceof RuleExistsError) {
-        //     const overwrite = await this.promptForOverwriteConfirmation(agent)
-        //     if (overwrite) {
-        //       await ruleWriterService.writeRule(agent, true)
-        //       this.log(`✅ Successfully generated rule file for ${agent}`)
-        //     } else {
-        //       this.log(`Skipping rule file generation for ${agent}`)
-        //     }
-        //   } else {
-        //     throw error
-        //   }
-        // }
-        const { filePath, writeMode } = AGENT_RULE_CONFIGS[selectedAgent];
-        // STEP 1: Check if file exists
-        const fileExists = await this.fileService.exists(filePath);
-        if (!fileExists) {
-            // Scenario A: File doesn't exist
-            const shouldCreate = await this.promptForFileCreation(selectedAgent, filePath);
-            if (!shouldCreate) {
-                this.terminal.log(`Skipped rule file creation for ${selectedAgent}`);
-                return;
-            }
-            await this.createNewRuleFile({
-                agent: selectedAgent,
-                filePath,
-            });
-            return;
-        }
-        // STEP 2: File exists - read content
-        const content = await this.fileService.read(filePath);
-        // STEP 3: Check for LEGACY rules (priority: clean these up first)
-        const hasFooterTag = content.includes(`${BRV_RULE_TAG} ${selectedAgent}`);
-        const hasBoundaryMarkers = content.includes(BRV_RULE_MARKERS.START) && content.includes(BRV_RULE_MARKERS.END);
-        const hasLegacyRules = hasFooterTag && !hasBoundaryMarkers;
-        if (hasLegacyRules) {
-            // Scenario B: Legacy rules detected - handle cleanup
-            await this.handleLegacyRulesCleanup({
-                agent: selectedAgent,
-                content,
-                filePath,
-            });
-            return;
-        }
-        // STEP 4: Check for NEW rules (boundary markers)
-        if (hasBoundaryMarkers) {
-            // Scenario C: New rules exist - prompt for overwrite
-            const shouldOverwrite = await this.promptForOverwriteConfirmation(selectedAgent);
-            if (!shouldOverwrite) {
-                this.terminal.log(`Skipped rule file update for ${selectedAgent}`);
-                return;
-            }
-            await this.replaceExistingRules({
-                agent: selectedAgent,
-                content,
-                filePath,
-                writeMode,
-            });
-            return;
-        }
-        // STEP 5: No ByteRover content - append rules
-        await this.appendRulesToFile({
-            agent: selectedAgent,
-            filePath,
-            writeMode,
-        });
-    }
     async getExistingConfig() {
         const exists = await this.projectConfigStore.exists();
         if (!exists)
@@ -239,6 +163,30 @@ export class InitUseCase {
             this.terminal.warn(`${name} initialization skipped: ${error instanceof Error ? error.message : 'Unknown error'}`);
         }
     }
+    /**
+     * Installs the default connector for the selected agent.
+     * Uses ConnectorManager to handle the installation.
+     */
+    async installConnectorForAgent(selectedAgent) {
+        const defaultType = this.connectorManager.getDefaultConnectorType(selectedAgent);
+        const result = await this.connectorManager.installDefault(selectedAgent);
+        if (result.success) {
+            if (result.alreadyInstalled) {
+                this.terminal.log(`${selectedAgent} is already connected via ${defaultType}`);
+            }
+            else {
+                this.terminal.log(`${selectedAgent} connected via ${defaultType}`);
+                this.terminal.log(`   Installed: ${result.configPath}`);
+                // Show restart message for hook connector
+                if (defaultType === 'hook' || defaultType === 'mcp') {
+                    this.terminal.warn(`\n⚠️  Please restart ${selectedAgent} to apply the new ${defaultType}.`);
+                }
+            }
+        }
+        else {
+            this.terminal.error(`Failed to install connector for ${selectedAgent}: ${result.message}`);
+        }
+    }
     isLegacyProjectConfig(config) {
         return 'type' in config && config.type === 'legacy';
     }
@@ -282,51 +230,6 @@ export class InitUseCase {
             },
         });
     }
-    /**
-     * Prompts the user to choose cleanup strategy for legacy rules.
-     * This method is protected to allow test overrides.
-     * @returns The chosen cleanup strategy
-     */
-    async promptForCleanupStrategy() {
-        return this.terminal.select({
-            choices: [
-                {
-                    description: 'New rules will be added with boundary markers. You manually remove old sections at your convenience.',
-                    name: 'Manual cleanup (recommended)',
-                    value: 'manual',
-                },
-                {
-                    description: '⚠️  We will remove all detected old sections. May cause content loss if detection is imperfect. A backup will be created.',
-                    name: 'Automatic cleanup',
-                    value: 'automatic',
-                },
-            ],
-            message: 'How would you like to proceed?',
-        });
-    }
-    /**
-     * Prompts the user to create a new rule file.
-     * This method is protected to allow test overrides.
-     * @param agent The agent for which the rule file doesn't exist
-     * @param filePath The path where the file would be created
-     * @returns True if the user wants to create the file, false otherwise
-     */
-    async promptForFileCreation(agent, filePath) {
-        return this.terminal.confirm({
-            default: true,
-            message: `Rule file '${filePath}' doesn't exist. Create it with ByteRover rules`,
-        });
-    }
-    /**
-     * Prompts the user to confirm overwriting an existing rule file.
-     * This method is protected to allow test overrides.
-     */
-    async promptForOverwriteConfirmation(agent) {
-        return this.terminal.confirm({
-            default: true,
-            message: `Rule file already exists for ${agent}. Overwrite`,
-        });
-    }
     async promptForSpaceSelection(spaces) {
         const selectedSpaceId = await this.terminal.select({
             choices: spaces.map((space) => ({
@@ -403,7 +306,6 @@ export class InitUseCase {
             });
             this.terminal.log();
             const selectedAgent = await this.promptForAgentSelection();
-            this.terminal.log('Detecting workspaces...');
             const { chatLogPath, cwd } = this.detectWorkspacesForAgent(selectedAgent);
             this.terminal.log(`✓ Detected workspace: ${cwd}`);
             const config = BrvConfig.fromSpace({
@@ -413,10 +315,8 @@ export class InitUseCase {
                 space: selectedSpace,
             });
             await this.projectConfigStore.write(config);
-            this.terminal.log(`\nGenerate rule instructions for coding agents to work with ByteRover correctly`);
             this.terminal.log();
-            await this.generateRulesForAgent(selectedAgent);
-            await this.trackingService.track('rule:generate');
+            await this.installConnectorForAgent(selectedAgent);
             await this.trackingService.track('space:init');
             this.logSuccess(selectedSpace);
             await this.trackingService.track('init', { status: 'finished' });
@@ -451,7 +351,6 @@ export class InitUseCase {
                 this.terminal.log('✓ Context tree initialized');
             }
             else {
-                // Remote has real data - sync it to local
                 await this.contextTreeWriterService.sync({ files: [...coGitSnapshot.files] });
                 await this.contextTreeSnapshotService.saveSnapshot();
                 this.terminal.log(`✓ Synced ${coGitSnapshot.files.length} context files from remote`);
@@ -464,134 +363,10 @@ export class InitUseCase {
         }
         this.terminal.actionStop();
     }
-    /**
-     * Appends ByteRover rules to a file that has no ByteRover content.
-     */
-    async appendRulesToFile(params) {
-        const { agent, filePath, writeMode } = params;
-        const ruleContent = await this.templateService.generateRuleContent(agent);
-        // For dedicated ByteRover files, overwrite; for shared instruction files, append
-        const mode = writeMode === 'overwrite' ? 'overwrite' : 'append';
-        await this.fileService.write(ruleContent, filePath, mode);
-        this.terminal.log(`✅ Successfully added rule file for ${agent}`);
-    }
-    /**
-     * Creates a new rule file with ByteRover rules.
-     */
-    async createNewRuleFile(params) {
-        const { agent, filePath } = params;
-        const ruleContent = await this.templateService.generateRuleContent(agent);
-        await this.fileService.write(ruleContent, filePath, 'overwrite');
-        this.terminal.log(`✅ Successfully created rule file for ${agent} at ${filePath}`);
-    }
-    async handleLegacyRulesCleanup(params) {
-        const { agent, content, filePath } = params;
-        const detectionResult = this.legacyRuleDetector.detectLegacyRules(content, agent);
-        const { reliableMatches, uncertainMatches } = detectionResult;
-        this.terminal.log(`\n⚠️  Detected ${reliableMatches.length + uncertainMatches.length} old ByteRover rule section(s) in ${filePath}:\n`);
-        if (reliableMatches.length > 0) {
-            this.terminal.log('Reliable matches:');
-            for (const [index, match] of reliableMatches.entries()) {
-                this.terminal.log(`  Section ${index + 1}: lines ${match.startLine}-${match.endLine}`);
-            }
-            this.terminal.log();
-        }
-        if (uncertainMatches.length > 0) {
-            this.terminal.log('  ⚠️  Uncertain matches (cannot determine start):');
-            for (const match of uncertainMatches) {
-                this.terminal.log(`  Footer found at line ${match.footerLine}`);
-                this.terminal.log(`  Reason: ${match.reason}`);
-            }
-            this.terminal.log();
-            this.terminal.log('⚠️  Due to uncertain matches, only manual cleanup is available.\n');
-            await this.performManualCleanup({
-                agent,
-                filePath,
-                reliableMatches,
-                uncertainMatches,
-            });
-            return;
-        }
-        const selectedStrategy = await this.promptForCleanupStrategy();
-        await (selectedStrategy === 'manual'
-            ? this.performManualCleanup({
-                agent,
-                filePath,
-                reliableMatches,
-                uncertainMatches,
-            })
-            : this.performAutomaticCleanup({
-                agent,
-                filePath,
-                reliableMatches,
-            }));
-    }
     logSuccess(space) {
         this.terminal.log(`\n✓ Project initialized successfully!`);
         this.terminal.log(`✓ Connected to space: ${space.getDisplayName()}`);
         this.terminal.log(`✓ Configuration saved to: ${BRV_DIR}/${PROJECT_CONFIG_FILE}`);
         this.terminal.log("NOTE: It's recommended to add .brv/ to your .gitignore file since ByteRover already takes care of memory/context versioning for you.");
     }
-    async performAutomaticCleanup(params) {
-        const { agent, filePath, reliableMatches } = params;
-        const backupPath = await this.fileService.createBackup(filePath);
-        this.terminal.log(`📦 Backup created: ${backupPath}`);
-        let content = await this.fileService.read(filePath);
-        // Remove all reliable matches (in reverse order to preserve line numbers)
-        const sortedMatches = [...reliableMatches].sort((a, b) => b.startLine - a.startLine);
-        for (const match of sortedMatches) {
-            content = content.replace(match.content, '');
-        }
-        // Write cleaned content
-        await this.fileService.write(content, filePath, 'overwrite');
-        // Append new rules
-        const ruleContent = await this.templateService.generateRuleContent(agent);
-        await this.fileService.write(ruleContent, filePath, 'append');
-        this.terminal.log(`✅ Removed ${reliableMatches.length} old ByteRover section(s)`);
-        this.terminal.log(`✅ Added new rules with boundary markers`);
-        this.terminal.log(`\nYou can safely delete the backup file once verified.`);
-    }
-    async performManualCleanup(params) {
-        const { agent, filePath, reliableMatches, uncertainMatches } = params;
-        const ruleContent = await this.templateService.generateRuleContent(agent);
-        await this.fileService.write(ruleContent, filePath, 'append');
-        this.terminal.log(`✅ New ByteRover rules added with boundary markers\n`);
-        this.terminal.log('Please manually remove old sections:');
-        for (const [index, match] of reliableMatches.entries()) {
-            this.terminal.log(`  - Section ${index + 1}: lines ${match.startLine}-${match.endLine} in ${filePath}`);
-        }
-        for (const match of uncertainMatches) {
-            this.terminal.log(`  - Section ending at line ${match.footerLine} in ${filePath}`);
-        }
-        this.terminal.log('\nKeep only the section between:');
-        this.terminal.log('  <!-- BEGIN BYTEROVER RULES -->');
-        this.terminal.log('  <!-- END BYTEROVER RULES -->');
-    }
-    /**
-     * Replaces existing ByteRover rules (with boundary markers) with new rules.
-     */
-    async replaceExistingRules(params) {
-        const { agent, content, filePath, writeMode } = params;
-        const ruleContent = await this.templateService.generateRuleContent(agent);
-        if (writeMode === 'overwrite') {
-            // For dedicated ByteRover files, just overwrite the entire file
-            await this.fileService.write(ruleContent, filePath, 'overwrite');
-        }
-        else {
-            // For shared instruction files, replace the section between markers
-            const startMarker = BRV_RULE_MARKERS.START;
-            const endMarker = BRV_RULE_MARKERS.END;
-            const startIndex = content.indexOf(startMarker);
-            const endIndex = content.indexOf(endMarker, startIndex);
-            if (startIndex === -1 || endIndex === -1) {
-                this.terminal.log('Could not find boundary markers in the file');
-                return;
-            }
-            const before = content.slice(0, startIndex);
-            const after = content.slice(endIndex + endMarker.length);
-            const newContent = before + ruleContent + after;
-            await this.fileService.write(newContent, filePath, 'overwrite');
-        }
-        this.terminal.log(`✅ Successfully updated rule file for ${agent}`);
-    }
 }

package/dist/infra/usecase/logout-use-case.js

@@ -38,7 +38,7 @@ export class LogoutUseCase {
             await this.tokenStore.clear();
             await this.onboardingPreferenceStore.clear();
             this.terminal.log("Successfully logged out.");
-            this.terminal.log("Run 'brv login' to authenticate again.");
+            this.terminal.log("Run '/login' to authenticate again.");
         }
         catch (error) {
             if (error instanceof Error && error.message.includes("keychain")) {

package/dist/infra/usecase/pull-use-case.js

@@ -23,7 +23,7 @@ export class PullUseCase {
     async checkProjectInit() {
         const projectConfig = await this.projectConfigStore.read();
         if (projectConfig === undefined) {
-            throw new WorkspaceNotInitializedError('Project not initialized. Please run "brv init" to select your team and workspace.', '.brv');
+            throw new WorkspaceNotInitializedError('Project not initialized. Please run "/init" to select your team and workspace.', '.brv');
         }
         return projectConfig;
     }
@@ -39,7 +39,7 @@ export class PullUseCase {
             const hasLocalChanges = await this.checkLocalChanges();
             this.terminal.actionStop();
             if (hasLocalChanges) {
-                this.terminal.log('You have local changes that have not been pushed. Run "brv push" first.');
+                this.terminal.log('You have local changes that have not been pushed. Run "/push" first.');
                 return;
             }
             // Pull from CoGit
@@ -67,7 +67,7 @@ export class PullUseCase {
             // Stop action if it's in progress
             this.terminal.actionStop();
             if (error instanceof WorkspaceNotInitializedError) {
-                this.terminal.log('Project not initialized. Please run "brv init" to select your team and workspace.');
+                this.terminal.log('Project not initialized. Please run "/init" to select your team and workspace.');
                 return;
             }
             const message = error instanceof Error ? error.message : 'Pull failed';
@@ -77,11 +77,11 @@ export class PullUseCase {
     async validateAuth() {
         const token = await this.tokenStore.load();
         if (token === undefined) {
-            this.terminal.error('Not authenticated. Run "brv login" first.');
+            this.terminal.error('Not authenticated. Run "/login" first.');
             return undefined;
         }
         if (!token.isValid()) {
-            this.terminal.error('Authentication token expired. Run "brv login" again.');
+            this.terminal.error('Authentication token expired. Run "/login" again.');
             return undefined;
         }
         return token;

package/dist/infra/usecase/push-use-case.js

@@ -82,7 +82,7 @@ export class PushUseCase {
             // Stop action if it's in progress
             this.terminal.actionStop();
             if (error instanceof WorkspaceNotInitializedError) {
-                this.terminal.log('Project not initialized. Please run "brv init" to select your team and workspace.');
+                this.terminal.log('Project not initialized. Please run "/init" to select your team and workspace.');
                 return;
             }
             // For other errors, to properly display error before exit
@@ -96,7 +96,7 @@ export class PushUseCase {
     async checkProjectInit() {
         const projectConfig = await this.projectConfigStore.read();
         if (projectConfig === undefined) {
-            throw new WorkspaceNotInitializedError('Project not initialized. Please run "brv init" to select your team and workspace.', '.brv');
+            throw new WorkspaceNotInitializedError('Project not initialized. Please run "/init" to select your team and workspace.', '.brv');
         }
         return projectConfig;
     }
@@ -112,11 +112,11 @@ export class PushUseCase {
     async validateAuth() {
         const token = await this.tokenStore.load();
         if (token === undefined) {
-            this.terminal.error('Not authenticated. Run "brv login" first.');
+            this.terminal.error('Not authenticated. Run "/login" first.');
             return undefined;
         }
         if (!token.isValid()) {
-            this.terminal.error('Authentication token expired. Run "brv login" again.');
+            this.terminal.error('Authentication token expired. Run "/login" again.');
             return undefined;
         }
         return token;

package/dist/infra/usecase/reset-use-case.js

@@ -14,7 +14,7 @@ export class ResetUseCase {
     async confirmReset() {
         return this.terminal.confirm({
             default: false,
-            message: 'Are you sure you want to reset the context tree? This will remove all existing context and restore default domains',
+            message: 'Are you sure you want to reset the context tree? This will remove all existing context. Your context tree will be empty.',
         });
     }
     async run(options) {
@@ -37,12 +37,11 @@ export class ResetUseCase {
             const baseDir = options.directory ?? process.cwd();
             const contextTreeDir = join(baseDir, BRV_DIR, CONTEXT_TREE_DIR);
             await rm(contextTreeDir, { force: true, recursive: true });
-            // Re-initialize context tree with default domains
+            // Re-initialize empty context tree
             await this.contextTreeService.initialize(options.directory);
             // Re-initialize empty snapshot
             await this.contextTreeSnapshotService.initEmptySnapshot(options.directory);
-            this.terminal.log('✓ Context tree reset successfully.');
-            this.terminal.log('  6 default domains restored: code_style, design, structure, compliance, testing, bug_fixes');
+            this.terminal.log('✓ Context tree reset successfully. Your context tree is now empty.');
         }
         catch (error) {
             // Handle user cancelling the prompt (Ctrl+C or closing stdin)

package/dist/infra/usecase/space-list-use-case.js

@@ -15,16 +15,16 @@ export class SpaceListUseCase {
         // Check project initialization
         const projectConfig = await this.projectConfigStore.read();
         if (!projectConfig) {
-            this.terminal.error('Project not initialized. Please run "brv init" first.');
+            this.terminal.error('Project not initialized. Please run "/init" first.');
             return;
         }
         const token = await this.tokenStore.load();
         if (!token) {
-            this.terminal.error('Not authenticated. Please run "brv login" first.');
+            this.terminal.error('Not authenticated. Please run "/login" first.');
             return;
         }
         if (!token.isValid()) {
-            this.terminal.error('Authentication token expired. Please run "brv login" again.');
+            this.terminal.error('Authentication token expired. Please run "/login" again.');
             return;
         }
         // Fetch spaces for the team from project config

package/dist/infra/usecase/space-switch-use-case.js

@@ -74,7 +74,7 @@ export class SpaceSwitchUseCase {
         // Check project initialization (MUST exist for switch)
         const currentConfig = await this.projectConfigStore.read();
         if (!currentConfig) {
-            this.terminal.log('Project not initialized. Please run "brv init" first.');
+            this.terminal.log('Project not initialized. Please run "/init" first.');
             return;
         }
         // Show current configuration
@@ -85,11 +85,11 @@ export class SpaceSwitchUseCase {
         // Validate authentication
         const token = await this.tokenStore.load();
         if (!token) {
-            this.terminal.log('Not authenticated. Please run "brv login" first.');
+            this.terminal.log('Not authenticated. Please run "/login" first.');
             return;
         }
         if (!token.isValid()) {
-            this.terminal.log('Authentication token expired. Please run "brv login" again.');
+            this.terminal.log('Authentication token expired. Please run "/login" again.');
             return;
         }
         // Fetch all teams

package/dist/infra/usecase/status-use-case.d.ts

@@ -4,10 +4,12 @@ import type { IProjectConfigStore } from '../../core/interfaces/i-project-config
 import type { ITerminal } from '../../core/interfaces/i-terminal.js';
 import type { ITokenStore } from '../../core/interfaces/i-token-store.js';
 import type { ITrackingService } from '../../core/interfaces/i-tracking-service.js';
+import type { IInstanceDiscovery } from '../../core/interfaces/instance/i-instance-discovery.js';
 import type { IStatusUseCase } from '../../core/interfaces/usecase/i-status-use-case.js';
 export interface StatusUseCaseOptions {
     contextTreeService: IContextTreeService;
     contextTreeSnapshotService: IContextTreeSnapshotService;
+    instanceDiscovery?: IInstanceDiscovery;
     projectConfigStore: IProjectConfigStore;
     terminal: ITerminal;
     tokenStore: ITokenStore;
@@ -16,6 +18,7 @@ export interface StatusUseCaseOptions {
 export declare class StatusUseCase implements IStatusUseCase {
     private readonly contextTreeService;
     private readonly contextTreeSnapshotService;
+    private readonly instanceDiscovery;
     private readonly projectConfigStore;
     private readonly terminal;
     private readonly tokenStore;
@@ -24,4 +27,11 @@ export declare class StatusUseCase implements IStatusUseCase {
     run(options: {
         cliVersion: string;
     }): Promise<void>;
+    /**
+     * Checks the MCP connection status by:
+     * 1. Discovering running brv instance
+     * 2. Connecting to it via Socket.IO
+     * 3. Verifying bidirectional communication with ping
+     */
+    private checkMcpStatus;
 }

package/dist/infra/usecase/status-use-case.js

@@ -2,9 +2,12 @@ import chalk from 'chalk';
 import { join } from 'node:path';
 import { BRV_DIR, CONTEXT_TREE_DIR } from '../../constants.js';
 import { getErrorMessage } from '../../utils/error-helpers.js';
+import { FileInstanceDiscovery } from '../instance/file-instance-discovery.js';
+import { SocketIOTransportClient } from '../transport/socket-io-transport-client.js';
 export class StatusUseCase {
     contextTreeService;
     contextTreeSnapshotService;
+    instanceDiscovery;
     projectConfigStore;
     terminal;
     tokenStore;
@@ -12,6 +15,7 @@ export class StatusUseCase {
     constructor(options) {
         this.contextTreeService = options.contextTreeService;
         this.contextTreeSnapshotService = options.contextTreeSnapshotService;
+        this.instanceDiscovery = options.instanceDiscovery ?? new FileInstanceDiscovery();
         this.projectConfigStore = options.projectConfigStore;
         this.terminal = options.terminal;
         this.tokenStore = options.tokenStore;
@@ -56,6 +60,8 @@ export class StatusUseCase {
             this.terminal.log('Project Status: Unable to read project configuration');
             this.terminal.warn(`Warning: ${getErrorMessage(error)}`);
         }
+        // MCP connection status
+        await this.checkMcpStatus();
         // Context tree status
         try {
             const contextTreeExists = await this.contextTreeService.exists();
@@ -94,4 +100,51 @@ export class StatusUseCase {
             this.terminal.warn(`Warning: ${error instanceof Error ? error.message : 'Context Tree unable to check status'}`);
         }
     }
+    /**
+     * Checks the MCP connection status by:
+     * 1. Discovering running brv instance
+     * 2. Connecting to it via Socket.IO
+     * 3. Verifying bidirectional communication with ping
+     */
+    async checkMcpStatus() {
+        try {
+            // Step 1: Discover running instance
+            const discoveryResult = await this.instanceDiscovery.discover(process.cwd());
+            if (!discoveryResult.found) {
+                if (discoveryResult.reason === 'instance_crashed') {
+                    this.terminal.log(`MCP Status: ${chalk.red('Instance crashed')} (stale instance file found)`);
+                }
+                else {
+                    this.terminal.log(`MCP Status: ${chalk.yellow('No instance running')}`);
+                }
+                return;
+            }
+            const { instance, projectRoot } = discoveryResult;
+            this.terminal.log(`MCP Status: Instance found (PID: ${instance.pid}, Port: ${instance.port})`);
+            // Step 2: Connect to instance
+            const client = new SocketIOTransportClient();
+            const url = instance.getTransportUrl();
+            try {
+                await client.connect(url);
+            }
+            catch (connectError) {
+                this.terminal.log(`MCP Status: ${chalk.red('Connection failed')} - ${getErrorMessage(connectError)}`);
+                return;
+            }
+            // Step 3: Verify bidirectional communication with ping
+            const isResponsive = await client.isConnected(2000);
+            if (isResponsive) {
+                this.terminal.log(`MCP Status: ${chalk.green('Connected and responsive')} (${projectRoot})`);
+            }
+            else {
+                this.terminal.log(`MCP Status: ${chalk.yellow('Connected but not responsive')} (ping timeout)`);
+            }
+            // Clean up
+            await client.disconnect();
+        }
+        catch (error) {
+            this.terminal.log(`MCP Status: ${chalk.red('Error checking status')}`);
+            this.terminal.warn(`Warning: ${getErrorMessage(error)}`);
+        }
+    }
 }