fix(gameplay): start campaigns in playable state

Co-authored-by: multica-agent <github@multica.ai>

apps/web/pages/campaign/[id].vue

@@ -51,7 +51,11 @@ const myIntent = computed(() => payload.value?.intents.find(intent =>
   intent.member_id === currentMember.value?.id || intent.character_id === myCharacter.value?.id,
 ))
 const isReady = computed(() => Boolean(myIntent.value?.ready))
-const activeHumanMembers = computed(() => payload.value?.members.filter(member => member.active !== false) ?? [])
+const activeHumanMembers = computed(() => payload.value?.members.filter(member =>
+  member.active !== false && payload.value?.characters.some(character =>
+    character.user_id === member.user_id && character.controller === 'human',
+  ),
+) ?? [])
 const readyCount = computed(() => activeHumanMembers.value.filter(member => payload.value?.intents.some(intent => intent.member_id === member.id && intent.ready)).length)
 const canAct = computed(() => currentRound.value?.status === 'open' && Boolean(myCharacter.value))
 const roundBusy = computed(() => ['queued', 'resolving'].includes(String(currentRound.value?.status)))

apps/web/pages/worlds/new.vue

@@ -16,6 +16,8 @@ interface StoredSession {
   confirmed_world_id?: string | null
 }
 
+const questionLimit = 4
+
 const { api } = useDngApi()
 const route = useRoute()
 const stage = ref<Stage>('seed')
@@ -33,7 +35,14 @@ const messages = ref<Message[]>([
 ])
 
 const displayedQuestion = computed(() => currentQuestion.value ? { key: currentQuestion.value.id, label: currentQuestion.value.label, options: currentQuestion.value.options } : null)
