Improve clipboard image pasting: sequential numbering and PowerShell support

- Changed image filenames from timestamp-based (clipboard-1234567890.png) to sequential numbering (image-1.png, image-2.png)
- Updated display format to show friendly labels: [image #1] @path instead of just @path
- Added Shift+Insert as alternative paste key binding for PowerShell compatibility (PowerShell intercepts Ctrl+V)
- Updated cleanup function to handle both old and new filename formats

This addresses the PowerShell Ctrl+V limitation and improves UX with clearer image references.

Author: prajwalr308

packages/cli/src/config/keyBindings.ts

@@ -192,7 +192,10 @@ export const defaultKeyBindings: KeyBindingConfig = {
     { key: 'x', ctrl: true },
     { sequence: '\x18', ctrl: true },
   ],
-  [Command.PASTE_CLIPBOARD]: [{ key: 'v', ctrl: true }],
+  [Command.PASTE_CLIPBOARD]: [
+    { key: 'v', ctrl: true },
+    { key: 'insert', shift: true },
+  ],
 
   // App level bindings
   [Command.SHOW_ERROR_DETAILS]: [{ key: 'f12' }],

packages/cli/src/ui/components/InputPrompt.tsx

@@ -334,12 +334,17 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
           // Get relative path from current directory
           const relativePath = path.relative(config.getTargetDir(), imagePath);
 
-          // Insert @path reference at cursor position
-          const insertText = `@${relativePath}`;
+          // Extract image number from filename (e.g., "image-1.png" -> 1)
+          const filename = path.basename(imagePath);
+          const imageNumberMatch = filename.match(/image-(\d+)\./);
+          const imageNumber = imageNumberMatch ? imageNumberMatch[1] : '?';
+
+          // Insert with friendly label: [image #1] @path
+          const insertText = `[image #${imageNumber}] @${relativePath}`;
           const currentText = buffer.text;
           const offset = buffer.getOffset();
 
-          // Add spaces around the path if needed
+          // Add spaces around the text if needed
           let textToInsert = insertText;
           const charBefore = offset > 0 ? currentText[offset - 1] : '';
           const charAfter =

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

@@ -86,6 +86,35 @@ async function wslClipboardHasImage(): Promise<boolean> {
   }
 }
 
+/**
+ * Gets the next available image number by checking existing files
+ * @param targetDir The target directory
+ * @returns The next image number
+ */
+async function getNextImageNumber(targetDir: string): Promise<number> {
+  try {
+    const tempDir = path.join(targetDir, '.gemini-clipboard');
+    await fs.mkdir(tempDir, { recursive: true });
+
+    const files = await fs.readdir(tempDir);
+    const imageFiles = files.filter((f) => f.match(/^image-(\d+)\.png$/));
+
+    if (imageFiles.length === 0) {
+      return 1;
+    }
+
+    // Extract numbers and find the max
+    const numbers = imageFiles.map((f) => {
+      const match = f.match(/^image-(\d+)\.png$/);
+      return match ? parseInt(match[1], 10) : 0;
+    });
+
+    return Math.max(...numbers) + 1;
+  } catch {
+    return 1;
+  }
+}
+
 /**
  * Saves clipboard image using PowerShell (WSL)
  * @param targetDir The target directory to save the image
@@ -106,9 +135,9 @@ async function wslSaveClipboardImage(
     const tempDir = path.join(baseDir, '.gemini-clipboard');
     await fs.mkdir(tempDir, { recursive: true });
 
-    // Generate unique filename
-    const timestamp = new Date().getTime();
-    const wslPath = path.join(tempDir, `clipboard-${timestamp}.png`);
+    // Get next image number
+    const imageNumber = await getNextImageNumber(baseDir);
+    const wslPath = path.join(tempDir, `image-${imageNumber}.png`);
 
     // Convert WSL path to Windows path for PowerShell
     const { stdout: winPath } = await spawnAsync('wslpath', ['-w', wslPath]);
@@ -269,14 +298,14 @@ export async function saveClipboardImage(
     const tempDir = path.join(baseDir, '.gemini-clipboard');
     await fs.mkdir(tempDir, { recursive: true });
 
-    // Generate a unique filename with timestamp
-    const timestamp = new Date().getTime();
+    // Get next image number
+    const imageNumber = await getNextImageNumber(baseDir);
 
     // Detect image format from magic bytes
     const extension = detectImageFormat(base64Data);
     const tempFilePath = path.join(
       tempDir,
-      `clipboard-${timestamp}.${extension}`,
+      `image-${imageNumber}.${extension}`,
     );
 
     // Convert base64 to buffer and save to file
@@ -317,14 +346,9 @@ export async function cleanupOldClipboardImages(
 
     for (const file of files) {
       if (
-        file.startsWith('clipboard-') &&
-        (file.endsWith('.png') ||
-          file.endsWith('.jpg') ||
-          file.endsWith('.jpeg') ||
-          file.endsWith('.tiff') ||
-          file.endsWith('.gif') ||
-          file.endsWith('.bmp') ||
-          file.endsWith('.webp'))
+        file.match(
+          /^(clipboard-\d+|image-\d+)\.(png|jpg|jpeg|tiff|gif|bmp|webp)$/,
+        )
       ) {
         const filePath = path.join(tempDir, file);
         const stats = await fs.stat(filePath);