kimaki 0.26.0 → 0.28.0

package/dist/message-formatting.js

@@ -9,6 +9,12 @@ import { processImage } from './image-utils.js';
 import { parsePatchFileCounts } from './patch-text-parser.js';
 import { getDataDir } from './config.js';
 const logger = createLogger(LogPrefix.FORMATTING);
+export const TOOL_PREFIX = '┣ ';
+export const FILE_EDIT_PREFIX = '◼︎ ';
+export const THINKING_PREFIX = '┣ ';
+export const STATUS_PREFIX = '⬦ ';
+export const QUEUE_PREFIX = '» ';
+export const WORKTREE_PREFIX = STATUS_PREFIX;
 /**
  * Serialize Discord embeds into plain text so the AI model can read them.
  * Each embed becomes an <embed> XML block with title, author, description,
@@ -137,6 +143,103 @@ function escapeInlineMarkdown(text) {
 function normalizeWhitespace(text) {
     return text.replace(/[\r\n]+/g, ' ').replace(/\s+/g, ' ');
 }
+export function sessionPartKind(part) {
+    return part.type === 'text' ? 'text' : 'tool';
+}
+export function shouldLeadWithBlankLine({ previousKind, nextKind, }) {
+    if (!previousKind)
+        return false;
+    return previousKind !== nextKind;
+}
+export function sessionPartContent({ content, leadWithBlankLine, }) {
+    if (!leadWithBlankLine)
+        return content;
+    return `\n${content}`;
+}
+export function asDiscordQuote(text) {
+    const lead = text.startsWith('\n') ? '\n' : '';
+    const body = lead ? text.slice(1) : text;
+    return lead + body.split('\n').map((line) => {
+        if (line.startsWith('>'))
+            return line;
+        return `> ${line}`;
+    }).join('\n');
+}
+function isNonEmptyTextPart(part) {
+    return part.type === 'text' && Boolean(part.text?.trim());
+}
+function isRenderableTurnPart(part) {
+    return isNonEmptyTextPart(part) || part.type === 'tool';
+}
+function nextToolNameAfter({ parts, fromIndex, }) {
+    for (const part of parts.slice(fromIndex + 1)) {
+        if (isNonEmptyTextPart(part))
+            return undefined;
+        if (part.type === 'tool' && part.tool)
+            return part.tool;
+    }
+}
+export function shouldQuoteIntermediateTextPart({ part, isLastInTurn, nextToolName, }) {
+    if (!isNonEmptyTextPart(part) || isLastInTurn)
+        return false;
+    const text = part.text ?? '';
+    if (text.includes('<callout'))
+        return false;
+    if (text.trim().split('\n').length > 2)
+        return false;
+    if (nextToolName === 'question'
+        || nextToolName?.endsWith('kimaki_sleep')
+        || nextToolName?.endsWith('kimaki_action_buttons')) {
+        return false;
+    }
+    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;
+        return parts.length;
+    })();
+    const sendParts = [];
+    const holdParts = [];
+    for (const [index, part] of parts.entries()) {
+        if (index < sendUntil) {
+            sendParts.push({
+                part,
+                quoteText: shouldQuoteIntermediateTextPart({
+                    part,
+                    isLastInTurn: mode !== 'progress'
+                        && parts.filter(isRenderableTurnPart).at(-1)?.id === part.id,
+                    nextToolName: nextToolNameAfter({ parts, fromIndex: index }),
+                }),
+            });
+            continue;
+        }
+        holdParts.push(part);
+    }
+    return {
+        send: sendParts.map((entry) => ({ id: entry.part.id, quoteText: entry.quoteText })),
+        hold: holdParts.map((part) => ({ id: part.id, quoteText: false })),
+        sendParts,
+    };
+}
 /**
  * Collect renderable assistant parts from session messages as SessionChunks.
  * Each non-empty formatted part becomes one chunk. Caller can batch them
@@ -161,7 +264,19 @@ export function collectSessionChunks({ messages, skipPartIds, limit, }) {
             if (!content.trim()) {
                 continue;
             }
-            allChunks.push({ partIds: [part.id], content: content.trimEnd() });
+            const quote = shouldQuoteIntermediateTextPart({
+                part,
+                isLastInTurn: false,
+                nextToolName: nextToolNameAfter({
+                    parts: message.parts,
+                    fromIndex: message.parts.indexOf(part),
+                }),
+            });
+            allChunks.push({
+                partIds: [part.id],
+                content: (quote ? asDiscordQuote(content) : content).trimEnd(),
+                kind: sessionPartKind(part),
+            });
         }
     }
     if (limit !== undefined && allChunks.length > limit) {
@@ -180,19 +295,37 @@ export function batchChunksForDiscord(chunks) {
         return [];
     }
     const batched = [];
-    let current = { partIds: [...chunks[0].partIds], content: chunks[0].content };
+    let current = {
+        partIds: [...chunks[0].partIds],
+        content: chunks[0].content,
+        kind: chunks[0].kind,
+    };
     for (let i = 1; i < chunks.length; i++) {
         const next = chunks[i];
+        if (next.kind !== current.kind) {
+            batched.push(current);
+            current = {
+                partIds: [...next.partIds],
+                content: next.content,
+                kind: next.kind,
+            };
+            continue;
+        }
         const merged = current.content + '\n' + next.content;
         if (merged.length <= DISCORD_BATCH_MAX_LENGTH) {
             current = {
                 partIds: [...current.partIds, ...next.partIds],
                 content: merged,
+                kind: current.kind,
             };
         }
         else {
             batched.push(current);
-            current = { partIds: [...next.partIds], content: next.content };
+            current = {
+                partIds: [...next.partIds],
+                content: next.content,
+                kind: next.kind,
+            };
         }
     }
     batched.push(current);
@@ -323,22 +456,12 @@ export async function getFileAttachments(message) {
     }));
     return results.filter((r) => r !== null);
 }
-const MAX_BASH_COMMAND_INLINE_LENGTH = 100;
-/**
- * Format the inline title for a bash tool part. Handles three cases:
- * 1. Short single-line command → show full command
- * 2. Long/multiline command with description → show description
- * 3. Long/multiline command without description → truncate first line of command
- *
- * The description field was removed from the opencode v2 bash tool schema but
- * kimaki's system prompt instructs models to always send it as an extra field.
- * Case 3 is the fallback when a model omits it.
- */
-export function formatBashToolTitle({ command, description, stateTitle, }) {
-    if (!command && !description && !stateTitle)
+const MAX_BASH_COMMAND_INLINE_LENGTH = 50;
+export function formatBashToolTitle({ command, description, summary, stateTitle, }) {
+    const label = description || summary;
+    if (!command && !label && !stateTitle)
         return '';
     const isSingleLine = !command.includes('\n');
-    // Find first non-empty line to handle commands with leading blank lines
     const firstMeaningfulLine = command
         .split('\n')
         .find((line) => line.trim().length > 0)
@@ -346,8 +469,8 @@ export function formatBashToolTitle({ command, description, stateTitle, }) {
     if (command && isSingleLine && command.length <= MAX_BASH_COMMAND_INLINE_LENGTH) {
         return ` _${escapeInlineMarkdown(command)}_`;
     }
-    if (description) {
-        return ` _${escapeInlineMarkdown(description)}_`;
+    if (label) {
+        return ` _${escapeInlineMarkdown(label)}_`;
     }
     if (firstMeaningfulLine.length > 0) {
         const needsTruncation = firstMeaningfulLine.length > MAX_BASH_COMMAND_INLINE_LENGTH;
@@ -444,6 +567,21 @@ export function getToolSummaryText(part) {
         const prompt = part.state.input?.prompt || '';
         return prompt ? `*${escapeInlineMarkdown(prompt.slice(0, 60))}*` : '';
     }
+    // LESSON: tool parts are sent to Discord at `running` status (see
+    // shouldSendPart in thread-session-runtime), so `state.title` from the tool
+    // result is never rendered here. Everything shown must come from state.input.
+    // `until` is already absolute; `duration` is relative, so say "for 2h" —
+    // never "until 2h".
+    if (part.tool.endsWith('kimaki_sleep')) {
+        const until = part.state.input?.until || '';
+        const duration = part.state.input?.duration || '';
+        const reason = part.state.input?.reason || '';
+        const when = until ? `until ${until}` : duration ? `for ${duration}` : '';
+        const reasonText = reason ? `_${escapeInlineMarkdown(reason)}_` : '';
+        return [when && escapeInlineMarkdown(when), reasonText]
+            .filter(Boolean)
+            .join(' ');
+    }
     if (!part.state.input)
         return '';
     const inputFields = Object.entries(part.state.input)
@@ -470,23 +608,16 @@ export function formatTodoList(part) {
     const activeTodo = todos[activeIndex];
     if (activeIndex === -1 || !activeTodo)
         return '';
-    // digit-with-period ⒈-⒛ for 1-20, fallback to regular number for 21+
-    const digitWithPeriod = '⒈⒉⒊⒋⒌⒍⒎⒏⒐⒑⒒⒓⒔⒕⒖⒗⒘⒙⒚⒛';
     const todoNumber = activeIndex + 1;
-    const num = todoNumber <= 20 ? digitWithPeriod[todoNumber - 1] : `${todoNumber}.`;
     const content = activeTodo.content.charAt(0).toLowerCase() + activeTodo.content.slice(1);
-    return `${num} **${escapeInlineMarkdown(content)}**`;
+    return `${todoNumber}.  **${escapeInlineMarkdown(content)}**`;
 }
 export function formatTaskToolTitle(part) {
-    if (part.tool !== 'task' || part.state.status === 'pending')
-        return '';
-    const childSessionId = part.state.metadata?.sessionId;
-    if (typeof childSessionId !== 'string' || !childSessionId)
+    // Running only. The child session can be created later when many tasks queue.
+    if (part.tool !== 'task' || part.state.status !== 'running')
         return '';
     const description = part.state.input?.description;
-    const stateTitle = part.state.status === 'running' || part.state.status === 'completed'
-        ? part.state.title
-        : undefined;
+    const stateTitle = part.state.title;
     const title = typeof description === 'string' && description
         ? description
         : typeof stateTitle === 'string'
@@ -496,7 +627,7 @@ export function formatTaskToolTitle(part) {
         return '';
     const subagentType = part.state.input?.subagent_type;
     const agent = typeof subagentType === 'string' ? subagentType : 'task';
-    return `┣ ${escapeInlineMarkdown(agent)} **${escapeInlineMarkdown(title)}**`;
+    return `${TOOL_PREFIX}${escapeInlineMarkdown(agent)} **${escapeInlineMarkdown(title)}**`;
 }
 export function formatPart(part, prefix) {
     const pfx = prefix ? `${prefix} ⋅ ` : '';
@@ -504,24 +635,15 @@ export function formatPart(part, prefix) {
         const text = part.text?.trim();
         if (!text)
             return '';
-        // For subtask text, always use bullet with prefix
         if (prefix) {
-            return `⬥ ${pfx}${text}`;
+            return `${pfx}${text}`;
         }
-        const firstChar = text[0] || '';
-        const markdownStarters = ['#', '*', '_', '-', '>', '`', '[', '|'];
-        const startsWithMarkdown = markdownStarters.includes(firstChar) ||
-            /^\d+\./.test(text) ||
-            /^<callout[\s>]/i.test(text);
-        if (startsWithMarkdown) {
-            return `\n${text}`;
-        }
-        return `⬥ ${text}`;
+        return text;
     }
     if (part.type === 'reasoning') {
         if (!part.text?.trim())
             return '';
-        return `┣ ${pfx}thinking`;
+        return `${THINKING_PREFIX}${pfx}thinking`;
     }
     if (part.type === 'file') {
         return prefix
@@ -530,19 +652,20 @@ export function formatPart(part, prefix) {
     }
     if (part.type === 'step-start' ||
         part.type === 'step-finish' ||
-        part.type === 'patch') {
+        part.type === 'patch' ||
+        part.type === 'compaction') {
         return '';
     }
     if (part.type === 'agent') {
-        return `┣ ${pfx}agent ${part.id}`;
+        return `${TOOL_PREFIX}${pfx}agent ${part.id}`;
     }
     if (part.type === 'snapshot') {
-        return `┣ ${pfx}snapshot ${part.snapshot}`;
+        return `${TOOL_PREFIX}${pfx}snapshot ${part.snapshot}`;
     }
     if (part.type === 'tool') {
         if (part.tool === 'todowrite') {
             const formatted = formatTodoList(part);
-            return prefix && formatted ? `┣ ${pfx}${formatted}` : formatted;
+            return prefix && formatted ? `${TOOL_PREFIX}${pfx}${formatted}` : formatted;
         }
         // Question tool is handled via Discord dropdowns, not text
         if (part.tool === 'question') {
@@ -566,11 +689,13 @@ export function formatPart(part, prefix) {
             }
             const command = part.state.input?.command || '';
             const description = part.state.input?.description || '';
+            const summary = part.state.input?.summary || '';
             const toolTitle = formatBashToolTitle({
                 command,
                 description,
+                summary,
             });
-            return `┣ ${pfx}bash${toolTitle}`;
+            return `${TOOL_PREFIX}${pfx}bash${toolTitle}`;
         }
         const summaryText = getToolSummaryText(part);
         const stateTitle = 'title' in part.state ? part.state.title : undefined;
@@ -581,9 +706,11 @@ export function formatPart(part, prefix) {
         else if (part.tool === 'bash') {
             const command = part.state.input?.command || '';
             const description = part.state.input?.description || '';
+            const summary = part.state.input?.summary || '';
             const formatted = formatBashToolTitle({
                 command,
                 description,
+                summary,
                 stateTitle,
             });
             toolTitle = formatted.startsWith(' ') ? formatted.slice(1) : formatted;
@@ -598,14 +725,17 @@ export function formatPart(part, prefix) {
             if (part.tool === 'edit' ||
                 part.tool === 'write' ||
                 part.tool === 'apply_patch') {
-                return '◼︎';
+                return FILE_EDIT_PREFIX;
             }
-            return '┣';
+            return TOOL_PREFIX;
         })();
         const toolParts = [part.tool, toolTitle, summaryText]
             .filter(Boolean)
             .join(' ');
-        return `${icon} ${pfx}${toolParts}`;
+        if (icon === '⨯') {
+            return `${icon} ${pfx}${toolParts}`;
+        }
+        return `${icon}${pfx}${toolParts}`;
     }
     logger.warn('Unknown part type:', part);
     return '';