MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-04-23 03:24:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(rebase): Resolve conflicts from rebase onto abhijit-2592

Browse Source 
Manually resolved merge conflicts in CLI and Core config files that occurred during the rebase of the extensible plan mode feature branch onto `abhijit-2592/read-proj-dir-policy-file`.
This commit is contained in:
Mahima Shanware
2026-02-19 19:11:51 +00:00
parent 12ee556f3b
commit 6f0d7b8adb
2 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/cli/src/config/config.ts
-4
View File
@@ -813,12 +813,8 @@ export async function loadCliConfig(
coreTools: settings.tools?.core || undefined, coreTools: settings.tools?.core || undefined,
allowedTools: allowedTools.length > 0 ? allowedTools : undefined, allowedTools: allowedTools.length > 0 ? allowedTools : undefined,
policyEngineConfig, policyEngineConfig,
<<<<<<< HEAD
policyUpdateConfirmationRequest, policyUpdateConfirmationRequest,
excludeTools,
=======
excludeTools: finalExcludeTools, excludeTools: finalExcludeTools,
>>>>>>> 45fcd9869 (Fix: Enable write_file in Plan Mode via workspace policy)
toolDiscoveryCommand: settings.tools?.discoveryCommand, toolDiscoveryCommand: settings.tools?.discoveryCommand,
toolCallCommand: settings.tools?.callCommand, toolCallCommand: settings.tools?.callCommand,
mcpServerCommand, mcpServerCommand,
packages/core/src/policy/config.ts
-7
View File
@@ -74,9 +74,6 @@ export function getPolicyDirectories(
dirs.push(workspacePoliciesDir); dirs.push(workspacePoliciesDir);
} }
// Admin tier (highest priority)
dirs.push(Storage.getSystemPoliciesDir());
// Default tier (lowest priority) // Default tier (lowest priority)
dirs.push(defaultPoliciesDir ?? DEFAULT_CORE_POLICIES_DIR); dirs.push(defaultPoliciesDir ?? DEFAULT_CORE_POLICIES_DIR);
@@ -180,11 +177,7 @@ export async function createPolicyEngineConfig(
const policyDirs = getPolicyDirectories( const policyDirs = getPolicyDirectories(
defaultPoliciesDir, defaultPoliciesDir,
settings.policyPaths, settings.policyPaths,
<<<<<<< HEAD
settings.workspacePoliciesDir,
=======
workspacePoliciesDir, workspacePoliciesDir,
>>>>>>> 45fcd9869 (Fix: Enable write_file in Plan Mode via workspace policy)
); );
const securePolicyDirs = await filterSecurePolicyDirectories(policyDirs); const securePolicyDirs = await filterSecurePolicyDirectories(policyDirs);