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

package/dist/server/__tests__/instance-proxy-legacy.test.js

@@ -0,0 +1,111 @@
+import assert from "node:assert/strict";
+import { test } from "node:test";
+import Fastify from "fastify";
+import { registerInstanceProxyRoutes } from "../http-server";
+import { createRuntimeFetch } from "../../opencode/compatibility/transport";
+import { rememberRuntime } from "../../opencode/compatibility/runtime";
+import { LOCATION_CONTEXT_HEADER, locationRequestOptions } from "../../opencode/compatibility/location";
+import { WorktreeDeletionFence } from "../../workspaces/worktree-session-evacuation";
+import { OpenCodeSharedService } from "../../workspaces/opencode-service";
+import { legacyContractFixture } from "../../opencode/compatibility/contract-fixture";
+test("legacy authority precedes translation for Forms, session writes, cursors and imported history", async () => {
+    const upstream = Fastify();
+    let forwarded = 0;
+    upstream.all("/*", async (request) => { forwarded++; return { method: request.method, url: request.url, body: request.body, headers: request.headers }; });
+    await upstream.listen({ host: "127.0.0.1", port: 0 });
+    const endpoint = { url: `http://127.0.0.1:${upstream.server.address().port}`, auth: { type: "basic", username: "opencode", password: "fixture" } };
+    rememberRuntime(endpoint, { version: "2.0.3", pid: 1, discovery: "health" });
+    const client = { session: { get: async ({ sessionID }) => ({ location: { directory: "/native", workspaceID: sessionID === "foreign" ? "two" : "one" } }) } };
+    const connection = { endpoint, client, fetch: createRuntimeFetch(endpoint), assertCurrent() { }, invalidate() { }, profile: async () => "legacy" };
+    const directories = new Set(["/host", "/native"]);
+    const manager = {
+        get: () => ({ id: "w", path: "/host" }),
+        getSharedServiceEndpoint: async () => { throw new Error("Pinned request must not reacquire endpoint"); },
+        getSharedServiceConnection: async () => connection,
+        getSharedServiceClient: async () => { throw new Error("Pinned request must not reacquire client"); },
+        getInstanceAuthorizationHeader: () => undefined,
+        getServiceDirectory: () => "/native",
+        getServiceDirectoryForPath: async (_id, directory) => directories.has(directory) ? "/native" : undefined,
+        getWorktreeIdentityForPath: async (_id, directory) => directories.has(directory) ? "root" : undefined,
+        ownsDirectory: async (_id, directory) => directories.has(directory), ownsPath: async () => false,
+        ownsLocation: async (_id, location, pinned) => {
+            assert.equal(pinned, client);
+            return directories.has(location.directory) && (location.workspaceID === undefined || location.workspaceID === "one");
+        },
+    };
+    const app = Fastify();
+    registerInstanceProxyRoutes(app, { workspaceManager: manager, worktreeDeletionFence: new WorktreeDeletionFence(), logger: { debug() { }, error() { }, isLevelEnabled: () => false } });
+    const prefix = "/workspaces/w/instance";
+    const context = (workspaceID) => locationRequestOptions({ directory: "/host", workspaceID }).headers;
+    try {
+        const form = await app.inject({ method: "DELETE", url: `${prefix}/api/session/global/form/f`, headers: { ...context("one"), "x-opencode-directory": encodeURIComponent("/host"), cookie: "browser=secret" } });
+        assert.equal(form.statusCode, 200, form.body);
+        assert.equal(form.json().url, "/api/session/global/form/f/cancel");
+        assert.equal(form.json().method, "POST");
+        assert.equal(form.json().headers["x-opencode-directory"], encodeURIComponent("/native"));
+        assert.equal(form.json().headers["x-opencode-workspace"], "one");
+        assert.equal(form.json().headers[LOCATION_CONTEXT_HEADER], undefined);
+        assert.equal(form.json().headers.cookie, undefined);
+        const create = await app.inject({ method: "POST", url: `${prefix}/api/session`, headers: context("one"), payload: { location: { directory: "/host" } } });
+        assert.equal(create.statusCode, 200, create.body);
+        assert.deepEqual(create.json().body.location, { directory: "/native", workspaceID: "one" });
+        const cursor = (workspace) => Buffer.from(JSON.stringify({ directory: "/native", workspace, anchor: { id: "s", time: 1, direction: "next" } })).toString("base64url");
+        const listed = await app.inject(`${prefix}/api/session?cursor=${cursor("one")}&workspace=ignored&directory=/foreign`);
+        assert.equal(listed.statusCode, 200, listed.body);
+        assert.equal(new URL(listed.json().url, endpoint.url).searchParams.get("cursor"), cursor("one"));
+        assert.equal(new URL(listed.json().url, endpoint.url).searchParams.has("workspace"), false);
+        const before = forwarded;
+        for (const request of [
+            { method: "DELETE", url: `${prefix}/api/session/global/form/f`, headers: { ...context("two"), "x-opencode-directory": encodeURIComponent("/host") } },
+            { method: "PATCH", url: `${prefix}/api/session/foreign`, payload: { title: "forbidden" } },
+            { method: "GET", url: `${prefix}/api/session?cursor=${cursor("two")}` },
+            { method: "POST", url: `${prefix}/api/experimental/session/import`, payload: {
+                    location: { directory: "/host", workspaceID: "one" }, info: { location: { directory: "/host", workspaceID: "one" } },
+                    messages: [{ type: "location-switched", location: { directory: "/host", workspaceID: "two" } }],
+                } },
+        ])
+            assert.equal((await app.inject(request)).statusCode, 403);
+        assert.equal(forwarded, before, "foreign identity is refused before forwarding any mutation");
+    }
+    finally {
+        await app.close();
+        await upstream.close();
+    }
+});
+test("the first legacy-context proxy request after reconnect negotiates before authorization", async () => {
+    const upstream = Fastify();
+    const calls = [];
+    upstream.get("/openapi.json", async () => { calls.push("schema"); return legacyContractFixture; });
+    upstream.get("/api/form/request", async (request) => {
+        calls.push("forms");
+        assert.equal(request.query["location[workspace]"], "one");
+        return { data: [], location: { directory: "/repo", workspaceID: "one" } };
+    });
+    await upstream.listen({ host: "127.0.0.1", port: 0 });
+    const endpoint = { url: `http://127.0.0.1:${upstream.server.address().port}` };
+    rememberRuntime(endpoint, { version: "next-contract", pid: 1, discovery: "health" });
+    const service = new OpenCodeSharedService();
+    await service.client({ kind: "lifecycle", identity: "isolated-test", lifecycle: { discover: async () => endpoint, ensure: async () => endpoint } });
+    const app = Fastify();
+    registerInstanceProxyRoutes(app, { workspaceManager: {
+            get: () => ({ path: "/repo" }),
+            getSharedServiceConnection: () => service.acquire(), getSharedServiceEndpoint: async () => endpoint,
+            getSharedServiceClient: () => service.client(), getInstanceAuthorizationHeader: () => undefined,
+            getWorktreeIdentityForPath: async () => "root", ownsDirectory: async () => true, ownsPath: async () => false,
+            ownsLocation: async (_id, location) => {
+                assert.deepEqual(calls, ["schema"], "contract must be selected before profile-dependent authorization");
+                return location.directory === "/repo" && (location.workspaceID === undefined || location.workspaceID === "one");
+            },
+        }, worktreeDeletionFence: new WorktreeDeletionFence(), logger: { debug() { }, error() { } } });
+    try {
+        const response = await app.inject({ url: "/workspaces/w/instance/api/form?location[directory]=/repo", headers: locationRequestOptions({ directory: "/repo", workspaceID: "one" }).headers });
+        assert.equal(response.statusCode, 200, response.body);
+        assert.deepEqual(calls, ["schema", "forms"]);
+    }
+    finally {
+        await service.shutdown();
+        await app.close();
+        await upstream.close();
+    }
+});
+//# sourceMappingURL=instance-proxy-legacy.test.js.map

