-
Notifications
You must be signed in to change notification settings - Fork 2.6k
fix: prevent extension hang when Claude Code is installed #6550
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -59,6 +59,44 @@ export async function activate(context: vscode.ExtensionContext) { | |||||
| context.subscriptions.push(outputChannel) | ||||||
| outputChannel.appendLine(`${Package.name} extension activated - ${JSON.stringify(Package)}`) | ||||||
|
|
||||||
| // Check for potential extension conflicts | ||||||
| const claudeCodeExtension = vscode.extensions.getExtension("anthropic.claude-code") | ||||||
| if (claudeCodeExtension) { | ||||||
| outputChannel.appendLine(`[Warning] Claude Code extension detected. Implementing conflict prevention measures.`) | ||||||
|
|
||||||
| // Add a small delay to prevent race conditions during activation | ||||||
| await new Promise((resolve) => setTimeout(resolve, 100)) | ||||||
| } | ||||||
|
|
||||||
| // Wrap the activation process with a timeout to prevent hanging | ||||||
| const ACTIVATION_TIMEOUT = 30000 // 30 seconds | ||||||
| const activationPromise = performActivation(context, outputChannel) | ||||||
|
|
||||||
| try { | ||||||
| await Promise.race([ | ||||||
| activationPromise, | ||||||
| new Promise((_, reject) => setTimeout(() => reject(new Error("Activation timeout")), ACTIVATION_TIMEOUT)), | ||||||
| ]) | ||||||
| } catch (error) { | ||||||
| outputChannel.appendLine(`[Error] Extension activation failed: ${error}`) | ||||||
| // Show a user-friendly error message | ||||||
| vscode.window | ||||||
| .showErrorMessage( | ||||||
| `Roo Code activation failed. ${claudeCodeExtension ? "This may be due to a conflict with Claude Code extension. " : ""}Please try reloading the window.`, | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. User-facing error text here should use i18n translation functions instead of hardcoded strings for consistency.
Suggested change
This comment was generated because it violated a code review rule: irule_C0ez7Rji6ANcGkkX. |
||||||
| "Reload Window", | ||||||
| ) | ||||||
| .then((selection) => { | ||||||
| if (selection === "Reload Window") { | ||||||
| vscode.commands.executeCommand("workbench.action.reloadWindow") | ||||||
| } | ||||||
| }) | ||||||
| throw error | ||||||
| } | ||||||
|
|
||||||
| return activationPromise | ||||||
| } | ||||||
|
|
||||||
| async function performActivation(context: vscode.ExtensionContext, outputChannel: vscode.OutputChannel) { | ||||||
| // Migrate old settings to new | ||||||
| await migrateSettings(context, outputChannel) | ||||||
|
|
||||||
|
|
@@ -180,7 +218,13 @@ export async function activate(context: vscode.ExtensionContext) { | |||||
| registerTerminalActions(context) | ||||||
|
|
||||||
| // Allows other extensions to activate once Roo is ready. | ||||||
| vscode.commands.executeCommand(`${Package.name}.activationCompleted`) | ||||||
| // Use a try-catch to prevent activation completion from blocking | ||||||
| try { | ||||||
| await vscode.commands.executeCommand(`${Package.name}.activationCompleted`) | ||||||
| } catch (error) { | ||||||
| outputChannel.appendLine(`[Warning] Failed to execute activationCompleted command: ${error}`) | ||||||
| // Continue activation even if this fails | ||||||
| } | ||||||
|
|
||||||
| // Implements the `RooCodeAPI` interface. | ||||||
| const socketPath = process.env.ROO_CODE_IPC_SOCKET_PATH | ||||||
|
|
||||||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Consider logging detailed error information (e.g., using error.message) to improve debuggability.