MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-03-16 09:01:17 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(ide): Correct IDE client temp dir and port matching (#8270)

Browse Source
This commit is contained in:
Shreya Keshive
2025-09-12 13:49:37 -04:00
committed by GitHub
parent 8a5e692373
commit 1f9564223b
2 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
packages/core/src/ide/ide-client.test.ts
View File

@@ -331,7 +331,7 @@ describe('IdeClient', () => {
expect(result).toEqual(config); expect(result).toEqual(config);
expect(fs.promises.readFile).toHaveBeenCalledWith( expect(fs.promises.readFile).toHaveBeenCalledWith(
path.join('/tmp/.gemini/ide', 'gemini-ide-server-12345-123.json'), path.join('/tmp/gemini/ide', 'gemini-ide-server-12345-123.json'),
'utf8', 'utf8',
); );
}); });
@@ -526,14 +526,46 @@ describe('IdeClient', () => {
expect(result).toEqual(validConfig); expect(result).toEqual(validConfig);
expect(fs.promises.readFile).toHaveBeenCalledWith( expect(fs.promises.readFile).toHaveBeenCalledWith(
path.join('/tmp/.gemini/ide', 'gemini-ide-server-12345-111.json'), path.join('/tmp/gemini/ide', 'gemini-ide-server-12345-111.json'),
'utf8', 'utf8',
); );
expect(fs.promises.readFile).not.toHaveBeenCalledWith( expect(fs.promises.readFile).not.toHaveBeenCalledWith(
path.join('/tmp/.gemini/ide', 'not-a-config-file.txt'), path.join('/tmp/gemini/ide', 'not-a-config-file.txt'),
'utf8', 'utf8',
); );
}); });
it('should match env port string to a number port in the config', async () => {
process.env['GEMINI_CLI_IDE_SERVER_PORT'] = '3333';
const config1 = { port: 1111, workspacePath: '/test/workspace' };
const config2 = { port: 3333, workspacePath: '/test/workspace2' };
vi.mocked(fs.promises.readFile).mockRejectedValueOnce(
new Error('not found'),
);
(
vi.mocked(fs.promises.readdir) as Mock<
(path: fs.PathLike) => Promise<string[]>
>
).mockResolvedValue([
'gemini-ide-server-12345-111.json',
'gemini-ide-server-12345-222.json',
]);
vi.mocked(fs.promises.readFile)
.mockResolvedValueOnce(JSON.stringify(config1))
.mockResolvedValueOnce(JSON.stringify(config2));
vi.spyOn(IdeClient, 'validateWorkspacePath').mockReturnValue({
isValid: true,
});
const ideClient = await IdeClient.getInstance();
const result = await (
ideClient as unknown as {
getConnectionConfigFromFile: () => Promise<unknown>;
}
).getConnectionConfigFromFile();
expect(result).toEqual(config2);
});
}); });
describe('isDiffingEnabled', () => { describe('isDiffingEnabled', () => {

4
packages/core/src/ide/ide-client.ts
View File

@@ -588,7 +588,7 @@ export class IdeClient {
// exist. // exist.
} }
const portFileDir = path.join(os.tmpdir(), '.gemini', 'ide'); const portFileDir = path.join(os.tmpdir(), 'gemini', 'ide');
let portFiles; let portFiles;
try { try {
portFiles = await fs.promises.readdir(portFileDir); portFiles = await fs.promises.readdir(portFileDir);
@@ -650,7 +650,7 @@ export class IdeClient {
const portFromEnv = this.getPortFromEnv(); const portFromEnv = this.getPortFromEnv();
if (portFromEnv) { if (portFromEnv) {
const matchingPort = validWorkspaces.find( const matchingPort = validWorkspaces.find(
(content) => content.port === portFromEnv, (content) => String(content.port) === portFromEnv,
); );
if (matchingPort) { if (matchingPort) {
return matchingPort; return matchingPort;