kimaki 0.30.0 → 0.30.1

package/dist/cli-commands/send.js

@@ -6,7 +6,6 @@
 import { goke } from 'goke';
 import { z } from 'zod';
 import { note } from '@clack/prompts';
-import YAML from 'yaml';
 import * as errore from 'errore';
 import { Events, ActivityType, Routes } from 'discord.js';
 import path from 'node:path';
@@ -24,7 +23,7 @@ import { WORKTREE_PREFIX } from '../commands/merge-worktree.js';
 import { QUEUE_PREFIX } from '../message-formatting.js';
 import { buildOpencodeEventLogLine } from '../session-handler/opencode-session-event-log.js';
 import { createDiscordRest } from '../discord-urls.js';
-import { archiveThread, ensureThreadMember, uploadFilesToDiscord, stripMentions } from '../discord-utils.js';
+import { archiveThread, buildThreadStartEmbeds, ensureThreadMember, uploadFilesToDiscord, stripMentions } from '../discord-utils.js';
 import { setDataDir, setProjectsDir, getDataDir, getProjectsDir } from '../config.js';
 import { execAsync, resolveSessionWorkingDirectory, isGitRepositoryRoot } from '../worktrees.js';
 import { upgrade, getCurrentVersion } from '../upgrade.js';
@@ -405,12 +404,7 @@ cli
                 ...(options.injectionGuard?.length ? { injectionGuardPatterns: options.injectionGuard } : {}),
                 ...(options.parentSession && { parentSessionId: options.parentSession }),
             };
-            const promptEmbed = [
-                {
-                    color: 0x2b2d31,
-                    footer: { text: YAML.stringify(threadPromptMarker) },
-                },
-            ];
+            const promptEmbed = await buildThreadStartEmbeds(threadPromptMarker);
             // Prefix the prompt so it's clear who sent it (matches /queue format).
             // Use a newline between prefix and prompt so leading /command
             // detection can find the command on its own line.
@@ -584,7 +578,7 @@ cli
                 ...(options.parentSession && { parentSessionId: options.parentSession }),
             };
         const autoStartEmbed = embedMarker
