Remove CLI from electron app (#17803)

Co-authored-by: LukeParkerDev <10430890+Hona@users.noreply.github.com>

packages/opencode/src/server/instance.ts

@@ -4,6 +4,7 @@ import { proxy } from "hono/proxy"
 import type { UpgradeWebSocket } from "hono/ws"
 import z from "zod"
 import { createHash } from "node:crypto"
+import * as fs from "node:fs/promises"
 import { Log } from "../util/log"
 import { Format } from "../format"
 import { TuiRoutes } from "./routes/tui"
@@ -28,6 +29,7 @@ import { ExperimentalRoutes } from "./routes/experimental"
 import { ProviderRoutes } from "./routes/provider"
 import { EventRoutes } from "./routes/event"
 import { errorHandler } from "./middleware"
+import { getMimeType } from "hono/utils/mime"
 
 const log = Log.create({ service: "server" })
 
@@ -285,13 +287,14 @@ export const InstanceRoutes = (upgrade: UpgradeWebSocket, app: Hono = new Hono()
       if (embeddedWebUI) {
         const match = embeddedWebUI[path.replace(/^\//, "")] ?? embeddedWebUI["index.html"] ?? null
         if (!match) return c.json({ error: "Not Found" }, 404)
-        const file = Bun.file(match)
-        if (await file.exists()) {
-          c.header("Content-Type", file.type)
-          if (file.type.startsWith("text/html")) {
+
+        if (await fs.exists(match)) {
+          const mime = getMimeType(match) ?? "text/plain"
+          c.header("Content-Type", mime)
+          if (mime.startsWith("text/html")) {
             c.header("Content-Security-Policy", DEFAULT_CSP)
           }
-          return c.body(await file.arrayBuffer())
+          return c.body(new Uint8Array(await fs.readFile(match)))
         } else {
           return c.json({ error: "Not Found" }, 404)
         }

packages/opencode/src/server/proxy.ts

@@ -1,7 +1,6 @@
 import type { Target } from "@/control-plane/types"
-import { lazy } from "@/util/lazy"
 import { Hono } from "hono"
-import { upgradeWebSocket } from "hono/bun"
+import type { UpgradeWebSocket } from "hono/ws"
 
 const hop = new Set([
   "connection",
@@ -53,10 +52,10 @@ function send(ws: { send(data: string | ArrayBuffer | Uint8Array): void }, data:
   return ws.send(data)
 }
 
-const app = lazy(() =>
+const app = (upgrade: UpgradeWebSocket) =>
   new Hono().get(
     "/__workspace_ws",
-    upgradeWebSocket((c) => {
+    upgrade((c) => {
       const url = c.req.header("x-opencode-proxy-url")
       const queue: Msg[] = []
       let remote: WebSocket | undefined
@@ -96,8 +95,7 @@ const app = lazy(() =>
         },
       }
     }),
-  ),
-)
+  )
 
 export namespace ServerProxy {
   export function http(target: Extract<Target, { type: "remote" }>, req: Request) {
@@ -112,13 +110,18 @@ export namespace ServerProxy {
     )
   }
 
-  export function websocket(target: Extract<Target, { type: "remote" }>, req: Request, env: unknown) {
+  export function websocket(
+    upgrade: UpgradeWebSocket,
+    target: Extract<Target, { type: "remote" }>,
+    req: Request,
+    env: unknown,
+  ) {
     const url = new URL(req.url)
     url.pathname = "/__workspace_ws"
     url.search = ""
     const next = new Headers(req.headers)
     next.set("x-opencode-proxy-url", socket(target.url))
-    return app().fetch(
+    return app(upgrade).fetch(
       new Request(url, {
         method: req.method,
         headers: next,

packages/opencode/src/server/router.ts

@@ -89,7 +89,7 @@ export function WorkspaceRouterMiddleware(upgrade: UpgradeWebSocket): Middleware
     }
 
     if (c.req.header("upgrade")?.toLowerCase() === "websocket") {
-      return ServerProxy.websocket(target, c.req.raw, c.env)
+      return ServerProxy.websocket(upgrade, target, c.req.raw, c.env)
     }
 
     const headers = new Headers(c.req.raw.headers)

packages/opencode/src/server/routes/session.ts

@@ -843,19 +843,17 @@ export const SessionRoutes = lazy(() =>
       ),
       validator("json", SessionPrompt.PromptInput.omit({ sessionID: true })),
       async (c) => {
-        c.status(204)
-        c.header("Content-Type", "application/json")
-        return stream(c, async () => {
-          const sessionID = c.req.valid("param").sessionID
-          const body = c.req.valid("json")
-          SessionPrompt.prompt({ ...body, sessionID }).catch((err) => {
-            log.error("prompt_async failed", { sessionID, error: err })
-            Bus.publish(Session.Event.Error, {
-              sessionID,
-              error: new NamedError.Unknown({ message: err instanceof Error ? err.message : String(err) }).toObject(),
-            })
+        const sessionID = c.req.valid("param").sessionID
+        const body = c.req.valid("json")
+        SessionPrompt.prompt({ ...body, sessionID }).catch((err) => {
+          log.error("prompt_async failed", { sessionID, error: err })
+          Bus.publish(Session.Event.Error, {
+            sessionID,
+            error: new NamedError.Unknown({ message: err instanceof Error ? err.message : String(err) }).toObject(),
           })
         })
+
+        return c.body(null, 204)
       },
     )
     .post(

packages/opencode/src/server/server.ts

@@ -2,6 +2,7 @@ import { Log } from "../util/log"
 import { describeRoute, generateSpecs, validator, resolver, openAPIRouteHandler } from "hono-openapi"
 import { Hono } from "hono"
 import { compress } from "hono/compress"
+import { createNodeWebSocket } from "@hono/node-ws"
 import { cors } from "hono/cors"
 import { basicAuth } from "hono/basic-auth"
 import type { UpgradeWebSocket } from "hono/ws"
@@ -9,8 +10,6 @@ import z from "zod"
 import { Auth } from "../auth"
 import { Flag } from "../flag/flag"
 import { ProviderID } from "../provider/schema"
-import { createAdaptorServer, type ServerType } from "@hono/node-server"
-import { createNodeWebSocket } from "@hono/node-ws"
 import { WorkspaceRouterMiddleware } from "./router"
 import { errors } from "./error"
 import { GlobalRoutes } from "./routes/global"
@@ -19,6 +18,7 @@ import { lazy } from "@/util/lazy"
 import { errorHandler } from "./middleware"
 import { InstanceRoutes } from "./instance"
 import { initProjectors } from "./projectors"
+import { createAdaptorServer, type ServerType } from "@hono/node-server"
 
 // @ts-ignore This global is needed to prevent ai-sdk from logging warnings to stdout https://github.com/vercel/ai/blob/2dc67e0ef538307f21368db32d5a12345d98831b/packages/ai/src/logger/log-warnings.ts#L85
 globalThis.AI_SDK_LOG_WARNINGS = false
@@ -42,7 +42,7 @@ export namespace Server {
     return false
   }
 
-  export const Default = lazy(() => create({}).app)
+  export const Default = lazy(() => create({}))
 
   export function ControlPlaneRoutes(upgrade: UpgradeWebSocket, app = new Hono(), opts?: { cors?: string[] }): Hono {
     return app
@@ -54,6 +54,9 @@ export namespace Server {
         const password = Flag.OPENCODE_SERVER_PASSWORD
         if (!password) return next()
         const username = Flag.OPENCODE_SERVER_USERNAME ?? "opencode"
+
+        if (c.req.query("auth_token")) c.req.raw.headers.set("authorization", `Basic ${c.req.query("auth_token")}`)
+
         return basicAuth({ username, password })(c, next)
       })
       .use(async (c, next) => {