package/dist/server/__tests__/instance-proxy-legacy.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"instance-proxy-legacy.test.js","sourceRoot":"","sources":["../../../src/server/__tests__/instance-proxy-legacy.test.ts"],"names":[],"mappings":"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","sourcesContent":["import assert from \"node:assert/strict\"\nimport { test } from \"node:test\"\nimport Fastify from \"fastify\"\nimport type { OpenCodeClient } from \"@opencode/client\"\nimport type { Endpoint } from \"@opencode/client/service\"\nimport { registerInstanceProxyRoutes, type InstanceProxyWorkspaceManager } from \"../http-server\"\nimport { createRuntimeFetch } from \"../../opencode/compatibility/transport\"\nimport { rememberRuntime } from \"../../opencode/compatibility/runtime\"\nimport { LOCATION_CONTEXT_HEADER, locationRequestOptions } from \"../../opencode/compatibility/location\"\nimport { WorktreeDeletionFence } from \"../../workspaces/worktree-session-evacuation\"\nimport { OpenCodeSharedService } from \"../../workspaces/opencode-service\"\nimport { legacyContractFixture } from \"../../opencode/compatibility/contract-fixture\"\n\ntest(\"legacy authority precedes translation for Forms, session writes, cursors and imported history\", async () => {\n  const upstream = Fastify()\n  let forwarded = 0\n  upstream.all(\"/*\", async request => { forwarded++; return { method: request.method, url: request.url, body: request.body, headers: request.headers } })\n  await upstream.listen({ host: \"127.0.0.1\", port: 0 })\n  const endpoint: Endpoint = { url: `http://127.0.0.1:${(upstream.server.address() as { port: number }).port}`, auth: { type: \"basic\", username: \"opencode\", password: \"fixture\" } }\n  rememberRuntime(endpoint, { version: \"2.0.3\", pid: 1, discovery: \"health\" })\n  const client = { session: { get: async ({ sessionID }: { sessionID: string }) => ({ location: { directory: \"/native\", workspaceID: sessionID === \"foreign\" ? \"two\" : \"one\" } }) } } as unknown as OpenCodeClient\n  const connection = { endpoint, client, fetch: createRuntimeFetch(endpoint), assertCurrent() {}, invalidate() {}, profile: async () => \"legacy\" as const }\n  const directories = new Set([\"/host\", \"/native\"])\n  const manager: InstanceProxyWorkspaceManager = {\n    get: () => ({ id: \"w\", path: \"/host\" }) as never,\n    getSharedServiceEndpoint: async () => { throw new Error(\"Pinned request must not reacquire endpoint\") },\n    getSharedServiceConnection: async () => connection,\n    getSharedServiceClient: async () => { throw new Error(\"Pinned request must not reacquire client\") },\n    getInstanceAuthorizationHeader: () => undefined,\n    getServiceDirectory: () => \"/native\",\n    getServiceDirectoryForPath: async (_id, directory) => directories.has(directory) ? \"/native\" : undefined,\n    getWorktreeIdentityForPath: async (_id, directory) => directories.has(directory) ? \"root\" : undefined,\n    ownsDirectory: async (_id, directory) => directories.has(directory), ownsPath: async () => false,\n    ownsLocation: async (_id, location, pinned) => {\n      assert.equal(pinned, client)\n      return directories.has(location.directory) && (location.workspaceID === undefined || location.workspaceID === \"one\")\n    },\n  }\n  const app = Fastify()\n  registerInstanceProxyRoutes(app, { workspaceManager: manager, worktreeDeletionFence: new WorktreeDeletionFence(), logger: { debug() {}, error() {}, isLevelEnabled: () => false } as never })\n  const prefix = \"/workspaces/w/instance\"\n  const context = (workspaceID: string) => locationRequestOptions({ directory: \"/host\", workspaceID })!.headers\n  try {\n    const form = await app.inject({ method: \"DELETE\", url: `${prefix}/api/session/global/form/f`, headers: { ...context(\"one\"), \"x-opencode-directory\": encodeURIComponent(\"/host\"), cookie: \"browser=secret\" } })\n    assert.equal(form.statusCode, 200, form.body)\n    assert.equal(form.json().url, \"/api/session/global/form/f/cancel\")\n    assert.equal(form.json().method, \"POST\")\n    assert.equal(form.json().headers[\"x-opencode-directory\"], encodeURIComponent(\"/native\"))\n    assert.equal(form.json().headers[\"x-opencode-workspace\"], \"one\")\n    assert.equal(form.json().headers[LOCATION_CONTEXT_HEADER], undefined)\n    assert.equal(form.json().headers.cookie, undefined)\n    const create = await app.inject({ method: \"POST\", url: `${prefix}/api/session`, headers: context(\"one\"), payload: { location: { directory: \"/host\" } } })\n    assert.equal(create.statusCode, 200, create.body)\n    assert.deepEqual(create.json().body.location, { directory: \"/native\", workspaceID: \"one\" })\n    const cursor = (workspace: string) => Buffer.from(JSON.stringify({ directory: \"/native\", workspace, anchor: { id: \"s\", time: 1, direction: \"next\" } })).toString(\"base64url\")\n    const listed = await app.inject(`${prefix}/api/session?cursor=${cursor(\"one\")}&workspace=ignored&directory=/foreign`)\n    assert.equal(listed.statusCode, 200, listed.body)\n    assert.equal(new URL(listed.json().url, endpoint.url).searchParams.get(\"cursor\"), cursor(\"one\"))\n    assert.equal(new URL(listed.json().url, endpoint.url).searchParams.has(\"workspace\"), false)\n    const before = forwarded\n    for (const request of [\n      { method: \"DELETE\" as const, url: `${prefix}/api/session/global/form/f`, headers: { ...context(\"two\"), \"x-opencode-directory\": encodeURIComponent(\"/host\") } },\n      { method: \"PATCH\" as const, url: `${prefix}/api/session/foreign`, payload: { title: \"forbidden\" } },\n      { method: \"GET\" as const, url: `${prefix}/api/session?cursor=${cursor(\"two\")}` },\n      { method: \"POST\" as const, url: `${prefix}/api/experimental/session/import`, payload: {\n        location: { directory: \"/host\", workspaceID: \"one\" }, info: { location: { directory: \"/host\", workspaceID: \"one\" } },\n        messages: [{ type: \"location-switched\", location: { directory: \"/host\", workspaceID: \"two\" } }],\n      } },\n    ]) assert.equal((await app.inject(request)).statusCode, 403)\n    assert.equal(forwarded, before, \"foreign identity is refused before forwarding any mutation\")\n  } finally { await app.close(); await upstream.close() }\n})\n\ntest(\"the first legacy-context proxy request after reconnect negotiates before authorization\", async () => {\n  const upstream = Fastify()\n  const calls: string[] = []\n  upstream.get(\"/openapi.json\", async () => { calls.push(\"schema\"); return legacyContractFixture })\n  upstream.get(\"/api/form/request\", async request => {\n    calls.push(\"forms\")\n    assert.equal((request.query as Record<string, string>)[\"location[workspace]\"], \"one\")\n    return { data: [], location: { directory: \"/repo\", workspaceID: \"one\" } }\n  })\n  await upstream.listen({ host: \"127.0.0.1\", port: 0 })\n  const endpoint = { url: `http://127.0.0.1:${(upstream.server.address() as { port: number }).port}` }\n  rememberRuntime(endpoint, { version: \"next-contract\", pid: 1, discovery: \"health\" })\n  const service = new OpenCodeSharedService()\n  await service.client({ kind: \"lifecycle\", identity: \"isolated-test\", lifecycle: { discover: async () => endpoint, ensure: async () => endpoint } })\n  const app = Fastify()\n  registerInstanceProxyRoutes(app, { workspaceManager: {\n    get: () => ({ path: \"/repo\" }) as never,\n    getSharedServiceConnection: () => service.acquire(), getSharedServiceEndpoint: async () => endpoint,\n    getSharedServiceClient: () => service.client(), getInstanceAuthorizationHeader: () => undefined,\n    getWorktreeIdentityForPath: async () => \"root\", ownsDirectory: async () => true, ownsPath: async () => false,\n    ownsLocation: async (_id, location) => {\n      assert.deepEqual(calls, [\"schema\"], \"contract must be selected before profile-dependent authorization\")\n      return location.directory === \"/repo\" && (location.workspaceID === undefined || location.workspaceID === \"one\")\n    },\n  }, worktreeDeletionFence: new WorktreeDeletionFence(), logger: { debug() {}, error() {} } as never })\n  try {\n    const response = await app.inject({ url: \"/workspaces/w/instance/api/form?location[directory]=/repo\", headers: locationRequestOptions({ directory: \"/repo\", workspaceID: \"one\" })!.headers })\n    assert.equal(response.statusCode, 200, response.body)\n    assert.deepEqual(calls, [\"schema\", \"forms\"])\n  } finally { await service.shutdown(); await app.close(); await upstream.close() }\n})\n"]}

