kimaki 0.4.39 → 0.4.41

package/package.json

@@ -2,18 +2,7 @@
   "name": "kimaki",
   "module": "index.ts",
   "type": "module",
-  "version": "0.4.39",
-  "scripts": {
-    "dev": "tsx --env-file .env src/cli.ts",
-    "prepublishOnly": "pnpm tsc",
-    "dev:bun": "DEBUG=1 bun --env-file .env src/cli.ts",
-    "watch": "tsx scripts/watch-session.ts",
-    "test:events": "tsx test-events.ts",
-    "pcm-to-mp3": "bun scripts/pcm-to-mp3",
-    "test:send": "tsx send-test-message.ts",
-    "register-commands": "tsx scripts/register-commands.ts",
-    "format": "oxfmt src"
-  },
+  "version": "0.4.41",
   "repository": "https://github.com/remorses/kimaki",
   "bin": "bin.js",
   "files": [
@@ -34,27 +23,38 @@
     "@clack/prompts": "^0.11.0",
     "@discordjs/voice": "^0.19.0",
     "@google/genai": "^1.34.0",
-    "@opencode-ai/sdk": "^1.1.12",
+    "@opencode-ai/sdk": "^1.1.31",
     "@purinton/resampler": "^1.0.4",
     "ai": "^5.0.114",
     "better-sqlite3": "^12.3.0",
     "cac": "^6.7.14",
     "discord.js": "^14.16.3",
     "domhandler": "^5.0.3",
-    "errore": "^0.5.2",
     "glob": "^13.0.0",
     "htmlparser2": "^10.0.0",
     "js-yaml": "^4.1.0",
     "marked": "^16.3.0",
+    "mime": "^4.1.0",
     "picocolors": "^1.1.1",
     "pretty-ms": "^9.3.0",
     "ripgrep-js": "^3.0.0",
     "string-dedent": "^3.0.2",
     "undici": "^7.16.0",
-    "zod": "^4.2.1"
+    "zod": "^4.2.1",
+    "errore": "^0.7.1"
   },
   "optionalDependencies": {
     "@discordjs/opus": "^0.10.0",
     "prism-media": "^1.3.5"
+  },
+  "scripts": {
+    "dev": "tsx --env-file .env src/cli.ts",
+    "dev:bun": "DEBUG=1 bun --env-file .env src/cli.ts",
+    "watch": "tsx scripts/watch-session.ts",
+    "test:events": "tsx test-events.ts",
+    "pcm-to-mp3": "bun scripts/pcm-to-mp3",
+    "test:send": "tsx send-test-message.ts",
+    "register-commands": "tsx scripts/register-commands.ts",
+    "format": "oxfmt src"
   }
-}
+}

package/src/cli.ts

@@ -43,6 +43,7 @@ import fs from 'node:fs'
 import * as errore from 'errore'
 
 import { createLogger } from './logger.js'
+import { uploadFilesToDiscord } from './discord-utils.js'
 import { spawn, spawnSync, execSync, type ExecSyncOptions } from 'node:child_process'
 import http from 'node:http'
 import { setDataDir, getDataDir, getLockPort } from './config.js'
@@ -211,7 +212,7 @@ async function registerCommands({
       })
       .toJSON(),
     new SlashCommandBuilder()
