kimaki 0.26.0 → 0.28.0

package/src/commands/file-upload.ts

@@ -25,6 +25,7 @@ import path from 'node:path'
 import { createLogger, LogPrefix } from '../logger.js'
 import { notifyError } from '../sentry.js'
 import { NOTIFY_MESSAGE_FLAGS, sendThreadMessage } from '../discord-utils.js'
+import { QUEUE_PREFIX } from '../message-formatting.js'
 
 const logger = createLogger(LogPrefix.FILE_UPLOAD)
 
@@ -325,7 +326,7 @@ export async function handleFileUploadModalSubmit(
       const username = interaction.user.globalName || interaction.user.username
       await sendThreadMessage(
         context.thread,
-        `» **${username}:** Uploaded ${fileNames.join(', ')}`,
+        `${QUEUE_PREFIX}**${username}:** Uploaded ${fileNames.join(', ')}`,
       )
     }
 

package/src/commands/fork-subagent.ts

@@ -18,6 +18,7 @@ import {
   resolveTextChannel,
   resolveWorkingDirectory,
   sendThreadMessage,
+  sendSessionPartBatches,
 } from '../discord-utils.js'
 import {
   collectSessionChunks,
@@ -240,9 +241,7 @@ export async function handleForkSubagentSelectMenu(
         limit: 30,
       })
       const batched = batchChunksForDiscord(chunks)