package/dist/server/__tests__/instance-proxy.test.js

@@ -5,6 +5,7 @@ import Fastify from "fastify";
 import replyFrom from "@fastify/reply-from";
 import { redactSecrets, registerInstanceProxyRoutes } from "../http-server";
 import { WorktreeDeletionFence } from "../../workspaces/worktree-session-evacuation";
+import { createRuntimeFetch } from "../../opencode/compatibility/transport";
 const apps = [];
 afterEach(async () => Promise.all(apps.splice(0).map((app) => app.close())));
 const cursor = (value) => Buffer.from(JSON.stringify(value)).toString("base64url");
@@ -106,6 +107,12 @@ async function harness(sessionDirectory = "/repo/worktree", activeSessions = {},
     const manager = {
         get: () => ({ id: "workspace", path: workspacePath }),
         getSharedServiceEndpoint: async () => ({ url: `http://127.0.0.1:${address.port}` }),
+        getSharedServiceConnection: async () => ({
+            endpoint: { url: `http://127.0.0.1:${address.port}` }, client,
+            fetch: createRuntimeFetch({ url: `http://127.0.0.1:${address.port}` }),
+            assertCurrent: () => { }, invalidate: () => { invalidations += 1; },
+            profile: async () => "modern",
+        }),
         invalidateSharedServiceConnection: () => { invalidations += 1; },
         getInstanceAuthorizationHeader: () => "Basic internal-secret",
         getServiceDirectory: () => serviceDirectory,
@@ -119,14 +126,13 @@ async function harness(sessionDirectory = "/repo/worktree", activeSessions = {},
             return canonical.includes("/worktree") ? "workspace:worktree" : "workspace:root";
         },
         getServicePathForPath: async (_id, candidate) => {
-            assert.ok(pathOwnershipChecks.includes(candidate), "prompt path must be ownership-checked before translation");
+            assert.ok(pathOwnershipChecks.includes(candidate), "path must be ownership-checked before translation");
             servicePathCalls.push(candidate);
             return pathMappings[candidate] ?? candidate;
         },
         getSharedServiceClient: async () => client,
         ownsLocation: async (_id, location) => owned.has(location.directory)
-            && (!location.workspaceID || location.workspaceID === (location.directory.includes("worktree") ? "worktree-location" : "owned-location")),
-        ownsLocationWorkspace: async (_id, workspaceID) => workspaceID === "owned-location" || workspaceID === "worktree-location",
+            && location.workspaceID === undefined,
         ownsDirectory: async (_id, directory) => owned.has(directory),
         ownsPath: async (_id, candidate) => {
             pathOwnershipChecks.push(candidate);
@@ -153,15 +159,15 @@ async function harness(sessionDirectory = "/repo/worktree", activeSessions = {},
 describe("instance proxy location enforcement", () => {
     it("forwards native execution settlement only for a session owned by the workspace", async () => {
         const { app, requestCount, sessionGets } = await harness();
-        const response = await app.inject({ method: "POST", url: "/workspaces/workspace/instance/api/session/session/wait" });
+        const response = await app.inject({ method: "POST", url: "/workspaces/workspace/instance/api/experimental/session/session/wait" });
         assert.equal(response.statusCode, 200);
-        assert.equal(JSON.parse(response.body).url, "/api/session/session/wait");
+        assert.equal(JSON.parse(response.body).url, "/api/experimental/session/session/wait");
         assert.deepEqual(sessionGets, ["session"]);
         assert.equal(requestCount(), 1);
     });
     it("rejects settlement waits for sessions belonging to another workspace", async () => {
         const { app, requestCount } = await harness("/other");
-        const response = await app.inject({ method: "POST", url: "/workspaces/workspace/instance/api/session/session/wait" });
+        const response = await app.inject({ method: "POST", url: "/workspaces/workspace/instance/api/experimental/session/session/wait" });
         assert.equal(response.statusCode, 403);
         assert.equal(requestCount(), 0);
     });
@@ -188,37 +194,40 @@ describe("instance proxy location enforcement", () => {
             method: "GET",
             url: "/workspaces/workspace/instance/api/session?directory=%2Fother",
         });
+        const activationResponse = await app.inject({
+            method: "POST",
+            url: "/workspaces/workspace/instance/api/plugin/await-activation?location%5Bdirectory%5D=%2Fother",
+        });
         assert.equal(bodyResponse.statusCode, 403);
         assert.equal(queryResponse.statusCode, 403);
+        assert.equal(activationResponse.statusCode, 403);
         assert.equal(requestCount(), 0);
         assert.doesNotMatch(bodyResponse.body, /internal-secret/);
     });
-    it("preserves owned native workspace selectors and rejects mismatched pairs", async () => {
+    it("rejects removed workspace selectors even alongside owned directories", async () => {
         const { app, requestCount } = await harness();
         const query = await app.inject({
             method: "GET",
             url: "/workspaces/workspace/instance/api/model?location%5Bdirectory%5D=%2Frepo%2Fworktree&location%5Bworkspace%5D=worktree-location",
         });
-        assert.equal(query.statusCode, 200);
-        assert.match(JSON.parse(query.body).url, /location%5Bworkspace%5D=worktree-location/);
+        assert.equal(query.statusCode, 400);
         const create = await app.inject({
             method: "POST",
             url: "/workspaces/workspace/instance/api/session",
             payload: { location: { directory: "/repo", workspaceID: "owned-location" } },
         });
-        assert.equal(create.statusCode, 200);
-        assert.equal(JSON.parse(create.body).body.location.workspaceID, "owned-location");
+        assert.equal(create.statusCode, 400);
         const foreign = await app.inject({
             method: "GET",
             url: "/workspaces/workspace/instance/api/model?location%5Bdirectory%5D=%2Frepo%2Fworktree&location%5Bworkspace%5D=owned-location",
         });
-        assert.equal(foreign.statusCode, 403);
+        assert.equal(foreign.statusCode, 400);
         const unsupported = await app.inject({
             method: "GET",
             url: "/workspaces/workspace/instance/api/model?workspace=owned-location",
         });
         assert.equal(unsupported.statusCode, 400);
-        assert.equal(requestCount(), 2);
+        assert.equal(requestCount(), 0);
     });
     it("rejects session admission while a worktree deletion is pending", async () => {
         const { app, worktreeDeletionFence, requestCount } = await harness();
@@ -368,7 +377,7 @@ describe("instance proxy location enforcement", () => {
         const ownedCursor = cursor({ directory: "/repo/worktree", anchor: { id: "session-1", time: 1, direction: "next" } });
         const response = await app.inject({
             method: "GET",
-            url: `/workspaces/workspace/instance/api/session?cursor=${ownedCursor}&directory=%2Fother&workspace=foreign-location`,
+            url: `/workspaces/workspace/instance/api/session?cursor=${ownedCursor}&directory=%2Fother`,
         });
         assert.equal(response.statusCode, 200);
         const upstreamUrl = JSON.parse(response.body).url;
@@ -391,12 +400,12 @@ describe("instance proxy location enforcement", () => {
         assert.equal((await app.inject({
             method: "GET",
             url: `/workspaces/workspace/instance/api/session?cursor=${cursor({ workspace: "foreign-location", directory: "/repo", anchor: { id: "session-1", time: 1, direction: "next" } })}`,
-        })).statusCode, 403);
+        })).statusCode, 400);
         assert.equal((await app.inject({
             method: "GET",
             url: `/workspaces/workspace/instance/api/session?cursor=${cursor({ workspace: "owned-location", anchor: { id: "session-1", time: 1, direction: "next" } })}`,
-        })).statusCode, 200);
-        assert.equal(requestCount(), 2);
+        })).statusCode, 400);
+        assert.equal(requestCount(), 1);
     });
     it("filters PTYs and rejects foreign PTY access", async () => {
         const { app, requestCount } = await harness("/repo/worktree", {}, {}, "/repo", "/repo", {}, {
@@ -485,14 +494,14 @@ describe("instance proxy location enforcement", () => {
     });
     it("permits only native global Forms actions without session hydration", async () => {
         const { app, sessionGets, requestCount } = await harness("/other");
-        for (const action of ["reply", "cancel"]) {
+        for (const [method, suffix] of [["POST", "/reply"], ["DELETE", ""]]) {
             const response = await app.inject({
-                method: "POST",
-                url: `/workspaces/workspace/instance/api/session/global/form/form-1/${action}`,
-                payload: action === "reply" ? { answers: {} } : {},
+                method,
+                url: `/workspaces/workspace/instance/api/session/global/form/form-1${suffix}`,
+                ...(method === "POST" ? { payload: { answer: {} } } : {}),
             });
             assert.equal(response.statusCode, 200);
-            assert.equal(JSON.parse(response.body).url, `/api/session/global/form/form-1/${action}?location%5Bdirectory%5D=%2Frepo`);
+            assert.equal(JSON.parse(response.body).url, `/api/session/global/form/form-1${suffix}?location%5Bdirectory%5D=%2Frepo`);
         }
         assert.deepEqual(sessionGets, []);
         assert.equal(requestCount(), 2);
@@ -503,27 +512,26 @@ describe("instance proxy location enforcement", () => {
         })).statusCode, 403);
         assert.deepEqual(sessionGets, ["global"]);
     });
-    it("forwards a validated global Form root location and workspace", async () => {
+    it("forwards a validated global Form root directory", async () => {
         const { app } = await harness("/repo/worktree", {}, {}, "/repo", "/srv/repo");
         const response = await app.inject({
             method: "POST",
             url: "/workspaces/workspace/instance/api/session/global/form/form-1/reply",
             headers: {
                 "x-opencode-directory": encodeURIComponent("/repo"),
-                "x-opencode-workspace": "owned-location",
             },
             payload: { answers: {} },
         });
         assert.equal(response.statusCode, 200);
         const upstream = JSON.parse(response.body);
         assert.equal(upstream.headers["x-opencode-directory"], encodeURIComponent("/srv/repo"));
-        assert.equal(upstream.headers["x-opencode-workspace"], "owned-location");
+        assert.equal(upstream.headers["x-opencode-workspace"], undefined);
     });
     it("translates and forwards a validated global Form worktree location", async () => {
         const { app } = await harness("/repo/worktree", {}, {}, "/repo", "/srv/repo", {}, {}, {}, { "/repo/worktree": "/srv/worktree" });
         const response = await app.inject({
-            method: "POST",
-            url: "/workspaces/workspace/instance/api/session/global/form/form-1/cancel",
+            method: "DELETE",
+            url: "/workspaces/workspace/instance/api/session/global/form/form-1",
             headers: { "x-opencode-directory": encodeURIComponent("/repo/worktree") },
             payload: {},
         });
@@ -553,7 +561,7 @@ describe("instance proxy location enforcement", () => {
                 "x-opencode-workspace": "foreign-location",
             },
             payload: { answers: {} },
-        })).statusCode, 403);
+        })).statusCode, 400);
         assert.equal(requestCount(), 0);
     });
     it("decodes, translates, and re-encodes Unicode global Form locations", async () => {
@@ -602,7 +610,7 @@ describe("instance proxy location enforcement", () => {
         });
         const response = await app.inject({ method: "GET", url: "/workspaces/workspace/instance/api/session/active" });
         assert.equal(response.statusCode, 200);
-        assert.deepEqual(JSON.parse(response.body), { owned: { type: "running" } });
+        assert.deepEqual(JSON.parse(response.body), { data: { owned: { type: "running" } } });
         assert.deepEqual(sessionGets.sort(), ["foreign", "owned", "stale"]);
         assert.equal(requestCount(), 0);
     });
