kimaki 0.28.0 → 0.30.0

package/dist/markdown.js

@@ -15,6 +15,112 @@ class UnexpectedError extends errore.createTaggedError({
 }
 const markdownLogger = createLogger(LogPrefix.MARKDOWN);
 const TOOL_OUTPUT_MAX_CHARS = 30_000;
+export const DEFAULT_TOOL_INPUT_MAX_CHARS = 80;
+function stringifyToolValue(value) {
+    if (typeof value === 'string')
+        return value;
+    return JSON.stringify(value);
+}
+export function truncateChars(value, maxChars) {
+    const collapsed = value.replace(/\s+/g, ' ').trim();
+    if (maxChars <= 0)
+        return '';
+    if (collapsed.length <= maxChars)
+        return collapsed;
+    if (maxChars === 1)
+        return '…';
+    return `${collapsed.slice(0, maxChars - 1)}…`;
+}
+export function formatDuration(ms) {
+    if (ms < 1000)
+        return `${ms}ms`;
+    if (ms < 60_000)
+        return `${(ms / 1000).toFixed(1)}s`;
+    const minutes = Math.floor(ms / 60_000);
+    const seconds = Math.floor((ms % 60_000) / 1000);
+    return `${minutes}m ${seconds}s`;
+}
+function messageCreatedAt(message) {
+    const created = message.time?.created;
+    return typeof created === 'number' ? created : undefined;
+}
+function messageEndedAt(message) {
+    const completed = message.time?.completed;
+    if (typeof completed === 'number')
+        return completed;
+    return messageCreatedAt(message);
+}
+/** User sent → last assistant finished, until the next user message. */
+export function userPromptDurationMs({ messages, userIndex, }) {
+    const userCreated = messageCreatedAt(messages[userIndex]?.info ?? {});
+    if (userCreated === undefined)
+        return undefined;
+    let end = userCreated;
+    for (let i = userIndex + 1; i < messages.length; i++) {
+        const info = messages[i]?.info;
+        if (info?.role === 'user')
+            break;
+        if (info?.role !== 'assistant')
+            continue;
+        const ended = messageEndedAt(info);
+        if (ended !== undefined && ended > end)
+            end = ended;
+    }
+    const ms = end - userCreated;
+    return ms > 0 ? ms : undefined;
+}
+export function fileBaseName(filePath) {
+    const normalized = filePath.replaceAll('\\', '/');
+    const segments = normalized.split('/');
+    return segments[segments.length - 1] || filePath;
+}
+function readTaskSessionId(metadata) {
+    if (!metadata || typeof metadata !== 'object' || Array.isArray(metadata))
+        return undefined;
+    const sessionId = metadata.sessionId;
+    return typeof sessionId === 'string' && sessionId.length > 0 ? sessionId : undefined;
+}
+function taskChildSessionId({ input, metadata, }) {
+    const sessionId = readTaskSessionId(metadata);
+    if (sessionId)
+        return sessionId;
+    const taskId = input?.task_id;
+    if (typeof taskId === 'string' && taskId.startsWith('ses'))
+        return taskId;
+    return undefined;
+}
+/** Compact tool input for session markdown. Keep this greppable and short. */
+export function formatCompactToolSummary({ tool, input, maxChars = DEFAULT_TOOL_INPUT_MAX_CHARS, metadata, }) {
+    const record = input ?? {};
+    if (tool === 'read') {
+        const path = record.filePath ?? record.path;
+        return typeof path === 'string' && path.length > 0 ? fileBaseName(path) : '';
+    }
+    if (tool === 'task') {
+        const description = typeof record.description === 'string' ? record.description : '';
+        const sessionId = taskChildSessionId({ input: record, metadata });
+        if (!sessionId)
+            return truncateChars(description, maxChars);
+        const separator = description.trim() ? 1 : 0;
+        const descBudget = Math.max(0, maxChars - sessionId.length - separator);
+        const desc = truncateChars(description, descBudget);
+        return [desc, sessionId].filter(Boolean).join(' ');
+    }
+    if (tool === 'bash') {
+        const command = typeof record.command === 'string' ? record.command : '';
+        const collapsedCommand = command.replace(/\s+/g, ' ').trim();
+        if (collapsedCommand.length > 0 && collapsedCommand.length <= maxChars) {
+            return collapsedCommand;
+        }
+        const description = typeof record.description === 'string' ? record.description : '';
+        return truncateChars(description || collapsedCommand, maxChars);
+    }
+    const parts = [];
+    for (const [key, value] of Object.entries(record)) {
+        parts.push(`${key}=${stringifyToolValue(value)}`);
+    }
+    return truncateChars(parts.join(' '), maxChars);
+}
 export class ShareMarkdown {
     client;
     constructor(client) {
@@ -26,7 +132,7 @@ export class ShareMarkdown {
      * @returns Error or markdown string
      */
     async generate(options) {
-        const { sessionID, includeSystemInfo, lastAssistantOnly, compactTools = true } = options;
+        const { sessionID, includeSystemInfo, lastAssistantOnly, compactTools = true, includeThinking = false, toolInputMaxChars = DEFAULT_TOOL_INPUT_MAX_CHARS, } = options;
         // Get session info
         const sessionResponse = await this.client.session.get({
             sessionID,
@@ -45,12 +151,7 @@ export class ShareMarkdown {
         const messages = messagesResponse.data;
         // If lastAssistantOnly, filter to only the last assistant message
         const messagesToRender = lastAssistantOnly
-            ? (() => {
-                const assistantMessages = messages.filter((m) => m.info.role === 'assistant');
-                return assistantMessages.length > 0
-                    ? [assistantMessages[assistantMessages.length - 1]]
-                    : [];
-            })()
+            ? messages.filter((m) => m.info.role === 'assistant').slice(-1)
             : messages;
         // Build markdown
         const lines = [];
@@ -74,17 +175,37 @@ export class ShareMarkdown {
             lines.push('## Conversation');
             lines.push('');
         }
-        for (const message of messagesToRender) {
-            const messageLines = this.renderMessage(message.info, message.parts, { compactTools });
+        for (const [index, message] of messagesToRender.entries()) {
+            const messageLines = this.renderMessage(message.info, message.parts, {
+                compactTools,
+                includeThinking,
+                toolInputMaxChars,
+            });
             lines.push(...messageLines);
             lines.push('');
+            const nextRole = messagesToRender[index + 1]?.info.role;
+            if (message.info.role !== 'assistant' || nextRole === 'assistant')
+                continue;
+            for (let userIndex = index - 1; userIndex >= 0; userIndex--) {
+                if (messagesToRender[userIndex]?.info.role !== 'user')
+                    continue;
+                const durationMs = userPromptDurationMs({
+                    messages: messagesToRender,
+                    userIndex,
+                });
+                if (durationMs !== undefined) {
+                    lines.push(`duration: ${formatDuration(durationMs)}`);
+                    lines.push('');
+                }
+                break;
+            }
         }
         return lines.join('\n');
     }
     renderMessage(message, parts, opts) {
         const lines = [];
         if (message.role === 'user') {
-            lines.push('### 👤 User');
+            lines.push('### user');
             lines.push('');
             for (const part of parts) {
                 if (part.type === 'text' && part.text) {
@@ -95,7 +216,7 @@ export class ShareMarkdown {
                     }
                 }
                 else if (part.type === 'file') {
-                    lines.push(`📎 **Attachment**: ${part.filename || 'unnamed file'}`);
+                    lines.push(`file: ${part.filename || 'unnamed file'}`);
                     if (part.url) {
                         lines.push(`   - URL: ${part.url}`);
                     }
@@ -104,47 +225,38 @@ export class ShareMarkdown {
             }
         }
         else if (message.role === 'assistant') {
-            const modelId = [message.providerID, message.modelID].filter(Boolean).join('/') ||
-                'unknown model';
-            lines.push(`### 🤖 Assistant (${modelId})`);
-            lines.push('');
-            // Filter and process parts
             const filteredParts = parts.filter((part) => {
-                if (part.type === 'step-start' && parts.indexOf(part) > 0)
-                    return false;
-                if (part.type === 'snapshot')
-                    return false;
-                if (part.type === 'patch')
+                if (part.type === 'step-start' ||
+                    part.type === 'step-finish' ||
+                    part.type === 'snapshot' ||
+                    part.type === 'patch')
                     return false;
-                if (part.type === 'step-finish')
-                    return false;
-                if (part.type === 'text' && part.synthetic === true)
+                if (part.type === 'text' && (part.synthetic === true || !part.text))
                     return false;
                 if (part.type === 'tool' && part.tool === 'todoread')
                     return false;
-                if (part.type === 'text' && !part.text)
-                    return false;
                 if (part.type === 'tool' &&
                     (part.state.status === 'pending' || part.state.status === 'running'))
                     return false;
                 return true;
             });
+            const body = [];
             for (const part of filteredParts) {
-                const partLines = opts.compactTools
-                    ? this.renderPartCompact(part, message)
-                    : this.renderPart(part, message);
-                lines.push(...partLines);
-            }
-            // Add completion time if available
-            if (message.time?.completed) {
-                const duration = message.time.completed - message.time.created;
-                lines.push('');
-                lines.push(`*Completed in ${this.formatDuration(duration)}*`);
+                body.push(...(opts.compactTools
+                    ? this.renderPartCompact(part, opts)
+                    : this.renderPart(part, opts)));
             }
+            if (body.length === 0)
+                return lines;
+            const modelId = [message.providerID, message.modelID].filter(Boolean).join('/') ||
+                'unknown model';
+            lines.push(`### assistant (${modelId})`);
+            lines.push('');
+            lines.push(...body);
         }
         return lines;
     }
-    renderPart(part, message) {
+    renderPart(part, opts) {
         const lines = [];
         switch (part.type) {
             case 'text':
@@ -154,14 +266,11 @@ export class ShareMarkdown {
                 }
                 break;
             case 'reasoning':
-                if (part.text) {
-                    lines.push('<details>');
-                    lines.push('<summary>💭 Thinking</summary>');
+                if (opts.includeThinking && part.text) {
+                    lines.push('thinking:');
                     lines.push('');
                     lines.push(part.text);
                     lines.push('');
-                    lines.push('</details>');
-                    lines.push('');
                 }
                 break;
             case 'tool':
@@ -169,10 +278,10 @@ export class ShareMarkdown {
                     const output = part.state.output || '';
                     const isOversized = output.length > TOOL_OUTPUT_MAX_CHARS;
                     if (isOversized) {
-                        lines.push(`> ⚠️ **Large tool output** (${output.length.toLocaleString()} chars, truncated to ${TOOL_OUTPUT_MAX_CHARS.toLocaleString()})`);
+                        lines.push(`> Large tool output (${output.length.toLocaleString()} chars, truncated to ${TOOL_OUTPUT_MAX_CHARS.toLocaleString()})`);
                         lines.push('');
                     }
-                    lines.push(`#### 🛠️ Tool: ${part.tool}`);
+                    lines.push(`#### tool: ${part.tool}`);
                     lines.push('');
                     // Render input parameters in YAML
                     if (part.state.input && Object.keys(part.state.input).length > 0) {
@@ -193,17 +302,9 @@ export class ShareMarkdown {
                         lines.push('```');
                         lines.push('');
                     }
-                    // Add timing info if significant
-                    if (part.state.time?.start && part.state.time?.end) {
-                        const duration = part.state.time.end - part.state.time.start;
-                        if (duration > 2000) {
-                            lines.push(`*Duration: ${this.formatDuration(duration)}*`);
-                            lines.push('');
-                        }
-                    }
                 }
                 else if (part.state.status === 'error') {
-                    lines.push(`#### ❌ Tool Error: ${part.tool}`);
+                    lines.push(`#### tool-error: ${part.tool}`);
                     lines.push('');
                     lines.push('```');
                     lines.push(part.state.error || 'Unknown error');
@@ -211,75 +312,36 @@ export class ShareMarkdown {
                     lines.push('');
                 }
                 break;
-            case 'step-start':
-                lines.push(`**Started using ${message.providerID}/${message.modelID}**`);
-                lines.push('');
-                break;
         }
         return lines;
     }
     /** Compact rendering: tool calls become a single line with line count instead of full output. */
-    renderPartCompact(part, message) {
-        // Non-tool parts render the same as verbose
+    renderPartCompact(part, opts) {
         if (part.type !== 'tool') {
-            return this.renderPart(part, message);
+            return this.renderPart(part, opts);
         }
         const lines = [];
         if (part.state.status === 'completed') {
             const output = part.state.output || '';
             const lineCount = output ? output.split('\n').length : 0;
-            const inputSummary = this.compactInputSummary(part.state.input);
+            const inputSummary = formatCompactToolSummary({
+                tool: part.tool,
+                input: part.state.input,
+                maxChars: opts.toolInputMaxChars,
+                metadata: part.state.metadata,
+            });
             const outputLabel = lineCount > 0 ? `(${lineCount} lines)` : '';
             const parts = [inputSummary, outputLabel].filter(Boolean).join(' ');
-            lines.push(`> 🛠️ **${part.tool}**${parts ? ` ${parts}` : ''}`);
+            lines.push(`tool: ${part.tool}${parts ? ` ${parts}` : ''}`);
             lines.push('');
         }
         else if (part.state.status === 'error') {
             const errorText = (part.state.error || 'Unknown error').split('\n')[0].slice(0, 120);
-            lines.push(`> ❌ **${part.tool}** — ${errorText}`);
+            lines.push(`tool-error: ${part.tool} ${errorText}`);
             lines.push('');
         }
         return lines;
     }
-    /** Build a compact key=value summary of tool input, max 2 params, 80 chars each. */
-    compactInputSummary(input) {
-        if (!input)
-            return '';
-        const entries = Object.entries(input);
-        if (entries.length === 0)
-            return '';
-        const parts = [];
-        const maxParams = 2;
-        for (let i = 0; i < Math.min(entries.length, maxParams); i++) {
-            const [key, value] = entries[i];
-            let val;
-            try {
-                val = typeof value === 'string'
-                    ? value
-                    : (JSON.stringify(value) ?? String(value));
-            }
-            catch {
-                val = String(value);
-            }
-            // Collapse whitespace for readability
-            const collapsed = val.replace(/\s+/g, ' ').trim();
-            const normalized = collapsed.length > 80 ? `${collapsed.slice(0, 80)}…` : collapsed;
-            parts.push(`${key}=${normalized}`);
-        }
-        if (entries.length > maxParams) {
-            parts.push('...');
-        }
-        return parts.join(', ');
-    }
-    formatDuration(ms) {
-        if (ms < 1000)
-            return `${ms}ms`;
-        if (ms < 60000)
-            return `${(ms / 1000).toFixed(1)}s`;
-        const minutes = Math.floor(ms / 60000);
-        const seconds = Math.floor((ms % 60000) / 1000);
-        return `${minutes}m ${seconds}s`;
-    }
 }
 /**
  * Generate compact session context for voice transcription.

package/dist/markdown.test.js

@@ -8,10 +8,68 @@ import url from 'node:url';
 import { test, expect, beforeAll, afterAll } from 'vitest';
 import * as errore from 'errore';
 import { buildDeterministicOpencodeConfig, } from 'opencode-deterministic-provider';
-import { ShareMarkdown, getCompactSessionContext } from './markdown.js';
+import { ShareMarkdown, fileBaseName, formatCompactToolSummary, formatDuration, getCompactSessionContext, truncateChars, userPromptDurationMs, } from './markdown.js';
 import { setDataDir } from './config.js';
 import { initializeOpencodeForDirectory, getOpencodeClient, stopOpencodeServer } from './opencode.js';
 import { cleanupTestSessions, initTestGitRepo } from './test-utils.js';
+test('truncateChars keeps short text and ellipsizes long text', () => {
+    expect(truncateChars('hello world', 80)).toBe('hello world');
+    expect(truncateChars('  a   b  ', 80)).toBe('a b');
+    expect(truncateChars('abcdefghij', 5)).toBe('abcd…');
+    expect(truncateChars('ab', 1)).toBe('…');
+});
+test('formatDuration uses ms, seconds, then minutes', () => {
+    expect(formatDuration(250)).toBe('250ms');
+    expect(formatDuration(1500)).toBe('1.5s');
+    expect(formatDuration(65_000)).toBe('1m 5s');
+});
+test('userPromptDurationMs spans user send to last following assistant', () => {
+    const messages = [
+        { info: { role: 'user', time: { created: 1000 } } },
+        { info: { role: 'assistant', time: { created: 1100, completed: 4000 } } },
+        { info: { role: 'assistant', time: { created: 4100, completed: 9000 } } },
+        { info: { role: 'user', time: { created: 20_000 } } },
+        { info: { role: 'assistant', time: { created: 20_100, completed: 21_000 } } },
+    ];
+    expect(userPromptDurationMs({ messages, userIndex: 0 })).toBe(8000);
+    expect(userPromptDurationMs({ messages, userIndex: 3 })).toBe(1000);
+});
+test('fileBaseName strips directories on posix and windows paths', () => {
+    expect(fileBaseName('/Users/morse/README.md')).toBe('README.md');
+    expect(fileBaseName('src\\cli.ts')).toBe('cli.ts');
+});
+test('formatCompactToolSummary indexes read, task, and bash inputs', () => {
+    expect(formatCompactToolSummary({
+        tool: 'read',
+        input: { filePath: '/Users/morse/Documents/GitHub/kimakivoice/README.md', offset: 1 },
+    })).toBe('README.md');
+    expect(formatCompactToolSummary({
+        tool: 'task',
+        input: { description: 'analyze gpuix-solid', task_id: 'ses_child123' },
+    })).toBe('analyze gpuix-solid ses_child123');
+    expect(formatCompactToolSummary({
+        tool: 'task',
+        input: { description: 'analyze gpuix-solid' },
+        metadata: { sessionId: 'ses_from_meta' },
+    })).toBe('analyze gpuix-solid ses_from_meta');
+    expect(formatCompactToolSummary({
+        tool: 'bash',
+        input: { command: 'echo hello world', description: 'Print greeting' },
+    })).toBe('echo hello world');
+    expect(formatCompactToolSummary({
+        tool: 'bash',
+        input: {
+            command: 'a'.repeat(120),
+            description: 'Rebuild native addon',
+        },
+        maxChars: 80,
+    })).toBe('Rebuild native addon');
+    expect(formatCompactToolSummary({
+        tool: 'grep',
+        input: { pattern: 'ShareMarkdown', path: 'cli/src/markdown.ts' },
+        maxChars: 40,
+    })).toBe('pattern=ShareMarkdown path=cli/src/mark…');
+});
 const ROOT = path.resolve(process.cwd(), 'tmp', 'markdown-test');
 function createRunDirectories() {
     fs.mkdirSync(ROOT, { recursive: true });
@@ -181,10 +239,7 @@ afterAll(async () => {
 // Strip dynamic parts (timestamps, durations, branch names) for stable assertions
 function normalizeMarkdown(md) {
     return md
-        // Normalize "Completed in Xs" to a fixed string
-        .replace(/\*Completed in [\d.]+[ms]+\*/g, '*Completed in Xs*')
-        // Normalize "Duration: Xs" tool timing
-        .replace(/\*Duration: [\d.]+[ms]+\*/g, '*Duration: Xs*')
+        .replace(/^duration: .+$/gm, 'duration: <duration>')
         // Normalize ISO dates in session info
         .replace(/\*\*Created\*\*: .+/g, '**Created**: <date>')
         .replace(/\*\*Updated\*\*: .+/g, '**Updated**: <date>')
@@ -206,11 +261,13 @@ test('generate markdown with system info', async () => {
     expect(markdown).toContain('# Markdown Test Session');
     expect(markdown).toContain('## Session Information');
     expect(markdown).toContain('## Conversation');
-    expect(markdown).toContain('### 👤 User');
+    expect(markdown).toContain('### user');
     expect(markdown).toContain('hello markdown test');
-    expect(markdown).toContain('### 🤖 Assistant (deterministic-provider/deterministic-v2)');
+    expect(markdown).toContain('### assistant (deterministic-provider/deterministic-v2)');
     expect(markdown).toContain('Hello! This is a deterministic markdown test response.');
-    expect(markdown).toContain('**Started using deterministic-provider/deterministic-v2**');
+    expect(markdown).not.toContain('Started using');
+    expect(markdown).not.toContain('Completed in');
+    expect(markdown).toMatch(/^duration: /m);
     const normalized = normalizeMarkdown(markdown);
     expect(normalized).toMatchInlineSnapshot(`
     "# Markdown Test Session
@@ -223,19 +280,17 @@ test('generate markdown with system info', async () => {
 
     ## Conversation
 
-    ### 👤 User
+    ### user
 
     hello markdown test
 
 
-    ### 🤖 Assistant (deterministic-provider/deterministic-v2)
-
-    **Started using deterministic-provider/deterministic-v2**
+    ### assistant (deterministic-provider/deterministic-v2)
 
     Hello! This is a deterministic markdown test response.
 
 
-    *Completed in Xs*
+    duration: <duration>
     "
   `);
 });
@@ -256,19 +311,17 @@ test('generate markdown without system info', async () => {
 
     ## Conversation
 
-    ### 👤 User
+    ### user
 
     hello markdown test
 
 
-    ### 🤖 Assistant (deterministic-provider/deterministic-v2)
-
-    **Started using deterministic-provider/deterministic-v2**
+    ### assistant (deterministic-provider/deterministic-v2)
 
     Hello! This is a deterministic markdown test response.
 
 
-    *Completed in Xs*
+    duration: <duration>
     "
   `);
 });
@@ -310,6 +363,21 @@ test('generate markdown with lastAssistantOnly', async () => {
     // Should contain the assistant response
     expect(markdown).toContain('Hello! This is a deterministic markdown test response.');
 });
+test('thinking is omitted unless includeThinking is set', async () => {
+    const exporter = new ShareMarkdown(client);
+    const hidden = await exporter.generate({
+        sessionID,
+        includeThinking: false,
+    });
+    expect(errore.isOk(hidden)).toBe(true);
+    expect(errore.unwrap(hidden)).not.toContain('thinking:');
+    const shown = await exporter.generate({
+        sessionID,
+        includeThinking: true,
+    });
+    expect(errore.isOk(shown)).toBe(true);
+    expect(errore.unwrap(shown)).not.toContain('💭');
+});
 test('compact tools: tool calls show one-liner with line count', async () => {
     const exporter = new ShareMarkdown(client);
     const result = await exporter.generate({
@@ -319,7 +387,7 @@ test('compact tools: tool calls show one-liner with line count', async () => {
     expect(errore.isOk(result)).toBe(true);
     const md = errore.unwrap(result);
     // Compact mode: exact one-liner format with params and line count
-    expect(md).toContain('> 🛠️ **bash** command=echo hello world, description=Print greeting');
+    expect(md).toContain('tool: bash echo hello world');
     expect(md).toMatch(/\(\d+ lines?\)/);
     // Should NOT contain full output code blocks or input YAML
     expect(md).not.toContain('**Output:**');
@@ -335,7 +403,7 @@ test('verbose tools: tool calls show full input and output', async () => {
     expect(errore.isOk(result)).toBe(true);
     const md = errore.unwrap(result);
     // Verbose mode: full tool rendering with input YAML and output code block
-    expect(md).toContain('#### 🛠️ Tool: bash');
+    expect(md).toContain('#### tool: bash');
     expect(md).toContain('**Input:**');
     expect(md).toContain('```yaml');
     expect(md).toContain('**Output:**');

package/dist/message-formatting.js

@@ -12,9 +12,20 @@ const logger = createLogger(LogPrefix.FORMATTING);
 export const TOOL_PREFIX = '┣ ';
 export const FILE_EDIT_PREFIX = '◼︎ ';
 export const THINKING_PREFIX = '┣ ';
-export const STATUS_PREFIX = '⬦ ';
+// Discord subtext. Not `#-`.
+export const SYSTEM_LINE_PREFIX = '-# ';
+export const STATUS_PREFIX = SYSTEM_LINE_PREFIX;
 export const QUEUE_PREFIX = '» ';
-export const WORKTREE_PREFIX = STATUS_PREFIX;
+export const WORKTREE_PREFIX = '⬦ ';
+export function asSystemLine(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('-#'))
+            return line;
+        return `${SYSTEM_LINE_PREFIX}${line}`;
+    }).join('\n');
+}
 /**
  * Serialize Discord embeds into plain text so the AI model can read them.
  * Each embed becomes an <embed> XML block with title, author, description,
@@ -165,6 +176,11 @@ export function asDiscordQuote(text) {
         return `> ${line}`;
     }).join('\n');
 }
+// Leave one char for the kind-change blank line in sessionPartContent.
+const DISCORD_MESSAGE_MAX_LENGTH = 2000;
+export function quotedTextFitsOneDiscordMessage(text) {
+    return asDiscordQuote(text).length < DISCORD_MESSAGE_MAX_LENGTH;
+}
 function isNonEmptyTextPart(part) {
     return part.type === 'text' && Boolean(part.text?.trim());
 }
@@ -187,6 +203,8 @@ export function shouldQuoteIntermediateTextPart({ part, isLastInTurn, nextToolNa
         return false;
     if (text.trim().split('\n').length > 2)
         return false;
+    if (!quotedTextFitsOneDiscordMessage(text))
+        return false;
     if (nextToolName === 'question'
         || nextToolName?.endsWith('kimaki_sleep')
         || nextToolName?.endsWith('kimaki_action_buttons')) {
@@ -195,31 +213,22 @@ export function shouldQuoteIntermediateTextPart({ part, isLastInTurn, nextToolNa
     return true;
 }
 export function planAssistantTurnFlush({ parts, mode, throughPartId, }) {
-    const lastText = parts.filter(isNonEmptyTextPart).at(-1);
-    const lastTextIndex = lastText
-        ? parts.findLastIndex((part) => part.id === lastText.id)
-        : -1;
     const throughIndex = throughPartId
         ? parts.findIndex((part) => part.id === throughPartId)
         : -1;
     const sendUntil = (() => {
-        if (mode === 'final')
-            return parts.length;
-        if (mode === 'interactive') {
-            if (throughIndex >= 0)
-                return throughIndex + 1;
-            return parts.length;
-        }
-        if (!lastText)
-            return parts.length;
-        // Hold unfinished last text and anything after it so tool order stays intact.
-        if (!lastText.time?.end)
-            return lastTextIndex;
+        if (mode === 'interactive' && throughIndex >= 0)
+            return throughIndex + 1;
         return parts.length;
     })();
     const sendParts = [];
     const holdParts = [];
     for (const [index, part] of parts.entries()) {
+        // Live tools must not wait for the current text part to end.
+        if (mode === 'progress' && part.type === 'text' && !part.time?.end) {
+            holdParts.push(part);
+            continue;
+        }
         if (index < sendUntil) {
             sendParts.push({
                 part,
@@ -632,6 +641,8 @@ export function formatTaskToolTitle(part) {
 export function formatPart(part, prefix) {
     const pfx = prefix ? `${prefix} ⋅ ` : '';
     if (part.type === 'text') {
+        if (part.synthetic === true)
+            return '';
         const text = part.text?.trim();
         if (!text)
             return '';