kimaki 0.4.47 → 0.4.48

package/src/cli.ts

@@ -47,7 +47,7 @@ import { createLogger, LogPrefix } 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'
+import { setDataDir, getDataDir, getLockPort, setDefaultVerbosity } from './config.js'
 import { sanitizeAgentName } from './commands/agent.js'
 
 const cliLogger = createLogger(LogPrefix.CLI)
@@ -145,7 +145,11 @@ async function checkSingleInstance(): Promise<void> {
         setTimeout(resolve, 500)
       })
     }
-  } catch {
+  } catch (error) {
+    cliLogger.debug(
+      'Lock port check failed:',
+      error instanceof Error ? error.message : String(error),
+    )
     cliLogger.debug('No other kimaki instance detected on lock port')
   }
 }
@@ -551,11 +555,23 @@ async function backgroundInit({
       getClient()
         .command.list({ query: { directory: currentDir } })
         .then((r) => r.data || [])
-        .catch(() => []),
+        .catch((error) => {
+          cliLogger.warn(
+            'Failed to load user commands during background init:',
+            error instanceof Error ? error.message : String(error),
+          )
+          return []
+        }),
       getClient()
         .app.agents({ query: { directory: currentDir } })
         .then((r) => r.data || [])
-        .catch(() => []),
+        .catch((error) => {
+          cliLogger.warn(
+            'Failed to load agents during background init:',
+            error instanceof Error ? error.message : String(error),
+          )
+          return []
+        }),
     ])
 
     await registerCommands({ token, appId, userCommands, agents })
@@ -613,7 +629,11 @@ async function run({ restart, addChannels, useWorktrees }: CliOptions) {
         try {
           fs.accessSync(p, fs.constants.F_OK)
           return true
-        } catch {
+        } catch (error) {
+          cliLogger.debug(
+            `OpenCode path not found at ${p}:`,
+            error instanceof Error ? error.message : String(error),
+          )
           return false
         }
       })
@@ -914,11 +934,23 @@ async function run({ restart, addChannels, useWorktrees }: CliOptions) {
     getClient()
       .command.list({ query: { directory: currentDir } })
       .then((r) => r.data || [])
-      .catch(() => []),
+      .catch((error) => {
+        cliLogger.warn(
+          'Failed to load user commands during setup:',
+          error instanceof Error ? error.message : String(error),
+        )
+        return []
+      }),
     getClient()
       .app.agents({ query: { directory: currentDir } })
       .then((r) => r.data || [])
-      .catch(() => []),
+      .catch((error) => {
+        cliLogger.warn(
+          'Failed to load agents during setup:',
+          error instanceof Error ? error.message : String(error),
+        )
+        return []
+      }),
   ])
 
   s.stop(`Found ${projects.length} OpenCode project(s)`)
@@ -1066,6 +1098,7 @@ cli
   .option('--data-dir <path>', 'Data directory for config and database (default: ~/.kimaki)')
   .option('--install-url', 'Print the bot install URL and exit')
   .option('--use-worktrees', 'Create git worktrees for all new sessions started from channel messages')
+  .option('--verbosity <level>', 'Default verbosity for all channels (tools-and-text or text-only)')
   .action(
     async (options: {
       restart?: boolean
@@ -1073,6 +1106,7 @@ cli
       dataDir?: string
       installUrl?: boolean
       useWorktrees?: boolean
+      verbosity?: string
     }) => {
       try {
         // Set data directory early, before any database access
@@ -1081,6 +1115,15 @@ cli
           cliLogger.log(`Using data directory: ${getDataDir()}`)
         }
 
+        if (options.verbosity) {
+          if (options.verbosity !== 'tools-and-text' && options.verbosity !== 'text-only') {
+            cliLogger.error(`Invalid verbosity level: ${options.verbosity}. Use "tools-and-text" or "text-only".`)
+            process.exit(EXIT_NO_RESTART)
+          }
+          setDefaultVerbosity(options.verbosity)
+          cliLogger.log(`Default verbosity: ${options.verbosity}`)
+        }
+
         if (options.installUrl) {
           const db = getDatabase()
           const existingBot = db
@@ -1240,8 +1283,11 @@ cli
               .prepare('SELECT app_id FROM bot_tokens ORDER BY created_at DESC LIMIT 1')
               .get() as { app_id: string } | undefined
             appId = botRow?.app_id
-          } catch {
-            // Database might not exist in CI, that's ok
+          } catch (error) {
+            cliLogger.debug(
+              'Database lookup failed while resolving app ID:',
+              error instanceof Error ? error.message : String(error),
+            )
           }
         }
       } else {
@@ -1356,8 +1402,11 @@ cli
                   if (ch && 'guild' in ch && ch.guild) {
                     return ch.guild
                   }
-                } catch {
-                  // Channel might be deleted, continue
+                } catch (error) {
+                  cliLogger.debug(
+                    'Failed to fetch existing channel while selecting guild:',
+                    error instanceof Error ? error.message : String(error),
+                  )
                 }
               }
               // Fall back to first guild the bot is in
