Revert "fix: force plan-accept to exit plan mode (#462)"

This reverts commit 847a31d.

Author: amanthanvi

src/App.tsx

@@ -1766,7 +1766,6 @@ function MainApp() {
     connectWorkspace,
     sendUserMessageToThread,
     setSelectedCollaborationModeId,
-    persistThreadCodexParams,
   });
 
   const { handleMoveWorkspace } = useWorkspaceOrderingOrchestration({

src/features/app/hooks/usePlanReadyActions.test.tsx

@@ -25,8 +25,7 @@ type UsePlanReadyActionsOptions = {
   resolvedEffort: string | null;
   connectWorkspace: (workspace: WorkspaceInfo) => Promise<void>;
   sendUserMessageToThread: SendUserMessageToThread;
-  setSelectedCollaborationModeId: (modeId: string | null) => void;
-  persistThreadCodexParams: (patch: { collaborationModeId?: string | null }) => void;
+  setSelectedCollaborationModeId: (modeId: string) => void;
 };
 
 export function usePlanReadyActions({
@@ -38,7 +37,6 @@ export function usePlanReadyActions({
   connectWorkspace,
   sendUserMessageToThread,
   setSelectedCollaborationModeId,
-  persistThreadCodexParams,
 }: UsePlanReadyActionsOptions) {
   const findCollaborationMode = useCallback(
     (wanted: string) => {
@@ -59,28 +57,6 @@ export function usePlanReadyActions({
     [collaborationModes],
   );
 
-  const isPlanMode = useCallback((mode: CollaborationModeOption | null) => {
-    if (!mode) {
-      return false;
-    }
-    const modeValue = (mode.mode || mode.id).trim().toLowerCase();
-    return modeValue === "plan";
-  }, []);
-
-  const findImplementationMode = useCallback(() => {
-    const defaultMode = findCollaborationMode("default");
-    if (defaultMode && !isPlanMode(defaultMode)) {
-      return defaultMode;
-    }
-
-    const codeMode = findCollaborationMode("code");
-    if (codeMode && !isPlanMode(codeMode)) {
-      return codeMode;
-    }
-
-    return collaborationModes.find((mode) => !isPlanMode(mode)) ?? null;
-  }, [collaborationModes, findCollaborationMode, isPlanMode]);
-
   const buildCollaborationModePayloadFor = useCallback(
     (mode: CollaborationModeOption | null) => {
       if (!mode) {
@@ -117,28 +93,31 @@ export function usePlanReadyActions({
       await connectWorkspace(activeWorkspace);
     }
 
-    const implementationMode = findImplementationMode();
-    const implementationModeId = implementationMode?.id ?? null;
-    setSelectedCollaborationModeId(implementationModeId);
-    persistThreadCodexParams({
-      collaborationModeId: implementationModeId,
-    });
+    const defaultMode =
+      findCollaborationMode("default") ??
+      findCollaborationMode("code") ??
+      collaborationModes[0] ??
+      null;
+
+    if (defaultMode?.id) {
+      setSelectedCollaborationModeId(defaultMode.id);
+    }
 
-    const collaborationMode = buildCollaborationModePayloadFor(implementationMode);
+    const collaborationMode = buildCollaborationModePayloadFor(defaultMode);
     await sendUserMessageToThread(
       activeWorkspace,
       activeThreadId,
       makePlanReadyAcceptMessage(),
       [],
-      { collaborationMode: collaborationMode ?? null },
+      collaborationMode ? { collaborationMode } : undefined,
     );
   }, [
     activeThreadId,
     activeWorkspace,
     buildCollaborationModePayloadFor,
+    collaborationModes,
     connectWorkspace,
-    findImplementationMode,
-    persistThreadCodexParams,
+    findCollaborationMode,
     sendUserMessageToThread,
     setSelectedCollaborationModeId,
   ]);
@@ -155,19 +134,17 @@ export function usePlanReadyActions({
       }
 
       const planMode = findCollaborationMode("plan");
-      const planModeId = planMode?.id ?? null;
-      setSelectedCollaborationModeId(planModeId);
-      persistThreadCodexParams({
-        collaborationModeId: planModeId,
-      });
+      if (planMode?.id) {
+        setSelectedCollaborationModeId(planMode.id);
+      }
       const collaborationMode = buildCollaborationModePayloadFor(planMode);
       const message = makePlanReadyChangesMessage(trimmed);
       await sendUserMessageToThread(
         activeWorkspace,
         activeThreadId,
         message,
         [],
-        { collaborationMode: collaborationMode ?? null },
+        collaborationMode ? { collaborationMode } : undefined,
       );
     },
     [
@@ -176,7 +153,6 @@ export function usePlanReadyActions({
       buildCollaborationModePayloadFor,
       connectWorkspace,
       findCollaborationMode,
-      persistThreadCodexParams,
       sendUserMessageToThread,
       setSelectedCollaborationModeId,
     ],