20 files changed, 84 insertions, 61 deletions
diff --git a/packages/console/app/.gitignore b/packages/console/app/.gitignore
index fb29f05d7..5033416b5 100644
--- a/packages/console/app/.gitignore
+++ b/packages/console/app/.gitignore
@@ -3,7 +3,6 @@ dist
 .output
 .vercel
 .netlify
-.vinxi
 app.config.timestamp_*.js
 
 # Environment
diff --git a/packages/console/app/app.config.ts b/packages/console/app/app.config.ts
deleted file mode 100644
index af013bc81..000000000
--- a/packages/console/app/app.config.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { defineConfig } from "@solidjs/start/config"
-
-export default defineConfig({
-  middleware: "./src/middleware.ts",
-  vite: {
-    server: {
-      allowedHosts: true,
-    },
-    build: {
-      rollupOptions: {
-        external: ["cloudflare:workers"],
-      },
-      minify: false,
-    },
-  },
-  server: {
-    compatibilityDate: "2024-09-19",
-    preset: "cloudflare_module",
-    cloudflare: {
-      nodeCompat: true,
-    },
-  },
-})
diff --git a/packages/console/app/package.json b/packages/console/app/package.json
index 2506bcd91..b9f5c50a1 100644
--- a/packages/console/app/package.json
+++ b/packages/console/app/package.json
@@ -4,12 +4,13 @@
   "type": "module",
   "scripts": {
     "typecheck": "tsgo --noEmit",
-    "dev": "vinxi dev --host 0.0.0.0",
+    "dev": "vite dev --host 0.0.0.0",
     "dev:remote": "VITE_AUTH_URL=https://auth.dev.opencode.ai bun sst shell --stage=dev bun dev",
-    "build": "./script/generate-sitemap.ts && vinxi build && ../../opencode/script/schema.ts ./.output/public/config.json",
-    "start": "vinxi start"
+    "build": "./script/generate-sitemap.ts && vite build && ../../opencode/script/schema.ts ./.output/public/config.json",
+    "start": "vite start"
   },
   "dependencies": {
+    "@cloudflare/vite-plugin": "1.15.2",
     "@ibm/plex": "6.4.1",
     "@jsx-email/render": "1.1.1",
     "@kobalte/core": "catalog:",
@@ -21,13 +22,15 @@
     "@solidjs/router": "catalog:",
     "@solidjs/start": "catalog:",
     "chart.js": "4.5.1",
+    "nitro": "3.0.1-alpha.1",
     "solid-js": "catalog:",
-    "vinxi": "^0.5.7",
+    "vite": "catalog:",
     "zod": "catalog:"
   },
   "devDependencies": {
+    "@typescript/native-preview": "catalog:",
     "typescript": "catalog:",
-    "@typescript/native-preview": "catalog:"
+    "wrangler": "4.50.0"
   },
   "engines": {
     "node": ">=22"
diff --git a/packages/console/app/src/context/auth.session.ts b/packages/console/app/src/context/auth.session.ts
index a8e2c4af3..726b6c834 100644
--- a/packages/console/app/src/context/auth.session.ts
+++ b/packages/console/app/src/context/auth.session.ts
@@ -1,4 +1,4 @@
-import { useSession } from "vinxi/http"
+import { useSession } from "@solidjs/start/http"
 
 export interface AuthSession {
   account?: Record<
diff --git a/packages/console/app/src/global.d.ts b/packages/console/app/src/global.d.ts
index dc6f10c22..4c2b0a170 100644
--- a/packages/console/app/src/global.d.ts
+++ b/packages/console/app/src/global.d.ts
@@ -1 +1,5 @@
 /// <reference types="@solidjs/start/env" />
+
+export declare module "@solidjs/start/server" {
+  export type APIEvent = { request: Request }
+}
diff --git a/packages/console/app/src/middleware.ts b/packages/console/app/src/middleware.ts
index b49473cbe..620fc25aa 100644
--- a/packages/console/app/src/middleware.ts
+++ b/packages/console/app/src/middleware.ts
@@ -1,5 +1,5 @@
-import { defineMiddleware } from "vinxi/http"
+import { createMiddleware } from "@solidjs/start/middleware"
 
-export default defineMiddleware({
+export default createMiddleware({
   onBeforeResponse() {},
 })
diff --git a/packages/console/app/src/routes/index.tsx b/packages/console/app/src/routes/index.tsx
index 8b8f44999..89909744d 100644
--- a/packages/console/app/src/routes/index.tsx
+++ b/packages/console/app/src/routes/index.tsx
@@ -1,6 +1,6 @@
 import "./index.css"
 import { Title, Meta, Link } from "@solidjs/meta"
-import { HttpHeader } from "@solidjs/start"
+// import { HttpHeader } from "@solidjs/start"
 import video from "../asset/lander/opencode-min.mp4"
 import videoPoster from "../asset/lander/opencode-poster.png"
 import { IconCopy, IconCheck } from "../component/icon"
@@ -42,7 +42,7 @@ export default function Home() {
 
   return (
     <main data-page="opencode">
-      <HttpHeader name="Cache-Control" value="public, max-age=1, s-maxage=3600, stale-while-revalidate=86400" />
+      {/*<HttpHeader name="Cache-Control" value="public, max-age=1, s-maxage=3600, stale-while-revalidate=86400" />*/}
       <Title>OpenCode | The AI coding agent built for the terminal</Title>
       <Link rel="canonical" href={config.baseUrl} />
       <Link rel="icon" type="image/svg+xml" href="/favicon.svg" />
diff --git a/packages/console/app/src/routes/zen/index.tsx b/packages/console/app/src/routes/zen/index.tsx
index 4eab4dcb9..e972dee95 100644
--- a/packages/console/app/src/routes/zen/index.tsx
+++ b/packages/console/app/src/routes/zen/index.tsx
@@ -1,7 +1,7 @@
 import "./index.css"
 import { createAsync, query, redirect } from "@solidjs/router"
 import { Title, Meta, Link } from "@solidjs/meta"
-import { HttpHeader } from "@solidjs/start"
+// import { HttpHeader } from "@solidjs/start"
 import zenLogoLight from "../../asset/zen-ornate-light.svg"
 import { config } from "~/config"
 import zenLogoDark from "../../asset/zen-ornate-dark.svg"
@@ -29,7 +29,7 @@ export default function Home() {
   createAsync(() => checkLoggedIn())
   return (
     <main data-page="zen">
-      <HttpHeader name="Cache-Control" value="public, max-age=1, s-maxage=3600, stale-while-revalidate=86400" />
+      {/*<HttpHeader name="Cache-Control" value="public, max-age=1, s-maxage=3600, stale-while-revalidate=86400" />*/}
       <Title>OpenCode Zen | A curated set of reliable optimized models for coding agents</Title>
       <Link rel="canonical" href={`${config.baseUrl}/zen`} />
       <Link rel="icon" type="image/svg+xml" href="/favicon-zen.svg" />
diff --git a/packages/console/app/tsconfig.json b/packages/console/app/tsconfig.json
index 07148a458..e30a67389 100644
--- a/packages/console/app/tsconfig.json
+++ b/packages/console/app/tsconfig.json
@@ -12,7 +12,7 @@
     "allowJs": true,
     "strict": true,
     "noEmit": true,
-    "types": ["vinxi/types/client"],
+    "types": ["vite/client"],
     "isolatedModules": true,
     "paths": {
       "~/*": ["./src/*"]
diff --git a/packages/console/app/vite.config.ts b/packages/console/app/vite.config.ts
new file mode 100644
index 000000000..3b013e990
--- /dev/null
+++ b/packages/console/app/vite.config.ts
@@ -0,0 +1,25 @@
+import { defineConfig, PluginOption } from "vite"
+import { solidStart } from "@solidjs/start/config"
+import { nitro } from "nitro/vite"
+
+export default defineConfig({
+  plugins: [
+    solidStart() as PluginOption,
+    nitro({
+      compatibilityDate: "2024-09-19",
+      preset: "cloudflare_module",
+      cloudflare: {
+        nodeCompat: true,
+      },
+    }),
+  ],
+  server: {
+    allowedHosts: true,
+  },
+  build: {
+    rollupOptions: {
+      external: ["cloudflare:workers"],
+    },
+    minify: false,
+  },
+})
diff --git a/packages/desktop/vite.config.ts b/packages/desktop/vite.config.ts
index 8e43b9835..ff18b1de3 100644
--- a/packages/desktop/vite.config.ts
+++ b/packages/desktop/vite.config.ts
@@ -9,7 +9,7 @@ export default defineConfig({
       "@": path.resolve(__dirname, "./src"),
     },
   },
-  plugins: [tailwindcss(), solidPlugin()],
+  plugins: [tailwindcss(), solidPlugin()] as any,
   server: {
     host: "0.0.0.0",
     allowedHosts: true,
diff --git a/packages/enterprise/.gitignore b/packages/enterprise/.gitignore
index 751513ce1..a515fd5d2 100644
--- a/packages/enterprise/.gitignore
+++ b/packages/enterprise/.gitignore
@@ -3,8 +3,6 @@ dist
 .output
 .vercel
 .netlify
-.vinxi
-app.config.timestamp_*.js
 
 # Environment
 .env
diff --git a/packages/enterprise/app.config.ts b/packages/enterprise/app.config.ts
deleted file mode 100644
index 1feaf9c0e..000000000
--- a/packages/enterprise/app.config.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { defineConfig } from "@solidjs/start/config"
-import tailwindcss from "@tailwindcss/vite"
-
-export default defineConfig({
-  vite: {
-    plugins: [tailwindcss() as any],
-    server: {
-      host: "0.0.0.0",
-      allowedHosts: true,
-    },
-  },
-})
diff --git a/packages/enterprise/package.json b/packages/enterprise/package.json
index ab9ed5d59..c5dbc3bbd 100644
--- a/packages/enterprise/package.json
+++ b/packages/enterprise/package.json
@@ -5,9 +5,10 @@
   "type": "module",
   "scripts": {
     "typecheck": "tsgo --noEmit",
-    "dev": "vinxi dev",
-    "build": "vinxi build",
-    "start": "vinxi start"
+    "dev": "vite dev",
+    "build": "vite build",
+    "build:cloudflare": "OPENCODE_DEPLOYMENT_TARGET=cloudflare vite build",
+    "start": "vite start"
   },
   "dependencies": {
     "@opencode-ai/util": "workspace:*",
@@ -18,8 +19,8 @@
     "hono": "catalog:",
     "hono-openapi": "catalog:",
     "luxon": "catalog:",
+    "nitro": "3.0.1-alpha.1",
     "solid-js": "catalog:",
-    "vinxi": "^0.5.7",
     "zod": "catalog:"
   },
   "devDependencies": {
diff --git a/packages/enterprise/src/global.d.ts b/packages/enterprise/src/global.d.ts
index dc6f10c22..4c2b0a170 100644
--- a/packages/enterprise/src/global.d.ts
+++ b/packages/enterprise/src/global.d.ts
@@ -1 +1,5 @@
 /// <reference types="@solidjs/start/env" />
+
+export declare module "@solidjs/start/server" {
+  export type APIEvent = { request: Request }
+}
diff --git a/packages/enterprise/tsconfig.json b/packages/enterprise/tsconfig.json
index 0a44d1efe..6bdc0f9ee 100644
--- a/packages/enterprise/tsconfig.json
+++ b/packages/enterprise/tsconfig.json
@@ -11,7 +11,7 @@
     "allowJs": true,
     "noEmit": true,
     "strict": true,
-    "types": ["vinxi/types/client"],
+    "types": ["vite/client"],
     "isolatedModules": true,
     "paths": {
       "~/*": ["./src/*"]
diff --git a/packages/enterprise/vite.config.ts b/packages/enterprise/vite.config.ts
new file mode 100644
index 000000000..acc1c7fa5
--- /dev/null
+++ b/packages/enterprise/vite.config.ts
@@ -0,0 +1,26 @@
+import { defineConfig, PluginOption } from "vite"
+import { solidStart } from "@solidjs/start/config"
+import { nitro } from "nitro/vite"
+import tailwindcss from "@tailwindcss/vite"
+
+const nitroConfig = (() => {
+  const target = process.env.OPENCODE_DEPLOYMENT_TARGET
+  if (target === "cloudflare") {
+    return {
+      compatibilityDate: "2024-09-19",
+      preset: "cloudflare_module",
+      cloudflare: {
+        nodeCompat: true,
+      },
+    }
+  }
+  return {}
+})()
+
+export default defineConfig({
+  plugins: [tailwindcss(), solidStart() as PluginOption, nitro(nitroConfig)],
+  server: {
+    host: "0.0.0.0",
+    allowedHosts: true,
+  },
+})
diff --git a/packages/plugin/package.json b/packages/plugin/package.json
index 7c3eb13ba..3d243e41d 100644
--- a/packages/plugin/package.json
+++ b/packages/plugin/package.json
@@ -24,4 +24,4 @@
     "typescript": "catalog:",
     "@typescript/native-preview": "catalog:"
   }
-}
-\ No newline at end of file
+}
diff --git a/packages/sdk/js/package.json b/packages/sdk/js/package.json
index c636105a3..e481cc74a 100644
--- a/packages/sdk/js/package.json
+++ b/packages/sdk/js/package.json
@@ -26,4 +26,4 @@
   "publishConfig": {
     "directory": "dist"
   }
-}
-\ No newline at end of file
+}
diff --git a/packages/ui/.gitignore b/packages/ui/.gitignore
index 751513ce1..a515fd5d2 100644
--- a/packages/ui/.gitignore
+++ b/packages/ui/.gitignore
@@ -3,8 +3,6 @@ dist
 .output
 .vercel
 .netlify
-.vinxi
-app.config.timestamp_*.js
 
 # Environment
 .env