@@ -1597,8 +1646,11 @@ cli
                 .prepare('SELECT app_id FROM bot_tokens ORDER BY created_at DESC LIMIT 1')
                 .get() as { app_id: string } | undefined
               appId = botRow?.app_id
-            } catch {
-              // Database might not exist in CI
+            } catch (error) {
+              cliLogger.debug(
+                'Database lookup failed while resolving app ID:',
+                error instanceof Error ? error.message : String(error),
+              )
             }
           }
         } else {
@@ -1677,8 +1729,11 @@ cli
               } else {
                 throw new Error('Channel has no guild')
               }
-            } catch {
-              // Channel might be deleted, fall back to first guild
+            } catch (error) {
+              cliLogger.debug(
+                'Failed to fetch existing channel while selecting guild:',
+                error instanceof Error ? error.message : String(error),
+              )
               const firstGuild = client.guilds.cache.first()
               if (!firstGuild) {
                 s.stop('No guild found')
@@ -1722,12 +1777,18 @@ cli
                 client.destroy()
                 process.exit(0)
               }
-            } catch {
-              // Channel might be deleted, continue checking
+            } catch (error) {
+              cliLogger.debug(
+                `Failed to fetch channel ${existingChannel.channel_id} while checking existing channels:`,
+                error instanceof Error ? error.message : String(error),
+              )
             }
           }
-        } catch {
-          // Database might not exist, continue to create
+        } catch (error) {
+          cliLogger.debug(
+            'Database lookup failed while checking existing channels:',
+            error instanceof Error ? error.message : String(error),
+          )
         }
 
         s.message(`Creating channels in ${guild.name}...`)

package/src/commands/abort.ts

@@ -67,6 +67,7 @@ export async function handleAbortCommand({ command }: CommandContext): Promise<v
 
   const existingController = abortControllers.get(sessionId)
   if (existingController) {
+    logger.log(`[ABORT] reason=user-requested sessionId=${sessionId} channelId=${channel.id} - user ran /abort command`)
     existingController.abort(new Error('User requested abort'))
     abortControllers.delete(sessionId)
   }
