kimaki 1.4.0 → 1.5.0

package/src/test/harness.ts

@@ -2,7 +2,8 @@
 // temp root with private XDG dirs and SQLite DB, started with the same
 // `serve --service` command the user's service uses, so the bot connects
 // through Service.discover() exactly like production. The bot runs in-process
-// against discord-digital-twin.
+// against discord-digital-twin. The model is opencode-deterministic-provider,
+// answered by startTestModel() in this process.
 
 import { execFile, execFileSync, spawn, type ChildProcess } from 'node:child_process'
 import { promisify } from 'node:util'
@@ -22,10 +23,13 @@ import { ChannelType, ComponentType, type APIMessage } from 'discord.js'
 import { DigitalDiscord } from 'discord-digital-twin/src'
 import {
   buildDeterministicOpencode2Config,
+  getLatestUserText,
+  resolveResponse,
   type DeterministicMatcher,
 } from 'opencode-deterministic-provider'
 
 import { disabledAnalytics, type Analytics } from '../analytics.ts'
+import type { WarmupTimers } from '../bot.ts'
 import { GATEWAY_APP_ID, saveCredentials, type Credentials } from '../credentials.ts'
 import { openDb, verbosityToV1, type Verbosity } from '../db.ts'
 import type { ToolInput } from '../format-parts.ts'
@@ -60,8 +64,50 @@ export function opencodeBinary(): string {
   return path.join(path.dirname(packageJsonPath), 'bin/opencode.exe')
 }
 