-      for (const batch of batched) {
-        await sendThreadMessage(forkedThread, batch.content)
-      }
+      await sendSessionPartBatches({ thread: forkedThread, batches: batched })
     }
   } catch (error) {
     forkLogger.error('Error replaying forked subagent history:', error)

package/src/commands/fork.ts

@@ -20,6 +20,7 @@ import {
   resolveWorkingDirectory,
   resolveTextChannel,
   sendThreadMessage,
+  sendSessionPartBatches,
 } from '../discord-utils.js'
 import {
   collectSessionChunks,
@@ -356,12 +357,12 @@ export async function handleForkSelectMenu(
         limit: 30,
       })
       const batched = batchChunksForDiscord(chunks)
-      for (const batch of batched) {
-        const discordMessage = await sendThreadMessage(thread, batch.content)
+      const sent = await sendSessionPartBatches({ thread, batches: batched })
+      for (const batch of sent) {
         await setPartMessagesBatch(
           batch.partIds.map((partId) => ({
             partId,
-            messageId: discordMessage.id,
+            messageId: batch.message.id,
             threadId: thread.id,
           })),
         )

package/src/commands/last-sessions.ts

@@ -148,8 +148,14 @@ export async function handleLastSessionsCommand({
   const tableMarkdown = buildSessionTable({ rows })
   const segments = splitTablesFromMarkdown(tableMarkdown)
 
-  const allComponents: APIMessageTopLevelComponent[] = segments.flatMap(
-    (segment) => {
+  const btwNote: APITextDisplayComponent = {
+    type: ComponentType.TextDisplay,
+    content:
+      'Titles prefixed `btw:` are side sessions that answer a related question. They are not duplicate sessions.',
+  }
+  const allComponents: APIMessageTopLevelComponent[] = [
+    btwNote,
+    ...segments.flatMap((segment) => {
       if (segment.type === 'components') {
         return segment.components
       }
@@ -158,8 +164,8 @@ export async function handleLastSessionsCommand({
         content: segment.text,
       }
       return [textDisplay]
-    },
-  )
+    }),
+  ]
 
   const { components } = truncateComponents(allComponents)
 

package/src/commands/login.ts

@@ -34,6 +34,7 @@ import {
   getOpencodeServerAuthHeaders,
 } from '../opencode.js'
 import { resolveTextChannel, getKimakiMetadata } from '../discord-utils.js'
+import { clearModelListCache } from '../session-handler/model-utils.js'
 import { createLogger, LogPrefix } from '../logger.js'
 import { buildPaginatedOptions, parsePaginationValue } from './paginated-select.js'
 
@@ -122,7 +123,9 @@ function createContextHash(context: LoginContext): string {
 // ── Provider popularity order ───────────────────────────────────
 // Discord select menus cap at 25 options, so we show popular ones first.
 // IDs sourced from opencode's provider.list() API (scripts/list-providers.ts).
+// `subrouter` leads: it pools every subscription and cycles across them.
 const PROVIDER_POPULARITY_ORDER: string[] = [
+  'subrouter',
   'anthropic',
   'openai',
   'google',
@@ -937,6 +940,7 @@ export async function handleOAuthCodeModalSubmit(
     }
 
     await getClient().instance.dispose({ directory: ctx.dir })
+    clearModelListCache()
     pendingLoginContexts.delete(hash)
 
     await interaction.editReply({
@@ -993,6 +997,7 @@ export async function handleApiKeyModalSubmit(
 
     // Dispose to refresh provider state so new credentials are recognized
     await getClient().instance.dispose({ directory: ctx.dir })
+    clearModelListCache()
 
     await interaction.editReply({
       content: `✅ **Successfully authenticated with ${ctx.providerName}!**\n\nYou can now use models from this provider.`,
@@ -1159,6 +1164,7 @@ async function startOAuthFlow(
     }
 
     await getClient().instance.dispose({ directory: ctx.dir })
+    clearModelListCache()
     pendingLoginContexts.delete(hash)
 
     await interaction.editReply({

package/src/commands/merge-worktree.ts

@@ -1,7 +1,5 @@
-// /merge-worktree command - Merge worktree commits into default branch.
-// Pipeline: rebase worktree commits onto target -> local fast-forward push.
-// Preserves all commits (no squash). On rebase conflicts, asks the AI model
-// in the thread to resolve them.
+// /merge-worktree command - Rebase or squash worktree commits into a target branch.
+// On rebase conflicts, asks the AI model in the thread to resolve them.
 
 import { type TextChannel, type ThreadChannel } from 'discord.js'
 import type { AutocompleteContext, CommandContext } from './types.js'
@@ -12,7 +10,12 @@ import {
 } from '../database.js'
 import { createLogger, LogPrefix } from '../logger.js'
 import { notifyError } from '../sentry.js'
-import { mergeWorktree, listBranchesByLastCommit, validateBranchRef } from '../worktrees.js'
+import {
+  mergeWorktree,
+  listBranchesByLastCommit,
+  validateBranchRef,
+  formatMergeWorktreeError,
+} from '../worktrees.js'
 import {
   sendThreadMessage,
   resolveWorkingDirectory,
@@ -27,19 +30,29 @@ import {
   TargetDirtyWorktreeError,
   NothingToMergeError,
 } from '../errors.js'
+import { WORKTREE_PREFIX } from '../message-formatting.js'
 
 const logger = createLogger(LogPrefix.WORKTREE)
 
-/** Worktree thread title prefix - indicates unmerged worktree */
-export const WORKTREE_PREFIX = '⬦ '
+function quoteShellArg(value: string): string {
+  return `'${value.replaceAll("'", "'\\''")}'`
+}
+
+export { WORKTREE_PREFIX }
+
+function worktreePrefixLength(name: string) {
+  if (name.startsWith(WORKTREE_PREFIX)) return WORKTREE_PREFIX.length
+  return 0
+}
 
 async function removeWorktreePrefixFromTitle(
   thread: ThreadChannel,
 ): Promise<void> {
-  if (!thread.name.startsWith(WORKTREE_PREFIX)) {
+  const prefixLength = worktreePrefixLength(thread.name)
+  if (!prefixLength) {
     return
   }
-  const newName = thread.name.slice(WORKTREE_PREFIX.length)
+  const newName = thread.name.slice(prefixLength)
   const timeoutMs = 5000
   await Promise.race([
     thread.setName(newName).catch((e) => {
@@ -122,6 +135,15 @@ export async function handleMergeWorktreeCommand({
     return
   }
 
+  const strategyOption = command.options.getString('strategy') || 'rebase'
+  if (strategyOption !== 'rebase' && strategyOption !== 'squash') {
+    await command.editReply(`Invalid merge strategy: \`${strategyOption}\``)
+    return
+  }
+  const strategyName = strategyOption === 'squash'
+    ? 'Squash into one commit'
+    : 'Keep commits (rebase)'
+
   const rawTargetBranch = command.options.getString('target-branch') || undefined
   let targetBranch = rawTargetBranch
   if (targetBranch) {
@@ -141,6 +163,7 @@ export async function handleMergeWorktreeCommand({
     mainRepoDir: info.project_directory,
     worktreeName: info.workspace_name,
     targetBranch,
+    strategy: strategyOption,
     onProgress: (msg) => {
       logger.log(`[merge] ${msg}`)
     },
@@ -163,13 +186,24 @@ export async function handleMergeWorktreeCommand({
 
     if (result instanceof NothingToMergeError) {
       void removeWorktreePrefixFromTitle(thread)
-      await command.editReply(`Merge failed: ${result.message}`)
+      await command.editReply(formatMergeWorktreeError(result))
       return
     }
 
     if (result instanceof RebaseConflictError) {
+      const prefixLength = worktreePrefixLength(thread.name)
+      const mergedThreadName = prefixLength
+        ? thread.name.slice(prefixLength)
+        : thread.name
+      const mergeCommand = [
+        'kimaki merge-worktree',
+        `--strategy ${strategyOption}`,
+        `--target-branch ${quoteShellArg(String(result.target))}`,
+        `--thread ${quoteShellArg(thread.id)}`,
+        `--thread-name ${quoteShellArg(mergedThreadName)}`,
+      ].join(' ')
       await command.editReply(
-        'Rebase conflict detected. Asking the model to resolve...',
+        `Rebase conflict detected. Asking the model to resolve it and retry the merge with **${strategyName}**.`,
       )
       await sendPromptToModel({
         prompt: [
@@ -184,7 +218,8 @@ export async function handleMergeWorktreeCommand({
           '6. Stage resolved files with `git add`',
           '7. Continue the rebase with `git rebase --continue`',
           '8. If git reports more conflicts, repeat steps 1-7 until the rebase finishes (no more rebase in progress, `git status` is clean)',
-          '9. Once the rebase is fully complete, tell me so I can run `/merge-worktree` again',
+          `9. Once the rebase is fully complete, run \`${mergeCommand}\` yourself`,
+          '10. If that command fails because the target changed or is not ready, stop and report the failure. The user can run it again later.',
         ].join('\n'),
         thread,
         projectDirectory: info.project_directory,
@@ -194,14 +229,17 @@ export async function handleMergeWorktreeCommand({
       return
     }
 
-    await command.editReply(`Merge failed: ${result.message}`)
+    const formatted = formatMergeWorktreeError(result)
+    logger.error(formatted)
+    await command.editReply(formatted)
     return
   }
 
   void removeWorktreePrefixFromTitle(thread)
-  await command.editReply(
-    `Merged \`${result.branchName}\` into \`${result.defaultBranch}\` @ ${result.shortSha} (${result.commitCount} commit${result.commitCount === 1 ? '' : 's'})\nWorktree now at detached HEAD.`,
-  )
+  const mergeSummary = strategyOption === 'squash'
+    ? `Squashed \`${result.branchName}\` into \`${result.defaultBranch}\` @ ${result.shortSha} (${result.commitCount} source commit${result.commitCount === 1 ? '' : 's'} → 1)`
+    : `Merged \`${result.branchName}\` into \`${result.defaultBranch}\` @ ${result.shortSha} (${result.commitCount} commit${result.commitCount === 1 ? '' : 's'})`
+  await command.editReply(`${mergeSummary}\nWorktree now at detached HEAD.`)
 }
 
 /**

package/src/commands/model-variant.ts

@@ -34,6 +34,7 @@ import {
 } from './model.js'
 
 import { getThinkingValuesForModel } from '../thinking-utils.js'
+import { resolveDisplayedModelId } from '../session-handler/model-utils.js'
 import { createLogger, LogPrefix } from '../logger.js'
 
 const logger = createLogger(LogPrefix.MODEL)
@@ -214,6 +215,13 @@ export async function showModelVariantPicker({
   const { providerID, modelID, model: fullModelId } = currentModelInfo
   const sourceLabel = formatSourceLabel(currentModelInfo)
   const variantLabel = cascadeVariant ? ` (${cascadeVariant})` : ''
+  const displayedModelId =
+    (await resolveDisplayedModelId({
+      providers: providersResponse.data.all,
+      providerID,
+      modelID,
+      sessionID: sessionId,
+    })) ?? fullModelId
 
   const provider = providersResponse.data.all.find((p) => {
     return p.id === providerID
@@ -226,7 +234,7 @@ export async function showModelVariantPicker({
     modelId: modelID,
   })
 
-  const statusText = `**Current model:** \`${fullModelId}\`${variantLabel} — ${sourceLabel}`
+  const statusText = `**Current model:** \`${displayedModelId}\`${variantLabel} — ${sourceLabel}`
 
   if (variants.length === 0) {
     await editReply({

package/src/commands/model.ts

@@ -28,7 +28,10 @@ import {
 } from '../database.js'
 import { initializeOpencodeForDirectory } from '../opencode.js'
 import { resolveTextChannel, getKimakiMetadata } from '../discord-utils.js'
-import { getDefaultModel } from '../session-handler/model-utils.js'
+import {
+  getDefaultModel,
+  resolveDisplayedModelId,
+} from '../session-handler/model-utils.js'
 import { getRuntime } from '../session-handler/thread-session-runtime.js'
 import { getThinkingValuesForModel } from '../thinking-utils.js'
 import {
@@ -544,22 +547,30 @@ export async function handleModelCommand({
       return
     }
 
-    const currentModelText = (() => {
+    const currentModelText = await (async () => {
+      if (currentModelInfo.type === 'none') {
+        return '**Current:** none'
+      }
+      const displayed =
+        (await resolveDisplayedModelId({
+          providers: allProviders,
+          providerID: currentModelInfo.providerID,
+          modelID: currentModelInfo.modelID,
+          sessionID: sessionId,
+        })) ?? currentModelInfo.model
       switch (currentModelInfo.type) {
         case 'session':
-          return `**Current (this thread):** \`${currentModelInfo.model}\``
+          return `**Current (this thread):** \`${displayed}\``
         case 'agent':
-          return `**Current (agent "${currentModelInfo.agentName}"):** \`${currentModelInfo.model}\``
+          return `**Current (agent "${currentModelInfo.agentName}"):** \`${displayed}\``
         case 'channel':
-          return `**Current (channel override):** \`${currentModelInfo.model}\``
+          return `**Current (channel override):** \`${displayed}\``
         case 'global':
-          return `**Current (global default):** \`${currentModelInfo.model}\``
+          return `**Current (global default):** \`${displayed}\``
         case 'opencode-config':
         case 'opencode-recent':
         case 'opencode-provider-default':
-          return `**Current (opencode default):** \`${currentModelInfo.model}\``
-        case 'none':
-          return '**Current:** none'
+          return `**Current (opencode default):** \`${displayed}\``
       }
     })()
 

package/src/commands/multioauth.ts

@@ -1,3 +1,4 @@
+// LEGACY rotation, superseded by @subrouter/opencode. See oauth-rotation-shared.ts.
 /**
  * CLI commands for multi-provider OAuth account management.
  * Mounted via goke .use() in cli.ts under the `multioauth` namespace.