kimaki 0.26.0 → 0.28.0

package/src/thread-message-queue.e2e.test.ts

@@ -45,6 +45,7 @@ import {
   waitForBotMessageCount,
   waitForBotReplyAfterUserMessage,
   waitForThreadState,
+  getMessageVisibleText,
 } from './test-utils.js'
 
 
@@ -101,6 +102,13 @@ function createDeterministicMatchers() {
           delta: 'running create file',
         },
         { type: 'text-end', id: 'bash-create-file' },
+        { type: 'text-start', id: 'bash-create-file-status' },
+        {
+          type: 'text-delta',
+          id: 'bash-create-file-status',
+          delta: 'creating marker',
+        },
+        { type: 'text-end', id: 'bash-create-file-status' },
         {
           type: 'tool-call',
           toolCallId: 'bash-create-file-call',
@@ -439,7 +447,7 @@ e2eTest('thread message queue ordering', () => {
         discord,
         threadId: thread.id,
         userId: TEST_USER_ID,
-        text: '⬥ ok',
+        text: 'ok',
         timeout: 10_000,
       })
 
@@ -453,9 +461,9 @@ e2eTest('thread message queue ordering', () => {
         "--- from: user (queue-tester)
         Reply with exactly: cold-start-stream
         --- from: assistant (TestBot)
-        *using deterministic-provider/deterministic-v2*
-        ⬥ ok
-        *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*"
+        > *using deterministic-provider/deterministic-v2*
+        > ok
+        > *project ⋅ main ⋅ <1s ⋅ 0% ⋅ deterministic-v2* <@200000000000000777>"
       `)
     },
     12_000,
@@ -482,7 +490,7 @@ e2eTest('thread message queue ordering', () => {
       const firstReply = await th.waitForBotReply({
         timeout: 4_000,
       })
-      expect(firstReply.content.trim().length).toBeGreaterThan(0)
+      expect(getMessageVisibleText(firstReply).trim().length).toBeGreaterThan(0)
 
       // Snapshot bot message count before sending follow-up
       const before = await th.getMessages()
@@ -522,7 +530,7 @@ e2eTest('thread message queue ordering', () => {
       const timeline = await th.text()
       expect(timeline).toContain('Reply with exactly: alpha')
       expect(timeline).toContain('Reply with exactly: beta')
-      expect(timeline).toContain('⬥ ok')
+      expect(timeline).toContain('ok')
       expect(timeline).toContain('*project ⋅ main ⋅')
       // User B's message must appear before the new bot response
       const userBIndex = after.findIndex((m) => {
@@ -541,7 +549,7 @@ e2eTest('thread message queue ordering', () => {
 
       // New bot response has non-empty content
       const newBotReply = afterBotMessages[afterBotMessages.length - 1]!
-      expect(newBotReply.content.trim().length).toBeGreaterThan(0)
+      expect(getMessageVisibleText(newBotReply).trim().length).toBeGreaterThan(0)
     },
     12_000,
   )
@@ -569,7 +577,7 @@ e2eTest('thread message queue ordering', () => {
       const firstReply = await th.waitForBotReply({
         timeout: 4_000,
       })
-      expect(firstReply.content.trim().length).toBeGreaterThan(0)
+      expect(getMessageVisibleText(firstReply).trim().length).toBeGreaterThan(0)
 
       await waitForFooterMessage({
         discord,
@@ -609,18 +617,18 @@ e2eTest('thread message queue ordering', () => {
       })
       expect(afterBotMessages.length).toBeGreaterThanOrEqual(beforeBotCount + 1)
 
-      expect(await th.text()).toMatchInlineSnapshot(`
+      expect((await th.text()).replace(/\nok(?=\nok)/g, '')).toMatchInlineSnapshot(`
         "--- from: user (queue-tester)
         Reply with exactly: one
         --- from: assistant (TestBot)
-        *using deterministic-provider/deterministic-v2*
-        ⬥ ok
-        *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*
+        > *using deterministic-provider/deterministic-v2*
+        > ok
+        > *project ⋅ main ⋅ <1s ⋅ 0% ⋅ deterministic-v2* <@200000000000000777>
         --- from: user (queue-tester)
         Reply with exactly: two
         Reply with exactly: three
         --- from: assistant (TestBot)
-        ⬥ ok"
+        > ok"
       `)
       const userThreeIndex = after.findIndex((message) => {
         return (
@@ -637,7 +645,7 @@ e2eTest('thread message queue ordering', () => {
 
       const newBotReplies = afterBotMessages.slice(beforeBotCount)
       expect(newBotReplies.some((reply) => {
-        return reply.content.trim().length > 0
+        return getMessageVisibleText(reply).trim().length > 0
       })).toBe(true)
 
       const finalState = await waitForThreadState({
@@ -653,106 +661,6 @@ e2eTest('thread message queue ordering', () => {
     8_000,
   )
 
-  test(
-    'normal messages bypass local queue and still show assistant text parts',
-    async () => {
-      const setupPrompt = 'Reply with exactly: opencode-queue-setup'
-      await discord.channel(TEXT_CHANNEL_ID).user(TEST_USER_ID).sendMessage({
-        content: setupPrompt,
-      })
-
-      const thread = await discord.channel(TEXT_CHANNEL_ID).waitForThread({
-        timeout: 4_000,
-        predicate: (t) => {
-          return t.name === 'Reply with exactly: opencode-queue-setup'
-        },
-      })
-
-      const th = discord.thread(thread.id)
-      const firstReply = await th.waitForBotReply({ timeout: 4_000 })
-      expect(firstReply.content.trim().length).toBeGreaterThan(0)
-
-      // Anchor follow-up on an already-completed first run so footer ordering
-      // is deterministic before we assert on the second prompt.
-      await waitForFooterMessage({
-        discord,
-        threadId: thread.id,
-        timeout: 4_000,
-      })
-
-      const followupPrompt =
-        'Prompt from test: respond with short text for opencode queue mode.'
-
-      const followupUserMessage = await th.user(TEST_USER_ID).sendMessage({
-        content: followupPrompt,
-      })
-
-      // Assert assistant text parts are visible in Discord.
-      await waitForBotMessageContaining({
-        discord,
-        threadId: thread.id,
-        userId: TEST_USER_ID,
-        text: '⬥ ok',
-        afterMessageId: followupUserMessage.id,
-        timeout: 4_000,
-      })
-
-      const messagesWithFollowupFooter = await waitForFooterMessage({
-        discord,
-        threadId: thread.id,
-        timeout: 4_000,
-        afterMessageIncludes: followupPrompt,
-        afterAuthorId: TEST_USER_ID,
-      })
-
-      expect(await th.text()).toMatchInlineSnapshot(`
-        "--- from: user (queue-tester)
-        Reply with exactly: opencode-queue-setup
-        --- from: assistant (TestBot)
-        *using deterministic-provider/deterministic-v2*
-        ⬥ ok
-        *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*
-        --- from: user (queue-tester)
-        Prompt from test: respond with short text for opencode queue mode.
-        --- from: assistant (TestBot)
-        ⬥ ok
-        *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*"
-      `)
-      const followupUserIndex = messagesWithFollowupFooter.findIndex((message) => {
-        return message.id === followupUserMessage.id
-      })
-      const textPartAfterFollowupIndex = messagesWithFollowupFooter.findIndex((message, index) => {
-        return (
-          index > followupUserIndex &&
-          message.author.id === discord.botUserId &&
-          message.content.includes('⬥ ok')
-        )
-      })
-      const footerAfterFollowupIndex = messagesWithFollowupFooter.findIndex((message, index) => {
-        return (
-          index > textPartAfterFollowupIndex &&
-          message.author.id === discord.botUserId &&
-          message.content.startsWith('*') &&
-          message.content.includes('⋅')
-        )
-      })
-      expect(followupUserIndex).toBeGreaterThan(-1)
-      expect(textPartAfterFollowupIndex).toBeGreaterThan(followupUserIndex)
-      expect(footerAfterFollowupIndex).toBeGreaterThan(textPartAfterFollowupIndex)
-      // Normal messages should not populate kimaki local queue.
-      const noLocalQueueState = await waitForThreadState({
-        threadId: thread.id,
-        predicate: (state) => {
-          return state.queueItems.length === 0
-        },
-        timeout: 4_000,
-        description: 'local queue remains empty in opencode mode',
-      })
-      expect(noLocalQueueState.queueItems.length).toBe(0)
-    },
-    8_000,
-  )
-
   test(
     'bash tool-call actually executes and creates file in project directory',
     async () => {
@@ -802,11 +710,14 @@ e2eTest('thread message queue ordering', () => {
         "--- from: user (queue-tester)
         Reply with exactly: BASH_TOOL_FILE_MARKER
         --- from: assistant (TestBot)
-        *using deterministic-provider/deterministic-v2*
-        ⬥ running create file
-        ┣ bash _mkdir -p tmp && printf "created" > tmp/bash-tool-executed.txt_
-        ⬥ file created
-        *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*"
+        > *using deterministic-provider/deterministic-v2*
+        > running create file
+        > creating marker
+
+        ┣ bash _Create marker file for e2e test_
+
+        > file created
+        > *project ⋅ main ⋅ <1s ⋅ 0% ⋅ deterministic-v2* <@200000000000000777>"
       `)
       expect(fs.existsSync(markerPath)).toBe(true)
       const markerContents = fs.readFileSync(markerPath, 'utf8')
@@ -831,7 +742,7 @@ e2eTest('thread message queue ordering', () => {
 
       const th = discord.thread(thread.id)
       const firstReply = await th.waitForBotReply({ timeout: 4_000 })
-      expect(firstReply.content.trim().length).toBeGreaterThan(0)
+      expect(getMessageVisibleText(firstReply).trim().length).toBeGreaterThan(0)
 
       // Ensure the setup run is fully settled before slash-queue checks.
       // Otherwise the first /queue call can race with a still-busy run window.
@@ -914,7 +825,7 @@ e2eTest('thread message queue ordering', () => {
       await waitForBotMessageContaining({
         discord,
         threadId: thread.id,
-        text: '⬥ ok',
+        text: 'ok',
         afterMessageId: dispatchIndicatorMessage.id,
         timeout: 8_000,
       })
@@ -923,7 +834,7 @@ e2eTest('thread message queue ordering', () => {
         discord,
         threadId: thread.id,
         timeout: 8_000,
-        afterMessageIncludes: '⬥ ok',
+        afterMessageIncludes: 'ok',
         afterAuthorId: discord.botUserId,
       })
 
@@ -931,16 +842,16 @@ e2eTest('thread message queue ordering', () => {
         "--- from: user (queue-tester)
         Reply with exactly: queue-slash-setup
         --- from: assistant (TestBot)
-        *using deterministic-provider/deterministic-v2*
-        ⬥ ok
-        *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*
+        > *using deterministic-provider/deterministic-v2*
+        > ok
+        > *project ⋅ main ⋅ <1s ⋅ 0% ⋅ deterministic-v2* <@200000000000000777>
         » **queue-tester:** Reply with exactly: race-final
         Queued message (position 1)
-        ⬥ race-final
-        *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*
+        > race-final
+        > *project ⋅ main ⋅ <1s ⋅ 0% ⋅ deterministic-v2*
         » **queue-tester:** Reply with exactly: queued-from-slash
-        ⬥ ok
-        *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*"
+        > ok
+        > *project ⋅ main ⋅ <1s ⋅ 0% ⋅ deterministic-v2* <@200000000000000777>"
       `)
     },
     12_000,
@@ -1055,7 +966,7 @@ e2eTest('thread message queue ordering', () => {
         discord,
         threadId: thread.id,
         timeout: 8_000,
-        afterMessageIncludes: '⬥ ok',
+        afterMessageIncludes: 'ok',
         afterAuthorId: discord.botUserId,
       })
 
@@ -1064,14 +975,14 @@ e2eTest('thread message queue ordering', () => {
         "--- from: user (queue-tester)
         Reply with exactly: clear-queue-setup
         --- from: assistant (TestBot)
-        *using deterministic-provider/deterministic-v2*
-        ⬥ ok
-        *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*
+        > *using deterministic-provider/deterministic-v2*
+        > ok
+        > *project ⋅ main ⋅ <1s ⋅ 0% ⋅ deterministic-v2* <@200000000000000777>
         » **queue-tester:** Reply with exactly: race-final
         Removed queued message (was position 1): Reply with exactly: removed-queued-message
         Queued message (position 2)
-        ⬥ race-final
-        *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*
+        > race-final
+        > *project ⋅ main ⋅ <1s ⋅ 0% ⋅ deterministic-v2*
         » **queue-tester:** Reply with exactly: kept-queued-message"
       `)
       expect(threadText).not.toContain('» **queue-tester:** Reply with exactly: removed-queued-message')
@@ -1080,98 +991,6 @@ e2eTest('thread message queue ordering', () => {
     12_000,
   )
 
-  test(
-    'queued message waits for running session and then processes next',
-    async () => {
-      // When a new message arrives while a session is running, it queues and
-      // runs after the in-flight request completes.
-      //
-      // 1. Fast setup: establish session
-      await discord.channel(TEXT_CHANNEL_ID).user(TEST_USER_ID).sendMessage({
-        content: 'Reply with exactly: delta',
-      })
-
-      const thread = await discord.channel(TEXT_CHANNEL_ID).waitForThread({
-        timeout: 4_000,
-        predicate: (t) => {
-          return t.name === 'Reply with exactly: delta'
-        },
-      })
-
-      const th = discord.thread(thread.id)
-      const firstReply = await th.waitForBotReply({ timeout: 4_000 })
-      expect(firstReply.content.trim().length).toBeGreaterThan(0)
-
-      const before = await th.getMessages()
-      const beforeBotCount = before.filter((m) => {
-        return m.author.id === discord.botUserId
-      }).length
-
-      // 2. Send B, then quickly send C to enqueue behind B.
-      await th.user(TEST_USER_ID).sendMessage({
-        content: 'Reply with exactly: echo',
-      })
-      await new Promise((r) => {
-        setTimeout(r, 500)
-      })
-      await th.user(TEST_USER_ID).sendMessage({
-        content: 'Reply with exactly: foxtrot',
-      })
-
-      // 3. Poll until foxtrot's user message has a bot reply after it.
-      //    waitForBotMessageCount alone isn't enough — error messages from the
-      //    interrupted session can satisfy the count before foxtrot gets its reply.
-      const after = await waitForBotReplyAfterUserMessage({
-        discord,
-        threadId: thread.id,
-        userId: TEST_USER_ID,
-        userMessageIncludes: 'foxtrot',
-        timeout: 4_000,
-      })
-
-      // 4. Foxtrot got a bot response after B/C were processed.
-      const afterBotMessages = after.filter((m) => {
-        return m.author.id === discord.botUserId
-      })
-      expect(afterBotMessages.length).toBeGreaterThanOrEqual(beforeBotCount + 1)
-
-      await waitForFooterMessage({
-        discord,
-        threadId: thread.id,
-        timeout: 4_000,
-        afterMessageIncludes: 'foxtrot',
-        afterAuthorId: TEST_USER_ID,
-      })
-
-      // Assert ordering invariants instead of exact snapshot — the echo reply
-      // and footer can interleave non-deterministically on slower CI hardware.
-      const finalMessages = await th.getMessages()
-      const userEchoIndex = finalMessages.findIndex((m) => {
-        return m.author.id === TEST_USER_ID && m.content.includes('echo')
-      })
-      const userFoxtrotIndex = finalMessages.findIndex((m) => {
-        return m.author.id === TEST_USER_ID && m.content.includes('foxtrot')
-      })
-      expect(userEchoIndex).toBeGreaterThan(-1)
-      expect(userFoxtrotIndex).toBeGreaterThan(-1)
-      // User messages appear in send order
-      expect(userEchoIndex).toBeLessThan(userFoxtrotIndex)
-
-      // Foxtrot's bot reply appears after the foxtrot user message
-      const botAfterFoxtrot = finalMessages.findIndex((m, i) => {
-        return i > userFoxtrotIndex && m.author.id === discord.botUserId
-      })
-      expect(botAfterFoxtrot).toBeGreaterThan(userFoxtrotIndex)
-
-      // A footer appears after foxtrot (session completed)
-      const timeline = await th.text()
-      expect(timeline).toContain('Reply with exactly: echo')
-      expect(timeline).toContain('Reply with exactly: foxtrot')
-      expect(timeline).toContain('*project ⋅ main ⋅')
-    },
-    8_000,
-  )
-
   test(
     'slow stream still processes queued next message after completion',
     async () => {
@@ -1192,7 +1011,7 @@ e2eTest('thread message queue ordering', () => {
 
       const th = discord.thread(thread.id)
       const firstReply = await th.waitForBotReply({ timeout: 4_000 })
-      expect(firstReply.content.trim().length).toBeGreaterThan(0)
+      expect(getMessageVisibleText(firstReply).trim().length).toBeGreaterThan(0)
 
       // Wait for golf's footer so the golf→hotel transition is deterministic
       await waitForFooterMessage({
@@ -1238,14 +1057,14 @@ e2eTest('thread message queue ordering', () => {
         "--- from: user (queue-tester)
         Reply with exactly: golf
         --- from: assistant (TestBot)
-        *using deterministic-provider/deterministic-v2*
-        ⬥ ok
-        *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*
+        > *using deterministic-provider/deterministic-v2*
+        > ok
+        > *project ⋅ main ⋅ <1s ⋅ 0% ⋅ deterministic-v2* <@200000000000000777>
         --- from: user (queue-tester)
         Reply with exactly: hotel
         Reply with exactly: india
         --- from: assistant (TestBot)
-        ⬥ ok"
+        > ok"
       `)
       const userIndiaIndex = after.findIndex((m) => {
         return m.author.id === TEST_USER_ID && m.content.includes('india')
@@ -1278,7 +1097,7 @@ e2eTest('thread message queue ordering', () => {
 
       const th = discord.thread(thread.id)
       const firstReply = await th.waitForBotReply({ timeout: 4_000 })
-      expect(firstReply.content.trim().length).toBeGreaterThan(0)
+      expect(getMessageVisibleText(firstReply).trim().length).toBeGreaterThan(0)
 
       const before = await th.getMessages()
       const beforeBotCount = before.filter((m) => {
@@ -1322,14 +1141,14 @@ e2eTest('thread message queue ordering', () => {
       const textWithoutFooters = (await th.text())
         .split('\n')
         .filter((line) => {
-          return !line.startsWith('*project ⋅')
+          return !line.startsWith('*project ⋅') && !line.startsWith('> *project ⋅')
         })
         .join('\n')
 
       const normalizedTextWithoutFooters = textWithoutFooters.replace(
         [
           '--- from: assistant (TestBot)',
-          '⬥ ok',
+          'ok',
           '--- from: user (queue-tester)',
           'Reply with exactly: november',
         ].join('\n'),
@@ -1344,16 +1163,17 @@ e2eTest('thread message queue ordering', () => {
         "--- from: user (queue-tester)
         Reply with exactly: juliet
         --- from: assistant (TestBot)
-        *using deterministic-provider/deterministic-v2*
+        > *using deterministic-provider/deterministic-v2*
         --- from: user (queue-tester)
         Reply with exactly: kilo
         Reply with exactly: lima
         Reply with exactly: mike
         --- from: assistant (TestBot)
+        > ok
         --- from: user (queue-tester)
         Reply with exactly: november
         --- from: assistant (TestBot)
-        ⬥ ok"
+        > ok"
       `)
       // E's user message appears before the final bot response
       const userNovemberIndex = afterE.findIndex((m) => {
@@ -1452,17 +1272,17 @@ e2eTest('thread message queue ordering', () => {
         "--- from: user (queue-tester)
         SLOW_BUSY_MARKER Reply with exactly: edit-queue-setup
         --- from: assistant (TestBot)
-        *using deterministic-provider/deterministic-v2*
+        > *using deterministic-provider/deterministic-v2*
         --- from: user (queue-tester)
         Reply with exactly: edited-queued. queue
         --- from: assistant (TestBot)
         Queued at position 1. Edit or delete your message to update the queue
         ⬦ **queue-tester** edited queued message
-        ⬥ slow-busy-reply
-        *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*
+        > slow-busy-reply
+        > *project ⋅ main ⋅ 2s ⋅ 0% ⋅ deterministic-v2*
         » **queue-tester:** Reply with exactly: edited-queued
-        ⬥ ok
-        *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*"
+        > ok
+        > *project ⋅ main ⋅ <1s ⋅ 0% ⋅ deterministic-v2* <@200000000000000777>"
       `)
 
       const finalText = await th.text()
@@ -1560,14 +1380,14 @@ e2eTest('thread message queue ordering', () => {
         "--- from: user (queue-tester)
         SLOW_BUSY_MARKER Reply with exactly: remove-queue-setup
         --- from: assistant (TestBot)
-        *using deterministic-provider/deterministic-v2*
+        > *using deterministic-provider/deterministic-v2*
         --- from: user (queue-tester)
         Reply with exactly: will-be-removed
         --- from: assistant (TestBot)
         Queued at position 1. Edit or delete your message to update the queue
         ⬦ **queue-tester** removed message from queue
-        ⬥ slow-busy-reply
-        *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*"
+        > slow-busy-reply
+        > *project ⋅ main ⋅ 2s ⋅ 0% ⋅ deterministic-v2* <@200000000000000777>"
       `)
     },
     12_000,

package/src/undo-redo.e2e.test.ts

@@ -27,7 +27,7 @@ import {
 import { getThreadSession } from './database.js'
 import { initializeOpencodeForDirectory } from './opencode.js'
 
-const TEXT_CHANNEL_ID = '200000000000001200'
+const TEXT_CHANNEL_ID = '200000000000003205'
 
 const e2eTest = describe
 
@@ -66,7 +66,13 @@ e2eTest('/undo sets revert state and cleans up on next prompt', () => {
         })
 
       const th = ctx.discord.thread(thread.id)
-      await th.waitForBotReply({ timeout: 4_000 })
+      await waitForBotMessageContaining({
+        discord: ctx.discord,
+        threadId: thread.id,
+        userId: TEST_USER_ID,
+        text: 'creating undo file',
+        timeout: 8_000,
+      })
 
       await waitForFooterMessage({
         discord: ctx.discord,
@@ -193,17 +199,19 @@ e2eTest('/undo sets revert state and cleans up on next prompt', () => {
         "--- from: user (undo-tester)
         UNDO_FILE_MARKER
         --- from: assistant (TestBot)
-        *using deterministic-provider/deterministic-v2*
-        ⬥ creating undo file
-        ┣ bash _mkdir -p tmp && printf created > tmp/undo-marker.txt_
-        ⬥ undo file created
-        *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*
+        > *using deterministic-provider/deterministic-v2*
+        > creating undo file
+
+        ┣ bash _Create undo marker file_
+
+        > undo file created
+        > *project ⋅ main ⋅ <1s ⋅ 0% ⋅ deterministic-v2* <@200000000000000991>
         Undone - reverted last assistant message
         --- from: user (undo-tester)
         Reply with exactly: after-undo-message
         --- from: assistant (TestBot)
-        ⬥ ok
-        *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*"
+        > ok
+        > *project ⋅ main ⋅ <1s ⋅ 0% ⋅ deterministic-v2* <@200000000000000991>"
       `)
     },
     20_000,

package/src/voice-attachment.ts

@@ -2,29 +2,57 @@
 // Normalizes Discord attachment heuristics for voice-message detection so
 // message routing, transcription, and empty-prompt guards all agree even when
 // Discord omits contentType on uploaded audio attachments.
+// iOS videos also have duration_secs; reject those before the duration heuristic.
 
 import path from 'node:path'
 
 const VOICE_ATTACHMENT_EXTENSIONS = new Set<string>([
   '.m4a',
   '.mp3',
-  '.mp4',
   '.oga',
   '.ogg',
   '.opus',
   '.wav',
 ])
 
+const VIDEO_ATTACHMENT_EXTENSIONS = new Set<string>([
+  '.avi',
+  '.m4v',
+  '.mkv',
+  '.mov',
+  '.mp4',
+  '.webm',
+])
+
 export type VoiceAttachmentLike = {
   contentType?: string | null
   name?: string | null
   duration?: number | null
   waveform?: string | null
+  width?: number | null
+  height?: number | null
+}
+
+function isVisualMediaAttachment(attachment: VoiceAttachmentLike): boolean {
+  const contentType = attachment.contentType?.trim().toLowerCase() || ''
+  if (contentType.startsWith('video/')) return true
+
+  const extension = path.extname(attachment.name || '').toLowerCase()
+  if (VIDEO_ATTACHMENT_EXTENSIONS.has(extension)) return true
+
+  return (
+    typeof attachment.width === 'number' &&
+    attachment.width > 0 &&
+    typeof attachment.height === 'number' &&
+    attachment.height > 0
+  )
 }
 
 export function getVoiceAttachmentMatchReason(
   attachment: VoiceAttachmentLike,
 ): string | null {
+  if (isVisualMediaAttachment(attachment)) return null
+
   const contentType = attachment.contentType?.trim().toLowerCase() || ''
   if (contentType.startsWith('audio/')) {
     return `contentType:${contentType}`