+export type TestModelRequest = {
+  latestUserText: string
+  // The whole prompt as JSON: system, history and tool results.
+  raw: string
+}
+
+// The deterministic model, answered in this process: OpenCode's provider POSTs each
+// prompt here. Tests read `requests` to check what the model saw and may push matchers.
+export type TestModel = {
+  matchers: DeterministicMatcher[]
+  requests: TestModelRequest[]
+}
+
+async function startTestModel({ matchers }: { matchers: DeterministicMatcher[] }) {
+  const model: TestModel = { matchers, requests: [] }
+  const server = http.createServer((request, response) => {
+    const chunks: Buffer[] = []
+    request.on('data', (chunk: Buffer) => chunks.push(chunk))
+    request.on('end', () => {
+      try {
+        const { prompt } = JSON.parse(Buffer.concat(chunks).toString('utf8')) as Parameters<typeof resolveResponse>[0]
+        model.requests.push({ latestUserText: getLatestUserText({ prompt }), raw: JSON.stringify(prompt) })
+        response.setHeader('content-type', 'application/json')
+        response.end(JSON.stringify(resolveResponse({ prompt, settings: { strict: false, matchers: model.matchers } })))
+      } catch (error) {
+        // The provider turns this into a model error, so the run fails visibly instead of hanging.
+        response.statusCode = 500
+        response.end(error instanceof Error ? error.stack : String(error))
+      }
+    })
+  })
+  await new Promise<void>((resolve) => server.listen(0, '127.0.0.1', resolve))
+  const address = server.address()
+  if (!address || typeof address !== 'object') throw new Error('test model has no port')
+  return {
+    model,
+    url: `http://127.0.0.1:${address.port}`,
+    stop: () => new Promise<void>((resolve) => server.close(() => resolve())),
+  }
+}
+
 export type OpencodeTestServer = {
   root: string
+  model: TestModel
   serviceFile: string
   // Global OpenCode config dir of this server (XDG_CONFIG_HOME/opencode).
   configDir: string
@@ -91,7 +137,7 @@ export async function startOpencodeTestServer({
   // Appended after the allow-all rules: the last matching rule wins.
   permissions?: Array<{ action: string; resource: string; effect: 'allow' | 'deny' | 'ask' }>
   // More deterministic models next to TEST_MODEL, e.g. with thinking variants.
-  models?: Record<string, { name: string; variants?: Array<{ id: string }> }>
+  models?: Record<string, { name: string; variants?: Array<{ id: string }>; limit?: { context?: number; output?: number } }>
   // Agent overrides and custom agents (config `agents`).
   agents?: Record<string, { description?: string; mode?: 'primary' | 'subagent' | 'all'; hidden?: boolean; model?: string }>
   // MCP servers (config `mcp.servers`).
@@ -104,9 +150,10 @@ export async function startOpencodeTestServer({
   fs.mkdirSync(projectDirectory, { recursive: true })
   execFileSync('git', ['init', '-q', '-b', 'main'], { cwd: projectDirectory })
   const serviceFile = path.join(root, 'state', 'opencode', 'service.json')
+  const testModel = await startTestModel({ matchers })
   const config = buildDeterministicOpencode2Config({
     model: TEST_MODEL,
-    settings: { strict: false, matchers },
+    settings: { responderUrl: testModel.url },
     permissions: [
       { action: 'shell', resource: '*', effect: 'allow' },
       { action: 'edit', resource: '*', effect: 'allow' },
@@ -183,6 +230,7 @@ export async function startOpencodeTestServer({
   await start()
   return {
     root,
+    model: testModel.model,
     serviceFile,
     configDir: path.join(env.XDG_CONFIG_HOME, 'opencode'),
     dbFile: path.join(env.XDG_DATA_HOME, 'opencode', 'opencode.db'),
@@ -193,6 +241,7 @@ export async function startOpencodeTestServer({
     start,
     stop: async () => {
       await kill()
+      await testModel.stop()
       fs.rmSync(root, { recursive: true, force: true })
     },
   }
@@ -499,6 +548,8 @@ export async function startTestBot({
   analytics,
   clock,
   schedulerIntervalMs,
+  coordinator,
+  warmupTimers,
 }: {
   dataDir: string
   twin: TestTwin
@@ -519,6 +570,9 @@ export async function startTestBot({
   // Scheduling tests pass manualClock() and null, then call bot.scheduler.runDueTasks().
   clock?: Clock
   schedulerIntervalMs?: number | null
+  // Default off (`--coordinator false`) so most tests get threads; coordinator tests pass true.
+  coordinator?: boolean
+  warmupTimers?: WarmupTimers
 }): Promise<BotHandle> {
   // What credential resolution saves in production; `kimaki project add` reads it.
   const credentials: Credentials = twin.discord.botToken.includes(':')
@@ -535,7 +589,7 @@ export async function startTestBot({
   if (lock instanceof Error) throw lock
   const bot = await startBot({
     dataDir,
-    kimakiCommand: `'${process.execPath}' --import '${createRequire(import.meta.url).resolve('tsx')}' '${path.resolve('src/cli.ts')}'`,
+    kimakiArgv: [process.execPath, '--import', createRequire(import.meta.url).resolve('tsx'), path.resolve('src/cli.ts')],
     token: credentials.token,
     appId: credentials.appId,
     lock,
@@ -548,6 +602,8 @@ export async function startTestBot({
     ...(clock && { clock }),
     ...(schedulerIntervalMs !== undefined && { schedulerIntervalMs }),
     ...(realtimeBaseUrls && { realtimeBaseUrls }),
+    coordinator: coordinator ?? false,
+    ...(warmupTimers && { warmupTimers }),
     transcriptionBaseUrls: {
       ...(geminiBaseUrl && { gemini: geminiBaseUrl }),
       ...(openaiBaseUrl && { openai: openaiBaseUrl }),
@@ -620,7 +676,8 @@ export function schedulingKit({ suite, dataDir, clock }: {
   }
 }
 
-export type FakeTranscription = { transcription: string; route?: string; agent?: string }
+// delayMs: how long the fake Gemini waits before it answers (not sent back as a tool argument).
+export type FakeTranscription = { transcription: string; route?: string; agent?: string; delayMs?: number }
 
 // A voice message whose audio bytes are the transcription the fake returns.
 export function voiceUrl(result: FakeTranscription): string {
@@ -650,13 +707,15 @@ export async function startFakeGemini(): Promise<FakeGemini> {
       const declaration = body.tools[0]!.functionDeclarations[0]!
       const audio = body.contents[0]!.parts.find((part) => part.inlineData)!.inlineData!
       requests.push({ routes: declaration.parameters.properties.route?.enum ?? null, mimeType: audio.mimeType })
-      const args = JSON.parse(Buffer.from(audio.data, 'base64').toString('utf8')) as FakeTranscription
-      response.setHeader('content-type', 'application/json')
-      response.end(
-        JSON.stringify({
-          candidates: [{ finishReason: 'STOP', content: { parts: [{ functionCall: { name: declaration.name, args } }] } }],
-        }),
-      )
+      const { delayMs = 0, ...args } = JSON.parse(Buffer.from(audio.data, 'base64').toString('utf8')) as FakeTranscription
+      setTimeout(() => {
+        response.setHeader('content-type', 'application/json')
+        response.end(
+          JSON.stringify({
+            candidates: [{ finishReason: 'STOP', content: { parts: [{ functionCall: { name: declaration.name, args } }] } }],
+          }),
+        )
+      }, delayMs)
     })
   })
   const port = await freePort()
@@ -727,14 +786,15 @@ export async function startFakeOpenAI({ result }: { result: FakeTranscription })
 
 export type FakeChatGPT = {
   baseUrl: string
-  // Each POST /transcribe, as ChatGPT received it.
-  requests: Array<{ authorization: string | null; accountId: string | null; filename: string; type: string; audio: Buffer }>
+  // Each POST, as the server received it.
+  requests: Array<{ path: string; authorization: string | null; accountId: string | null; model: string | null; filename: string; type: string; audio: Buffer }>
   // Reply status; tests set 401 to check the API key fallback.
   status: number
   stop: () => Promise<void>
 }
 
 // chatgpt.com/backend-api/transcribe: multipart `file` in, `{ text }` out.
+// Also a local Whisper server (/audio/transcriptions), which takes the same shape plus `model`.
 export async function startFakeChatGPT({ text }: { text: string }): Promise<FakeChatGPT> {
   const fake: Omit<FakeChatGPT, 'baseUrl' | 'stop'> = { requests: [], status: 200 }
   const server = http.createServer((request, response) => {
@@ -745,9 +805,12 @@ export async function startFakeChatGPT({ text }: { text: string }): Promise<Fake
       const form = await new Request('http://fake/transcribe', { method: 'POST', headers, body: Buffer.concat(chunks) }).formData()
       const file = form.get('file')
       if (!(file instanceof File)) throw new Error('fake ChatGPT: no file field')
+      const model = form.get('model')
       fake.requests.push({
+        path: request.url ?? '',
         authorization: headers.get('authorization'),
         accountId: headers.get('chatgpt-account-id'),
+        model: typeof model === 'string' ? model : null,
         filename: file.name,
         type: file.type,
         audio: Buffer.from(await file.arrayBuffer()),

package/src/test/replay.ts

@@ -25,9 +25,11 @@ export function rootSessionId(events: V2Event[]): string {
   return created.data.sessionID
 }
 
+const REPLAY_PROJECT = '/project'
+
 export const DEFAULT_PREFS: Prefs = {
   verbosity: 'tools',
-  contextLimits: { 'openai/gpt-6-luna': 400_000 },
+  models: { 'openai/gpt-6-luna': { name: 'GPT 6 Luna', context: 400_000 } },
 }
 
 export function replay({
@@ -44,8 +46,9 @@ export function replay({
     emptyView({
       sessionId: rootSessionId(events.filter((event): event is V2Event => !event.type.startsWith('kimaki.'))),
       channelId: 'channel',
-      directory: '/project',
+      directory: REPLAY_PROJECT,
       isNew: true,
+      coordinator: false,
     })
   return events.reduce<{ view: ThreadView; effects: Effect[] }>(
     (acc, event) => {
@@ -74,15 +77,18 @@ export function effectLines(effects: Effect[]): string[] {
     if (effect.type === 'viewed') return []
     if (effect.type === 'typing') return `[typing ${effect.on ? 'on' : 'off'}]`
     if (effect.type === 'attachments') return `[attachments ${effect.files.map((file) => file.name).join(', ')}]`
-    if (effect.type === 'markdown') return `${effect.blankLineBefore ? '\\n' : ''}${effect.text}`
+    if (effect.type === 'markdown') return `${effect.replyTo ? `[reply to ${effect.replyTo}] ` : ''}${effect.blankLineBefore ? '\\n' : ''}${effect.text}`
     if (effect.type === 'show') {
       const reply = effect.replyTo ? ` reply to ${effect.replyTo}` : ''
       return `[show ${effect.key}${reply}] ${effect.messages.map(uiLine).join(' | ')}`
     }
-    if (effect.type === 'edit') return `[edit ${effect.key}] ${effect.messages.map(uiLine).join(' | ')}`
-    // Tests have no git checkout: the branch is always main.
+    if (effect.type === 'edit') {
+      const reply = effect.reply === undefined ? [] : [`[reply to ${effect.replyTo ?? effect.key}] ${effect.reply}`]
+      return [`[edit ${effect.key}] ${effect.messages.map(uiLine).join(' | ')}`, ...reply]
+    }
+    // Tests have no git checkout: the branch is always main. The channel runs build in /project.
     if (effect.type === 'footer') {
-      const footer = formatFooter({ ...effect, folder: path.basename(effect.directory), branch: 'main' })
+      const footer = formatFooter({ ...effect, branch: 'main', defaultBranch: null, projectDirectory: REPLAY_PROJECT, defaultAgent: 'build' })
       return effect.notify ? footer : `[silent] ${footer}`
     }
     return effect.text.replace(/^\n/, '\\n')

package/src/thread-reducer.fixtures.test.ts

@@ -11,7 +11,7 @@ test('tools: names from tool.input.started, failed tool lines, read-only tools h
   const { effects } = replay({ events: loadFixture('tools.events.jsonl') })
   expect(effectLines(effects)).toMatchInlineSnapshot(`
     [
-      "» **user:** Do these steps with tools, one by one: 1) run \`ls cli/src | head -5\` with bash, 2) write a file tmp-events/hello.txt containing "hello", 3) edit that file to replace hello with "hello world", 4) glob for **/*.txt under tmp-events, 5) read the file. Then reply with one short line.",
+      "-# » **user:** Do these steps with tools, one by one: 1) run \`ls cli/src | head -5\` with bash, 2) write a file tmp-events/hello.txt containing "hello", 3) edit that file to replace hello with "hello world", 4) glob for **/*.txt under tmp-events, 5) read the file. Then reply with one short line.",
       "[typing on]",
       "-# *using openai/gpt-6-luna low ⋅ build*",
       "-# ┣ shell _ls cli/src \\| head -5_",
@@ -23,7 +23,7 @@ test('tools: names from tool.input.started, failed tool lines, read-only tools h
       "-# ┣ shell _python3 -c "from pathlib import Path; p=Path('tmp-events/hello.txt'); p.write\\_t…_",
       "\\nDone. \`tmp-events/hello.txt\` contains \`hello world\`.",
       "[typing off]",
-      "-# *project ⋅ main ⋅ 17s ⋅ 6% ⋅ gpt-6-luna*",
+      "-# *main ⋅ 17s ⋅ 6% ⋅ gpt-6-luna*",
     ]
   `)
 })
@@ -31,18 +31,18 @@ test('tools: names from tool.input.started, failed tool lines, read-only tools h
 test('tools at text verbosity: text, edits and errors only', () => {
   const { effects } = replay({
     events: loadFixture('tools.events.jsonl'),
-    prefs: { verbosity: 'text', contextLimits: {} },
+    prefs: { verbosity: 'text', models: {} },
   })
   expect(effectLines(effects)).toMatchInlineSnapshot(`
     [
-      "» **user:** Do these steps with tools, one by one: 1) run \`ls cli/src | head -5\` with bash, 2) write a file tmp-events/hello.txt containing "hello", 3) edit that file to replace hello with "hello world", 4) glob for **/*.txt under tmp-events, 5) read the file. Then reply with one short line.",
+      "-# » **user:** Do these steps with tools, one by one: 1) run \`ls cli/src | head -5\` with bash, 2) write a file tmp-events/hello.txt containing "hello", 3) edit that file to replace hello with "hello world", 4) glob for **/*.txt under tmp-events, 5) read the file. Then reply with one short line.",
       "[typing on]",
       "-# *using openai/gpt-6-luna low ⋅ build*",
       "-#  ⨯  shell _Invalid arguments for tool "shell":_",
       "-#  ⨯  shell _Invalid arguments for tool "shell":_",
       "\\nDone. \`tmp-events/hello.txt\` contains \`hello world\`.",
       "[typing off]",
-      "-# *project ⋅ main ⋅ 17s ⋅ gpt-6-luna*",
+      "-# *main ⋅ 17s ⋅ gpt-6-luna*",
     ]
   `)
 })
@@ -51,13 +51,13 @@ test('task-subagent: child tool lines labelled with the agent, no child text, fo
   const { effects, view } = replay({ events: loadFixture('task-subagent.events.jsonl') })
   expect(effectLines(effects)).toMatchInlineSnapshot(`
     [
-      "» **user:** Use the subagent tool with agent "general" to find which file defines the Drizzle SQLite schema in cli/src (the subagent should use glob and read). Then read the first 10 lines of that file yourself with the read tool and answer in 2 short sentences.",
+      "-# » **user:** Use the subagent tool with agent "general" to find which file defines the Drizzle SQLite schema in cli/src (the subagent should use glob and read). Then read the first 10 lines of that file yourself with the read tool and answer in 2 short sentences.",
       "[typing on]",
       "-# *using openai/gpt-6-luna low ⋅ build*",
       "-# ┣ general **Find SQLite schema file**",
       "\\nThe Drizzle SQLite schema is defined in \`cli/src/schema.ts\`. Its first lines confirm it defines tables for Kimaki’s local SQLite database.",
       "[typing off]",
-      "-# *project ⋅ main ⋅ 12s ⋅ 6% ⋅ gpt-6-luna*",
+      "-# *main ⋅ 12s ⋅ 6% ⋅ gpt-6-luna*",
     ]
   `)
   expect(view.children).toMatchInlineSnapshot(`
@@ -76,12 +76,12 @@ test('task-parallel: background children show start and end lines only, no foote
   const { effects, view } = replay({ events: loadFixture('task-parallel.events.jsonl') })
   expect(effectLines(effects)).toMatchInlineSnapshot(`
     [
-      "» **user:** In a single step, call the subagent tool twice in parallel, both with agent "general": one to count the .ts files in cli/src/commands using a shell command, one to list the top-level folders of the repo with a shell command. Then reply with both results in 2 lines.",
+      "-# » **user:** In a single step, call the subagent tool twice in parallel, both with agent "general": one to count the .ts files in cli/src/commands using a shell command, one to list the top-level folders of the repo with a shell command. Then reply with both results in 2 lines.",
       "[typing on]",
       "-# *using openai/gpt-6-luna low ⋅ build*",
       "-# ┣ general **Count command TypeScript** (background)",
       "-# ┣ general **List repo folders** (background)",
-      "-# ⬦ general finished: Count command TypeScript",
+      "-# general finished: Count command TypeScript",
       "\\nBoth tasks are running. I’ll report the two results when they finish.",
       "\\n-# ┣ general **List repo folders**",
       "-# ┣ general ⋅ shell _find . -maxdepth 1 -type d -not -name . -print \\| sed 's#^./##' \\| sort_",
@@ -115,16 +115,16 @@ test('abort: no error line for the aborted tool, no footer, next turn is normal'
   const { effects } = replay({ events: loadFixture('abort.events.jsonl') })
   expect(effectLines(effects)).toMatchInlineSnapshot(`
     [
-      "» **user:** Run \`sleep 30 && echo never\` with bash, then summarize.",
+      "-# » **user:** Run \`sleep 30 && echo never\` with bash, then summarize.",
       "[typing on]",
       "-# *using openai/gpt-6-luna low ⋅ build*",
       "-# ┣ shell _sleep 30 && echo never_",
       "[typing off]",
-      "» **user:** Say only: resumed after abort.",
+      "-# » **user:** Say only: resumed after abort.",
       "[typing on]",
       "resumed after abort",
       "[typing off]",
-      "-# *project ⋅ main ⋅ 1s ⋅ 6% ⋅ gpt-6-luna*",
+      "-# *main ⋅ 1s ⋅ 6% ⋅ gpt-6-luna*",
     ]
   `)
 })
@@ -185,23 +185,25 @@ test('queue-plain: acks with positions while busy, silent footer before each del
   const { effects, view } = replay({ events: loadFixture('queue-plain.events.jsonl') })
   expect(effectLines(effects)).toMatchInlineSnapshot(`
     [
-      "» **user:** Run \`sleep 6 && echo slow-done\` with bash, then say done.",
+      "-# » **user:** Run \`sleep 6 && echo slow-done\` with bash, then say done.",
       "[typing on]",
       "-# *using openai/gpt-6-luna low ⋅ build*",
       "-# ┣ shell _sleep 6 && echo slow-done_",
-      "[show queue:msg_0f20347e1001nsJ7W4hOvhBpQb] -# Queued at position 1. Delete the original message to remove it, or use /clear-queue position:1",
-      "[show queue:msg_0f20347e500196F4o0voD7LGMV] -# Queued at position 2. Delete the original message to remove it, or use /clear-queue position:2",
+      "[show queue:msg_0f20347e1001nsJ7W4hOvhBpQb] -# » **user:** QUEUED-1: reply with the word apple.
+    -# Queued at position 1. Remove it with /clear-queue position:1",
+      "[show queue:msg_0f20347e500196F4o0voD7LGMV] -# » **user:** QUEUED-2: reply with the word cherry.
+    -# Queued at position 2. Remove it with /clear-queue position:2",
       "\\nDone.",
-      "[silent] -# *project ⋅ main ⋅ 10s ⋅ 6% ⋅ gpt-6-luna*",
-      "[edit queue:msg_0f20347e1001nsJ7W4hOvhBpQb] -# Queued message sent",
-      "» **user:** QUEUED-1: reply with the word apple.",
+      "[silent] -# *main ⋅ 10s ⋅ 6% ⋅ gpt-6-luna*",
+      "[edit queue:msg_0f20347e1001nsJ7W4hOvhBpQb] -# » **user:** QUEUED-1: reply with the word apple.",
+      "[reply to queue:msg_0f20347e1001nsJ7W4hOvhBpQb] -# Queued message sent",
       "apple",
-      "[silent] -# *project ⋅ main ⋅ 2s ⋅ 6% ⋅ gpt-6-luna*",
-      "[edit queue:msg_0f20347e500196F4o0voD7LGMV] -# Queued message sent",
-      "» **user:** QUEUED-2: reply with the word cherry.",
+      "[silent] -# *main ⋅ 2s ⋅ 6% ⋅ gpt-6-luna*",
+      "[edit queue:msg_0f20347e500196F4o0voD7LGMV] -# » **user:** QUEUED-2: reply with the word cherry.",
+      "[reply to queue:msg_0f20347e500196F4o0voD7LGMV] -# Queued message sent",
       "cherry",
       "[typing off]",
-      "-# *project ⋅ main ⋅ 2s ⋅ 6% ⋅ gpt-6-luna*",
+      "-# *main ⋅ 2s ⋅ 6% ⋅ gpt-6-luna*",
     ]
   `)
   expect(view.inbox).toMatchInlineSnapshot(`[]`)
@@ -211,21 +213,25 @@ test('steer-queue: cancelled item edits its ack, interrupted run has no footer',
   const { effects, view } = replay({ events: loadFixture('steer-queue.events.jsonl') })
   expect(effectLines(effects)).toMatchInlineSnapshot(`
     [
-      "» **user:** Run \`sleep 8 && echo slow-done\` with bash, then say done.",
+      "-# » **user:** Run \`sleep 8 && echo slow-done\` with bash, then say done.",
       "[typing on]",
       "-# *using openai/gpt-6-luna low ⋅ build*",
       "-# ┣ shell _sleep 8 && echo slow-done_",
-      "[show queue:msg_0f200f884001tIpWlHhNB8Y5bv] -# Queued at position 1. Delete the original message to remove it, or use /clear-queue position:1",
-      "[show queue:msg_kimaki_queued_b_test1] -# Queued at position 2. Delete the original message to remove it, or use /clear-queue position:2",
-      "[show queue:msg_0f200f88a001SXny4FyIMuMPS6] -# Queued at position 3. Delete the original message to remove it, or use /clear-queue position:3",
-      "[edit queue:msg_kimaki_queued_b_test1] -# Removed from queue",
-      "» **user:** STEER: actually also tell me the current date using bash \`date\`.",
+      "[show queue:msg_0f200f884001tIpWlHhNB8Y5bv] -# » **user:** QUEUED-A: after everything, reply with the word apple.
+    -# Queued at position 1. Remove it with /clear-queue position:1",
+      "[show queue:msg_kimaki_queued_b_test1] -# » **user:** QUEUED-B: reply with the word banana.
+    -# Queued at position 2. Remove it with /clear-queue position:2",
+      "[show queue:msg_0f200f88a001SXny4FyIMuMPS6] -# » **user:** QUEUED-C: reply with the word cherry.
+    -# Queued at position 3. Remove it with /clear-queue position:3",
+      "[edit queue:msg_kimaki_queued_b_test1] -# » **user:** QUEUED-B: reply with the word banana.
+    -# Removed from queue",
+      "-# » **user:** STEER: actually also tell me the current date using bash \`date\`.",
       "[typing off]",
       "[typing on]",
       "-# ┣ shell _date_",
       "\\nDone. The current date is Wed Sep 30 2026.",
       "[typing off]",
-      "-# *project ⋅ main ⋅ 3s ⋅ 6% ⋅ gpt-6-luna*",
+      "-# *main ⋅ 3s ⋅ 6% ⋅ gpt-6-luna*",
     ]
   `)
   // The recorded order (prompt, then interrupt with resume) parks queued items.
@@ -241,21 +247,22 @@ test('queue-parked: parked item runs and echoes after the next prompt, with a fo
   const { effects } = replay({ events: loadFixture('queue-parked.events.jsonl') })
   expect(effectLines(effects)).toMatchInlineSnapshot(`
     [
-      "» **user:** Run \`sleep 6 && echo slow-done\` with bash, then say done.",
+      "-# » **user:** Run \`sleep 6 && echo slow-done\` with bash, then say done.",
       "[typing on]",
       "-# *using openai/gpt-6-luna low ⋅ build*",
       "-# ┣ shell _sleep 6 && echo slow-done_",
-      "[show queue:msg_0f2039909001oR0GJKPGqxOjml] -# Queued at position 1. Delete the original message to remove it, or use /clear-queue position:1",
+      "[show queue:msg_0f2039909001oR0GJKPGqxOjml] -# » **user:** PARKED-1: reply with the word apple.
+    -# Queued at position 1. Remove it with /clear-queue position:1",
       "[typing off]",
-      "» **user:** NEW: reply with the word kiwi.",
+      "-# » **user:** NEW: reply with the word kiwi.",
       "[typing on]",
       "kiwi",
-      "[silent] -# *project ⋅ main ⋅ 3s ⋅ 6% ⋅ gpt-6-luna*",
-      "[edit queue:msg_0f2039909001oR0GJKPGqxOjml] -# Queued message sent",
-      "» **user:** PARKED-1: reply with the word apple.",
+      "[silent] -# *main ⋅ 3s ⋅ 6% ⋅ gpt-6-luna*",
+      "[edit queue:msg_0f2039909001oR0GJKPGqxOjml] -# » **user:** PARKED-1: reply with the word apple.",
+      "[reply to queue:msg_0f2039909001oR0GJKPGqxOjml] -# Queued message sent",
       "apple",
       "[typing off]",
-      "-# *project ⋅ main ⋅ 3s ⋅ 6% ⋅ gpt-6-luna*",
+      "-# *main ⋅ 3s ⋅ 6% ⋅ gpt-6-luna*",
     ]
   `)
 })
@@ -264,7 +271,7 @@ test('question: one dropdown per question, typing off while waiting, edited on r
   const { effects, view } = replay({ events: loadFixture('question.events.jsonl') })
   expect(effectLines(effects)).toMatchInlineSnapshot(`
     [
-      "» **user:** Use the question tool to ask me which color I prefer, with options red, green, blue (single choice), and in the same question tool call add a second question asking which fruits I like with options apple, pear, kiwi (multiple choice). After my answer, reply with one line.",
+      "-# » **user:** Use the question tool to ask me which color I prefer, with options red, green, blue (single choice), and in the same question tool call add a second question asking which fruits I like with options apple, pear, kiwi (multiple choice). After my answer, reply with one line.",
       "[typing on]",
       "-# *using openai/gpt-6-luna low ⋅ build*",
       "[typing off]",
@@ -279,7 +286,7 @@ test('question: one dropdown per question, typing off while waiting, edited on r
     ✓ _apple, kiwi_",
       "You prefer green, and you like apples and kiwi.",
       "[typing off]",
-      "-# *project ⋅ main ⋅ 5s ⋅ 6% ⋅ gpt-6-luna*",
+      "-# *main ⋅ 5s ⋅ 6% ⋅ gpt-6-luna*",
     ]
   `)
   expect(view.forms).toMatchInlineSnapshot(`{}`)
@@ -289,7 +296,7 @@ test('permission: two requests, the rejected one fails its tool call', () => {
   const { effects, view } = replay({ events: loadFixture('permission.events.jsonl') })
   expect(effectLines(effects)).toMatchInlineSnapshot(`
     [
-      "» **user:** Run \`echo first\` with bash. Then run \`echo second\` with bash. Then reply with one line describing what happened.",
+      "-# » **user:** Run \`echo first\` with bash. Then run \`echo second\` with bash. Then reply with one line describing what happened.",
       "[typing on]",
       "-# *using openai/gpt-6-luna low ⋅ build*",
       "-# ┣ shell _echo first_",
@@ -315,7 +322,7 @@ test('permission: two requests, the rejected one fails its tool call', () => {
       "-#  ⨯  shell _Unable to execute command: echo second_",
       "\\n\`echo first\` printed \`first\`; \`echo second\` failed to execute.",
       "[typing off]",
-      "-# *project ⋅ main ⋅ 5s ⋅ 6% ⋅ gpt-6-luna*",
+      "-# *main ⋅ 5s ⋅ 6% ⋅ gpt-6-luna*",
     ]
   `)
   expect(view.permissions).toMatchInlineSnapshot(`{}`)
@@ -323,26 +330,26 @@ test('permission: two requests, the rejected one fails its tool call', () => {
 
 test('shell-background: background shell line even without side effects, finished line when its job ends', () => {
   const events = loadFixture('shell-background.events.jsonl')
-  const view = emptyView({ sessionId: 'ses_ee56d6caeffech0rMI5NTnkky1', channelId: 'channel', directory: '/project', isNew: false })
-  const { effects, view: end } = replay({ events, view, prefs: { verbosity: 'tools', contextLimits: {} } })
+  const view = emptyView({ sessionId: 'ses_ee56d6caeffech0rMI5NTnkky1', channelId: 'channel', directory: '/project', isNew: false, coordinator: false })
+  const { effects, view: end } = replay({ events, view, prefs: { verbosity: 'tools', models: {} } })
   expect(effectLines(effects)).toMatchInlineSnapshot(`
     [
-      "» **user:** start a task in background that runs sleep 100",
+      "-# » **user:** start a task in background that runs sleep 100",
       "[typing on]",
       "-# ┣ shell _Run sleep 100 in background_ (background)",
       "\\nI started \`sleep 100\` in the background (shell ID \`sh_11a929cf5001mAukdL6rQFIbLg\`). It ends in about 100 seconds, and I get a notification when it does.",
       "[typing off]",
-      "-# *project ⋅ main ⋅ 4s ⋅ claude-opus-5-5 ⋅ opus*",
-      "» **user:** is it still running",
+      "-# *main ⋅ 4s ⋅ claude-opus-5-5 ⋅ opus*",
+      "-# » **user:** is it still running",
       "[typing on]",
       "Yes, it is still running (PID 47861). I have not had the completion notification yet.",
       "[typing off]",
-      "-# *project ⋅ main ⋅ 5s ⋅ claude-opus-5-5 ⋅ opus*",
-      "-# ⬦ background shell finished: _Run sleep 100 in background_",
+      "-# *main ⋅ 5s ⋅ claude-opus-5-5 ⋅ opus*",
+      "-# background shell finished: _Run sleep 100 in background_",
       "[typing on]",
       "\\nThe background \`sleep 100\` has finished. It printed no output.",
       "[typing off]",
-      "-# *project ⋅ main ⋅ 2s ⋅ claude-opus-5-5 ⋅ opus*",
+      "-# *main ⋅ 2s ⋅ claude-opus-5-5 ⋅ opus*",
     ]
   `)
   expect(end.shells).toMatchInlineSnapshot(`{}`)
@@ -357,8 +364,8 @@ test('shell: user !cmd output while idle and while busy, synthetic items render
     user-shell-idle
     05de62d feat: make external opencode session sync opt-in via --enable-sync
     \`\`\`",
-      "» **user:** CONTEXT ONLY: the deploy tag is v9.9.9",
-      "» **user:** What did my shell command print, and what is the deploy tag? Also run \`sleep 5\` with bash first.",
+      "-# » **user:** CONTEXT ONLY: the deploy tag is v9.9.9",
+      "-# » **user:** What did my shell command print, and what is the deploy tag? Also run \`sleep 5\` with bash first.",
       "[typing on]",
       "-# *using openai/gpt-6-luna low ⋅ build*",
       "-# ┣ shell _sleep 5_",
@@ -368,7 +375,7 @@ test('shell: user !cmd output while idle and while busy, synthetic items render
     \`\`\`",
       "\\nYour shell command printed \`user-shell-idle\` and \`05de62d feat: make external opencode session sync opt-in via --enable-sync\`. The deploy tag is \`v9.9.9\`.",
       "[typing off]",
-      "-# *project ⋅ main ⋅ 9s ⋅ 6% ⋅ gpt-6-luna*",
+      "-# *main ⋅ 9s ⋅ 6% ⋅ gpt-6-luna*",
     ]
   `)
 })