kimaki 0.30.0 → 0.30.1

package/src/commands/queue.ts

@@ -21,7 +21,7 @@ import {
   getRuntime,
 } from '../session-handler/thread-session-runtime.js'
 import { createLogger, LogPrefix } from '../logger.js'
-import { asSystemLine, QUEUE_PREFIX } from '../message-formatting.js'
+import { asSubtext, QUEUE_PREFIX } from '../message-formatting.js'
 import { store } from '../store.js'
 
 const logger = createLogger(LogPrefix.QUEUE)
@@ -124,7 +124,7 @@ export async function handleQueueRemoveButton(
     : await deleteThreadQueueItemWithoutRuntime(parsed.queueId)
   if (!removed) {
     await interaction.editReply({
-      content: asSystemLine('Queued message is no longer in the queue'),
+      content: asSubtext('Queued message is no longer in the queue'),
       components: [],
     })
     return
@@ -134,7 +134,7 @@ export async function handleQueueRemoveButton(
     ? `/${removed.command.name}`
     : removed.prompt.slice(0, 120)
   await interaction.editReply({
-    content: asSystemLine(`Removed queued message: ${label}`),
+    content: asSubtext(`Removed queued message: ${label}`),
     components: [],
   })
   logger.log(
@@ -211,7 +211,7 @@ export async function handleQueueCommand({
   })
 
   if (enqueueResult.queued && enqueueResult.queueId) {
-    const responseText = asSystemLine(`Queued message${enqueueResult.position ? ` (position ${enqueueResult.position})` : ''}`)
+    const responseText = asSubtext(`Queued message${enqueueResult.position ? ` (position ${enqueueResult.position})` : ''}`)
     await command.reply({
       content: responseText,
       components: [
@@ -282,7 +282,7 @@ export async function handleClearQueueCommand({
     }
 
     await command.reply({
-      content: asSystemLine(`Cleared queued message at position ${position}`),
+      content: asSubtext(`Cleared queued message at position ${position}`),
       flags: SILENT_MESSAGE_FLAGS,
     })
 
@@ -306,7 +306,7 @@ export async function handleClearQueueCommand({
   }
 
   await command.reply({
-    content: asSystemLine(`Cleared ${cleared.length} queued message${cleared.length > 1 ? 's' : ''}:\n${list}`),
+    content: asSubtext(`Cleared ${cleared.length} queued message${cleared.length > 1 ? 's' : ''}:\n${list}`),
     flags: SILENT_MESSAGE_FLAGS,
   })
 
@@ -402,7 +402,7 @@ export async function handleQueueCommandCommand({
   })
 
   if (enqueueResult.queued && enqueueResult.queueId) {
-    const responseText = asSystemLine(`Queued message${enqueueResult.position ? ` (position ${enqueueResult.position})` : ''}`)
+    const responseText = asSubtext(`Queued message${enqueueResult.position ? ` (position ${enqueueResult.position})` : ''}`)
     await command.reply({
       content: responseText,
       components: [

package/src/discord-bot.ts

@@ -39,7 +39,7 @@ import {
 import { formatAutoWorktreeName, createWorktreeInBackground, worktreeCreatingMessage } from './commands/new-worktree.js'
 import { resolveSessionWorkingDirectory, git, isGitRepositoryRoot } from './worktrees.js'
 import { WORKTREE_PREFIX } from './commands/merge-worktree.js'
-import { asSystemLine, STATUS_PREFIX } from './message-formatting.js'
+import { asSubtext } from './message-formatting.js'
 import {
   escapeBackticksInCodeBlocks,
   splitMarkdownForDiscord,
@@ -996,7 +996,7 @@ export async function startDiscordBot({
         if (enqueueResult.queued && enqueueResult.position) {
           await sendThreadMessage(
             thread,
-            asSystemLine(`Queued at position ${enqueueResult.position}. Edit or delete your message to update the queue`),
+            asSubtext(`Queued at position ${enqueueResult.position}. Edit or delete your message to update the queue`),
           )
         }
       }
@@ -1258,7 +1258,7 @@ export async function startDiscordBot({
           )
           await sendThreadMessage(
             channel,
-            `${STATUS_PREFIX}**${displayName}** removed message from queue`,
+            asSubtext(`**${displayName}** removed message from queue`),
           )
         } else {
           discordLogger.log(
@@ -1266,7 +1266,7 @@ export async function startDiscordBot({
           )
           await sendThreadMessage(
             channel,
-            `${STATUS_PREFIX}**${displayName}** edited queued message`,
+            asSubtext(`**${displayName}** edited queued message`),
           )
         }
       }
@@ -1297,7 +1297,7 @@ export async function startDiscordBot({
       )
       await sendThreadMessage(
         channel,
-        `${STATUS_PREFIX}**${removed.username}** removed message from queue`,
+        asSubtext(`**${removed.username}** removed message from queue`),
       )
     } catch (error) {
       discordLogger.error(

package/src/discord-utils.ts

@@ -26,8 +26,10 @@ import {
   shouldLeadWithBlankLine,
   type SessionChunk,
 } from './message-formatting.js'
-import { getChannelDirectory, getThreadWorktreeOrWorkspace } from './database.js'
+import { getChannelDirectory, getThreadIdBySessionId, getThreadWorktreeOrWorkspace } from './database.js'
 import { DiscordOperationError } from './errors.js'
+import type { ThreadStartMarker } from './system-message.js'
+import YAML from 'yaml'
 import { limitHeadingDepth } from './limit-heading-depth.js'
 import { unnestCodeBlocksFromLists } from './unnest-code-blocks.js'
 import { createLogger, LogPrefix } from './logger.js'
@@ -38,6 +40,20 @@ import path from 'node:path'
 
 const discordLogger = createLogger(LogPrefix.DISCORD)
 
+/** Starter embed with the YAML marker. Links the parent thread when the parent session is known locally. */
+export async function buildThreadStartEmbeds(marker: ThreadStartMarker) {
+  const parentThreadId = marker.parentSessionId
+    ? await getThreadIdBySessionId(marker.parentSessionId)
+    : undefined
+  return [
+    {
+      color: 0x2b2d31,
+      ...(parentThreadId && { description: `Parent thread: <#${parentThreadId}>` }),
+      footer: { text: YAML.stringify(marker) },
+    },
+  ]
+}
+
 /**
  * Centralized permission check for Kimaki bot access.
  * Returns true if the member has permission to use the bot:

package/src/external-directory-permissions.e2e.test.ts

@@ -84,7 +84,7 @@ describe('external directory permissions', () => {
       -# *using deterministic-provider/deterministic-v2*
       > reading external directory
 
-      ┣ read *probe.txt*
+      -# ┣ read *probe.txt*
 
       > external-directory-probe-done
       -# *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*
@@ -93,7 +93,7 @@ describe('external directory permissions', () => {
       --- from: assistant (TestBot)
       > reading external directory
 
-      ┣ read *probe.txt*
+      -# ┣ read *probe.txt*
 
       > external-directory-probe-done
       -# *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*"

package/src/external-directory-project-deny.e2e.test.ts

@@ -70,7 +70,7 @@ describe('external directory project deny', () => {
       -# *using deterministic-provider/deterministic-v2*
       > reading external directory
 
-      ┣ read *probe.txt*
+      -# ┣ read *probe.txt*
 
       > external-directory-probe-denied"
     `)

package/src/message-formatting.test.ts

@@ -1,7 +1,7 @@
 import fs from 'node:fs'
 import path from 'node:path'
 import { afterEach, describe, test, expect } from 'vitest'
-import { asDiscordQuote, asSystemLine, batchChunksForDiscord, collectSessionChunks, formatBashToolTitle, formatPart, formatTaskToolTitle, formatTodoList, getTextAttachments, planAssistantTurnFlush, quotedTextFitsOneDiscordMessage, serializeEmbeds, serializePoll, serializeMessageSnapshots, sessionPartContent, shouldLeadWithBlankLine, TEXT_ATTACHMENT_INLINE_LIMIT_BYTES } from './message-formatting.js'
+import { asDiscordQuote, asSubtext, batchChunksForDiscord, collectSessionChunks, formatBashToolTitle, formatPart, formatTaskToolTitle, formatTodoList, getTextAttachments, planAssistantTurnFlush, quotedTextFitsOneDiscordMessage, serializeEmbeds, serializePoll, serializeMessageSnapshots, sessionPartContent, shouldLeadWithBlankLine, TEXT_ATTACHMENT_INLINE_LIMIT_BYTES } from './message-formatting.js'
 import { getDataDir } from './config.js'
 import type { Collection, Embed, Message, MessageSnapshot, Poll } from 'discord.js'
 import type { Part } from '@opencode-ai/sdk/v2'
@@ -76,16 +76,17 @@ describe('formatPart', () => {
 
 })
 
-describe('asSystemLine', () => {
-  test('prefixes every line', () => {
-    expect(asSystemLine('hello\nworld')).toMatchInlineSnapshot(`
+describe('asSubtext', () => {
+  test('prefixes every non-empty line', () => {
+    expect(asSubtext('hello\n\nworld')).toMatchInlineSnapshot(`
       "-# hello
+
       -# world"
     `)
   })
 
   test('does not double-prefix', () => {
-    expect(asSystemLine('-# already marked')).toMatchInlineSnapshot(`"-# already marked"`)
+    expect(asSubtext('-# already marked')).toMatchInlineSnapshot(`"-# already marked"`)
   })
 })
 
@@ -596,7 +597,7 @@ describe('collectSessionChunks', () => {
     })
     expect(chunks.map((chunk) => chunk.content)).toEqual([
       '> I will read it',
-      '┣ read',
+      '-# ┣ read',
     ])
   })
 
@@ -771,7 +772,7 @@ describe('formatTaskToolTitle', () => {
           sessionId: 'ses_child',
         }),
       ),
-    ).toMatchInlineSnapshot(`"┣ general **Classify pending changes**"`)
+    ).toMatchInlineSnapshot(`"-# ┣ general **Classify pending changes**"`)
   })
 
   test('prefers input description on running parts', () => {
@@ -784,7 +785,7 @@ describe('formatTaskToolTitle', () => {
           sessionId: 'ses_child',
         }),
       ),
-    ).toMatchInlineSnapshot(`"┣ explore **inspect repo**"`)
+    ).toMatchInlineSnapshot(`"-# ┣ explore **inspect repo**"`)
   })
 
   test('does not format completed parts so Discord does not post the line at the end', () => {
@@ -811,7 +812,7 @@ describe('formatTaskToolTitle', () => {
           },
         }),
       ),
-    ).toMatchInlineSnapshot(`"┣ general **audit customer pages**"`)
+    ).toMatchInlineSnapshot(`"-# ┣ general **audit customer pages**"`)
   })
 })
 

package/src/message-formatting.ts

@@ -30,17 +30,19 @@ export const TOOL_PREFIX = '┣ '
 export const FILE_EDIT_PREFIX = '◼︎ '
 export const THINKING_PREFIX = '┣ '
 // Discord subtext. Not `#-`.
-export const SYSTEM_LINE_PREFIX = '-# '
-export const STATUS_PREFIX = SYSTEM_LINE_PREFIX
+export const SUBTEXT_PREFIX = '-# '
+// Same width as ┣. Only used for tool-related status lines; other bot status lines have no glyph.
+export const STATUS_PREFIX = '⬦ '
 export const QUEUE_PREFIX = '» '
 export const WORKTREE_PREFIX = '⬦ '
 
-export function asSystemLine(text: string): string {
+export function asSubtext(text: string): string {
   const lead = text.startsWith('\n') ? '\n' : ''
   const body = lead ? text.slice(1) : text
   return lead + body.split('\n').map((line) => {
-    if (line.startsWith(SYSTEM_LINE_PREFIX) || line.startsWith('-#')) return line
-    return `${SYSTEM_LINE_PREFIX}${line}`
+    if (!line.trim()) return line
+    if (line.startsWith('-#')) return line
+    return `${SUBTEXT_PREFIX}${line}`
   }).join('\n')
 }
 
@@ -830,10 +832,17 @@ export function formatTaskToolTitle(part: Extract<Part, { type: 'tool' }>): stri
 
   const subagentType = part.state.input?.subagent_type
   const agent = typeof subagentType === 'string' ? subagentType : 'task'
-  return `${TOOL_PREFIX}${escapeInlineMarkdown(agent)} **${escapeInlineMarkdown(title)}**`
+  return asSubtext(`${TOOL_PREFIX}${escapeInlineMarkdown(agent)} **${escapeInlineMarkdown(title)}**`)
 }
 
+// Non-text parts (tools, thinking, files) render as Discord subtext so they look dimmer than text.
 export function formatPart(part: Part, prefix?: string): string {
+  const formatted = formatPartBody(part, prefix)
+  if (!formatted || part.type === 'text') return formatted
+  return asSubtext(formatted)
+}
+
+function formatPartBody(part: Part, prefix?: string): string {
   const pfx = prefix ? `${prefix} ⋅ ` : ''
 
   if (part.type === 'text') {

package/src/question-abort-clears-dropdown.e2e.test.ts

@@ -65,7 +65,7 @@ describe('abort clears pending question dropdown', () => {
       if (!runtime) {
         throw new Error('Expected runtime for question abort test')
       }
-      runtime.abortActiveRun('test-question-abort')
+      void runtime.abortActiveRun('test-question-abort')
 
       // Click the now-dead dropdown. The answer echo must never appear.
       const interaction = await th.user(TEST_USER_ID).selectMenu({

package/src/question-abort-retry-text-before-dropdown.e2e.test.ts

@@ -129,7 +129,7 @@ describe('question text before dropdown after abort retry', () => {
       if (!runtime) {
         throw new Error('Expected runtime for abort-retry question test')
       }
-      runtime.abortActiveRun('test-question-abort-retry-flush')
+      void runtime.abortActiveRun('test-question-abort-retry-flush')
 
       await th.user(TEST_USER_ID).sendMessage({
         content: 'QUESTION_AFTER_ABORT_RETRY_MARKER',

package/src/queue-advanced-abort.e2e.test.ts

@@ -10,7 +10,7 @@ import {
   getRuntime,
 } from './session-handler/thread-session-runtime.js'
 import { getThreadState } from './session-handler/thread-runtime-state.js'
-import { setSessionModel } from './database.js'
+import { listThreadQueueItems, setSessionModel } from './database.js'
 import {
   isFooterMessage,
   waitForFooterMessage,
@@ -82,7 +82,7 @@ e2eTest('queue advanced: abort and retry', () => {
         throw new Error('Expected runtime to exist for explicit-abort test')
       }
 
-      runtime.abortActiveRun('test-explicit-abort')
+      void runtime.abortActiveRun('test-explicit-abort')
 
       await th.user(TEST_USER_ID).sendMessage({
         content: 'Reply with exactly: papa',
@@ -145,6 +145,73 @@ e2eTest('queue advanced: abort and retry', () => {
     12_000,
   )
 
+  test(
+    '/abort clears queued messages so they are never sent',
+    async () => {
+      await ctx.discord.channel(TEXT_CHANNEL_ID).user(TEST_USER_ID).sendMessage({
+        content: 'PLUGIN_TIMEOUT_SLEEP_MARKER',
+      })
+
+      const thread = await ctx.discord.channel(TEXT_CHANNEL_ID).waitForThread({
+        timeout: 4_000,
+        predicate: (t) => {
+          return t.name === 'PLUGIN_TIMEOUT_SLEEP_MARKER'
+        },
+      })
+      const th = ctx.discord.thread(thread.id)
+
+      await waitForBotMessageContaining({
+        discord: ctx.discord,
+        threadId: thread.id,
+        userId: TEST_USER_ID,
+        text: 'starting sleep',
+        timeout: 4_000,
+      })
+
+      const { id: queueInteractionId } = await th.user(TEST_USER_ID).runSlashCommand({
+        name: 'queue',
+        options: [{ name: 'message', type: 3, value: 'Reply with exactly: abort-cleared-queued' }],
+      })
+      await th.waitForInteractionAck({ interactionId: queueInteractionId, timeout: 4_000 })
+      expect(getRuntime(thread.id)?.getQueueLength()).toBe(1)
+      expect(await listThreadQueueItems(thread.id)).toHaveLength(1)
+
+      const { id: abortInteractionId } = await th.user(TEST_USER_ID).runSlashCommand({
+        name: 'abort',
+      })
+      await th.waitForInteractionAck({ interactionId: abortInteractionId, timeout: 4_000 })
+      await waitForBotMessageContaining({
+        discord: ctx.discord,
+        threadId: thread.id,
+        userId: TEST_USER_ID,
+        text: 'Request **aborted**',
+        timeout: 4_000,
+      })
+
+      // Queued message must never be dispatched after abort.
+      for (let i = 0; i < 10; i++) {
+        await new Promise((resolve) => {
+          setTimeout(resolve, 20)
+        })
+        const text = await th.text()
+        expect(text).not.toContain('» **queue-advanced-tester:** Reply with exactly: abort-cleared-queued')
+      }
+
+      expect(await th.text()).toMatchInlineSnapshot(`
+        "--- from: user (queue-advanced-tester)
+        PLUGIN_TIMEOUT_SLEEP_MARKER
+        --- from: assistant (TestBot)
+        -# *using deterministic-provider/deterministic-v2*
+        > starting sleep 100
+        -# Queued message (position 1)
+        Request **aborted**, cleared 1 queued message"
+      `)
+      expect(getRuntime(thread.id)?.getQueueLength()).toBe(0)
+      expect(await listThreadQueueItems(thread.id)).toHaveLength(0)
+    },
+    10_000,
+  )
+
   test(
     'explicit abort emits MessageAbortedError and does not emit footer',
     async () => {
@@ -183,7 +250,7 @@ e2eTest('queue advanced: abort and retry', () => {
       const beforeAbortMessages = await th.getMessages()
       const baselineCount = beforeAbortMessages.length
 
-      runtime.abortActiveRun('test-no-footer-on-abort')
+      void runtime.abortActiveRun('test-no-footer-on-abort')
 
       for (let i = 0; i < 10; i++) {
         await new Promise((resolve) => {
@@ -242,7 +309,7 @@ e2eTest('queue advanced: abort and retry', () => {
         throw new Error('Expected runtime to exist for race abort scenario')
       }
 
-      runtime.abortActiveRun('test-race-abort')
+      void runtime.abortActiveRun('test-race-abort')
 
       await th.user(TEST_USER_ID).sendMessage({
         content: raceFinalPrompt,
@@ -366,7 +433,7 @@ e2eTest('queue advanced: abort and retry', () => {
         throw new Error('Expected runtime to exist for forced-abort test')
       }
 
-      runtime.abortActiveRun('force-abort-test')
+      void runtime.abortActiveRun('force-abort-test')
 
       expect(await th.text()).toMatchInlineSnapshot(`
         "--- from: user (queue-advanced-tester)

package/src/queue-advanced-footer.e2e.test.ts

@@ -345,7 +345,7 @@ e2eTest('queue advanced: footer emission', () => {
         -# *using deterministic-provider/deterministic-v2*
         > running tool
 
-        ┣ bash _echo tool-call-footer-test_
+        -# ┣ bash _echo tool-call-footer-test_
 
         > tool call completed
         -# *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*"

package/src/queue-advanced-permissions-typing.e2e.test.ts

@@ -128,7 +128,7 @@ describe('queue advanced: typing around permissions', () => {
         -# *using deterministic-provider/deterministic-v2*
         > requesting external read permission
 
-        ┣ read *.zprofile*
+        -# ┣ read *.zprofile*
         ⚠️ **Permission Required**
         **Type:** \`external_directory\`
         Agent is accessing files outside the project. [Learn more](https://opencode.ai/docs/permissions/#external-directories)

package/src/session-handler/event-stream-state.test.ts

@@ -1754,13 +1754,110 @@ describe('getPromptCacheClear', () => {
       sessionId,
       currentMessageId: 'msg_asst_2',
     })).toEqual({
-      previousCacheRead: 20000,
+      expectedCacheRead: 20000,
       currentCacheRead: 0,
       previousMessageId: 'msg_asst_1',
       currentMessageId: 'msg_asst_2',
     })
   })
 
+  test('detects a miss on the second turn when the first turn only wrote cache', () => {
+    const sessionId = 'ses_cache_second_turn'
+    const events = [
+      userEvent({ sessionId, messageId: 'msg_user_1', created: 1 }),
+      assistantEvent({
+        sessionId,
+        messageId: 'msg_asst_1',
+        parentID: 'msg_user_1',
+        created: 2,
+        tokens: {
+          input: 100,
+          output: 10,
+          reasoning: 0,
+          cache: { read: 0, write: 20000 },
+        },
+      }),
+      userEvent({ sessionId, messageId: 'msg_user_2', created: 3 }),
+      assistantEvent({
+        sessionId,
+        messageId: 'msg_asst_2',
+        parentID: 'msg_user_2',
+        created: 4,
+        tokens: {
+          input: 100,
+          output: 12,
+          reasoning: 0,
+          cache: { read: 0, write: 20200 },
+        },
+      }),
+    ]
+    expect(getPromptCacheClear({
+      events,
+      sessionId,
+      currentMessageId: 'msg_asst_2',
+    })).toEqual({
+      expectedCacheRead: 20000,
+      currentCacheRead: 0,
+      previousMessageId: 'msg_asst_1',
+      currentMessageId: 'msg_asst_2',
+    })
+  })
+
+  test('detects consecutive misses, not only every other turn', () => {
+    const sessionId = 'ses_cache_consecutive'
+    const events = [
+      userEvent({ sessionId, messageId: 'msg_user_1', created: 1 }),
+      assistantEvent({
+        sessionId,
+        messageId: 'msg_asst_1',
+        parentID: 'msg_user_1',
+        created: 2,
+        tokens: {
+          input: 100,
+          output: 10,
+          reasoning: 0,
+          cache: { read: 20000, write: 100 },
+        },
+      }),
+      userEvent({ sessionId, messageId: 'msg_user_2', created: 3 }),
+      assistantEvent({
+        sessionId,
+        messageId: 'msg_asst_2',
+        parentID: 'msg_user_2',
+        created: 4,
+        tokens: {
+          input: 100,
+          output: 10,
+          reasoning: 0,
+          cache: { read: 0, write: 20300 },
+        },
+      }),
+      userEvent({ sessionId, messageId: 'msg_user_3', created: 5 }),
+      assistantEvent({
+        sessionId,
+        messageId: 'msg_asst_3',
+        parentID: 'msg_user_3',
+        created: 6,
+        tokens: {
+          input: 100,
+          output: 10,
+          reasoning: 0,
+          cache: { read: 0, write: 20500 },
+        },
+      }),
+    ]
+    expect(getPromptCacheClear({
+      events,
+      sessionId,
+      currentMessageId: 'msg_asst_3',
+    })).toEqual({
+      expectedCacheRead: 20300,
+      currentCacheRead: 0,
+      previousMessageId: 'msg_asst_2',
+      currentMessageId: 'msg_asst_3',
+    })
+  })
+
   test('detects a cache drop when prompt size stays similar', () => {
     const sessionId = 'ses_cache_drop'
     const events = [
@@ -1796,7 +1893,7 @@ describe('getPromptCacheClear', () => {
       sessionId,
       currentMessageId: 'msg_asst_2',
     })).toEqual({
-      previousCacheRead: 40000,
+      expectedCacheRead: 40000,
       currentCacheRead: 8000,
       previousMessageId: 'msg_asst_1',
       currentMessageId: 'msg_asst_2',
@@ -1895,8 +1992,8 @@ describe('getPromptCacheClear', () => {
     })).toBeUndefined()
   })
 
-  test('ignores a smaller prompt after context reduction', () => {
-    const sessionId = 'ses_cache_smaller'
+  test('ignores a smaller prompt that is still read from cache after a revert', () => {
+    const sessionId = 'ses_cache_revert'
     const events = [
       userEvent({ sessionId, messageId: 'msg_user_1', created: 1 }),
       assistantEvent({
@@ -1918,10 +2015,10 @@ describe('getPromptCacheClear', () => {
         parentID: 'msg_user_2',
         created: 4,
         tokens: {
-          input: 5000,
+          input: 200,
           output: 10,
           reasoning: 0,
-          cache: { read: 8000, write: 5000 },
+          cache: { read: 8000, write: 0 },
         },
       }),
     ]
@@ -1932,6 +2029,48 @@ describe('getPromptCacheClear', () => {
     })).toBeUndefined()
   })
 
+  test('detects a miss when the prompt shrank without pruning', () => {
+    const sessionId = 'ses_cache_shrunk_miss'
+    const events = [
+      userEvent({ sessionId, messageId: 'msg_user_1', created: 1 }),
+      assistantEvent({
+        sessionId,
+        messageId: 'msg_asst_1',
+        parentID: 'msg_user_1',
+        created: 2,
+        tokens: {
+          input: 100,
+          output: 10,
+          reasoning: 0,
+          cache: { read: 187000, write: 0 },
+        },
+      }),
+      userEvent({ sessionId, messageId: 'msg_user_2', created: 3 }),
+      assistantEvent({
+        sessionId,
+        messageId: 'msg_asst_2',
+        parentID: 'msg_user_2',
+        created: 4,
+        tokens: {
+          input: 182000,
+          output: 10,
+          reasoning: 0,
+          cache: { read: 0, write: 0 },
+        },
+      }),
+    ]
+    expect(getPromptCacheClear({
+      events,
+      sessionId,
+      currentMessageId: 'msg_asst_2',
+    })).toEqual({
+      expectedCacheRead: 182000,
+      currentCacheRead: 0,
+      previousMessageId: 'msg_asst_1',
+      currentMessageId: 'msg_asst_2',
+    })
+  })
+
   test('compares against the previous user turn, not a same-turn tool step', () => {
     const sessionId = 'ses_cache_same_turn'
     const events = [
@@ -1979,7 +2118,7 @@ describe('getPromptCacheClear', () => {
       sessionId,
       currentMessageId: 'msg_asst_2b',
     })).toEqual({
-      previousCacheRead: 20000,
+      expectedCacheRead: 20000,
       currentCacheRead: 0,
       previousMessageId: 'msg_asst_1',
       currentMessageId: 'msg_asst_2b',
@@ -2023,7 +2162,7 @@ describe('getPromptCacheClear', () => {
     })).toBeUndefined()
   })
 
-  test('does not compare across an aborted assistant', () => {
+  test('compares across an aborted assistant with the last good reply', () => {
     const sessionId = 'ses_cache_abort_bridge'
     const events = [
       userEvent({ sessionId, messageId: 'msg_user_1', created: 1 }),
@@ -2071,7 +2210,12 @@ describe('getPromptCacheClear', () => {
       events,
       sessionId,
       currentMessageId: 'msg_asst_3',
-    })).toBeUndefined()
+    })).toEqual({
+      expectedCacheRead: 40000,
+      currentCacheRead: 0,
+      previousMessageId: 'msg_asst_1',
+      currentMessageId: 'msg_asst_3',
+    })
   })
 
   test('does not compare across a compaction summary', () => {
@@ -2216,13 +2360,13 @@ describe('getPromptCacheClear', () => {
 
   test('formats a compact cache-miss notice', () => {
     expect(formatPromptCacheClearMessage({
-      previousCacheRead: 20000,
+      expectedCacheRead: 20000,
       currentCacheRead: 0,
       previousMessageId: 'msg_asst_1',
       currentMessageId: 'msg_asst_2',
     })).toBe('prompt cache missed (20k → 0)')
     expect(formatPromptCacheClearMessage({
-      previousCacheRead: 20000,
+      expectedCacheRead: 20000,
       currentCacheRead: 0,
       previousMessageId: 'msg_asst_1',
       currentMessageId: 'msg_asst_2',