-      .setName('session')
+      .setName('new-session')
       .setDescription('Start a new OpenCode session')
       .addStringOption((option) => {
         option.setName('prompt').setDescription('Prompt content for the session').setRequired(true)
@@ -236,6 +237,18 @@ async function registerCommands({
         return option
       })
       .toJSON(),
+    new SlashCommandBuilder()
+      .setName('new-worktree')
+      .setDescription('Create a new git worktree and start a session thread')
+      .addStringOption((option) => {
+        option
+          .setName('name')
+          .setDescription('Name for the worktree (will be formatted: lowercase, spaces to dashes)')
+          .setRequired(true)
+
+        return option
+      })
+      .toJSON(),
     new SlashCommandBuilder()
       .setName('add-project')
       .setDescription('Create Discord channels for a new OpenCode project')
@@ -376,6 +389,133 @@ async function registerCommands({
   }
 }
 
+/**
+ * Store channel-directory mappings in the database.
+ * Called after Discord login to persist channel configurations.
+ */
+function storeChannelDirectories({
+  kimakiChannels,
+  db,
+}: {
+  kimakiChannels: { guild: Guild; channels: ChannelWithTags[] }[]
+  db: ReturnType<typeof getDatabase>
+}): void {
+  for (const { guild, channels } of kimakiChannels) {
+    for (const channel of channels) {
+      if (channel.kimakiDirectory) {
+        db.prepare(
+          'INSERT OR IGNORE INTO channel_directories (channel_id, directory, channel_type, app_id) VALUES (?, ?, ?, ?)',
+        ).run(channel.id, channel.kimakiDirectory, 'text', channel.kimakiApp || null)
+
+        const voiceChannel = guild.channels.cache.find(
+          (ch) => ch.type === ChannelType.GuildVoice && ch.name === channel.name,
+        )
+
+        if (voiceChannel) {
+          db.prepare(
+            'INSERT OR IGNORE INTO channel_directories (channel_id, directory, channel_type, app_id) VALUES (?, ?, ?, ?)',
+          ).run(voiceChannel.id, channel.kimakiDirectory, 'voice', channel.kimakiApp || null)
+        }
+      }
+    }
+  }
+}
+
+/**
+ * Show the ready message with channel links.
+ * Called at the end of startup to display available channels.
+ */
+function showReadyMessage({
+  kimakiChannels,
+  createdChannels,
+  appId,
+}: {
+  kimakiChannels: { guild: Guild; channels: ChannelWithTags[] }[]
+  createdChannels: { name: string; id: string; guildId: string }[]
+  appId: string
+}): void {
+  const allChannels: {
+    name: string
+    id: string
+    guildId: string
+    directory?: string
+  }[] = []
+
+  allChannels.push(...createdChannels)
+
+  kimakiChannels.forEach(({ guild, channels }) => {
+    channels.forEach((ch) => {
+      allChannels.push({
+        name: ch.name,
+        id: ch.id,
+        guildId: guild.id,
+        directory: ch.kimakiDirectory,
+      })
+    })
+  })
+
+  if (allChannels.length > 0) {
+    const channelLinks = allChannels
+      .map((ch) => `• #${ch.name}: https://discord.com/channels/${ch.guildId}/${ch.id}`)
+      .join('\n')
+
+    note(
+      `Your kimaki channels are ready! Click any link below to open in Discord:\n\n${channelLinks}\n\nSend a message in any channel to start using OpenCode!`,
+      '🚀 Ready to Use',
+    )
+  }
+
+  note(
+    'Leave this process running to keep the bot active.\n\nIf you close this process or restart your machine, run `npx kimaki` again to start the bot.',
+    '⚠️  Keep Running',
+  )
+}
+
+/**
+ * Background initialization for quick start mode.
+ * Starts OpenCode server and registers slash commands without blocking bot startup.
+ */
+async function backgroundInit({
+  currentDir,
+  token,
+  appId,
+}: {
+  currentDir: string
+  token: string
+  appId: string
+}): Promise<void> {
+  try {
+    const opencodeResult = await initializeOpencodeForDirectory(currentDir)
+    if (opencodeResult instanceof Error) {
+      cliLogger.warn('Background OpenCode init failed:', opencodeResult.message)
+      // Still try to register basic commands without user commands/agents
+      await registerCommands({ token, appId, userCommands: [], agents: [] })
+      return
+    }
+
+    const getClient = opencodeResult
+
+    const [userCommands, agents] = await Promise.all([
+      getClient()
+        .command.list({ query: { directory: currentDir } })
+        .then((r) => r.data || [])
+        .catch(() => []),
+      getClient()
+        .app.agents({ query: { directory: currentDir } })
+        .then((r) => r.data || [])
+        .catch(() => []),
+    ])
+
+    await registerCommands({ token, appId, userCommands, agents })
+    cliLogger.log('Slash commands registered!')
+  } catch (error) {
+    cliLogger.error(
+      'Background init failed:',
+      error instanceof Error ? error.message : String(error),
+    )
+  }
+}
+
 async function run({ restart, addChannels }: CliOptions) {
   const forceSetup = Boolean(restart)
 
@@ -582,7 +722,7 @@ async function run({ restart, addChannels }: CliOptions) {
   const currentDir = process.cwd()
   s.start('Starting OpenCode server...')
   const opencodePromise = initializeOpencodeForDirectory(currentDir).then((result) => {
-    if (errore.isError(result)) {
+    if (result instanceof Error) {
       throw new Error(result.message)
     }
     return result
@@ -666,25 +806,8 @@ async function run({ restart, addChannels }: CliOptions) {
   }
   db.prepare('INSERT OR REPLACE INTO bot_tokens (app_id, token) VALUES (?, ?)').run(appId, token)
 
-  for (const { guild, channels } of kimakiChannels) {
-    for (const channel of channels) {
-      if (channel.kimakiDirectory) {
-        db.prepare(
-          'INSERT OR IGNORE INTO channel_directories (channel_id, directory, channel_type, app_id) VALUES (?, ?, ?, ?)',
-        ).run(channel.id, channel.kimakiDirectory, 'text', channel.kimakiApp || null)
-
-        const voiceChannel = guild.channels.cache.find(
-          (ch) => ch.type === ChannelType.GuildVoice && ch.name === channel.name,
-        )
-
-        if (voiceChannel) {
-          db.prepare(
-            'INSERT OR IGNORE INTO channel_directories (channel_id, directory, channel_type, app_id) VALUES (?, ?, ?, ?)',
-          ).run(voiceChannel.id, channel.kimakiDirectory, 'voice', channel.kimakiApp || null)
-        }
-      }
-    }
-  }
+  // Store channel-directory mappings
+  storeChannelDirectories({ kimakiChannels, db })
 
   if (kimakiChannels.length > 0) {
     const channelList = kimakiChannels
@@ -700,6 +823,22 @@ async function run({ restart, addChannels }: CliOptions) {
     note(channelList, 'Existing Kimaki Channels')
   }
 
+  // Quick start: if setup is already done, start bot immediately and background the rest
+  const isQuickStart = existingBot && !forceSetup && !addChannels
+  if (isQuickStart) {
+    s.start('Starting Discord bot...')
+    await startDiscordBot({ token, appId, discordClient })
+    s.stop('Discord bot is running!')
+
+    // Background: OpenCode init + slash command registration (non-blocking)
+    void backgroundInit({ currentDir, token, appId })
+
+    showReadyMessage({ kimakiChannels, createdChannels, appId })
+    outro('✨ Bot ready! Listening for messages...')
+    return
+  }
+
+  // Full setup path: wait for OpenCode, show prompts, create channels if needed
   // Await the OpenCode server that was started in parallel with Discord login
   s.start('Waiting for OpenCode server...')
   const getClient = await opencodePromise
@@ -862,42 +1001,7 @@ async function run({ restart, addChannels }: CliOptions) {
   await startDiscordBot({ token, appId, discordClient })
   s.stop('Discord bot is running!')
 
-  const allChannels: {
-    name: string
-    id: string
-    guildId: string
-    directory?: string
-  }[] = []
-
-  allChannels.push(...createdChannels)
-
-  kimakiChannels.forEach(({ guild, channels }) => {
-    channels.forEach((ch) => {
-      allChannels.push({
-        name: ch.name,
-        id: ch.id,
-        guildId: guild.id,
-        directory: ch.kimakiDirectory,
-      })
-    })
-  })
-
-  if (allChannels.length > 0) {
-    const channelLinks = allChannels
-      .map((ch) => `• #${ch.name}: https://discord.com/channels/${ch.guildId}/${ch.id}`)
-      .join('\n')
-
-    note(
-      `Your kimaki channels are ready! Click any link below to open in Discord:\n\n${channelLinks}\n\nSend a message in any channel to start using OpenCode!`,
-      '🚀 Ready to Use',
-    )
-  }
-
-  note(
-    'Leave this process running to keep the bot active.\n\nIf you close this process or restart your machine, run `npx kimaki` again to start the bot.',
-    '⚠️  Keep Running',
-  )
-
+  showReadyMessage({ kimakiChannels, createdChannels, appId })
   outro('✨ Setup complete! Listening for new messages... do not close this process.')
 }
 
@@ -998,34 +1102,11 @@ cli
       const s = spinner()
       s.start(`Uploading ${resolvedFiles.length} file(s)...`)
 
-      for (const file of resolvedFiles) {
-        const buffer = fs.readFileSync(file)
-
-        const formData = new FormData()
-        formData.append(
-          'payload_json',
-          JSON.stringify({
-            attachments: [{ id: 0, filename: path.basename(file) }],
-          }),
-        )
-        formData.append('files[0]', new Blob([buffer]), path.basename(file))
-
-        const response = await fetch(
-          `https://discord.com/api/v10/channels/${threadRow.thread_id}/messages`,
-          {
-            method: 'POST',
-            headers: {
-              Authorization: `Bot ${botRow.token}`,
-            },
-            body: formData,
-          },
-        )
-
-        if (!response.ok) {
-          const error = await response.text()
-          throw new Error(`Discord API error: ${response.status} - ${error}`)
-        }
-      }
+      await uploadFilesToDiscord({
+        threadId: threadRow.thread_id,
+        botToken: botRow.token,
+        files: resolvedFiles,
+      })
 
       s.stop(`Uploaded ${resolvedFiles.length} file(s)!`)
 

package/src/commands/abort.ts

@@ -72,7 +72,7 @@ export async function handleAbortCommand({ command }: CommandContext): Promise<v
   }
 
   const getClient = await initializeOpencodeForDirectory(directory)
-  if (errore.isError(getClient)) {
+  if (getClient instanceof Error) {
     await command.reply({
       content: `Failed to abort: ${getClient.message}`,
       ephemeral: true,

package/src/commands/add-project.ts

@@ -26,7 +26,7 @@ export async function handleAddProjectCommand({ command, appId }: CommandContext
   try {
     const currentDir = process.cwd()
     const getClient = await initializeOpencodeForDirectory(currentDir)
-    if (errore.isError(getClient)) {
+    if (getClient instanceof Error) {
       await command.editReply(getClient.message)
       return
     }
@@ -94,7 +94,7 @@ export async function handleAddProjectAutocomplete({
   try {
     const currentDir = process.cwd()
     const getClient = await initializeOpencodeForDirectory(currentDir)
-    if (errore.isError(getClient)) {
+    if (getClient instanceof Error) {
       await interaction.respond([])
       return
     }

package/src/commands/agent.ts

@@ -162,7 +162,7 @@ export async function handleAgentCommand({
 
   try {
     const getClient = await initializeOpencodeForDirectory(context.dir)
-    if (errore.isError(getClient)) {
+    if (getClient instanceof Error) {
       await interaction.editReply({ content: getClient.message })
       return
     }
@@ -297,7 +297,7 @@ export async function handleQuickAgentCommand({
 
   try {
     const getClient = await initializeOpencodeForDirectory(context.dir)
-    if (errore.isError(getClient)) {
+    if (getClient instanceof Error) {
       await command.editReply({ content: getClient.message })
       return
     }

package/src/commands/fork.ts

@@ -73,7 +73,7 @@ export async function handleForkCommand(interaction: ChatInputCommandInteraction
   const sessionId = row.session_id
 
   const getClient = await initializeOpencodeForDirectory(directory)
-  if (errore.isError(getClient)) {
+  if (getClient instanceof Error) {
     await interaction.editReply({
       content: `Failed to load messages: ${getClient.message}`,
     })
@@ -171,7 +171,7 @@ export async function handleForkSelectMenu(
   await interaction.deferReply({ ephemeral: false })
 
   const getClient = await initializeOpencodeForDirectory(directory)
-  if (errore.isError(getClient)) {
+  if (getClient instanceof Error) {
     await interaction.editReply(`Failed to fork session: ${getClient.message}`)
     return
   }

package/src/commands/model.ts

@@ -129,7 +129,7 @@ export async function handleModelCommand({
 
   try {
     const getClient = await initializeOpencodeForDirectory(projectDirectory)
-    if (errore.isError(getClient)) {
+    if (getClient instanceof Error) {
       await interaction.editReply({ content: getClient.message })
       return
     }
@@ -237,7 +237,7 @@ export async function handleProviderSelectMenu(
 
   try {
     const getClient = await initializeOpencodeForDirectory(context.dir)
-    if (errore.isError(getClient)) {
+    if (getClient instanceof Error) {
       await interaction.editReply({
         content: getClient.message,
         components: [],

package/src/commands/remove-project.ts

@@ -42,7 +42,7 @@ export async function handleRemoveProjectCommand({ command, appId }: CommandCont
         catch: (e) => e as Error,
       })
       
-      if (errore.isError(channel)) {
+      if (channel instanceof Error) {
         logger.error(`Failed to fetch channel ${channel_id}:`, channel)
         failedChannels.push(`${channel_type}: ${channel_id}`)
         continue
@@ -116,7 +116,7 @@ export async function handleRemoveProjectAutocomplete({
         try: () => guild.channels.fetch(channel_id),
         catch: (e) => e as Error,
       })
-      if (errore.isError(channel)) {
+      if (channel instanceof Error) {
         // Channel not in this guild, skip
         continue
       }

package/src/commands/resume.ts

@@ -61,7 +61,7 @@ export async function handleResumeCommand({ command, appId }: CommandContext): P
 
   try {
     const getClient = await initializeOpencodeForDirectory(projectDirectory)
-    if (errore.isError(getClient)) {
+    if (getClient instanceof Error) {
       await command.editReply(getClient.message)
       return
     }
@@ -173,7 +173,7 @@ export async function handleResumeAutocomplete({
 
   try {
     const getClient = await initializeOpencodeForDirectory(projectDirectory)
-    if (errore.isError(getClient)) {
+    if (getClient instanceof Error) {
       await interaction.respond([])
       return
     }

package/src/commands/session.ts

@@ -1,4 +1,4 @@
-// /session command - Start a new OpenCode session.
+// /new-session command - Start a new OpenCode session.
 
 import { ChannelType, type TextChannel } from 'discord.js'
 import fs from 'node:fs'
@@ -59,7 +59,7 @@ export async function handleSessionCommand({ command, appId }: CommandContext):
 
   try {
     const getClient = await initializeOpencodeForDirectory(projectDirectory)
-    if (errore.isError(getClient)) {
+    if (getClient instanceof Error) {
       await command.editReply(getClient.message)
       return
     }
@@ -133,7 +133,7 @@ async function handleAgentAutocomplete({ interaction, appId }: AutocompleteConte
 
   try {
     const getClient = await initializeOpencodeForDirectory(projectDirectory)
-    if (errore.isError(getClient)) {
+    if (getClient instanceof Error) {
       await interaction.respond([])
       return
     }
@@ -216,7 +216,7 @@ export async function handleSessionAutocomplete({
 
   try {
     const getClient = await initializeOpencodeForDirectory(projectDirectory)
-    if (errore.isError(getClient)) {
+    if (getClient instanceof Error) {
       await interaction.respond([])
       return
     }

package/src/commands/share.ts

@@ -65,7 +65,7 @@ export async function handleShareCommand({ command }: CommandContext): Promise<v
   const sessionId = row.session_id
 
   const getClient = await initializeOpencodeForDirectory(directory)
-  if (errore.isError(getClient)) {
+  if (getClient instanceof Error) {
     await command.reply({
       content: `Failed to share session: ${getClient.message}`,
       ephemeral: true,

package/src/commands/undo-redo.ts

@@ -67,7 +67,7 @@ export async function handleUndoCommand({ command }: CommandContext): Promise<vo
   await command.deferReply({ flags: SILENT_MESSAGE_FLAGS })
 
   const getClient = await initializeOpencodeForDirectory(directory)
-  if (errore.isError(getClient)) {
+  if (getClient instanceof Error) {
     await command.editReply(`Failed to undo: ${getClient.message}`)
     return
   }
@@ -174,7 +174,7 @@ export async function handleRedoCommand({ command }: CommandContext): Promise<vo
   await command.deferReply({ flags: SILENT_MESSAGE_FLAGS })
 
   const getClient = await initializeOpencodeForDirectory(directory)
-  if (errore.isError(getClient)) {
+  if (getClient instanceof Error) {
     await command.editReply(`Failed to redo: ${getClient.message}`)
     return
   }