From 3ce5569b82a85a3e0ed3d04a35d4b34446e568e4 Mon Sep 17 00:00:00 2001 From: Shantur Rathore Date: Sun, 23 Nov 2025 13:38:50 +0000 Subject: [PATCH] route CLI logs to host processes only --- packages/electron-app/electron/main/ipc.ts | 8 +------- packages/electron-app/electron/preload/index.cjs | 4 ---- packages/tauri-app/src-tauri/src/cli_manager.rs | 2 +- packages/ui/src/types/global.d.ts | 1 - 4 files changed, 2 insertions(+), 13 deletions(-) diff --git a/packages/electron-app/electron/main/ipc.ts b/packages/electron-app/electron/main/ipc.ts index fdaae2f3..32726727 100644 --- a/packages/electron-app/electron/main/ipc.ts +++ b/packages/electron-app/electron/main/ipc.ts @@ -1,5 +1,5 @@ import { BrowserWindow, dialog, ipcMain, type OpenDialogOptions } from "electron" -import type { CliLogEntry, CliProcessManager, CliStatus } from "./process-manager" +import type { CliProcessManager, CliStatus } from "./process-manager" interface DialogOpenRequest { mode: "directory" | "file" @@ -26,12 +26,6 @@ export function setupCliIPC(mainWindow: BrowserWindow, cliManager: CliProcessMan } }) - cliManager.on("log", (entry: CliLogEntry) => { - if (!mainWindow.isDestroyed()) { - mainWindow.webContents.send("cli:log", entry) - } - }) - cliManager.on("error", (error: Error) => { if (!mainWindow.isDestroyed()) { mainWindow.webContents.send("cli:error", { message: error.message }) diff --git a/packages/electron-app/electron/preload/index.cjs b/packages/electron-app/electron/preload/index.cjs index ff2e6831..dfd2ff10 100644 --- a/packages/electron-app/electron/preload/index.cjs +++ b/packages/electron-app/electron/preload/index.cjs @@ -5,10 +5,6 @@ const electronAPI = { ipcRenderer.on("cli:status", (_, data) => callback(data)) return () => ipcRenderer.removeAllListeners("cli:status") }, - onCliLog: (callback) => { - ipcRenderer.on("cli:log", (_, data) => callback(data)) - return () => ipcRenderer.removeAllListeners("cli:log") - }, onCliError: (callback) => { ipcRenderer.on("cli:error", (_, data) => callback(data)) return () => ipcRenderer.removeAllListeners("cli:error") diff --git a/packages/tauri-app/src-tauri/src/cli_manager.rs b/packages/tauri-app/src-tauri/src/cli_manager.rs index 55db8ad0..7272b935 100644 --- a/packages/tauri-app/src-tauri/src/cli_manager.rs +++ b/packages/tauri-app/src-tauri/src/cli_manager.rs @@ -355,7 +355,7 @@ impl CliProcessManager { Ok(_) => { let line = buffer.trim_end(); if !line.is_empty() { - let _ = app.emit("cli:log", json!({"stream": stream, "message": line})); + log_line(&format!("[cli][{}] {}", stream, line)); if ready.load(Ordering::SeqCst) { continue; diff --git a/packages/ui/src/types/global.d.ts b/packages/ui/src/types/global.d.ts index 02897687..fd7907cf 100644 --- a/packages/ui/src/types/global.d.ts +++ b/packages/ui/src/types/global.d.ts @@ -21,7 +21,6 @@ declare global { interface ElectronAPI { onCliStatus?: (callback: (data: unknown) => void) => () => void - onCliLog?: (callback: (data: unknown) => void) => () => void onCliError?: (callback: (data: unknown) => void) => () => void getCliStatus?: () => Promise openDialog?: (options: ElectronDialogOptions) => Promise