clone/opencode
1
0
Fork 0
mirror of https://github.com/anomalyco/opencode.git synced 2026-05-01 18:26:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): more explicit routing to fix workspace instance issue (#23171)

Browse Source
This commit is contained in:
James Long
2026-04-17 16:39:34 -04:00
committed by GitHub
parent d11268ece7
commit 47f553f9ba
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/opencode/src/server/routes/control/index.ts
View File

@@ -7,7 +7,6 @@ import { Hono } from "hono"
import { describeRoute, resolver, validator, openAPIRouteHandler } from "hono-openapi" import { describeRoute, resolver, validator, openAPIRouteHandler } from "hono-openapi"
import z from "zod" import z from "zod"
import { errors } from "../../error" import { errors } from "../../error"
import { WorkspaceRoutes } from "./workspace"
export function ControlPlaneRoutes(): Hono { export function ControlPlaneRoutes(): Hono {
const app = new Hono() const app = new Hono()
@@ -158,5 +157,4 @@ export function ControlPlaneRoutes(): Hono {
return c.json(true) return c.json(true)
}, },
) )
.route("/experimental/workspace", WorkspaceRoutes())
} }

5
packages/opencode/src/server/routes/instance/index.ts
View File

@@ -15,7 +15,6 @@ import { Command } from "@/command"
import { QuestionRoutes } from "./question" import { QuestionRoutes } from "./question"
import { PermissionRoutes } from "./permission" import { PermissionRoutes } from "./permission"
import { Flag } from "@/flag/flag" import { Flag } from "@/flag/flag"
import { WorkspaceID } from "@/control-plane/schema"
import { ExperimentalHttpApiServer } from "./httpapi/server" import { ExperimentalHttpApiServer } from "./httpapi/server"
import { ProjectRoutes } from "./project" import { ProjectRoutes } from "./project"
import { SessionRoutes } from "./session" import { SessionRoutes } from "./session"
@@ -30,8 +29,8 @@ import { SyncRoutes } from "./sync"
import { AppRuntime } from "@/effect/app-runtime" import { AppRuntime } from "@/effect/app-runtime"
import { InstanceMiddleware } from "./middleware" import { InstanceMiddleware } from "./middleware"
export const InstanceRoutes = (upgrade: UpgradeWebSocket, workspaceID?: WorkspaceID): Hono => { export const InstanceRoutes = (upgrade: UpgradeWebSocket): Hono => {
const app = new Hono().use(InstanceMiddleware(workspaceID)) const app = new Hono()
if (Flag.OPENCODE_EXPERIMENTAL_HTTPAPI) { if (Flag.OPENCODE_EXPERIMENTAL_HTTPAPI) {
const handler = ExperimentalHttpApiServer.webHandler().handler const handler = ExperimentalHttpApiServer.webHandler().handler

19
packages/opencode/src/server/server.ts
View File

@@ -14,6 +14,8 @@ import { ControlPlaneRoutes } from "./routes/control"
import { UIRoutes } from "./routes/ui" import { UIRoutes } from "./routes/ui"
import { GlobalRoutes } from "./routes/global" import { GlobalRoutes } from "./routes/global"
import { WorkspaceRouterMiddleware } from "./workspace" import { WorkspaceRouterMiddleware } from "./workspace"
import { InstanceMiddleware } from "./routes/instance/middleware"
import { WorkspaceRoutes } from "./routes/control/workspace"
// @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 // @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 globalThis.AI_SDK_LOG_WARNINGS = false
@@ -45,14 +47,9 @@ function create(opts: { cors?: string[] }) {
if (Flag.OPENCODE_WORKSPACE_ID) { if (Flag.OPENCODE_WORKSPACE_ID) {
return { return {
app: app app: app
.use(InstanceMiddleware(Flag.OPENCODE_WORKSPACE_ID ? WorkspaceID.make(Flag.OPENCODE_WORKSPACE_ID) : undefined))
.use(FenceMiddleware) .use(FenceMiddleware)
.route( .route("/", InstanceRoutes(runtime.upgradeWebSocket)),
"/",
InstanceRoutes(
runtime.upgradeWebSocket,
Flag.OPENCODE_WORKSPACE_ID ? WorkspaceID.make(Flag.OPENCODE_WORKSPACE_ID) : undefined,
),
),
runtime, runtime,
} }
} }
@@ -60,7 +57,13 @@ function create(opts: { cors?: string[] }) {
return { return {
app: app app: app
.route("/", ControlPlaneRoutes()) .route("/", ControlPlaneRoutes())
.use(WorkspaceRouterMiddleware(runtime.upgradeWebSocket)) .route(
"/",
new Hono()
.use(InstanceMiddleware())
.route("/experimental/workspace", WorkspaceRoutes())
.use(WorkspaceRouterMiddleware(runtime.upgradeWebSocket)),
)
.route("/", InstanceRoutes(runtime.upgradeWebSocket)) .route("/", InstanceRoutes(runtime.upgradeWebSocket))
.route("/", UIRoutes()), .route("/", UIRoutes()),
runtime, runtime,