Standardize create-flow option steps on one question-and-options layout and Selection sizes.

Method cards, chips, and the right rail now share the two-column shell; last options clear the footer fade, See all stays under the stack, and the left heading no longer jumps when the list expands.

Co-authored-by: Cursor <cursoragent@cursor.com>

app/(app)/create/screens/card/CommunicationMethodsScreen.tsx

@@ -4,9 +4,9 @@
  * `communication-methods` step — Figma “Flow — Compact Card Stack” (node `20246-15828`).
  * Registry: `layoutKind: "card"` (`CREATE_FLOW_SCREEN_REGISTRY["communication-methods"]`).
  *
- * Lives under `screens/card/` (not `select/`): Figma **card stack** layout is a distinct shell from
- * two-column chip **select** frames. Future card-stack steps get their own `*Screen.tsx` here and
- * reuse `CardStack` / `CreateFlowCardStackStepShell` as needed.
+ * Page chrome is the shared question-and-options shell
+ * ({@link CreateFlowTwoColumnSelectShell}); options are {@link CardStack} with
+ * `layout="singleStack"` and {@link Selection} size `l`.
  *
  * Card click opens the Figma create modal (node `20246-15829`) with three
  * editable sections rendered by {@link CommunicationMethodEditFields}. The
@@ -18,11 +18,11 @@
 import { useState, useCallback, useMemo, useRef } from "react";
 import { useMessages } from "../../../../contexts/MessagesContext";
 import { useCreateFlow } from "../../context/CreateFlowContext";
-import { useCreateFlowMdUp } from "../../hooks/useCreateFlowMdUp";
 import { useBeforeUnloadGuard } from "../../../../hooks/useBeforeUnloadGuard";
 import { useDiscardCustomizeConfirm } from "../../hooks/useDiscardCustomizeConfirm";
 import { useMethodCardDeckOrdering } from "../../hooks/useMethodCardDeckOrdering";
-import { CreateFlowCardStackStepShell } from "../../components/CreateFlowCardStackStepShell";
+import { CreateFlowHeaderLockup } from "../../components/CreateFlowHeaderLockup";
+import { CreateFlowTwoColumnSelectShell } from "../../components/CreateFlowTwoColumnSelectShell";
 import CardStack from "../../../../components/cards/CardStack";
 import Create from "../../../../components/modals/Create";
 import InlineTextButton from "../../../../components/buttons/InlineTextButton";
@@ -61,7 +61,6 @@ export function CommunicationMethodsScreen() {
   const m = useMessages();
   const comm = m.create.customRule.communication;
   const modalKebabMenu = m.create.customRule.modalKebabMenu;
-  const mdUp = useCreateFlowMdUp();
   const { confirmDiscard, confirmDialog } = useDiscardCustomizeConfirm();
   const { state, updateState, replaceState, markCreateFlowInteraction } =
     useCreateFlow();
@@ -120,17 +119,9 @@ export function CommunicationMethodsScreen() {
     setAddCustomWizardOpen(true);
   }, [markCreateFlowInteraction]);
 
-  const title = expanded ? comm.page.expandedTitle : comm.page.compactTitle;
+  const title = comm.page.compactTitle;
 
