Skip to content

[SSR Agent] Issue Fix (346): Fix IDE integration using pre-installed extension #348

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.

Sign up for GitHub

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

Open
joneba-google wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[SSR Agent] Issue Fix (346): Fix IDE integration using pre-installed extension #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions packages/cli/src/ui/AppContainer.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ const mockCoreEvents = vi.hoisted(() => ({
off: vi.fn(),
drainBacklogs: vi.fn(),
emit: vi.fn(),
emitFeedback: vi.fn(),
emitSettingsChanged: vi.fn(),
}));

// Mock IdeClient
Expand Down Expand Up @@ -3707,4 +3709,49 @@ describe('AppContainer State Management', () => {
unmount();
});
});

describe('IDE Companion Integration Nudge', () => {
let mockHandleSlashCommand: Mock;

beforeEach(() => {
mockHandleSlashCommand = vi.fn();
mockedUseSlashCommandProcessor.mockReturnValue({
handleSlashCommand: mockHandleSlashCommand,
slashCommands: [],
pendingHistoryItems: [],
commandContext: {},
shellConfirmationRequest: null,
confirmationRequest: null,
});
});

it('executes "/ide enable" when companion extension is pre-installed', async () => {
const { unmount } = await act(async () => renderAppContainer());

act(() => {
capturedUIActions.handleIdePromptComplete({
userSelection: 'yes',
isExtensionPreInstalled: true,
});
});

expect(mockHandleSlashCommand).toHaveBeenCalledWith('/ide enable');
unmount();
});

it('executes "/ide install" when companion extension is not pre-installed', async () => {
const { unmount } = await act(async () => renderAppContainer());

act(() => {
capturedUIActions.handleIdePromptComplete({
userSelection: 'yes',
isExtensionPreInstalled: false,
});
});

expect(mockHandleSlashCommand).toHaveBeenCalledWith('/ide install');
unmount();
});
});
});

7 changes: 5 additions & 2 deletions packages/cli/src/ui/AppContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1773,8 +1773,11 @@ Logging in with Google... Restarting Gemini CLI to continue.
const handleIdePromptComplete = useCallback(
(result: IdeIntegrationNudgeResult) => {
if (result.userSelection === 'yes') {
// eslint-disable-next-line @typescript-eslint/no-floating-promises
handleSlashCommand('/ide install');
if (result.isExtensionPreInstalled) {
void handleSlashCommand('/ide enable');
} else {
void handleSlashCommand('/ide install');
}
settings.setValue(SettingScope.User, 'ide.hasSeenNudge', true);
} else if (result.userSelection === 'dismiss') {
settings.setValue(SettingScope.User, 'ide.hasSeenNudge', true);
Expand Down
Loading