From ae2e6896da710ac10aa59003adf7c8dcd4d885cd Mon Sep 17 00:00:00 2001 From: Peter Steinberger Date: Thu, 19 Feb 2026 00:20:10 +0000 Subject: [PATCH] refactor(hooks): dedupe command result formatting --- src/hooks/gmail-setup-utils.ts | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/src/hooks/gmail-setup-utils.ts b/src/hooks/gmail-setup-utils.ts index 1e57fdc735..95188ce0e5 100644 --- a/src/hooks/gmail-setup-utils.ts +++ b/src/hooks/gmail-setup-utils.ts @@ -23,13 +23,17 @@ function trimOutput(value: string): string { return `${trimmed.slice(0, MAX_OUTPUT_CHARS)}…`; } -function formatCommandFailure(command: string, result: SpawnResult): string { +function formatCommandResultInternal( + command: string, + result: SpawnResult, + statusLabel: "failed" | "exited", +): string { const code = result.code ?? "null"; const signal = result.signal ? `, signal=${result.signal}` : ""; const killed = result.killed ? ", killed=true" : ""; const stderr = trimOutput(result.stderr); const stdout = trimOutput(result.stdout); - const lines = [`${command} failed (code=${code}${signal}${killed})`]; + const lines = [`${command} ${statusLabel} (code=${code}${signal}${killed})`]; if (stderr) { lines.push(`stderr: ${stderr}`); } @@ -39,20 +43,12 @@ function formatCommandFailure(command: string, result: SpawnResult): string { return lines.join("\n"); } +function formatCommandFailure(command: string, result: SpawnResult): string { + return formatCommandResultInternal(command, result, "failed"); +} + function formatCommandResult(command: string, result: SpawnResult): string { - const code = result.code ?? "null"; - const signal = result.signal ? `, signal=${result.signal}` : ""; - const killed = result.killed ? ", killed=true" : ""; - const stderr = trimOutput(result.stderr); - const stdout = trimOutput(result.stdout); - const lines = [`${command} exited (code=${code}${signal}${killed})`]; - if (stderr) { - lines.push(`stderr: ${stderr}`); - } - if (stdout) { - lines.push(`stdout: ${stdout}`); - } - return lines.join("\n"); + return formatCommandResultInternal(command, result, "exited"); } function formatJsonParseFailure(command: string, result: SpawnResult, err: unknown): string {