kimaki 0.30.0 → 0.31.0

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');
 }
 /**
@@ -112,6 +115,14 @@ export function serializeMessageSnapshots(snapshots) {
  * model can see all user-visible content.
  */
 export function resolveMentions(message) {
+    const content = resolveContentMentions(message);
+    const extras = serializeMessageExtras(message);
+    if (!extras)
+        return content;
+    return content ? `${content}\n\n${extras}` : extras;
+}
+/** Message content with mentions resolved, without embeds, polls or forwards. */
+export function resolveContentMentions(message) {
     let content = message.content || '';
     // Replace user mentions <@userId> or <@!userId> with @displayName
     for (const [userId, user] of message.mentions.users) {
@@ -128,17 +139,34 @@ export function resolveMentions(message) {
         const name = 'name' in channel ? channel.name : channelId;
         content = content.replace(new RegExp(`<#${channelId}>`, 'g'), `#${name}`);
     }
-    // Append non-text content so the model can see it
-    const extras = [
+    return content;
+}
+// Matches explicit queue markers at the end of a message (case-insensitive).
+// Supported forms:
+// - punctuation + queue: ". queue", "! queue", ". queue.", "!queue."
+// - queue as its own final line: "text\nqueue" or just "queue"
+// When present the suffix is stripped and the message is routed through
+// kimaki's local queue (same as /queue command).
+const QUEUE_SUFFIX_RE = /(?:[.!?,;:]|^)\s*queue\.?\s*$|\n\s*queue\.?\s*$/i;
+/**
+ * Only for code that builds or reads raw prompt text. Discord message ingress
+ * must go through `resolveMessagePrompt()` in message-preprocessing.ts.
+ */
+export function extractQueueSuffix(prompt) {
+    if (!QUEUE_SUFFIX_RE.test(prompt)) {
+        return { prompt, forceQueue: false };
+    }
+    return { prompt: prompt.replace(QUEUE_SUFFIX_RE, '').trimEnd(), forceQueue: true };
+}
+/** Non-text message content (embeds, poll, forwards) serialized for the model. */
+export function serializeMessageExtras(message) {
+    return [
         serializeEmbeds(message.embeds),
         serializePoll(message.poll),
         serializeMessageSnapshots(message.messageSnapshots),
-    ].filter(Boolean);
-    if (extras.length > 0) {
-        const joined = extras.join('\n\n');
-        content = content ? `${content}\n\n${joined}` : joined;
-    }
-    return content;
+    ]
+        .filter(Boolean)
+        .join('\n\n');
 }
 /**
  * Escapes Discord inline markdown characters so dynamic content
@@ -201,7 +229,7 @@ export function shouldQuoteIntermediateTextPart({ part, isLastInTurn, nextToolNa
     const text = part.text ?? '';
     if (text.includes('<callout'))
         return false;
-    if (text.trim().split('\n').length > 2)
+    if (text.trim().includes('\n'))
         return false;
     if (!quotedTextFitsOneDiscordMessage(text))
         return false;
@@ -636,9 +664,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', () => {
@@ -358,8 +359,8 @@ describe('planAssistantTurnFlush', () => {
       }
     `);
     });
-    test('progress still quotes two-line earlier text', () => {
-        expect(plan([text('t1', 'line one\nline two'), tool('tool1'), text('t2', 'answer')], 'progress').send.find((entry) => entry.id === 't1')).toEqual({ id: 't1', quoteText: true });
+    test('progress leaves two-line text unquoted', () => {
+        expect(plan([text('t1', 'line one\nline two'), tool('tool1'), text('t2', 'answer')], 'progress').send.find((entry) => entry.id === 't1')).toEqual({ id: 't1', quoteText: false });
     });
     test('progress keeps sleep-tool quote context after that tool is already sent', () => {
         const parts = [text('t1', 'wait'), tool('sleep1', 'kimaki_sleep')];
@@ -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/message-preprocessing.js

@@ -9,7 +9,7 @@
 // preserving arrival order without a separate threadIngressQueue.
 import { DiscordOperationError, OpenCodeSdkError } from './errors.js';
 import { getOrCreateRuntime } from './session-handler/thread-session-runtime.js';
-import { resolveMentions, getFileAttachments, getTextAttachments, } from './message-formatting.js';
+import { resolveMentions, resolveContentMentions, serializeMessageExtras, getFileAttachments, getTextAttachments, } from './message-formatting.js';
 import { processVoiceAttachment } from './voice-handler.js';
 import { isVoiceAttachment } from './voice-attachment.js';
 import { initializeOpencodeForDirectory } from './opencode.js';
@@ -17,6 +17,7 @@ import { getCompactSessionContext, getLastSessionId } from './markdown.js';
 import { getThreadSession, getThreadWorktreeOrWorkspace } from './database.js';
 import { resolveWorkingDirectory, resolveTextChannel, sendThreadMessage } from './discord-utils.js';
 import { forkSessionToBtwThread } from './commands/btw.js';
+import { extractBtwQueueSuffix } from './btw-prefix-detection.js';
 import { createNewSessionThread } from './commands/session.js';
 import * as errore from 'errore';
 import { createLogger, LogPrefix } from './logger.js';
@@ -122,19 +123,35 @@ async function fetchAvailableAgents(getClient, directory) {
         return { name: a.name, description: a.description };
     });
 }
-// Matches explicit queue markers at the end of a message (case-insensitive).
-// Supported forms:
-// - punctuation + queue: ". queue", "! queue", ". queue.", "!queue."
-// - queue as its own final line: "text\nqueue" or just "queue"
-// When present the suffix is stripped and the message is routed through
-// kimaki's local queue (same as /queue command).
-const QUEUE_SUFFIX_RE = /(?:[.!?,;:]|^)\s*queue\.?\s*$|\n\s*queue\.?\s*$/i;
 const REPLIED_MESSAGE_TEXT_LIMIT = 1_000;
-export function extractQueueSuffix(prompt) {
-    if (!QUEUE_SUFFIX_RE.test(prompt)) {
-        return { prompt, forceQueue: false };
-    }
-    return { prompt: prompt.replace(QUEUE_SUFFIX_RE, '').trimEnd(), forceQueue: true };
+/**
+ * Shared ingress step for every Discord message that becomes a prompt: user
+ * messages, `kimaki send --thread` injections and `kimaki send --channel`
+ * starter messages. Strips the queue suffix, appends embeds and text
+ * attachments, and picks the ingress mode.
+ *
+ * `text` must not contain embeds or attachments yet. The suffix is read from
+ * it first; anything appended before would push "? queue" away from the end.
+ */
+export async function resolveMessagePrompt({ message, text, forceQueue = false, includeExtras = true, }) {
+    const qs = extractBtwQueueSuffix(text);
+    const [images, textAttachments] = await Promise.all([
+        getFileAttachments(message),
+        getTextAttachments(message),
+    ]);
+    const prompt = [
+        qs.forceBtw && !qs.forceQueue && !forceQueue ? text : qs.prompt,
+        includeExtras ? serializeMessageExtras(message) : '',
+        textAttachments,
+    ]
+        .filter(Boolean)
+        .join('\n\n');
+    return {
+        prompt,
+        images: images.length > 0 ? images : undefined,
+        mode: qs.forceQueue || forceQueue ? 'local-queue' : 'opencode',
+        queuedAction: (qs.forceQueue || forceQueue) && qs.forceBtw ? 'btw' : undefined,
+    };
 }
 function shouldSkipEmptyPrompt({ message, prompt, images, hasVoiceAttachment, }) {
     if (prompt.trim()) {
@@ -198,7 +215,7 @@ export async function preprocessExistingThreadMessage({ message, thread, project
     voiceLogger.log(`[SESSION] Found session ${sessionId} for thread ${thread.id}`);
     let messageContent = isCliInjected
         ? (message.content || '')
-        : resolveMentions(message);
+        : resolveContentMentions(message);
     const repliedMessage = await getRepliedMessageContext({ message });
     // Fetch session context and available agents for voice transcription enrichment
     let currentSessionContext;
@@ -271,30 +288,17 @@ export async function preprocessExistingThreadMessage({ message, thread, project
     if (hasVoiceAttachment && !voiceResult && !messageContent.trim()) {
         return { prompt: '', mode: 'opencode', skip: true };
     }
-    // Extract queue suffix from raw message content BEFORE appending text
-    // attachments. Otherwise a text file attachment pushes "? queue" away from
-    // the end of the string and the regex fails to match.
-    const qs = extractQueueSuffix(messageContent);
-    const fileAttachments = await getFileAttachments(message);
-    const textAttachmentsContent = await getTextAttachments(message);
-    const prompt = textAttachmentsContent
-        ? `${qs.prompt}\n\n${textAttachmentsContent}`
-        : qs.prompt;
-    if (shouldSkipEmptyPrompt({
+    const resolved = await resolveMessagePrompt({
         message,
-        prompt,
-        images: fileAttachments,
-        hasVoiceAttachment,
-    })) {
+        text: messageContent,
+        forceQueue: voiceResult?.queueMessage,
+        // The kimaki marker embed of CLI injections is metadata, not prompt text.
+        includeExtras: !isCliInjected,
+    });
+    if (shouldSkipEmptyPrompt({ message, ...resolved, hasVoiceAttachment })) {
         return { prompt: '', mode: 'opencode', skip: true };
     }
-    return {
-        prompt,
-        images: fileAttachments.length > 0 ? fileAttachments : undefined,
-        repliedMessage,
-        mode: qs.forceQueue || voiceResult?.queueMessage ? 'local-queue' : 'opencode',
-        agent: voiceResult?.agent,
-    };
+    return { ...resolved, repliedMessage, agent: voiceResult?.agent };
 }
 /**
  * Pre-process a message that starts a new session in a thread (no existing
@@ -315,7 +319,7 @@ export async function preprocessNewSessionMessage({ message, thread, projectDire
             voiceLogger.error(`Could not fetch agents for voice transcription:`, e);
         }
     }
-    let prompt = resolveMentions(message);
+    let prompt = resolveContentMentions(message);
     const repliedMessage = await getRepliedMessageContext({ message });
     const voiceResult = await processVoiceAttachment({
         message,
@@ -355,27 +359,15 @@ export async function preprocessNewSessionMessage({ message, thread, projectDire
             prompt = `Context from thread:\n${starterText}\n\nUser request:\n${prompt}`;
         }
     }
-    const qs = extractQueueSuffix(prompt);
-    const fileAttachments = await getFileAttachments(message);
-    const textAttachmentsContent = await getTextAttachments(message);
-    const finalPrompt = textAttachmentsContent
-        ? `${qs.prompt}\n\n${textAttachmentsContent}`
-        : qs.prompt;
-    if (shouldSkipEmptyPrompt({
+    const resolved = await resolveMessagePrompt({
         message,
-        prompt: finalPrompt,
-        images: fileAttachments,
-        hasVoiceAttachment,
-    })) {
+        text: prompt,
+        forceQueue: voiceResult?.queueMessage,
+    });
+    if (shouldSkipEmptyPrompt({ message, ...resolved, hasVoiceAttachment })) {
         return { prompt: '', mode: 'opencode', skip: true };
     }
-    return {
-        prompt: finalPrompt,
-        images: fileAttachments.length > 0 ? fileAttachments : undefined,
-        repliedMessage,
-        mode: qs.forceQueue || voiceResult?.queueMessage ? 'local-queue' : 'opencode',
-        agent: voiceResult?.agent,
-    };
+    return { ...resolved, repliedMessage, agent: voiceResult?.agent };
 }
 /**
  * Pre-process a message from a text channel (creates a new thread).
@@ -394,7 +386,7 @@ export async function preprocessNewThreadMessage({ message, thread, projectDirec
             voiceLogger.error(`Could not fetch agents for voice transcription:`, e);
         }
     }
-    let messageContent = resolveMentions(message);
+    let messageContent = resolveContentMentions(message);
     const repliedMessage = await getRepliedMessageContext({ message });
     const voiceResult = await processVoiceAttachment({
         message,
@@ -415,27 +407,13 @@ export async function preprocessNewThreadMessage({ message, thread, projectDirec
     if (hasVoiceAttachment && !voiceResult && !messageContent.trim()) {
         return { prompt: '', mode: 'opencode', skip: true };
     }
-    // Extract queue suffix from raw message content BEFORE appending text
-    // attachments (same fix as preprocessExistingThreadMessage).
-    const qs = extractQueueSuffix(messageContent);
-    const fileAttachments = await getFileAttachments(message);
-    const textAttachmentsContent = await getTextAttachments(message);
-    const prompt = textAttachmentsContent
-        ? `${qs.prompt}\n\n${textAttachmentsContent}`
-        : qs.prompt;
-    if (shouldSkipEmptyPrompt({
+    const resolved = await resolveMessagePrompt({
         message,
-        prompt,
-        images: fileAttachments,
-        hasVoiceAttachment,
-    })) {
+        text: messageContent,
+        forceQueue: voiceResult?.queueMessage,
+    });
+    if (shouldSkipEmptyPrompt({ message, ...resolved, hasVoiceAttachment })) {
         return { prompt: '', mode: 'opencode', skip: true };
     }
-    return {
-        prompt,
-        images: fileAttachments.length > 0 ? fileAttachments : undefined,
-        repliedMessage,
-        mode: qs.forceQueue || voiceResult?.queueMessage ? 'local-queue' : 'opencode',
-        agent: voiceResult?.agent,
-    };
+    return { ...resolved, repliedMessage, agent: voiceResult?.agent };
 }

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);
@@ -154,7 +210,7 @@ e2eTest('queue advanced: abort and retry', () => {
         Reply with exactly: abort-no-footer-setup
         --- from: assistant (TestBot)
         -# *using deterministic-provider/deterministic-v2*
-        > ok
+        ok
         -# *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*
         --- from: user (queue-advanced-tester)
         SLOW_ABORT_MARKER run long response"
@@ -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-action-buttons.e2e.test.js

@@ -123,13 +123,13 @@ describe('queue advanced: action buttons', () => {
         Reply with exactly: action-button-setup
         --- from: assistant (TestBot)
         -# *using deterministic-provider/deterministic-v2*
-        > ok
+        ok
         -# *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*
         **Action Required**
         _Selected: Continue action-buttons flow_
         [user clicks button]
         » **queue-action-tester:** Continue action-buttons flow
-        > action-buttons-click-continued
+        action-buttons-click-continued
         -# *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*"
       `);
         expect(timeline).toContain('action-buttons-click-continued');
@@ -196,7 +196,7 @@ describe('queue advanced: action buttons', () => {
         Reply with exactly: action-button-dismiss-setup
         --- from: assistant (TestBot)
         -# *using deterministic-provider/deterministic-v2*
-        > ok
+        ok
         -# *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*
         **Action Required**
         _Buttons dismissed._

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

@@ -35,7 +35,7 @@ e2eTest('queue advanced: footer emission', () => {
         Reply with exactly: footer-check
         --- from: assistant (TestBot)
         -# *using deterministic-provider/deterministic-v2*
-        > ok
+        ok
         -# *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*"
       `);
         const foundFooter = footerMessages.some((m) => {
@@ -68,7 +68,7 @@ e2eTest('queue advanced: footer emission', () => {
           Reply with exactly: footer-with-mention
           --- from: assistant (TestBot)
           -# *using deterministic-provider/deterministic-v2*
-          > ok
+          ok
           -# *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2* <@200000000000000991>"
         `);
         }
@@ -122,12 +122,12 @@ e2eTest('queue advanced: footer emission', () => {
         Reply with exactly: footer-multi-setup
         --- from: assistant (TestBot)
         -# *using deterministic-provider/deterministic-v2*
-        > ok
+        ok
         -# *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*
         --- from: user (queue-advanced-tester)
         Reply with exactly: footer-multi-second
         --- from: assistant (TestBot)
-        > ok
+        ok
         -# *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*"
       `);
         if (footerCount >= 2) {
@@ -217,7 +217,7 @@ e2eTest('queue advanced: footer emission', () => {
         Reply with exactly: interrupt-footer-setup
         --- from: assistant (TestBot)
         -# *using deterministic-provider/deterministic-v2*
-        > ok
+        ok
         -# *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*
         --- from: user (queue-advanced-tester)
         PLUGIN_TIMEOUT_SLEEP_MARKER
@@ -226,7 +226,7 @@ e2eTest('queue advanced: footer emission', () => {
         --- from: user (queue-advanced-tester)
         Reply with exactly: interrupt-footer-followup
         --- from: assistant (TestBot)
-        > ok
+        ok
         -# *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*"
       `);
         expect(followupUserIdx).toBeGreaterThanOrEqual(0);
@@ -277,9 +277,9 @@ 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
+        tool call completed
         -# *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*"
       `);
     }, 10_000);

package/dist/queue-advanced-model-switch.e2e.test.js

@@ -249,7 +249,7 @@ describe('queue advanced: /model with interrupt recovery', () => {
         Reply with exactly: model-switcher-setup
         --- from: assistant (TestBot)
         -# *using deterministic-provider/deterministic-v2*
-        > ok
+        ok
         -# *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*
         Model set for this session:
         **Deterministic Provider** / **deterministic-v3**
@@ -263,7 +263,7 @@ describe('queue advanced: /model with interrupt recovery', () => {
         --- from: user (queue-model-switch-tester)
         Reply with exactly: model-switcher-followup
         --- from: assistant (TestBot)
-        > ok
+        ok
         -# *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v3*"
       `);
         expect(footer).toBeDefined();

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)
@@ -100,7 +100,7 @@ describe('queue advanced: typing around permissions', () => {
         ✅ Permission **accepted**
         [user clicks button]
 
-        > permission-flow-done
+        permission-flow-done
         -# *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*"
       `);
         const timeline = await th.text({