kimaki 0.4.47 → 0.4.48

package/dist/message-formatting.js

@@ -15,6 +15,67 @@ const logger = createLogger(LogPrefix.FORMATTING);
 function escapeInlineMarkdown(text) {
     return text.replace(/([*_~|`\\])/g, '\\$1');
 }
+/**
+ * Parses a patchText string (apply_patch format) and counts additions/deletions per file.
+ * Patch format uses `*** Add File:`, `*** Update File:`, `*** Delete File:` headers,
+ * with diff lines prefixed by `+` (addition) or `-` (deletion) inside `@@` hunks.
+ */
+function parsePatchCounts(patchText) {
+    const counts = new Map();
+    const lines = patchText.split('\n');
+    let currentFile = '';
+    let currentType = '';
+    let inHunk = false;
+    for (const line of lines) {
+        const addMatch = line.match(/^\*\*\* Add File:\s*(.+)/);
+        const updateMatch = line.match(/^\*\*\* Update File:\s*(.+)/);
+        const deleteMatch = line.match(/^\*\*\* Delete File:\s*(.+)/);
+        if (addMatch || updateMatch || deleteMatch) {
+            const match = addMatch || updateMatch || deleteMatch;
+            currentFile = (match?.[1] ?? '').trim();
+            currentType = addMatch ? 'add' : updateMatch ? 'update' : 'delete';
+            counts.set(currentFile, { additions: 0, deletions: 0 });
+            inHunk = false;
+            continue;
+        }
+        if (line.startsWith('@@')) {
+            inHunk = true;
+            continue;
+        }
+        if (line.startsWith('*** ')) {
+            inHunk = false;
+            continue;
+        }
+        if (!currentFile) {
+            continue;
+        }
+        const entry = counts.get(currentFile);
+        if (!entry) {
+            continue;
+        }
+        if (currentType === 'add') {
+            // all content lines in Add File are additions
+            if (line.length > 0 && !line.startsWith('*** ')) {
+                entry.additions++;
+            }
+        }
+        else if (currentType === 'delete') {
+            // all content lines in Delete File are deletions
+            if (line.length > 0 && !line.startsWith('*** ')) {
+                entry.deletions++;
+            }
+        }
+        else if (inHunk) {
+            if (line.startsWith('+')) {
+                entry.additions++;
+            }
+            else if (line.startsWith('-')) {
+                entry.deletions++;
+            }
+        }
+    }
+    return counts;
+}
 /**
  * Normalize whitespace: convert newlines to spaces and collapse consecutive spaces.
  */
@@ -132,59 +193,20 @@ export function getToolSummaryText(part) {
             : `(+${added}-${removed})`;
     }
     if (part.tool === 'apply_patch') {
-        const state = part.state;
-        const rawFiles = state.metadata?.files;
-        const partMetaFiles = part.metadata?.files;
-        const filesList = Array.isArray(rawFiles)
-            ? rawFiles
-            : Array.isArray(partMetaFiles)
-                ? partMetaFiles
-                : [];
-        const summarizeFiles = (files) => {
-            const summarized = files
-                .map((f) => {
-                if (!f) {
-                    return null;
-                }
-                if (typeof f === 'string') {
-                    const fileName = f.split('/').pop() || '';
-                    return fileName ? `*${escapeInlineMarkdown(fileName)}* (+0-0)` : `(+0-0)`;
-                }
-                if (typeof f !== 'object') {
-                    return null;
-                }
-                const file = f;
-                const pathStr = String(file.relativePath || file.filePath || file.path || '');
-                const fileName = pathStr.split('/').pop() || '';
-                const added = typeof file.additions === 'number' ? file.additions : 0;
-                const removed = typeof file.deletions === 'number' ? file.deletions : 0;
-                return fileName
-                    ? `*${escapeInlineMarkdown(fileName)}* (+${added}-${removed})`
-                    : `(+${added}-${removed})`;
-            })
-                .filter(Boolean)
-                .join(', ');
-            return summarized;
-        };
-        if (filesList.length > 0) {
-            const summarized = summarizeFiles(filesList);
-            if (summarized) {
-                return summarized;
-            }
-        }
-        const outputText = typeof state.output === 'string' ? state.output : '';
-        const outputLines = outputText.split('\n');
-        const updatedIndex = outputLines.findIndex((line) => line.startsWith('Success. Updated the following files:'));
-        if (updatedIndex !== -1) {
-            const fileLines = outputLines.slice(updatedIndex + 1).filter(Boolean);
-            if (fileLines.length > 0) {
-                const summarized = summarizeFiles(fileLines.map((line) => line.replace(/^[AMD]\s+/, '').trim()));
-                if (summarized) {
-                    return summarized;
-                }
-            }
+        // Only inputs are available when parts are sent during streaming (output/metadata not yet populated)
+        const patchText = part.state.input?.patchText || '';
+        if (!patchText) {
+            return '';
         }
-        return '';
+        const patchCounts = parsePatchCounts(patchText);
+        return [...patchCounts.entries()]
+            .map(([filePath, { additions, deletions }]) => {
+            const fileName = filePath.split('/').pop() || '';
+            return fileName
+                ? `*${escapeInlineMarkdown(fileName)}* (+${additions}-${deletions})`
+                : `(+${additions}-${deletions})`;
+        })
+            .join(', ');
     }
     if (part.tool === 'write') {
         const filePath = part.state.input?.filePath || '';

package/dist/opencode.js

@@ -32,30 +32,24 @@ async function getOpenPort() {
     });
 }
 async function waitForServer(port, maxAttempts = 30) {
+    const endpoint = `http://127.0.0.1:${port}/api/health`;
     for (let i = 0; i < maxAttempts; i++) {
-        const endpoints = [
-            `http://127.0.0.1:${port}/api/health`,
-            `http://127.0.0.1:${port}/`,
-            `http://127.0.0.1:${port}/api`,
-        ];
-        for (const endpoint of endpoints) {
-            const response = await errore.tryAsync({
-                try: () => fetch(endpoint),
-                catch: (e) => new FetchError({ url: endpoint, cause: e }),
-            });
-            if (response instanceof Error) {
-                // Connection refused or other transient errors - continue polling
-                opencodeLogger.debug(`Server polling attempt failed: ${response.message}`);
-                continue;
-            }
-            if (response.status < 500) {
-                return true;
-            }
-            const body = await response.text();
-            // Fatal errors that won't resolve with retrying
-            if (body.includes('BunInstallFailedError')) {
-                return new ServerStartError({ port, reason: body.slice(0, 200) });
-            }
+        const response = await errore.tryAsync({
+            try: () => fetch(endpoint),
+            catch: (e) => new FetchError({ url: endpoint, cause: e }),
+        });
+        if (response instanceof Error) {
+            // Connection refused or other transient errors - continue polling
+            await new Promise((resolve) => setTimeout(resolve, 1000));
+            continue;
+        }
+        if (response.status < 500) {
+            return true;
+        }
+        const body = await response.text();
+        // Fatal errors that won't resolve with retrying
+        if (body.includes('BunInstallFailedError')) {
+            return new ServerStartError({ port, reason: body.slice(0, 200) });
         }
         await new Promise((resolve) => setTimeout(resolve, 1000));
     }

package/dist/session-handler.js

@@ -56,6 +56,7 @@ export async function abortAndRetrySession({ sessionId, thread, projectDirectory
     }
     sessionLogger.log(`[ABORT+RETRY] Aborting session ${sessionId} for model change`);
     // Abort with special reason so we don't show "completed" message
+    sessionLogger.log(`[ABORT] reason=model-change sessionId=${sessionId} - user changed model mid-request, will retry with new model`);
     controller.abort(new Error('model-change'));
     // Also call the API abort endpoint
     const getClient = await initializeOpencodeForDirectory(projectDirectory);
@@ -63,11 +64,12 @@ export async function abortAndRetrySession({ sessionId, thread, projectDirectory
         sessionLogger.error(`[ABORT+RETRY] Failed to initialize OpenCode client:`, getClient.message);
         return false;
     }
+    sessionLogger.log(`[ABORT-API] reason=model-change sessionId=${sessionId} - sending API abort for model change retry`);
     const abortResult = await errore.tryAsync(() => {
         return getClient().session.abort({ path: { id: sessionId } });
     });
     if (abortResult instanceof Error) {
-        sessionLogger.log(`[ABORT+RETRY] API abort call failed (may already be done):`, abortResult);
+        sessionLogger.log(`[ABORT-API] API abort call failed (may already be done):`, abortResult);
     }
     // Small delay to let the abort propagate
     await new Promise((resolve) => {
@@ -176,7 +178,9 @@ export async function handleOpencodeSession({ prompt, thread, projectDirectory,
     const existingController = abortControllers.get(session.id);
     if (existingController) {
         voiceLogger.log(`[ABORT] Cancelling existing request for session: ${session.id}`);
+        sessionLogger.log(`[ABORT] reason=new-request sessionId=${session.id} threadId=${thread.id} - new user message arrived while previous request was still running`);
         existingController.abort(new Error('New request started'));
+        sessionLogger.log(`[ABORT-API] reason=new-request sessionId=${session.id} - sending API abort because new message arrived`);
         const abortResult = await errore.tryAsync(() => {
             return getClient().session.abort({
                 path: { id: session.id },
@@ -184,7 +188,7 @@ export async function handleOpencodeSession({ prompt, thread, projectDirectory,
             });
         });
         if (abortResult instanceof Error) {
-            sessionLogger.log(`[ABORT] Server abort failed (may be already done):`, abortResult);
+            sessionLogger.log(`[ABORT-API] Server abort failed (may be already done):`, abortResult);
         }
     }
     // Auto-reject ALL pending permissions for this thread
@@ -277,6 +281,9 @@ export async function handleOpencodeSession({ prompt, thread, projectDirectory,
     let assistantMessageId;
     let handlerPromise = null;
     let typingInterval = null;
+    let hasSentParts = false;
+    let promptResolved = false;
+    let hasReceivedEvent = false;
     function startTyping() {
         if (abortController.signal.aborted) {
             discordLogger.log(`Not starting typing, already aborted`);
@@ -313,12 +320,14 @@ export async function handleOpencodeSession({ prompt, thread, projectDirectory,
             }
         };
     }
-    // Get verbosity setting for this channel (use parent channel for threads)
+    // Read verbosity dynamically so mid-session /verbosity changes take effect immediately
     const verbosityChannelId = channelId || thread.parentId || thread.id;
-    const verbosity = getChannelVerbosity(verbosityChannelId);
+    const getVerbosity = () => {
+        return getChannelVerbosity(verbosityChannelId);
+    };
     const sendPartMessage = async (part) => {
         // In text-only mode, only send text parts (the ⬥ diamond messages)
-        if (verbosity === 'text-only' && part.type !== 'text') {
+        if (getVerbosity() === 'text-only' && part.type !== 'text') {
             return;
         }
         const content = formatPart(part) + '\n\n';
@@ -336,6 +345,7 @@ export async function handleOpencodeSession({ prompt, thread, projectDirectory,
             discordLogger.error(`ERROR: Failed to send part ${part.id}:`, sendResult);
             return;
         }
+        hasSentParts = true;
         sentPartIds.add(part.id);
         getDatabase()
             .prepare('INSERT OR REPLACE INTO part_messages (part_id, message_id, thread_id) VALUES (?, ?, ?)')
@@ -392,6 +402,7 @@ export async function handleOpencodeSession({ prompt, thread, projectDirectory,
             if (msg.sessionID !== session.id) {
                 return;
             }
+            hasReceivedEvent = true;
             if (msg.role !== 'assistant') {
                 return;
             }
@@ -477,7 +488,7 @@ export async function handleOpencodeSession({ prompt, thread, projectDirectory,
                         const label = `${agent}-${agentSpawnCounts[agent]}`;
                         subtaskSessions.set(childSessionId, { label, assistantMessageId: undefined });
                         // Skip task messages in text-only mode
-                        if (verbosity !== 'text-only') {
+                        if (getVerbosity() !== 'text-only') {
                             const taskDisplay = `┣ task **${label}** _${description}_`;
                             await sendThreadMessage(thread, taskDisplay + '\n\n');
                         }
@@ -486,7 +497,7 @@ export async function handleOpencodeSession({ prompt, thread, projectDirectory,
                 }
                 return;
             }
-            if (part.type === 'tool' && part.state.status === 'completed') {
+            if (part.type === 'tool' && part.state.status === 'completed' && getVerbosity() !== 'text-only') {
                 const output = part.state.output || '';
                 const outputTokens = Math.ceil(output.length / 4);
                 const largeOutputThreshold = 3000;
@@ -532,7 +543,7 @@ export async function handleOpencodeSession({ prompt, thread, projectDirectory,
         };
         const handleSubtaskPart = async (part, subtaskInfo) => {
             // In text-only mode, skip all subtask output (they're tool-related)
-            if (verbosity === 'text-only') {
+            if (getVerbosity() === 'text-only') {
                 return;
             }
             if (part.type === 'step-start' || part.type === 'step-finish') {
@@ -599,10 +610,15 @@ export async function handleOpencodeSession({ prompt, thread, projectDirectory,
             }
         };
         const handlePermissionAsked = async (permission) => {
-            if (permission.sessionID !== session.id) {
-                voiceLogger.log(`[PERMISSION IGNORED] Permission for different session (expected: ${session.id}, got: ${permission.sessionID})`);
+            const isMainSession = permission.sessionID === session.id;
+            const isSubtaskSession = subtaskSessions.has(permission.sessionID);
+            if (!isMainSession && !isSubtaskSession) {
+                voiceLogger.log(`[PERMISSION IGNORED] Permission for unknown session (expected: ${session.id} or subtask, got: ${permission.sessionID})`);
                 return;
             }
+            const subtaskLabel = isSubtaskSession
+                ? subtaskSessions.get(permission.sessionID)?.label
+                : undefined;
             const dedupeKey = buildPermissionDedupeKey({ permission, directory });
             const threadPermissions = pendingPermissions.get(thread.id);
             const existingPending = threadPermissions
@@ -635,7 +651,7 @@ export async function handleOpencodeSession({ prompt, thread, projectDirectory,
                 }
                 return;
             }
-            sessionLogger.log(`Permission requested: permission=${permission.permission}, patterns=${permission.patterns.join(', ')}`);
+            sessionLogger.log(`Permission requested: permission=${permission.permission}, patterns=${permission.patterns.join(', ')}${subtaskLabel ? `, subtask=${subtaskLabel}` : ''}`);
             if (stopTyping) {
                 stopTyping();
                 stopTyping = null;
@@ -644,6 +660,7 @@ export async function handleOpencodeSession({ prompt, thread, projectDirectory,
                 thread,
                 permission,
                 directory,
+                subtaskLabel,
             });
             if (!pendingPermissions.has(thread.id)) {
                 pendingPermissions.set(thread.id, new Map());
@@ -657,7 +674,9 @@ export async function handleOpencodeSession({ prompt, thread, projectDirectory,
             });
         };
         const handlePermissionReplied = ({ requestID, reply, sessionID, }) => {
-            if (sessionID !== session.id) {
+            const isMainSession = sessionID === session.id;
+            const isSubtaskSession = subtaskSessions.has(sessionID);
+            if (!isMainSession && !isSubtaskSession) {
                 return;
             }
             sessionLogger.log(`Permission ${requestID} replied with: ${reply}`);
@@ -707,10 +726,11 @@ export async function handleOpencodeSession({ prompt, thread, projectDirectory,
             sessionLogger.log(`[QUEUE] Question shown but queue has messages, processing from ${nextMessage.username}`);
             await sendThreadMessage(thread, `» **${nextMessage.username}:** ${nextMessage.prompt.slice(0, 150)}${nextMessage.prompt.length > 150 ? '...' : ''}`);
             setImmediate(() => {
+                const prefixedPrompt = `<discord-user name="${nextMessage.username}" />\n${nextMessage.prompt}`;
                 void errore
                     .tryAsync(async () => {
                     return handleOpencodeSession({
-                        prompt: nextMessage.prompt,
+                        prompt: prefixedPrompt,
                         thread,
                         projectDirectory: directory,
                         images: nextMessage.images,
@@ -755,14 +775,12 @@ export async function handleOpencodeSession({ prompt, thread, projectDirectory,
         };
         const handleSessionIdle = (idleSessionId) => {
             if (idleSessionId === session.id) {
-                // Ignore stale session.idle events - if we haven't received any content yet
-                // (no assistantMessageId set), this is likely a stale event from before
-                // the prompt was sent or from a previous request's subscription state.
-                if (!assistantMessageId) {
-                    sessionLogger.log(`[SESSION IDLE] Ignoring stale idle event for ${session.id} (no content received yet)`);
+                if (!promptResolved || !hasReceivedEvent) {
+                    sessionLogger.log(`[SESSION IDLE] Ignoring idle event for ${session.id} (prompt not resolved or no events yet)`);
                     return;
                 }
-                sessionLogger.log(`[SESSION IDLE] Session ${session.id} is idle, aborting`);
+                sessionLogger.log(`[SESSION IDLE] Session ${session.id} is idle, ending stream`);
+                sessionLogger.log(`[ABORT] reason=finished sessionId=${session.id} threadId=${thread.id} - session completed normally, received idle event after prompt resolved`);
                 abortController.abort(new Error('finished'));
                 return;
             }
@@ -884,8 +902,9 @@ export async function handleOpencodeSession({ prompt, thread, projectDirectory,
                     // Send the queued message as a new prompt (recursive call)
                     // Use setImmediate to avoid blocking and allow this finally to complete
                     setImmediate(() => {
+                        const prefixedPrompt = `<discord-user name="${nextMessage.username}" />\n${nextMessage.prompt}`;
                         handleOpencodeSession({
-                            prompt: nextMessage.prompt,
+                            prompt: prefixedPrompt,
                             thread,
                             projectDirectory,
                             images: nextMessage.images,
@@ -960,6 +979,7 @@ export async function handleOpencodeSession({ prompt, thread, projectDirectory,
                 mainRepoDirectory: worktreeInfo.project_directory,
             }
             : undefined;
+        hasSentParts = false;
         const response = command
             ? await getClient().session.command({
                 path: { id: session.id },
@@ -997,7 +1017,7 @@ export async function handleOpencodeSession({ prompt, thread, projectDirectory,
             })();
             throw new Error(`OpenCode API error (${response.response.status}): ${errorMessage}`);
         }
-        abortController.abort(new Error('finished'));
+        promptResolved = true;
         sessionLogger.log(`Successfully sent prompt, got response`);
         if (originalMessage) {
             const reactionResult = await errore.tryAsync(async () => {
@@ -1026,6 +1046,7 @@ export async function handleOpencodeSession({ prompt, thread, projectDirectory,
         return;
     }
     sessionLogger.error(`ERROR: Failed to send prompt:`, promptError);
+    sessionLogger.log(`[ABORT] reason=error sessionId=${session.id} threadId=${thread.id} - prompt failed with error: ${promptError.message}`);
     abortController.abort(new Error('error'));
     if (originalMessage) {
         const reactionResult = await errore.tryAsync(async () => {

package/dist/system-message.js

@@ -111,19 +111,21 @@ headings are discouraged anyway. instead try to use bold text for titles which r
 
 you can create diagrams wrapping them in code blocks.
 
-## ending conversations with options
+## proactivity
 
-IMPORTANT: At the end of each response, especially after completing a task or presenting a plan, use the question tool to offer the user clear options for what to do next.
+Be proactive. When the user asks you to do something, do it. Do NOT stop to ask for confirmation.
 
-IMPORTANT: The question tool must be called last, after all text parts. If it is called before your final text response, the user will not see the text.
+Only ask questions when the request is genuinely ambiguous with multiple valid approaches, or the action is destructive and irreversible.
 
-Examples:
-- After showing a plan: offer "Start implementing?" with Yes/No options
-- After completing edits: offer "Commit changes?" with Yes/No options
-- After debugging: offer "How to proceed?" with options like "Apply fix", "Investigate further", "Try different approach"
+## ending conversations with options
 
-The user can always select "Other" to type a custom response if the provided options don't fit their needs, or if the plan needs updating.
+After **completing** a task, use the question tool to offer follow-up options. The question tool must be called last, after all text parts.
 
-This makes the interaction more guided and reduces friction for the user.
+IMPORTANT: Do NOT use the question tool to ask permission before doing work. Do the work first, then offer follow-ups.
+
+Examples:
+- After completing edits: offer "Commit changes?" or "Run tests?"
+- After debugging: offer "Apply fix", "Investigate further", "Try different approach"
+- After a genuinely ambiguous request where you cannot infer intent: offer the different approaches
 `;
 }

package/dist/tools.js

@@ -289,6 +289,7 @@ export async function getTools({ onMessageCompleted, directory, }) {
             }),
             execute: async ({ sessionId }) => {
                 try {
+                    toolsLogger.log(`[ABORT] reason=voice-tool sessionId=${sessionId} - user requested abort via voice assistant tool`);
                     const result = await getClient().session.abort({
                         path: { id: sessionId },
                     });

package/dist/utils.js

@@ -50,6 +50,7 @@ export function isAbortError(error, signal) {
             error.name === 'Aborterror' ||
             error.name === 'aborterror' ||
             error.name.toLowerCase() === 'aborterror' ||
+            error.name === 'MessageAbortedError' ||
             error.message?.includes('aborted') ||
             (signal?.aborted ?? false))) ||
         (error instanceof DOMException && error.name === 'AbortError'));

package/package.json

@@ -2,7 +2,7 @@
   "name": "kimaki",
   "module": "index.ts",
   "type": "module",
-  "version": "0.4.47",
+  "version": "0.4.48",
   "repository": "https://github.com/remorses/kimaki",
   "bin": "bin.js",
   "files": [
@@ -20,7 +20,7 @@
     "tsx": "^4.20.5"
   },
   "dependencies": {
-    "@clack/prompts": "^0.11.0",
+    "@clack/prompts": "^1.0.0",
     "@discordjs/voice": "^0.19.0",
     "@google/genai": "^1.34.0",
     "@opencode-ai/sdk": "^1.1.31",
@@ -41,7 +41,7 @@
     "string-dedent": "^3.0.2",
     "undici": "^7.16.0",
     "zod": "^4.2.1",
-    "errore": "^0.9.0"
+    "errore": "^0.10.0"
   },
   "optionalDependencies": {
     "@discordjs/opus": "^0.10.0",