From 5db9942125d4997006425e1cfcdcea2ca2940286 Mon Sep 17 00:00:00 2001 From: Mohamed Boudra Date: Sun, 5 Apr 2026 00:53:46 +0700 Subject: [PATCH] fix(desktop): restore daemon QR pairing output --- packages/desktop/src/daemon/runtime-paths.ts | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/desktop/src/daemon/runtime-paths.ts b/packages/desktop/src/daemon/runtime-paths.ts index b20c84f81..88615f942 100644 --- a/packages/desktop/src/daemon/runtime-paths.ts +++ b/packages/desktop/src/daemon/runtime-paths.ts @@ -223,7 +223,7 @@ function createCliInvocation(args: string[]): NodeEntrypointInvocation { const cli = resolveCliEntrypoint(); return createNodeEntrypointInvocation({ entrypoint: cli, - argvMode: "bare", + argvMode: "node-script", args, baseEnv: process.env, }); @@ -304,8 +304,16 @@ export async function runCliJsonCommand(args: string[]): Promise { throw new Error("CLI command did not produce JSON output."); } + // The stdout may contain non-JSON preamble (e.g. Node deprecation warnings). + // Extract the first valid JSON object or array from the output. + const jsonStart = stdout.search(/[{[]/); + if (jsonStart < 0) { + throw new Error("CLI command output contained no JSON."); + } + const jsonText = stdout.slice(jsonStart); + try { - return JSON.parse(stdout) as unknown; + return JSON.parse(jsonText) as unknown; } catch (error) { throw new Error( `CLI command returned invalid JSON: ${error instanceof Error ? error.message : String(error)}`,