@@ -623,6 +631,9 @@ describe("instance proxy location enforcement", () => {
         })).statusCode, 403);
         assert.equal((await app.inject({ method: "GET", url: "/workspaces/workspace/instance/api/permission/saved" })).statusCode, 403);
         assert.equal((await app.inject({ method: "DELETE", url: "/workspaces/workspace/instance/api/permission/saved/global-rule" })).statusCode, 403);
+        for (const route of ["plugin/check", "plugin/update", "rpc/plugin/method"]) {
+            assert.equal((await app.inject({ method: "POST", url: `/workspaces/workspace/instance/api/${route}` })).statusCode, 403);
+        }
         assert.equal(requestCount(), 0);
     });
     it("allows native pending-state management for owned sessions", async () => {
@@ -632,14 +643,13 @@ describe("instance proxy location enforcement", () => {
             ["GET", "/workspaces/workspace/instance/api/session/owned/permission"],
             ["GET", "/workspaces/workspace/instance/api/session/owned/form"],
             ["POST", "/workspaces/workspace/instance/api/session/owned/background"],
-            ["POST", "/workspaces/workspace/instance/api/session/owned/revert/clear"],
+            ["DELETE", "/workspaces/workspace/instance/api/session/owned/revert"],
             ["GET", "/workspaces/workspace/instance/api/skill"],
             ["GET", "/workspaces/workspace/instance/api/reference"],
             ["GET", "/workspaces/workspace/instance/api/mcp/resource"],
             ["GET", "/workspaces/workspace/instance/api/websearch/provider"],
             ["DELETE", "/workspaces/workspace/instance/api/session/owned/inbox/prompt-1"],
-            ["POST", "/workspaces/workspace/instance/api/session/owned/inbox/prompt-1/steer"],
-            ["POST", "/workspaces/workspace/instance/api/session/owned/inbox/prompt-1/queue"],
+            ["PATCH", "/workspaces/workspace/instance/api/session/owned/inbox/prompt-1"],
         ];
         for (const [method, url] of requests) {
             assert.equal((await app.inject({ method, url })).statusCode, 200, `${method} ${url}`);
@@ -703,11 +713,53 @@ describe("instance proxy location enforcement", () => {
         assert.deepEqual(servicePathCalls, Object.keys(mappings));
         assert.equal(requestCount(), 1);
     });
+    it("bounds filesystem list targets to owned worktrees before translating them", async () => {
+        const mappings = {
+            "/repo/sibling": "/home/dev/repo/sibling",
+            "/repo/worktree/src": "/home/dev/worktree/src",
+        };
+        const { app, servicePathCalls, requestCount } = await harness("/repo/worktree", {}, {}, "/repo", "/repo", mappings);
+        const owned = await app.inject({
+            method: "GET",
+            url: "/workspaces/workspace/instance/api/fs/list?location%5Bdirectory%5D=%2Frepo%2Fworktree&path=src",
+        });
+        assert.equal(owned.statusCode, 200);
+        const upstreamUrl = new URL(JSON.parse(owned.body).url, "http://upstream");
+        assert.equal(upstreamUrl.pathname, "/api/fs/list");
+        assert.equal(upstreamUrl.searchParams.get("location[directory]"), "/repo/worktree");
+        assert.equal(upstreamUrl.searchParams.get("path"), "/home/dev/worktree/src");
+        assert.deepEqual(servicePathCalls, ["/repo/worktree/src"]);
+        assert.equal(requestCount(), 1);
+        const sibling = await app.inject({
+            method: "GET",
+            url: "/workspaces/workspace/instance/api/fs/list?location%5Bdirectory%5D=%2Frepo%2Fworktree&path=..%2Fsibling",
+        });
+        assert.equal(sibling.statusCode, 200);
+        assert.equal(new URL(JSON.parse(sibling.body).url, "http://upstream").searchParams.get("path"), "/home/dev/repo/sibling");
+        for (const pathValue of ["../../../other", "/other"]) {
+            const foreign = await app.inject({
+                method: "GET",
+                url: `/workspaces/workspace/instance/api/fs/list?path=${encodeURIComponent(pathValue)}`,
+            });
+            assert.equal(foreign.statusCode, 403);
+        }
+        const duplicate = await app.inject({
+            method: "GET",
+            url: "/workspaces/workspace/instance/api/fs/list?path=src&path=test",
+        });
+        assert.equal(duplicate.statusCode, 400);
+        const nul = await app.inject({
+            method: "GET",
+            url: "/workspaces/workspace/instance/api/fs/list?path=src%00secret",
+        });
+        assert.equal(nul.statusCode, 400);
+        assert.equal(requestCount(), 2);
+    });
     it("defaults and validates only schema-defined imported session locations", async () => {
         const { app, requestCount } = await harness();
         const accepted = await app.inject({
             method: "POST",
-            url: "/workspaces/workspace/instance/api/session/import",
+            url: "/workspaces/workspace/instance/api/experimental/session/import",
             payload: {
                 info: { id: "session-1", metadata: { location: { directory: "/other" } } },
                 messages: [{
@@ -726,9 +778,18 @@ describe("instance proxy location enforcement", () => {
         assert.deepEqual(body.messages[0].previous.location, { directory: "/repo" });
         assert.deepEqual(body.messages[0].metadata.location, { directory: "/other" });
         assert.equal(body.messages[0].content[0].state.input.location, "/other");
+        const obsolete = await app.inject({
+            method: "POST",
+            url: "/workspaces/workspace/instance/api/experimental/session/import",
+            payload: {
+                info: { id: "old-selector", location: { directory: "/repo", workspaceID: "owned-location" } },
+                messages: [],
+            },
+        });
+        assert.equal(obsolete.statusCode, 400);
         const rejected = await app.inject({
             method: "POST",
-            url: "/workspaces/workspace/instance/api/session/import",
+            url: "/workspaces/workspace/instance/api/experimental/session/import",
             payload: {
                 info: { id: "session-2", location: { directory: "/repo" } },
                 messages: [{ type: "location-switched", location: { directory: "/repo/worktree" }, previous: { location: { directory: "/other" } } }],