kimaki 0.24.0 → 0.26.0

package/dist/session-handler/thread-session-runtime.js

@@ -16,8 +16,8 @@ import { isAbortError } from '../utils.js';
 import { registerEventListener, unregisterEventListener, waitForGlobalEventListener, } from './global-event-listener.js';
 import { createLogger, LogPrefix } from '../logger.js';
 import { sendThreadMessage, SILENT_MESSAGE_FLAGS, NOTIFY_MESSAGE_FLAGS, } from '../discord-utils.js';
-import { formatPart } from '../message-formatting.js';
-import { getChannelVerbosity, getPartMessageIds, getDb, setPartMessage, getThreadSession, setThreadSession, getThreadParentSessionId, setThreadParentSessionId, getThreadWorktreeOrWorkspace, setSessionAgent, clearSessionModel, getVariantCascade, setSessionStartSource, appendSessionEventsSinceLastTimestamp, getSessionEventSnapshot, } from '../database.js';
+import { formatPart, formatTaskToolTitle } from '../message-formatting.js';
+import { getChannelVerbosity, getPartMessageIds, getDb, setPartMessage, getThreadSession, setThreadSession, getThreadParentSessionId, setThreadParentSessionId, getThreadWorktreeOrWorkspace, setSessionAgent, clearSessionModel, getVariantCascade, setSessionStartSource, completeScheduledTaskRunsForSession, failScheduledTaskRunsForSession, startScheduledTaskRunSession, appendSessionEventsSinceLastTimestamp, getSessionEventSnapshot, } from '../database.js';
 import * as orm from 'drizzle-orm';
 import * as schema from '../schema.js';
 import { showPermissionButtons, addPermissionRequestToContext, arePatternsCoveredBy, pendingPermissionContexts, } from '../commands/permissions.js';
@@ -30,7 +30,7 @@ import { getDataDir } from '../config.js';
 import { trackEvent, } from '../analytics.js';
 import { resolveValidatedAgentPreference } from './agent-utils.js';
 import { appendOpencodeSessionEventLog, getOpencodeEventSessionId, isOpencodeSessionEventLogEnabled, } from './opencode-session-event-log.js';
-import { doesLatestUserTurnHaveNaturalCompletion, didQuestionQueueHandoffSinceLatestQuestionAsked, getAssistantMessageIdsForLatestUserTurn, getCurrentTurnStartTime, isSessionBusy, getLatestRunInfo, getDerivedSubtaskIndex, getDerivedSubtaskAgentType, getLatestAssistantMessageIdForLatestUserTurn, hasAssistantMessageCompletedBefore, isAssistantMessageInLatestUserTurn, isAssistantMessageNaturalCompletion, } from './event-stream-state.js';
+import { doesLatestUserTurnHaveNaturalCompletion, didQuestionQueueHandoffSinceLatestQuestionAsked, getAssistantMessageIdsForLatestUserTurn, getCurrentTurnStartTime, isSessionBusy, getLatestRunInfo, getIdleTokenUsageDelta, getDerivedSubtaskIndex, getDerivedSubtaskAgentType, getLatestAssistantMessageIdForLatestUserTurn, hasAssistantMessageCompletedBefore, isAssistantMessageInLatestUserTurn, isAssistantMessageNaturalCompletion, } from './event-stream-state.js';
 // Track multiple pending permissions per thread (keyed by permission ID).
 // OpenCode handles blocking/sequencing — we just need to track all pending
 // permissions to avoid duplicates and properly clean up on reply/teardown.