-            ? [{ color: 0x2b2d31, footer: { text: YAML.stringify(embedMarker) } }]
+            ? await buildThreadStartEmbeds(embedMarker)
             : undefined;
         const starterMessage = await sendDiscordMessageWithOptionalAttachment({
             channelId,

package/dist/commands/abort.js

@@ -1,6 +1,6 @@
 // /abort command - Abort the current OpenCode request in this thread.
 import { ChannelType, MessageFlags, } from 'discord.js';
-import { cancelSessionSleepForThread, getThreadSession } from '../database.js';
+import { cancelSessionSleepForThread, deleteThreadQueueItems, getThreadSession, } from '../database.js';
 import { getOpencodeClient, initializeOpencodeForDirectory } from '../opencode.js';
 import { resolveWorkingDirectory, SILENT_MESSAGE_FLAGS, } from '../discord-utils.js';
 import { getRuntime } from '../session-handler/thread-session-runtime.js';
@@ -45,12 +45,21 @@ export async function handleAbortCommand({ command, }) {
     // through enqueueIncoming, so cancel any pending sleep here too. Otherwise the
     // wake would still fire later and restart a session the user just stopped.
     await cancelSessionSleepForThread({ threadId: channel.id });
-    // abortActiveRun delegates to session.abort(), run settlement stays event-driven.
+    // abortActiveRun delegates to session.abort() and clears the /queue, so
+    // queued messages are not sent after abort or restored after a restart.
     const runtime = getRuntime(channel.id);
+    let clearedCount = 0;
     if (runtime) {
-        runtime.abortActiveRun('user-requested');
+        const cleared = await runtime.abortActiveRun('user-requested');
+        clearedCount = cleared.length;
     }
     else {
+        const deleteResult = await deleteThreadQueueItems(channel.id).catch((error) => {
+            return new Error('Failed to clear persisted queue', { cause: error });
+        });
+        if (deleteResult instanceof Error) {
+            logger.error(`[ABORT] ${deleteResult.message}:`, deleteResult.cause);
+        }
         // No runtime but session exists — fall back to direct API abort
         const serverResult = await initializeOpencodeForDirectory(projectDirectory);
         if (serverResult instanceof Error) {
@@ -67,6 +76,9 @@ export async function handleAbortCommand({ command, }) {
             logger.error('[ABORT] API abort failed:', error);
         }
     }
-    await command.editReply('Request **aborted**');
+    const queueNote = clearedCount > 0
+        ? `, cleared ${clearedCount} queued message${clearedCount > 1 ? 's' : ''}`
+        : '';
+    await command.editReply(`Request **aborted**${queueNote}`);
     logger.log(`Session ${sessionId} aborted by user`);
 }

package/dist/commands/queue.js

@@ -5,7 +5,7 @@ import { deleteThreadQueueItem, getThreadSession } from '../database.js';
 import { resolveWorkingDirectory, SILENT_MESSAGE_FLAGS, } from '../discord-utils.js';
 import { getOrCreateRuntime, 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);
 export const QUEUE_REMOVE_CUSTOM_ID_PREFIX = 'queue_remove:';
@@ -75,7 +75,7 @@ export async function handleQueueRemoveButton(interaction) {
         : 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;
@@ -84,7 +84,7 @@ export async function handleQueueRemoveButton(interaction) {
         ? `/${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(`[QUEUE] User ${interaction.user.displayName} removed queued item ${parsed.queueId} in thread ${parsed.threadId}`);
@@ -145,7 +145,7 @@ export async function handleQueueCommand({ command, appId, }) {
         mode: 'local-queue',
     });
     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: [
@@ -205,7 +205,7 @@ export async function handleClearQueueCommand({ command, }) {
             return;
         }
         await command.reply({
-            content: asSystemLine(`Cleared queued message at position ${position}`),
+            content: asSubtext(`Cleared queued message at position ${position}`),
             flags: SILENT_MESSAGE_FLAGS,
         });
         logger.log(`[QUEUE] User ${command.user.displayName} cleared queued position ${position} in thread ${channel.id}`);
@@ -223,7 +223,7 @@ export async function handleClearQueueCommand({ command, }) {
         list = list.slice(0, 597) + '...';
     }
     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,
     });
     logger.log(`[QUEUE] User ${command.user.displayName} cleared queue in thread ${channel.id}`);
@@ -299,7 +299,7 @@ export async function handleQueueCommandCommand({ command, appId, }) {
         mode: 'local-queue',
     });
     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/dist/discord-bot.js

@@ -13,7 +13,7 @@ import { stopOpencodeServer, } from './opencode.js';
 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, sendThreadMessage, SILENT_MESSAGE_FLAGS, NOTIFY_MESSAGE_FLAGS, reactToThread, stripMentions, hasKimakiBotPermission, hasNoKimakiRole, resolveGuildMessageMember, } from './discord-utils.js';
 import { getOpencodeSystemMessage, isInjectedPromptMarker, } from './system-message.js';
 import YAML from 'yaml';
@@ -742,7 +742,7 @@ export async function startDiscordBot({ token, appId, discordClient, useWorktree
                     });
                     // Notify when a voice message was queued instead of sent immediately
                     if (enqueueResult.queued && enqueueResult.position) {
-                        await sendThreadMessage(thread, asSystemLine(`Queued at position ${enqueueResult.position}. Edit or delete your message to update the queue`));
+                        await sendThreadMessage(thread, asSubtext(`Queued at position ${enqueueResult.position}. Edit or delete your message to update the queue`));
                     }
                 }
                 if (channel.type === ChannelType.GuildText) {
@@ -955,11 +955,11 @@ export async function startDiscordBot({ token, appId, discordClient, useWorktree
                 const displayName = message.member?.displayName ?? message.author.displayName;
                 if (result.removed) {
                     discordLogger.log(`[MESSAGE_EDIT] Removed queued message ${message.id} in thread ${channel.id}`);
-                    await sendThreadMessage(channel, `${STATUS_PREFIX}**${displayName}** removed message from queue`);
+                    await sendThreadMessage(channel, asSubtext(`**${displayName}** removed message from queue`));
                 }
                 else {
                     discordLogger.log(`[MESSAGE_EDIT] Updated queued message ${message.id} in thread ${channel.id}`);
-                    await sendThreadMessage(channel, `${STATUS_PREFIX}**${displayName}** edited queued message`);
+                    await sendThreadMessage(channel, asSubtext(`**${displayName}** edited queued message`));
                 }
             }
         }
@@ -982,7 +982,7 @@ export async function startDiscordBot({ token, appId, discordClient, useWorktree
             if (!removed)
                 return;
             discordLogger.log(`[MESSAGE_DELETE] Removed queued message ${message.id} in thread ${channel.id}`);
-            await sendThreadMessage(channel, `${STATUS_PREFIX}**${removed.username}** removed message from queue`);
+            await sendThreadMessage(channel, asSubtext(`**${removed.username}** removed message from queue`));
         }
         catch (error) {
             discordLogger.error('Error handling message delete:', error instanceof Error ? error.stack : String(error));

package/dist/discord-utils.js

@@ -10,8 +10,9 @@ import { discordApiUrl } from './discord-urls.js';
 import { Lexer } from 'marked';
 import { splitTablesFromMarkdown } from './format-tables.js';
 import { sessionPartContent, shouldLeadWithBlankLine, } from './message-formatting.js';
-import { getChannelDirectory, getThreadWorktreeOrWorkspace } from './database.js';
+import { getChannelDirectory, getThreadIdBySessionId, getThreadWorktreeOrWorkspace } from './database.js';
 import { DiscordOperationError } from './errors.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';
@@ -20,6 +21,19 @@ import mime from 'mime';
 import fs from 'node:fs';
 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) {
+    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/dist/external-directory-permissions.e2e.test.js

@@ -67,7 +67,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*
@@ -76,7 +76,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/dist/external-directory-project-deny.e2e.test.js

@@ -57,7 +57,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/dist/message-formatting.js

@@ -13,17 +13,20 @@ 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) {
+export function asSubtext(text) {
     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('-#'))
+        if (!line.trim())
             return line;
-        return `${SYSTEM_LINE_PREFIX}${line}`;
+        if (line.startsWith('-#'))
+            return line;
+        return `${SUBTEXT_PREFIX}${line}`;
     }).join('\n');
 }
 /**
@@ -636,9 +639,16 @@ export function formatTaskToolTitle(part) {
         return '';
     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, prefix) {
+    const formatted = formatPartBody(part, prefix);
+    if (!formatted || part.type === 'text')
+        return formatted;
+    return asSubtext(formatted);
+}
+function formatPartBody(part, prefix) {
     const pfx = prefix ? `${prefix} ⋅ ` : '';
     if (part.type === 'text') {
         if (part.synthetic === true)

package/dist/message-formatting.test.js

@@ -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';
 describe('formatPart', () => {
     test('callout text is returned without a diamond prefix', () => {
@@ -65,15 +65,16 @@ describe('formatPart', () => {
         expect(formatPart(part)).toBe('Subrouter: Using openai/gpt-5.6-sol because xai/grok-4.6 is rate limited.');
     });
 });
-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"`);
     });
 });
 describe('asDiscordQuote', () => {
@@ -477,7 +478,7 @@ describe('collectSessionChunks', () => {
         });
         expect(chunks.map((chunk) => chunk.content)).toEqual([
             '> I will read it',
-            '┣ read',
+            '-# ┣ read',
         ]);
     });
     test('does not quote earlier text longer than two lines', () => {
@@ -630,7 +631,7 @@ describe('formatTaskToolTitle', () => {
             input: { subagent_type: 'general' },
             title: 'Classify pending changes',
             sessionId: 'ses_child',
-        }))).toMatchInlineSnapshot(`"┣ general **Classify pending changes**"`);
+        }))).toMatchInlineSnapshot(`"-# ┣ general **Classify pending changes**"`);
     });
     test('prefers input description on running parts', () => {
         expect(formatTaskToolTitle(taskPart({
@@ -638,7 +639,7 @@ describe('formatTaskToolTitle', () => {
             input: { description: 'inspect repo', subagent_type: 'explore' },
             title: 'ignored title',
             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', () => {
         expect(formatTaskToolTitle(taskPart({
@@ -655,7 +656,7 @@ describe('formatTaskToolTitle', () => {
                 description: 'audit customer pages',
                 subagent_type: 'general',
             },
-        }))).toMatchInlineSnapshot(`"┣ general **audit customer pages**"`);
+        }))).toMatchInlineSnapshot(`"-# ┣ general **audit customer pages**"`);
     });
 });
 describe('formatBashToolTitle', () => {

package/dist/question-abort-clears-dropdown.e2e.test.js

@@ -50,7 +50,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({
             messageId: questionMsg.id,

package/dist/question-abort-retry-text-before-dropdown.e2e.test.js

@@ -113,7 +113,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/dist/queue-advanced-abort.e2e.test.js

@@ -4,7 +4,7 @@ import { describe, test, expect } from 'vitest';
 import { setupQueueAdvancedSuite, TEST_USER_ID, } from './queue-advanced-e2e-setup.js';
 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, waitForBotMessageContaining, waitForBotReplyAfterUserMessage, } from './test-utils.js';
 const TEXT_CHANNEL_ID = '200000000000001003';
 const e2eTest = describe;
@@ -57,7 +57,7 @@ e2eTest('queue advanced: abort and retry', () => {
         if (!runtime) {
             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',
         });
@@ -108,6 +108,62 @@ e2eTest('queue advanced: abort and retry', () => {
         });
         expect(userPapaIndex).toBeLessThan(lastBotIndex);
     }, 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 () => {
         await ctx.discord.channel(TEXT_CHANNEL_ID).user(TEST_USER_ID).sendMessage({
             content: 'Reply with exactly: abort-no-footer-setup',
@@ -137,7 +193,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) => {
                 setTimeout(resolve, 20);
@@ -183,7 +239,7 @@ e2eTest('queue advanced: abort and retry', () => {
         if (!runtime) {
             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,
         });
@@ -279,7 +335,7 @@ e2eTest('queue advanced: abort and retry', () => {
         if (!runtime) {
             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)
         Reply with exactly: force-abort-setup

package/dist/queue-advanced-footer.e2e.test.js

@@ -277,7 +277,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/dist/queue-advanced-permissions-typing.e2e.test.js

@@ -92,7 +92,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/dist/session-handler/event-stream-state.js

@@ -597,9 +597,6 @@ function hasPruneBetween({ events, sessionId, fromIndex, toIndex, }) {
     }
     return false;
 }
-function promptInputTokens(tokens) {
-    return tokens.input + tokens.cache.read + tokens.cache.write;
-}
 function getCompletedAssistantAt({ events, sessionId, messageId, upToIndex, }) {
     for (let i = upToIndex; i >= 0; i--) {
         const event = events[i]?.event;
@@ -629,7 +626,8 @@ function isComparableCacheAssistant(message) {
     }
     return true;
 }
-// Same-model cache drop vs the previous completed assistant. Errors and compaction summaries block the pair.
+// Same-model cache drop vs the previous completed assistant. Aborted/errored replies are skipped,
+// compaction summaries and pruned tool output block the pair since they rewrite the prompt.
 export function getPromptCacheClear({ events, sessionId, currentMessageId, upToIndex, }) {
     const end = upToIndex ?? events.length - 1;
     const current = getCompletedAssistantAt({
@@ -658,13 +656,13 @@ export function getPromptCacheClear({ events, sessionId, currentMessageId, upToI
             continue;
         }
         seen.add(info.id);
-        if (!isComparableCacheAssistant(info) || !info.tokens) {
+        if (!isUserFacingAssistantMessage(info)) {
             return undefined;
         }
-        if (info.modelID !== current.modelID || info.providerID !== current.providerID) {
-            return undefined;
+        if (!isComparableCacheAssistant(info) || !info.tokens) {
+            continue;
         }
-        if (info.tokens.cache.read < MIN_PROMPT_CACHE_READ_TO_TRACK) {
+        if (info.modelID !== current.modelID || info.providerID !== current.providerID) {
             return undefined;
         }
         if (hasPruneBetween({
@@ -675,17 +673,19 @@ export function getPromptCacheClear({ events, sessionId, currentMessageId, upToI
         })) {
             return undefined;
         }
-        if (current.tokens.cache.read > info.tokens.cache.read * PROMPT_CACHE_DROP_RATIO) {
+        // Anthropic reports a fresh cache as write only, so read alone misses the turn after a miss.
+        const previousCached = info.tokens.cache.read + info.tokens.cache.write;
+        const currentPrompt = current.tokens.input + current.tokens.cache.read + current.tokens.cache.write;
+        // A reverted (shorter) prompt can only reuse its own length from cache.
+        const expectedCacheRead = Math.min(previousCached, currentPrompt);
+        if (expectedCacheRead < MIN_PROMPT_CACHE_READ_TO_TRACK) {
             return undefined;
         }
-        const previousPrompt = promptInputTokens(info.tokens);
-        const currentPrompt = promptInputTokens(current.tokens);
-        // Pruning blanks old tool output and shrinks the next prompt. That is not a cache clear.
-        if (currentPrompt < previousPrompt) {
+        if (current.tokens.cache.read > expectedCacheRead * PROMPT_CACHE_DROP_RATIO) {
             return undefined;
         }
         return {
-            previousCacheRead: info.tokens.cache.read,
+            expectedCacheRead,
             currentCacheRead: current.tokens.cache.read,
             previousMessageId: info.id,
             currentMessageId: current.id,
@@ -702,7 +702,7 @@ export function formatCompactTokenCount(count) {
     return String(count);
 }
 export function formatPromptCacheClearMessage(clear, systemDiff) {
-    const tokens = `prompt cache missed (${formatCompactTokenCount(clear.previousCacheRead)} → ${formatCompactTokenCount(clear.currentCacheRead)})`;
+    const tokens = `prompt cache missed (${formatCompactTokenCount(clear.expectedCacheRead)} → ${formatCompactTokenCount(clear.currentCacheRead)})`;
     if (!systemDiff || (systemDiff.additions === 0 && systemDiff.deletions === 0)) {
         return tokens;
     }