add log date

Author: pchalamet

src/Terrabuild.UI/src/App.tsx

@@ -103,6 +103,7 @@ const App = () => {
     Record<string, { x: number; y: number }>
   >({});
   const [draggedNodeId, setDraggedNodeId] = useState<string | null>(null);
+  const [buildStartedAt, setBuildStartedAt] = useState<Date | null>(null);
   const [nodes, setNodes] = useNodesState([]);
   const [edges, setEdges, onEdgesChange] = useEdgesState([]);
   const flowInstance = useRef<ReactFlowInstance | null>(null);
@@ -121,6 +122,7 @@ const App = () => {
     null
   );
   const pendingBuildLogRef = useRef(false);
+  const lastApiNoticeRef = useRef(0);
   const applyTerminalTheme = () => {
     if (!terminal.current || !terminalReady.current) {
       return;
@@ -138,6 +140,19 @@ const App = () => {
         effectiveColorScheme === "dark" ? "#3b3f45" : "#c9d0d8",
     };
   };
+
+  const notifyApiUnavailable = () => {
+    const now = Date.now();
+    if (now - lastApiNoticeRef.current < 15000) {
+      return;
+    }
+    lastApiNoticeRef.current = now;
+    notifications.show({
+      color: "red",
+      title: "API unavailable",
+      message: "Unable to reach the Terrabuild API.",
+    });
+  };
   const flushPendingTerminalActions = () => {
     if (!terminalReady.current) {
       return;
@@ -278,15 +293,23 @@ const App = () => {
 
   useEffect(() => {
     const load = async () => {
-      const [targetsRes, projectsRes] = await Promise.all([
-        fetch("/api/targets"),
-        fetch("/api/projects"),
-      ]);
-      if (targetsRes.ok) {
-        setTargets(await targetsRes.json());
-      }
-      if (projectsRes.ok) {
-        setProjects(await projectsRes.json());
+      try {
+        const [targetsRes, projectsRes] = await Promise.all([
+          fetch("/api/targets"),
+          fetch("/api/projects"),
+        ]);
+        if (targetsRes.ok) {
+          setTargets(await targetsRes.json());
+        } else {
+          notifyApiUnavailable();
+        }
+        if (projectsRes.ok) {
+          setProjects(await projectsRes.json());
+        } else {
+          notifyApiUnavailable();
+        }
+      } catch {
+        notifyApiUnavailable();
       }
     };
     load().catch(() => null);
@@ -345,6 +368,7 @@ const App = () => {
     fetchGraph().catch(() => {
       setGraphError("Failed to load graph.");
       setGraph(null);
+      notifyApiUnavailable();
     });
   }, [selectedTargets, selectedProjects, configuration, environment, engine]);
 
@@ -510,7 +534,14 @@ const App = () => {
     const controller = new AbortController();
     logAbort.current = controller;
 
-    const response = await fetch("/api/build/log", { signal: controller.signal });
+    let response: Response;
+    try {
+      response = await fetch("/api/build/log", { signal: controller.signal });
+    } catch {
+      notifyApiUnavailable();
+      setBuildRunning(false);
+      return;
+    }
     if (!response.body) {
       return;
     }
@@ -632,6 +663,7 @@ const App = () => {
         message: "Build command copied to clipboard.",
       });
     } catch {
+      notifyApiUnavailable();
       notifications.show({
         color: "red",
         title: "Copy failed",
@@ -647,13 +679,22 @@ const App = () => {
     setBuildRunning(true);
     setBuildError(null);
     const payload = buildPayload();
-    const response = await fetch("/api/build", {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify(payload),
-    });
+    let response: Response;
+    try {
+      response = await fetch("/api/build", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify(payload),
+      });
+    } catch {
+      setBuildRunning(false);
+      setBuildStartedAt(null);
+      notifyApiUnavailable();
+      return;
+    }
     if (!response.ok) {
       setBuildRunning(false);
+      setBuildStartedAt(null);
       const message = await response.text();
       setBuildError(message);
       notifications.show({
@@ -663,13 +704,15 @@ const App = () => {
       });
       return;
     }
+    setBuildStartedAt(null);
     notifications.show({
       color: "blue",
       title: "Build started",
       message: "Build is running.",
     });
     startLogStream().catch(() => {
       setBuildRunning(false);
+      notifyApiUnavailable();
       notifications.show({
         color: "red",
         title: "Build failed",
@@ -708,7 +751,9 @@ const App = () => {
         setProjectStatus(statusMap);
       }
     };
-    refresh().catch(() => null);
+    refresh().catch(() => {
+      notifyApiUnavailable();
+    });
   }, [
     buildRunning,
     selectedTargets,
@@ -749,6 +794,12 @@ const App = () => {
     if (!terminal.current) {
       return;
     }
+    const summary = nodeResults[key];
+    if (summary?.startedAt) {
+      setBuildStartedAt(new Date(summary.startedAt));
+    } else {
+      setBuildStartedAt(null);
+    }
     setSelectedTargetKey(key);
     terminal.current.reset();
     setShowTerminal(true);
@@ -779,6 +830,16 @@ const App = () => {
     await loadTargetLog(key, target);
   };
 
+  useEffect(() => {
+    if (!selectedTargetKey) {
+      return;
+    }
+    const summary = nodeResults[selectedTargetKey];
+    if (summary?.startedAt) {
+      setBuildStartedAt(new Date(summary.startedAt));
+    }
+  }, [selectedTargetKey, nodeResults]);
+
   const handleNodesChange: OnNodesChange = (changes) => {
     setNodes((current) => {
       const updated = applyNodeChanges(changes, current);
@@ -796,6 +857,13 @@ const App = () => {
 
   const terminalBackground =
     effectiveColorScheme === "dark" ? theme.colors.dark[7] : theme.white;
+  const buildLogTitle = buildStartedAt
+    ? `Build Log ${buildStartedAt
+        .toISOString()
+        .replace("T", " ")
+        .replace("Z", "")
+        .slice(0, 19)}`
+    : "Build Log";
 
   return (
     <AppShell
@@ -917,6 +985,7 @@ const App = () => {
           <BuildLogPanel
             showTerminal={showTerminal}
             buildRunning={buildRunning}
+            title={buildLogTitle}
             onHide={() => setShowTerminal(false)}
             terminalRef={terminalRef}
             background={terminalBackground}

src/Terrabuild.UI/src/components/BuildLogPanel.tsx

@@ -5,6 +5,7 @@ import { RefObject } from "react";
 type BuildLogPanelProps = {
   showTerminal: boolean;
   buildRunning: boolean;
+  title: string;
   onHide: () => void;
   terminalRef: RefObject<HTMLDivElement | null>;
   background: string;
@@ -13,6 +14,7 @@ type BuildLogPanelProps = {
 const BuildLogPanel = ({
   showTerminal,
   buildRunning,
+  title,
   onHide,
   terminalRef,
   background,
@@ -35,7 +37,7 @@ const BuildLogPanel = ({
     >
       {showTerminal && (
         <Group justify="space-between" align="center" mb="sm">
-          <Title order={4}>Build Log</Title>
+          <Title order={4}>{title}</Title>
           <Group spacing="xs" align="center" justify="flex-end">
             <Badge color={buildRunning ? "orange" : "gray"}>
               {buildRunning ? "Live" : "Idle"}

src/Terrabuild/Helpers/Exec.fs

@@ -168,16 +168,18 @@ let execCaptureTimestampedOutput (workingDir: string) (command: string) (args: s
     try
         use logWriter = new StreamWriter(logFile)
         let writeLock = Lock()
-
-        let inline lockWrite (from: string) (msg: string | null) =
+        let inline lockWrite (msg: string | null) =
             match msg with
-            | NonNull msg -> lock writeLock (fun () -> logWriter.WriteLine($"{DateTime.UtcNow} {from} {msg}"))
+            | NonNull msg ->
+                lock writeLock (fun () ->
+                    logWriter.WriteLine(msg)
+                )
             | _ -> ()
 
         Log.Debug("Running and capturing timestamped output of '{Command}' with arguments '{Args}' in working dir '{WorkingDir}'", command, args, workingDir)
         use proc = createProcess workingDir command args envs true
-        proc.OutputDataReceived.Add(fun e -> lockWrite "OUT" e.Data)
-        proc.ErrorDataReceived.Add(fun e -> lockWrite "ERR" e.Data)
+        proc.OutputDataReceived.Add(fun e -> lockWrite e.Data)
+        proc.ErrorDataReceived.Add(fun e -> lockWrite e.Data)
         proc.BeginOutputReadLine()
         proc.BeginErrorReadLine()
         proc.WaitForExit()

src/Terrabuild/Web/GraphServer.fs

@@ -582,7 +582,7 @@ let start (graphArgs: ParseResults<GraphArgs>) (logEnabled: bool) (debugEnabled:
                             let content = IO.readTextFile step.Log
                             if String.IsNullOrWhiteSpace(content) |> not then
                                 if builder.Length > 0 then builder.AppendLine().AppendLine() |> ignore
-                                builder.AppendLine(step.MetaCommand).AppendLine(content) |> ignore
+                                builder.AppendLine(content) |> ignore
                     )
                     let logText = builder.ToString()
                     Results.Text(logText, "text/plain")