diff --git a/src/app/(page)/disputes/[id]/page.tsx b/src/app/(page)/disputes/[id]/page.tsx
index 89faf1c..0bcb23a 100644
--- a/src/app/(page)/disputes/[id]/page.tsx
+++ b/src/app/(page)/disputes/[id]/page.tsx
@@ -134,7 +134,7 @@ export default function DisputePage({ params }: { params: Promise<{ id: string }
   const [isRefreshing, setIsRefreshing] = React.useState(false);
 
   React.useEffect(() => {
-    if (judgmentError && !judgmentErrorModal) {
+    if (judgmentError && !judgmentErrorModal && dispute?.status !== 'closed') {
       setJudgmentErrorMessage(
         judgmentErrorData instanceof Error
           ? judgmentErrorData.message
@@ -172,7 +172,8 @@ export default function DisputePage({ params }: { params: Promise<{ id: string }
         showToast('초대 링크 발급에 실패했어요.');
         return;
       }
-      await navigator.clipboard.writeText(data.data.inviteUrl);
+      const category = dispute.categoryGroup.toLowerCase()
+      await navigator.clipboard.writeText(`${data.data.inviteUrl}?category=${category}`);
       showToast('초대 링크가 복사되었어요!');
     } catch {
       showToast('초대 링크 발급에 실패했어요.');
@@ -308,7 +309,7 @@ export default function DisputePage({ params }: { params: Promise<{ id: string }
                 className={`${styles.statementCard}${myRole === 'role_a' && !isCompleted ? ` ${styles.statementCardEditable}` : ''}`}
                 onClick={
                   myRole === 'role_a' && !isCompleted
-                    ? () => router.push(`/disputes/${id}/statement?edit=true`)
+                    ? () => router.push(`/disputes/${id}/statement?category=${dispute.categoryGroup}&edit=true`)
                     : undefined
                 }
                 {...(myRole === 'role_a' && !isCompleted
@@ -318,7 +319,7 @@ export default function DisputePage({ params }: { params: Promise<{ id: string }
                       onKeyDown: (e) => {
                         if (e.key === 'Enter' || e.key === ' ') {
                           e.preventDefault();
-                          router.push(`/disputes/${id}/statement?edit=true`);
+                          router.push(`/disputes/${id}/statement?category=${dispute.categoryGroup}&edit=true`);
                         }
                       },
                     }
@@ -337,9 +338,7 @@ export default function DisputePage({ params }: { params: Promise<{ id: string }
                       className={styles.statementAvatarImg}
                     />
                   </div>
-                  {participantA?.mbti && (
-                    <span className={styles.statementMbti}>{participantA.mbti}</span>
-                  )}
+                  <span className={styles.statementMbti}>{participantA?.mbti ?? 'MBTI 미설정'}</span>
                 </div>
               </div>
             )}
@@ -348,7 +347,7 @@ export default function DisputePage({ params }: { params: Promise<{ id: string }
                 className={`${styles.statementCard}${myRole === 'role_b' && !isCompleted ? ` ${styles.statementCardEditable}` : ''}`}
                 onClick={
                   myRole === 'role_b' && !isCompleted
-                    ? () => router.push(`/disputes/${id}/statement?edit=true`)
+                    ? () => router.push(`/disputes/${id}/statement?category=${dispute.categoryGroup}&edit=true`)
                     : undefined
                 }
                 {...(myRole === 'role_b' && !isCompleted
@@ -358,7 +357,7 @@ export default function DisputePage({ params }: { params: Promise<{ id: string }
                       onKeyDown: (e) => {
                         if (e.key === 'Enter' || e.key === ' ') {
                           e.preventDefault();
-                          router.push(`/disputes/${id}/statement?edit=true`);
+                          router.push(`/disputes/${id}/statement?category=${dispute.categoryGroup}&edit=true`);
                         }
                       },
                     }
@@ -377,9 +376,7 @@ export default function DisputePage({ params }: { params: Promise<{ id: string }
                       className={styles.statementAvatarImg}
                     />
                   </div>
-                  {participantB?.mbti && (
-                    <span className={styles.statementMbti}>{participantB.mbti}</span>
-                  )}
+                  <span className={styles.statementMbti}>{participantB?.mbti ?? 'MBTI 미설정'}</span>
                 </div>
               </div>
             )}
@@ -447,7 +444,7 @@ export default function DisputePage({ params }: { params: Promise<{ id: string }
               disabled={!canJudge}
               onClick={() => (isSolo ? setShowSoloModal(true) : void runJudge())}
             >
-              판결받기
+              {dispute.status === 'opponent_joined' ? '상대방이 작성 중...' : '판결받기'}
             </Button>
           </div>
         </div>
diff --git a/src/app/(page)/disputes/[id]/statement/StatementPage.module.scss b/src/app/(page)/disputes/[id]/statement/StatementPage.module.scss
index 412aa6e..2a15d12 100644
--- a/src/app/(page)/disputes/[id]/statement/StatementPage.module.scss
+++ b/src/app/(page)/disputes/[id]/statement/StatementPage.module.scss
@@ -74,6 +74,16 @@
   background-color: var(--bg-page);
 }
 
+.footerRow {
+  display: flex;
+  flex-direction: row;
+  gap: fn.r(12);
+
+  > * {
+    flex: 1;
+  }
+}
+
 .modalOverlay {
   position: fixed;
   inset: 0;
diff --git a/src/app/(page)/disputes/[id]/statement/page.tsx b/src/app/(page)/disputes/[id]/statement/page.tsx
index 84b909e..d61aacf 100644
--- a/src/app/(page)/disputes/[id]/statement/page.tsx
+++ b/src/app/(page)/disputes/[id]/statement/page.tsx
@@ -6,6 +6,7 @@ import { useHeaderStore } from '@/stores/headerStore'
 import { useDispute } from '@/domains/dispute/dispute.hooks'
 import { useUserMe } from '@/domains/user/hooks'
 import Button from '@/components/ui/Button'
+import Spinner from '@/components/ui/Spinner'
 import Select from '@/components/ui/Select'
 import Textarea from '@/components/ui/Textarea'
 import { CATEGORY_ICON_MAP, CATEGORY_LABEL_MAP } from '@/components/ui/CategoryIcon'
@@ -62,39 +63,82 @@ export default function StatementPage({
   const [isLoading, setIsLoading] = React.useState(false)
   const [filterMessage, setFilterMessage] = React.useState<string | null>(null)
   const [showPersonalInfoWarning, setShowPersonalInfoWarning] = React.useState(false)
+  const [savedDisputeId, setSavedDisputeId] = React.useState<string | null>(null)
+
+  const SAVING_MESSAGES = ['나쁜 말을 검열 중입니다', '내용을 저장 중입니다', 'AI가 분석 중입니다', '조금만 기다려주세요']
+  const [savingMsgIdx, setSavingMsgIdx] = React.useState(0)
+  React.useEffect(() => {
+    if (!isLoading) return
+    const timer = setInterval(() => setSavingMsgIdx((i) => (i + 1) % SAVING_MESSAGES.length), 2000)
+    return () => clearInterval(timer)
+  }, [isLoading])
+
+  const handleCancel = () => {
+    fetch(`/api/rooms/${id}`, { method: 'DELETE', keepalive: true }).catch(() => {})
+    router.push('/')
+  }
 
   const handleSave = async () => {
     if (isLoading) return
     setIsLoading(true)
     setFilterMessage(null)
 
+    if (mbti !== (userMe?.mbti ?? '')) {
+      const form = new FormData()
+      form.append('mbti', mbti)
+      await fetch('/api/user/me', { method: 'PATCH', body: form })
+    }
+
     try {
-      const res = await fetch(`/api/disputes/${id}/statements`, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ content }),
-      })
-      const json = await res.json() as { success: boolean; data?: { hasPersonalInfo?: boolean }; error?: { code?: string; message?: string } }
-
-      if (!json.success) {
-        setIsLoading(false)
-        const AI_EXTRACTION_CODES = ['AI_EXTRACTION_FAILED', 'AI_EXTRACTION_TIMEOUT', 'AI_EXTRACTION_PARSE_ERROR']
-        if (json.error?.code && AI_EXTRACTION_CODES.includes(json.error.code)) {
-          alert(json.error.message ?? 'AI 분석에 실패했습니다. 다시 시도해주세요.')
+      if (isEditMode) {
+        const res = await fetch(`/api/disputes/${id}/statements`, {
+          method: 'PATCH',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify({ content }),
+        })
+        const json = await res.json() as { success: boolean; data?: { hasPersonalInfo?: boolean }; error?: { code?: string; message?: string } }
+
+        if (!json.success) {
+          setIsLoading(false)
+          setFilterMessage(json.error?.message ?? '저장 중 오류가 발생했습니다. 다시 시도해주세요.')
           return
         }
-        setFilterMessage(json.error?.message ?? '저장 중 오류가 발생했습니다. 다시 시도해주세요.')
-        return
-      }
 
-      if (json.data?.hasPersonalInfo) {
-        setIsLoading(false)
-        setShowPersonalInfoWarning(true)
-        return
-      }
+        if (json.data?.hasPersonalInfo) {
+          setIsLoading(false)
+          setShowPersonalInfoWarning(true)
+          return
+        }
+
+        router.push(`/disputes/${id}`)
+      } else {
+        const res = await fetch('/api/disputes', {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify({ roomId: id, categoryGroup: category, content }),
+        })
+        const json = await res.json() as { success: boolean; data?: { id: string; hasPersonalInfo?: boolean }; error?: { code?: string; message?: string } }
+
+        if (!json.success) {
+          setIsLoading(false)
+          const AI_EXTRACTION_CODES = ['AI_EXTRACTION_FAILED', 'AI_EXTRACTION_TIMEOUT', 'AI_EXTRACTION_PARSE_ERROR']
+          if (json.error?.code && AI_EXTRACTION_CODES.includes(json.error.code)) {
+            alert(json.error.message ?? 'AI 분석에 실패했습니다. 다시 시도해주세요.')
+            return
+          }
+          setFilterMessage(json.error?.message ?? '저장 중 오류가 발생했습니다. 다시 시도해주세요.')
+          return
+        }
 
-      // 성공 시 isLoading을 false로 바꾸지 않음 — 페이지가 unmount될 때까지 스피너 유지
-      router.push(`/disputes/${id}`)
+        if (json.data?.hasPersonalInfo) {
+          setSavedDisputeId(json.data.id)
+          setIsLoading(false)
+          setShowPersonalInfoWarning(true)
+          return
+        }
+
+        router.push(`/disputes/${json.data!.id}`)
+      }
     } catch {
       setIsLoading(false)
       setFilterMessage('네트워크 오류가 발생했습니다. 다시 시도해주세요.')
@@ -116,6 +160,17 @@ export default function StatementPage({
 
   const Icon = CATEGORY_ICON_MAP[category]
 
+  if (isLoading) {
+    return (
+      <div className={styles.savingScreen}>
+        <div className={styles.savingContent}>
+          <Spinner />
+          <p className={styles.savingText}>{SAVING_MESSAGES[savingMsgIdx]}</p>
+        </div>
+      </div>
+    )
+  }
+
   return (
     <div className={styles.page}>
 
@@ -156,9 +211,16 @@ export default function StatementPage({
       </div>
 
       <div className={styles.footer}>
-        <Button onClick={handleSave} disabled={!content.trim() || isLoading}>
-          {isLoading ? '저장 중...' : isEditMode ? '수정저장' : '진술저장'}
-        </Button>
+        <div className={styles.footerRow}>
+          {!isEditMode && (
+            <Button variant="outline" onClick={() => void handleCancel()} disabled={isLoading}>
+              취소
+            </Button>
+          )}
+          <Button onClick={() => void handleSave()} disabled={!content.trim() || isLoading}>
+            {isLoading ? '저장 중...' : isEditMode ? '수정저장' : '진술저장'}
+          </Button>
+        </div>
       </div>
 
       {showPersonalInfoWarning && (
@@ -170,7 +232,7 @@ export default function StatementPage({
               진술 내용을 다시 확인해주세요.
             </p>
             <div className={styles.modalActions}>
-              <Button onClick={() => router.push(`/disputes/${id}`)}>
+              <Button onClick={() => router.push(`/disputes/${isEditMode ? id : savedDisputeId!}`)}>
                 계속 진행
               </Button>
               <Button variant="outline" onClick={() => setShowPersonalInfoWarning(false)}>
diff --git a/src/app/(page)/join/[token]/page.tsx b/src/app/(page)/join/[token]/page.tsx
index ab145b6..a75f833 100644
--- a/src/app/(page)/join/[token]/page.tsx
+++ b/src/app/(page)/join/[token]/page.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import React from 'react';
 import { useEffect, useState } from 'react';
 import { useRouter, useParams } from 'next/navigation';
 import Button from '@/components/ui/Button';
@@ -15,10 +16,15 @@ interface JoinInfo {
 
 type JoinState = 'loading' | 'invite' | 'error' | 'closed' | 'expired';
 
-export default function JoinPage() {
+export default function JoinPage({
+  searchParams,
+}: {
+  searchParams: Promise<{ category?: string }>
+}) {
   const router = useRouter();
   const params = useParams();
   const token = params.token as string;
+  const { category } = React.use(searchParams);
 
   const [state, setState] = useState<JoinState>('loading');
   const [joinInfo, setJoinInfo] = useState<JoinInfo | null>(null);
@@ -79,7 +85,8 @@ export default function JoinPage() {
         return;
       }
 
-      router.push(`/disputes/${data.data.disputeId}/statement`);
+      const cat = category ?? joinInfo?.categoryGroup?.toLowerCase() ?? 'romance'
+      router.push(`/disputes/${data.data.roomId}/statement?category=${cat}`);
     } catch {
       setState('error');
     } finally {
@@ -87,7 +94,7 @@ export default function JoinPage() {
     }
   };
 
-  const goToMain = () => router.push('/home');
+  const goToMain = () => router.push('/');
 
   const renderContent = () => {
     if (state === 'loading') return null;
diff --git a/src/app/api/disputes/[id]/statements/route.ts b/src/app/api/disputes/[id]/statements/route.ts
index 658dbc3..dbc5d87 100644
--- a/src/app/api/disputes/[id]/statements/route.ts
+++ b/src/app/api/disputes/[id]/statements/route.ts
@@ -375,3 +375,128 @@ export async function POST(
     )
   }
 }
+
+// PATCH /api/disputes/:id/statements
+// 진술 수정 (isEditMode). 모더레이션만 실행, AI 메타 추출 없음
+export async function PATCH(
+  request: NextRequest,
+  { params }: { params: Promise<{ id: string }> },
+) {
+  const userId = await getRequestUserId(request)
+  if (!userId) {
+    return NextResponse.json<ApiResponse>(
+      { success: false, error: { code: 'UNAUTHORIZED', message: '로그인이 필요합니다.' } },
+      { status: 401 },
+    )
+  }
+
+  const { id: disputeId } = await params
+
+  let body: unknown
+  try {
+    body = await request.json()
+  } catch {
+    return NextResponse.json<ApiResponse>(
+      { success: false, error: { code: 'INVALID_REQUEST', message: '요청 본문을 파싱할 수 없습니다.' } },
+      { status: 400 },
+    )
+  }
+
+  const parsed = statementSchema.safeParse(body)
+  if (!parsed.success) {
+    return NextResponse.json<ApiResponse>(
+      {
+        success: false,
+        error: {
+          code: 'VALIDATION_ERROR',
+          message: '입력값이 올바르지 않습니다.',
+          fieldErrors: parsed.error.errors.map((e) => ({
+            field: e.path.join('.'),
+            code: e.code,
+            message: e.message,
+          })),
+        },
+      },
+      { status: 400 },
+    )
+  }
+
+  const { content } = parsed.data
+
+  try {
+    const [participant, dispute] = await Promise.all([
+      prisma.disputeParticipant.findFirst({ where: { disputeId, userId }, include: { statements: true } }),
+      prisma.dispute.findFirst({ where: { id: disputeId } }),
+    ])
+
+    if (!participant) {
+      return NextResponse.json<ApiResponse>(
+        { success: false, error: { code: 'FORBIDDEN', message: '해당 사건의 참여자가 아닙니다.' } },
+        { status: 403 },
+      )
+    }
+    if (!dispute) {
+      return NextResponse.json<ApiResponse>(
+        { success: false, error: { code: 'DISPUTE_NOT_FOUND', message: '사건을 찾을 수 없습니다.' } },
+        { status: 404 },
+      )
+    }
+
+    const immutableStatuses: DisputeStatus[] = ['JUDGING', 'JUDGED', 'CLOSED', 'DELETED', 'EXPIRED']
+    if (immutableStatuses.includes(dispute.status)) {
+      return NextResponse.json<ApiResponse>(
+        { success: false, error: { code: 'CONFLICT', message: '현재 상태에서는 진술을 수정할 수 없습니다.' } },
+        { status: 409 },
+      )
+    }
+
+    const existingStatement = participant.statements[0] ?? null
+    if (!existingStatement) {
+      return NextResponse.json<ApiResponse>(
+        { success: false, error: { code: 'NOT_FOUND', message: '수정할 진술이 없습니다.' } },
+        { status: 404 },
+      )
+    }
+
+    let moderation = { isBlocked: false, hasPersonalInfo: false, confidenceScore: null as number | null, durationMs: null as number | null, modelName: null as string | null, reason: null as string | null }
+    let moderationSucceeded = false
+    try {
+      moderation = await moderateContent(content)
+      moderationSucceeded = true
+    } catch (err) {
+      console.error('[disputes/statements] PATCH moderation failed', { message: err instanceof Error ? err.message : 'unknown' })
+    }
+
+    if (moderation.isBlocked) {
+      return NextResponse.json<ApiResponse>(
+        { success: false, error: { code: 'CONTENT_BLOCKED', message: moderation.reason ?? '부적절한 표현이 포함되어 있습니다. 내용을 수정해주세요.' } },
+        { status: 422 },
+      )
+    }
+
+    const statement = await prisma.$transaction(async (tx) => {
+      const stmt = await tx.disputeStatement.update({
+        where: { id: existingStatement.id },
+        data: { content, moderationStatus: moderationSucceeded ? 'approved' : 'pending', submittedAt: new Date() },
+      })
+      if (moderationSucceeded) {
+        await tx.moderationLog.create({
+          data: { roomId: dispute.roomId, conversationId: dispute.sourceConversationId, disputeId, statementId: stmt.id, userId, target: 'STATEMENT', isBlocked: false, reason: null, confidenceScore: moderation.confidenceScore, durationMs: moderation.durationMs, modelName: moderation.modelName },
+        })
+      }
+      return stmt
+    })
+
+    return NextResponse.json<ApiResponse<StatementData>>({
+      success: true,
+      data: { id: statement.id, disputeId: statement.disputeId, role: statement.role.toLowerCase(), content: statement.content, submittedAt: statement.submittedAt?.toISOString() ?? null, hasPersonalInfo: moderation.hasPersonalInfo },
+    })
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error)
+    console.error('[disputes/statements] PATCH error', { message })
+    return NextResponse.json<ApiResponse>(
+      { success: false, error: { code: 'INTERNAL_SERVER_ERROR', message: '서버 오류가 발생했습니다.' } },
+      { status: 500 },
+    )
+  }
+}
diff --git a/src/app/api/disputes/route.ts b/src/app/api/disputes/route.ts
index d6e51fd..72daf34 100644
--- a/src/app/api/disputes/route.ts
+++ b/src/app/api/disputes/route.ts
@@ -9,10 +9,6 @@ import { extractDisputeMeta } from '@/lib/ai/judgment'
 import type { ApiResponse, CategoryGroup } from '@/types/common'
 import type { DisputeDto, DisputeParticipantDto, DisputeListResponse } from '@/types/dispute'
 
-class DuplicateDisputeError extends Error {
-  constructor() { super('DISPUTE_ALREADY_EXISTS') }
-}
-
 function withTimeout<T>(promise: Promise<T>, ms: number, label: string): Promise<T> {
   let timerId: ReturnType<typeof setTimeout>
   const timeout = new Promise<never>((_, reject) => {
@@ -25,7 +21,7 @@ const createDisputeSchema = z.object({
   roomId: z.string().uuid('유효하지 않은 방 ID입니다.'),
   categoryGroup: z.enum(VALID_CATEGORY_GROUPS, {
     errorMap: () => ({ message: '카테고리는 romance, family, friend, work 중 하나여야 합니다.' }),
-  }),
+  }).optional(),
   content: z.string().min(1, '진술 내용을 입력해주세요.'),
   sourceConversationId: z.string().uuid('유효하지 않은 대화 ID입니다.').optional(),
 })
@@ -152,8 +148,13 @@ export async function GET(request: NextRequest) {
   }
 }
 
+interface DisputeResult {
+  id: string
+  hasPersonalInfo: boolean
+}
+
 // POST /api/disputes
-// 사건 생성. content(진술)를 받아 AI 추출 → dispute 생성 → statement 저장까지 원자적 처리
+// roomId 기준으로 새 사건 생성(role_a) 또는 기존 사건에 진술 저장(role_b/수정) 통합 처리
 export async function POST(request: NextRequest) {
   const userId = await getRequestUserId(request)
   if (!userId) {
@@ -195,9 +196,7 @@ export async function POST(request: NextRequest) {
   const { roomId, categoryGroup, content, sourceConversationId } = parsed.data
 
   try {
-    // 방 유효성 확인
-    const room = await prisma.disputeRoom.findFirst({ where: { id: roomId, creatorUserId: userId, deletedAt: null } })
-
+    const room = await prisma.disputeRoom.findFirst({ where: { id: roomId, deletedAt: null } })
     if (!room) {
       return NextResponse.json<ApiResponse>(
         { success: false, error: { code: 'ROOM_NOT_FOUND', message: '방을 찾을 수 없습니다.' } },
@@ -211,56 +210,130 @@ export async function POST(request: NextRequest) {
       )
     }
 
-    const activeCount = await prisma.dispute.count({
-      where: {
-        categoryGroup: categoryGroup.toUpperCase() as PrismaCategoryGroup,
-        deletedAt: null,
-        status: { notIn: [...COMPLETED_DISPUTE_STATUSES] },
-        participants: { some: { userId } },
-      },
+    const existingDispute = await prisma.dispute.findFirst({
+      where: { roomId },
+      include: { participants: { include: { statements: true } } },
     })
-    if (activeCount >= CATEGORY_ACTIVE_LIMIT) {
-      return NextResponse.json<ApiResponse>(
-        {
-          success: false,
-          error: {
-            code: 'CATEGORY_LIMIT_EXCEEDED',
-            message: '사건은 카테고리당 2개까지만\n생성이 가능합니다.',
-          },
+
+    // ── 케이스 A: 새 사건 생성 (dispute 없음, 방 생성자만 가능) ──
+    if (!existingDispute) {
+      if (room.creatorUserId !== userId) {
+        return NextResponse.json<ApiResponse>(
+          { success: false, error: { code: 'FORBIDDEN', message: '사건을 생성할 권한이 없습니다.' } },
+          { status: 403 },
+        )
+      }
+
+      const resolvedCategory = categoryGroup ?? 'romance'
+
+      const activeCount = await prisma.dispute.count({
+        where: {
+          categoryGroup: resolvedCategory.toUpperCase() as PrismaCategoryGroup,
+          deletedAt: null,
+          status: { notIn: [...COMPLETED_DISPUTE_STATUSES] },
+          participants: { some: { userId } },
         },
-        { status: 422 },
+      })
+      if (activeCount >= CATEGORY_ACTIVE_LIMIT) {
+        return NextResponse.json<ApiResponse>(
+          { success: false, error: { code: 'CATEGORY_LIMIT_EXCEEDED', message: '사건은 카테고리당 2개까지만\n생성이 가능합니다.' } },
+          { status: 422 },
+        )
+      }
+
+      const [moderationResult, metaResult] = await Promise.allSettled([
+        withTimeout(moderateContent(content), 8000, 'moderateContent'),
+        withTimeout(extractDisputeMeta(content), 10000, 'extractDisputeMeta'),
+      ])
+
+      let moderation = { isBlocked: false, hasPersonalInfo: false, confidenceScore: null as number | null, durationMs: null as number | null, modelName: null as string | null, reason: null as string | null }
+      let moderationSucceeded = false
+      if (moderationResult.status === 'fulfilled') {
+        moderation = moderationResult.value
+        moderationSucceeded = true
+      } else {
+        console.error('[disputes] moderation failed', { message: moderationResult.reason instanceof Error ? moderationResult.reason.message : 'unknown', userId, roomId })
+      }
+
+      if (moderation.isBlocked) {
+        return NextResponse.json<ApiResponse>(
+          { success: false, error: { code: 'CONTENT_BLOCKED', message: moderation.reason ?? '부적절한 표현이 포함되어 있습니다. 내용을 수정해주세요.' } },
+          { status: 422 },
+        )
+      }
+
+      if (metaResult.status === 'rejected') {
+        const msg = metaResult.reason instanceof Error ? metaResult.reason.message : String(metaResult.reason)
+        if (msg.includes('timeout')) return NextResponse.json<ApiResponse>({ success: false, error: { code: 'AI_EXTRACTION_TIMEOUT', message: 'AI 분석 시간이 초과됐습니다. 다시 시도해주세요.' } }, { status: 504 })
+        if (msg.includes('JSON')) return NextResponse.json<ApiResponse>({ success: false, error: { code: 'AI_EXTRACTION_PARSE_ERROR', message: 'AI 응답 처리 중 오류가 발생했습니다. 다시 시도해주세요.' } }, { status: 502 })
+        return NextResponse.json<ApiResponse>({ success: false, error: { code: 'AI_EXTRACTION_FAILED', message: 'AI 분석에 실패했습니다. 다시 시도해주세요.' } }, { status: 503 })
+      }
+
+      const { title, summary: description } = metaResult.value
+      if (!title) {
+        return NextResponse.json<ApiResponse>({ success: false, error: { code: 'AI_EXTRACTION_FAILED', message: 'AI가 사건 제목을 추출하지 못했습니다. 다시 시도해주세요.' } }, { status: 503 })
+      }
+
+      const dispute = await prisma.$transaction(async (tx) => {
+        const created = await tx.dispute.create({
+          data: { roomId, categoryGroup: resolvedCategory.toUpperCase() as PrismaCategoryGroup, title, description, sourceConversationId, status: 'WAITING_OPPONENT' },
+        })
+        const participant = await tx.disputeParticipant.create({
+          data: { disputeId: created.id, userId, role: 'ROLE_A' },
+        })
+        const statement = await tx.disputeStatement.create({
+          data: { disputeId: created.id, participantId: participant.id, userId, role: 'ROLE_A', content, moderationStatus: moderationSucceeded ? 'approved' : 'pending', submittedAt: new Date() },
+        })
+        if (moderationSucceeded) {
+          await tx.moderationLog.create({
+            data: { roomId, conversationId: sourceConversationId ?? null, disputeId: created.id, statementId: statement.id, userId, target: 'STATEMENT', isBlocked: false, reason: null, confidenceScore: moderation.confidenceScore, durationMs: moderation.durationMs, modelName: moderation.modelName },
+          })
+        }
+        return created
+      }, { isolationLevel: Prisma.TransactionIsolationLevel.Serializable })
+
+      return NextResponse.json<ApiResponse<DisputeResult>>(
+        { success: true, data: { id: dispute.id, hasPersonalInfo: moderation.hasPersonalInfo } },
+        { status: 201 },
       )
     }
 
-    // 모더레이션 + AI 추출 병렬 실행 (둘 다 타임아웃 적용)
-    const [moderationResult, metaResult] = await Promise.allSettled([
-      withTimeout(moderateContent(content), 8000, 'moderateContent'),
-      withTimeout(extractDisputeMeta(content), 10000, 'extractDisputeMeta'),
-    ])
+    // ── 케이스 B: 기존 사건에 진술 저장 (상대방 참여 또는 수정) ──
+    const participant = existingDispute.participants.find((p) => p.userId === userId)
+    if (!participant) {
+      return NextResponse.json<ApiResponse>(
+        { success: false, error: { code: 'FORBIDDEN', message: '해당 사건의 참여자가 아닙니다.' } },
+        { status: 403 },
+      )
+    }
+
+    const immutableStatuses: DisputeStatus[] = ['JUDGING', 'JUDGED', 'CLOSED', 'DELETED', 'EXPIRED']
+    if (immutableStatuses.includes(existingDispute.status)) {
+      return NextResponse.json<ApiResponse>(
+        { success: false, error: { code: 'CONFLICT', message: '현재 상태에서는 진술을 수정할 수 없습니다.' } },
+        { status: 409 },
+      )
+    }
+
+    const existingStatement = participant.statements[0] ?? null
+    const isNew = !existingStatement
+
+    let newDisputeStatus: DisputeStatus | null = null
+    if (participant.role === 'ROLE_A' && existingDispute.status === 'DRAFT') newDisputeStatus = 'WAITING_OPPONENT'
+    else if (participant.role === 'ROLE_B' && existingDispute.status === 'OPPONENT_JOINED') newDisputeStatus = 'BOTH_SUBMITTED'
 
-    // 모더레이션 처리 (실패 시 fail open)
     let moderation = { isBlocked: false, hasPersonalInfo: false, confidenceScore: null as number | null, durationMs: null as number | null, modelName: null as string | null, reason: null as string | null }
     let moderationSucceeded = false
-    if (moderationResult.status === 'fulfilled') {
-      moderation = moderationResult.value
+    try {
+      moderation = await moderateContent(content)
       moderationSucceeded = true
-    } else {
-      const reason = moderationResult.reason
-      console.error('[disputes] moderation failed', {
-        message: reason instanceof Error ? reason.message : 'unknown',
-        userId,
-        roomId,
-      })
+    } catch (err) {
+      console.error('[disputes] moderation failed', { message: err instanceof Error ? err.message : 'unknown' })
     }
 
     if (moderation.isBlocked) {
-      console.info('[disputes] content blocked', {
-        userId,
-        roomId,
-        isBlocked: true,
-        confidenceScore: moderation.confidenceScore,
-        modelName: moderation.modelName,
-        reason: moderation.reason,
+      await prisma.moderationLog.create({
+        data: { roomId, conversationId: existingDispute.sourceConversationId, disputeId: existingDispute.id, userId, target: 'STATEMENT', isBlocked: true, reason: moderation.reason, confidenceScore: moderation.confidenceScore, durationMs: moderation.durationMs, modelName: moderation.modelName },
       })
       return NextResponse.json<ApiResponse>(
         { success: false, error: { code: 'CONTENT_BLOCKED', message: moderation.reason ?? '부적절한 표현이 포함되어 있습니다. 내용을 수정해주세요.' } },
@@ -268,98 +341,48 @@ export async function POST(request: NextRequest) {
       )
     }
 
-    // AI 추출 처리 (실패 시 에러 반환)
-    if (metaResult.status === 'rejected') {
-      const msg = metaResult.reason instanceof Error ? metaResult.reason.message : String(metaResult.reason)
-      if (msg.includes('timeout')) {
-        return NextResponse.json<ApiResponse>(
-          { success: false, error: { code: 'AI_EXTRACTION_TIMEOUT', message: 'AI 분석 시간이 초과됐습니다. 다시 시도해주세요.' } },
-          { status: 504 },
-        )
+    let disputeMeta: { title: string; description: string } | null = null
+    if (participant.role === 'ROLE_A' && isNew) {
+      try {
+        const meta = await withTimeout(extractDisputeMeta(content), 30000, 'extractDisputeMeta')
+        disputeMeta = { title: meta.title, description: meta.summary }
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err)
+        if (msg.includes('timeout')) return NextResponse.json<ApiResponse>({ success: false, error: { code: 'AI_EXTRACTION_TIMEOUT', message: 'AI 분석 시간이 초과됐습니다. 다시 시도해주세요.' } }, { status: 504 })
+        if (msg.includes('JSON')) return NextResponse.json<ApiResponse>({ success: false, error: { code: 'AI_EXTRACTION_PARSE_ERROR', message: 'AI 응답 처리 중 오류가 발생했습니다. 다시 시도해주세요.' } }, { status: 502 })
+        return NextResponse.json<ApiResponse>({ success: false, error: { code: 'AI_EXTRACTION_FAILED', message: 'AI 분석에 실패했습니다. 다시 시도해주세요.' } }, { status: 503 })
       }
-      if (msg.includes('JSON')) {
-        return NextResponse.json<ApiResponse>(
-          { success: false, error: { code: 'AI_EXTRACTION_PARSE_ERROR', message: 'AI 응답 처리 중 오류가 발생했습니다. 다시 시도해주세요.' } },
-          { status: 502 },
-        )
-      }
-      return NextResponse.json<ApiResponse>(
-        { success: false, error: { code: 'AI_EXTRACTION_FAILED', message: 'AI 분석에 실패했습니다. 다시 시도해주세요.' } },
-        { status: 503 },
-      )
     }
 
-    const { title, summary: description } = metaResult.value
-    if (!title) {
-      return NextResponse.json<ApiResponse>(
-        { success: false, error: { code: 'AI_EXTRACTION_FAILED', message: 'AI가 사건 제목을 추출하지 못했습니다. 다시 시도해주세요.' } },
-        { status: 503 },
-      )
-    }
+    const statement = await prisma.$transaction(async (tx) => {
+      const stmt = isNew
+        ? await tx.disputeStatement.create({ data: { disputeId: existingDispute.id, participantId: participant.id, userId, role: participant.role, content, moderationStatus: moderationSucceeded ? 'approved' : 'pending', submittedAt: new Date() } })
+        : await tx.disputeStatement.update({ where: { id: existingStatement.id }, data: { content, moderationStatus: moderationSucceeded ? 'approved' : 'pending', submittedAt: new Date() } })
 
-    // dispute + 참여자 + 진술 원자적 생성 (중복 체크 포함, serializable로 race condition 방지)
-    const dispute = await prisma.$transaction(async (tx) => {
-      const existing = await tx.dispute.findFirst({ where: { roomId } })
-      if (existing) throw new DuplicateDisputeError()
-
-      const created = await tx.dispute.create({
-        data: {
-          roomId,
-          categoryGroup: categoryGroup.toUpperCase() as PrismaCategoryGroup,
-          title,
-          description,
-          sourceConversationId,
-          status: 'WAITING_OPPONENT',
-        },
-      })
-      const participant = await tx.disputeParticipant.create({
-        data: { disputeId: created.id, userId, role: 'ROLE_A' },
-      })
-      const statement = await tx.disputeStatement.create({
-        data: {
-          disputeId: created.id,
-          participantId: participant.id,
-          userId,
-          role: 'ROLE_A',
-          content,
-          moderationStatus: moderationSucceeded ? 'approved' : 'pending',
-          submittedAt: new Date(),
-        },
-      })
       if (moderationSucceeded) {
         await tx.moderationLog.create({
-          data: {
-            roomId,
-            conversationId: sourceConversationId ?? null,
-            disputeId: created.id,
-            statementId: statement.id,
-            userId,
-            target: 'STATEMENT',
-            isBlocked: false,
-            reason: null,
-            confidenceScore: moderation.confidenceScore,
-            durationMs: moderation.durationMs,
-            modelName: moderation.modelName,
-          },
+          data: { roomId, conversationId: existingDispute.sourceConversationId, disputeId: existingDispute.id, statementId: stmt.id, userId, target: 'STATEMENT', isBlocked: false, reason: null, confidenceScore: moderation.confidenceScore, durationMs: moderation.durationMs, modelName: moderation.modelName },
         })
       }
-      return tx.dispute.findUniqueOrThrow({
-        where: { id: created.id },
-        include: { participants: { include: { user: { select: { profileImageUrl: true, image: true } } } } },
+
+      await tx.dispute.update({
+        where: { id: existingDispute.id },
+        data: {
+          ...(newDisputeStatus ? { status: newDisputeStatus } : {}),
+          ...(disputeMeta ? { title: disputeMeta.title, description: disputeMeta.description } : {}),
+        },
       })
-    }, { isolationLevel: Prisma.TransactionIsolationLevel.Serializable })
 
-    return NextResponse.json<ApiResponse<DisputeDto & { hasPersonalInfo: boolean }>>(
-      { success: true, data: { ...toDisputeDto(dispute), hasPersonalInfo: moderation.hasPersonalInfo } },
-      { status: 201 },
+      return stmt
+    })
+
+    return NextResponse.json<ApiResponse<DisputeResult>>(
+      { success: true, data: { id: existingDispute.id, hasPersonalInfo: moderation.hasPersonalInfo } },
+      { status: isNew ? 201 : 200 },
     )
   } catch (error) {
-    if (error instanceof DuplicateDisputeError) {
-      return NextResponse.json<ApiResponse>(
-        { success: false, error: { code: 'DISPUTE_ALREADY_EXISTS', message: '이미 사건이 존재하는 방입니다.' } },
-        { status: 409 },
-      )
-    }
+    const message = error instanceof Error ? error.message : String(error)
+    console.error('[disputes] POST error', { message })
     return NextResponse.json<ApiResponse>(
       { success: false, error: { code: 'INTERNAL_SERVER_ERROR', message: '서버 오류가 발생했습니다.' } },
       { status: 500 },
diff --git a/src/components/home/NewCaseButton.tsx b/src/components/home/NewCaseButton.tsx
index 3384290..3f3838d 100644
--- a/src/components/home/NewCaseButton.tsx
+++ b/src/components/home/NewCaseButton.tsx
@@ -51,7 +51,7 @@ export default function NewCaseButton() {
         throw new Error(roomJson.error?.message)
       }
 
-      router.push(`/rooms/${roomJson.data.id}/statement?category=${category}`)
+      router.push(`/disputes/${roomJson.data.id}/statement?category=${category}`)
     } catch (err) {
       setErrorMessage(err instanceof Error && err.message ? err.message : '방 생성에 실패했습니다. 다시 시도해주세요.')
     } finally {