-const progress = computed(() => stage.value === 'preview' || stage.value === 'confirming' ? 100 : stage.value === 'generating' ? 85 : stage.value === 'seed' ? 10 : 20 + Math.round((Math.min(answerCount.value, 5) / 5) * 55))
+const conversationMessages = computed(() => {
+  if (!currentQuestion.value) return messages.value
+  const currentIndex = messages.value.findLastIndex(message =>
+    message.role === 'coauthor' && message.body === currentQuestion.value?.label,
+  )
+  return currentIndex < 0 ? messages.value : messages.value.filter((_, index) => index !== currentIndex)
+})
+const progress = computed(() => stage.value === 'preview' || stage.value === 'confirming' ? 100 : stage.value === 'generating' ? 85 : stage.value === 'seed' ? 10 : 20 + Math.round((Math.min(answerCount.value, questionLimit) / questionLimit) * 55))
 
 function addMessage(role: Message['role'], body: string, label?: string) {
   messages.value.push({ id: `${Date.now()}-${messages.value.length}`, role, body, label })
@@ -117,6 +126,7 @@ async function resume(id: string) {
 
 async function answerQuestion(key: string, value: string) {
   if (stage.value !== 'questions' || currentQuestion.value?.id !== key || busy.value || !sessionId.value) return
+  const answeredQuestion = currentQuestion.value
   busy.value = true
   pendingAnswer.value = { key, value }
   try {
@@ -124,9 +134,10 @@ async function answerQuestion(key: string, value: string) {
       method: 'POST', body: { content: value },
     })
     answers[key] = value
+    addMessage('coauthor', answeredQuestion.label, `COAUTHOR · QUESTION ${Math.min(answerCount.value + 1, questionLimit)} OF ${questionLimit}`)
     addMessage('player', value)
     currentQuestion.value = null
-    answerCount.value = Math.min(answerCount.value + 1, 5)
+    answerCount.value = Math.min(answerCount.value + 1, questionLimit)
     pendingAnswer.value = null
     retryAction.value = 'respond'
     await requestNextQuestion()
@@ -140,14 +151,13 @@ async function answerQuestion(key: string, value: string) {
 async function requestNextQuestion() {
   if (!sessionId.value) return
   const result = await api<RespondResult>(`/api/v1/coauthor/sessions/${sessionId.value}/respond`, { method: 'POST' })
-  if (result.readyToGenerate || answerCount.value >= 5) {
+  if (result.readyToGenerate || answerCount.value >= questionLimit) {
     currentQuestion.value = null
     await generate()
     return
   }
   if (!result.question) throw new Error('The coauthor did not return its next question.')
   currentQuestion.value = result.question
-  addMessage('coauthor', result.question.label, `COAUTHOR · QUESTION ${Math.min(answerCount.value + 1, 5)} OF UP TO 5`)
 }
 
 function errorText(error: unknown) {
@@ -247,7 +257,7 @@ onMounted(() => {
       <main v-if="stage !== 'preview' && stage !== 'confirming'" class="coauthor">
         <p class="kicker">COAUTHOR / SESSION 01</p>
         <h1>BUILD THE<br>IMPOSSIBLE<span>.</span></h1>
-        <CoauthorConversation :messages="messages" :question="displayedQuestion" :selected-answer="currentQuestion ? answers[currentQuestion.id] : undefined" :busy="stage === 'generating' || busy" @answer="answerQuestion" @retry="retry" />
+        <CoauthorConversation :messages="conversationMessages" :question="displayedQuestion" :selected-answer="currentQuestion ? answers[currentQuestion.id] : undefined" :busy="stage === 'generating' || busy" @answer="answerQuestion" @retry="retry" />
         <form v-if="stage === 'seed'" class="seed" @submit.prevent="begin">
           <textarea v-model="seed" aria-label="World idea" rows="3" maxlength="1200" autofocus />
           <button :disabled="!seed.trim() || busy">{{ busy ? 'SAVING…' : 'BEGIN' }} <span>→</span></button>

apps/web/server/api/v1/coauthor/sessions/[id]/respond.post.ts

@@ -1,17 +1,9 @@
 import { z } from 'zod'
 import { buildJsonCompletion, parseJsonCompletion } from '~/server/utils/ai-provider'
+import { CoauthorQuestionSchema, StoredCoauthorQuestionSchema } from '~/server/utils/coauthor-question'
 import { requireStageTwoSafeText, requireStageTwoUser, stageTwoApiError, stageTwoDatabase, stageTwoRpc, stageTwoUuid } from '~/server/utils/stage-two-supabase'
 
 const MessageSchema = z.object({ role: z.enum(['user', 'assistant']), content: z.string().min(1).max(5000) })
-const QuestionSchema = z.object({
-  question: z.string().trim().min(5).max(300),
-  options: z.array(z.string().trim().min(1).max(100)).length(3),
-})
-const StoredQuestionSchema = z.object({
-  id: z.string().trim().min(1).max(80),
-  label: z.string().trim().min(5).max(300),
-  options: z.array(z.string().trim().min(1).max(100)).length(3),
-})
 
 export default defineEventHandler(async (event) => {
   try {
@@ -27,29 +19,42 @@ export default defineEventHandler(async (event) => {
     const answerCount = Math.max(0, messages.filter(message => message.role === 'user').length - 1)
     if (answerCount >= 4) return { readyToGenerate: true }
     if (session.current_question) {
-      return { readyToGenerate: false, question: StoredQuestionSchema.parse(session.current_question) }
+      const storedQuestion = StoredCoauthorQuestionSchema.safeParse(session.current_question)
+      if (storedQuestion.success) return { readyToGenerate: false, question: storedQuestion.data }
     }
 
-    const completion = buildJsonCompletion(useRuntimeConfig(), {
-      system: `You are the Dungeons & Ground coauthor. Based only on this conversation, ask one focused question that makes the original TTRPG world more playable. This is clarification ${answerCount + 1} of 4. Do not repeat a topic already answered. Adapt to the requested genre. Use the language of the first user message for the question and every answer option unless the user explicitly requests another language. Provide exactly three concise, mutually distinct answer options. Keep everything suitable for ages 13+.`,
-      messages,
-      schemaName: 'coauthor_question',
-      jsonSchema: QuestionSchema.toJSONSchema(),
-    })
-    const controller = new AbortController()
-    const timeout = setTimeout(() => controller.abort(), 30_000)
-    let response: Response
-    try {
-      response = await fetch(completion.endpoint, {
-        method: 'POST', headers: completion.headers, body: JSON.stringify(completion.body), signal: controller.signal,
+    let question: z.infer<typeof CoauthorQuestionSchema> | undefined
+    for (let attempt = 0; attempt < 2 && !question; attempt += 1) {
+      const correction = attempt
+        ? ' The previous response was malformed. Ensure every option is a natural-language answer, not punctuation, a JSON key, or a copy of the question.'
+        : ''
+      const completion = buildJsonCompletion(useRuntimeConfig(), {
+        system: `You are the Dungeons & Ground coauthor. Based only on this conversation, ask one focused question that makes the original TTRPG world more playable. This is clarification ${answerCount + 1} of 4. Do not repeat a topic already answered. Adapt to the requested genre. Use the language of the first user message for the question and every answer option unless the user explicitly requests another language. Provide exactly three concise, mutually distinct natural-language answers to the question. Never use punctuation or JSON field names as an option, and never repeat the question as an option. Keep everything suitable for ages 13+.${correction}`,
+        messages,
+        schemaName: 'coauthor_question',
+        jsonSchema: CoauthorQuestionSchema.toJSONSchema(),
       })
-    } finally {
-      clearTimeout(timeout)
+      const controller = new AbortController()
+      const timeout = setTimeout(() => controller.abort(), 30_000)
+      let response: Response
+      try {
+        response = await fetch(completion.endpoint, {
+          method: 'POST', headers: completion.headers, body: JSON.stringify(completion.body), signal: controller.signal,
+        })
+      } finally {
+        clearTimeout(timeout)
+      }
+      if (!response.ok) throw createError({ statusCode: 502, statusMessage: 'The coauthor is temporarily unavailable.' })
+      try {
+        const parsed = CoauthorQuestionSchema.safeParse(parseJsonCompletion(await response.json()))
+        if (parsed.success) question = parsed.data
+      } catch {
+        // Retry once when the provider ignores structured-output requirements.
+      }
     }
-    if (!response.ok) throw createError({ statusCode: 502, statusMessage: 'The coauthor is temporarily unavailable.' })
-    const question = QuestionSchema.parse(parseJsonCompletion(await response.json()))
+    if (!question) throw createError({ statusCode: 502, statusMessage: 'The coauthor returned invalid answer options. Try the question again.' })
     requireStageTwoSafeText([question.question, ...question.options].join('\n'))
-    const storedQuestion = StoredQuestionSchema.parse({
+    const storedQuestion = StoredCoauthorQuestionSchema.parse({
       id: `question-${answerCount + 1}`,
       label: question.question,
       options: question.options,

apps/web/server/utils/coauthor-question.test.ts

@@ -0,0 +1,30 @@
+import { describe, expect, it } from 'vitest'
+import { CoauthorQuestionSchema, StoredCoauthorQuestionSchema } from './coauthor-question'
+
+describe('coauthor question validation', () => {
+  it('accepts three useful, distinct answers', () => {
+    expect(CoauthorQuestionSchema.parse({
+      question: 'How will the party enter the sealed archive?',
+      options: ['Negotiate with its keeper', 'Search for a maintenance route', 'Force the main gate'],
+    })).toMatchObject({ options: ['Negotiate with its keeper', 'Search for a maintenance route', 'Force the main gate'] })
+    expect(CoauthorQuestionSchema.toJSONSchema()).toMatchObject({
+      type: 'object',
+      properties: { options: { type: 'array', minItems: 3, maxItems: 3 } },
+    })
+  })
+
+  it('rejects malformed JSON fragments and a repeated question', () => {
+    expect(() => CoauthorQuestionSchema.parse({
+      question: 'Как персонажи собираются решить проблему отсутствия наличных денег?',
+      options: [':', 'question', 'Как персонажи собираются решить проблему отсутствия наличных денег?'],
+    })).toThrow()
+  })
+
+  it('applies the same quality checks to a stored question', () => {
+    expect(() => StoredCoauthorQuestionSchema.parse({
+      id: 'question-2',
+      label: 'What makes the signal dangerous?',
+      options: ['The signal is alive', 'The signal is alive', 'Nobody knows yet'],
+    })).toThrow()
+  })
+})

apps/web/server/utils/coauthor-question.ts

@@ -0,0 +1,63 @@
+import { z } from 'zod'
+
+const reservedOptionValues = new Set([
+  'answer',
+  'answers',
+  'label',
+  'option',
+  'options',
+  'question',
+])
+
+function normalized(value: string) {
+  return value.trim().toLocaleLowerCase().replace(/\s+/g, ' ')
+}
+
+export const CoauthorQuestionSchema = z.object({
+  question: z.string().trim().min(5).max(300),
+  options: z.array(z.string().trim().min(2).max(100)).length(3),
+}).superRefine((value, context) => {
+  const question = normalized(value.question)
+  const seen = new Set<string>()
+
+  value.options.forEach((option, index) => {
+    const candidate = normalized(option)
+    if (!/[\p{L}\p{N}]/u.test(candidate) || reservedOptionValues.has(candidate)) {
+      context.addIssue({
+        code: 'custom',
+        message: 'Each option must be a meaningful answer.',
+        path: ['options', index],
+      })
+    }
+    if (seen.has(candidate)) {
+      context.addIssue({
+        code: 'custom',
+        message: 'Answer options must be distinct.',
+        path: ['options', index],
+      })
+    }
+    if (candidate === question || (candidate.length >= 20 && question.includes(candidate))) {
+      context.addIssue({
+        code: 'custom',
+        message: 'An answer option must not repeat the question.',
+        path: ['options', index],
+      })
+    }
+    seen.add(candidate)
+  })
+})
+
+export const StoredCoauthorQuestionSchema = z.object({
+  id: z.string().trim().min(1).max(80),
+  label: z.string().trim().min(5).max(300),
+  options: CoauthorQuestionSchema.shape.options,
+}).superRefine((value, context) => {
+  const result = CoauthorQuestionSchema.safeParse({ question: value.label, options: value.options })
+  for (const issue of result.error?.issues ?? []) {
+    context.addIssue({
+      code: 'custom',
+      message: issue.message,
+      path: issue.path[0] === 'question' ? ['label', ...issue.path.slice(1)] : issue.path,
+    })
+  }
+})