@neuralnomads/codenomad-dev 0.20.0-dev-20260911-ea37f97b → 0.20.0-dev-20260917-aa51cbb9

package/dist/server/http-server.js

@@ -7,7 +7,7 @@ import { connect as connectTcp, isIP } from "net";
 import path from "path";
 import { connect as connectTls } from "tls";
 import { fetch } from "undici";
-import { isInvalidRequestError, isPtyNotFoundError, isSessionNotFoundError, isShellNotFoundError } from "@opencode-ai/client";
+import { isInvalidRequestError, isPtyNotFoundError, isSessionNotFoundError, isShellNotFoundError } from "@opencode/client";
 import { registerWorkspaceRoutes } from "./routes/workspaces";
 import { registerSettingsRoutes } from "./routes/settings";
 import { registerFilesystemRoutes } from "./routes/filesystem";
@@ -28,6 +28,10 @@ import { registerUsageRoutes } from "./routes/usage";
 import { registerAuthRoutes } from "./routes/auth";
 import { sendUnauthorized, wantsHtml } from "../auth/http-auth";
 import { buildPreviewRuntimeBridge, rewritePreviewImportMap, rewritePreviewJavaScriptImports } from "../previews/runtime-bridge";
+import { forwardRuntimeRequest } from "../opencode/compatibility/proxy";
+import { contractProfile, runtimeIdentity } from "../opencode/compatibility/runtime";
+import { LOCATION_CONTEXT_HEADER, locationRequestOptions, readLocationContext } from "../opencode/compatibility/location";
+import { decodeSessionListScope, prepareLocationImport, readRequestLocations } from "../opencode/compatibility/proxy-locations";
 import { createOpenCodeUpdateService } from "../opencode-update/service";
 import { WorktreeDeletionFence } from "../workspaces/worktree-session-evacuation";
 import { isAutomationPluginRequest, registerAutomationPluginRoute } from "./routes/automation-plugin";
@@ -492,11 +496,21 @@ async function proxyWorkspaceRequest(args) {
         reply.code(403).send({ error: "OpenCode route is not available through a workspace" });
         return;
     }
-    const endpoint = await workspaceManager.getSharedServiceEndpoint(workspaceId);
+    const connection = await workspaceManager.getSharedServiceConnection?.(workspaceId);
+    const endpoint = connection?.endpoint ?? await workspaceManager.getSharedServiceEndpoint(workspaceId);
+    const clientForRequest = () => connection ? Promise.resolve(connection.client) : workspaceManager.getSharedServiceClient();
     if (!endpoint) {
         reply.code(502).send({ error: "OpenCode service is not ready" });
         return;
     }
