From 3a1ac907d00dec5697c9d9e7858d6f6e7860a969 Mon Sep 17 00:00:00 2001
From: Brad Harris <bmharris@gmail.com>
Date: Wed, 27 May 2026 03:05:49 -0600
Subject: [PATCH] Adopt shared errorMessage() helper in agents.ts and
 templates.ts

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 apps/server/src/routes/agents.ts    | 17 ++++++++---------
 apps/server/src/routes/templates.ts |  6 ++----
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/apps/server/src/routes/agents.ts b/apps/server/src/routes/agents.ts
index 76888b67..b4f6db52 100644
--- a/apps/server/src/routes/agents.ts
+++ b/apps/server/src/routes/agents.ts
@@ -35,6 +35,7 @@ import {
   parseOptionalBooleanField,
   parseOptionalStringArrayField,
 } from "./agent-startup.js";
+import { errorMessage } from "../shared/lib/error-message.js";
 const AGENT_INITIAL_PROMPT_MAX_CHARS = 16_000;
 const COPY_MODE_ASSIST_DISABLED_ERROR = "Copy mode assist is disabled.";
 const AGENT_LATEST_EVENT_TYPES = [
@@ -442,9 +443,7 @@ export async function registerAgentRoutes(
       try {
         await deps.startStream(id, body.port);
       } catch (error) {
-        const message =
-          error instanceof Error ? error.message : "Failed to start stream.";
-        return reply.code(502).send({ error: message });
+        return reply.code(502).send({ error: errorMessage(error) });
       }
       return { ok: true };
     }
@@ -526,7 +525,7 @@ export async function registerAgentRoutes(
       parsedRequest = await parseCreateAgentRequest(request);
     } catch (error) {
       return reply.code(400).send({
-        error: error instanceof Error ? error.message : "Invalid request body.",
+        error: errorMessage(error),
       });
     }
     const { body, startupFiles } = parsedRequest;
@@ -577,7 +576,7 @@ export async function registerAgentRoutes(
       );
     } catch (error) {
       return reply.code(400).send({
-        error: error instanceof Error ? error.message : "Invalid request body.",
+        error: errorMessage(error),
       });
     }
 
@@ -651,7 +650,7 @@ export async function registerAgentRoutes(
       startupPins = createStartupPins(startupLinks ?? []);
     } catch (error) {
       return reply.code(400).send({
-        error: error instanceof Error ? error.message : "Invalid startupLinks.",
+        error: errorMessage(error),
       });
     }
 
@@ -1130,9 +1129,9 @@ export async function registerAgentRoutes(
           assistState.connectionId = assistConnection.connectionId;
         }
       } catch (error) {
-        const message =
-          error instanceof Error ? error.message : "Terminal attach failed.";
-        socket.send(JSON.stringify({ type: "error", message }));
+        socket.send(
+          JSON.stringify({ type: "error", message: errorMessage(error) })
+        );
         socket.close(1011, "attach failed");
         return;
       }
diff --git a/apps/server/src/routes/templates.ts b/apps/server/src/routes/templates.ts
index e5328a50..aabc50b4 100644
--- a/apps/server/src/routes/templates.ts
+++ b/apps/server/src/routes/templates.ts
@@ -225,8 +225,7 @@ export async function registerTemplateRoutes(
         );
       } catch (error) {
         return reply.code(400).send({
-          error:
-            error instanceof Error ? error.message : "Invalid startupLinks.",
+          error: errorMessage(error),
         });
       }
 
@@ -236,8 +235,7 @@ export async function registerTemplateRoutes(
           startupPins = createStartupPins(startupLinks);
         } catch (error) {
           return reply.code(400).send({
-            error:
-              error instanceof Error ? error.message : "Invalid startupLinks.",
+            error: errorMessage(error),
           });
         }
       }