Merge pull request #36 from BjornMelin/refactor/client-error-parsing

refactor(ui): DRY JSON error parsing + accessible confirms

Author: BjornMelin

.github/actions/ci-setup/action.yml

@@ -8,9 +8,9 @@ inputs:
     default: "24.x"
 
   bun-version:
-    description: "Bun version to install (default: 1.3.7)"
+    description: "Bun version to install (default: 1.3.9)"
     required: false
-    default: "1.3.7"
+    default: "1.3.9"
 
   bun-download-url:
     description: "Optional Bun download URL override (avoids GitHub API tag fetch). If omitted, defaults to the Bun baseline Linux x64 release asset for the selected bun-version."
@@ -21,7 +21,7 @@ runs:
   using: composite
   steps:
     - name: Setup Node.js
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v6.2.0
       with:
         node-version: ${{ inputs.node-version }}
 

.github/workflows/ci.yml

@@ -72,7 +72,7 @@ jobs:
 
       - name: Upload blob report
         if: ${{ !cancelled() }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6.0.0
         with:
           name: blob-report-${{ matrix.shardIndex }}
           path: .vitest-reports/blob/${{ matrix.shardIndex }}.json
@@ -93,7 +93,7 @@ jobs:
         uses: ./.github/actions/ci-setup
 
       - name: Download blob reports
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7.0.0
         with:
           pattern: blob-report-*
           path: .vitest-reports/blob
@@ -104,7 +104,7 @@ jobs:
 
       - name: Upload JUnit report
         if: ${{ !cancelled() }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6.0.0
         with:
           name: vitest-junit
           path: .vitest-reports/junit.xml

.github/workflows/codeql.yml

@@ -27,16 +27,16 @@ jobs:
         uses: actions/checkout@v6.0.2
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v4.32.0
+        uses: github/codeql-action/init@v4.32.2
         with:
           languages: ${{ matrix.language }}
           queries: security-extended
           config-file: ./.github/codeql/codeql-config.yml
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v4.32.0
+        uses: github/codeql-action/autobuild@v4.32.2
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v4.32.0
+        uses: github/codeql-action/analyze@v4.32.2
         with:
           category: "/language:${{ matrix.language }}"

.github/workflows/scorecard.yml

@@ -40,6 +40,6 @@ jobs:
           retention-days: 5
 
       - name: Upload to code-scanning
-        uses: github/codeql-action/upload-sarif@v4.32.0
+        uses: github/codeql-action/upload-sarif@v4.32.2
         with:
           sarif_file: results.sarif

src/app/(app)/projects/[projectId]/approvals/approvals-client.tsx

@@ -2,7 +2,6 @@
 
 import { useRouter } from "next/navigation";
 import { startTransition, useId, useState } from "react";
-import { z } from "zod/mini";
 import { Button } from "@/components/ui/button";
 import {
   Dialog,
@@ -18,19 +17,7 @@ import {
   EmptyHeader,
   EmptyTitle,
 } from "@/components/ui/empty";
-
-const approvalsResponseSchema = z.looseObject({
-  approvals: z.optional(z.array(z.unknown())),
-});
-
-const errorResponseSchema = z.looseObject({
-  error: z.optional(
-    z.looseObject({
-      code: z.optional(z.string()),
-      message: z.optional(z.string()),
-    }),
-  ),
-});
+import { tryReadJsonErrorMessage } from "@/lib/core/errors";
 
 type ApprovalSummary = Readonly<{
   id: string;
@@ -110,36 +97,34 @@ export function ApprovalsClient(
     }
 
     if (!res.ok) {
-      let message = `Failed to refresh approvals (${res.status}).`;
-      try {
-        const jsonUnknown: unknown = await res.json();
-        const parsed = errorResponseSchema.safeParse(jsonUnknown);
-        const fromServer = parsed.success ? parsed.data.error?.message : null;
-        if (fromServer) message = fromServer;
-      } catch {
-        // Ignore.
-      }
+      const fromServer = await tryReadJsonErrorMessage(res);
+      const message =
+        fromServer ?? `Failed to refresh approvals (${res.status}).`;
       setIsRefreshing(false);
       setError(message);
       return;
     }
 
+    let jsonUnknown: unknown;
     try {
-      const jsonUnknown: unknown = await res.json();
-      const parsed = approvalsResponseSchema.safeParse(jsonUnknown);
-      const list = parsed.success ? parsed.data.approvals : null;
-      const next =
-        list && Array.isArray(list)
-          ? list.filter(isApprovalSummary)
-          : props.initialApprovals;
-      setApprovals(next);
+      jsonUnknown = await res.json();
     } catch (err) {
       setError(
         err instanceof Error ? err.message : "Failed to parse approvals.",
       );
-    } finally {
       setIsRefreshing(false);
+      return;
     }
+
+    const approvalsValue =
+      jsonUnknown && typeof jsonUnknown === "object"
+        ? (jsonUnknown as { approvals?: unknown }).approvals
+        : undefined;
+    const next = Array.isArray(approvalsValue)
+      ? approvalsValue.filter(isApprovalSummary)
+      : props.initialApprovals;
+    setApprovals(next);
+    setIsRefreshing(false);
   };
 
   const approve = async (approvalId: string): Promise<boolean> => {
@@ -160,15 +145,8 @@ export function ApprovalsClient(
     }
 
     if (!res.ok) {
-      let message = `Failed to approve (${res.status}).`;
-      try {
-        const jsonUnknown: unknown = await res.json();
-        const parsed = errorResponseSchema.safeParse(jsonUnknown);
-        const fromServer = parsed.success ? parsed.data.error?.message : null;
-        if (fromServer) message = fromServer;
-      } catch {
-        // Ignore.
-      }
+      const fromServer = await tryReadJsonErrorMessage(res);
+      const message = fromServer ?? `Failed to approve (${res.status}).`;
       setApprovingId(null);
       setError(message);
       return false;

src/app/(app)/projects/[projectId]/code-mode/code-mode-client.tsx

@@ -1,14 +1,7 @@
 "use client";
 
 import { Loader2Icon } from "lucide-react";
-import {
-  startTransition,
-  useEffect,
-  useId,
-  useMemo,
-  useRef,
-  useState,
-} from "react";
+import { startTransition, useEffect, useId, useRef, useState } from "react";
 import { z } from "zod/mini";
 
 import { Terminal } from "@/components/ai-elements/terminal";
@@ -21,6 +14,7 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@/components/ui/select";
+import { tryReadJsonErrorMessage } from "@/lib/core/errors";
 
 type StreamStatus = "idle" | "streaming" | "done" | "error";
 const STREAM_EVENT_FLUSH_MS = 16;
@@ -30,10 +24,6 @@ const startResponseSchema = z.looseObject({
   workflowRunId: z.optional(z.string()),
 });
 
-const errorResponseSchema = z.looseObject({
-  error: z.optional(z.looseObject({ message: z.optional(z.string()) })),
-});
-
 const uiMessageChunkSchema = z.looseObject({
   data: z.optional(z.unknown()),
   type: z.string(),
@@ -139,11 +129,6 @@ export function CodeModeClient(props: Readonly<{ projectId: string }>) {
     [],
   );
 
-  const streamStorageKey = useMemo(
-    () => (runId ? `workflow:code-mode:v1:${runId}:startIndex` : null),
-    [runId],
-  );
-
   const start = async () => {
     abortRef.current?.abort();
     abortRef.current = new AbortController();
@@ -175,15 +160,9 @@ export function CodeModeClient(props: Readonly<{ projectId: string }>) {
     }
 
     if (!res.ok) {
-      let message = `Failed to start Code Mode (${res.status}).`;
-      try {
-        const jsonUnknown: unknown = await res.json();
-        const parsed = errorResponseSchema.safeParse(jsonUnknown);
-        const fromServer = parsed.success ? parsed.data.error?.message : null;
-        if (fromServer) message = fromServer;
-      } catch {
-        // Ignore.
-      }
+      const fromServer = await tryReadJsonErrorMessage(res);
+      const message =
+        fromServer ?? `Failed to start Code Mode (${res.status}).`;
       setStatus("error");
       setError(message);
       return;
@@ -226,14 +205,14 @@ export function CodeModeClient(props: Readonly<{ projectId: string }>) {
   };
 
   useEffect(() => {
-    if (!runId || !streamStorageKey) return;
-    void reconnectSeed;
+    if (!runId) return;
+    void reconnectSeed; // Reference to trigger effect re-run on reconnect requests
 
     const abort = abortRef.current;
     if (!abort) return;
 
     const currentRunId = runId;
-    const storageKey = streamStorageKey;
+    const storageKey = `workflow:code-mode:v1:${currentRunId}:startIndex`;
 
     let startIndex = readStartIndex(storageKey);
     const autoReconnectDelaysMs = [250, 750, 1500] as const;
@@ -280,15 +259,8 @@ export function CodeModeClient(props: Readonly<{ projectId: string }>) {
       }
 
       if (!res.ok) {
-        let message = `Failed to open stream (${res.status}).`;
-        try {
-          const jsonUnknown: unknown = await res.json();
-          const parsed = errorResponseSchema.safeParse(jsonUnknown);
-          const fromServer = parsed.success ? parsed.data.error?.message : null;
-          if (fromServer) message = fromServer;
-        } catch {
-          // Ignore.
-        }
+        const fromServer = await tryReadJsonErrorMessage(res);
+        const message = fromServer ?? `Failed to open stream (${res.status}).`;
         setError(message);
         setStatus("error");
         return "error";
@@ -471,7 +443,7 @@ export function CodeModeClient(props: Readonly<{ projectId: string }>) {
       setStatus("error");
       setError(err instanceof Error ? err.message : "Stream disconnected.");
     });
-  }, [reconnectSeed, runId, streamStorageKey]);
+  }, [reconnectSeed, runId]);
 
   const cancel = async () => {
     if (!runId) return;

src/app/(app)/projects/[projectId]/repos/repo-connect-client.tsx

@@ -3,23 +3,10 @@
 import { Loader2Icon } from "lucide-react";
 import { useRouter } from "next/navigation";
 import { startTransition, useId, useState } from "react";
-import { z } from "zod/mini";
 
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
-
-const connectResponseSchema = z.looseObject({
-  repo: z.optional(z.looseObject({ id: z.optional(z.string()) })),
-});
-
-const errorResponseSchema = z.looseObject({
-  error: z.optional(
-    z.looseObject({
-      code: z.optional(z.string()),
-      message: z.optional(z.string()),
-    }),
-  ),
-});
+import { tryReadJsonErrorMessage } from "@/lib/core/errors";
 
 type RepoSummary = Readonly<{
   id: string;
@@ -87,32 +74,13 @@ export function RepoConnectClient(
     }
 
     if (!res.ok) {
-      let message = `Failed to connect repo (${res.status}).`;
-      try {
-        const jsonUnknown: unknown = await res.json();
-        const parsed = errorResponseSchema.safeParse(jsonUnknown);
-        const fromServer = parsed.success ? parsed.data.error?.message : null;
-        if (fromServer) message = fromServer;
-      } catch {
-        // Ignore.
-      }
+      const fromServer = await tryReadJsonErrorMessage(res);
+      const message = fromServer ?? `Failed to connect repo (${res.status}).`;
       setIsPending(false);
       setError(message);
       return;
     }
 
-    try {
-      const jsonUnknown: unknown = await res.json();
-      const parsed = connectResponseSchema.safeParse(jsonUnknown);
-      if (!parsed.success) {
-        throw new Error("Unexpected response from server.");
-      }
-    } catch (err) {
-      setIsPending(false);
-      setError(err instanceof Error ? err.message : "Failed to connect repo.");
-      return;
-    }
-
     setIsPending(false);
     setOwner("");
     setName("");