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

fix: copy command gets stuck (#6482)

Browse Source 
Co-authored-by: Hriday Taneja <hridayt@google.com>
This commit is contained in:
hritan
2025-08-20 18:42:42 +00:00
committed by GitHub
parent 716297fb32
commit fd64d89da0
2 changed files with 45 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
packages/cli/src/ui/utils/commandUtils.ts
View File

@@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
import { spawn } from 'child_process';
import { spawn, SpawnOptions } from 'child_process';
/**
* Checks if a query string potentially represents an '@' command.
@@ -29,11 +29,13 @@ export const isSlashCommand = (query: string): boolean => query.startsWith('/');
// Copies a string snippet to the clipboard for different platforms
export const copyToClipboard = async (text: string): Promise<void> => {
const run = (cmd: string, args: string[]) =>
const run = (cmd: string, args: string[], options?: SpawnOptions) =>
new Promise<void>((resolve, reject) => {
const child = spawn(cmd, args);
const child = options ? spawn(cmd, args, options) : spawn(cmd, args);
let stderr = '';
child.stderr.on('data', (chunk) => (stderr += chunk.toString()));
if (child.stderr) {
child.stderr.on('data', (chunk) => (stderr += chunk.toString()));
}
child.on('error', reject);
child.on('close', (code) => {
if (code === 0) return resolve();
@@ -44,11 +46,21 @@ export const copyToClipboard = async (text: string): Promise<void> => {
),
);
});
child.stdin.on('error', reject);
child.stdin.write(text);
child.stdin.end();
if (child.stdin) {
child.stdin.on('error', reject);
child.stdin.write(text);
child.stdin.end();
} else {
reject(new Error('Child process has no stdin stream to write to.'));
}
});
// Configure stdio for Linux clipboard commands.
// - stdin: 'pipe' to write the text that needs to be copied.
// - stdout: 'inherit' since we don't need to capture the command's output on success.
// - stderr: 'pipe' to capture error messages (e.g., "command not found") for better error handling.
const linuxOptions: SpawnOptions = { stdio: ['pipe', 'inherit', 'pipe'] };
switch (process.platform) {
case 'win32':
return run('clip', []);
@@ -56,11 +68,11 @@ export const copyToClipboard = async (text: string): Promise<void> => {
return run('pbcopy', []);
case 'linux':
try {
await run('xclip', ['-selection', 'clipboard']);
await run('xclip', ['-selection', 'clipboard'], linuxOptions);
} catch (primaryError) {
try {
// If xclip fails for any reason, try xsel as a fallback.
await run('xsel', ['--clipboard', '--input']);
await run('xsel', ['--clipboard', '--input'], linuxOptions);
} catch (fallbackError) {
const primaryMsg =
primaryError instanceof Error