fix(core): revert form service and mcp elicitation (#35080)

packages/app/e2e/regression/session-request-docks.spec.ts

@@ -10,21 +10,17 @@ const title = "Request dock regression"
 
 test("shows a pending question dock", async ({ page }) => {
   await mockServer(page, {
-    forms: [
+    questions: [
       {
-        id: "frm_question_request",
+        id: "question-request",
         sessionID,
-        mode: "form",
-        metadata: { kind: "question" },
-        fields: [
+        questions: [
           {
-            key: "question_0",
-            type: "string",
-            title: "Which implementation should be used?",
-            description: "Implementation",
+            header: "Implementation",
+            question: "Which implementation should be used?",
             options: [
-              { value: "Minimal", label: "Minimal", description: "Use the smallest correct change" },
-              { value: "Extended", label: "Extended", description: "Include additional behavior" },
+              { label: "Minimal", description: "Use the smallest correct change" },
+              { label: "Extended", description: "Include additional behavior" },
             ],
           },
         ],
@@ -45,8 +41,7 @@ test("shows a pending question dock", async ({ page }) => {
   const rejectRequests: string[] = []
   page.on("request", (request) => {
     if (request.method() !== "POST") return
-    if (new URL(request.url()).pathname === `/api/session/${sessionID}/form/frm_question_request/cancel`)
-      rejectRequests.push(request.url())
+    if (new URL(request.url()).pathname === "/question/question-request/reject") rejectRequests.push(request.url())
   })
 
   await question.locator('[data-component="icon-button"][data-icon="chevron-down"]').click()
@@ -68,12 +63,10 @@ test("shows a pending question dock", async ({ page }) => {
 
   await question.getByRole("radio", { name: /Minimal/ }).click()
   const reply = page.waitForRequest(
-    (request) =>
-      request.method() === "POST" &&
-      new URL(request.url()).pathname === `/api/session/${sessionID}/form/frm_question_request/reply`,
+    (request) => request.method() === "POST" && new URL(request.url()).pathname === "/question/question-request/reply",
   )
   await question.getByRole("button", { name: "Submit" }).click()
-  expect((await reply).postDataJSON()).toEqual({ answer: { question_0: "Minimal" } })
+  expect((await reply).postDataJSON()).toEqual({ answers: [["Minimal"]] })
 })
 
 test("shows a pending permission dock", async ({ page }) => {
@@ -112,7 +105,6 @@ async function mockServer(
   requests: {
     permissions?: unknown[] | (() => unknown[])
     questions?: unknown[] | (() => unknown[])
-    forms?: unknown[] | (() => unknown[])
   },
 ) {
   await mockOpenCodeServer(page, {
@@ -156,7 +148,6 @@ async function mockServer(
     pageMessages: () => ({ items: [] }),
     permissions: requests.permissions,
     questions: requests.questions,
-    forms: requests.forms,
   })
   await page.addInitScript(() => {
     localStorage.setItem("settings.v3", JSON.stringify({ general: { newLayoutDesigns: true } }))