@google/gemini-cli-core 0.70.0-nightly.20261118.g2fd679bbf → 0.70.0-preview.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/docs/ide-integration/ide-companion-spec.md +10 -4
- package/dist/docs/reference/policy-engine.md +9 -3
- package/dist/src/generated/git-commit.d.ts +2 -2
- package/dist/src/generated/git-commit.js +2 -2
- package/dist/src/generated/git-commit.js.map +1 -1
- package/dist/src/ide/ide-connection-utils.d.ts +4 -2
- package/dist/src/ide/ide-connection-utils.js +57 -6
- package/dist/src/ide/ide-connection-utils.js.map +1 -1
- package/dist/src/ide/ide-connection-utils.test.js +143 -12
- package/dist/src/ide/ide-connection-utils.test.js.map +1 -1
- package/dist/src/ide/process-utils.integration.test.js +4 -3
- package/dist/src/ide/process-utils.integration.test.js.map +1 -1
- package/dist/src/policy/policy-engine.js +7 -1
- package/dist/src/policy/policy-engine.js.map +1 -1
- package/dist/src/policy/policy-engine.test.js +3 -0
- package/dist/src/policy/policy-engine.test.js.map +1 -1
- package/dist/src/policy/policy-updater.test.js +3 -3
- package/dist/src/policy/policy-updater.test.js.map +1 -1
- package/dist/src/policy/safe-regex.test.js +4 -2
- package/dist/src/policy/safe-regex.test.js.map +1 -1
- package/dist/src/policy/shell-argument-expansion.test.d.ts +6 -0
- package/dist/src/policy/shell-argument-expansion.test.js +143 -0
- package/dist/src/policy/shell-argument-expansion.test.js.map +1 -0
- package/dist/src/policy/shell-safety-regression.test.js +69 -0
- package/dist/src/policy/shell-safety-regression.test.js.map +1 -1
- package/dist/src/policy/toml-loader.js +2 -2
- package/dist/src/policy/toml-loader.js.map +1 -1
- package/dist/src/policy/toml-loader.test.js +35 -10
- package/dist/src/policy/toml-loader.test.js.map +1 -1
- package/dist/src/policy/utils.d.ts +6 -1
- package/dist/src/policy/utils.js +13 -4
- package/dist/src/policy/utils.js.map +1 -1
- package/dist/src/policy/utils.test.js +75 -19
- package/dist/src/policy/utils.test.js.map +1 -1
- package/dist/src/sandbox/utils/commandSafety.js +13 -3
- package/dist/src/sandbox/utils/commandSafety.js.map +1 -1
- package/dist/src/sandbox/utils/commandSafety.test.js +43 -1
- package/dist/src/sandbox/utils/commandSafety.test.js.map +1 -1
- package/dist/src/sandbox/utils/commandUtils.js +6 -1
- package/dist/src/sandbox/utils/commandUtils.js.map +1 -1
- package/dist/src/sandbox/utils/commandUtils.test.d.ts +6 -0
- package/dist/src/sandbox/utils/commandUtils.test.js +42 -0
- package/dist/src/sandbox/utils/commandUtils.test.js.map +1 -0
- package/dist/src/services/gitService.js +10 -3
- package/dist/src/services/gitService.js.map +1 -1
- package/dist/src/utils/paths.d.ts +8 -0
- package/dist/src/utils/paths.js +13 -0
- package/dist/src/utils/paths.js.map +1 -1
- package/dist/src/utils/paths.test.js +22 -1
- package/dist/src/utils/paths.test.js.map +1 -1
- package/dist/src/utils/shell-utils.d.ts +13 -0
- package/dist/src/utils/shell-utils.js +192 -0
- package/dist/src/utils/shell-utils.js.map +1 -1
- package/dist/src/utils/shell-utils.test.js +102 -1
- package/dist/src/utils/shell-utils.test.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +6 -6
- package/dist/google-gemini-cli-core-0.70.0-nightly.20261110.g1603e9bab.tgz +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# Gemini CLI companion plugin: Interface specification
|
|
2
2
|
|
|
3
|
-
> Last Updated:
|
|
3
|
+
> Last Updated: November 17, 2026
|
|
4
4
|
|
|
5
5
|
This document defines the contract for building a companion plugin to enable
|
|
6
6
|
Gemini CLI's IDE mode. For VS Code, these features (native diffing, context
|
|
@@ -34,9 +34,15 @@ creating a "discovery file."
|
|
|
34
34
|
- **How the CLI finds the file:** The CLI determines the Process ID (PID) of the
|
|
35
35
|
IDE it's running in by traversing the process tree. It then looks for a
|
|
36
36
|
discovery file that contains this PID in its name.
|
|
37
|
-
- **File location
|
|
38
|
-
`os.tmpdir()/gemini
|
|
39
|
-
|
|
37
|
+
- **File location and permissions:** On POSIX systems (Linux and macOS), you
|
|
38
|
+
**MUST** create the file in `os.tmpdir()/gemini-ide-${UID}/` (where `${UID}`
|
|
39
|
+
is the numeric user ID of the current process). Your plugin **MUST** create
|
|
40
|
+
this directory with `0700` permissions, verify with `lstat` that it isn't a
|
|
41
|
+
symbolic link and is owned by `${UID}`, and write the discovery file
|
|
42
|
+
atomically with `0600` permissions (for example, opening a temporary file in
|
|
43
|
+
that directory with exclusive creation `wx` and mode `0600`, then renaming it
|
|
44
|
+
into place). On Windows, where `%TEMP%` is already scoped to the current user,
|
|
45
|
+
create the file in `os.tmpdir()\gemini\ide\`.
|
|
40
46
|
- **File naming convention:** The filename is critical and **MUST** follow the
|
|
41
47
|
pattern: `gemini-ide-server-${PID}-${PORT}.json`
|
|
42
48
|
- `${PID}`: The process ID of the parent IDE process. Your plugin must
|
|
@@ -93,6 +93,11 @@ the arguments don't match the pattern, the rule does not apply. For a list of
|
|
|
93
93
|
argument keys available for each tool, see the **Parameters** in the
|
|
94
94
|
[Tools reference](/docs/reference/tools#available-tools).
|
|
95
95
|
|
|
96
|
+
In the stable JSON string, each top-level argument is delimited by the `\x00`
|
|
97
|
+
character, while nested objects and array items aren't. To match only a
|
|
98
|
+
top-level argument, start the pattern with `\x00`, for example
|
|
99
|
+
`'\x00"command":"git '`.
|
|
100
|
+
|
|
96
101
|
Patterns use [RE2 syntax](https://github.com/google/re2/wiki/Syntax). Gemini CLI
|
|
97
102
|
matches them in time proportional to the length of the arguments, so evaluation
|
|
98
103
|
time stays predictable for large arguments. RE2 differs from JavaScript regular
|
|
@@ -338,7 +343,7 @@ toolAnnotations = { readOnlyHint = true }
|
|
|
338
343
|
|
|
339
344
|
# (Optional) A regular expression in RE2 syntax to match against the tool's
|
|
340
345
|
# arguments.
|
|
341
|
-
argsPattern = '"command":"(git|npm)'
|
|
346
|
+
argsPattern = '\x00"command":"(?:git|npm)'
|
|
342
347
|
|
|
343
348
|
# (Optional) A string or array of strings that a shell command must start with.
|
|
344
349
|
# This is syntactic sugar for `toolName = "run_shell_command"` and an
|
|
@@ -349,8 +354,9 @@ commandPrefix = "git"
|
|
|
349
354
|
# shell command.
|
|
350
355
|
# This is also syntactic sugar for `toolName = "run_shell_command"`.
|
|
351
356
|
# Note: This pattern is tested against the JSON representation of the arguments
|
|
352
|
-
# (e.g., `{"command":"<your_command>"}`).
|
|
353
|
-
#
|
|
357
|
+
# (e.g., `{"command":"<your_command>"}`). It matches only the top-level
|
|
358
|
+
# `command` argument and starts at the beginning of the command, so
|
|
359
|
+
# alternatives such as `ls|pwd` also apply from the start of the command.
|
|
354
360
|
# Anchors like `^` or `$` apply to the full JSON string,
|
|
355
361
|
# so `^` should usually be avoided here.
|
|
356
362
|
# You cannot use commandPrefix and commandRegex in the same rule.
|
|
@@ -3,5 +3,5 @@
|
|
|
3
3
|
* Copyright 2026 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
export declare const GIT_COMMIT_INFO = "
|
|
7
|
-
export declare const CLI_VERSION = "0.70.0-
|
|
6
|
+
export declare const GIT_COMMIT_INFO = "615d6bc8c";
|
|
7
|
+
export declare const CLI_VERSION = "0.70.0-preview.0";
|
|
@@ -5,6 +5,6 @@
|
|
|
5
5
|
*/
|
|
6
6
|
// This file is auto-generated by the build script (scripts/generate-git-commit-info.js)
|
|
7
7
|
// Do not edit this file manually.
|
|
8
|
-
export const GIT_COMMIT_INFO = '
|
|
9
|
-
export const CLI_VERSION = '0.70.0-
|
|
8
|
+
export const GIT_COMMIT_INFO = '615d6bc8c';
|
|
9
|
+
export const CLI_VERSION = '0.70.0-preview.0';
|
|
10
10
|
//# sourceMappingURL=git-commit.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git-commit.js","sourceRoot":"","sources":["../../../src/generated/git-commit.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,wFAAwF;AACxF,kCAAkC;AAClC,MAAM,CAAC,MAAM,eAAe,GAAG,WAAW,CAAC;AAC3C,MAAM,CAAC,MAAM,WAAW,GAAG,
|
|
1
|
+
{"version":3,"file":"git-commit.js","sourceRoot":"","sources":["../../../src/generated/git-commit.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,wFAAwF;AACxF,kCAAkC;AAClC,MAAM,CAAC,MAAM,eAAe,GAAG,WAAW,CAAC;AAC3C,MAAM,CAAC,MAAM,WAAW,GAAG,kBAAkB,CAAC"}
|
|
@@ -30,9 +30,11 @@ export declare function validateWorkspacePath(ideWorkspacePath: string | undefin
|
|
|
30
30
|
};
|
|
31
31
|
export declare function getPortFromEnv(): string | undefined;
|
|
32
32
|
export declare function getStdioConfigFromEnv(): StdioConfig | undefined;
|
|
33
|
-
|
|
33
|
+
type DiscoveredConnectionConfig = ConnectionConfig & {
|
|
34
34
|
workspacePath?: string;
|
|
35
35
|
ideInfo?: IdeInfo;
|
|
36
|
-
}
|
|
36
|
+
};
|
|
37
|
+
export declare function getConnectionConfigFromFile(pid: number): Promise<DiscoveredConnectionConfig | undefined>;
|
|
37
38
|
export declare function createProxyAwareFetch(ideServerHost: string): Promise<(url: string | URL, init?: RequestInit) => Promise<Response>>;
|
|
38
39
|
export declare function getIdeServerHost(): string;
|
|
40
|
+
export {};
|
|
@@ -8,7 +8,7 @@ import * as path from 'node:path';
|
|
|
8
8
|
import * as os from 'node:os';
|
|
9
9
|
import { EnvHttpProxyAgent, fetch as undiciFetch } from 'undici';
|
|
10
10
|
import { debugLogger } from '../utils/debugLogger.js';
|
|
11
|
-
import { isSubpath, resolveToRealPath } from '../utils/paths.js';
|
|
11
|
+
import { getIdeConnectionDir, isSubpath, resolveToRealPath, } from '../utils/paths.js';
|
|
12
12
|
import { isNodeError } from '../utils/errors.js';
|
|
13
13
|
import {} from './detect-ide.js';
|
|
14
14
|
const logger = {
|
|
@@ -94,14 +94,50 @@ export function getStdioConfigFromEnv() {
|
|
|
94
94
|
return { command, args };
|
|
95
95
|
}
|
|
96
96
|
const IDE_SERVER_FILE_REGEX = /^gemini-ide-server-(\d+)-\d+\.json$/;
|
|
97
|
+
async function verifyDirectory(dirPath, requireStrictPermissions) {
|
|
98
|
+
try {
|
|
99
|
+
const stat = await fs.promises.lstat(dirPath);
|
|
100
|
+
if ((typeof stat.isSymbolicLink === 'function' && stat.isSymbolicLink()) ||
|
|
101
|
+
(typeof stat.isDirectory === 'function' && !stat.isDirectory())) {
|
|
102
|
+
return false;
|
|
103
|
+
}
|
|
104
|
+
if (requireStrictPermissions) {
|
|
105
|
+
if (process.getuid && stat.uid !== process.getuid()) {
|
|
106
|
+
return false;
|
|
107
|
+
}
|
|
108
|
+
if (os.platform() !== 'win32' &&
|
|
109
|
+
typeof stat.mode === 'number' &&
|
|
110
|
+
(stat.mode & 0o077) !== 0) {
|
|
111
|
+
return false;
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
return true;
|
|
115
|
+
}
|
|
116
|
+
catch {
|
|
117
|
+
return false;
|
|
118
|
+
}
|
|
119
|
+
}
|
|
97
120
|
async function verifyAndReadFile(filePath) {
|
|
98
121
|
let handle;
|
|
99
122
|
try {
|
|
100
|
-
|
|
123
|
+
const openFlags = os.platform() === 'win32'
|
|
124
|
+
? 'r'
|
|
125
|
+
: fs.constants.O_RDONLY |
|
|
126
|
+
(fs.constants.O_NOFOLLOW ?? 0) |
|
|
127
|
+
(fs.constants.O_NONBLOCK ?? 0);
|
|
128
|
+
handle = await fs.promises.open(filePath, openFlags);
|
|
101
129
|
const stat = await handle.stat();
|
|
130
|
+
if (typeof stat.isFile === 'function' && !stat.isFile()) {
|
|
131
|
+
return undefined;
|
|
132
|
+
}
|
|
102
133
|
if (process.getuid && stat.uid !== process.getuid()) {
|
|
103
134
|
return undefined;
|
|
104
135
|
}
|
|
136
|
+
if (os.platform() !== 'win32' &&
|
|
137
|
+
typeof stat.mode === 'number' &&
|
|
138
|
+
(stat.mode & 0o077) !== 0) {
|
|
139
|
+
return undefined;
|
|
140
|
+
}
|
|
105
141
|
return await handle.readFile('utf8');
|
|
106
142
|
}
|
|
107
143
|
catch {
|
|
@@ -113,10 +149,13 @@ async function verifyAndReadFile(filePath) {
|
|
|
113
149
|
}
|
|
114
150
|
}
|
|
115
151
|
}
|
|
116
|
-
|
|
117
|
-
|
|
152
|
+
async function readConnectionConfigFromDirectory(portFileDir, pid, requireStrictPermissions) {
|
|
153
|
+
if (!(await verifyDirectory(portFileDir, requireStrictPermissions))) {
|
|
154
|
+
return undefined;
|
|
155
|
+
}
|
|
156
|
+
// For backwards compatibility with single-file naming scheme
|
|
118
157
|
try {
|
|
119
|
-
const portFile = path.join(
|
|
158
|
+
const portFile = path.join(portFileDir, `gemini-ide-server-${pid}.json`);
|
|
120
159
|
const portFileContents = await verifyAndReadFile(portFile);
|
|
121
160
|
if (!portFileContents) {
|
|
122
161
|
throw new Error('Verification failed or file not found');
|
|
@@ -134,7 +173,6 @@ export async function getConnectionConfigFromFile(pid) {
|
|
|
134
173
|
// windows are open, multiple files matching the pattern are expected to
|
|
135
174
|
// exist.
|
|
136
175
|
}
|
|
137
|
-
const portFileDir = path.join(os.tmpdir(), 'gemini', 'ide');
|
|
138
176
|
let portFiles;
|
|
139
177
|
try {
|
|
140
178
|
portFiles = await fs.promises.readdir(portFileDir);
|
|
@@ -225,6 +263,19 @@ export async function getConnectionConfigFromFile(pid) {
|
|
|
225
263
|
}
|
|
226
264
|
return selected;
|
|
227
265
|
}
|
|
266
|
+
export async function getConnectionConfigFromFile(pid) {
|
|
267
|
+
const baseTmpDir = os.tmpdir();
|
|
268
|
+
const primaryDir = getIdeConnectionDir(baseTmpDir);
|
|
269
|
+
const primaryConfig = await readConnectionConfigFromDirectory(primaryDir, pid, Boolean(process.getuid));
|
|
270
|
+
if (primaryConfig) {
|
|
271
|
+
return primaryConfig;
|
|
272
|
+
}
|
|
273
|
+
const legacyDir = path.join(baseTmpDir, 'gemini', 'ide');
|
|
274
|
+
if (legacyDir !== primaryDir) {
|
|
275
|
+
return readConnectionConfigFromDirectory(legacyDir, pid, false);
|
|
276
|
+
}
|
|
277
|
+
return undefined;
|
|
278
|
+
}
|
|
228
279
|
// Sort files to prioritize the one matching the target pid,
|
|
229
280
|
// then by whether the process is still alive, then by newest (largest PID).
|
|
230
281
|
function sortConnectionFiles(files, targetPid) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ide-connection-utils.js","sourceRoot":"","sources":["../../../src/ide/ide-connection-utils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ide-connection-utils.js","sourceRoot":"","sources":["../../../src/ide/ide-connection-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ import * as fs from 'node:fs';
|
|
|
8
8
|
import * as path from 'node:path';
|
|
9
9
|
import * as os from 'node:os';
|
|
10
10
|
import { getConnectionConfigFromFile, validateWorkspacePath, getIdeServerHost, } from './ide-connection-utils.js';
|
|
11
|
+
import { getIdeConnectionDir } from '../utils/paths.js';
|
|
11
12
|
import { pathToFileURL } from 'node:url';
|
|
12
13
|
vi.mock('node:fs', async (importOriginal) => {
|
|
13
14
|
const actual = await importOriginal();
|
|
@@ -18,7 +19,12 @@ vi.mock('node:fs', async (importOriginal) => {
|
|
|
18
19
|
readFile: vi.fn(),
|
|
19
20
|
readdir: vi.fn(),
|
|
20
21
|
realpath: vi.fn((p) => Promise.resolve(p)),
|
|
21
|
-
|
|
22
|
+
lstat: vi.fn(),
|
|
23
|
+
stat: vi.fn(() => Promise.resolve({
|
|
24
|
+
uid: process.getuid ? process.getuid() : 1000,
|
|
25
|
+
mode: 0o100600,
|
|
26
|
+
isFile: () => true,
|
|
27
|
+
})),
|
|
22
28
|
open: vi.fn((filePath) => Promise.resolve({
|
|
23
29
|
stat: () => fs.promises.stat(filePath),
|
|
24
30
|
readFile: (options) => fs.promises.readFile(filePath, options),
|
|
@@ -37,6 +43,7 @@ vi.mock('undici', () => ({
|
|
|
37
43
|
Agent: vi.fn(),
|
|
38
44
|
}));
|
|
39
45
|
describe('ide-connection-utils', () => {
|
|
46
|
+
const expectedIdeDir = getIdeConnectionDir('/tmp');
|
|
40
47
|
beforeEach(() => {
|
|
41
48
|
// Mock environment variables
|
|
42
49
|
vi.stubEnv('GEMINI_CLI_IDE_WORKSPACE_PATH', '/test/workspace');
|
|
@@ -48,6 +55,23 @@ describe('ide-connection-utils', () => {
|
|
|
48
55
|
vi.mocked(os.tmpdir).mockReturnValue('/tmp');
|
|
49
56
|
vi.mocked(os.platform).mockReturnValue('linux');
|
|
50
57
|
vi.spyOn(process, 'kill').mockImplementation(() => true);
|
|
58
|
+
const currentUid = process.getuid ? process.getuid() : 1000;
|
|
59
|
+
vi.mocked(fs.promises.lstat).mockImplementation((targetPath) => {
|
|
60
|
+
if (String(targetPath) === expectedIdeDir) {
|
|
61
|
+
return Promise.resolve({
|
|
62
|
+
uid: currentUid,
|
|
63
|
+
mode: 0o40700,
|
|
64
|
+
isSymbolicLink: () => false,
|
|
65
|
+
isDirectory: () => true,
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
return Promise.reject(Object.assign(new Error('ENOENT'), { code: 'ENOENT' }));
|
|
69
|
+
});
|
|
70
|
+
vi.mocked(fs.promises.stat).mockImplementation(() => Promise.resolve({
|
|
71
|
+
uid: currentUid,
|
|
72
|
+
mode: 0o100600,
|
|
73
|
+
isFile: () => true,
|
|
74
|
+
}));
|
|
51
75
|
});
|
|
52
76
|
afterEach(() => {
|
|
53
77
|
vi.restoreAllMocks();
|
|
@@ -59,7 +83,7 @@ describe('ide-connection-utils', () => {
|
|
|
59
83
|
vi.mocked(fs.promises.readFile).mockResolvedValue(JSON.stringify(config));
|
|
60
84
|
const result = await getConnectionConfigFromFile(12345);
|
|
61
85
|
expect(result).toEqual(config);
|
|
62
|
-
expect(fs.promises.readFile).toHaveBeenCalledWith(path.join(
|
|
86
|
+
expect(fs.promises.readFile).toHaveBeenCalledWith(path.join(expectedIdeDir, 'gemini-ide-server-12345.json'), 'utf8');
|
|
63
87
|
});
|
|
64
88
|
it('should return undefined if no config files are found', async () => {
|
|
65
89
|
vi.mocked(fs.promises.readFile).mockRejectedValue(new Error('not found'));
|
|
@@ -74,7 +98,7 @@ describe('ide-connection-utils', () => {
|
|
|
74
98
|
vi.mocked(fs.promises.readFile).mockResolvedValue(JSON.stringify(config));
|
|
75
99
|
const result = await getConnectionConfigFromFile(12345);
|
|
76
100
|
expect(result).toEqual(config);
|
|
77
|
-
expect(fs.promises.readFile).toHaveBeenCalledWith(path.join(
|
|
101
|
+
expect(fs.promises.readFile).toHaveBeenCalledWith(path.join(expectedIdeDir, 'gemini-ide-server-12345-123.json'), 'utf8');
|
|
78
102
|
});
|
|
79
103
|
it('should filter out configs with invalid workspace paths', async () => {
|
|
80
104
|
const validConfig = {
|
|
@@ -108,7 +132,7 @@ describe('ide-connection-utils', () => {
|
|
|
108
132
|
vi.mocked(fs.promises.readFile).mockResolvedValueOnce(JSON.stringify(validConfig));
|
|
109
133
|
const result = await getConnectionConfigFromFile(targetPid);
|
|
110
134
|
expect(result).toEqual(validConfig);
|
|
111
|
-
expect(fs.promises.readFile).toHaveBeenCalledWith(path.join(
|
|
135
|
+
expect(fs.promises.readFile).toHaveBeenCalledWith(path.join(expectedIdeDir, `gemini-ide-server-${otherPid}-111.json`), 'utf8');
|
|
112
136
|
});
|
|
113
137
|
it('should prioritize the target PID over other PIDs', async () => {
|
|
114
138
|
const targetPid = 12345;
|
|
@@ -127,7 +151,7 @@ describe('ide-connection-utils', () => {
|
|
|
127
151
|
.mockResolvedValueOnce(JSON.stringify(otherConfig));
|
|
128
152
|
const result = await getConnectionConfigFromFile(targetPid);
|
|
129
153
|
expect(result).toEqual(targetConfig);
|
|
130
|
-
expect(fs.promises.readFile).toHaveBeenCalledWith(path.join(
|
|
154
|
+
expect(fs.promises.readFile).toHaveBeenCalledWith(path.join(expectedIdeDir, `gemini-ide-server-${targetPid}-1.json`), 'utf8');
|
|
131
155
|
});
|
|
132
156
|
it('should prioritize an alive process over a dead one', async () => {
|
|
133
157
|
const targetPid = 12345; // target not present
|
|
@@ -150,7 +174,7 @@ describe('ide-connection-utils', () => {
|
|
|
150
174
|
.mockResolvedValueOnce(JSON.stringify(deadConfig));
|
|
151
175
|
const result = await getConnectionConfigFromFile(targetPid);
|
|
152
176
|
expect(result).toEqual(aliveConfig);
|
|
153
|
-
expect(fs.promises.readFile).toHaveBeenCalledWith(path.join(
|
|
177
|
+
expect(fs.promises.readFile).toHaveBeenCalledWith(path.join(expectedIdeDir, `gemini-ide-server-${alivePid}-1.json`), 'utf8');
|
|
154
178
|
});
|
|
155
179
|
it('should prioritize the largest PID (newest) among alive processes', async () => {
|
|
156
180
|
const targetPid = 12345; // target not present
|
|
@@ -170,7 +194,7 @@ describe('ide-connection-utils', () => {
|
|
|
170
194
|
.mockResolvedValueOnce(JSON.stringify(oldConfig));
|
|
171
195
|
const result = await getConnectionConfigFromFile(targetPid);
|
|
172
196
|
expect(result).toEqual(newConfig);
|
|
173
|
-
expect(fs.promises.readFile).toHaveBeenCalledWith(path.join(
|
|
197
|
+
expect(fs.promises.readFile).toHaveBeenCalledWith(path.join(expectedIdeDir, `gemini-ide-server-${newPid}-1.json`), 'utf8');
|
|
174
198
|
});
|
|
175
199
|
it('should return the first valid config when multiple workspaces are valid', async () => {
|
|
176
200
|
const config1 = { port: '1111', workspacePath: '/test/workspace' };
|
|
@@ -231,8 +255,8 @@ describe('ide-connection-utils', () => {
|
|
|
231
255
|
vi.mocked(fs.promises.readFile).mockResolvedValueOnce(JSON.stringify(validConfig));
|
|
232
256
|
const result = await getConnectionConfigFromFile(12345);
|
|
233
257
|
expect(result).toEqual(validConfig);
|
|
234
|
-
expect(fs.promises.readFile).toHaveBeenCalledWith(path.join(
|
|
235
|
-
expect(fs.promises.readFile).not.toHaveBeenCalledWith(path.join(
|
|
258
|
+
expect(fs.promises.readFile).toHaveBeenCalledWith(path.join(expectedIdeDir, 'gemini-ide-server-12345-111.json'), 'utf8');
|
|
259
|
+
expect(fs.promises.readFile).not.toHaveBeenCalledWith(path.join(expectedIdeDir, 'not-a-config-file.txt'), 'utf8');
|
|
236
260
|
});
|
|
237
261
|
it('should match env port string to a number port in the config', async () => {
|
|
238
262
|
vi.stubEnv('GEMINI_CLI_IDE_SERVER_PORT', '3333');
|
|
@@ -299,8 +323,10 @@ describe('ide-connection-utils', () => {
|
|
|
299
323
|
vi.mocked(fs.promises.readdir).mockResolvedValue(['gemini-ide-server-12345-111.json']);
|
|
300
324
|
vi.mocked(fs.promises.readFile).mockResolvedValueOnce(JSON.stringify(config1));
|
|
301
325
|
const otherUid = (process.getuid ? process.getuid() : 1000) + 1;
|
|
302
|
-
vi.mocked(fs.promises.stat).
|
|
326
|
+
vi.mocked(fs.promises.stat).mockResolvedValue({
|
|
303
327
|
uid: otherUid,
|
|
328
|
+
mode: 0o100600,
|
|
329
|
+
isFile: () => true,
|
|
304
330
|
});
|
|
305
331
|
const result = await getConnectionConfigFromFile(12345);
|
|
306
332
|
expect(result).toBeUndefined();
|
|
@@ -314,8 +340,10 @@ describe('ide-connection-utils', () => {
|
|
|
314
340
|
vi.mocked(fs.promises.readdir).mockResolvedValue(['gemini-ide-server-12345-111.json']);
|
|
315
341
|
vi.mocked(fs.promises.readFile).mockResolvedValueOnce(JSON.stringify(config1));
|
|
316
342
|
const currentUid = process.getuid ? process.getuid() : 1000;
|
|
317
|
-
vi.mocked(fs.promises.stat).
|
|
343
|
+
vi.mocked(fs.promises.stat).mockResolvedValue({
|
|
318
344
|
uid: currentUid,
|
|
345
|
+
mode: 0o100600,
|
|
346
|
+
isFile: () => true,
|
|
319
347
|
});
|
|
320
348
|
const result = await getConnectionConfigFromFile(12345);
|
|
321
349
|
expect(result).toEqual(config1);
|
|
@@ -323,10 +351,113 @@ describe('ide-connection-utils', () => {
|
|
|
323
351
|
it('should reject and ignore config files if fs.promises.open throws an error', async () => {
|
|
324
352
|
vi.mocked(fs.promises.readFile).mockRejectedValueOnce(new Error('not found'));
|
|
325
353
|
vi.mocked(fs.promises.readdir).mockResolvedValue(['gemini-ide-server-12345-111.json']);
|
|
326
|
-
vi.mocked(fs.promises.open).
|
|
354
|
+
vi.mocked(fs.promises.open).mockRejectedValue(new Error('symlink loop / permission denied'));
|
|
327
355
|
const result = await getConnectionConfigFromFile(12345);
|
|
328
356
|
expect(result).toBeUndefined();
|
|
329
357
|
});
|
|
358
|
+
it('should open config files with O_RDONLY | O_NOFOLLOW | O_NONBLOCK on POSIX', async () => {
|
|
359
|
+
const config1 = {
|
|
360
|
+
port: '1111',
|
|
361
|
+
workspacePath: '/test/workspace',
|
|
362
|
+
};
|
|
363
|
+
vi.mocked(fs.promises.readFile).mockResolvedValue(JSON.stringify(config1));
|
|
364
|
+
await getConnectionConfigFromFile(12345);
|
|
365
|
+
const expectedFlags = fs.constants.O_RDONLY |
|
|
366
|
+
(fs.constants.O_NOFOLLOW ?? 0) |
|
|
367
|
+
(fs.constants.O_NONBLOCK ?? 0);
|
|
368
|
+
expect(fs.promises.open).toHaveBeenCalledWith(path.join(expectedIdeDir, 'gemini-ide-server-12345.json'), expectedFlags);
|
|
369
|
+
});
|
|
370
|
+
it.runIf(process.getuid !== undefined)('should reject primary discovery directory if it is a symlink, owned by another UID, or group/world accessible', async () => {
|
|
371
|
+
const currentUid = process.getuid ? process.getuid() : 1000;
|
|
372
|
+
const badStats = [
|
|
373
|
+
{
|
|
374
|
+
uid: currentUid,
|
|
375
|
+
mode: 0o120777,
|
|
376
|
+
isSymbolicLink: () => true,
|
|
377
|
+
isDirectory: () => false,
|
|
378
|
+
},
|
|
379
|
+
{
|
|
380
|
+
uid: currentUid + 1,
|
|
381
|
+
mode: 0o40700,
|
|
382
|
+
isSymbolicLink: () => false,
|
|
383
|
+
isDirectory: () => true,
|
|
384
|
+
},
|
|
385
|
+
{
|
|
386
|
+
uid: currentUid,
|
|
387
|
+
mode: 0o40755,
|
|
388
|
+
isSymbolicLink: () => false,
|
|
389
|
+
isDirectory: () => true,
|
|
390
|
+
},
|
|
391
|
+
];
|
|
392
|
+
for (const statObj of badStats) {
|
|
393
|
+
vi.mocked(fs.promises.lstat).mockImplementation((targetPath) => {
|
|
394
|
+
if (String(targetPath) === expectedIdeDir) {
|
|
395
|
+
return Promise.resolve(statObj);
|
|
396
|
+
}
|
|
397
|
+
return Promise.reject(Object.assign(new Error('ENOENT'), { code: 'ENOENT' }));
|
|
398
|
+
});
|
|
399
|
+
const result = await getConnectionConfigFromFile(12345);
|
|
400
|
+
expect(result).toBeUndefined();
|
|
401
|
+
expect(fs.promises.readdir).not.toHaveBeenCalled();
|
|
402
|
+
}
|
|
403
|
+
});
|
|
404
|
+
it('should reject config files that are non-regular files (e.g. FIFOs) or accessible by group/other', async () => {
|
|
405
|
+
const currentUid = process.getuid ? process.getuid() : 1000;
|
|
406
|
+
vi.mocked(fs.promises.readFile).mockResolvedValue(JSON.stringify({ port: '1111', workspacePath: '/test/workspace' }));
|
|
407
|
+
// Non-regular file (FIFO)
|
|
408
|
+
vi.mocked(fs.promises.stat).mockResolvedValue({
|
|
409
|
+
uid: currentUid,
|
|
410
|
+
mode: 0o010600,
|
|
411
|
+
isFile: () => false,
|
|
412
|
+
});
|
|
413
|
+
expect(await getConnectionConfigFromFile(12345)).toBeUndefined();
|
|
414
|
+
// Group/world-readable regular file (0o644)
|
|
415
|
+
vi.mocked(fs.promises.stat).mockResolvedValue({
|
|
416
|
+
uid: currentUid,
|
|
417
|
+
mode: 0o100644,
|
|
418
|
+
isFile: () => true,
|
|
419
|
+
});
|
|
420
|
+
expect(await getConnectionConfigFromFile(12345)).toBeUndefined();
|
|
421
|
+
// Group-readable regular file (0o640)
|
|
422
|
+
vi.mocked(fs.promises.stat).mockResolvedValue({
|
|
423
|
+
uid: currentUid,
|
|
424
|
+
mode: 0o100640,
|
|
425
|
+
isFile: () => true,
|
|
426
|
+
});
|
|
427
|
+
expect(await getConnectionConfigFromFile(12345)).toBeUndefined();
|
|
428
|
+
// World-writable regular file (0o666)
|
|
429
|
+
vi.mocked(fs.promises.stat).mockResolvedValue({
|
|
430
|
+
uid: currentUid,
|
|
431
|
+
mode: 0o100666,
|
|
432
|
+
isFile: () => true,
|
|
433
|
+
});
|
|
434
|
+
expect(await getConnectionConfigFromFile(12345)).toBeUndefined();
|
|
435
|
+
});
|
|
436
|
+
it.runIf(process.getuid !== undefined)('should fall back to legacy /tmp/gemini/ide directory when primary per-user directory does not exist', async () => {
|
|
437
|
+
const legacyDir = path.join('/tmp', 'gemini', 'ide');
|
|
438
|
+
const currentUid = process.getuid ? process.getuid() : 1000;
|
|
439
|
+
const legacyConfig = {
|
|
440
|
+
port: '7777',
|
|
441
|
+
workspacePath: '/test/workspace',
|
|
442
|
+
};
|
|
443
|
+
vi.mocked(fs.promises.lstat).mockImplementation((targetPath) => {
|
|
444
|
+
if (String(targetPath) === legacyDir) {
|
|
445
|
+
return Promise.resolve({
|
|
446
|
+
uid: currentUid,
|
|
447
|
+
mode: 0o40755,
|
|
448
|
+
isSymbolicLink: () => false,
|
|
449
|
+
isDirectory: () => true,
|
|
450
|
+
});
|
|
451
|
+
}
|
|
452
|
+
return Promise.reject(Object.assign(new Error('ENOENT'), { code: 'ENOENT' }));
|
|
453
|
+
});
|
|
454
|
+
vi.mocked(fs.promises.readFile).mockRejectedValueOnce(new Error('not found'));
|
|
455
|
+
vi.mocked(fs.promises.readdir).mockResolvedValue(['gemini-ide-server-12345-7777.json']);
|
|
456
|
+
vi.mocked(fs.promises.readFile).mockResolvedValueOnce(JSON.stringify(legacyConfig));
|
|
457
|
+
const result = await getConnectionConfigFromFile(12345);
|
|
458
|
+
expect(result).toEqual(legacyConfig);
|
|
459
|
+
expect(fs.promises.readFile).toHaveBeenCalledWith(path.join(legacyDir, 'gemini-ide-server-12345-7777.json'), 'utf8');
|
|
460
|
+
});
|
|
330
461
|
});
|
|
331
462
|
describe('validateWorkspacePath', () => {
|
|
332
463
|
it('should return valid if path is within cwd', () => {
|