Stop bridging Grok exit plan requests.

Author: Jaaneek

apps/server/scripts/acp-mock-agent.ts

@@ -19,7 +19,6 @@ const emitInterleavedAssistantToolCalls =
 const emitGenericToolPlaceholders = process.env.T3_ACP_EMIT_GENERIC_TOOL_PLACEHOLDERS === "1";
 const emitAskQuestion = process.env.T3_ACP_EMIT_ASK_QUESTION === "1";
 const emitXAiAskUserQuestion = process.env.T3_ACP_EMIT_XAI_ASK_USER_QUESTION === "1";
-const emitXAiExitPlanMode = process.env.T3_ACP_EMIT_XAI_EXIT_PLAN_MODE === "1";
 const failSetConfigOption = process.env.T3_ACP_FAIL_SET_CONFIG_OPTION === "1";
 const exitOnSetConfigOption = process.env.T3_ACP_EXIT_ON_SET_CONFIG_OPTION === "1";
 const promptResponseText = process.env.T3_ACP_PROMPT_RESPONSE_TEXT;
@@ -591,27 +590,6 @@ const program = Effect.gen(function* () {
         return { stopReason: "end_turn" };
       }
 
-      if (emitXAiExitPlanMode) {
-        const result = yield* agent.client.extRequest("_x.ai/exit_plan_mode", {
-          method: "x.ai/exit_plan_mode",
-          params: {
-            sessionId: requestedSessionId,
-            toolCallId: "exit-plan-mode-tool-call-1",
-            planContent: "# Grok plan\n\n- Inspect the workspace\n- Apply the fix",
-          },
-        });
-        if (
-          typeof result !== "object" ||
-          result === null ||
-          !("outcome" in result) ||
-          result.outcome !== "approved"
-        ) {
-          throw new Error("Expected _x.ai/exit_plan_mode approved outcome.");
-        }
-
-        return { stopReason: "end_turn" };
-      }
-
       yield* agent.client.sessionUpdate({
         sessionId: requestedSessionId,
         update: {

apps/server/src/provider/Layers/GrokAdapter.test.ts

@@ -335,47 +335,6 @@ it.layer(grokAdapterTestLayer)("GrokAdapterLive", (it) => {
     }),
   );
 
-  it.effect("handles xAI exit_plan_mode extension requests", () =>
-    Effect.gen(function* () {
-      const threadId = ThreadId.make("grok-xai-exit-plan-mode");
-      const wrapperPath = yield* Effect.promise(() =>
-        makeMockGrokWrapper({ T3_ACP_EMIT_XAI_EXIT_PLAN_MODE: "1" }),
-      );
-      const adapter = yield* makeTestAdapter(wrapperPath);
-      const proposedPlan =
-        yield* Deferred.make<Extract<ProviderRuntimeEvent, { type: "turn.proposed.completed" }>>();
-
-      const eventsFiber = yield* Stream.runForEach(adapter.streamEvents, (event) => {
-        if (
-          String(event.threadId) !== String(threadId) ||
-          event.type !== "turn.proposed.completed"
-        ) {
-          return Effect.void;
-        }
-        return Deferred.succeed(proposedPlan, event).pipe(Effect.ignore);
-      }).pipe(Effect.forkChild);
-
-      yield* adapter.startSession({
-        threadId,
-        provider: ProviderDriverKind.make("grok"),
-        cwd: process.cwd(),
-        runtimeMode: "full-access",
-      });
-
-      yield* adapter.sendTurn({ threadId, input: "propose a plan", attachments: [] });
-
-      const event = yield* Deferred.await(proposedPlan);
-      assert.equal(
-        event.payload.planMarkdown,
-        "# Grok plan\n\n- Inspect the workspace\n- Apply the fix",
-      );
-      assert.equal(event.raw?.method, "_x.ai/exit_plan_mode");
-
-      yield* Fiber.interrupt(eventsFiber);
-      yield* adapter.stopSession(threadId);
-    }),
-  );
-
   it.effect("continues streaming events when native notification logging fails", () =>
     Effect.gen(function* () {
       const threadId = ThreadId.make("grok-native-log-failure");

apps/server/src/provider/Layers/GrokAdapter.ts

@@ -59,11 +59,8 @@ import {
 } from "../acp/GrokAcpSupport.ts";
 import {
   extractXAiAskUserQuestions,
-  extractXAiExitPlanMarkdown,
   makeXAiAskUserQuestionResponse,
-  makeXAiExitPlanModeResponse,
   XAiAskUserQuestionRequest,
-  XAiExitPlanModeRequest,
 } from "../acp/XAiAcpExtension.ts";
 import { type GrokAdapterShape } from "../Services/GrokAdapter.ts";
 import { type EventNdjsonLogger, makeEventNdjsonLogger } from "./EventNdjsonLogger.ts";
@@ -436,35 +433,6 @@ export function makeGrokAdapter(grokSettings: GrokSettings, options?: GrokAdapte
                 ),
               { discard: true },
             );
-            yield* Effect.forEach(
-              ["x.ai/exit_plan_mode", "_x.ai/exit_plan_mode"] as const,
-              (method) =>
-                acp.handleExtRequest(method, XAiExitPlanModeRequest, (params) =>
-                  mapAcpCallbackFailure(
-                    Effect.gen(function* () {
-                      yield* logNative(input.threadId, method, params);
-                      const planMarkdown = extractXAiExitPlanMarkdown(params)?.trim();
-                      if (planMarkdown) {
-                        yield* offerRuntimeEvent({
-                          type: "turn.proposed.completed",
-                          ...(yield* makeEventStamp()),
-                          provider: PROVIDER,
-                          threadId: input.threadId,
-                          turnId: sessions.get(input.threadId)?.activeTurnId,
-                          payload: { planMarkdown },
-                          raw: {
-                            source: "acp.grok.extension",
-                            method,
-                            payload: params,
-                          },
-                        });
-                      }
-                      return makeXAiExitPlanModeResponse();
-                    }),
-                  ),
-                ),
-              { discard: true },
-            );
             yield* acp.handleRequestPermission((params) =>
               mapAcpCallbackFailure(
                 Effect.gen(function* () {

apps/server/src/provider/acp/XAiAcpExtension.ts

@@ -2,7 +2,6 @@ import type { ProviderUserInputAnswers, UserInputQuestion } from "@t3tools/contr
 import * as Schema from "effect/Schema";
 
 export const XAiAskUserQuestionRequest = Schema.Unknown;
-export const XAiExitPlanModeRequest = Schema.Unknown;
 
 type UnknownRecord = Record<string, unknown>;
 
@@ -136,15 +135,6 @@ export function extractXAiAskUserQuestions(params: unknown): ReadonlyArray<UserI
   return [extractQuestion(question, title, 0)];
 }
 
-export function extractXAiExitPlanMarkdown(params: unknown): string | undefined {
-  const root = unwrapParams(params);
-  const nestedPlan = nestedRecord(root, ["plan"]);
-  return (
-    stringField(root, ["planContent", "plan_content", "planMarkdown", "plan", "content"]) ??
-    (nestedPlan ? stringField(nestedPlan, ["content", "markdown", "text"]) : undefined)
-  );
-}
-
 function answerValues(answer: unknown): ReadonlyArray<string> {
   if (Array.isArray(answer)) {
     return answer.flatMap((entry) => {
@@ -167,7 +157,3 @@ export function makeXAiAskUserQuestionResponse(answers: ProviderUserInputAnswers
     ),
   };
 }
-
-export function makeXAiExitPlanModeResponse(): { readonly outcome: "approved" } {
-  return { outcome: "approved" };
-}