Improve desktop task run feedback

Author: chenbo

apps/desktop/src/main/main.ts

@@ -1,4 +1,4 @@
-import { spawn, type ChildProcessWithoutNullStreams } from "node:child_process";
+import { spawn, type ChildProcess } from "node:child_process";
 import { existsSync, readdirSync, statSync } from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
@@ -22,7 +22,7 @@ interface RunTaskRejected {
 type RunTaskResult = RunTaskStarted | RunTaskRejected;
 
 let mainWindow: BrowserWindow | undefined;
-let currentTask: ChildProcessWithoutNullStreams | undefined;
+let currentTask: ChildProcess | undefined;
 let currentRepo: string | undefined;
 
 const __filename = fileURLToPath(import.meta.url);
@@ -66,7 +66,7 @@ function registerIpc(): void {
   ipcMain.handle("task:run", (_event, input: RunTaskInput): RunTaskResult => {
     if (currentTask) return { error: "A task is already running." };
     const repo = input.repo.trim();
-    const task = input.task.trim();
+    const task = normalizeTaskForCli(input.task);
     if (!repo) return { error: "Select a repository first." };
     if (!task) return { error: "Enter a task first." };
     if (!existsSync(repo)) return { error: `Repository does not exist: ${repo}` };
@@ -76,23 +76,36 @@ function registerIpc(): void {
     currentRepo = repo;
     currentTask = spawn(command, args, {
       cwd: repo,
-      shell: false,
+      env: process.env,
+      shell: process.platform === "win32",
       windowsHide: true
     });
 
-    currentTask.stdout.on("data", (chunk: Buffer) => {
+    mainWindow?.webContents.send("task:output", { stream: "system", text: `Starting: ${formatCommand(command, args)}\n` });
+
+    currentTask.stdout?.on("data", (chunk: Buffer) => {
       mainWindow?.webContents.send("task:output", { stream: "stdout", text: chunk.toString("utf8") });
     });
 
-    currentTask.stderr.on("data", (chunk: Buffer) => {
+    currentTask.stderr?.on("data", (chunk: Buffer) => {
       mainWindow?.webContents.send("task:output", { stream: "stderr", text: chunk.toString("utf8") });
     });
 
+    let finished = false;
     currentTask.once("error", (error) => {
+      finished = true;
+      currentTask = undefined;
       mainWindow?.webContents.send("task:output", { stream: "stderr", text: `${error.message}\n` });
+      mainWindow?.webContents.send("task:exit", {
+        code: null,
+        signal: "spawn-error",
+        error: error.message
+      });
     });
 
     currentTask.once("close", (code, signal) => {
+      if (finished) return;
+      finished = true;
       const reportPath = currentRepo ? findLatestReport(currentRepo) : undefined;
       currentTask = undefined;
       mainWindow?.webContents.send("task:exit", {
@@ -140,6 +153,18 @@ function findLatestReport(repo: string): string | undefined {
   return candidates[0]?.file;
 }
 
+function formatCommand(command: string, args: string[]): string {
+  return [command, ...args].map(quoteArg).join(" ");
+}
+
+function normalizeTaskForCli(task: string): string {
+  return task.trim().replace(/\s+/gu, " ");
+}
+
+function quoteArg(value: string): string {
+  return /[\s"]/u.test(value) ? `"${value.replaceAll('"', '\\"').replaceAll("\n", "\\n")}"` : value;
+}
+
 registerIpc();
 
 app

apps/desktop/src/main/preload.cts

@@ -1,7 +1,7 @@
 import { contextBridge, ipcRenderer, type IpcRendererEvent } from "electron";
 
-type TaskOutputHandler = (event: { stream: "stdout" | "stderr"; text: string }) => void;
-type TaskExitHandler = (event: { code: number | null; signal: string | null; reportPath?: string }) => void;
+type TaskOutputHandler = (event: { stream: "stdout" | "stderr" | "system"; text: string }) => void;
+type TaskExitHandler = (event: { code: number | null; signal: string | null; reportPath?: string; error?: string }) => void;
 
 contextBridge.exposeInMainWorld("openCodePlusPlus", {
   selectRepo: () => ipcRenderer.invoke("repo:select") as Promise<string | undefined>,
@@ -11,12 +11,13 @@ contextBridge.exposeInMainWorld("openCodePlusPlus", {
   getLatestReport: (repo: string) => ipcRenderer.invoke("report:latest", repo) as Promise<string | undefined>,
   openLatestReport: (repo: string) => ipcRenderer.invoke("report:open", repo) as Promise<{ opened: boolean; path?: string; error?: string }>,
   onTaskOutput: (handler: TaskOutputHandler) => {
-    const listener = (_event: IpcRendererEvent, payload: { stream: "stdout" | "stderr"; text: string }) => handler(payload);
+    const listener = (_event: IpcRendererEvent, payload: { stream: "stdout" | "stderr" | "system"; text: string }) => handler(payload);
     ipcRenderer.on("task:output", listener);
     return () => ipcRenderer.off("task:output", listener);
   },
   onTaskExit: (handler: TaskExitHandler) => {
-    const listener = (_event: IpcRendererEvent, payload: { code: number | null; signal: string | null; reportPath?: string }) => handler(payload);
+    const listener = (_event: IpcRendererEvent, payload: { code: number | null; signal: string | null; reportPath?: string; error?: string }) =>
+      handler(payload);
     ipcRenderer.on("task:exit", listener);
     return () => ipcRenderer.off("task:exit", listener);
   }

apps/desktop/src/preload/global.d.ts

@@ -8,8 +8,8 @@ declare global {
       stopTask: () => Promise<{ stopped: boolean }>;
       getLatestReport: (repo: string) => Promise<string | undefined>;
       openLatestReport: (repo: string) => Promise<{ opened: boolean; path?: string; error?: string }>;
-      onTaskOutput: (handler: (event: { stream: "stdout" | "stderr"; text: string }) => void) => () => void;
-      onTaskExit: (handler: (event: { code: number | null; signal: string | null; reportPath?: string }) => void) => () => void;
+      onTaskOutput: (handler: (event: { stream: "stdout" | "stderr" | "system"; text: string }) => void) => () => void;
+      onTaskExit: (handler: (event: { code: number | null; signal: string | null; reportPath?: string; error?: string }) => void) => () => void;
     };
   }
 }

apps/desktop/src/renderer/src/App.tsx

@@ -27,8 +27,15 @@ function App() {
     const offExit = bridge.onTaskExit((event) => {
       setRunning(false);
       setReportPath(event.reportPath);
+      if (event.error) {
+        appendLog("stderr", `${event.error}\n`);
+      }
       appendLog("system", `\nTask exited with ${event.code === null ? `signal ${event.signal ?? "unknown"}` : `code ${event.code}`}\n`);
-      setStatus(event.reportPath ? "Task finished. A report is ready to open." : "Task finished. No report was found yet.");
+      if (event.error) {
+        setStatus(`Task failed to start: ${event.error}`);
+      } else {
+        setStatus(event.reportPath ? "Task finished. A report is ready to open." : "Task finished. No report was found yet.");
+      }
     });
     return () => {
       offOutput();
@@ -41,8 +48,9 @@ function App() {
   }, [logs]);
 
   const commandPreview = useMemo(() => {
-    if (!repo || !task.trim()) return 'opencode-plusplus.cmd oc run "<task>" --repo "<repo>" --max-loops 2';
-    return `opencode-plusplus.cmd oc run "${task.trim()}" --repo "${repo}" --max-loops 2`;
+    const normalizedTask = normalizeTaskForCli(task);
+    if (!repo || !normalizedTask) return 'opencode-plusplus.cmd oc run "<task>" --repo "<repo>" --max-loops 2';
+    return `opencode-plusplus.cmd oc run "${normalizedTask}" --repo "${repo}" --max-loops 2`;
   }, [repo, task]);
 
   if (!bridge) {
@@ -77,15 +85,25 @@ function App() {
   async function runTask(): Promise<void> {
     setLogs([]);
     setReportPath(undefined);
-    const result = await bridge.runTask({ repo, task });
-    if (result.error) {
-      appendLog("stderr", `${result.error}\n`);
-      setStatus(result.error);
-      return;
-    }
     setRunning(true);
-    setStatus(`Running task with PID ${result.pid ?? "unknown"}.`);
-    appendLog("system", `$ ${result.command} ${(result.args ?? []).map(quoteArg).join(" ")}\n\n`);
+    setStatus("Starting task...");
+    appendLog("system", "Starting task...\n");
+    try {
+      const result = await bridge.runTask({ repo, task });
+      if (result.error) {
+        setRunning(false);
+        appendLog("stderr", `${result.error}\n`);
+        setStatus(result.error);
+        return;
+      }
+      setStatus(`Running task with PID ${result.pid ?? "unknown"}.`);
+      appendLog("system", `$ ${result.command} ${(result.args ?? []).map(quoteArg).join(" ")}\n\n`);
+    } catch (error) {
+      setRunning(false);
+      const message = error instanceof Error ? error.message : String(error);
+      appendLog("stderr", `${message}\n`);
+      setStatus(`Task failed to start: ${message}`);
+    }
   }
 
   async function stopTask(): Promise<void> {
@@ -185,7 +203,11 @@ function App() {
 }
 
 function quoteArg(value: string): string {
-  return /\s/.test(value) ? `"${value.replaceAll('"', '\\"')}"` : value;
+  return /\s/u.test(value) ? `"${value.replaceAll('"', '\\"').replaceAll("\n", "\\n")}"` : value;
+}
+
+function normalizeTaskForCli(task: string): string {
+  return task.trim().replace(/\s+/gu, " ");
 }
 
 createRoot(document.getElementById("root") as HTMLElement).render(<App />);