Address feedback

Author: joshualitt

package-lock.json

@@ -86,6 +86,7 @@
     "@types/minimatch": "^5.1.2",
     "@types/mock-fs": "^4.13.4",
     "@types/prompts": "^2.4.9",
+    "@types/proper-lockfile": "^4.1.4",
     "@types/react": "^19.2.0",
     "@types/react-dom": "^19.2.0",
     "@types/shell-quote": "^1.7.5",
@@ -126,6 +127,7 @@
   "dependencies": {
     "ink": "npm:@jrichman/[email protected]",
     "latest-version": "^9.0.0",
+    "proper-lockfile": "^4.1.2",
     "simple-git": "^3.28.0"
   },
   "optionalDependencies": {

package.json

@@ -55,6 +55,9 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
         'shell_history',
       );
     }
+    initialize(): Promise<undefined> {
+      return Promise.resolve(undefined);
+    }
   }
   return {
     ...actual,

packages/cli/src/ui/hooks/useShellHistory.test.ts

@@ -24,6 +24,7 @@ async function getHistoryFilePath(
   configStorage?: Storage,
 ): Promise<string> {
   const storage = configStorage ?? new Storage(projectRoot);
+  await storage.initialize();
   return storage.getHistoryFilePath();
 }
 

packages/cli/src/ui/hooks/useShellHistory.ts

@@ -45,6 +45,7 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
     },
     Storage: class {
       getProjectTempDir = vi.fn(() => '/tmp/global');
+      initialize = vi.fn(() => Promise.resolve(undefined));
     },
   };
 });

packages/cli/src/ui/utils/clipboardUtils.test.ts

@@ -256,8 +256,11 @@ const saveFileWithXclip = async (tempFilePath: string) => {
  * @param targetDir The root directory of the current project.
  * @returns The absolute path to the images directory.
  */
-function getProjectClipboardImagesDir(targetDir: string): string {
+async function getProjectClipboardImagesDir(
+  targetDir: string,
+): Promise<string> {
   const storage = new Storage(targetDir);
+  await storage.initialize();
   const baseDir = storage.getProjectTempDir();
   return path.join(baseDir, 'images');
 }
@@ -271,7 +274,7 @@ export async function saveClipboardImage(
   targetDir: string,
 ): Promise<string | null> {
   try {
-    const tempDir = getProjectClipboardImagesDir(targetDir);
+    const tempDir = await getProjectClipboardImagesDir(targetDir);
     await fs.mkdir(tempDir, { recursive: true });
 
     // Generate a unique filename with timestamp
@@ -396,7 +399,7 @@ export async function cleanupOldClipboardImages(
   targetDir: string,
 ): Promise<void> {
   try {
-    const tempDir = getProjectClipboardImagesDir(targetDir);
+    const tempDir = await getProjectClipboardImagesDir(targetDir);
     const files = await fs.readdir(tempDir);
     const oneHourAgo = Date.now() - 60 * 60 * 1000;
 

packages/cli/src/ui/utils/clipboardUtils.ts

@@ -18,6 +18,7 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
     spawnAsync: vi.fn(),
     Storage: class {
       getProjectTempDir = vi.fn(() => "C:\\User's Files");
+      initialize = vi.fn(() => Promise.resolve(undefined));
     },
   };
 });

packages/cli/src/ui/utils/clipboardUtils.windows.test.ts

@@ -11,6 +11,7 @@ import * as path from 'node:path';
 vi.mock('@google/gemini-cli-core', () => ({
   Storage: vi.fn().mockImplementation(() => ({
     getProjectTempDir: vi.fn().mockReturnValue('/tmp/project'),
+    initialize: vi.fn().mockResolvedValue(undefined),
   })),
   shutdownTelemetry: vi.fn(),
   isTelemetrySdkInitialized: vi.fn().mockReturnValue(false),

packages/cli/src/utils/cleanup.test.ts

@@ -102,6 +102,7 @@ async function drainStdin() {
 
 export async function cleanupCheckpoints() {
   const storage = new Storage(process.cwd());
+  await storage.initialize();
   const tempDir = storage.getProjectTempDir();
   const checkpointsDir = join(tempDir, 'checkpoints');
   try {

packages/cli/src/utils/cleanup.ts

@@ -348,8 +348,12 @@ export async function cleanupToolOutputFiles(
     }
 
     const retentionConfig = settings.general.sessionRetention;
-    const tempDir =
-      projectTempDir ?? new Storage(process.cwd()).getProjectTempDir();
+    let tempDir = projectTempDir;
+    if (!tempDir) {
+      const storage = new Storage(process.cwd());
+      await storage.initialize();
+      tempDir = storage.getProjectTempDir();
+    }
     const toolOutputDir = path.join(tempDir, TOOL_OUTPUT_DIR);
 
     // Check if directory exists