Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
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
4 changes: 2 additions & 2 deletions packages/cli/src/config/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { hooksCommand } from '../commands/hooks.js';
import { gemmaCommand } from '../commands/gemma.js';
import {
setGeminiMdFilename as setServerGeminiMdFilename,
getCurrentGeminiMdFilename,
resetGeminiMdFilename,
Comment thread
devr0306 marked this conversation as resolved.
Resolved
ApprovalMode,
DEFAULT_GEMINI_EMBEDDING_MODEL,
DEFAULT_FILE_FILTERING_OPTIONS,
Expand Down Expand Up @@ -620,7 +620,7 @@ export async function loadCliConfig(
setServerGeminiMdFilename(settings.context.fileName);
} else {
// Reset to default if not provided in settings.
setServerGeminiMdFilename(getCurrentGeminiMdFilename());
resetGeminiMdFilename();
}

const fileService = new FileDiscoveryService(cwd);
Expand Down
54 changes: 45 additions & 9 deletions packages/core/src/tools/memoryTool.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import {
import {
MemoryTool,
setGeminiMdFilename,
resetGeminiMdFilename,
getCurrentGeminiMdFilename,
getAllGeminiMdFilenames,
DEFAULT_CONTEXT_FILENAME,
Expand Down Expand Up @@ -77,30 +78,65 @@ describe('MemoryTool', () => {

afterEach(() => {
vi.restoreAllMocks();
setGeminiMdFilename(DEFAULT_CONTEXT_FILENAME);
resetGeminiMdFilename(DEFAULT_CONTEXT_FILENAME);
});

describe('setGeminiMdFilename', () => {
it('should update currentGeminiMdFilename when a valid new name is provided', () => {
it('should append to currentGeminiMdFilename when a valid new name is provided', () => {
const newName = 'CUSTOM_CONTEXT.md';
setGeminiMdFilename(newName);
expect(getCurrentGeminiMdFilename()).toBe(newName);
expect(getAllGeminiMdFilenames()).toEqual([
newName,
DEFAULT_CONTEXT_FILENAME,
]);
});

it('should not update currentGeminiMdFilename if the new name is empty or whitespace', () => {
const initialName = getCurrentGeminiMdFilename();
const initialNames = getAllGeminiMdFilenames();
setGeminiMdFilename(' ');
expect(getCurrentGeminiMdFilename()).toBe(initialName);
expect(getAllGeminiMdFilenames()).toEqual(initialNames);

setGeminiMdFilename('');
expect(getCurrentGeminiMdFilename()).toBe(initialName);
expect(getAllGeminiMdFilenames()).toEqual(initialNames);
});

it('should handle an array of filenames', () => {
it('should handle adding an array of filenames', () => {
const newNames = ['CUSTOM_CONTEXT.md', 'ANOTHER_CONTEXT.md'];
setGeminiMdFilename(newNames);
expect(getCurrentGeminiMdFilename()).toBe('CUSTOM_CONTEXT.md');
expect(getAllGeminiMdFilenames()).toEqual(newNames);
expect(getAllGeminiMdFilenames()).toEqual([
...newNames,
DEFAULT_CONTEXT_FILENAME,
]);
});

it('should ensure uniqueness when adding names', () => {
setGeminiMdFilename(DEFAULT_CONTEXT_FILENAME);
expect(getAllGeminiMdFilenames()).toEqual([DEFAULT_CONTEXT_FILENAME]);

setGeminiMdFilename(['NEW.md', 'NEW.md']);
expect(getAllGeminiMdFilenames()).toEqual([
'NEW.md',
DEFAULT_CONTEXT_FILENAME,
]);
});
});

describe('resetGeminiMdFilename', () => {
it('should replace all filenames with the provided one', () => {
setGeminiMdFilename('OTHER.md');
resetGeminiMdFilename('RESET.md');
expect(getAllGeminiMdFilenames()).toEqual(['RESET.md']);
});

it('should reset to default if no argument provided', () => {
resetGeminiMdFilename('OTHER.md');
resetGeminiMdFilename();
expect(getAllGeminiMdFilenames()).toEqual([DEFAULT_CONTEXT_FILENAME]);
});

it('should handle array reset', () => {
resetGeminiMdFilename(['A.md', 'B.md']);
expect(getAllGeminiMdFilenames()).toEqual(['A.md', 'B.md']);
});
});

Expand Down
68 changes: 61 additions & 7 deletions packages/core/src/tools/memoryTool.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,71 @@ export const DEFAULT_CONTEXT_FILENAME = 'GEMINI.md';
export const MEMORY_SECTION_HEADER = '## Gemini Added Memories';
export const PROJECT_MEMORY_INDEX_FILENAME = 'MEMORY.md';

// This variable will hold the currently configured filename for GEMINI.md context files.
// It defaults to DEFAULT_CONTEXT_FILENAME but can be overridden by setGeminiMdFilename.
// This variable will hold the currently configured filenames for GEMINI.md context files.
// It defaults to DEFAULT_CONTEXT_FILENAME but can be extended by setGeminiMdFilename.
let currentGeminiMdFilename: string | string[] = DEFAULT_CONTEXT_FILENAME;
Comment thread
devr0306 marked this conversation as resolved.
Resolved
Comment thread
devr0306 marked this conversation as resolved.
Resolved

/**
* Adds one or more filenames to the current context filenames.
* Ensures uniqueness and maintains order.
*/
export function setGeminiMdFilename(newFilename: string | string[]): void {
if (Array.isArray(newFilename)) {
if (newFilename.length > 0) {
currentGeminiMdFilename = newFilename.map((name) => name.trim());
const filenames = Array.isArray(newFilename) ? newFilename : [newFilename];
const current = getAllGeminiMdFilenames();
const next = new Set<string>();

for (const filename of filenames) {
const trimmed = filename.trim();
if (trimmed !== '') {
const normalized = path.normalize(trimmed);
// Sanitize to prevent path traversal while allowing subdirectories
if (
!path.isAbsolute(normalized) &&
!normalized.startsWith('..') &&
normalized !== '.'
) {
Comment thread
devr0306 marked this conversation as resolved.
Resolved
next.add(normalized);
}
}
} else if (newFilename && newFilename.trim() !== '') {
currentGeminiMdFilename = newFilename.trim();
}

for (const filename of current) {
next.add(filename);
}

const result = Array.from(next);
if (result.length > 1) {
currentGeminiMdFilename = result;
} else if (result.length === 1) {
currentGeminiMdFilename = result[0];
}
}
Comment thread
devr0306 marked this conversation as resolved.
Resolved
Comment thread
devr0306 marked this conversation as resolved.
Resolved
Comment thread
devr0306 marked this conversation as resolved.
Resolved

/**
* Resets the context filenames to the provided value, or the default if none provided.
* This replaces all current filenames.
*/
export function resetGeminiMdFilename(
filename: string | string[] = DEFAULT_CONTEXT_FILENAME,
): void {
const filenames = Array.isArray(filename) ? filename : [filename];
const cleaned = Array.from(
new Set(
filenames
.map((f) => path.normalize(f.trim()))
.filter(
(f) =>
f !== '' && f !== '.' && !f.startsWith('..') && !path.isAbsolute(f),
),
Comment thread
devr0306 marked this conversation as resolved.
Resolved
),
);

if (cleaned.length === 0) {
currentGeminiMdFilename = DEFAULT_CONTEXT_FILENAME;
} else if (cleaned.length === 1) {
currentGeminiMdFilename = cleaned[0];
} else {
currentGeminiMdFilename = cleaned;
}
}
Comment thread
devr0306 marked this conversation as resolved.
Resolved
Comment thread
devr0306 marked this conversation as resolved.
Resolved
Comment thread
devr0306 marked this conversation as resolved.
Resolved

Expand Down
Loading