Skip to content

Adopt shared errorMessage() in agents.ts and templates.ts #608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
selfcontained merged 1 commit into from
May 27, 2026
Merged

Adopt shared errorMessage() in agents.ts and templates.ts #608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions apps/server/src/routes/agents.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down Expand Up @@ -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 };
}
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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),
});
}

Expand Down Expand Up @@ -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),
});
}

Expand Down Expand Up @@ -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;
}
Expand Down
6 changes: 2 additions & 4 deletions apps/server/src/routes/templates.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
});
}

Expand All @@ -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),
});
}
}
Expand Down
Loading