kimaki 1.3.0 → 1.4.0

package/src/cli/bot.ts

@@ -8,10 +8,10 @@ import fs from 'node:fs'
 import path from 'node:path'
 import { setTimeout as sleep } from 'node:timers/promises'
 import dedent from 'string-dedent'
-import type { Goke } from 'goke'
+import { wrapJsonSchema, type Goke } from 'goke'
 
 import { distCliEntry, writeAutostartScript } from '../autostart.ts'
-import { parseDisabledSkills } from '../builtin-skills.ts'
+import { parseDisabledPromptSections, parseDisabledSkills, PROMPT_SECTIONS } from '../builtin-skills.ts'
 import { callBot, DEFAULT_LOCK_PORT, RESTART_EXIT_CODE, startLockServer } from '../lock-server.ts'
 import { parseDuration } from '../duration.ts'
 import { createLogger, setLogFile } from '../logger.ts'
@@ -89,9 +89,9 @@ export function registerStartCommand(cli: Goke) {
     .option('--restart-onboarding', 'Choose credentials again')
     .option('--worktrees', 'Use a fresh Git worktree for new sessions unless the channel overrides it')
     .option('--allow-all-users', 'Every server member can use the bot (role "no-kimaki" still denies; provider login stays admin-only)')
-    .option('--message-tool', 'Discord shows only a concise reply the agent sends with a send_message tool; plain text stays visible in the OpenCode TUI')
     .option('--voice <name>', 'Voice of voice calls, saved for later starts (e.g. cove, juniper, sol). "default" resets it')
     .option('--disable-skills <list>', 'Built-in Kimaki skills to turn off: "all" or a comma separated list (kimaki-debug,kimaki-tunnel)')
+    .option('--disable-prompt <section>', wrapJsonSchema<string[]>({ type: 'array', items: { type: 'string' }, description: `System prompt section to remove from new sessions (repeatable): ${PROMPT_SECTIONS.join(', ')}` }))
     .option('--no-analytics', 'Disable anonymous usage analytics (same as KIMAKI_STRADA_ENABLED=0)')
     .option('--if-not-running', 'Start only if no bot runs; never stop the running one (used by autostart)')
     .action(async (options) => {
@@ -130,6 +130,8 @@ export function registerStartCommand(cli: Goke) {
       const urls = gatewayUrlsFromEnv()
       const disabledSkills = parseDisabledSkills(options.disableSkills)
       if (disabledSkills instanceof Error) fail(disabledSkills)
+      const disabledPrompt = parseDisabledPromptSections(options.disablePrompt)
+      if (disabledPrompt instanceof Error) fail(disabledPrompt)
       const machine = options.machineName ?? defaultMachineName()
       // Validated before the lock, so a typo never stops the running bot. null: reset to the default.
       const voice = (() => {
@@ -220,7 +222,7 @@ export function registerStartCommand(cli: Goke) {
         autoWorktrees: Boolean(options.worktrees),
         allowAllUsers: Boolean(options.allowAllUsers),
         disabledSkills,
-        messageTool: Boolean(options.messageTool),
+        disabledPrompt,
       })
       if (bot instanceof Error) failStartup(bot)
       // exit() keeps process.exitCode: the restart route sets RESTART_EXIT_CODE before its SIGTERM.
@@ -250,7 +252,7 @@ export function registerStartCommand(cli: Goke) {
           ...(options.worktrees ? ['--worktrees'] : []),
           ...(options.allowAllUsers ? ['--allow-all-users'] : []),
           ...(options.disableSkills ? ['--disable-skills', options.disableSkills] : []),
-          ...(options.messageTool ? ['--message-tool'] : []),
+          ...disabledPrompt.flatMap((section) => ['--disable-prompt', section]),
           ...(options.noAnalytics ? ['--no-analytics'] : []),
           ...(options.machineName ? ['--machine-name', options.machineName] : []),
         ] })

package/src/cli-lock.e2e.test.ts

@@ -376,9 +376,9 @@ test('CLI help documents the supported P7 commands', async () => {
       --restart-onboarding          Choose credentials again
       --worktrees                   Use a fresh Git worktree for new sessions unless the channel overrides it
       --allow-all-users             Every server member can use the bot (role "no-kimaki" still denies; provider login stays admin-only)
-      --message-tool                Discord shows only a concise reply the agent sends with a send_message tool; plain text stays visible in the OpenCode TUI
       --voice <name>                Voice of voice calls, saved for later starts (e.g. cove, juniper, sol). "default" resets it
       --disable-skills <list>       Built-in Kimaki skills to turn off: "all" or a comma separated list (kimaki-debug,kimaki-tunnel)
+      --disable-prompt <section>    System prompt section to remove from new sessions (repeatable): discord-permissions, kimaki-debugging, file-upload-requests, action-buttons, session-sleep, session-abort, cross-project-commands, waiting-sessions, critique-diffs, markdown-formatting, discord-callouts, search-result-urls, ascii-diagrams
       --no-analytics                Disable anonymous usage analytics (same as KIMAKI_STRADA_ENABLED=0)
       --if-not-running              Start only if no bot runs; never stop the running one (used by autostart)
       -h, --help                    Display this message

package/src/event-loop.ts

@@ -67,7 +67,6 @@ export function createEventLoop({
   effects,
   recorder,
   analytics,
-  messageTool,
   onRunEnded,
   onTranscriptDue,
 }: {
@@ -77,8 +76,6 @@ export function createEventLoop({
   effects: EffectsRunner
   recorder: EventRecorder
   analytics: Analytics
-  // `kimaki --message-tool`: plain text of root sessions stays hidden (Prefs.messageTool).
-  messageTool: boolean
   // Every finished or failed run of a thread's root session (voice call notifications).
   onRunEnded: (run: RunEnded) => void
   // A root session stopped running (also after an interrupt): its transcript file is stale.
@@ -125,7 +122,7 @@ export function createEventLoop({
     if (!view) return
     const verbosity = state.verbosity[view.channelId] ?? verbosityFromV1(null)
     const contextLimits = modelLimits.get(view.directory)?.limits ?? {}
-    const result = reduce({ view, event, prefs: { verbosity, contextLimits, messageTool } })
+    const result = reduce({ view, event, prefs: { verbosity, contextLimits } })
     if (result.view !== view) store.setState((current) => ({ threads: { ...current.threads, [threadId]: result.view } }))
     effects.run(threadId, result.effects)
     if (event.type === 'session.moved' && event.data.sessionID === view.sessionId) void loadModelLimits(event.data.location.directory)

package/src/main.ts

@@ -9,6 +9,7 @@ import * as errore from 'errore'
 import { createAgentUi } from './agent-ui.ts'
 import type { Analytics } from './analytics.ts'
 import { oc, type Bot } from './bot.ts'
+import type { PromptSection } from './builtin-skills.ts'
 import { openDb } from './db.ts'
 import { createEffectsRunner } from './effects.ts'
 import { DiscordError } from './errors.ts'
@@ -68,8 +69,8 @@ export type StartBotOptions = {
   allowAllUsers?: boolean
   // Built-in skill ids denied in new sessions (builtin-skills.ts).
   disabledSkills?: readonly string[]
-  // `kimaki --message-tool`: agents also reply through send_message; Discord hides their plain text.
-  messageTool?: boolean
+  // Static instruction parts left out of new sessions (system-prompt.ts).
+  disabledPrompt?: readonly PromptSection[]
 }
 
 export type BotHandle = Bot & {
@@ -148,7 +149,7 @@ export async function startBot(options: StartBotOptions): Promise<Error | BotHan
       if (result instanceof Error) logger.warn(`transcript of ${sessionId} not synced`, result)
     })
   }
-  const eventLoop = createEventLoop({ store, db, discord, effects, recorder, analytics: options.analytics, messageTool: options.messageTool ?? false, onRunEnded: voiceCalls.runEnded, onTranscriptDue })
+  const eventLoop = createEventLoop({ store, db, discord, effects, recorder, analytics: options.analytics, onRunEnded: voiceCalls.runEnded, onTranscriptDue })
   const loaded = await eventLoop.load()
   if (loaded instanceof Error) return loaded
   // Before the service is used, so a service started by ensure() loads it at once.
@@ -187,7 +188,7 @@ export async function startBot(options: StartBotOptions): Promise<Error | BotHan
     autoWorktrees: options.autoWorktrees ?? false,
     allowAllUsers: options.allowAllUsers ?? false,
     disabledSkills: options.disabledSkills ?? [],
-    messageTool: options.messageTool ?? false,
+    disabledPrompt: options.disabledPrompt ?? [],
     features: { withSleepLock: createSleepLock(), waitForPlugin: createPluginWait({ opencode }), agentUi, voiceCalls },
   }
   const scheduler = createScheduler({

package/src/markdown/markdown.test.ts

@@ -412,3 +412,14 @@ test('edge cases: 2500-char code line, fence info line inside a fence, oversized
 
   expect(markdownPayloads('<callout accent="#ef4444"></callout>')).toMatchInlineSnapshot(`[]`)
 })
+
+test('empty blockquote lines get a trailing space so Discord keeps the quote', () => {
+  const text = '**1. To a@b.com**\n\n> Hi Mohammad,\n>\n> Your subscription is cancelled.\n>\n> Tommy\n\nDone.'
+  const segments = renderMarkdown(text)
+  expect(segments.map((segment) => ('markdown' in segment ? JSON.stringify(segment.markdown.split('\n')) : segment.kind)))
+    .toMatchInlineSnapshot(`
+      [
+        "["**1. To a@b.com**","","> Hi Mohammad,","> ","> Your subscription is cancelled.","> ","> Tommy","","Done."]",
+      ]
+    `)
+})

package/src/markdown/render-markdown.ts

@@ -5,6 +5,7 @@
 //        ├─ table                ──▶ table segment (Components V2 later)
 //        ├─ heading depth > 3    ──▶ clamped to ###
 //        ├─ list with code items ──▶ code lifted after its item
+//        ├─ blockquote           ──▶ bare ">" lines become "> "
 //        └─ other nodes          ──▶ original source slices, packed into ≤ limit
 //
 // Text is sliced from the original source by node offsets, never
@@ -217,7 +218,8 @@ function nodePieces(source: string, node: RootContent, limit: number): string[]
     return unnestList(source, node, limit).flatMap((piece) => (piece.length <= limit ? [piece] : splitText(piece, limit)))
   }
   if (node.type === 'code') return codePieces(source, node, limit)
-  const text = slice(source, node)
+  // Discord quotes need "> " plus a space; a bare ">" line shows as a literal ">".
+  const text = node.type === 'blockquote' ? slice(source, node).replace(/^( *>)$/gm, '$1 ') : slice(source, node)
   if (text.length <= limit) return [text]
   if (node.type === 'list') {
     const items = node.children.map((item) => slice(source, item))

package/src/plugin/index.ts

@@ -1,5 +1,5 @@
-import type { JsonValue } from '@opencode/client'
 import { Plugin, Skill } from '@opencode/plugin'
+import type { SessionContext } from '@opencode/plugin/promise/session'
 import { Schema } from 'effect'
 import { execFile } from 'node:child_process'
 import { promisify } from 'node:util'
@@ -8,7 +8,7 @@ import path from 'node:path'
 import { autostartBot } from '../autostart.ts'
 import { readBuiltinSkills } from '../builtin-skills.ts'
 import { fileEditTool, recordToolEdits } from '../file-edit-log.ts'
-import { MESSAGE_MODE_INSTRUCTIONS, MESSAGE_TOOL, MESSAGE_TOOL_DESCRIPTION, MESSAGE_TOOL_INPUT, turnContext } from '../system-prompt.ts'
+import { turnContext } from '../system-prompt.ts'
 
 const exec = promisify(execFile)
 
@@ -32,32 +32,17 @@ export default Plugin.define({
         }
       })
     }
-    // metadata.kimaki of the session, or of the thread's root for a subagent (`root: false`).
-    async function marker(sessionID: string): Promise<{ fields: Map<string, JsonValue>; root: boolean } | null> {
+    async function marker(sessionID: string) {
       const session = await ctx.session.get({ sessionID }).catch(() => null)
       const value: unknown = session?.metadata?.['kimaki']
       if (!value || typeof value !== 'object' || Array.isArray(value)) return null
       const current = new Map(Object.entries(value))
-      if (!session?.parentID) return { fields: current, root: true }
+      if (!session?.parentID) return current
       const parent = await ctx.session.get({ sessionID: session.parentID }).catch(() => null)
       const parentMarker = parent?.metadata?.['kimaki']
-      if (parentMarker && typeof parentMarker === 'object' && !Array.isArray(parentMarker) && parentMarker['threadId'] === current.get('threadId')) {
-        const root = await marker(session.parentID)
-        return root && { fields: root.fields, root: false }
-      }
-      return { fields: current, root: true }
+      if (parentMarker && typeof parentMarker === 'object' && !Array.isArray(parentMarker) && parentMarker['threadId'] === current.get('threadId')) return marker(session.parentID)
+      return current
     }
-    // Registered for every session; the context hook removes it outside message mode.
-    await ctx.tool.transform((editor) => {
-      editor.add({
-        name: MESSAGE_TOOL,
-        description: MESSAGE_TOOL_DESCRIPTION,
-        input: MESSAGE_TOOL_INPUT,
-        options: { codemode: false },
-        // Discord renders the call input (thread-reducer.ts); the tool itself does nothing.
-        execute: async () => ({ content: 'Message sent to the user.' }),
-      })
-    })
     // The git branch reaches the model as a synthetic message saved right before
     // the user prompt, only when it changed. Text in event.system would change the
     // cached prompt prefix on every branch switch. The prompt hook runs before
@@ -74,28 +59,14 @@ export default Plugin.define({
       if (last?.type === 'synthetic' && last.text === text) return
       await ctx.session.synthetic({ sessionID: event.sessionID, text, delivery: event.delivery, resume: false }).catch(() => undefined)
     })
-    // send_message only for root sessions of a bot started with --message-tool.
-    // Every request kind that carries the tool list gets the same tools and system
-    // text, so the prompt cache keeps hitting and no other session ever sees the tool.
-    async function applyMessageMode(event: { sessionID: string; tools: Record<string, unknown>; system: Array<{ type: 'text'; text: string }> }) {
-      const info = await marker(event.sessionID)
-      const messageMode = info?.root === true && info.fields.get('messageTool') === true
-      if (!messageMode) delete event.tools[MESSAGE_TOOL]
-      else event.system.push({ type: 'text', text: MESSAGE_MODE_INSTRUCTIONS })
-      return info
-    }
-    await ctx.session.hook('compaction', async (event) => {
-      await applyMessageMode(event)
-    })
-    await ctx.session.hook('generate', async (event) => {
-      await applyMessageMode(event)
-    })
-    await ctx.session.hook('context', async (event) => {
+    // Runs for every request kind: turns (context), compaction and generate (OpenCode
+    // `warming` keep-alive requests). All kinds must get the same system text, tools
+    // and messages, or the provider prompt cache misses.
+    const shapeRequest = async (event: SessionContext) => {
       // The only prompt change for every session, TUI included. The ID never
       // changes in a session, so the cached prompt prefix stays stable.
       event.system.push({ type: 'text', text: `OpenCode session ID: ${event.sessionID}` })
-      const info = await applyMessageMode(event)
-      if (!info) return
+      if (!(await marker(event.sessionID))) return
       // The <discord-user> context of each prompt, built from its metadata, so the
       // stored text stays clean for the TUI and other clients. Same metadata, same
       // text on every request: the cached prompt prefix stays stable.
@@ -121,12 +92,15 @@ export default Plugin.define({
           ...properties,
         } }
       }
-    })
+    }
+    await ctx.session.hook('context', shapeRequest)
+    await ctx.session.hook('compaction', shapeRequest)
+    await ctx.session.hook('generate', shapeRequest)
     await ctx.tool.hook('execute.before', async (event) => {
       if (event.tool !== 'shell' || !event.input || typeof event.input !== 'object' || Array.isArray(event.input)) return
       const info = await marker(event.sessionID)
-      const dataDir = info?.fields.get('dataDir')
-      const lockPort = info?.fields.get('lockPort')
+      const dataDir = info?.get('dataDir')
+      const lockPort = info?.get('lockPort')
       if (typeof dataDir !== 'string' || typeof lockPort !== 'number') return
       if (!('command' in event.input) || typeof event.input.command !== 'string') return
       const quote = (value: string) => `'${value.replaceAll("'", "'\\''")}'`
@@ -135,7 +109,7 @@ export default Plugin.define({
     // File edits feed `kimaki session editors` (v1-compatible JSONL index).
     await ctx.tool.hook('execute.after', async (event) => {
       if (event.status !== 'completed' || !fileEditTool(event.tool)) return
-      const dataDir = (await marker(event.sessionID))?.fields.get('dataDir')
+      const dataDir = (await marker(event.sessionID))?.get('dataDir')
       if (typeof dataDir !== 'string') return
       // Plugins stay silent: a failed append only loses one index entry.
       const recorded = await recordToolEdits({ dataDir, directory: ctx.location.directory, sessionId: event.sessionID, tool: event.tool, input: event.input })

package/src/session-events.ts

@@ -110,9 +110,13 @@ export async function resolveSession({
 type Message = Awaited<ReturnType<OpenCodeClient['message']['list']>>['data'][number]
 type Session = Awaited<ReturnType<OpenCodeClient['session']['get']>>
 
+// Long enough for most edits, commands and subagent prompts; huge writes stay short.
+const TOOL_INPUT_LIMIT = 5000
+
 function renderMessage(message: Message, options: { thinking?: boolean; verbose?: boolean }): string {
   const time = new Date(message.time.created).toISOString()
-  if (message.type === 'user') return `## user ${time}\n\n${message.text}`
+  if (message.type === 'user' || message.type === 'synthetic' || message.type === 'system') return `## ${message.type} ${time}\n\n${message.text}`
+  if (message.type === 'compaction' && message.status !== 'failed') return `## compaction ${time}\n\n${message.summary}`
   if (message.type !== 'assistant') return `## ${message.type} ${time}\n\n${JSON.stringify(message)}`
   const header = `## assistant ${time} (${message.agent}, ${message.model.providerID}/${message.model.id})`
   const parts = message.content.map((part) => {
@@ -120,7 +124,7 @@ function renderMessage(message: Message, options: { thinking?: boolean; verbose?
     if (part.type === 'reasoning') return options.thinking ? part.text : ''
     if (part.type === 'tool') {
       const state = part.state
-      const input = options.verbose ? JSON.stringify(state.input ?? {}) : JSON.stringify(state.input ?? {}).slice(0, 500)
+      const input = options.verbose ? JSON.stringify(state.input ?? {}) : JSON.stringify(state.input ?? {}).slice(0, TOOL_INPUT_LIMIT)
       const error = state.status === 'error' ? `\nerror: ${JSON.stringify(state).slice(0, 500)}` : ''
       const output = options.verbose && state.status === 'completed' ? `\n${JSON.stringify(state.content)}` : ''
       return `tool ${part.name} [${state.status}] ${input}${error}${output}`
@@ -158,7 +162,7 @@ function renderSession({ session, messages, thinking, verbose }: { session: Pick
 }
 
 // Transcripts: <dataDir>/transcripts/<sessionId>.md, the `session read` markdown
-// (no thinking, no tool outputs) so agents can search every session with rg.
+// with thinking but no tool outputs, so agents can search every session with rg.
 // The file mtime is the session's time.updated: a file at least that new is current.
 export function transcriptsDir({ dataDir }: { dataDir: string }): string {
   return path.join(dataDir, 'transcripts')
@@ -172,7 +176,7 @@ export async function writeTranscript({ client, dataDir, session }: { client: Op
   const temp = `${file}.${process.pid}.${crypto.randomUUID()}.tmp`
   const written = await (async () => {
     await fs.promises.mkdir(dir, { recursive: true, mode: 0o700 })
-    await fs.promises.writeFile(temp, `${renderSession({ session, messages })}\n`, { mode: 0o600 })
+    await fs.promises.writeFile(temp, `${renderSession({ session, messages, thinking: true })}\n`, { mode: 0o600 })
     await fs.promises.utimes(temp, session.time.updated / 1000, session.time.updated / 1000)
     await fs.promises.rename(temp, file)
   })().catch((cause) => new ConfigError({ reason: `Cannot write ${file}`, cause }))

package/src/sessions.ts

@@ -12,7 +12,6 @@ import * as orm from 'drizzle-orm'
 import {
   cliContext,
   globalModel,
-  markerIsCurrent,
   oc,
   parseModel,
   projectOf,
@@ -204,6 +203,7 @@ async function putInstructions(
     agents,
     parentSessionId,
     scheduledTask,
+    disabled: bot.disabledPrompt,
   })
   const put = await oc(bot, 'instructions.entry.put', (client) =>
     client.session.instructions.entry.put({ sessionID: sessionId, key: INSTRUCTION_KEY, value }),
@@ -274,7 +274,7 @@ export async function ensureSessionMarker(
   const info = await oc(bot, `get session ${sessionId}`, (client) => client.session.get({ sessionID: sessionId }))
   if (info instanceof Error) return info
   const marker = readMarker(info.metadata)
-  if (marker && markerIsCurrent(bot, marker)) return
+  if (marker && marker.dataDir === bot.dataDir && marker.lockPort === bot.lockPort) return
   // Instructions first: the marker means "set up", so a failure here is retried on the next input.
   if (!marker) {
     logger.log(`adopting legacy session ${sessionId} of thread ${thread.id}`)
@@ -304,7 +304,7 @@ export async function refreshCliContext(bot: Bot) {
     }
     const marker = readMarker(info.metadata)
     if (!marker) continue
-    if (markerIsCurrent(bot, marker)) continue
+    if (marker.dataDir === bot.dataDir && marker.lockPort === bot.lockPort) continue
     const metadata = { ...info.metadata, kimaki: { ...marker.fields, ...cliContext(bot) } }
     const result = await oc(bot, 'refresh Kimaki CLI context', (client) => client.session.update({ sessionID: sessionId, metadata }))
     if (result instanceof Error) return result