@codori/client 0.0.6 → 0.0.7

package/app/components/ChatWorkspace.vue

@@ -8,6 +8,7 @@ import {
   removePendingUserMessageId,
   resolvePromptSubmitStatus,
   resolveTurnSubmissionMethod,
+  shouldApplyNotificationToCurrentTurn,
   shouldSubmitViaTurnSteer,
   shouldAwaitThreadHydration,
   shouldRetrySteerWithTurnStart,
@@ -135,6 +136,7 @@ const composerError = computed(() => attachmentError.value ?? error.value)
 const submitError = computed(() => composerError.value ? new Error(composerError.value) : undefined)
 const interruptRequested = ref(false)
 const awaitingAssistantOutput = ref(false)
+const sendMessageLocked = ref(false)
 const isBusy = computed(() =>
   status.value === 'submitted'
   || status.value === 'streaming'
@@ -467,7 +469,11 @@ const ensurePendingLiveStream = async () => {
       }
 
       const turnId = notificationTurnId(notification)
-      if (turnId && turnId !== liveStream.turnId) {
+      if (!shouldApplyNotificationToCurrentTurn({
+        liveStreamTurnId: liveStream.turnId,
+        notificationMethod: notification.method,
+        notificationTurnId: turnId
+      })) {
         return
       }
 
@@ -806,7 +812,11 @@ const hydrateThread = async (threadId: string) => {
           }
 
           const turnId = notificationTurnId(notification)
-          if (turnId && turnId !== nextLiveStream.turnId) {
+          if (!shouldApplyNotificationToCurrentTurn({
+            liveStreamTurnId: nextLiveStream.turnId,
+            notificationMethod: notification.method,
+            notificationTurnId: turnId
+          })) {
             return
           }
 
@@ -1764,118 +1774,131 @@ const applyNotification = (notification: CodexRpcNotification) => {
 }
 
 const sendMessage = async () => {
+  if (sendMessageLocked.value) {
+    return
+  }
+
+  sendMessageLocked.value = true
   const text = input.value.trim()
   const submittedAttachments = attachments.value.slice()
 
   if (!text && submittedAttachments.length === 0) {
+    sendMessageLocked.value = false
     return
   }
 
+  input.value = ''
+  clearAttachments({ revoke: false })
+
   try {
     await loadPromptControls()
   } catch (caughtError) {
+    restoreDraftIfPristine(text, submittedAttachments)
     error.value = caughtError instanceof Error ? caughtError.message : String(caughtError)
     status.value = 'error'
+    sendMessageLocked.value = false
     return
   }
 
-  if (pendingThreadHydration && shouldAwaitThreadHydration({
-    hasPendingThreadHydration: true,
-    routeThreadId: routeThreadId.value
-  })) {
-    await pendingThreadHydration
-  }
+  try {
+    if (pendingThreadHydration && shouldAwaitThreadHydration({
+      hasPendingThreadHydration: true,
+      routeThreadId: routeThreadId.value
+    })) {
+      await pendingThreadHydration
+    }
 
-  pinnedToBottom.value = true
-  error.value = null
-  attachmentError.value = null
-  const submissionMethod = resolveTurnSubmissionMethod(shouldSubmitWithTurnSteer())
-  if (submissionMethod === 'turn/start') {
-    status.value = 'submitted'
-  }
-  input.value = ''
-  clearAttachments({ revoke: false })
-  const optimisticMessage = buildOptimisticMessage(text, submittedAttachments)
-  const optimisticMessageId = optimisticMessage.id
-  rememberOptimisticAttachments(optimisticMessageId, submittedAttachments)
-  messages.value = [...messages.value, optimisticMessage]
-  markAwaitingAssistantOutput(shouldAwaitAssistantOutput(submissionMethod))
-  let startedLiveStream: LiveStream | null = null
-  let executedSubmissionMethod = submissionMethod
+    pinnedToBottom.value = true
+    error.value = null
+    attachmentError.value = null
+    const submissionMethod = resolveTurnSubmissionMethod(shouldSubmitWithTurnSteer())
+    if (submissionMethod === 'turn/start') {
+      status.value = 'submitted'
+    }
+    const optimisticMessage = buildOptimisticMessage(text, submittedAttachments)
+    const optimisticMessageId = optimisticMessage.id
+    rememberOptimisticAttachments(optimisticMessageId, submittedAttachments)
+    messages.value = [...messages.value, optimisticMessage]
+    markAwaitingAssistantOutput(shouldAwaitAssistantOutput(submissionMethod))
+    let startedLiveStream: LiveStream | null = null
+    let executedSubmissionMethod = submissionMethod
 
-  try {
-    const client = getClient(props.projectId)
+    try {
+      const client = getClient(props.projectId)
 
-    if (submissionMethod === 'turn/steer') {
-      const liveStream = await ensurePendingLiveStream()
-      queuePendingUserMessage(liveStream, optimisticMessageId)
-      let uploadedAttachments: PersistedProjectAttachment[] | undefined
-
-      try {
-        uploadedAttachments = await uploadAttachments(liveStream.threadId, submittedAttachments)
-        const turnId = await waitForLiveStreamTurnId(liveStream)
-
-        await client.request<TurnStartResponse>('turn/steer', {
-          threadId: liveStream.threadId,
-          expectedTurnId: turnId,
-          input: buildTurnStartInput(text, uploadedAttachments),
-          ...buildTurnOverrides(selectedModel.value, selectedEffort.value)
-        })
-        tokenUsage.value = null
-      } catch (caughtError) {
-        const errorToHandle = caughtError instanceof Error ? caughtError : new Error(String(caughtError))
-        if (!shouldRetrySteerWithTurnStart(errorToHandle.message)) {
-          throw errorToHandle
-        }
+      if (submissionMethod === 'turn/steer') {
+        const liveStream = await ensurePendingLiveStream()
+        queuePendingUserMessage(liveStream, optimisticMessageId)
+        let uploadedAttachments: PersistedProjectAttachment[] | undefined
 
-        executedSubmissionMethod = 'turn/start'
-        startedLiveStream = liveStream
-        status.value = 'submitted'
-        setLiveStreamTurnId(liveStream, null)
-        setLiveStreamInterruptRequested(liveStream, false)
+        try {
+          uploadedAttachments = await uploadAttachments(liveStream.threadId, submittedAttachments)
+          const turnId = await waitForLiveStreamTurnId(liveStream)
 
-        await submitTurnStart({
-          client,
-          liveStream,
-          text,
-          submittedAttachments,
-          uploadedAttachments,
-          optimisticMessageId,
-          queueOptimisticMessage: false
-        })
+          await client.request<TurnStartResponse>('turn/steer', {
+            threadId: liveStream.threadId,
+            expectedTurnId: turnId,
+            input: buildTurnStartInput(text, uploadedAttachments),
+            ...buildTurnOverrides(selectedModel.value, selectedEffort.value)
+          })
+          tokenUsage.value = null
+        } catch (caughtError) {
+          const errorToHandle = caughtError instanceof Error ? caughtError : new Error(String(caughtError))
+          if (!shouldRetrySteerWithTurnStart(errorToHandle.message)) {
+            throw errorToHandle
+          }
+
+          executedSubmissionMethod = 'turn/start'
+          startedLiveStream = liveStream
+          status.value = 'submitted'
+          setLiveStreamTurnId(liveStream, null)
+          setLiveStreamInterruptRequested(liveStream, false)
+
+          await submitTurnStart({
+            client,
+            liveStream,
+            text,
+            submittedAttachments,
+            uploadedAttachments,
+            optimisticMessageId,
+            queueOptimisticMessage: false
+          })
+        }
+        return
       }
-      return
-    }
 
-    const liveStream = await ensurePendingLiveStream()
-    startedLiveStream = liveStream
-    await submitTurnStart({
-      client,
-      liveStream,
-      text,
-      submittedAttachments,
-      optimisticMessageId
-    })
-  } catch (caughtError) {
-    const messageText = caughtError instanceof Error ? caughtError.message : String(caughtError)
+      const liveStream = await ensurePendingLiveStream()
+      startedLiveStream = liveStream
+      await submitTurnStart({
+        client,
+        liveStream,
+        text,
+        submittedAttachments,
+        optimisticMessageId
+      })
+    } catch (caughtError) {
+      const messageText = caughtError instanceof Error ? caughtError.message : String(caughtError)
 
-    markAwaitingAssistantOutput(false)
-    untrackPendingUserMessage(optimisticMessageId)
-    removeOptimisticMessage(optimisticMessageId)
+      markAwaitingAssistantOutput(false)
+      untrackPendingUserMessage(optimisticMessageId)
+      removeOptimisticMessage(optimisticMessageId)
 
-    if (executedSubmissionMethod === 'turn/start') {
-      if (startedLiveStream && session.liveStream === startedLiveStream) {
-        clearPendingOptimisticMessages(clearLiveStream(new Error(messageText)))
+      if (executedSubmissionMethod === 'turn/start') {
+        if (startedLiveStream && session.liveStream === startedLiveStream) {
+          clearPendingOptimisticMessages(clearLiveStream(new Error(messageText)))
+        }
+        session.pendingLiveStream = null
+        restoreDraftIfPristine(text, submittedAttachments)
+        error.value = messageText
+        status.value = 'error'
+        return
       }
-      session.pendingLiveStream = null
+
       restoreDraftIfPristine(text, submittedAttachments)
       error.value = messageText
-      status.value = 'error'
-      return
     }
-
-    restoreDraftIfPristine(text, submittedAttachments)
-    error.value = messageText
+  } finally {
+    sendMessageLocked.value = false
   }
 }
 
@@ -2077,19 +2100,11 @@ watch([selectedModel, availableModels], () => {
           />
         </template>
         <template #indicator>
-          <div
+          <UChatShimmer
             v-if="awaitingAssistantOutput"
-            class="flex items-center gap-3 px-1 py-2 text-sm text-muted"
-          >
-            <UIcon
-              name="i-lucide-loader-circle"
-              class="size-4 animate-spin text-primary"
-            />
-            <div class="flex flex-col gap-1">
-              <UChatShimmer text="Waiting for response…" />
-              <span class="text-xs text-toned">Real reasoning will appear separately when streaming starts.</span>
-            </div>
-          </div>
+            text="Thinking..."
+            class="px-1 py-2"
+          />
         </template>
       </UChatMessages>
     </div>

package/app/utils/chat-turn-engagement.ts

@@ -31,9 +31,10 @@ export const shouldSubmitViaTurnSteer = (input: {
   liveStreamTurnId: string | null
   status: PromptSubmitStatus
 }) =>
-  input.activeThreadId !== null
-  && input.liveStreamThreadId === input.activeThreadId
-  && (input.liveStreamTurnId !== null || input.status === 'submitted' || input.status === 'streaming')
+  (input.activeThreadId !== null
+    && input.liveStreamThreadId === input.activeThreadId
+    && input.status === 'submitted')
+  || hasSteerableTurn(input)
 
 export const shouldAwaitThreadHydration = (input: {
   hasPendingThreadHydration: boolean
@@ -43,7 +44,17 @@ export const shouldAwaitThreadHydration = (input: {
   && input.routeThreadId !== null
 
 export const shouldRetrySteerWithTurnStart = (message: string) =>
-  /no active turn to steer/i.test(message)
+  /no active turn to steer|active turn is no longer available/i.test(message)
+
+export const shouldApplyNotificationToCurrentTurn = (input: {
+  liveStreamTurnId: string | null
+  notificationMethod: string
+  notificationTurnId: string | null
+}) =>
+  input.liveStreamTurnId === null
+  || input.notificationTurnId === null
+  || input.notificationTurnId === input.liveStreamTurnId
+  || input.notificationMethod === 'turn/started'
 
 export const resolvePromptSubmitStatus = (input: {
   status: PromptSubmitStatus

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codori/client",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "private": false,
   "description": "Codori Nuxt dashboard for project browsing, Codex chat, and thread resume.",
   "type": "module",