@@ -949,9 +949,20 @@ export class ThreadSessionRuntime {
                 await this.handlePartUpdated(event.properties.part);
                 break;
             case 'session.idle':
+                await completeScheduledTaskRunsForSession(event.properties.sessionID);
                 await this.handleSessionIdle(event.properties.sessionID);
                 break;
             case 'session.error':
+                if (event.properties.sessionID) {
+                    const sessionError = event.properties.error;
+                    const errorMessage = sessionError && typeof sessionError === 'object'
+                        ? String(sessionError.data?.message || sessionError.name || 'Session failed')
+                        : 'Session failed';
+                    await failScheduledTaskRunsForSession({
+                        sessionId: event.properties.sessionID,
+                        error: errorMessage,
+                    });
+                }
                 await this.handleSessionError(event.properties);
                 break;
             case 'permission.asked':
@@ -1433,6 +1444,35 @@ export class ThreadSessionRuntime {
             this.ensureTypingNow();
             return;
         }
+        if (part.type === 'tool' &&
+            part.tool === 'task' &&
+            !this.state?.sentPartIds.has(part.id)) {
+            const taskDisplay = formatTaskToolTitle(part);
+            if (taskDisplay && (await this.getVerbosity()) !== 'text_only') {
+                await this.flushBufferedParts({
+                    messageID: part.messageID,
+                    force: true,
+                    skipPartId: part.id,
+                });
+                threadState.updateThread(this.threadId, (t) => {
+                    const newIds = new Set(t.sentPartIds);
+                    newIds.add(part.id);
+                    return { ...t, sentPartIds: newIds };
+                });
+                const sendResult = await sendThreadMessage(this.thread, taskDisplay + '\n\n')
+                    .catch((e) => new DiscordOperationError({ operation: 'sendMessage', cause: e }));
+                if (sendResult instanceof Error) {
+                    threadState.updateThread(this.threadId, (t) => {
+                        const newIds = new Set(t.sentPartIds);
+                        newIds.delete(part.id);
+                        return { ...t, sentPartIds: newIds };
+                    });
+                    discordLogger.error(`ERROR: Failed to send task part ${part.id}:`, sendResult);
+                    return;
+                }
+                await setPartMessage({ partId: part.id, messageId: sendResult.id, threadId: this.thread.id });
+            }
+        }
         if (part.type === 'tool' && part.state.status === 'running') {
             await this.flushBufferedParts({
                 messageID: part.messageID,
@@ -1440,40 +1480,6 @@ export class ThreadSessionRuntime {
                 skipPartId: part.id,
             });
             await this.sendPartMessage({ part });
-            // Track task tool spawning subtask sessions
-            if (part.tool === 'task' && !this.state?.sentPartIds.has(part.id)) {
-                const description = typeof part.state.input?.description === 'string'
-                    ? part.state.input.description
-                    : '';
-                const agent = typeof part.state.input?.subagent_type === 'string'
-                    ? part.state.input.subagent_type
-                    : 'task';
-                const childSessionId = typeof part.state.metadata?.sessionId === 'string'
-                    ? part.state.metadata.sessionId
-                    : '';
-                if (description && childSessionId) {
-                    if ((await this.getVerbosity()) !== 'text_only') {
-                        const taskDisplay = `┣ ${agent} **${description}**`;
-                        threadState.updateThread(this.threadId, (t) => {
-                            const newIds = new Set(t.sentPartIds);
-                            newIds.add(part.id);
-                            return { ...t, sentPartIds: newIds };
-                        });
-                        const sendResult = await sendThreadMessage(this.thread, taskDisplay + '\n\n')
-                            .catch((e) => new DiscordOperationError({ operation: 'sendMessage', cause: e }));
-                        if (sendResult instanceof Error) {
-                            threadState.updateThread(this.threadId, (t) => {
-                                const newIds = new Set(t.sentPartIds);
-                                newIds.delete(part.id);
-                                return { ...t, sentPartIds: newIds };
-                            });
-                            discordLogger.error(`ERROR: Failed to send task part ${part.id}:`, sendResult);
-                            return;
-                        }
-                        await setPartMessage({ partId: part.id, messageId: sendResult.id, threadId: this.thread.id });
-                    }
-                }
-            }
             return;
         }
         // Action buttons tool handler
@@ -1637,7 +1643,47 @@ export class ThreadSessionRuntime {
         await setPartMessage({ partId: part.id, messageId: sendResult.id, threadId: this.thread.id });
         this.requestTypingRepulse();
     }
+    trackIdleTokenUsage(idleSessionId) {
+        let idleEventIndex;
+        for (let i = this.eventBuffer.length - 1; i >= 0; i--) {
+            const event = this.eventBuffer[i]?.event;
+            if (event?.type === 'session.idle' && event.properties.sessionID === idleSessionId) {
+                idleEventIndex = i;
+                break;
+            }
+        }
+        if (idleEventIndex === undefined) {
+            return;
+        }
+        const usage = getIdleTokenUsageDelta({
+            events: this.eventBuffer,
+            sessionId: idleSessionId,
+            idleEventIndex,
+        });
+        if (!usage) {
+            return;
+        }
+        const properties = {
+            tokens_input: usage.input,
+            tokens_output: usage.output,
+            tokens_reasoning: usage.reasoning,
+            tokens_cache_read: usage.cacheRead,
+            tokens_cache_write: usage.cacheWrite,
+            tokens_total: usage.total,
+            cost: usage.cost,
+            assistant_message_count: usage.assistantMessageCount,
+            is_subagent: Boolean(this.getSubtaskInfoForSession(idleSessionId)),
+        };
+        if (usage.model) {
+            properties.model = usage.model;
+        }
+        if (usage.providerID) {
+            properties.provider = usage.providerID;
+        }
+        trackEvent('tokens_used', properties);
+    }
     async handleSessionIdle(idleSessionId) {
+        this.trackIdleTokenUsage(idleSessionId);
         const sessionId = this.state?.sessionId;
         // ── Subtask idle ──────────────────────────────────────────
         const subtask = this.getSubtaskInfoForSession(idleSessionId);
@@ -2122,7 +2168,6 @@ export class ThreadSessionRuntime {
                 prompt: input.prompt,
                 agent: input.agent,
                 permissions: input.permissions,
-                permissionRules: input.permissionRules,
                 injectionGuardPatterns: input.injectionGuardPatterns,
                 sessionStartScheduleKind: input.sessionStartSource?.scheduleKind,
                 sessionStartScheduledTaskId: input.sessionStartSource?.scheduledTaskId,
@@ -2137,7 +2182,6 @@ export class ThreadSessionRuntime {
                 sessionId: session.id,
                 createdNewSession,
                 permissions: input.permissions,
-                permissionRules: input.permissionRules,
             });
             if (updatePermissionsResult instanceof Error) {
                 await cleanupOnError(`Failed to update session permissions: ${updatePermissionsResult.message}`);
@@ -2333,6 +2377,13 @@ export class ThreadSessionRuntime {
                 await cleanupOnError(`✗ OpenCode API error: ${errorMessage}`);
                 return;
             }
+            if (input.sessionStartSource?.scheduledTaskRunId) {
+                await startScheduledTaskRunSession({
+                    runId: input.sessionStartSource.scheduledTaskRunId,
+                    sessionId: session.id,
+                    projectDirectory: this.sdkDirectory,
+                });
+            }
             logger.log(`[INGRESS] promptAsync accepted by opencode queue sessionId=${session.id} threadId=${this.threadId}`);
             if (!input.noReply) {
                 trackTurnStarted({
@@ -2369,7 +2420,6 @@ export class ThreadSessionRuntime {
             agent: input.agent,
             model: input.model,
             permissions: input.permissions,
-            permissionRules: input.permissionRules,
             injectionGuardPatterns: input.injectionGuardPatterns,
             parentSessionId: input.parentSessionId,
             sourceMessageId: input.sourceMessageId,
@@ -2505,10 +2555,6 @@ export class ThreadSessionRuntime {
                     // no explicit agent was already set (CLI --agent flag wins).
                     agent: input.agent || result.agent,
                     repliedMessage: result.repliedMessage,
-                    permissionRules: [
-                        ...(input.permissionRules ?? []),
-                        ...(result.permissionRules ?? []),
-                    ],
                     preprocess: undefined,
                 });
                 const hasPromptText = resolvedInput.prompt.trim().length > 0;
@@ -2753,7 +2799,6 @@ export class ThreadSessionRuntime {
             prompt: input.prompt,
             agent: input.agent,
             permissions: input.permissions,
-            permissionRules: input.permissionRules,
             injectionGuardPatterns: input.injectionGuardPatterns,
             sessionStartScheduleKind: input.sessionStartScheduleKind,
             sessionStartScheduledTaskId: input.sessionStartScheduledTaskId,
@@ -2772,7 +2817,6 @@ export class ThreadSessionRuntime {
             sessionId: session.id,
             createdNewSession,
             permissions: input.permissions,
-            permissionRules: input.permissionRules,
         });
         if (updatePermissionsResult instanceof Error) {
             this.stopTyping();
@@ -3132,14 +3176,11 @@ export class ThreadSessionRuntime {
     }
     // ── Session Ensure ──────────────────────────────────────────
     // Creates or reuses the OpenCode session for this thread.
-    async updateExistingSessionPermissions({ client, sessionId, createdNewSession, permissions, permissionRules, }) {
+    async updateExistingSessionPermissions({ client, sessionId, createdNewSession, permissions, }) {
         if (createdNewSession) {
             return null;
         }
-        const rules = [
-            ...(permissionRules ?? []),
-            ...parsePermissionRules(permissions ?? []),
-        ];
+        const rules = parsePermissionRules(permissions ?? []);
         if (rules.length === 0) {
             return null;
         }
@@ -3154,7 +3195,7 @@ export class ThreadSessionRuntime {
         }
         return null;
     }
-    async ensureSession({ prompt, agent, permissions, permissionRules, injectionGuardPatterns, sessionStartScheduleKind, sessionStartScheduledTaskId, }) {
+    async ensureSession({ prompt, agent, permissions, injectionGuardPatterns, sessionStartScheduleKind, sessionStartScheduledTaskId, }) {
         const directory = this.sdkDirectory;
         // Resolve worktree info for server initialization
         const workspaceInfo = await getThreadWorktreeOrWorkspace(this.thread.id);
@@ -3195,10 +3236,8 @@ export class ThreadSessionRuntime {
             }
         }
         if (!session) {
-            // Pass per-session external_directory permissions so this session can
-            // access its own project directory (and worktree origin if applicable)
-            // without prompts. These override the server-level 'ask' default via
-            // opencode's findLast() rule evaluation.
+            // Pass per-session external_directory permissions. By default this is a
+            // single allow-everything rule plus the worktree-origin deny rule.
             // CLI --permission rules are appended after base rules so they win
             // via opencode's findLast() evaluation.
             const sessionPermissions = [
@@ -3206,7 +3245,6 @@ export class ThreadSessionRuntime {
                     directory: this.sdkDirectory,
                     originalRepoDirectory,
                 }),
-                ...(permissionRules ?? []),
                 ...parsePermissionRules(permissions ?? []),
             ];
             // Omit title so OpenCode auto-generates a summary from the conversation

package/dist/store.js

@@ -13,6 +13,7 @@ export const store = createStore(() => ({
     disabledSkills: [],
     allowedMentions: ['users'],
     allowAllUsers: false,
+    restrictExternalDirectories: false,
     permissionTimeoutMs: 10 * 60 * 1000,
     useWorktrees: false,
     autoUpgradeEnabled: true,

package/dist/subagent-rate-limit-plugin.js

@@ -10,6 +10,9 @@ const RATE_LIMIT_TEXT_PATTERNS = [
     'retry after',
     'too many requests',
     'quota exceeded',
+    'balance exhausted',
+    'spending-limit',
+    'run out of credits',
 ];
 function isRateLimitText(text) {
     if (!text) {
@@ -66,7 +69,7 @@ function extractRateLimitReason(event) {
     }
     if (event.type === 'message.part.updated' && event.properties.part.type === 'retry') {
         const retryError = event.properties.part.error;
-        if (retryError.data.statusCode === 429) {
+        if (retryError.data.statusCode === 429 || retryError.data.statusCode === 402) {
             return retryError.data.message;
         }
         if (isRateLimitText(retryError.data.responseBody)) {
@@ -90,9 +93,17 @@ function extractRateLimitReason(event) {
     if (!apiError) {
         return undefined;
     }
-    if (apiError.statusCode === 429) {
+    if (apiError.statusCode === 429 || apiError.statusCode === 402) {
         return apiError.message;
     }
+    // xAI returns 403 with spending-limit or run out of credits text.
+    // Only treat 403 as a usage limit if the body matches specific patterns,
+    // not all 403s (which can be auth errors handled elsewhere).
+    if (apiError.statusCode === 403) {
+        const errorText = [apiError.message, apiError.responseBody].filter(Boolean).join(' ');
+        if (isRateLimitText(errorText))
+            return apiError.message;
+    }
     if (isRateLimitText(apiError.responseBody)) {
         return apiError.responseBody;
     }

package/dist/system-message.js

@@ -374,7 +374,8 @@ see --help for options like voice, speed, etc.
 
 ## requesting files from the user
 
-To ask the user to upload files from their device, use the \`kimaki_file_upload\` tool. This shows a native file picker dialog in Discord. The files are downloaded to the project's \`uploads/\` directory and the tool returns the local file paths.
+To ask the user to upload files from their device, use \`kimaki_file_upload\`. This shows a native file picker dialog in Discord. The files are downloaded to the project's \`uploads/\` directory and the tool returns the local file paths.
+You MUST call \`kimaki_file_upload\` LAST, after ALL text.
 
 ## archiving the current thread
 
@@ -492,6 +493,10 @@ Use \`--send-at\` to schedule a one-time or recurring task:
 kimaki send --channel ${channelId} --prompt 'Reminder: review open PRs' --send-at '2026-03-01T09:00:00Z' --agent <current_agent>${parentSessionArg}${userArg}
 kimaki send --channel ${channelId} --prompt 'Run weekly test suite and summarize failures' --send-at '0 9 * * 1' --agent <current_agent>${parentSessionArg}${userArg}
 
+Use \`--pre-run '<command>'\` to check whether a scheduled task should start. Kimaki runs the command in the project directory. Exit code 0 starts the session and appends stdout to the prompt. Any other exit code skips that occurrence. Command output is written to the Kimaki log.
+
+Scheduled tasks do not overlap by default. Add \`--allow-concurrency\` only when concurrent sessions from the same task are safe.
+
 **ALWAYS pass \`--user\` when scheduling a task.** Discord only shows a thread in the left sidebar to its members. Without \`--user\`, kimaki does not ensure anyone is a member, so the task can fire completely unnoticed if the user never joined the thread or already left it. This applies to \`--channel\` and \`--thread\` scheduling alike.
 
 ALL scheduling is in UTC. Dates must be UTC ISO format ending with \`Z\`. Cron expressions also fire in UTC (e.g. \`0 9 * * 1\` means 9:00 UTC every Monday).
@@ -501,6 +506,8 @@ When the user specifies a time without a timezone, ask them to confirm their tim
 - \`--notify-only\` to create a reminder thread without auto-starting a session
 - \`--worktree\` to create the scheduled thread as a worktree session (only if the user explicitly asks for a worktree)
 - \`--agent\` and \`--model\` to control scheduled session behavior
+- \`--pre-run\` to start only when a project command exits with code 0
+- \`--allow-concurrency\` to permit overlapping runs from the same task
 - \`--parent-session\` to pass this session as parent of the scheduled child
 - \`--user\` to add a specific user to the scheduled thread (always pass this)
 
@@ -534,7 +541,7 @@ Notification strategy:
 Manage scheduled tasks with:
 
 kimaki task list
-kimaki task edit <id> --prompt "new prompt" [--send-at "new schedule"] [--user "<discord-user-id>"] [--model "provider/model"] [--agent "<agent>"]
+kimaki task edit <id> --prompt "new prompt" [--send-at "new schedule"] [--pre-run "command"] [--allow-concurrency true|false] [--user "<discord-user-id>"] [--model "provider/model"] [--agent "<agent>"]
 kimaki task delete <id>
 
 \`kimaki task list\` prints \`userId\`, \`agent\`, and \`model\` columns. A \`-\` in \`userId\` means nobody is added to the thread when that task fires, so the user may never see it. Fix it with \`kimaki task edit <id> --user '<discord-user-id>'\` instead of deleting and recreating the task. Change model or agent in place with \`--model\` / \`--agent\` (empty string clears the override). Do not read SQLite or recreate the task just to swap model.
@@ -827,9 +834,16 @@ Only ask questions when the request is genuinely ambiguous with multiple valid a
 
 ## ending conversations with options
 
-The question tool must be called last, after all text parts. Always use it when you ask questions.
+You MUST write ALL user-visible text FIRST.
+You MUST call \`question\` LAST, after ALL text parts.
+NEVER call \`question\` before your text. Discord will hide the message.
+
+The same rule applies to \`kimaki_action_buttons\` and \`kimaki_file_upload\`.
+You MUST call them LAST, after ALL text.
+
+ALWAYS use \`question\` when you ask the user a question. Do not write a numbered list in plain text.
 
-IMPORTANT: Do NOT use the question tool to ask permission before doing work. Do the work first, then offer follow-ups.
+IMPORTANT: Do NOT use \`question\` to ask permission before doing work. Do the work first, then offer follow-ups.
 
 Examples:
 - After completing edits: offer "Commit changes?"

package/dist/system-message.test.js

@@ -24,6 +24,16 @@ describe('system-message', () => {
         expect(message).toContain('- failed commands');
         expect(message).toContain('<callout accent="#f59e0b">');
     });
+    test('requires interactive tools after all text, using exact tool names', () => {
+        const message = getOpencodeSystemMessage({
+            sessionId: 'ses_123',
+        });
+        expect(message).toContain('You MUST write ALL user-visible text FIRST');
+        expect(message).toContain('You MUST call `question` LAST');
+        expect(message).toContain('NEVER call `question` before your text');
+        expect(message).toContain('`kimaki_action_buttons`');
+        expect(message).toContain('`kimaki_file_upload`');
+    });
     test('persists and reads session system prompt for command path', async () => {
         const dataDir = fs.mkdtempSync(path.join(os.tmpdir(), 'kimaki-system-'));
         tempDirs.push(dataDir);
@@ -174,7 +184,8 @@ describe('system-message', () => {
 
       ## requesting files from the user
 
-      To ask the user to upload files from their device, use the \`kimaki_file_upload\` tool. This shows a native file picker dialog in Discord. The files are downloaded to the project's \`uploads/\` directory and the tool returns the local file paths.
+      To ask the user to upload files from their device, use \`kimaki_file_upload\`. This shows a native file picker dialog in Discord. The files are downloaded to the project's \`uploads/\` directory and the tool returns the local file paths.
+      You MUST call \`kimaki_file_upload\` LAST, after ALL text.
 
       ## archiving the current thread
 
@@ -295,6 +306,10 @@ describe('system-message', () => {
       kimaki send --channel chan_123 --prompt 'Reminder: review open PRs' --send-at '2026-03-01T09:00:00Z' --agent <current_agent> --parent-session ses_123 --user '<discord-user-id>'
       kimaki send --channel chan_123 --prompt 'Run weekly test suite and summarize failures' --send-at '0 9 * * 1' --agent <current_agent> --parent-session ses_123 --user '<discord-user-id>'
 
+      Use \`--pre-run '<command>'\` to check whether a scheduled task should start. Kimaki runs the command in the project directory. Exit code 0 starts the session and appends stdout to the prompt. Any other exit code skips that occurrence. Command output is written to the Kimaki log.
+
+      Scheduled tasks do not overlap by default. Add \`--allow-concurrency\` only when concurrent sessions from the same task are safe.
+
       **ALWAYS pass \`--user\` when scheduling a task.** Discord only shows a thread in the left sidebar to its members. Without \`--user\`, kimaki does not ensure anyone is a member, so the task can fire completely unnoticed if the user never joined the thread or already left it. This applies to \`--channel\` and \`--thread\` scheduling alike.
 
       ALL scheduling is in UTC. Dates must be UTC ISO format ending with \`Z\`. Cron expressions also fire in UTC (e.g. \`0 9 * * 1\` means 9:00 UTC every Monday).
@@ -304,6 +319,8 @@ describe('system-message', () => {
       - \`--notify-only\` to create a reminder thread without auto-starting a session
       - \`--worktree\` to create the scheduled thread as a worktree session (only if the user explicitly asks for a worktree)
       - \`--agent\` and \`--model\` to control scheduled session behavior
+      - \`--pre-run\` to start only when a project command exits with code 0
+      - \`--allow-concurrency\` to permit overlapping runs from the same task
       - \`--parent-session\` to pass this session as parent of the scheduled child
       - \`--user\` to add a specific user to the scheduled thread (always pass this)
 
@@ -337,7 +354,7 @@ describe('system-message', () => {
       Manage scheduled tasks with:
 
       kimaki task list
-      kimaki task edit <id> --prompt "new prompt" [--send-at "new schedule"] [--user "<discord-user-id>"] [--model "provider/model"] [--agent "<agent>"]
+      kimaki task edit <id> --prompt "new prompt" [--send-at "new schedule"] [--pre-run "command"] [--allow-concurrency true|false] [--user "<discord-user-id>"] [--model "provider/model"] [--agent "<agent>"]
       kimaki task delete <id>
 
       \`kimaki task list\` prints \`userId\`, \`agent\`, and \`model\` columns. A \`-\` in \`userId\` means nobody is added to the thread when that task fires, so the user may never see it. Fix it with \`kimaki task edit <id> --user '<discord-user-id>'\` instead of deleting and recreating the task. Change model or agent in place with \`--model\` / \`--agent\` (empty string clears the override). Do not read SQLite or recreate the task just to swap model.
@@ -782,9 +799,16 @@ describe('system-message', () => {
 
       ## ending conversations with options
 
-      The question tool must be called last, after all text parts. Always use it when you ask questions.
+      You MUST write ALL user-visible text FIRST.
+      You MUST call \`question\` LAST, after ALL text parts.
+      NEVER call \`question\` before your text. Discord will hide the message.
+
+      The same rule applies to \`kimaki_action_buttons\` and \`kimaki_file_upload\`.
+      You MUST call them LAST, after ALL text.
+
+      ALWAYS use \`question\` when you ask the user a question. Do not write a numbered list in plain text.
 
-      IMPORTANT: Do NOT use the question tool to ask permission before doing work. Do the work first, then offer follow-ups.
+      IMPORTANT: Do NOT use \`question\` to ask permission before doing work. Do the work first, then offer follow-ups.
 
       Examples:
       - After completing edits: offer "Commit changes?"