From a8bcfa36bb46a17c814c991f4e65256b80eee35d Mon Sep 17 00:00:00 2001
From: Nathan Flurry <developer@nathanflurry.com>
Date: Thu, 12 Mar 2026 20:31:49 -0700
Subject: [PATCH] Fix Foundry Rivet base path and frontend endpoint fallback

---
 foundry/docker/frontend-caddy-entrypoint.sh   | 13 ++++++++++++-
 foundry/packages/backend/src/actors/index.ts  |  3 +++
 foundry/packages/client/src/backend-client.ts | 10 +++++++++-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/foundry/docker/frontend-caddy-entrypoint.sh b/foundry/docker/frontend-caddy-entrypoint.sh
index db98b94..44a42ad 100644
--- a/foundry/docker/frontend-caddy-entrypoint.sh
+++ b/foundry/docker/frontend-caddy-entrypoint.sh
@@ -5,9 +5,20 @@ escape_js() {
   printf '%s' "${1:-}" | sed 's/\\/\\\\/g; s/"/\\"/g'
 }
 
+normalize_backend_endpoint() {
+  case "${1:-}" in
+    */api/rivet)
+      printf '%s/v1/rivet' "${1%/api/rivet}"
+      ;;
+    *)
+      printf '%s' "${1:-}"
+      ;;
+  esac
+}
+
 cat > /srv/__foundry_runtime_config.js <<EOF
 window.__FOUNDRY_RUNTIME_CONFIG__ = {
-  backendEndpoint: "$(escape_js "${VITE_HF_BACKEND_ENDPOINT:-}")",
+  backendEndpoint: "$(escape_js "$(normalize_backend_endpoint "${VITE_HF_BACKEND_ENDPOINT:-}")")",
   defaultWorkspaceId: "$(escape_js "${VITE_HF_WORKSPACE:-}")",
   frontendClientMode: "$(escape_js "${FOUNDRY_FRONTEND_CLIENT_MODE:-remote}")"
 };
diff --git a/foundry/packages/backend/src/actors/index.ts b/foundry/packages/backend/src/actors/index.ts
index 4fb9533..7914847 100644
--- a/foundry/packages/backend/src/actors/index.ts
+++ b/foundry/packages/backend/src/actors/index.ts
@@ -9,6 +9,9 @@ import { sandboxInstance } from "./sandbox-instance/index.js";
 import { workspace } from "./workspace/index.js";
 
 export const registry = setup({
+  serverless: {
+    basePath: "/v1/rivet",
+  },
   use: {
     workspace,
     project,
diff --git a/foundry/packages/client/src/backend-client.ts b/foundry/packages/client/src/backend-client.ts
index 255c4ba..d9ffa06 100644
--- a/foundry/packages/client/src/backend-client.ts
+++ b/foundry/packages/client/src/backend-client.ts
@@ -273,8 +273,16 @@ function stripTrailingSlash(value: string): string {
   return value.replace(/\/$/, "");
 }
 
-function deriveBackendEndpoints(endpoint: string): { appEndpoint: string; rivetEndpoint: string } {
+function normalizeLegacyBackendEndpoint(endpoint: string): string {
   const normalized = stripTrailingSlash(endpoint);
+  if (normalized.endsWith("/api/rivet")) {
+    return `${normalized.slice(0, -"/api/rivet".length)}/v1/rivet`;
+  }
+  return normalized;
+}
+
+function deriveBackendEndpoints(endpoint: string): { appEndpoint: string; rivetEndpoint: string } {
+  const normalized = normalizeLegacyBackendEndpoint(endpoint);
   if (normalized.endsWith("/rivet")) {
     return {
       appEndpoint: normalized.slice(0, -"/rivet".length),