Skip to content

server: ensure frontend has correct port for PTY websocket connections #5898

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
adamdotdevin merged 3 commits into from
Dec 22, 2025
+23 −13
Merged

server: ensure frontend has correct port for PTY websocket connections #5898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c7ec474
server: ensure frontend has correct port for PTY websocket connections
ashutoshpw Dec 21, 2025
cf60e41
Merge branch 'dev' into fix/pty-websocket-port
ashutoshpw Dec 21, 2025
bc6a309
Merge branch 'dev' into fix/pty-websocket-port
ashutoshpw Dec 22, 2025
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
2 changes: 1 addition & 1 deletion packages/desktop/src/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const url =
new URLSearchParams(document.location.search).get("url") ||
(location.hostname.includes("opencode.ai") || location.hostname.includes("localhost")
? `http://${host}:${port}`
: "/")
: window.location.origin)

export function App() {
return (
Expand Down
34 changes: 22 additions & 12 deletions packages/opencode/src/server/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { describeRoute, generateSpecs, validator, resolver, openAPIRouteHandler
import { Hono } from "hono"
import { cors } from "hono/cors"
import { stream, streamSSE } from "hono/streaming"
import { proxy } from "hono/proxy"
import { Session } from "../session"
import z from "zod"
import { Provider } from "../provider/provider"
Expand Down Expand Up @@ -54,6 +53,9 @@ globalThis.AI_SDK_LOG_WARNINGS = false
export namespace Server {
const log = Log.create({ service: "server" })

// Port that the server is running on, used to inject into frontend HTML
let serverPort: number = 4096

export const Event = {
Connected: BusEvent.define("server.connected", z.object({})),
Disposed: BusEvent.define("global.disposed", z.object({})),
Expand Down Expand Up @@ -2578,12 +2580,25 @@ export namespace Server {
},
)
.all("/*", async (c) => {
return proxy(`https://desktop.opencode.ai${c.req.path}`, {
...c.req,
const response = await fetch(`https://desktop.opencode.ai${c.req.path}`, {
method: c.req.method,
headers: {
host: "desktop.opencode.ai",
},
})

const contentType = response.headers.get("content-type") || ""

// If this is an HTML response, inject the server port
if (contentType.includes("text/html")) {
const html = await response.text()
const portScript = `<script>window.__OPENCODE__ = window.__OPENCODE__ || {}; window.__OPENCODE__.port = ${serverPort};</script>`
// Inject the script right after the opening <head> tag
const modifiedHtml = html.replace("<head>", `<head>${portScript}`)
return c.html(modifiedHtml)
}

return response
}),
)

Expand All @@ -2607,14 +2622,9 @@ export namespace Server {
idleTimeout: 0,
fetch: App().fetch,
websocket: websocket,
} as const
if (opts.port === 0) {
try {
return Bun.serve({ ...args, port: 4096 })
} catch {
// port 4096 not available, fall through to use port 0
}
}
return Bun.serve({ ...args, port: opts.port })
})
// Store the actual port for injection into frontend HTML
serverPort = server.port ?? opts.port
return server
}
}