summaryrefslogtreecommitdiff
path: root/packages/cli/src/ui/utils/commandUtils.ts
diff options
context:
space:
mode:
Diffstat (limited to 'packages/cli/src/ui/utils/commandUtils.ts')
-rw-r--r--packages/cli/src/ui/utils/commandUtils.ts30
1 files changed, 21 insertions, 9 deletions
diff --git a/packages/cli/src/ui/utils/commandUtils.ts b/packages/cli/src/ui/utils/commandUtils.ts
index 80ed51ae..089ec339 100644
--- a/packages/cli/src/ui/utils/commandUtils.ts
+++ b/packages/cli/src/ui/utils/commandUtils.ts
@@ -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