+    const profile = connection ? await connection.profile() : contractProfile(runtimeIdentity(endpoint));
+    let locationContext;
+    try {
+        locationContext = readLocationContext(request.headers[LOCATION_CONTEXT_HEADER], profile);
+    }
+    catch {
+        return reply.code(400).send({ error: "Invalid location context" });
+    }
     const targetUrl = buildInstanceTargetUrl(endpoint.url, args.pathSuffix);
     if (!targetUrl) {
         reply.code(400).send({ error: "Invalid workspace instance path" });
@@ -508,22 +522,22 @@ async function proxyWorkspaceRequest(args) {
             reply.code(405).send({ error: "Method not allowed" });
             return;
         }
-        const client = await workspaceManager.getSharedServiceClient();
+        const client = await clientForRequest();
         const active = await client.session.active();
         const entries = await Promise.all(Object.entries(active).map(async ([sessionId, status]) => {
             try {
                 const session = await client.session.get({ sessionID: sessionId });
-                return await workspaceManager.ownsDirectory(workspaceId, session.location.directory) ? [sessionId, status] : null;
+                return await workspaceManager.ownsLocation(workspaceId, session.location, client) ? [sessionId, status] : null;
             }
             catch {
                 return null;
             }
         }));
-        reply.send(Object.fromEntries(entries.filter((entry) => entry !== null)));
+        reply.send({ data: Object.fromEntries(entries.filter((entry) => entry !== null)) });
         return;
     }
     if (pathname.replace(/\/+$/, "") === "/api/project") {
-        const projects = await (await workspaceManager.getSharedServiceClient()).project.list();
+        const projects = await (await clientForRequest()).project.list();
         const ownedProjects = await Promise.all(projects.map(async (project) => {
             if (!await workspaceManager.ownsDirectory(workspaceId, project.canonical))
                 return null;
@@ -535,8 +549,8 @@ async function proxyWorkspaceRequest(args) {
     }
     const sessionListHasScope = request.method === "GET"
         && pathname.replace(/\/+$/, "") === "/api/session"
-        && (targetUrl.searchParams.has("cursor") || targetUrl.searchParams.has("project") || targetUrl.searchParams.has("workspace"));
-    const sessionListScope = await authorizeSessionList(targetUrl, request.method, workspaceManager, workspaceId);
+        && (targetUrl.searchParams.has("cursor") || targetUrl.searchParams.has("project"));
+    const sessionListScope = await authorizeSessionList(targetUrl, request.method, workspaceManager, workspaceId, profile, connection?.client);
     if (sessionListScope !== "allowed") {
         reply.code(sessionListScope === "invalid" ? 400 : 403).send({ error: "Session list does not belong to workspace" });
         return;
@@ -545,8 +559,7 @@ async function proxyWorkspaceRequest(args) {
     let globalFormLocation;
     if (isGlobalFormAction(pathname, request.method)) {
         const directoryHeader = request.headers["x-opencode-directory"];
-        const workspaceHeader = request.headers["x-opencode-workspace"];
-        if (Array.isArray(directoryHeader) || Array.isArray(workspaceHeader)) {
+        if (Array.isArray(directoryHeader) || request.headers["x-opencode-workspace"] !== undefined) {
             reply.code(400).send({ error: "Invalid Form location" });
             return;
         }
@@ -564,19 +577,19 @@ async function proxyWorkspaceRequest(args) {
                 return;
             }
         }
-        if (workspaceHeader !== undefined && !workspaceHeader.trim()) {
-            reply.code(400).send({ error: "Invalid Form location" });
-            return;
-        }
-        if (directory !== undefined || workspaceHeader !== undefined) {
-            globalFormLocation = {
-                directory: directory ?? workspace.path,
-                ...(workspaceHeader ? { workspaceID: workspaceHeader } : {}),
-            };
+        if (locationContext && locationContext.directory !== (directory ?? serviceDirectory)) {
+            return reply.code(400).send({ error: "Conflicting Form location" });
         }
+        if (directory !== undefined)
+            globalFormLocation = { ...locationContext, directory };
+    }
+    const imported = prepareSessionImport(pathname, request.method, stripLocationSelectors(targetUrl, request.body, workspace.path, serviceDirectory), serviceDirectory, profile);
+    const requestLocations = readRequestLocations(targetUrl, imported.body, workspace.path, profile);
+    const explicitLocations = [...requestLocations.locations];
+    if (locationContext) {
+        requestLocations.directories.push(locationContext.directory);
+        requestLocations.locations.push(locationContext);
     }
-    const imported = prepareSessionImport(pathname, request.method, stripLocationSelectors(targetUrl, request.body, workspace.path, serviceDirectory), serviceDirectory);
-    const requestLocations = readRequestDirectories(targetUrl, imported.body, workspace.path);
     if (globalFormLocation) {
         requestLocations.directories.push(globalFormLocation.directory);
         requestLocations.locations.push(globalFormLocation);
@@ -588,7 +601,7 @@ async function proxyWorkspaceRequest(args) {
     const promptFiles = readPromptFilePaths(pathname, request.method, imported.body);
     if (requestLocations.invalid
         || !(await allDirectoriesOwned(workspaceManager, workspaceId, requestLocations.directories))
-        || !(await allLocationsOwned(workspaceManager, workspaceId, requestLocations.locations))) {
+        || !(await allLocationsOwned(workspaceManager, workspaceId, requestLocations.locations, connection?.client))) {
         reply.code(requestLocations.invalid ? 400 : 403).send({ error: "Location does not belong to workspace" });
         return;
     }
@@ -603,6 +616,29 @@ async function proxyWorkspaceRequest(args) {
         }
         translatedDirectories.set(directory, translated);
     }
+    if (locationContext && explicitLocations.some(location => translatedDirectories.get(location.directory) !== translatedDirectories.get(locationContext.directory)
+        || (location.workspaceID !== undefined && location.workspaceID !== locationContext.workspaceID))) {
+        return reply.code(400).send({ error: "Conflicting location context" });
+    }
+    const fileListPath = readFileListPath(targetUrl, request.method, requestLocations.directories[0] ?? workspace.path);
+    if (fileListPath.invalid) {
+        reply.code(400).send({ error: "Invalid filesystem path" });
+        return;
+    }
+    if (fileListPath.candidate) {
+        if (!(await workspaceManager.ownsPath(workspaceId, fileListPath.candidate))) {
+            reply.code(403).send({ error: "Filesystem path does not belong to workspace" });
+            return;
+        }
+        const translated = workspaceManager.getServicePathForPath
+            ? await workspaceManager.getServicePathForPath(workspaceId, fileListPath.candidate)
+            : fileListPath.candidate;
+        if (!translated) {
+            reply.code(403).send({ error: "Filesystem path does not belong to workspace" });
+            return;
+        }
+        targetUrl.searchParams.set("path", translated);
+    }
     const mutationIdentities = new Set();
     if (request.method !== "GET" && request.method !== "HEAD") {
         for (const directory of requestLocations.directories) {
@@ -632,9 +668,13 @@ async function proxyWorkspaceRequest(args) {
     }
     const promptBody = replacePromptFileUris(serviceBody, translatedPromptPaths);
     const requestedDirectory = requestLocations.directories[0];
-    const runtimeLocation = { directory: requestedDirectory ? translatedDirectories.get(requestedDirectory) ?? serviceDirectory : serviceDirectory };
+    const runtimeLocation = {
+        directory: requestedDirectory ? translatedDirectories.get(requestedDirectory) ?? serviceDirectory : serviceDirectory,
+        workspaceID: locationContext?.workspaceID ?? explicitLocations.find(location => location.directory === requestedDirectory)?.workspaceID,
+    };
+    const runtimeLocationOptions = locationRequestOptions(runtimeLocation);
     if (pathname.replace(/\/+$/, "") === "/api/pty" && request.method === "GET") {
-        const result = await (await workspaceManager.getSharedServiceClient()).pty.list({ location: runtimeLocation });
+        const result = await (await clientForRequest()).pty.list({ location: { directory: runtimeLocation.directory } }, runtimeLocationOptions);
         const ownership = await Promise.all(result.data.map((pty) => workspaceManager.ownsDirectory(workspaceId, pty.cwd)));
         reply.send({ ...result, data: result.data.filter((_, index) => ownership[index]) });
         return;
@@ -642,7 +682,7 @@ async function proxyWorkspaceRequest(args) {
     const ptyId = getPtyRouteId(pathname);
     if (ptyId) {
         try {
-            const pty = await (await workspaceManager.getSharedServiceClient()).pty.get({ ptyID: ptyId, location: runtimeLocation });
+            const pty = await (await clientForRequest()).pty.get({ ptyID: ptyId, location: { directory: runtimeLocation.directory } }, runtimeLocationOptions);
             if (!(await workspaceManager.ownsDirectory(workspaceId, pty.data.cwd))) {
                 reply.code(403).send({ error: "PTY does not belong to workspace" });
                 return;
@@ -657,7 +697,7 @@ async function proxyWorkspaceRequest(args) {
         }
     }
     if (pathname.replace(/\/+$/, "") === "/api/shell" && request.method === "GET") {
-        const result = await (await workspaceManager.getSharedServiceClient()).shell.list({ location: runtimeLocation });
+        const result = await (await clientForRequest()).shell.list({ location: { directory: runtimeLocation.directory } }, runtimeLocationOptions);
         const ownership = await Promise.all(result.data.map((shell) => workspaceManager.ownsDirectory(workspaceId, shell.cwd)));
         reply.send({ ...result, data: result.data.filter((_, index) => ownership[index]) });
         return;
@@ -665,7 +705,7 @@ async function proxyWorkspaceRequest(args) {
     const shellId = getShellRouteId(pathname);
     if (shellId) {
         try {
-            const shell = await (await workspaceManager.getSharedServiceClient()).shell.get({ id: shellId, location: runtimeLocation });
+            const shell = await (await clientForRequest()).shell.get({ id: shellId, location: { directory: runtimeLocation.directory } }, runtimeLocationOptions);
             if (!(await workspaceManager.ownsDirectory(workspaceId, shell.data.cwd))) {
                 reply.code(403).send({ error: "Shell does not belong to workspace" });
                 return;
@@ -683,7 +723,7 @@ async function proxyWorkspaceRequest(args) {
     if (sessionId && !isGlobalFormAction(pathname, request.method)) {
         let session;
         try {
-            session = await (await workspaceManager.getSharedServiceClient()).session.get({ sessionID: sessionId });
+            session = await (await clientForRequest()).session.get({ sessionID: sessionId });
         }
         catch (error) {
             if (isInvalidRequestError(error)) {
@@ -696,7 +736,7 @@ async function proxyWorkspaceRequest(args) {
             }
             throw error;
         }
-        if (!(await workspaceManager.ownsDirectory(workspaceId, session.location.directory))) {
+        if (!(await workspaceManager.ownsLocation(workspaceId, session.location, await clientForRequest()))) {
             reply.code(403).send({ error: "Session does not belong to workspace" });
             return;
         }
@@ -718,14 +758,26 @@ async function proxyWorkspaceRequest(args) {
     }
     logger.debug({ workspaceId, method: request.method, targetUrl: targetUrl.toString() }, "Proxying request to instance");
     try {
+        connection?.assertCurrent();
+        if (connection || workspaceManager.getSharedServiceFetch) {
+            const headers = sanitizeInstanceProxyRequestHeaders(request.headers, instanceAuthHeader);
+            delete headers[LOCATION_CONTEXT_HEADER];
+            if (locationContext)
+                Object.assign(headers, locationRequestOptions({ ...locationContext, directory: translatedDirectories.get(locationContext.directory) }, { includeDirectory: true })?.headers);
+            if (globalFormLocation)
+                headers["x-opencode-directory"] = encodeURIComponent(translatedDirectories.get(globalFormLocation.directory));
+            return await forwardRuntimeRequest({
+                request, reply, url: targetUrl.toString(), body, headers,
+                fetch: connection?.fetch ?? await workspaceManager.getSharedServiceFetch(), release: releaseMutation,
+                invalidate: () => connection ? connection.invalidate() : workspaceManager.invalidateSharedServiceConnection?.(),
+            });
+        }
         return reply.from(targetUrl.toString(), {
             ...(body !== request.body ? { body } : {}),
             rewriteRequestHeaders: (_originalRequest, headers) => {
                 const outgoingHeaders = sanitizeInstanceProxyRequestHeaders(headers, instanceAuthHeader);
                 if (globalFormLocation) {
                     outgoingHeaders["x-opencode-directory"] = encodeURIComponent(translatedDirectories.get(globalFormLocation.directory));
-                    if (globalFormLocation.workspaceID)
-                        outgoingHeaders["x-opencode-workspace"] = globalFormLocation.workspaceID;
                 }
                 if (logger.isLevelEnabled("trace")) {
                     logger.trace({
@@ -776,77 +828,6 @@ function appendIncomingQuery(targetUrl, incomingUrl) {
         targetUrl.searchParams.append(key, value);
     return targetUrl;
 }
-function readRequestDirectories(targetUrl, body, defaultDirectory) {
-    const directories = [];
-    const locations = [];
-    let invalid = false;
-    for (const key of ["location[directory]", "directory"]) {
-        for (const value of targetUrl.searchParams.getAll(key)) {
-            if (value.trim())
-                directories.push(value);
-            else
-                invalid = true;
-        }
-    }
-    const queryWorkspaces = targetUrl.searchParams.getAll("location[workspace]");
-    const queryDirectories = targetUrl.searchParams.getAll("location[directory]");
-    if (queryWorkspaces.length > 1 || queryDirectories.length > 1)
-        invalid = true;
-    if (queryWorkspaces.length === 1) {
-        const workspaceID = queryWorkspaces[0];
-        if (!workspaceID.trim())
-            invalid = true;
-        else
-            locations.push({ directory: queryDirectories[0] ?? defaultDirectory, workspaceID });
-    }
-    if (targetUrl.pathname.replace(/\/+$/, "") !== "/api/session" && targetUrl.searchParams.has("workspace"))
-        invalid = true;
-    if (targetUrl.searchParams.has("workspaceID") || targetUrl.searchParams.has("location[workspaceID]"))
-        invalid = true;
-    if (body && typeof body === "object" && !Array.isArray(body) && !Buffer.isBuffer(body)) {
-        const input = body;
-        if ("directory" in input) {
-            if (typeof input.directory === "string" && input.directory.trim())
-                directories.push(input.directory);
-            else
-                invalid = true;
-        }
-        if ("location" in input) {
-            const location = input.location;
-            if (location && typeof location === "object" && !Array.isArray(location)) {
-                const source = location;
-                const directory = source.directory;
-                if (typeof directory === "string" && directory.trim())
-                    directories.push(directory);
-                else
-                    invalid = true;
-                if (source.workspace !== undefined)
-                    invalid = true;
-                if (source.workspaceID !== undefined) {
-                    if (typeof source.workspaceID === "string" && source.workspaceID.trim() && typeof directory === "string" && directory.trim()) {
-                        locations.push({ directory, workspaceID: source.workspaceID });
-                    }
-                    else
-                        invalid = true;
-                }
-            }
-            else if (location !== null && location !== undefined) {
-                invalid = true;
-            }
-        }
-        if (/^\/api\/session\/[^/]+\/move\/?$/.test(targetUrl.pathname) && "workspaceID" in input) {
-            if (typeof input.workspaceID === "string" && input.workspaceID.trim() && typeof input.directory === "string" && input.directory.trim()) {
-                locations.push({ directory: input.directory, workspaceID: input.workspaceID });
-            }
-            else
-                invalid = true;
-        }
-        else if ("workspaceID" in input) {
-            invalid = true;
-        }
-    }
-    return { directories, locations, invalid };
-}
 function readNativeCwd(targetUrl, body, locations) {
     if (!/^\/api\/(?:shell|pty)\/?$/.test(targetUrl.pathname) || !body || typeof body !== "object" || Array.isArray(body) || Buffer.isBuffer(body))
         return;
@@ -858,11 +839,33 @@ function readNativeCwd(targetUrl, body, locations) {
     else
         locations.invalid = true;
 }
+function readFileListPath(targetUrl, method, defaultDirectory) {
+    if (method !== "GET" || targetUrl.pathname.replace(/\/+$/, "") !== "/api/fs/list") {
+        return { invalid: false };
+    }
+    const values = targetUrl.searchParams.getAll("path");
+    if (values.length > 1)
+        return { invalid: true };
+    const requested = values[0]?.trim() || ".";
+    if (requested.includes("\0"))
+        return { invalid: true };
+    const windowsBase = /^[A-Za-z]:[\\/]/.test(defaultDirectory) || /^[\\/]{2}[^\\/]/.test(defaultDirectory);
+    if (!windowsBase && path.win32.isAbsolute(requested) && !path.posix.isAbsolute(requested)) {
+        return { candidate: path.win32.normalize(requested), invalid: false };
+    }
+    return {
+        candidate: windowsBase
+            ? path.win32.resolve(defaultDirectory, requested)
+            : path.posix.resolve(defaultDirectory, requested),
+        invalid: false,
+    };
+}
 function sanitizeInstanceProxyRequestHeaders(headers, authorization) {
     const blocked = new Set([
         "authorization", "connection", "cookie", "forwarded", "host", "keep-alive", "proxy-authenticate",
         "proxy-authorization", "proxy-connection", "set-cookie", "te", "trailer", "transfer-encoding", "upgrade",
         "x-forwarded-for", "x-forwarded-host", "x-forwarded-port", "x-forwarded-proto",
+        LOCATION_CONTEXT_HEADER,
     ]);
     const connection = headers.connection;
     for (const name of (Array.isArray(connection) ? connection.join(",") : connection ?? "").split(","))
@@ -900,9 +903,9 @@ export function redactSecrets(value) {
 async function allDirectoriesOwned(manager, workspaceId, directories) {
     return (await Promise.all(directories.map((directory) => manager.ownsDirectory(workspaceId, directory)))).every(Boolean);
 }
-async function allLocationsOwned(manager, workspaceId, locations) {
-    const unique = new Map(locations.map((location) => [`${location.directory}\0${location.workspaceID ?? ""}`, location]));
-    return (await Promise.all([...unique.values()].map((location) => manager.ownsLocation(workspaceId, location)))).every(Boolean);
+async function allLocationsOwned(manager, workspaceId, locations, client) {
+    const unique = new Map(locations.map((location) => [JSON.stringify([location.directory, location.workspaceID]), location]));
+    return (await Promise.all([...unique.values()].map((location) => manager.ownsLocation(workspaceId, location, client)))).every(Boolean);
 }
 async function allPathsOwned(manager, workspaceId, paths) {
     return (await Promise.all(paths.map((candidate) => manager.ownsPath(workspaceId, candidate)))).every(Boolean);
@@ -910,6 +913,9 @@ async function allPathsOwned(manager, workspaceId, paths) {
 function applyDefaultWorkspaceLocation(targetUrl, body, method, directory, hasLocation, sessionRoute) {
     if (hasLocation || sessionRoute)
         return body;
+    if (/^\/api\/(?:credential|project)(?:\/|$)/.test(targetUrl.pathname)
+        || /^\/api\/permission\/saved(?:\/|$)/.test(targetUrl.pathname))
+        return body;
     if (targetUrl.pathname === "/api/session" && method === "GET") {
         targetUrl.searchParams.set("directory", directory);
         return body;
@@ -930,99 +936,53 @@ function getSessionRouteId(pathname) {
     return match[1];
 }
 function isGlobalFormAction(pathname, method) {
-    return method === "POST" && /^\/api\/session\/global\/form\/[^/]+\/(?:reply|cancel)\/?$/.test(pathname);
+    return (method === "POST" && /^\/api\/session\/global\/form\/[^/]+\/reply\/?$/.test(pathname))
+        || (method === "DELETE" && /^\/api\/session\/global\/form\/[^/]+\/?$/.test(pathname));
 }
-async function authorizeSessionList(targetUrl, method, manager, workspaceId) {
+async function authorizeSessionList(targetUrl, method, manager, workspaceId, profile, client) {
     if (method !== "GET" || targetUrl.pathname.replace(/\/+$/, "") !== "/api/session")
         return "allowed";
     const cursors = targetUrl.searchParams.getAll("cursor");
     if (cursors.length > 1)
         return "invalid";
     if (cursors.length === 1) {
-        const scope = decodeSessionListCursor(cursors[0]);
+        const scope = decodeSessionListScope(cursors[0], profile);
         if (!scope)
             return "invalid";
-        for (const key of ["directory", "workspace", "location[directory]", "location[workspace]", "project", "subpath"]) {
+        for (const key of ["directory", "location[directory]", "project", "subpath", ...(profile === "legacy" ? ["workspace", "location[workspace]"] : [])]) {
             targetUrl.searchParams.delete(key);
         }
-        return ownsSessionListScope(manager, workspaceId, scope);
+        return ownsSessionListScope(manager, workspaceId, scope, client);
     }
     const projects = targetUrl.searchParams.getAll("project");
     const subpaths = targetUrl.searchParams.getAll("subpath");
-    const workspaces = targetUrl.searchParams.getAll("workspace");
     const directories = targetUrl.searchParams.getAll("directory");
-    if (projects.length > 1 || subpaths.length > 1 || workspaces.length > 1 || directories.length > 1
+    if (projects.length > 1 || subpaths.length > 1 || directories.length > 1
         || (subpaths.length && !projects.length))
         return "invalid";
-    const workspace = workspaces[0];
     const directory = directories[0];
-    if ((workspace !== undefined && !workspace.trim()) || (directory !== undefined && !directory.trim()))
+    if (directory !== undefined && !directory.trim())
         return "invalid";
     if (!projects.length) {
-        if (workspace && directory)
-            return ownsSessionListScope(manager, workspaceId, { workspace, directory });
-        if (workspace)
-            return ownsSessionListScope(manager, workspaceId, { workspace });
         return "allowed";
     }
     const project = projects[0];
     const subpath = subpaths[0];
     if (!project || (subpath !== undefined && !isSafeRelativePath(subpath)))
         return "invalid";
-    return ownsSessionListScope(manager, workspaceId, { ...(workspace ? { workspace } : {}), project, subpath });
-}
-function decodeSessionListCursor(cursor) {
-    if (!cursor || !/^[A-Za-z0-9_-]+$/.test(cursor))
-        return null;
-    try {
-        const value = JSON.parse(Buffer.from(cursor, "base64url").toString("utf8"));
-        if (!value || typeof value !== "object" || Array.isArray(value))
-            return null;
-        const anchor = value.anchor;
-        if (!anchor || typeof anchor !== "object" || Array.isArray(anchor)
-            || typeof anchor.id !== "string" || !anchor.id
-            || typeof anchor.time !== "number" || !Number.isFinite(anchor.time)
-            || (anchor.direction !== "previous" && anchor.direction !== "next"))
-            return null;
-        if (value.workspace !== undefined && (typeof value.workspace !== "string" || !value.workspace.trim()))
-            return null;
-        if (value.search !== undefined && typeof value.search !== "string")
-            return null;
-        if (value.order !== undefined && value.order !== "asc" && value.order !== "desc")
-            return null;
-        if (typeof value.directory === "string" && value.directory.trim() && value.project === undefined && value.subpath === undefined) {
-            return { ...(typeof value.workspace === "string" ? { workspace: value.workspace } : {}), directory: value.directory };
-        }
-        if (typeof value.project === "string" && value.project.trim() && value.directory === undefined) {
-            if (value.subpath === undefined) {
-                return { ...(typeof value.workspace === "string" ? { workspace: value.workspace } : {}), project: value.project };
-            }
-            if (typeof value.subpath === "string" && isSafeRelativePath(value.subpath)) {
-                return { ...(typeof value.workspace === "string" ? { workspace: value.workspace } : {}), project: value.project, subpath: value.subpath };
-            }
-        }
-        if (typeof value.workspace === "string" && value.directory === undefined && value.project === undefined && value.subpath === undefined) {
-            return { workspace: value.workspace };
-        }
-        return null;
-    }
-    catch {
-        return null;
-    }
+    return ownsSessionListScope(manager, workspaceId, { project, subpath, workspaceID: targetUrl.searchParams.get("workspace") ?? undefined }, client);
 }
 function isSafeRelativePath(value) {
     return value === "" || (!path.posix.isAbsolute(value) && !path.win32.isAbsolute(value) && !value.split(/[\\/]/).includes(".."));
 }
-async function ownsSessionListScope(manager, workspaceId, scope) {
+async function ownsSessionListScope(manager, workspaceId, scope, client) {
     if (scope.directory) {
-        const owned = scope.workspace
-            ? await manager.ownsLocation(workspaceId, { directory: scope.directory, workspaceID: scope.workspace })
-            : await manager.ownsDirectory(workspaceId, scope.directory);
+        const owned = await manager.ownsLocation(workspaceId, { directory: scope.directory, workspaceID: scope.workspaceID }, client);
         return owned ? "allowed" : "foreign";
     }
     if (!scope.project)
-        return scope.workspace && await manager.ownsLocationWorkspace(workspaceId, scope.workspace) ? "allowed" : "foreign";
-    const project = (await (await manager.getSharedServiceClient()).project.list()).find((candidate) => candidate.id === scope.project);
+        return "foreign";
+    const project = (await (client ?? await manager.getSharedServiceClient()).project.list()).find((candidate) => candidate.id === scope.project);
     if (!project)
         return "foreign";
     const directory = scope.subpath === undefined
@@ -1030,16 +990,14 @@ async function ownsSessionListScope(manager, workspaceId, scope) {
         : /^[A-Za-z]:[\\/]|^\\\\/.test(project.canonical)
             ? path.win32.resolve(project.canonical, scope.subpath)
             : path.posix.resolve(project.canonical, scope.subpath);
-    const owned = scope.workspace
-        ? await manager.ownsLocation(workspaceId, { directory, workspaceID: scope.workspace })
-        : await manager.ownsDirectory(workspaceId, directory);
+    const owned = await manager.ownsLocation(workspaceId, { directory, workspaceID: scope.workspaceID }, client);
     return owned ? "allowed" : "foreign";
 }
 function getPtyRouteId(pathname) {
     return pathname.replace(/\/+$/, "").match(/^\/api\/pty\/([^/]+)$/)?.[1] ?? null;
 }
 function getShellRouteId(pathname) {
-    return pathname.replace(/\/+$/, "").match(/^\/api\/shell\/([^/]+)(?:\/output|\/timeout)?$/)?.[1] ?? null;
+    return pathname.replace(/\/+$/, "").match(/^\/api\/shell\/([^/]+)(?:\/output)?$/)?.[1] ?? null;
 }
 function buildInstanceTargetUrl(endpoint, pathSuffix) {
     const suffix = pathSuffix ?? "";
@@ -1078,39 +1036,42 @@ function isAllowedInstanceApiRoute(method, pathname) {
         ["GET", /^\/api\/(?:mcp\/resource|websearch\/provider)$/],
         ["GET", /^\/api\/agent\/[^/]+$/],
         ["GET", /^\/api\/model\/default$/],
-        ["GET", /^\/api\/(?:permission|question)\/request$/],
-        ["GET", /^\/api\/form\/request$/],
-        ["GET", /^\/api\/project\/current$/],
+        ["GET", /^\/api\/permission\/request$/],
+        ["GET", /^\/api\/form$/],
         ["GET", /^\/api\/project$/],
         ["GET", /^\/api\/vcs(?:\/status)?$/],
         ["GET", /^\/api\/fs\/(?:list|read\/.+)$/],
-        ["GET", /^\/api\/(?:pty|shell)(?:\/[^/]+(?:\/output)?)?$/],
+        ["GET", /^\/api\/pty(?:\/[^/]+)?$/],
+        ["GET", /^\/api\/shell(?:\/[^/]+(?:\/output)?)?$/],
         ["POST", /^\/api\/(?:pty|shell)$/],
         ["PUT", /^\/api\/pty\/[^/]+$/],
         ["DELETE", /^\/api\/pty\/[^/]+$/],
         ["DELETE", /^\/api\/shell\/[^/]+$/],
-        ["PATCH", /^\/api\/shell\/[^/]+\/timeout$/],
-        ["POST", /^\/api\/mcp\/[^/]+\/(?:connect|disconnect)$/],
+        ["POST", /^\/api\/experimental\/mcp\/[^/]+\/(?:connect|disconnect)$/],
         ["DELETE", /^\/api\/credential\/[^/]+$/],
         ["POST", /^\/api\/integration\/[^/]+\/connect\/(?:key|oauth|command)$/],
         ["GET", /^\/api\/integration\/[^/]+\/connect\/(?:oauth|command)\/[^/]+$/],
         ["DELETE", /^\/api\/integration\/[^/]+\/connect\/(?:oauth|command)\/[^/]+$/],
         ["POST", /^\/api\/integration\/[^/]+\/connect\/oauth\/[^/]+\/complete$/],
         ["GET", /^\/api\/session(?:\/active)?$/],
-        ["POST", /^\/api\/session(?:\/import)?$/],
+        ["POST", /^\/api\/session$/],
+        ["POST", /^\/api\/experimental\/session\/import$/],
         ["GET", /^\/api\/session\/[^/]+(?:\/message(?:\/[^/]+)?)?$/],
         ["GET", /^\/api\/session\/[^/]+\/inbox$/],
         ["GET", /^\/api\/session\/[^/]+\/(?:permission|form)$/],
         ["DELETE", /^\/api\/session\/[^/]+$/],
         ["DELETE", /^\/api\/session\/[^/]+\/inbox\/[^/]+$/],
-        ["POST", /^\/api\/session\/[^/]+\/(?:agent|model|rename|move|prompt|command|shell|compact|interrupt|wait|background|fork)$/],
-        ["POST", /^\/api\/session\/[^/]+\/inbox\/[^/]+\/(?:steer|queue)$/],
-        ["POST", /^\/api\/session\/[^/]+\/revert\/(?:stage|clear)$/],
-        ["PUT", /^\/api\/session\/[^/]+\/instructions\/entries\/[^/]+$/],
-        ["DELETE", /^\/api\/session\/[^/]+\/instructions\/entries\/[^/]+$/],
+        ["PATCH", /^\/api\/session\/[^/]+$/],
+        ["POST", /^\/api\/session\/[^/]+\/(?:agent|model|move|prompt|command|shell|compact|interrupt|background|fork)$/],
+        ["POST", /^\/api\/experimental\/session\/[^/]+\/wait$/],
+        ["PATCH", /^\/api\/session\/[^/]+\/inbox\/[^/]+$/],
+        ["POST", /^\/api\/session\/[^/]+\/revert\/stage$/],
+        ["DELETE", /^\/api\/session\/[^/]+\/revert$/],
+        ["PUT", /^\/api\/experimental\/session\/[^/]+\/instructions\/entries\/[^/]+$/],
+        ["DELETE", /^\/api\/experimental\/session\/[^/]+\/instructions\/entries\/[^/]+$/],
         ["POST", /^\/api\/session\/[^/]+\/permission\/[^/]+\/reply$/],
-        ["POST", /^\/api\/session\/[^/]+\/question\/[^/]+\/(?:reply|reject)$/],
-        ["POST", /^\/api\/session\/[^/]+\/form\/[^/]+\/(?:reply|cancel)$/],
+        ["POST", /^\/api\/session\/[^/]+\/form\/[^/]+\/reply$/],
+        ["DELETE", /^\/api\/session\/[^/]+\/form\/[^/]+$/],
         ["GET", /^\/api\/experimental\/session\/[^/]+\/log$/],
     ];
     return allowed.some(([allowedMethod, pattern]) => method === allowedMethod && pattern.test(route));
@@ -1141,7 +1102,7 @@ function replaceRequestDirectories(targetUrl, body, replacements, pathname, meth
             input[key] = replacements.get(value);
     }
     input.location = replaceLocation(input.location);
-    if (pathname !== "/api/session/import" || method !== "POST")
+    if (pathname !== "/api/experimental/session/import" || method !== "POST")
         return input;
     input.info = input.info && typeof input.info === "object" && !Array.isArray(input.info) && !Buffer.isBuffer(input.info)
         ? { ...input.info, location: replaceLocation(input.info.location) }
@@ -1267,62 +1228,11 @@ function replacePromptFileUris(body, replacements) {
         }),
     };
 }
-function prepareSessionImport(pathname, method, body, directory) {
+function prepareSessionImport(pathname, method, body, directory, profile) {
     const result = { body, directories: [], locations: [], invalid: false };
-    if (pathname !== "/api/session/import" || method !== "POST")
-        return result;
-    if (!body || typeof body !== "object" || Array.isArray(body) || Buffer.isBuffer(body)) {
-        result.invalid = true;
+    if (pathname !== "/api/experimental/session/import" || method !== "POST")
         return result;
-    }
-    const input = body;
-    const addLocation = (owner, key) => {
-        const value = owner[key];
-        if (value === null || value === undefined) {
-            owner[key] = { directory };
-            result.directories.push(directory);
-            return;
-        }
-        if (!value || typeof value !== "object" || Array.isArray(value) || Buffer.isBuffer(value)) {
-            result.invalid = true;
-            return;
-        }
-        const location = value;
-        if (location.directory === null || location.directory === undefined)
-            location.directory = directory;
-        if (typeof location.directory !== "string" || !location.directory.trim()) {
-            result.invalid = true;
-            return;
-        }
-        result.directories.push(location.directory);
-        if (location.workspace !== undefined)
-            result.invalid = true;
-        if (location.workspaceID !== undefined) {
-            if (typeof location.workspaceID === "string" && location.workspaceID.trim()) {
-                result.locations.push({ directory: location.directory, workspaceID: location.workspaceID });
-            }
-            else
-                result.invalid = true;
-        }
-    };
-    addLocation(input, "location");
-    if (input.info && typeof input.info === "object" && !Array.isArray(input.info) && !Buffer.isBuffer(input.info)) {
-        addLocation(input.info, "location");
-    }
-    if (Array.isArray(input.messages)) {
-        for (const value of input.messages) {
-            if (!value || typeof value !== "object" || Array.isArray(value) || Buffer.isBuffer(value))
-                continue;
-            const message = value;
-            if (message.type !== "location-switched")
-                continue;
-            addLocation(message, "location");
-            if (message.previous && typeof message.previous === "object" && !Array.isArray(message.previous) && !Buffer.isBuffer(message.previous)) {
-                addLocation(message.previous, "location");
-            }
-        }
-    }
-    return result;
+    return prepareLocationImport(body, directory, profile);
 }
 function normalizeInstanceSuffix(pathSuffix) {
     if (!pathSuffix || pathSuffix === "/") {