kimaki 1.3.0 → 1.5.0

package/src/queue.ts

@@ -4,9 +4,14 @@
 //
 //   inbox.enqueued (queue, while busy) ─▶ "Queued at position N" ack
 //   inbox.enqueued (steer, echo)       ─▶ the echo line (wakes, scheduled runs, TUI prompts)
-//   inbox.delivered                    ─▶ "» user: text" echo, ack says "Queued message sent"
+//   inbox.delivered (or promoted)      ─▶ "Queued message sent" reply to the user message, ack says "Queued"
 //   inbox.cancelled                    ─▶ ack says "Removed from queue"
 //
+// Every acked item gets that reply when it starts, in threads and coordinator
+// channels alike. The prompt text is never posted again. Prompts without a Discord
+// message (CLI, routines, TUI) have nothing for the ack to reply to: the ack
+// shows the full prompt, and the "Queued message sent" reply goes to the ack.
+//
 // A queued prompt's inbox ID is msg_discord_<messageId> (prompt.ts), so a
 // message delete or an edit maps to the item by ID alone. Items without a
 // Discord source message (/queue, CLI, commands) are removed with /clear-queue.
@@ -18,10 +23,10 @@ import type { Draft } from 'immer'
 import type { Bot } from './bot.ts'
 import { asSubtext, textOnly } from './format-parts.ts'
 import { stripTurnContext } from './system-prompt.ts'
+import { markdownPayloads, type DiscordPayload } from './markdown/components.ts'
+import { DISCORD_TEXT_LIMIT } from './markdown/render-markdown.ts'
 import type { Emit, ThreadView } from './thread-reducer.ts'
 