@@ -82,6 +83,7 @@ export async function handleAbortCommand({ command }: CommandContext): Promise<v
   }
 
   try {
+    logger.log(`[ABORT-API] reason=user-requested sessionId=${sessionId} channelId=${channel.id} - sending API abort from /abort command`)
     await getClient().session.abort({
       path: { id: sessionId },
     })

package/src/commands/create-new-project.ts

@@ -1,8 +1,10 @@
 // /create-new-project command - Create a new project folder, initialize git, and start a session.
+// Also exports createNewProject() for reuse during onboarding (welcome channel creation).
 
-import { ChannelType, type TextChannel } from 'discord.js'
+import { ChannelType, type Guild, type TextChannel } from 'discord.js'
 import fs from 'node:fs'
 import path from 'node:path'
+import { execSync } from 'node:child_process'
 import type { CommandContext } from './types.js'
 import { getProjectsDir } from '../config.js'
 import { createProjectChannels } from '../channel-management.js'
@@ -12,6 +14,67 @@ import { createLogger, LogPrefix } from '../logger.js'
 
 const logger = createLogger(LogPrefix.CREATE_PROJECT)
 
+/**
+ * Core project creation logic: creates directory, inits git, creates Discord channels.
+ * Reused by the slash command handler and by onboarding (welcome channel).
+ * Returns null if the project directory already exists.
+ */
+export async function createNewProject({
+  guild,
+  projectName,
+  appId,
+  botName,
+}: {
+  guild: Guild
+  projectName: string
+  appId: string
+  botName?: string
+}): Promise<{
+  textChannelId: string
+  voiceChannelId: string
+  channelName: string
+  projectDirectory: string
+  sanitizedName: string
+} | null> {
+  const sanitizedName = projectName
+    .toLowerCase()
+    .replace(/[^a-z0-9-]/g, '-')
+    .replace(/-+/g, '-')
+    .replace(/^-|-$/g, '')
+    .slice(0, 100)
+
+  if (!sanitizedName) {
+    return null
+  }
+
+  const projectsDir = getProjectsDir()
+  const projectDirectory = path.join(projectsDir, sanitizedName)
+
+  if (!fs.existsSync(projectsDir)) {
+    fs.mkdirSync(projectsDir, { recursive: true })
+    logger.log(`Created projects directory: ${projectsDir}`)
+  }
+
+  if (fs.existsSync(projectDirectory)) {
+    return null
+  }
+
+  fs.mkdirSync(projectDirectory, { recursive: true })
+  logger.log(`Created project directory: ${projectDirectory}`)
+
+  execSync('git init', { cwd: projectDirectory, stdio: 'pipe' })
+  logger.log(`Initialized git in: ${projectDirectory}`)
+
+  const { textChannelId, voiceChannelId, channelName } = await createProjectChannels({
+    guild,
+    projectDirectory,
+    appId,
+    botName,
+  })
+
+  return { textChannelId, voiceChannelId, channelName, projectDirectory, sanitizedName }
+}
+
 export async function handleCreateNewProjectCommand({
   command,
   appId,
@@ -32,45 +95,33 @@ export async function handleCreateNewProjectCommand({
     return
   }
 
-  const sanitizedName = projectName
-    .toLowerCase()
-    .replace(/[^a-z0-9-]/g, '-')
-    .replace(/-+/g, '-')
-    .replace(/^-|-$/g, '')
-    .slice(0, 100)
-
-  if (!sanitizedName) {
-    await command.editReply('Invalid project name')
-    return
-  }
+  try {
+    const result = await createNewProject({
+      guild,
+      projectName,
+      appId,
+      botName: command.client.user?.username,
+    })
 
-  const projectsDir = getProjectsDir()
-  const projectDirectory = path.join(projectsDir, sanitizedName)
+    if (!result) {
+      const sanitizedName = projectName
+        .toLowerCase()
+        .replace(/[^a-z0-9-]/g, '-')
+        .replace(/-+/g, '-')
+        .replace(/^-|-$/g, '')
+        .slice(0, 100)
 
-  try {
-    if (!fs.existsSync(projectsDir)) {
-      fs.mkdirSync(projectsDir, { recursive: true })
-      logger.log(`Created projects directory: ${projectsDir}`)
-    }
+      if (!sanitizedName) {
+        await command.editReply('Invalid project name')
+        return
+      }
 
-    if (fs.existsSync(projectDirectory)) {
+      const projectDirectory = path.join(getProjectsDir(), sanitizedName)
       await command.editReply(`Project directory already exists: ${projectDirectory}`)
       return
     }
 
-    fs.mkdirSync(projectDirectory, { recursive: true })
-    logger.log(`Created project directory: ${projectDirectory}`)
-
-    const { execSync } = await import('node:child_process')
-    execSync('git init', { cwd: projectDirectory, stdio: 'pipe' })
-    logger.log(`Initialized git in: ${projectDirectory}`)
-
-    const { textChannelId, voiceChannelId, channelName } = await createProjectChannels({
-      guild,
-      projectDirectory,
-      appId,
-    })
-
+    const { textChannelId, voiceChannelId, channelName, projectDirectory, sanitizedName } = result
     const textChannel = (await guild.channels.fetch(textChannelId)) as TextChannel
 
     await command.editReply(

package/src/commands/merge-worktree.ts

@@ -47,7 +47,11 @@ async function isDetachedHead(worktreeDir: string): Promise<boolean> {
   try {
     await execAsync(`git -C "${worktreeDir}" symbolic-ref HEAD`)
     return false
-  } catch {
+  } catch (error) {
+    logger.debug(
+      `Failed to resolve HEAD for ${worktreeDir}:`,
+      error instanceof Error ? error.message : String(error),
+    )
     return true
   }
 }
@@ -59,7 +63,11 @@ async function getCurrentBranch(worktreeDir: string): Promise<string | null> {
   try {
     const { stdout } = await execAsync(`git -C "${worktreeDir}" symbolic-ref --short HEAD`)
     return stdout.trim() || null
-  } catch {
+  } catch (error) {
+    logger.debug(
+      `Failed to get current branch for ${worktreeDir}:`,
+      error instanceof Error ? error.message : String(error),
+    )
     return null
   }
 }
@@ -113,7 +121,11 @@ export async function handleMergeWorktreeCommand({ command, appId }: CommandCont
         `git -C "${mainRepoDir}" symbolic-ref refs/remotes/origin/HEAD 2>/dev/null | sed 's@^refs/remotes/origin/@@'`,
       )
       defaultBranch = stdout.trim() || 'main'
-    } catch {
+    } catch (error) {
+      logger.warn(
+        `Failed to detect default branch for ${mainRepoDir}, falling back to main:`,
+        error instanceof Error ? error.message : String(error),
+      )
       defaultBranch = 'main'
     }
 
@@ -141,11 +153,26 @@ export async function handleMergeWorktreeCommand({ command, appId }: CommandCont
       await execAsync(`git -C "${worktreeDir}" merge ${defaultBranch} --no-edit`)
     } catch (e) {
       // If merge fails (conflicts), abort and report
-      await execAsync(`git -C "${worktreeDir}" merge --abort`).catch(() => {})
+      await execAsync(`git -C "${worktreeDir}" merge --abort`).catch((error) => {
+        logger.warn(
+          `Failed to abort merge in ${worktreeDir}:`,
+          error instanceof Error ? error.message : String(error),
+        )
+      })
       // Clean up temp branch if we created one
       if (tempBranch) {
-        await execAsync(`git -C "${worktreeDir}" checkout --detach`).catch(() => {})
-        await execAsync(`git -C "${worktreeDir}" branch -D ${tempBranch}`).catch(() => {})
+        await execAsync(`git -C "${worktreeDir}" checkout --detach`).catch((error) => {
+          logger.warn(
+            `Failed to detach HEAD after merge conflict in ${worktreeDir}:`,
+            error instanceof Error ? error.message : String(error),
+          )
+        })
+        await execAsync(`git -C "${worktreeDir}" branch -D ${tempBranch}`).catch((error) => {
+          logger.warn(
+            `Failed to delete temp branch ${tempBranch} in ${worktreeDir}:`,
+            error instanceof Error ? error.message : String(error),
+          )
+        })
       }
       throw new Error(`Merge conflict - resolve manually in worktree then retry`)
     }
@@ -162,11 +189,21 @@ export async function handleMergeWorktreeCommand({ command, appId }: CommandCont
 
     // 7. Delete the merged branch (temp or original)
     logger.log(`Deleting merged branch ${branchToMerge}`)
-    await execAsync(`git -C "${worktreeDir}" branch -D ${branchToMerge}`).catch(() => {})
+    await execAsync(`git -C "${worktreeDir}" branch -D ${branchToMerge}`).catch((error) => {
+      logger.warn(
+        `Failed to delete merged branch ${branchToMerge} in ${worktreeDir}:`,
+        error instanceof Error ? error.message : String(error),
+      )
+    })
 
     // Also delete the original worktree branch if different from what we merged
     if (!isDetached && branchToMerge !== worktreeInfo.worktree_name) {
-      await execAsync(`git -C "${worktreeDir}" branch -D ${worktreeInfo.worktree_name}`).catch(() => {})
+      await execAsync(`git -C "${worktreeDir}" branch -D ${worktreeInfo.worktree_name}`).catch((error) => {
+        logger.warn(
+          `Failed to delete worktree branch ${worktreeInfo.worktree_name} in ${worktreeDir}:`,
+          error instanceof Error ? error.message : String(error),
+        )
+      })
     }
 
     // 8. Remove worktree prefix from thread title (fire and forget with timeout)

package/src/commands/permissions.ts

@@ -35,10 +35,12 @@ export async function showPermissionDropdown({
   thread,
   permission,
   directory,
+  subtaskLabel,
 }: {
   thread: ThreadChannel
   permission: PermissionRequest
   directory: string
+  subtaskLabel?: string
 }): Promise<{ messageId: string; contextHash: string }> {
   const contextHash = crypto.randomBytes(8).toString('hex')
 
@@ -80,9 +82,11 @@ export async function showPermissionDropdown({
 
   const actionRow = new ActionRowBuilder<StringSelectMenuBuilder>().addComponents(selectMenu)
 
+  const subtaskLine = subtaskLabel ? `**From:** \`${subtaskLabel}\`\n` : ''
   const permissionMessage = await thread.send({
     content:
       `⚠️ **Permission Required**\n\n` +
+      subtaskLine +
       `**Type:** \`${permission.permission}\`\n` +
       (patternStr ? `**Pattern:** \`${patternStr}\`` : ''),
     components: [actionRow],

package/src/commands/session.ts

@@ -133,7 +133,10 @@ async function handleAgentAutocomplete({ interaction, appId }: AutocompleteConte
     }
 
     const agents = agentsResponse.data
-      .filter((a) => a.mode === 'primary' || a.mode === 'all')
+      .filter((a) => {
+        const hidden = (a as { hidden?: boolean }).hidden
+        return (a.mode === 'primary' || a.mode === 'all') && !hidden
+      })
       .filter((a) => a.name.toLowerCase().includes(focusedValue.toLowerCase()))
       .slice(0, 25)
 

package/src/commands/verbosity.ts

@@ -11,7 +11,7 @@ const verbosityLogger = createLogger(LogPrefix.VERBOSITY)
 
 /**
  * Handle the /verbosity slash command.
- * Sets output verbosity for the channel (applies to new sessions).
+ * Sets output verbosity for the channel (applies immediately, even mid-session).
  */
 export async function handleVerbosityCommand({
   command,
@@ -51,7 +51,7 @@ export async function handleVerbosityCommand({
 
   if (currentLevel === level) {
     await command.reply({
-      content: `Verbosity is already set to **${level}**.`,
+      content: `Verbosity is already set to **${level}** for this channel.`,
       ephemeral: true,
     })
     return
@@ -65,7 +65,7 @@ export async function handleVerbosityCommand({
     : 'All output will be shown, including tool executions and status messages.'
 
   await command.reply({
-    content: `Verbosity set to **${level}**.\n${description}\nThis applies to all new sessions in this channel.`,
+    content: `Verbosity set to **${level}** for this channel.\n${description}\nThis is a per-channel setting and applies immediately, including any active sessions.`,
     ephemeral: true,
   })
 }

package/src/config.ts

@@ -44,6 +44,20 @@ export function getProjectsDir(): string {
   return path.join(getDataDir(), 'projects')
 }
 
+// Default verbosity for channels that haven't set a per-channel override.
+// Set via --verbosity CLI flag at startup.
+import type { VerbosityLevel } from './database.js'
+
+let defaultVerbosity: VerbosityLevel = 'tools-and-text'
+
+export function getDefaultVerbosity(): VerbosityLevel {
+  return defaultVerbosity
+}
+
+export function setDefaultVerbosity(level: VerbosityLevel): void {
+  defaultVerbosity = level
+}
+
 const DEFAULT_LOCK_PORT = 29988
 
 /**

package/src/database.ts

@@ -7,7 +7,7 @@ import fs from 'node:fs'
 import path from 'node:path'
 import * as errore from 'errore'
 import { createLogger, LogPrefix } from './logger.js'
-import { getDataDir } from './config.js'
+import { getDataDir, getDefaultVerbosity } from './config.js'
 
 const dbLogger = createLogger(LogPrefix.DB)
 
@@ -69,8 +69,11 @@ export function getDatabase(): Database.Database {
     // Migration: add app_id column to channel_directories for multi-bot support
     try {
       db.exec(`ALTER TABLE channel_directories ADD COLUMN app_id TEXT`)
-    } catch {
-      // Column already exists, ignore
+    } catch (error) {
+      dbLogger.debug(
+        'Failed to add app_id column to channel_directories (likely exists):',
+        error instanceof Error ? error.message : String(error),
+      )
     }
 
     // Table for threads that should auto-start a session (created by CLI without --notify-only)
@@ -378,14 +381,17 @@ export function runVerbosityMigrations(database?: Database.Database): void {
 
 /**
  * Get the verbosity setting for a channel.
- * @returns 'tools-and-text' (default) or 'text-only'
+ * Falls back to the global default set via --verbosity CLI flag if no per-channel override exists.
  */
 export function getChannelVerbosity(channelId: string): VerbosityLevel {
   const db = getDatabase()
   const row = db
     .prepare('SELECT verbosity FROM channel_verbosity WHERE channel_id = ?')
     .get(channelId) as { verbosity: string } | undefined
-  return (row?.verbosity as VerbosityLevel) || 'tools-and-text'
+  if (row?.verbosity) {
+    return row.verbosity as VerbosityLevel
+  }
+  return getDefaultVerbosity()
 }
 
 /**