MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-05-13 05:12:55 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(cli): expand tilde in policy paths from settings.json (#22772)

Browse Source
This commit is contained in:
Abhi
2026-03-17 17:48:24 -04:00
committed by GitHub
parent e0be1b2afd
commit 95bca2c3b3
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/cli/src/config/config.test.ts
+4 -1
View File
@@ -3347,7 +3347,10 @@ describe('Policy Engine Integration in loadCliConfig', () => {
expect(ServerConfig.createPolicyEngineConfig).toHaveBeenCalledWith( expect(ServerConfig.createPolicyEngineConfig).toHaveBeenCalledWith(
expect.objectContaining({ expect.objectContaining({
policyPaths: ['/path/to/policy1.toml', '/path/to/policy2.toml'], policyPaths: [
path.normalize('/path/to/policy1.toml'),
path.normalize('/path/to/policy2.toml'),
],
}), }),
expect.anything(), expect.anything(),
); );
packages/cli/src/config/config.ts
+6 -2
View File
@@ -651,8 +651,12 @@ export async function loadCliConfig(
...settings.mcp, ...settings.mcp,
allowed: argv.allowedMcpServerNames ?? settings.mcp?.allowed, allowed: argv.allowedMcpServerNames ?? settings.mcp?.allowed,
}, },
policyPaths: argv.policy ?? settings.policyPaths, policyPaths: (argv.policy ?? settings.policyPaths)?.map((p) =>
adminPolicyPaths: argv.adminPolicy ?? settings.adminPolicyPaths, resolvePath(p),
),
adminPolicyPaths: (argv.adminPolicy ?? settings.adminPolicyPaths)?.map(
(p) => resolvePath(p),
),
}; };
const { workspacePoliciesDir, policyUpdateConfirmationRequest } = const { workspacePoliciesDir, policyUpdateConfirmationRequest } =