-const ECHO_LIMIT = 1_900
-
 // A root inbox user item not delivered yet, in inbox order.
 export type PendingInput = {
   inboxID: string
@@ -31,6 +36,10 @@ export type PendingInput = {
   username: string | null
   // Discord message the prompt came from (the ack replies to it).
   messageId: string | null
+  // The first answer text replies to this message. Only in a coordinator channel:
+  // a thread holds one conversation, so turns need no extra delimiter there.
+  // Not for acked items: their "Queued message sent" reply marks the start.
+  replyTo: string | null
   // An ack was posted; only acked items get an echo when they start.
   acked: boolean
   // Line from the prompt metadata (scheduled runs) or for prompts sent outside Discord; shown on delivery even without an ack.
@@ -45,36 +54,102 @@ function ackKey(inboxID: string): string {
   return `queue:${inboxID}`
 }
 
-function inputFields(payload: { text: string; metadata?: { readonly [key: string]: JsonValue } }) {
+// CLI and scheduled prompts carry a UUID, not a Discord message to reply to.
+export function discordMessageId(messageId: string): string | null {
+  return /^\d+$/.test(messageId) ? messageId : null
+}
+
+function inputFields({ payload, channelId }: { payload: { text: string; metadata?: { readonly [key: string]: JsonValue } }; channelId: string }) {
   const text = stripTurnContext(payload.text)
   const discord = payload.metadata?.['discord']
   // Sent outside Discord (TUI, other clients): echo it like V1 external sync did.
   if (!discord || typeof discord !== 'object' || Array.isArray(discord)) {
-    return { external: true, text, username: null, messageId: null, echo: text.trim() ? formatEcho({ username: 'user', text }) : null }
+    return { external: true, text, username: null, messageId: null, replyTo: null, echo: text.trim() ? formatEcho({ username: 'user', text }) : null }
   }
   const username = discord['username']
-  const messageId = discord['messageId']
+  const raw = discord['messageId']
   const echo = discord['echo']
+  const messageId = typeof raw === 'string' ? discordMessageId(raw) : null
   return {
     external: false,
     text,
     username: typeof username === 'string' ? username : null,
-    // CLI and scheduled prompts carry a UUID, not a Discord message to reply to.
-    messageId: typeof messageId === 'string' && /^\d+$/.test(messageId) ? messageId : null,
+    messageId,
+    // A coordinator prompt's conversation is the project channel itself.
+    replyTo: discord['threadId'] === channelId ? messageId : null,
     // Shown when a prompt without a Discord message is taken (wake, scheduled run).
     echo: typeof echo === 'string' ? echo : null,
   }
 }
 
-export function formatEcho({ username, text }: { username: string | null; text: string }): string {
-  const body = text.length > ECHO_LIMIT ? `${text.slice(0, ECHO_LIMIT - 1)}…` : text
-  return `» **${username ?? 'queued'}:** ${body}`
+function echoLine({ username, text }: { username: string | null; text: string }): string {
+  // Block markdown only renders at the start of a line, so it goes below the prefix.
+  const separator = BLOCK_MARKDOWN_START.test(text) ? '\n' : ' '
+  return `» **${username ?? 'queued'}:**${separator}${text}`
+}
+
+// Headings, quotes, lists, code fences, rules, tables and subtext.
+const BLOCK_MARKDOWN_START = /^ {0,3}(#{1,6}(\s|$)|-#\s|>|[-*+]\s|\d{1,9}[.)]\s|```|~~~|-{3,}\s*$|\|)/
+const CODE_FENCE = /^ {0,3}(```|~~~)/
+
+// Every prompt the bot posts (CLI, routines, TUI, voice, slash commands) is
+// subtext, so it reads apart from model output. A long one becomes several messages (effects.ts).
+export function formatEcho(input: { username: string | null; text: string }): string {
+  return subtext(echoLine(input))
+}
+
+// A long echo (formatEcho) as several messages, split like model markdown.
+// Each piece gets its `-# ` again: a line cut at a word break would lose it.
+export function echoPayloads(echo: string): DiscordPayload[] {
+  return markdownPayloads(echo).map((payload) => ('content' in payload ? { content: subtext(payload.content.trim()) } : payload))
+}
+
+// A slash command reply stands in for the user message: one Discord message, long text is cut.
+export function formatEchoReply(input: { username: string | null; text: string }): string {
+  return cut(formatEcho(input), DISCORD_TEXT_LIMIT)
+}
+
+// Every non-empty line gets `-# `. Subtext only renders inline markdown: code
+// blocks stay as they are, headings become bold, other block markers show as text.
+function subtext(text: string): string {
+  let fenced = false
+  return text
+    .split('\n')
+    .flatMap((line) => {
+      if (CODE_FENCE.test(line)) fenced = !fenced
+      else if (!fenced && line.trim() === '') return []
+      else if (!fenced && !line.startsWith('-# ')) return [asSubtext(line.replace(HEADING, '**$1**'))]
+      return [line]
+    })
+    .join('\n')
+}
+
+const HEADING = /^ {0,3}#{1,6}\s+(.+?)\s*$/
+
+function cut(text: string, limit: number): string {
+  return text.length > limit ? `${text.slice(0, limit - 1)}…` : text
+}
+
+// The ack of a prompt with a Discord message replies to it. Without one (CLI,
+// routines, TUI) the ack itself shows the prompt, and its status line below.
+function ackContent(item: PendingInput, status: string | null): string {
+  if (item.messageId) return asSubtext(status ?? '')
+  const line = status ? `\n${asSubtext(status)}` : ''
+  return `${cut(subtext(item.echo ?? echoLine(item)), DISCORD_TEXT_LIMIT - line.length)}${line}`
 }
 
 type Slice = { draft: Draft<ThreadView>; emit: Emit }
 
-function closeAck({ emit }: Slice, item: PendingInput, content: string) {
-  if (item.acked) emit({ type: 'edit', key: ackKey(item.inboxID), messages: [textOnly(asSubtext(content))] })
+function closeAck({ emit }: Slice, item: PendingInput, status: string) {
+  if (item.acked) emit({ type: 'edit', key: ackKey(item.inboxID), messages: [textOnly(ackContent(item, status))] })
+}
+
+// An acked item starts running. The user message (or the ack without one)
+// already shows the prompt: a reply to it marks where it runs, instead of a
+// second copy. Also in a coordinator, where the answer may post no text (IDLE).
+function markStarted({ emit }: Slice, item: PendingInput) {
+  const ack = textOnly(ackContent(item, item.messageId ? 'Queued' : null))
+  emit({ type: 'edit', key: ackKey(item.inboxID), messages: [ack], reply: asSubtext('Queued message sent'), replyTo: item.messageId })
 }
 
 // Removes the item from the inbox; returns it when it was still queued.
@@ -91,32 +166,34 @@ export function enqueueInput(
   const { draft, emit, data, busy } = slice
   const { item, inboxID } = data
   if (item.type !== 'user' || draft.inbox.some((candidate) => candidate.inboxID === inboxID)) return
-  const { external, ...fields } = inputFields(item.payload)
+  const { external, ...fields } = inputFields({ payload: item.payload, channelId: draft.channelId })
   // The expanded prompt of a command Kimaki ran: the queue echo shows the typed command, never the template.
   const command = external ? draft.commandPending : null
   if (external) draft.commandPending = null
-  const meta = command ? { ...fields, ...command, echo: null } : fields
+  const meta = command ? { ...fields, ...command } : fields
   // Idle with nothing pending: OpenCode runs it at once, like a normal message.
   const acked = item.delivery === 'queue' && (busy || draft.inbox.length > 0)
-  draft.inbox.push({ inboxID, delivery: item.delivery, ...meta, acked })
+  const pending: PendingInput = { inboxID, delivery: item.delivery, ...meta, acked }
+  draft.inbox.push(pending)
   if (item.delivery !== 'queue') {
     if (!meta.echo) return
-    emit({ type: 'send', text: meta.echo })
+    emit({ type: 'send', text: meta.echo, echo: true })
     draft.lastKind = null
     return
   }
   if (!acked) return
   const position = queuedItems(draft).length
-  const ack = textOnly(asSubtext(`Queued at position ${position}. Delete the original message to remove it, or use /clear-queue position:${position}`))
-  emit({ type: 'show', key: ackKey(inboxID), messages: [ack], replyTo: meta.messageId, notify: false })
+  const remove = meta.messageId ? 'Delete the original message to remove it, or use' : 'Remove it with'
+  const ack = textOnly(ackContent(pending, `Queued at position ${position}. ${remove} /clear-queue position:${position}`))
+  emit({ type: 'show', key: ackKey(inboxID), messages: [ack], replyTo: meta.messageId, notify: false, echo: true })
 }
 
 export function deliverQueued(slice: Slice & { inboxID: string }) {
   const item = takeQueued(slice, slice.inboxID)
   if (!item || (!item.acked && !item.echo)) return
-  closeAck(slice, item, 'Queued message sent')
-  slice.emit({ type: 'send', text: item.echo ?? formatEcho(item) })
   slice.draft.lastKind = null
+  if (item.acked) return markStarted(slice, item)
+  slice.emit({ type: 'send', text: item.echo ?? formatEcho(item), echo: true })
 }
 
 export function cancelQueued(slice: Slice & { inboxID: string }) {
@@ -128,7 +205,7 @@ export function cancelQueued(slice: Slice & { inboxID: string }) {
 export function promoteQueued(slice: Slice & { inboxID: string }) {
   const item = slice.draft.inbox.find((candidate) => candidate.inboxID === slice.inboxID)
   if (item?.delivery !== 'queue') return
-  closeAck(slice, { ...item }, 'Queued message sent')
+  if (item.acked) markStarted(slice, { ...item })
   item.delivery = 'steer'
 }
 
@@ -146,8 +223,11 @@ export function hydrateQueue(slice: Slice & { inbox: readonly SessionInboxInfo[]
   draft.inbox = users.map((item): PendingInput => {
     const existing = known.get(item.id)
     if (existing?.delivery === item.delivery) return existing
-    if (existing?.delivery === 'queue' && item.delivery === 'steer') closeAck(slice, existing, 'Queued message sent')
-    const { external: _external, ...fields } = inputFields(item.payload)
+    if (existing?.delivery === 'queue' && item.delivery === 'steer') {
+      if (existing.acked) markStarted(slice, existing)
+      return { ...existing, delivery: 'steer' }
+    }
+    const { external: _external, ...fields } = inputFields({ payload: item.payload, channelId: draft.channelId })
     return { inboxID: item.id, delivery: item.delivery, ...fields, acked: item.delivery === 'queue' }
   })
 }

package/src/remote-send.e2e.test.ts

@@ -38,17 +38,17 @@ test('CLI remote envelope runs only on the owning bot and returns its IDs', asyn
   await waitForFooter({ discord: twin.discord, threadId: ids.threadId, count: 2 })
   expect((await twin.discord.thread(ids.threadId).text()).replaceAll(ids.threadId, 'THREAD')).toMatchInlineSnapshot(`
     "--- from: assistant (TestBot)
-    » **CLI:** Remote first
-    Files: remote.txt
+    -# » **CLI:** Remote first
+    -# Files: remote.txt
     -# *using deterministic-provider/deterministic-v2 ⋅ build*
     ok
-    -# *project ⋅ main ⋅ Ns ⋅ deterministic-v2*
+    -# *main ⋅ Ns ⋅ deterministic-v2*
     Remote queued. queue
     [embed]
     Delivered to <#THREAD>
     [embed]
     ok
-    -# *project ⋅ main ⋅ Ns ⋅ deterministic-v2*"
+    -# *main ⋅ Ns ⋅ deterministic-v2*"
   `)
   expect(a.store.getState().roots[ids.threadId]).toBeUndefined()
   expect(b.store.getState().roots[ids.threadId]).toBe(ids.sessionId)
@@ -67,10 +67,10 @@ test('CI send with only KIMAKI_BOT_TOKEN and no local bot reaches the owning bot
   await waitForFooter({ discord: twin.discord, threadId: ids.threadId })
   expect(await twin.discord.thread(ids.threadId).text()).toMatchInlineSnapshot(`
     "--- from: assistant (TestBot)
-    » **CLI:** From CI
+    -# » **CLI:** From CI
     -# *using deterministic-provider/deterministic-v2 ⋅ build*
     ok
-    -# *project ⋅ main ⋅ Ns ⋅ deterministic-v2*"
+    -# *main ⋅ Ns ⋅ deterministic-v2*"
   `)
   expect(b.store.getState().roots[ids.threadId]).toBe(ids.sessionId)
   expect(fs.readdirSync(ciDataDir)).toEqual([])

package/src/remote-send.ts

@@ -36,7 +36,8 @@ export function promptFilePath(file: { uri: string }): string {
 // file path; the prompt file goes first, because the receiver reads the first attachment.
 export function remoteEnvelope(input: SendInput) {
   const requestId = crypto.randomBytes(8).toString('hex')
-  const { files, prompt, ...options } = input
+  // A session of this machine means nothing to the receiving bot.
+  const { files, prompt, senderSessionId: _sender, ...options } = input
   // A prompt over the message limit travels as an attachment; the content keeps a preview.
   const long = prompt.length > 2000
   const footer = `${REMOTE_SEND_PREFIX}${JSON.stringify({ requestId, options, ...(long && { promptFile: REMOTE_PROMPT_FILE }) })}`

package/src/renderer.e2e.test.ts

@@ -166,7 +166,7 @@ test('shell and edit lines are shown, read is hidden at the default verbosity',
     -# ◼︎ edit *notes.md* (+1-0)
 
     Edited notes.md.
-    -# *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*"
+    -# *main ⋅ Ns ⋅ N% ⋅ deterministic-v2*"
   `)
 })
 
@@ -182,7 +182,7 @@ test('Code Mode execute shows its description, then one line per inner tool call
     -# ┣ execute.opencode.list\\_mcp\\_resources
 
     Found the models.
-    -# *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*"
+    -# *main ⋅ Ns ⋅ N% ⋅ deterministic-v2*"
   `)
 })
 
@@ -199,7 +199,7 @@ test('Code Mode execute shows failed inner calls and the code error', async () =
     -#  ⨯  execute _Error: broken on purpose_
 
     The code failed.
-    -# *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*"
+    -# *main ⋅ Ns ⋅ N% ⋅ deterministic-v2*"
   `)
 })
 
@@ -252,7 +252,7 @@ test('table and callout render as components, long code splits into valid messag
       {
         "components": false,
         "fences": 0,
-        "length": 49,
+        "length": 39,
       },
     ]
   `)
@@ -356,7 +356,7 @@ test('table and callout render as components, long code splits into valid messag
     const value78 = compute(78) // line 78
     const value79 = compute(79) // line 79
     \`\`\`
-    -# *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*"
+    -# *main ⋅ Ns ⋅ N% ⋅ deterministic-v2*"
   `)
 })
 
@@ -371,7 +371,7 @@ test('foreground subagent: child tool lines labelled with the agent, one footer'
     -# ┣ general ⋅ shell _ls \\*.md_
 
     The child found notes.md.
-    -# *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*"
+    -# *main ⋅ Ns ⋅ N% ⋅ deterministic-v2*"
   `)
 })
 
@@ -385,6 +385,6 @@ test('channel verbosity text shows only text and edit lines', async () => {
     -# ◼︎ edit *notes.md* (+1-0)
 
     Edited notes.md.
-    -# *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*"
+    -# *main ⋅ Ns ⋅ N% ⋅ deterministic-v2*"
   `)
 })

package/src/restart.e2e.test.ts

@@ -62,12 +62,12 @@ test('restarted bot continues the session of an existing thread', async () => {
     --- from: assistant (TestBot)
     -# *using deterministic-provider/deterministic-v2 ⋅ build*
     ok
-    -# *project ⋅ main ⋅ Ns ⋅ deterministic-v2*
+    -# *main ⋅ Ns ⋅ deterministic-v2*
     --- from: user (tommy)
     second message after restart
     --- from: assistant (TestBot)
     ok
-    -# *project ⋅ main ⋅ Ns ⋅ deterministic-v2*"
+    -# *main ⋅ Ns ⋅ deterministic-v2*"
   `)
   const rows = await bot.db.query.thread_sessions.findMany()
   expect(rows.map((row) => row.session_id)).toEqual([binding?.session_id])

package/src/routines.e2e.test.ts

@@ -92,10 +92,10 @@ test('a routine row written by V1 runs unchanged', async () => {
   await waitForFooter({ discord: twin.discord, threadId: threadId! })
   expect(await twin.discord.thread(threadId!).text()).toMatchInlineSnapshot(`
     "--- from: assistant (TestBot)
-    » **routine #3:** V1 weekly check
+    -# » **routine #3:** V1 weekly check
     -# *using deterministic-provider/deterministic-v2 ⋅ build*
     ok
-    -# *project ⋅ main ⋅ Ns ⋅ deterministic-v2*"
+    -# *main ⋅ Ns ⋅ deterministic-v2*"
   `)
   expect((await listTasks()).find((task) => task.id === row!.id)).toMatchObject({ status: 'planned', nextRunAt: '2030-01-14T09:00:00.000Z' })
   // V1 history: finished rows only show with the V1 `task list --all`.

package/src/scheduler.e2e.test.ts

@@ -12,10 +12,13 @@ import {
   manualClock,
   schedulingKit,
   seedProjectChannel,
+  slowTextMatcher,
   startOpencodeTestServer,
   startTestBot,
   startTwin,
   tempDataDir,
+  textParts,
+  waitForBotMessageContaining,
   waitForFooter,
   warmUp,
   type OpencodeTestServer,
@@ -30,7 +33,10 @@ let bot: BotHandle
 const { cli, schedule, tick, listTasks, request } = schedulingKit({ suite: () => ({ bot, twin, server }), dataDir, clock })
 
 beforeAll(async () => {
-  ;[server, twin] = await Promise.all([startOpencodeTestServer(), startTwin()])
+  ;[server, twin] = await Promise.all([startOpencodeTestServer({ matchers: [
+    slowTextMatcher({ marker: 'slow-marker', text: 'slow-done', delayMs: 800 }),
+    { id: 'report', priority: 50, when: { latestUserTextIncludes: 'Report when done' }, then: { parts: textParts('report ok') } },
+  ] }), startTwin()])
   await seedProjectChannel({ dataDir, channelId: twin.channelId, guildId: twin.discord.guildId, directory: server.projectDirectory })
   bot = await startTestBot({ dataDir, twin, server, clock, schedulerIntervalMs: null })
   await warmUp({ server })
@@ -51,10 +57,10 @@ test('a one-shot routine starts a thread at its time, then is gone', async () =>
   await waitForFooter({ discord: twin.discord, threadId: threadId! })
   expect(await twin.discord.thread(threadId!).text()).toMatchInlineSnapshot(`
     "--- from: assistant (TestBot)
-    » **routine #1:** Check the deploy once
+    -# » **routine #1:** Check the deploy once
     -# *using deterministic-provider/deterministic-v2 ⋅ build*
     ok
-    -# *project ⋅ main ⋅ Ns ⋅ deterministic-v2*"
+    -# *main ⋅ Ns ⋅ deterministic-v2*"
   `)
   const thread = (await twin.discord.channel(twin.channelId).getThreads()).find((candidate) => candidate.id === threadId)
   expect(thread?.name).toBe('Deploy check')
@@ -93,10 +99,10 @@ test('a cron routine fires once per occurrence, in a new thread each time', asyn
   expect([first.length, second.length]).toEqual([1, 1])
   expect(await twin.discord.thread(second[0]!).text()).toMatchInlineSnapshot(`
     "--- from: assistant (TestBot)
-    » **routine #2:** Hourly report
+    -# » **routine #2:** Hourly report
     -# *using deterministic-provider/deterministic-v2 ⋅ build*
     ok
-    -# *project ⋅ main ⋅ Ns ⋅ deterministic-v2*"
+    -# *main ⋅ Ns ⋅ deterministic-v2*"
   `)
   expect((await listTasks()).find((row) => row.id === task.routineId)).toMatchObject({ status: 'planned', nextRunAt: '2030-01-01T13:00:00.000Z' })
   await request('task.delete', { id: task.routineId })
@@ -114,16 +120,16 @@ test('a routine for an existing thread prompts that thread, with or without . qu
   await waitForFooter({ discord: twin.discord, threadId: started.threadId, count: 3 })
   expect(await twin.discord.thread(started.threadId).text()).toMatchInlineSnapshot(`
     "--- from: assistant (TestBot)
-    » **CLI:** Thread for a reminder
+    -# » **CLI:** Thread for a reminder
     -# *using deterministic-provider/deterministic-v2 ⋅ build*
     ok
-    -# *project ⋅ main ⋅ Ns ⋅ deterministic-v2*
-    » **routine #3:** Reminder: check the logs
+    -# *main ⋅ Ns ⋅ deterministic-v2*
+    -# » **routine #3:** Reminder: check the logs
     ok
-    -# *project ⋅ main ⋅ Ns ⋅ deterministic-v2*
-    » **routine #4:** Then summarize them
+    -# *main ⋅ Ns ⋅ deterministic-v2*
+    -# » **routine #4:** Then summarize them
     ok
-    -# *project ⋅ main ⋅ Ns ⋅ deterministic-v2*"
+    -# *main ⋅ Ns ⋅ deterministic-v2*"
   `)
 })
 
@@ -136,14 +142,12 @@ test('--pre-run: a failing command skips the run, output is appended to the prom
   await waitForFooter({ discord: twin.discord, threadId: created[0]! })
   expect(await twin.discord.thread(created[0]!).text()).toMatchInlineSnapshot(`
     "--- from: assistant (TestBot)
-    » **routine #6:** Summarize the new issues
-
-    ## Pre-run command output
-
-    issue 42 is new
+    -# » **routine #6:** Summarize the new issues
+    -# **Pre-run command output**
+    -# issue 42 is new
     -# *using deterministic-provider/deterministic-v2 ⋅ build*
     ok
-    -# *project ⋅ main ⋅ Ns ⋅ deterministic-v2*"
+    -# *main ⋅ Ns ⋅ deterministic-v2*"
   `)
   // A skipped one-shot is done too, like V1.
   expect((await listTasks()).filter((row) => row.id === skipped.routineId || row.id === ran.routineId)).toEqual([])
@@ -162,14 +166,14 @@ test('recurring worktree routines get a fresh checkout on every run', async () =
   const normalize = (text: string) => text.replace(/report-[a-f0-9]{8}/g, 'report-ID')
   expect(normalize(await twin.discord.thread(first[0]!).text())).toMatchInlineSnapshot(`
     "--- from: assistant (TestBot)
-    » **routine #7:** Isolated recurring report
+    -# » **routine #7:** Isolated recurring report
     -# *using deterministic-provider/deterministic-v2 ⋅ build*
     ok
     -# *report-ID ⋅ opencode/kimaki-report-ID ⋅ Ns ⋅ deterministic-v2*"
   `)
   expect(normalize(await twin.discord.thread(second[0]!).text())).toMatchInlineSnapshot(`
     "--- from: assistant (TestBot)
-    » **routine #7:** Isolated recurring report
+    -# » **routine #7:** Isolated recurring report
     -# *using deterministic-provider/deterministic-v2 ⋅ build*
     ok
     -# *report-ID ⋅ opencode/kimaki-report-ID ⋅ Ns ⋅ deterministic-v2*"
@@ -180,3 +184,25 @@ test('recurring worktree routines get a fresh checkout on every run', async () =
   expect(directories.every((directory) => directory !== server.projectDirectory)).toBe(true)
   await request('task.delete', { id: task.routineId })
 })
+
+// Without --allow-concurrency a thread routine waits until the thread is idle, then runs at once.
+test('a . queue routine with --allow-concurrency that fires while its thread is busy waits in the queue, then gets its reply', async () => {
+  const started = await send(bot, { channelId: twin.channelId, prompt: 'Long work slow-marker' })
+  if (started instanceof Error) throw started
+  await waitForBotMessageContaining({ discord: twin.discord, threadId: started.threadId, text: '*using ' })
+  await request('send', { threadId: started.threadId, prompt: 'Report when done. queue', sendAt: '2030-01-01T19:00:00Z', allowConcurrency: true })
+  expect(await tick('2030-01-01T19:00:00Z')).toEqual([])
+  await waitForFooter({ discord: twin.discord, threadId: started.threadId, count: 2 })
+  expect(await twin.discord.thread(started.threadId).text({ showReplies: true })).toMatchInlineSnapshot(`
+    "--- from: assistant (TestBot)
+    -# » **CLI:** Long work slow-marker
+    -# *using deterministic-provider/deterministic-v2 ⋅ build*
+    -# » **routine #8:** Report when done
+    slow-done
+    -# *main ⋅ Ns ⋅ N% ⋅ deterministic-v2*
+    [reply to TestBot: -# » **routine #8:** Report when done]
+    -# Queued message sent
+    report ok
+    -# *main ⋅ Ns ⋅ N% ⋅ deterministic-v2*"
+  `)
+})

package/src/scheduler.ts

@@ -423,8 +423,10 @@ export async function createTask(bot: Bot, { send: input, options }: { send: Sen
     if (threadId) {
       const thread = await bot.discord.channels.fetch(threadId).catch((cause) => new DiscordError({ operation: `fetch thread ${threadId}`, cause }))
       if (thread instanceof Error) return thread
-      if (!thread?.isThread() || !thread.parentId) return null
-      return projectOf(bot, thread.parentId)
+      // A coordinator channel is its own project channel.
+      const channelId = thread?.isThread() ? thread.parentId : thread?.id
+      if (!channelId) return null
+      return projectOf(bot, channelId)
     }
     return bot.db.query.channel_directories
       .findFirst({ where: input.channelId ? { channel_id: input.channelId } : { directory: path.resolve(input.project!) } })

package/src/schema-sql.ts

@@ -1,3 +1,3 @@
 // Generated by pnpm generate from src/schema.ts. Do not edit.
 
-export const SCHEMA_SQL = "CREATE TABLE IF NOT EXISTS `bot_api_keys` (\n\t`app_id` text PRIMARY KEY,\n\t`gemini_api_key` text,\n\t`openai_api_key` text,\n\t`xai_api_key` text,\n\t`created_at` datetime DEFAULT CURRENT_TIMESTAMP,\n\tCONSTRAINT `fk_bot_api_keys_app_id_bot_tokens_app_id_fk` FOREIGN KEY (`app_id`) REFERENCES `bot_tokens`(`app_id`) ON UPDATE CASCADE\n);\n\nCREATE TABLE IF NOT EXISTS `bot_settings` (\n\t`app_id` text PRIMARY KEY,\n\t`voice_call_voice` text,\n\t`created_at` datetime DEFAULT CURRENT_TIMESTAMP,\n\t`updated_at` datetime DEFAULT CURRENT_TIMESTAMP,\n\tCONSTRAINT `fk_bot_settings_app_id_bot_tokens_app_id_fk` FOREIGN KEY (`app_id`) REFERENCES `bot_tokens`(`app_id`) ON UPDATE CASCADE\n);\n\nCREATE TABLE IF NOT EXISTS `bot_tokens` (\n\t`app_id` text PRIMARY KEY,\n\t`token` text NOT NULL,\n\t`bot_mode` text DEFAULT 'self_hosted' NOT NULL,\n\t`client_id` text,\n\t`client_secret` text,\n\t`proxy_url` text,\n\t`created_at` datetime DEFAULT CURRENT_TIMESTAMP,\n\t`last_used_at` datetime\n);\n\nCREATE TABLE IF NOT EXISTS `channel_agents` (\n\t`channel_id` text PRIMARY KEY,\n\t`agent_name` text NOT NULL,\n\t`created_at` datetime DEFAULT CURRENT_TIMESTAMP,\n\t`updated_at` datetime DEFAULT CURRENT_TIMESTAMP,\n\tCONSTRAINT `fk_channel_agents_channel_id_channel_directories_channel_id_fk` FOREIGN KEY (`channel_id`) REFERENCES `channel_directories`(`channel_id`) ON UPDATE CASCADE\n);\n\nCREATE TABLE IF NOT EXISTS `channel_directories` (\n\t`channel_id` text PRIMARY KEY,\n\t`directory` text NOT NULL,\n\t`channel_type` text NOT NULL,\n\t`guild_id` text,\n\t`created_at` datetime DEFAULT CURRENT_TIMESTAMP\n);\n\nCREATE TABLE IF NOT EXISTS `channel_mention_mode` (\n\t`channel_id` text PRIMARY KEY,\n\t`enabled` integer DEFAULT 0 NOT NULL,\n\t`created_at` datetime DEFAULT CURRENT_TIMESTAMP,\n\t`updated_at` datetime DEFAULT CURRENT_TIMESTAMP,\n\tCONSTRAINT `fk_channel_mention_mode_channel_id_channel_directories_channel_id_fk` FOREIGN KEY (`channel_id`) REFERENCES `channel_directories`(`channel_id`) ON UPDATE CASCADE\n);\n\nCREATE TABLE IF NOT EXISTS `channel_models` (\n\t`channel_id` text PRIMARY KEY,\n\t`model_id` text NOT NULL,\n\t`variant` text,\n\t`created_at` datetime DEFAULT CURRENT_TIMESTAMP,\n\t`updated_at` datetime DEFAULT CURRENT_TIMESTAMP,\n\tCONSTRAINT `fk_channel_models_channel_id_channel_directories_channel_id_fk` FOREIGN KEY (`channel_id`) REFERENCES `channel_directories`(`channel_id`) ON UPDATE CASCADE\n);\n\nCREATE TABLE IF NOT EXISTS `channel_verbosity` (\n\t`channel_id` text PRIMARY KEY,\n\t`verbosity` text DEFAULT 'tools_and_text' NOT NULL,\n\t`updated_at` datetime DEFAULT CURRENT_TIMESTAMP,\n\tCONSTRAINT `fk_channel_verbosity_channel_id_channel_directories_channel_id_fk` FOREIGN KEY (`channel_id`) REFERENCES `channel_directories`(`channel_id`) ON UPDATE CASCADE\n);\n\nCREATE TABLE IF NOT EXISTS `channel_worktrees` (\n\t`channel_id` text PRIMARY KEY,\n\t`enabled` integer DEFAULT 0 NOT NULL,\n\t`created_at` datetime DEFAULT CURRENT_TIMESTAMP,\n\t`updated_at` datetime DEFAULT CURRENT_TIMESTAMP,\n\tCONSTRAINT `fk_channel_worktrees_channel_id_channel_directories_channel_id_fk` FOREIGN KEY (`channel_id`) REFERENCES `channel_directories`(`channel_id`) ON UPDATE CASCADE\n);\n\nCREATE TABLE IF NOT EXISTS `global_models` (\n\t`app_id` text PRIMARY KEY,\n\t`model_id` text NOT NULL,\n\t`variant` text,\n\t`created_at` datetime DEFAULT CURRENT_TIMESTAMP,\n\t`updated_at` datetime DEFAULT CURRENT_TIMESTAMP,\n\tCONSTRAINT `fk_global_models_app_id_bot_tokens_app_id_fk` FOREIGN KEY (`app_id`) REFERENCES `bot_tokens`(`app_id`) ON UPDATE CASCADE\n);\n\nCREATE TABLE IF NOT EXISTS `guild_categories` (\n\t`guild_id` text PRIMARY KEY,\n\t`category_id` text,\n\t`audio_category_id` text,\n\t`created_at` datetime DEFAULT CURRENT_TIMESTAMP\n);\n\nCREATE TABLE IF NOT EXISTS `scheduled_tasks` (\n\t`id` integer PRIMARY KEY AUTOINCREMENT,\n\t`status` text DEFAULT 'planned' NOT NULL,\n\t`schedule_kind` text NOT NULL,\n\t`run_at` datetime,\n\t`cron_expr` text,\n\t`timezone` text,\n\t`next_run_at` datetime NOT NULL,\n\t`running_started_at` datetime,\n\t`last_run_at` datetime,\n\t`last_error` text,\n\t`attempts` integer DEFAULT 0 NOT NULL,\n\t`payload_json` text NOT NULL,\n\t`prompt_preview` text NOT NULL,\n\t`channel_id` text,\n\t`thread_id` text,\n\t`session_id` text,\n\t`project_directory` text,\n\t`created_at` datetime DEFAULT CURRENT_TIMESTAMP,\n\t`updated_at` datetime DEFAULT CURRENT_TIMESTAMP,\n\tCONSTRAINT `fk_scheduled_tasks_channel_id_channel_directories_channel_id_fk` FOREIGN KEY (`channel_id`) REFERENCES `channel_directories`(`channel_id`) ON UPDATE CASCADE ON DELETE SET NULL,\n\tCONSTRAINT `fk_scheduled_tasks_thread_id_thread_sessions_thread_id_fk` FOREIGN KEY (`thread_id`) REFERENCES `thread_sessions`(`thread_id`) ON UPDATE CASCADE ON DELETE SET NULL\n);\n\nCREATE TABLE IF NOT EXISTS `session_sleeps` (\n\t`session_id` text PRIMARY KEY,\n\t`wake_at` datetime NOT NULL,\n\t`reason` text,\n\t`status` text DEFAULT 'planned' NOT NULL,\n\t`delivery_id` text NOT NULL,\n\t`attempts` integer DEFAULT 0 NOT NULL,\n\t`last_attempt_at` datetime,\n\t`created_at` datetime DEFAULT CURRENT_TIMESTAMP\n);\n\nCREATE TABLE IF NOT EXISTS `thread_sessions` (\n\t`thread_id` text PRIMARY KEY,\n\t`session_id` text NOT NULL,\n\t`source` text DEFAULT 'kimaki' NOT NULL,\n\t`last_synced_name` text,\n\t`parent_session_id` text,\n\t`created_at` datetime DEFAULT CURRENT_TIMESTAMP,\n\t`updated_at` datetime DEFAULT CURRENT_TIMESTAMP\n);\n\nCREATE INDEX IF NOT EXISTS `scheduled_tasks_status_next_run_at_idx` ON `scheduled_tasks` (`status`,`next_run_at`);\nCREATE INDEX IF NOT EXISTS `scheduled_tasks_channel_id_status_idx` ON `scheduled_tasks` (`channel_id`,`status`);\nCREATE INDEX IF NOT EXISTS `scheduled_tasks_thread_id_status_idx` ON `scheduled_tasks` (`thread_id`,`status`);\nCREATE INDEX IF NOT EXISTS `session_sleeps_status_wake_at_idx` ON `session_sleeps` (`status`,`wake_at`);"
+export const SCHEMA_SQL = "CREATE TABLE IF NOT EXISTS `bot_api_keys` (\n\t`app_id` text PRIMARY KEY,\n\t`gemini_api_key` text,\n\t`openai_api_key` text,\n\t`xai_api_key` text,\n\t`created_at` datetime DEFAULT CURRENT_TIMESTAMP,\n\tCONSTRAINT `fk_bot_api_keys_app_id_bot_tokens_app_id_fk` FOREIGN KEY (`app_id`) REFERENCES `bot_tokens`(`app_id`) ON UPDATE CASCADE\n);\n\nCREATE TABLE IF NOT EXISTS `bot_settings` (\n\t`app_id` text PRIMARY KEY,\n\t`voice_call_voice` text,\n\t`created_at` datetime DEFAULT CURRENT_TIMESTAMP,\n\t`updated_at` datetime DEFAULT CURRENT_TIMESTAMP,\n\tCONSTRAINT `fk_bot_settings_app_id_bot_tokens_app_id_fk` FOREIGN KEY (`app_id`) REFERENCES `bot_tokens`(`app_id`) ON UPDATE CASCADE\n);\n\nCREATE TABLE IF NOT EXISTS `bot_tokens` (\n\t`app_id` text PRIMARY KEY,\n\t`token` text NOT NULL,\n\t`bot_mode` text DEFAULT 'self_hosted' NOT NULL,\n\t`client_id` text,\n\t`client_secret` text,\n\t`proxy_url` text,\n\t`created_at` datetime DEFAULT CURRENT_TIMESTAMP,\n\t`last_used_at` datetime\n);\n\nCREATE TABLE IF NOT EXISTS `channel_agents` (\n\t`channel_id` text PRIMARY KEY,\n\t`agent_name` text NOT NULL,\n\t`created_at` datetime DEFAULT CURRENT_TIMESTAMP,\n\t`updated_at` datetime DEFAULT CURRENT_TIMESTAMP,\n\tCONSTRAINT `fk_channel_agents_channel_id_channel_directories_channel_id_fk` FOREIGN KEY (`channel_id`) REFERENCES `channel_directories`(`channel_id`) ON UPDATE CASCADE\n);\n\nCREATE TABLE IF NOT EXISTS `channel_coordinator` (\n\t`channel_id` text PRIMARY KEY,\n\t`enabled` integer NOT NULL,\n\t`created_at` datetime DEFAULT CURRENT_TIMESTAMP,\n\t`updated_at` datetime DEFAULT CURRENT_TIMESTAMP,\n\tCONSTRAINT `fk_channel_coordinator_channel_id_channel_directories_channel_id_fk` FOREIGN KEY (`channel_id`) REFERENCES `channel_directories`(`channel_id`) ON UPDATE CASCADE\n);\n\nCREATE TABLE IF NOT EXISTS `channel_directories` (\n\t`channel_id` text PRIMARY KEY,\n\t`directory` text NOT NULL,\n\t`channel_type` text NOT NULL,\n\t`guild_id` text,\n\t`created_at` datetime DEFAULT CURRENT_TIMESTAMP\n);\n\nCREATE TABLE IF NOT EXISTS `channel_mention_mode` (\n\t`channel_id` text PRIMARY KEY,\n\t`enabled` integer DEFAULT 0 NOT NULL,\n\t`created_at` datetime DEFAULT CURRENT_TIMESTAMP,\n\t`updated_at` datetime DEFAULT CURRENT_TIMESTAMP,\n\tCONSTRAINT `fk_channel_mention_mode_channel_id_channel_directories_channel_id_fk` FOREIGN KEY (`channel_id`) REFERENCES `channel_directories`(`channel_id`) ON UPDATE CASCADE\n);\n\nCREATE TABLE IF NOT EXISTS `channel_models` (\n\t`channel_id` text PRIMARY KEY,\n\t`model_id` text NOT NULL,\n\t`variant` text,\n\t`created_at` datetime DEFAULT CURRENT_TIMESTAMP,\n\t`updated_at` datetime DEFAULT CURRENT_TIMESTAMP,\n\tCONSTRAINT `fk_channel_models_channel_id_channel_directories_channel_id_fk` FOREIGN KEY (`channel_id`) REFERENCES `channel_directories`(`channel_id`) ON UPDATE CASCADE\n);\n\nCREATE TABLE IF NOT EXISTS `channel_verbosity` (\n\t`channel_id` text PRIMARY KEY,\n\t`verbosity` text DEFAULT 'tools_and_text' NOT NULL,\n\t`updated_at` datetime DEFAULT CURRENT_TIMESTAMP,\n\tCONSTRAINT `fk_channel_verbosity_channel_id_channel_directories_channel_id_fk` FOREIGN KEY (`channel_id`) REFERENCES `channel_directories`(`channel_id`) ON UPDATE CASCADE\n);\n\nCREATE TABLE IF NOT EXISTS `channel_worktrees` (\n\t`channel_id` text PRIMARY KEY,\n\t`enabled` integer DEFAULT 0 NOT NULL,\n\t`created_at` datetime DEFAULT CURRENT_TIMESTAMP,\n\t`updated_at` datetime DEFAULT CURRENT_TIMESTAMP,\n\tCONSTRAINT `fk_channel_worktrees_channel_id_channel_directories_channel_id_fk` FOREIGN KEY (`channel_id`) REFERENCES `channel_directories`(`channel_id`) ON UPDATE CASCADE\n);\n\nCREATE TABLE IF NOT EXISTS `global_models` (\n\t`app_id` text PRIMARY KEY,\n\t`model_id` text NOT NULL,\n\t`variant` text,\n\t`created_at` datetime DEFAULT CURRENT_TIMESTAMP,\n\t`updated_at` datetime DEFAULT CURRENT_TIMESTAMP,\n\tCONSTRAINT `fk_global_models_app_id_bot_tokens_app_id_fk` FOREIGN KEY (`app_id`) REFERENCES `bot_tokens`(`app_id`) ON UPDATE CASCADE\n);\n\nCREATE TABLE IF NOT EXISTS `guild_categories` (\n\t`guild_id` text PRIMARY KEY,\n\t`category_id` text,\n\t`audio_category_id` text,\n\t`created_at` datetime DEFAULT CURRENT_TIMESTAMP\n);\n\nCREATE TABLE IF NOT EXISTS `scheduled_tasks` (\n\t`id` integer PRIMARY KEY AUTOINCREMENT,\n\t`status` text DEFAULT 'planned' NOT NULL,\n\t`schedule_kind` text NOT NULL,\n\t`run_at` datetime,\n\t`cron_expr` text,\n\t`timezone` text,\n\t`next_run_at` datetime NOT NULL,\n\t`running_started_at` datetime,\n\t`last_run_at` datetime,\n\t`last_error` text,\n\t`attempts` integer DEFAULT 0 NOT NULL,\n\t`payload_json` text NOT NULL,\n\t`prompt_preview` text NOT NULL,\n\t`channel_id` text,\n\t`thread_id` text,\n\t`session_id` text,\n\t`project_directory` text,\n\t`created_at` datetime DEFAULT CURRENT_TIMESTAMP,\n\t`updated_at` datetime DEFAULT CURRENT_TIMESTAMP,\n\tCONSTRAINT `fk_scheduled_tasks_channel_id_channel_directories_channel_id_fk` FOREIGN KEY (`channel_id`) REFERENCES `channel_directories`(`channel_id`) ON UPDATE CASCADE ON DELETE SET NULL,\n\tCONSTRAINT `fk_scheduled_tasks_thread_id_thread_sessions_thread_id_fk` FOREIGN KEY (`thread_id`) REFERENCES `thread_sessions`(`thread_id`) ON UPDATE CASCADE ON DELETE SET NULL\n);\n\nCREATE TABLE IF NOT EXISTS `session_sleeps` (\n\t`session_id` text PRIMARY KEY,\n\t`wake_at` datetime NOT NULL,\n\t`reason` text,\n\t`status` text DEFAULT 'planned' NOT NULL,\n\t`delivery_id` text NOT NULL,\n\t`attempts` integer DEFAULT 0 NOT NULL,\n\t`last_attempt_at` datetime,\n\t`created_at` datetime DEFAULT CURRENT_TIMESTAMP\n);\n\nCREATE TABLE IF NOT EXISTS `thread_sessions` (\n\t`thread_id` text PRIMARY KEY,\n\t`session_id` text NOT NULL,\n\t`source` text DEFAULT 'kimaki' NOT NULL,\n\t`last_synced_name` text,\n\t`parent_session_id` text,\n\t`created_at` datetime DEFAULT CURRENT_TIMESTAMP,\n\t`updated_at` datetime DEFAULT CURRENT_TIMESTAMP\n);\n\nCREATE INDEX IF NOT EXISTS `scheduled_tasks_status_next_run_at_idx` ON `scheduled_tasks` (`status`,`next_run_at`);\nCREATE INDEX IF NOT EXISTS `scheduled_tasks_channel_id_status_idx` ON `scheduled_tasks` (`channel_id`,`status`);\nCREATE INDEX IF NOT EXISTS `scheduled_tasks_thread_id_status_idx` ON `scheduled_tasks` (`thread_id`,`status`);\nCREATE INDEX IF NOT EXISTS `session_sleeps_status_wake_at_idx` ON `session_sleeps` (`status`,`wake_at`);"

package/src/schema.ts

@@ -124,6 +124,14 @@ export const channel_mention_mode = s.sqliteTable('channel_mention_mode', {
   updated_at: datetime('updated_at').default(orm.sql`CURRENT_TIMESTAMP`).$onUpdate(() => new Date()),
 })
 
+// /toggle-coordinator choice of a project channel. Missing: the `--coordinator` default.
+export const channel_coordinator = s.sqliteTable('channel_coordinator', {
+  channel_id: s.text('channel_id').primaryKey().notNull().references(() => channel_directories.channel_id, { onUpdate: 'cascade' }),
+  enabled: s.integer('enabled', { mode: 'number' }).notNull(),
+  created_at: datetime('created_at').default(orm.sql`CURRENT_TIMESTAMP`),
+  updated_at: datetime('updated_at').default(orm.sql`CURRENT_TIMESTAMP`).$onUpdate(() => new Date()),
+})
+
 export const scheduled_tasks = s.sqliteTable('scheduled_tasks', {
   id: s.integer('id', { mode: 'number' }).primaryKey({ autoIncrement: true }).notNull(),
   status: s.text('status', { enum: ['planned', 'running', 'completed', 'cancelled', 'failed'] }).notNull().default('planned'),
@@ -176,6 +184,7 @@ export const relations = defineRelations({
   channel_worktrees,
   channel_verbosity,
   channel_mention_mode,
+  channel_coordinator,
   scheduled_tasks,
   session_sleeps,
 }, (r) => ({
@@ -203,6 +212,7 @@ export const relations = defineRelations({
     channel_worktree: r.one.channel_worktrees({ from: r.channel_directories.channel_id, to: r.channel_worktrees.channel_id }),
     channel_verbosity: r.one.channel_verbosity({ from: r.channel_directories.channel_id, to: r.channel_verbosity.channel_id }),
     channel_mention_mode: r.one.channel_mention_mode({ from: r.channel_directories.channel_id, to: r.channel_mention_mode.channel_id }),
+    channel_coordinator: r.one.channel_coordinator({ from: r.channel_directories.channel_id, to: r.channel_coordinator.channel_id }),
     scheduled_tasks: r.many.scheduled_tasks(),
   },
   channel_models: {
@@ -220,6 +230,9 @@ export const relations = defineRelations({
   channel_mention_mode: {
     channel: r.one.channel_directories({ from: r.channel_mention_mode.channel_id, to: r.channel_directories.channel_id }),
   },
+  channel_coordinator: {
+    channel: r.one.channel_directories({ from: r.channel_coordinator.channel_id, to: r.channel_directories.channel_id }),
+  },
   scheduled_tasks: {
     channel: r.one.channel_directories({ from: r.scheduled_tasks.channel_id, to: r.channel_directories.channel_id }),
     thread: r.one.thread_sessions({ from: r.scheduled_tasks.thread_id, to: r.thread_sessions.thread_id }),