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

bug(core): Fix minor bug in migration logic. (#18661)

Browse Source
This commit is contained in:
joshualitt
2026-02-09 12:41:12 -08:00
committed by GitHub
parent bcc0f27594
commit 08dca3e1d6
2 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packages/core/src/config/storageMigration.test.ts
View File

@@ -64,6 +64,25 @@ describe('StorageMigration', () => {
expect(fs.existsSync(path.join(newPath, 'old.txt'))).toBe(false);
});
it('migrates even if new path contains .project_root (ProjectRegistry initialization)', async () => {
const oldPath = path.join(tempDir, 'old-hash');
const newPath = path.join(tempDir, 'new-slug');
fs.mkdirSync(oldPath);
fs.mkdirSync(newPath);
fs.writeFileSync(path.join(oldPath, 'history.db'), 'data');
fs.writeFileSync(path.join(newPath, '.project_root'), 'path');
await StorageMigration.migrateDirectory(oldPath, newPath);
expect(fs.existsSync(path.join(newPath, 'history.db'))).toBe(true);
expect(fs.readFileSync(path.join(newPath, 'history.db'), 'utf8')).toBe(
'data',
);
expect(fs.readFileSync(path.join(newPath, '.project_root'), 'utf8')).toBe(
'path',
);
});
it('creates parent directory for new path if it does not exist', async () => {
const oldPath = path.join(tempDir, 'old-hash');
const newPath = path.join(tempDir, 'sub', 'new-slug');

15
packages/core/src/config/storageMigration.ts
View File

@@ -22,12 +22,21 @@ export class StorageMigration {
newPath: string,
): Promise<void> {
try {
// If the new path already exists, we consider migration done or skipped to avoid overwriting.
// If the old path doesn't exist, there's nothing to migrate.
if (fs.existsSync(newPath) || !fs.existsSync(oldPath)) {
if (!fs.existsSync(oldPath)) {
return;
}
if (fs.existsSync(newPath)) {
const files = await fs.promises.readdir(newPath);
// If it contains more than just the .project_root file, it's not a fresh directory from ProjectRegistry
if (
files.length > 1 ||
(files.length === 1 && files[0] !== '.project_root')
) {
return;
}
}
// Ensure the parent directory of the new path exists
const parentDir = path.dirname(newPath);
await fs.promises.mkdir(parentDir, { recursive: true });