-  const description = expanded ? (
-    <>
-      {comm.page.expandedDescriptionBefore}
-      <InlineTextButton onClick={handleOpenAddWizard}>
-        {comm.page.compactDescriptionLinkLabel}
-      </InlineTextButton>
-      {comm.page.expandedDescriptionAfter}
-    </>
-  ) : (
+  const description = (
     <>
       {comm.page.compactDescriptionBefore}
       <InlineTextButton onClick={handleOpenAddWizard}>
@@ -694,30 +685,41 @@ export function CommunicationMethodsScreen() {
 
   return (
     <>
-    <CreateFlowCardStackStepShell
-      lockupTitle={title}
-      lockupDescription={description}
-      stackBusy={!recommendationsReady}
-    >
-      {recommendationsReady && (
-        <CardStack
-          cards={sampleCards}
-          selectedIds={selectedIds}
-          onCardSelect={handleCardClick}
-          expanded={expanded}
-          onToggleExpand={() => {
-            markCreateFlowInteraction();
-            setExpanded((prev) => !prev);
-          }}
-          hasMore={true}
-          toggleLabel={comm.page.seeAllLink}
-          compactRecommendedLimit={5}
-          compactCardIds={compactCardIds}
-          compactDesktopLayout="flexWrap"
-          headerLockupSize={mdUp ? "L" : "M"}
+    <CreateFlowTwoColumnSelectShell
+      contentTopBelowMd="space-800"
+      lgVerticalAlign="start"
+      header={
+        <CreateFlowHeaderLockup
+          title={title}
+          description={description}
+          justification="left"
         />
-      )}
-    </CreateFlowCardStackStepShell>
+      }
+    >
+      <div
+        className="flex w-full min-w-0 flex-col items-stretch gap-6 py-0 lg:h-full lg:min-h-0 lg:flex-1"
+        aria-busy={!recommendationsReady}
+      >
+        {recommendationsReady && (
+          <CardStack
+            cards={sampleCards}
+            selectedIds={selectedIds}
+            onCardSelect={handleCardClick}
+            expanded={expanded}
+            onToggleExpand={() => {
+              markCreateFlowInteraction();
+              setExpanded((prev) => !prev);
+            }}
+            hasMore={true}
+            toggleLabel={comm.page.seeAllLink}
+            compactRecommendedLimit={5}
+            compactCardIds={compactCardIds}
+            layout="singleStack"
+            className="w-full lg:h-full lg:min-h-0 lg:flex-1"
+          />
+        )}
+      </div>
+    </CreateFlowTwoColumnSelectShell>
       <Create
         isOpen={createModalOpen}
         onClose={handleCreateModalClose}

app/(app)/create/screens/card/ConflictManagementScreen.tsx

@@ -4,6 +4,9 @@
  * `conflict-management` step — Figma compact card stack (node `20879-15979`).
  * Registry: `CREATE_FLOW_SCREEN_REGISTRY["conflict-management"]`.
  *
+ * Page chrome is the shared question-and-options shell
+ * (`CreateFlowTwoColumnSelectShell`); options are CardStack `singleStack`.
+ *
  * Card click opens the Figma "Add Approach" create modal (node `20874-172292`)
  * with four controls rendered by {@link ConflictManagementEditFields}: Core
  * Principle, Applicable Scope (text area), Process Protocol, and Restoration
@@ -15,11 +18,11 @@
 import { useState, useCallback, useMemo, useRef } from "react";
 import { useMessages } from "../../../../contexts/MessagesContext";
 import { useCreateFlow } from "../../context/CreateFlowContext";
-import { useCreateFlowMdUp } from "../../hooks/useCreateFlowMdUp";
 import { useBeforeUnloadGuard } from "../../../../hooks/useBeforeUnloadGuard";
 import { useDiscardCustomizeConfirm } from "../../hooks/useDiscardCustomizeConfirm";
 import { useMethodCardDeckOrdering } from "../../hooks/useMethodCardDeckOrdering";
-import { CreateFlowCardStackStepShell } from "../../components/CreateFlowCardStackStepShell";
+import { CreateFlowHeaderLockup } from "../../components/CreateFlowHeaderLockup";
+import { CreateFlowTwoColumnSelectShell } from "../../components/CreateFlowTwoColumnSelectShell";
 import CardStack from "../../../../components/cards/CardStack";
 import Create from "../../../../components/modals/Create";
 import InlineTextButton from "../../../../components/buttons/InlineTextButton";
@@ -58,7 +61,6 @@ export function ConflictManagementScreen() {
   const m = useMessages();
   const cm = m.create.customRule.conflictManagement;
   const modalKebabMenu = m.create.customRule.modalKebabMenu;
-  const mdUp = useCreateFlowMdUp();
   const { confirmDiscard, confirmDialog } = useDiscardCustomizeConfirm();
   const { state, updateState, replaceState, markCreateFlowInteraction } =
     useCreateFlow();
@@ -117,17 +119,9 @@ export function ConflictManagementScreen() {
     setAddCustomWizardOpen(true);
   }, [markCreateFlowInteraction]);
 
-  const title = expanded ? cm.page.expandedTitle : cm.page.compactTitle;
+  const title = cm.page.compactTitle;
 
-  const description = expanded ? (
-    <>
-      {cm.page.expandedDescriptionBefore}
-      <InlineTextButton onClick={handleOpenAddWizard}>
-        {cm.page.compactDescriptionLinkLabel}
-      </InlineTextButton>
-      {cm.page.expandedDescriptionAfter}
-    </>
-  ) : (
+  const description = (
     <>
       {cm.page.compactDescriptionBefore}
       <InlineTextButton onClick={handleOpenAddWizard}>
@@ -695,30 +689,41 @@ export function ConflictManagementScreen() {
 
   return (
     <>
-    <CreateFlowCardStackStepShell
-      lockupTitle={title}
-      lockupDescription={description}
-      stackBusy={!recommendationsReady}
-    >
-      {recommendationsReady && (
-        <CardStack
-          cards={sampleCards}
-          selectedIds={selectedIds}
-          onCardSelect={handleCardClick}
-          expanded={expanded}
-          onToggleExpand={() => {
-            markCreateFlowInteraction();
-            setExpanded((prev) => !prev);
-          }}
-          hasMore={true}
-          toggleLabel={cm.page.seeAllLink}
-          compactRecommendedLimit={5}
-          compactCardIds={compactCardIds}
-          compactDesktopLayout="pyramidFive"
-          headerLockupSize={mdUp ? "L" : "M"}
+    <CreateFlowTwoColumnSelectShell
+      contentTopBelowMd="space-800"
+      lgVerticalAlign="start"
+      header={
+        <CreateFlowHeaderLockup
+          title={title}
+          description={description}
+          justification="left"
         />
-      )}
-    </CreateFlowCardStackStepShell>
+      }
+    >
+      <div
+        className="flex w-full min-w-0 flex-col items-stretch gap-6 py-0 lg:h-full lg:min-h-0 lg:flex-1"
+        aria-busy={!recommendationsReady}
+      >
+        {recommendationsReady && (
+          <CardStack
+            cards={sampleCards}
+            selectedIds={selectedIds}
+            onCardSelect={handleCardClick}
+            expanded={expanded}
+            onToggleExpand={() => {
+              markCreateFlowInteraction();
+              setExpanded((prev) => !prev);
+            }}
+            hasMore={true}
+            toggleLabel={cm.page.seeAllLink}
+            compactRecommendedLimit={5}
+            compactCardIds={compactCardIds}
+            layout="singleStack"
+            className="w-full lg:h-full lg:min-h-0 lg:flex-1"
+          />
+        )}
+      </div>
+    </CreateFlowTwoColumnSelectShell>
       <Create
         isOpen={createModalOpen}
         onClose={handleCreateModalClose}

app/(app)/create/screens/card/MembershipMethodsScreen.tsx

@@ -4,6 +4,9 @@
  * `membership-methods` step — Figma compact card stack (node `20858-13947`).
  * Registry: `CREATE_FLOW_SCREEN_REGISTRY["membership-methods"]`.
  *
+ * Page chrome is the shared question-and-options shell
+ * (`CreateFlowTwoColumnSelectShell`); options are CardStack `singleStack`.
+ *
  * Card click opens the Figma create modal (node `20858-13948`) with three
  * editable sections rendered by {@link MembershipMethodEditFields}. The same
  * field set is reused on `/create/final-review` — see `FinalReviewChipEditModal`.
@@ -16,11 +19,11 @@
 import { useState, useCallback, useMemo, useRef } from "react";
 import { useMessages } from "../../../../contexts/MessagesContext";
 import { useCreateFlow } from "../../context/CreateFlowContext";
-import { useCreateFlowMdUp } from "../../hooks/useCreateFlowMdUp";
 import { useBeforeUnloadGuard } from "../../../../hooks/useBeforeUnloadGuard";
 import { useDiscardCustomizeConfirm } from "../../hooks/useDiscardCustomizeConfirm";
 import { useMethodCardDeckOrdering } from "../../hooks/useMethodCardDeckOrdering";
-import { CreateFlowCardStackStepShell } from "../../components/CreateFlowCardStackStepShell";
+import { CreateFlowHeaderLockup } from "../../components/CreateFlowHeaderLockup";
+import { CreateFlowTwoColumnSelectShell } from "../../components/CreateFlowTwoColumnSelectShell";
 import CardStack from "../../../../components/cards/CardStack";
 import Create from "../../../../components/modals/Create";
 import InlineTextButton from "../../../../components/buttons/InlineTextButton";
@@ -59,7 +62,6 @@ export function MembershipMethodsScreen() {
   const m = useMessages();
   const mem = m.create.customRule.membership;
   const modalKebabMenu = m.create.customRule.modalKebabMenu;
-  const mdUp = useCreateFlowMdUp();
   const { confirmDiscard, confirmDialog } = useDiscardCustomizeConfirm();
   const { state, updateState, replaceState, markCreateFlowInteraction } =
     useCreateFlow();
@@ -118,17 +120,9 @@ export function MembershipMethodsScreen() {
     setAddCustomWizardOpen(true);
   }, [markCreateFlowInteraction]);
 
-  const title = expanded ? mem.page.expandedTitle : mem.page.compactTitle;
+  const title = mem.page.compactTitle;
 
-  const description = expanded ? (
-    <>
-      {mem.page.expandedDescriptionBefore}
-      <InlineTextButton onClick={handleOpenAddWizard}>
-        {mem.page.compactDescriptionLinkLabel}
-      </InlineTextButton>
-      {mem.page.expandedDescriptionAfter}
-    </>
-  ) : (
+  const description = (
     <>
       {mem.page.compactDescriptionBefore}
       <InlineTextButton onClick={handleOpenAddWizard}>
@@ -688,30 +682,41 @@ export function MembershipMethodsScreen() {
 
   return (
     <>
-    <CreateFlowCardStackStepShell
-      lockupTitle={title}
-      lockupDescription={description}
-      stackBusy={!recommendationsReady}
-    >
-      {recommendationsReady && (
-        <CardStack
-          cards={sampleCards}
-          selectedIds={selectedIds}
-          onCardSelect={handleCardClick}
-          expanded={expanded}
-          onToggleExpand={() => {
-            markCreateFlowInteraction();
-            setExpanded((prev) => !prev);
-          }}
-          hasMore={true}
-          toggleLabel={mem.page.seeAllLink}
-          compactRecommendedLimit={5}
-          compactCardIds={compactCardIds}
-          compactDesktopLayout="pyramidFive"
-          headerLockupSize={mdUp ? "L" : "M"}
+    <CreateFlowTwoColumnSelectShell
+      contentTopBelowMd="space-800"
+      lgVerticalAlign="start"
+      header={
+        <CreateFlowHeaderLockup
+          title={title}
+          description={description}
+          justification="left"
         />
-      )}
-    </CreateFlowCardStackStepShell>
+      }
+    >
+      <div
+        className="flex w-full min-w-0 flex-col items-stretch gap-6 py-0 lg:h-full lg:min-h-0 lg:flex-1"
+        aria-busy={!recommendationsReady}
+      >
+        {recommendationsReady && (
+          <CardStack
+            cards={sampleCards}
+            selectedIds={selectedIds}
+            onCardSelect={handleCardClick}
+            expanded={expanded}
+            onToggleExpand={() => {
+              markCreateFlowInteraction();
+              setExpanded((prev) => !prev);
+            }}
+            hasMore={true}
+            toggleLabel={mem.page.seeAllLink}
+            compactRecommendedLimit={5}
+            compactCardIds={compactCardIds}
+            layout="singleStack"
+            className="w-full lg:h-full lg:min-h-0 lg:flex-1"
+          />
+        )}
+      </div>
+    </CreateFlowTwoColumnSelectShell>
       <Create
         isOpen={createModalOpen}
         onClose={handleCreateModalClose}

app/(app)/create/screens/right-rail/DecisionApproachesScreen.tsx

@@ -766,7 +766,7 @@ export function DecisionApproachesScreen() {
       }
     >
       <div
-        className="flex w-full min-w-0 flex-col items-stretch gap-6 py-0"
+        className="flex w-full min-w-0 flex-col items-stretch gap-6 py-0 lg:h-full lg:min-h-0 lg:flex-1"
         aria-busy={!recommendationsReady}
       >
         {recommendationsReady && (
@@ -796,7 +796,7 @@ export function DecisionApproachesScreen() {
             layout="singleStack"
             compactRecommendedLimit={5}
             compactCardIds={compactCardIds}
-            className="w-full"
+            className="w-full lg:h-full lg:min-h-0 lg:flex-1"
             headerLockupSize={mdUp ? "L" : "M"}
           />
         )}