A desktop coding agent with free access to frontier models.
TypeScript
feat: desktop drops the 1.x engine mount
ogsamrat65651e7b42a3
diff --git a/apps/app/src/app/lib/opencode-session-native.ts b/apps/app/src/app/lib/opencode-session-native.tsindex d7668b9f..066ac573 100644--- a/apps/app/src/app/lib/opencode-session-native.ts+++ b/apps/app/src/app/lib/opencode-session-native.ts@@ -1,8 +1,8 @@import type { Message, Part, Session, SessionStatus, Todo } from "@opencode-ai/sdk/v2/client";import { closeSessionBrowserTabs } from "./desktop";-import { createClient, unwrap, type FieldsResult } from "./opencode";-import { createClientV2, isOpencodeV2BaseUrl } from "./opencode-v2-adapter";+import { unwrap, type FieldsResult } from "./opencode";+import { createClientV2 } from "./opencode-v2-adapter";import type { OmniRushSessionSnapshot } from "./omnirush-server";import type { ResolvedWorkspaceEndpoint } from "./workspace-endpoint";@@ -57,9 +57,7 @@ function readOwnedSnapshotTarget(}function createNativeOperations(endpoint: NativeSessionEndpoint): NativeSessionOperations {- const client = isOpencodeV2BaseUrl(endpoint.opencodeBaseUrl)- ? createClientV2(endpoint.opencodeBaseUrl, undefined, { token: endpoint.token })- : createClient(endpoint.opencodeBaseUrl, undefined, { mode: "omnirush", token: endpoint.token });+ const client = createClientV2(endpoint.opencodeBaseUrl, undefined, { token: endpoint.token });return {get: (sessionId, options) => client.session.get({ sessionID: sessionId }, options),messages: (sessionId, limit, options) => client.session.messages({ sessionID: sessionId, limit }, options),diff --git a/apps/app/src/app/lib/opencode-v2-adapter.ts b/apps/app/src/app/lib/opencode-v2-adapter.tsindex 19ac6d5b..574eaeb8 100644--- a/apps/app/src/app/lib/opencode-v2-adapter.ts+++ b/apps/app/src/app/lib/opencode-v2-adapter.ts@@ -14,6 +14,7 @@ import type {ToolPart,UnknownError,} from "@opencode-ai/sdk/v2/client";+import { createOpencodeClient } from "@opencode-ai/sdk/v2/client";import { createClient, createDesktopFetch, type FieldsResult } from "./opencode";import { isDesktopRuntime } from "./runtime-env";@@ -1357,7 +1358,15 @@ export function createClientV2(): ReturnType<typeof createClient> {const baseUrl = opencode2BaseUrl.replace(/\/+$/, "");const fetchImpl = createV2Fetch(auth);- const compatibilityClient = createClient(baseUrl, directory, { mode: "omnirush", token: auth.token });+ // Only the facade's shape: every 1.x call the adapter does not port fails+ // here, locally, instead of reaching a 2.x engine that has no 1.x routes.+ const compatibilityClient: ReturnType<typeof createClient> = createOpencodeClient({+ baseUrl,+ fetch: async (input) => Response.json({+ name: "UnsupportedInV2",+ message: `Not available on the OpenCode 2.x engine: ${(input instanceof Request ? input.url : String(input)).slice(baseUrl.length).split("?")[0]}`,+ }, { status: 501 }),+ });const permissionSessionByRequestID = new Map<string, string>();const questionFormsByID = new Map<string, NonNullable<ReturnType<typeof mapV2Question>>>();@@ -1653,7 +1662,8 @@ export function createClientV2(const promptResult = await request("POST",`/api/session/${encodeURIComponent(parameters.sessionID)}/prompt`,- { text },+ // The UI's id becomes the saved user message, so an uncertain send can be checked by id.+ { text, ...(parameters.messageID?.startsWith("msg_") ? { id: parameters.messageID } : {}) },options?.signal,);return promptResult.response.ok ? successfulResult(promptResult, {}) : failedResult(promptResult);@@ -1706,6 +1716,18 @@ export function createClientV2();return result.response.ok ? successfulResult(result, true) : failedResult(result);},+ diff: async (parameters: SessionParameters & { messageID?: string }, options?: RequestOptions) => {+ const query = parameters.messageID ? `?from=${encodeURIComponent(parameters.messageID)}` : "";+ const result = await request("GET", `/api/session/${encodeURIComponent(parameters.sessionID)}/diff${query}`, undefined, options?.signal);+ return result.response.ok ? successfulResult(result, responseItems(result.payload)) : failedResult(result);+ },+ message: async (parameters: SessionParameters & { messageID: string }, options?: RequestOptions) => {+ const result = await request("GET",+ `/api/session/${encodeURIComponent(parameters.sessionID)}/message/${encodeURIComponent(parameters.messageID)}`, undefined, options?.signal);+ if (!result.response.ok) return failedResult(result);+ const mapped = mapV2Message(responseData(result.payload), parameters.sessionID);+ return mapped ? successfulResult(result, mapped) : failedResult({ ...result, payload: { name: "InvalidV2MessageResponse" } });+ },fork: async (parameters: SessionParameters & { messageID?: string },options?: RequestOptions,@@ -1771,6 +1793,7 @@ export function createClientV2(get: async (): Promise<FieldsResult<Record<string, never>>> => localResult(baseUrl, "/api/config", {}),},provider: {+ auth: async () => localResult(baseUrl, "/api/provider/auth", {}),list: async (_parameters: DirectoryParameters = {},options?: RequestOptions,@@ -1819,10 +1842,37 @@ export function createClientV2(},},app: {- agents: async (): Promise<FieldsResult<never[]>> => localResult(baseUrl, "/api/agent", []),+ agents: async (_parameters?: DirectoryParameters, options?: RequestOptions) => {+ const result = await request("GET", "/api/agent", undefined, options?.signal);+ if (!result.response.ok) return failedResult(result);+ // `name` is the 1.x identifier the UI selects by; 2.x calls it `id`.+ return successfulResult(result, responseItems(result.payload).flatMap((item) => {+ const id = readString(item, "id");+ const mode = readString(item, "mode");+ if (!id || (mode !== "primary" && mode !== "subagent" && mode !== "all")) return [];+ const model = readRecord(item, "model");+ const providerID = readString(model, "providerID");+ const modelID = readString(model, "id");+ const description = readString(item, "description");+ return [{+ name: id, mode, hidden: isRecord(item) && item.hidden === true,+ permission: [], options: {},+ ...(description ? { description } : {}),+ ...(providerID && modelID ? { model: { providerID, modelID } } : {}),+ }];+ }));+ },},command: {- list: async (): Promise<FieldsResult<never[]>> => localResult(baseUrl, "/api/command", []),+ list: async (_parameters?: DirectoryParameters, options?: RequestOptions) => {+ const result = await request("GET", "/api/command", undefined, options?.signal);+ if (!result.response.ok) return failedResult(result);+ return successfulResult(result, responseItems(result.payload).flatMap((item) => {+ const name = readString(item, "name");+ const description = readString(item, "description");+ return name ? [{ name, template: "", hints: [], ...(description ? { description } : {}) }] : [];+ }));+ },},permission: {list: listPermissions,@@ -1843,7 +1893,76 @@ export function createClientV2(},},find: {- files: async (): Promise<FieldsResult<never[]>> => localResult(baseUrl, "/api/fs/find", []),+ files: async (+ parameters: DirectoryParameters & { query: string; dirs?: "true" | "false"; type?: "file" | "directory"; limit?: number },+ options?: RequestOptions,+ ): Promise<FieldsResult<string[]>> => {+ const query = new URLSearchParams({ query: parameters.query });+ const type = parameters.type ?? (parameters.dirs === "false" ? "file" : undefined);+ if (type) query.set("type", type);+ if (parameters.limit !== undefined) query.set("limit", String(parameters.limit));+ const result = await request("GET", `/api/fs/find?${query.toString()}`, undefined, options?.signal);+ if (!result.response.ok) return failedResult(result);+ // Directories end with a slash, as in 1.x; the folder itself ("/") is not a result.+ return successfulResult(result, responseItems(result.payload).flatMap((item) => {+ const path = readString(item, "path")?.replace(/\/+$/, "");+ return path ? [readString(item, "type") === "directory" ? `${path}/` : path] : [];+ }));+ },+ },+ vcs: {+ get: async (_parameters?: DirectoryParameters, options?: RequestOptions) => {+ const result = await request("GET", "/api/vcs", undefined, options?.signal);+ if (!result.response.ok) return failedResult(result);+ const branch = readRecord(responseData(result.payload), "branch");+ const current = readString(branch, "current");+ const defaultBranch = readString(branch, "default");+ return successfulResult(result, {+ ...(current ? { branch: current } : {}),+ ...(defaultBranch ? { default_branch: defaultBranch } : {}),+ });+ },+ diff: async (parameters: DirectoryParameters & { mode?: string }, options?: RequestOptions) => {+ // 1.x "git" is the uncommitted tree; 2.x calls it "working".+ const mode = !parameters.mode || parameters.mode === "git" ? "working" : parameters.mode;+ const result = await request("GET", `/api/vcs/diff?mode=${encodeURIComponent(mode)}`, undefined, options?.signal);+ return result.response.ok ? successfulResult(result, responseItems(result.payload)) : failedResult(result);+ },+ },+ project: {+ list: async (_parameters?: DirectoryParameters, options?: RequestOptions) => {+ const result = await request("GET", "/api/project", undefined, options?.signal);+ if (!result.response.ok) return failedResult(result);+ return successfulResult(result, responseItems(result.payload).flatMap((item) => {+ const id = readString(item, "id");+ const worktree = readString(item, "canonical");+ return id && worktree && isRecord(item) ? [{ ...item, id, worktree }] : [];+ }));+ },+ current: async (_parameters?: DirectoryParameters, options?: RequestOptions) => {+ const result = await request("GET", "/api/location", undefined, options?.signal);+ if (!result.response.ok) return failedResult(result);+ const project = readRecord(result.payload, "project");+ const id = readString(project, "id");+ const worktree = readString(project, "canonical");+ return id && worktree+ ? successfulResult(result, { id, worktree, time: { created: 0 }, sandboxes: [] })+ : failedResult({ ...result, payload: { name: "InvalidV2LocationResponse" } });+ },+ },+ path: {+ get: async (_parameters?: DirectoryParameters, options?: RequestOptions) => {+ const result = await request("GET", "/api/location", undefined, options?.signal);+ if (!result.response.ok) return failedResult(result);+ const current = readString(result.payload, "directory") ?? "";+ const worktree = readString(readRecord(result.payload, "project"), "canonical") ?? current;+ // 2.x has no home/state/config paths for clients.+ return successfulResult(result, { home: "", state: "", config: "", worktree, directory: current });+ },+ },+ // No language-server status in 2.x and no client-side provider sign-in (the server owns providers).+ lsp: {+ status: async () => localResult(baseUrl, "/api/lsp", []),},mcp: {status: async (_parameters?: DirectoryParameters, options?: RequestOptions): Promise<FieldsResult<Record<string, { status: string; error?: string }>>> => {@@ -1888,6 +2007,10 @@ export function createClientV2(Object.assign(compatibilityClient.question, adapter.question);Object.assign(compatibilityClient.v2.session.permission, adapter.v2.session.permission);Object.assign(compatibilityClient.find, adapter.find);+ Object.assign(compatibilityClient.vcs, adapter.vcs);+ Object.assign(compatibilityClient.project, adapter.project);+ Object.assign(compatibilityClient.path, adapter.path);+ Object.assign(compatibilityClient.lsp, adapter.lsp);Object.assign(compatibilityClient.mcp, adapter.mcp);Object.assign(compatibilityClient.event, adapter.event);v2Clients.add(compatibilityClient);diff --git a/apps/app/src/app/lib/workspace-endpoint.ts b/apps/app/src/app/lib/workspace-endpoint.tsindex 392b336a..2157995d 100644--- a/apps/app/src/app/lib/workspace-endpoint.ts+++ b/apps/app/src/app/lib/workspace-endpoint.ts@@ -12,7 +12,7 @@* Always go through {@link resolveWorkspaceEndpoint} when you need:* - an `OmniRushServerClient` for a workspace* - a mounted `/workspace/<id>` URL prefix- * - the `/opencode` URL for the OpenCode SDK+ * - the `/opencode2` URL for the OpenCode 2.x engine** Don't compose `<baseUrl>/workspace/<id>` by hand — that pattern is what* caused this whole class of "remote workspace API calls hit the local@@ -39,7 +39,7 @@ export type ResolvedWorkspaceEndpoint = {client: OmniRushServerClient;/** Mounted base url: `<baseUrl>/workspace/<workspaceId>`. No trailing slash. */mountedBaseUrl: string;- /** OpenCode SDK base url: `<mountedBaseUrl>/opencode`. */+ /** OpenCode 2.x engine base url: `<mountedBaseUrl>/opencode2`. */opencodeBaseUrl: string;};@@ -131,7 +131,7 @@ export function resolveWorkspaceEndpoint(isRemote: true,client,mountedBaseUrl,- opencodeBaseUrl: `${mountedBaseUrl}/opencode`,+ opencodeBaseUrl: `${mountedBaseUrl}/opencode2`,};}@@ -153,6 +153,6 @@ export function resolveWorkspaceEndpoint(isRemote: false,client,mountedBaseUrl,- opencodeBaseUrl: `${mountedBaseUrl}/opencode`,+ opencodeBaseUrl: `${mountedBaseUrl}/opencode2`,};}diff --git a/apps/app/src/react-app/domains/connections/store.ts b/apps/app/src/react-app/domains/connections/store.tsindex 42eb4a2b..29bbf0c7 100644--- a/apps/app/src/react-app/domains/connections/store.ts+++ b/apps/app/src/react-app/domains/connections/store.ts@@ -17,7 +17,8 @@ import {mintCloudControlMcpToken,readDenSettings,} from "../../../app/lib/den";-import { createClient, unwrap } from "../../../app/lib/opencode";+import { unwrap } from "../../../app/lib/opencode";+import { createClientV2 } from "../../../app/lib/opencode-v2-adapter";import { finishPerf, perfNow, recordPerfLog } from "../../../app/lib/perf-log";import {assertDesktopWebUrl,@@ -394,9 +395,8 @@ export function createConnectionsStore(options: {const mountedBaseUrl =buildOmniRushWorkspaceBaseUrl(omnirushBaseUrl, await resolveOmniRushWorkspaceId()) ?? omnirushBaseUrl;- activeClient = createClient(`${mountedBaseUrl.replace(/\/+$/, "")}/opencode`, undefined, {+ activeClient = createClientV2(`${mountedBaseUrl.replace(/\/+$/, "")}/opencode2`, undefined, {token,- mode: "omnirush",});options.setClient(activeClient);return activeClient;diff --git a/apps/app/src/react-app/domains/session/chat/session-page.tsx b/apps/app/src/react-app/domains/session/chat/session-page.tsxindex d042509d..66b1eb5c 100644--- a/apps/app/src/react-app/domains/session/chat/session-page.tsx+++ b/apps/app/src/react-app/domains/session/chat/session-page.tsx@@ -108,11 +108,11 @@ import { useWorkbenchStore, type WorkbenchSessionTab } from "./workbench-store";import { isSameWorkbenchSession } from "./workbench-store";import { ReactSessionRuntime } from "../sync/runtime-sync";import { useSessionInteractions } from "../sync/use-session-interactions";-import { createClient } from "@/app/lib/opencode";+import type { Client } from "@/app/types";import { createQuitGuard, finishGuardKey, leavingRunningTurn, type FinishGuardKind } from "@/app/lib/good-session";import { FinishGuardDialog, TurnGuardDialog, finishGuardFor, requestFinishIt } from "@/react-app/domains/quality/good-session";-import { createClientV2, isOpencodeV2BaseUrl } from "@/app/lib/opencode-v2-adapter";+import { createClientV2 } from "@/app/lib/opencode-v2-adapter";import {availableNarrowPane,NarrowPaneSwitcher,@@ -359,9 +359,7 @@ function WorkbenchPaneHeader(props: {/** Every visible conversation owns its pending interactions, including the side pane. */function SplitSessionSurface(props: SessionSurfaceProps) {- const client = useMemo(() => isOpencodeV2BaseUrl(props.opencodeBaseUrl)- ? createClientV2(props.opencodeBaseUrl, props.workspaceRoot, { token: props.omnirushToken })- : createClient(props.opencodeBaseUrl, props.workspaceRoot, { token: props.omnirushToken, mode: "omnirush" }),+ const client = useMemo(() => createClientV2(props.opencodeBaseUrl, props.workspaceRoot, { token: props.omnirushToken }),[props.opencodeBaseUrl, props.omnirushToken, props.workspaceRoot]);const interactions = useSessionInteractions({client, workspaceId: props.workspaceId, sessionId: props.sessionId, workspaceRoot: props.workspaceRoot ?? "",diff --git a/apps/app/src/react-app/domains/session/commands/use-session-commands.ts b/apps/app/src/react-app/domains/session/commands/use-session-commands.tsindex 387adb7f..47374018 100644--- a/apps/app/src/react-app/domains/session/commands/use-session-commands.ts+++ b/apps/app/src/react-app/domains/session/commands/use-session-commands.ts@@ -3,7 +3,7 @@ import type { QueryKey } from "@tanstack/react-query";import { toast } from "@/components/ui/sonner";import { createClient, unwrap } from "@/app/lib/opencode";-import { createClientV2, isOpencodeV2BaseUrl } from "@/app/lib/opencode-v2-adapter";+import { createClientV2 } from "@/app/lib/opencode-v2-adapter";import { abortSessionSafe, revertSession, unrevertSession } from "@/app/lib/opencode-session";import type { OmniRushSessionMessage, OmniRushSessionSnapshot } from "@/app/lib/omnirush-server";import { getReactQueryClient } from "@/react-app/infra/query-client";@@ -39,9 +39,7 @@ export function useCachedQueryData<T>(queryKey: QueryKey): T | undefined {export function useOpencodeClient(target: Pick<SessionCommandTarget, "opencodeBaseUrl" | "token" | "workspaceRoot">): OpencodeClient {return useMemo(- () => isOpencodeV2BaseUrl(target.opencodeBaseUrl)- ? createClientV2(target.opencodeBaseUrl, target.workspaceRoot || undefined, { token: target.token })- : createClient(target.opencodeBaseUrl, target.workspaceRoot.trim() || undefined, { token: target.token, mode: "omnirush" }),+ () => createClientV2(target.opencodeBaseUrl, target.workspaceRoot || undefined, { token: target.token }),[target.opencodeBaseUrl, target.token, target.workspaceRoot],);}diff --git a/apps/app/src/react-app/domains/session/surface/session-surface.tsx b/apps/app/src/react-app/domains/session/surface/session-surface.tsxindex 95e13879..176e7290 100644--- a/apps/app/src/react-app/domains/session/surface/session-surface.tsx+++ b/apps/app/src/react-app/domains/session/surface/session-surface.tsx@@ -9,7 +9,7 @@ import { toast } from "@/components/ui/sonner";import { captureAnalyticsEvent } from "@/app/lib/analytics";import { useUpdateGateBlocked } from "@/app/lib/update-gate";import { interruptSessionTurn, sessionNeedsStop, submitAfterInterruption, subscribeSessionInterruption } from "@/app/lib/opencode-interruption";-import { createClient, createPromptMessageID, hasAcceptedPromptMessage, isPromptAdmissionUnknown, isSendStopped, unwrap } from "@/app/lib/opencode";+import { createPromptMessageID, hasAcceptedPromptMessage, isPromptAdmissionUnknown, isSendStopped, unwrap } from "@/app/lib/opencode";import { compactSession } from "@/app/lib/opencode-session";import { createClientV2, isOpencodeV2BaseUrl } from "@/app/lib/opencode-v2-adapter";import * as opencodeSessionNative from "@/app/lib/opencode-session-native";@@ -1413,9 +1413,7 @@ export function SessionSurface(props: SessionSurfaceProps) {const autoOpenedTargetRef = useRef<string | null>(null);const initializedAutoOpenSessionRef = useRef<string | null>(null);const opencodeClient = useMemo(- () => isOpencodeV2BaseUrl(props.opencodeBaseUrl)- ? createClientV2(props.opencodeBaseUrl, props.workspaceRoot || undefined, { token: props.omnirushToken })- : createClient(props.opencodeBaseUrl, props.workspaceRoot.trim() || undefined, { token: props.omnirushToken, mode: "omnirush" }),+ () => createClientV2(props.opencodeBaseUrl, props.workspaceRoot || undefined, { token: props.omnirushToken }),[props.opencodeBaseUrl, props.omnirushToken, props.workspaceRoot],);diff --git a/apps/app/src/react-app/domains/session/sync/global-queue-drainer.ts b/apps/app/src/react-app/domains/session/sync/global-queue-drainer.tsindex f03cd1ce..ab20c23f 100644--- a/apps/app/src/react-app/domains/session/sync/global-queue-drainer.ts+++ b/apps/app/src/react-app/domains/session/sync/global-queue-drainer.ts@@ -3,10 +3,10 @@ import type { SessionStatus } from "@opencode-ai/sdk/v2/client";import { draftHasLostPaste } from "../surface/composer/pasted-text";import { isSessionReverted } from "./reverted-sessions";import { markTaskRunStart } from "@/app/lib/analytics";-import { createClient, createPromptMessageID, hasAcceptedPromptMessage, isPromptAdmissionUnknown, isSendStopped } from "@/app/lib/opencode";+import { createPromptMessageID, hasAcceptedPromptMessage, isPromptAdmissionUnknown, isSendStopped } from "@/app/lib/opencode";import { shellInSession } from "@/app/lib/opencode-session";import { submitAfterInterruption } from "@/app/lib/opencode-interruption";-import { createClientV2, isOpencodeV2BaseUrl } from "@/app/lib/opencode-v2-adapter";+import { createClientV2 } from "@/app/lib/opencode-v2-adapter";import { composeNativeSessionSnapshot } from "@/app/lib/opencode-session-native";import type { ComposerDraft, ModelRef } from "@/app/types";import { readStoredDefaultModel } from "@/react-app/kernel/model-config";@@ -106,11 +106,10 @@ async function performQueuedDraftSend(const sendModel = sessionModelSelection?.model ?? readStoredDefaultModelSafely() ?? context.model;// The effort the picker shows for this model, never a null it hides.const sendVariant = resolveSendVariant(sendModel, sessionModelSelection ? sessionModelSelection.variant : context.variant);- const createEngineClient = isOpencodeV2BaseUrl(context.opencodeBaseUrl) ? createClientV2 : createClient;- const opencodeClient = createEngineClient(+ const opencodeClient = createClientV2(context.opencodeBaseUrl,context.workspaceRoot || undefined,- { token: context.omnirushToken, mode: "omnirush" },+ { token: context.omnirushToken },);if (draft.mode === "shell") {@@ -198,8 +197,8 @@ function armObservationProbe(watched: WatchedSession) {void (async () => {const phase = getQueuedDrainState(watched.sessionId).phase;if (phase.kind === "admission_unknown") {- const client = createClient(watched.context.opencodeBaseUrl, watched.context.workspaceRoot || undefined, {- token: watched.context.omnirushToken, mode: "omnirush",+ const client = createClientV2(watched.context.opencodeBaseUrl, watched.context.workspaceRoot || undefined, {+ token: watched.context.omnirushToken,});if (await hasAcceptedPromptMessage(client, watched.sessionId, phase.messageID)) {if (watchedSessions.get(watched.sessionId) !== watched) return;diff --git a/apps/app/src/react-app/domains/session/sync/session-sync.ts b/apps/app/src/react-app/domains/session/sync/session-sync.tsindex 054fa202..44a2daf2 100644--- a/apps/app/src/react-app/domains/session/sync/session-sync.ts+++ b/apps/app/src/react-app/domains/session/sync/session-sync.ts@@ -9,7 +9,7 @@ import { captureAnalyticsEvent, takeTaskRunStart } from "@/app/lib/analytics";import { gatewayRefusalEvent } from "@/app/lib/gateway-refusal";import { trackTaskCompleted, trackTaskFailed } from "@/app/lib/den-telemetry";import { observeModelsTaskEvent } from "@/app/lib/models-task-analytics";-import { createClient, unwrap } from "@/app/lib/opencode";+import { unwrap } from "@/app/lib/opencode";import { createClientV2, isOpencodeV2BaseUrl } from "@/app/lib/opencode-v2-adapter";import { perfNow, recordPerfLog } from "@/app/lib/perf-log";import { isGeneratedSessionTitle } from "@/app/lib/session-title";@@ -190,9 +190,7 @@ type SessionStatusFetcher = () => Promise<Record<string, SessionStatus>>;function createSyncClient(baseUrl: string, omnirushToken: string) {- return isOpencodeV2BaseUrl(baseUrl)- ? createClientV2(baseUrl, undefined, { token: omnirushToken })- : createClient(baseUrl, undefined, { token: omnirushToken, mode: "omnirush" });+ return createClientV2(baseUrl, undefined, { token: omnirushToken });}const defaultSyncSubscriptionFactory: SyncSubscriptionFactory = async (baseUrl, omnirushToken, signal) => {diff --git a/apps/app/src/react-app/infra/workspace-server-client.test.ts b/apps/app/src/react-app/infra/workspace-server-client.test.tsindex 6c2ffcef..8a587e95 100644--- a/apps/app/src/react-app/infra/workspace-server-client.test.ts+++ b/apps/app/src/react-app/infra/workspace-server-client.test.ts@@ -40,7 +40,7 @@ describe("workspace server client primitive", () => {expect(first.baseUrl).toBe("http://127.0.0.1:4096");expect(first.token).toBe("local-token");expect(first.workspaceId).toBe("local-alpha");- expect(first.opencodeBaseUrl).toBe("http://127.0.0.1:4096/workspace/local-alpha/opencode");+ expect(first.opencodeBaseUrl).toBe("http://127.0.0.1:4096/workspace/local-alpha/opencode2");});test("changed local credentials produce a distinct endpoint and client", () => {@@ -84,7 +84,7 @@ describe("workspace server client primitive", () => {expect(endpoint.baseUrl).toBe("https://worker.example.test");expect(endpoint.token).toBe("remote-token");expect(endpoint.workspaceId).toBe("server-workspace-id");- expect(endpoint.opencodeBaseUrl).toBe("https://worker.example.test/workspace/server-workspace-id/opencode");+ expect(endpoint.opencodeBaseUrl).toBe("https://worker.example.test/workspace/server-workspace-id/opencode2");});test("keeps resolver caches scoped instead of leaking a global singleton", () => {diff --git a/apps/app/src/react-app/kernel/global-sdk-provider.tsx b/apps/app/src/react-app/kernel/global-sdk-provider.tsxindex c28f2236..9d4a2eb5 100644--- a/apps/app/src/react-app/kernel/global-sdk-provider.tsx+++ b/apps/app/src/react-app/kernel/global-sdk-provider.tsx@@ -8,12 +8,12 @@ import {useState,type ReactNode,} from "react";-import {+import type {createOpencodeClient,- type Event,+ Event,} from "@opencode-ai/sdk/v2/client";-import { usePlatform } from "./platform";+import { createClientV2 } from "../../app/lib/opencode-v2-adapter";import { useServer } from "./server-provider";type OpencodeClient = ReturnType<typeof createOpencodeClient>;@@ -114,38 +114,22 @@ export async function runGlobalEventSubscription(input: GlobalEventSubscriptionRexport function GlobalSDKProvider({ children }: GlobalSDKProviderProps) {const server = useServer();- const platform = usePlatform();const emitterRef = useRef<GlobalEventEmitter | null>(null);if (!emitterRef.current) {emitterRef.current = createEmitter();}const emitter = emitterRef.current;- const token = readOmniRushToken();- const headers =- token && server.url.includes("/opencode")- ? { Authorization: `Bearer ${token}` }- : undefined;+ // The global client talks to the 2.x engine mount (`<server>/opencode2`).+ const token = server.url.includes("/opencode") ? readOmniRushToken() || undefined : undefined;- const [client, setClient] = useState<OpencodeClient>(() =>- createOpencodeClient({- baseUrl: server.url,- headers,- fetch: platform.fetch,- throwOnError: true,- }),- );+ const [client, setClient] = useState<OpencodeClient>(() => createClientV2(server.url, undefined, { token }));useEffect(() => {- setClient(- createOpencodeClient({- baseUrl: server.url,- headers,- fetch: platform.fetch,- throwOnError: true,- }),- );- }, [platform.fetch, server.url]);+ setClient(createClientV2(server.url, undefined, { token }));+ // token is re-read from local storage; rebuild only when the server URL changes.+ // eslint-disable-next-line react-hooks/exhaustive-deps+ }, [server.url]);useEffect(() => {const baseUrl = server.url;@@ -153,12 +137,7 @@ export function GlobalSDKProvider({ children }: GlobalSDKProviderProps) {if (!baseUrl || !isHealthy) return;const abort = new AbortController();- const eventClient = createOpencodeClient({- baseUrl,- headers,- signal: abort.signal,- fetch: platform.fetch,- });+ const eventClient = createClientV2(baseUrl, undefined, { token });type Queued = { directory: string; payload: Event };let queue: Array<Queued | undefined> = [];@@ -236,9 +215,9 @@ export function GlobalSDKProvider({ children }: GlobalSDKProviderProps) {if (timer) clearTimeout(timer);flush();};- // headers is re-derived from local storage; rerun only when server URL or health flips.+ // token is re-read from local storage; rerun only when server URL or health flips.// eslint-disable-next-line react-hooks/exhaustive-deps- }, [emitter, platform.fetch, server.healthy, server.url]);+ }, [emitter, server.healthy, server.url]);const value = useMemo<GlobalSDKContextValue>(() => ({diff --git a/apps/app/src/react-app/kernel/server-provider.tsx b/apps/app/src/react-app/kernel/server-provider.tsxindex cbe7c8b5..7e92fb67 100644--- a/apps/app/src/react-app/kernel/server-provider.tsx+++ b/apps/app/src/react-app/kernel/server-provider.tsx@@ -9,9 +9,8 @@ import {useRef,type ReactNode,} from "react";-import { createOpencodeClient } from "@opencode-ai/sdk/v2/client";-import { desktopFetch } from "../../app/lib/desktop";+import { createClientV2 } from "../../app/lib/opencode-v2-adapter";import {getOmniRushGatewayOrigin,readOmniRushGatewayDenToken,@@ -22,7 +21,8 @@ import { isDesktopRuntime } from "../../app/utils";import { initialServerState, serverReducer } from "./server-provider-state";export function normalizeServerUrl(input: string): string | undefined {- return normalizeOmniRushServerUrl(input) ?? undefined;+ // A saved 1.x engine mount moves to the 2.x one; the 1.x engine is gone.+ return normalizeOmniRushServerUrl(input)?.replace(/\/opencode$/, "/opencode2") ?? undefined;}export function serverDisplayName(url: string): string {@@ -47,7 +47,9 @@ function readStoredList(): string[] {try {const raw = window.localStorage.getItem("omnirush.server.list");const parsed = raw ? (JSON.parse(raw) as unknown) : [];- return Array.isArray(parsed) ? parsed.filter((item) => typeof item === "string") : [];+ return Array.isArray(parsed)+ ? parsed.flatMap((item) => typeof item === "string" ? [normalizeServerUrl(item) ?? item] : [])+ : [];} catch {return [];}@@ -81,15 +83,9 @@ export function buildOmniRushHealthHeaders(url: string): Record<string, string>async function checkHealth(url: string): Promise<boolean> {if (!url) return false;- const headers = buildOmniRushHealthHeaders(url);- const client = createOpencodeClient({- baseUrl: url,- headers,- signal: AbortSignal.timeout(3000),- fetch: isDesktopRuntime() ? desktopFetch : undefined,- });- return client.global- .health()+ const token = buildOmniRushHealthHeaders(url) ? readOmniRushToken() : undefined;+ return createClientV2(url, undefined, { token }).global+ .health({ signal: AbortSignal.timeout(3000) }).then((result) => result.data?.healthy === true).catch(() => false);}@@ -108,7 +104,7 @@ export function ServerProvider({ children, defaultUrl }: ServerProviderProps) {if (typeof window === "undefined") return;const gatewayOrigin = getOmniRushGatewayOrigin();- const fallback = normalizeServerUrl(gatewayOrigin ? `${gatewayOrigin}/opencode` : defaultUrl) ?? "";+ const fallback = normalizeServerUrl(gatewayOrigin ? `${gatewayOrigin}/opencode2` : defaultUrl) ?? "";// Hosted web deployments served by omnirush.ai must reuse the OpenCode proxy// rather than any persisted localhost target.diff --git a/apps/app/src/react-app/shell/providers.tsx b/apps/app/src/react-app/shell/providers.tsxindex 9382527d..e350c000 100644--- a/apps/app/src/react-app/shell/providers.tsx+++ b/apps/app/src/react-app/shell/providers.tsx@@ -34,11 +34,11 @@ function resolveDefaultServerUrl(): string {? import.meta.env.VITE_OMNIRUSH_URL.trim(): "";if (omnirushUrl) {- return `${omnirushUrl.replace(/\/+$/, "")}/opencode`;+ return `${omnirushUrl.replace(/\/+$/, "")}/opencode2`;}if (isWebDeployment() && import.meta.env.PROD && typeof window !== "undefined") {- return `${window.location.origin}/opencode`;+ return `${window.location.origin}/opencode2`;}const envUrl =diff --git a/apps/app/src/react-app/shell/route-workspaces.ts b/apps/app/src/react-app/shell/route-workspaces.tsindex fa85f13f..00025c7c 100644--- a/apps/app/src/react-app/shell/route-workspaces.ts+++ b/apps/app/src/react-app/shell/route-workspaces.ts@@ -5,8 +5,8 @@import type { Session } from "@opencode-ai/sdk/v2/client";-import { createClient, unwrap } from "@/app/lib/opencode";-import { createClientV2, isOpencodeV2BaseUrl } from "@/app/lib/opencode-v2-adapter";+import { unwrap } from "@/app/lib/opencode";+import { createClientV2 } from "@/app/lib/opencode-v2-adapter";import { deleteNativeSession, unwrapNativeSessionResult } from "@/app/lib/opencode-session-native";import { OmniRushServerError, type OmniRushWorkspaceInfo } from "@/app/lib/omnirush-server";import type { ResolvedWorkspaceEndpoint } from "@/app/lib/workspace-endpoint";@@ -44,10 +44,7 @@ export type RouteSessionListTransport = (input: {}) => Promise<RouteSessionListResult>;const nativeRouteSessionList: RouteSessionListTransport = async ({ endpoint, limit }) => {- const client = createClient(endpoint.opencodeBaseUrl, undefined, {- mode: "omnirush",- token: endpoint.token,- });+ const client = createClientV2(endpoint.opencodeBaseUrl, undefined, { token: endpoint.token });// The engine's /session list only returns sessions filed under the folder's// current project id, which changes when an agent turns the folder into a// git repo or adds a remote, and it matches the folder byte for byte. The@@ -105,9 +102,7 @@ async function routeSessionEndpoint(endpoint: ResolvedWorkspaceEndpoint): Promisexport async function createRouteSession(endpoint: ResolvedWorkspaceEndpoint, directory?: string): Promise<Session> {const native = await routeSessionEndpoint(endpoint);- const client = isOpencodeV2BaseUrl(native.opencodeBaseUrl)- ? createClientV2(native.opencodeBaseUrl, directory, { token: native.token })- : createClient(native.opencodeBaseUrl, directory, { token: native.token, mode: "omnirush" });+ const client = createClientV2(native.opencodeBaseUrl, directory, { token: native.token });return unwrap(await client.session.create({ directory }));}diff --git a/apps/app/src/react-app/shell/session-route.tsx b/apps/app/src/react-app/shell/session-route.tsxindex d55162cf..b88c0f13 100644--- a/apps/app/src/react-app/shell/session-route.tsx+++ b/apps/app/src/react-app/shell/session-route.tsx@@ -23,7 +23,7 @@ import { buildDiagnosticsBundleJson } from "@/app/lib/diagnostics-bundle";import { downloadTextAsFile } from "@/app/lib/download";import { canCreateWorkspaces } from "@/app/lib/workspace-creation-policy";import { useQueryClient } from "@tanstack/react-query";-import { createClient, isPromptAdmissionUnknown, unwrap } from "@/app/lib/opencode";+import { isPromptAdmissionUnknown, unwrap } from "@/app/lib/opencode";import { createClientV2, isOpencodeV2BaseUrl, V2_SESSION_ARCHIVE_UNAVAILABLE } from "@/app/lib/opencode-v2-adapter";import { abortSessionSafe, forkSession, listCommands, revertSession, setSessionArchived, shellInSession, unrevertSession } from "@/app/lib/opencode-session";import { getNativeSessionMessages } from "@/app/lib/opencode-session-native";@@ -1773,11 +1773,10 @@ export function SessionRoute() {}const workspaceRoot = paneEndpoint.workspaceRoot;- const createEngineClient = isOpencodeV2BaseUrl(endpoint.opencodeBaseUrl) ? createClientV2 : createClient;- const workspaceOpencodeClient = createEngineClient(+ const workspaceOpencodeClient = createClientV2(endpoint.opencodeBaseUrl,workspaceRoot || undefined,- { token: endpoint.token, mode: "omnirush" },+ { token: endpoint.token },);const scopedSurface = {...surfaceProps,@@ -3421,8 +3420,7 @@ export function SessionRoute() {await refreshRouteState();void queryClient.invalidateQueries({ queryKey: workspaceTasksQueryKey(workspaceId) });const opencodeUrl = `${(buildOmniRushWorkspaceBaseUrl(baseUrl, taskWorkspace.id) ?? baseUrl).replace(/\/+$/, "")}/opencode2`;- const createEngineClient = isOpencodeV2BaseUrl(opencodeUrl) ? createClientV2 : createClient;- const engine = createEngineClient(opencodeUrl, taskWorkspace.path || undefined, { token, mode: "omnirush" });+ const engine = createClientV2(opencodeUrl, taskWorkspace.path || undefined, { token });const session = unwrap(await engine.session.create({ directory: taskWorkspace.path || undefined }));const system = await buildOmniRushSessionSystemContext(client, {workspaceId: taskWorkspace.id,diff --git a/apps/app/src/react-app/shell/settings-route.tsx b/apps/app/src/react-app/shell/settings-route.tsxindex 0494b534..df1084dc 100644--- a/apps/app/src/react-app/shell/settings-route.tsx+++ b/apps/app/src/react-app/shell/settings-route.tsx@@ -11,7 +11,8 @@ import {resolveOmniRushExtensionCatalogPlatform,} from "@/app/constants";import type { EnablementContext } from "@/app/enablement";-import { createClient, unwrap } from "@/app/lib/opencode";+import { unwrap } from "@/app/lib/opencode";+import { createClientV2 } from "@/app/lib/opencode-v2-adapter";import {createOmniRushServerClient,isLoopbackOmniRushServerUrl,@@ -1009,13 +1010,10 @@ function SettingsRouteContent(props: SettingsSurfaceProps = {}) {const opencodeClient = useMemo(() => {if (!selectedWorkspaceEndpoint || !selectedWorkspaceEndpoint.token) return null;- return createClient(+ return createClientV2(selectedWorkspaceEndpoint.opencodeBaseUrl,selectedWorkspaceRoot || undefined,- {- token: selectedWorkspaceEndpoint.token,- mode: "omnirush",- },+ { token: selectedWorkspaceEndpoint.token },);}, [selectedWorkspaceEndpoint, selectedWorkspaceRoot]);diff --git a/apps/app/src/react-app/shell/use-workspace-route-state.ts b/apps/app/src/react-app/shell/use-workspace-route-state.tsindex 6e77b4d4..51bb1833 100644--- a/apps/app/src/react-app/shell/use-workspace-route-state.ts+++ b/apps/app/src/react-app/shell/use-workspace-route-state.ts@@ -22,7 +22,7 @@ import {type OmniRushServerInfo,type WorkspaceList,} from "@/app/lib/desktop";-import { createClient, unwrap } from "@/app/lib/opencode";+import { unwrap } from "@/app/lib/opencode";import { createClientV2 } from "@/app/lib/opencode-v2-adapter";import { getNativeSession, isMissingSessionError } from "@/app/lib/opencode-session-native";import { createOmniRushServerClient, OmniRushServerError, type OmniRushServerClient } from "@/app/lib/omnirush-server";@@ -1415,16 +1415,11 @@ export function useWorkspaceRouteState(input: UseWorkspaceRouteStateInput) {const opencodeClient = useMemo(() =>engineRoutingReady && opencodeBaseUrl && selectedWorkspaceServerToken && !selectedWorkspaceError- ? engineV2ChatRouting- ? createClientV2(opencodeBaseUrl, selectedWorkspaceRoot || undefined, {- token: selectedWorkspaceServerToken,- })- : createClient(opencodeBaseUrl, selectedWorkspaceRoot || undefined, {- token: selectedWorkspaceServerToken,- mode: "omnirush",- })+ ? createClientV2(opencodeBaseUrl, selectedWorkspaceRoot || undefined, {+ token: selectedWorkspaceServerToken,+ }): null,- [engineRoutingReady, engineV2ChatRouting, opencodeBaseUrl, selectedWorkspaceError, selectedWorkspaceRoot, selectedWorkspaceServerToken],+ [engineRoutingReady, opencodeBaseUrl, selectedWorkspaceError, selectedWorkspaceRoot, selectedWorkspaceServerToken],);useEffect(() => {if (!developerMode || !opencodeClient) return;diff --git a/apps/app/tests/composer-focus-continuity.test.tsx b/apps/app/tests/composer-focus-continuity.test.tsxindex 613d042f..f11d5510 100644--- a/apps/app/tests/composer-focus-continuity.test.tsx+++ b/apps/app/tests/composer-focus-continuity.test.tsx@@ -123,7 +123,7 @@ test("composer focus and optimistic sends preserve drafts through snapshots andif (new URL(request.url).pathname.includes(`/session/${sessionId}/message/`)) {acceptanceRequests.push(request);return acceptedMessageId- ? Response.json({ info: { id: acceptedMessageId, sessionID: sessionId, role: "user" }, parts: [] })+ ? Response.json({ data: { id: acceptedMessageId, sessionID: sessionId, type: "user", text: "Uncertain send", time: { created: 1 } } }): new Response(null, { status: 404 });}return Response.json({});@@ -368,8 +368,8 @@ test("composer focus and optimistic sends preserve drafts through snapshots andexpect(getQueuedDrainState(sessionId).phase.kind).toBe("awaiting_observation");for (const request of acceptanceRequests) {expect(request.method).toBe("GET");- expect(new URL(request.url).pathname).toBe(`/opencode/session/${sessionId}/message/${uncertainId}`);- expect(new URL(request.url).searchParams.get("directory")).toBe("/tmp/project-focus-continuity");+ // The acceptance check reads the 2.x message route; this surface keeps exact-id matching (no same-text fallback).+ expect(new URL(request.url).pathname).toBe(`/opencode/api/session/${sessionId}/message/${uncertainId}`);}expect(acceptanceRequests).toHaveLength(2);await act(async () => queryClient.setQueryData(transcriptKey(workspaceId, sessionId), [{diff --git a/apps/app/tests/opencode-v2-adapter.test.ts b/apps/app/tests/opencode-v2-adapter.test.tsindex 78658bf9..b781653e 100644--- a/apps/app/tests/opencode-v2-adapter.test.ts+++ b/apps/app/tests/opencode-v2-adapter.test.ts@@ -1712,6 +1712,9 @@ describe("v2 question forms", () => {expect(requests.map((item) => item.method)).toEqual(["POST", "PUT", "POST"]);expect(requests[1]).toMatchObject({ path: "/opencode2/api/experimental/session/ses_side/instructions/entries/omnirush-context", body: { value: parameters.system } });expect(requests[2]?.body).toEqual({ text: "What is happening?" });+ requests.length = 0;+ await client.session.promptAsync({ ...parameters, messageID: "msg_0123456789abUIdraft00000" });+ expect(requests[2]?.body).toEqual({ text: "What is happening?", id: "msg_0123456789abUIdraft00000" });requests.length = 0; status = 503;expect((await client.session.promptAsync(parameters)).response.status).toBe(503);expect(requests.map((item) => item.method)).toEqual(["POST", "PUT"]);@@ -1868,3 +1871,65 @@ test("MCP status from the 2.x engine reads as the 1.x status map", async () => {.toEqual({ memory: { status: "connected" }, gh: { status: "failed", error: "boom" } });expect(v2McpStatusMap(null)).toEqual({});});++describe("OpenCode 2.0.32 workspace reads", () => {+ test("agents, commands, files, vcs, projects and diffs read native routes in the 1.x shapes", async () => {+ const originalFetch = globalThis.fetch;+ const paths: string[] = [];+ globalThis.fetch = async (input, init) => {+ const request = input instanceof Request ? input : new Request(input, init);+ const url = new URL(request.url);+ const path = url.pathname.replace("/opencode2", "") + url.search;+ paths.push(`${request.method} ${path}`);+ if (url.pathname.endsWith("/api/agent")) return Response.json({ data: [+ { id: "build", name: "Build", mode: "primary", hidden: false, permissions: [], request: {}, description: "Default", model: { id: "m1", providerID: "mock" } },+ { id: "compaction", name: "Compaction", mode: "primary", hidden: true, permissions: [], request: {} },+ ] });+ if (url.pathname.endsWith("/api/command")) return Response.json({ data: [{ name: "init" }] });+ if (url.pathname.endsWith("/api/fs/find")) return Response.json({ data: [{ path: "/", type: "directory" }, { path: "src/", type: "directory" }, { path: "src/a.ts", type: "file" }] });+ if (url.pathname.endsWith("/api/vcs")) return Response.json({ data: { provider: "git", branch: { current: "feat", default: "main" } } });+ if (url.pathname.endsWith("/api/vcs/diff")) return Response.json({ data: [{ file: "a.ts", patch: "p", additions: 1, deletions: 0, status: "modified" }] });+ if (url.pathname.endsWith("/api/project")) return Response.json([{ id: "prj", canonical: "/workspace", time: { created: 1, updated: 1, active: 1 }, sandboxes: [] }]);+ if (url.pathname.endsWith("/api/location")) return Response.json({ directory: "/workspace/sub", project: { id: "prj", directory: "/workspace", canonical: "/workspace" } });+ if (url.pathname.endsWith("/diff")) return Response.json({ data: [{ file: "b.ts", patch: "q", additions: 0, deletions: 1, status: "deleted" }] });+ throw new Error(`Unexpected request: ${request.method} ${path}`);+ };+ try {+ const client = createClientV2("http://owner.test/opencode2", "/workspace", {});+ expect((await client.app.agents()).data).toEqual([+ { name: "build", mode: "primary", hidden: false, permission: [], options: {}, description: "Default", model: { providerID: "mock", modelID: "m1" } },+ { name: "compaction", mode: "primary", hidden: true, permission: [], options: {} },+ ]);+ expect((await client.command.list()).data).toEqual([{ name: "init", template: "", hints: [] }]);+ expect((await client.find.files({ query: "a", dirs: "true", limit: 50 })).data).toEqual(["src/", "src/a.ts"]);+ expect((await client.vcs.get()).data).toEqual({ branch: "feat", default_branch: "main" });+ expect((await client.vcs.diff({ mode: "git" })).data).toMatchObject([{ file: "a.ts", status: "modified" }]);+ expect((await client.project.list()).data).toMatchObject([{ id: "prj", worktree: "/workspace" }]);+ expect((await client.project.current()).data).toMatchObject({ id: "prj", worktree: "/workspace" });+ expect((await client.path.get()).data).toEqual({ home: "", state: "", config: "", worktree: "/workspace", directory: "/workspace/sub" });+ expect((await client.session.diff({ sessionID: "ses_main", messageID: "msg_user" })).data).toMatchObject([{ file: "b.ts" }]);+ expect((await client.lsp.status()).data).toEqual([]);+ expect((await client.provider.auth()).data).toEqual({});+ expect(paths).toEqual([+ "GET /api/agent", "GET /api/command", "GET /api/fs/find?query=a&limit=50", "GET /api/vcs",+ "GET /api/vcs/diff?mode=working", "GET /api/project", "GET /api/location", "GET /api/location",+ "GET /api/session/ses_main/diff?from=msg_user",+ ]);+ } finally { globalThis.fetch = originalFetch; }+ });++ test("1.x calls the adapter does not port fail locally and never reach the engine", async () => {+ const originalFetch = globalThis.fetch;+ let reached = 0;+ globalThis.fetch = async () => { reached += 1; return new Response(null, { status: 204 }); };+ try {+ const client = createClientV2("http://owner.test/workspace/w/opencode2", "/workspace", {});+ const update = await client.config.update({ config: {} });+ expect(update.response?.status).toBe(501);+ expect(update.error).toMatchObject({ name: "UnsupportedInV2", message: "Not available on the OpenCode 2.x engine: /config" });+ expect((await client.mcp.connect({ name: "x" })).response?.status).toBe(501);+ expect((await client.instance.dispose()).response?.status).toBe(501);+ expect(reached).toBe(0);+ } finally { globalThis.fetch = originalFetch; }+ });+});diff --git a/apps/app/tests/route-session-list.test.ts b/apps/app/tests/route-session-list.test.tsindex 13a792e8..aa549dda 100644--- a/apps/app/tests/route-session-list.test.ts+++ b/apps/app/tests/route-session-list.test.ts@@ -27,7 +27,7 @@ describe("workspace route native session lists", () => {{ id: "ses_local", directory: "/tmp/local" },]);expect(inputs).toEqual([{ endpoint, limit: 200 }]);- expect(endpoint.opencodeBaseUrl).toBe("https://local.example.test/workspace/local%20workspace/opencode");+ expect(endpoint.opencodeBaseUrl).toBe("https://local.example.test/workspace/local%20workspace/opencode2");expect(endpoint.token).toBe("local-token");});@@ -112,7 +112,7 @@ describe("workspace route native session lists", () => {{ endpoint, limit: 200 },{ endpoint, limit: 200 },]);- expect(endpoint.opencodeBaseUrl).toBe("https://remote.example.test/worker/workspace/server%2Fid/opencode");+ expect(endpoint.opencodeBaseUrl).toBe("https://remote.example.test/worker/workspace/server%2Fid/opencode2");expect(endpoint.token).toBe("remote-token");});});diff --git a/apps/app/tests/workspace-endpoint.test.ts b/apps/app/tests/workspace-endpoint.test.tsindex a5eb2d87..7a736add 100644--- a/apps/app/tests/workspace-endpoint.test.ts+++ b/apps/app/tests/workspace-endpoint.test.ts@@ -19,7 +19,7 @@ describe("workspace endpoint resolution", () => {expect(endpoint?.baseUrl).toBe("http://127.0.0.1:4096");expect(endpoint?.isRemote).toBe(false);expect(endpoint?.mountedBaseUrl).toBe("http://127.0.0.1:4096/workspace/ws_local");- expect(endpoint?.opencodeBaseUrl).toBe("http://127.0.0.1:4096/workspace/ws_local/opencode");+ expect(endpoint?.opencodeBaseUrl).toBe("http://127.0.0.1:4096/workspace/ws_local/opencode2");expect(endpoint?.token).toBe("local-token");});@@ -42,7 +42,7 @@ describe("workspace endpoint resolution", () => {expect(endpoint?.baseUrl).toBe("https://worker.example.test");expect(endpoint?.isRemote).toBe(true);expect(endpoint?.mountedBaseUrl).toBe("https://worker.example.test/workspace/server-workspace-b");- expect(endpoint?.opencodeBaseUrl).toBe("https://worker.example.test/workspace/server-workspace-b/opencode");+ expect(endpoint?.opencodeBaseUrl).toBe("https://worker.example.test/workspace/server-workspace-b/opencode2");expect(endpoint?.token).toBe("remote-token");});diff --git a/apps/app/tests/workspace-routes.test.ts b/apps/app/tests/workspace-routes.test.tsindex 4cea20d4..81663eba 100644--- a/apps/app/tests/workspace-routes.test.ts+++ b/apps/app/tests/workspace-routes.test.ts@@ -48,7 +48,7 @@ describe("workspace session mutations", () => {}expect(request.headers.get("Authorization")).toBe("Bearer fixture-token");if (request.method === "DELETE") return Response.json(true);- if (engine === "v2") expect(await request.json()).toMatchObject({ location: { directory: "/existing" } });+ expect(await request.json()).toMatchObject({ location: { directory: "/existing" } });return Response.json({ id: "ses_created", title: "New session", time: { created: 1, updated: 1 } });};try {@@ -60,9 +60,10 @@ describe("workspace session mutations", () => {expect(await deleteRouteSession(endpoint, "ses_created")).toBe(true);expect(requests).toEqual(["GET /experimental/engine-v2-preview/status",- `POST /workspace/ws_existing/${engine === "v2" ? "opencode2/api/session" : "opencode/session"}`,+ // Every engine route is the 2.x mount; the 1.x engine is gone.+ "POST /workspace/ws_existing/opencode2/api/session","GET /experimental/engine-v2-preview/status",- `DELETE /workspace/ws_existing/${engine === "v2" ? "opencode2/api/session" : "opencode/session"}/ses_created`,+ "DELETE /workspace/ws_existing/opencode2/api/session/ses_created",]);} finally {globalThis.fetch = originalFetch;