kimaki 0.4.82 → 0.4.84

package/src/discord-bot.ts

@@ -7,21 +7,18 @@ import {
   closeDatabase,
   getThreadWorktree,
   getThreadSession,
-  createPendingWorktree,
-  setWorktreeReady,
-  setWorktreeError,
   getChannelWorktreesEnabled,
   getChannelMentionMode,
   getChannelDirectory,
   getPrisma,
   cancelAllPendingIpcRequests,
+  deleteChannelDirectoryById,
 } from './database.js'
 import {
   stopOpencodeServer,
 } from './opencode.js'
-import { formatWorktreeName } from './commands/new-worktree.js'
+import { formatWorktreeName, createWorktreeInBackground, worktreeCreatingMessage } from './commands/new-worktree.js'
 import { WORKTREE_PREFIX } from './commands/merge-worktree.js'
-import { createWorktreeWithSubmodules } from './worktrees.js'
 import {
   escapeBackticksInCodeBlocks,
   splitMarkdownForDiscord,
@@ -35,6 +32,7 @@ import {
 } from './discord-utils.js'
 import {
   getOpencodeSystemMessage,
+  isInjectedPromptMarker,
   type ThreadStartMarker,
 } from './system-message.js'
 import yaml from 'js-yaml'
@@ -78,6 +76,10 @@ import { markDiscordGatewayReady, stopHranaServer } from './hrana-server.js'
 import { notifyError } from './sentry.js'
 import { flushDebouncedProcessCallbacks } from './debounced-process-flush.js'
 import { startRuntimeIdleSweeper } from './runtime-idle-sweeper.js'
+import {
+  startExternalOpencodeSessionSync,
+  stopExternalOpencodeSessionSync,
+} from './external-opencode-sync.js'
 
 export {
   initDatabase,
@@ -283,6 +285,7 @@ export async function startDiscordBot({
 
     registerInteractionHandler({ discordClient: c, appId: currentAppId })
     registerVoiceStateHandler({ discordClient: c, appId: currentAppId })
+    startExternalOpencodeSessionSync({ discordClient: c })
 
     // Channel logging is informational only; do it in background so startup stays responsive.
     void (async () => {
@@ -396,7 +399,7 @@ export async function startDiscordBot({
         footer: message.embeds[0]?.footer?.text,
       })
       const isCliInjectedPrompt = Boolean(
-        isSelfBotMessage && promptMarker?.cliThreadPrompt,
+        isSelfBotMessage && isInjectedPromptMarker({ marker: promptMarker }),
       )
       const sessionStartSource = isCliInjectedPrompt
         ? parseSessionStartSourceFromMarker(promptMarker)
@@ -604,8 +607,8 @@ export async function startDiscordBot({
           return
         }
 
-        // Capture narrowed non-undefined value for use in the preprocess closure
         const resolvedProjectDir = projectDirectory
+
         const sdkDir =
           worktreeInfo?.status === 'ready' &&
           worktreeInfo.worktree_directory
@@ -629,7 +632,9 @@ export async function startDiscordBot({
           cancelHtmlActionsForThread(thread.id)
           const dismissedPermission = await cancelPendingPermission(thread.id)
           if (dismissedPermission) {
-            runtime.abortActiveRun('user sent a new message while permission was pending')
+            await runtime.abortActiveRunAndWait({
+              reason: 'user sent a new message while permission was pending',
+            })
           }
           const questionResult = await cancelPendingQuestion(thread.id, message.content)
           void cancelPendingFileUpload(thread.id)
@@ -649,6 +654,8 @@ export async function startDiscordBot({
             cliInjectedUsername ||
             message.member?.displayName ||
             message.author.displayName,
+          sourceMessageId: message.id,
+          sourceThreadId: thread.id,
           appId: currentAppId,
           agent: cliInjectedAgent,
           model: cliInjectedModel,
@@ -777,45 +784,23 @@ export async function startDiscordBot({
           )
           discordLogger.log(`[WORKTREE] Creating worktree: ${worktreeName}`)
 
-          // Store pending worktree immediately so bot knows about it
-          await createPendingWorktree({
-            threadId: thread.id,
+          const worktreeStatusMessage = await thread
+            .send({
+              content: worktreeCreatingMessage(worktreeName),
+              flags: SILENT_MESSAGE_FLAGS,
+            })
+            .catch(() => undefined)
+
+          const result = await createWorktreeInBackground({
+            thread,
+            starterMessage: worktreeStatusMessage,
             worktreeName,
             projectDirectory,
+            rest: discordClient.rest,
           })
 
-          const worktreeResult = await createWorktreeWithSubmodules({
-            directory: projectDirectory,
-            name: worktreeName,
-          })
-
-          if (worktreeResult instanceof Error) {
-            const errMsg = worktreeResult.message
-            discordLogger.error(`[WORKTREE] Creation failed: ${errMsg}`)
-            await setWorktreeError({
-              threadId: thread.id,
-              errorMessage: errMsg,
-            })
-            await thread.send({
-              content: `⚠️ Failed to create worktree: ${errMsg}\nUsing main project directory instead.`,
-              flags: NOTIFY_MESSAGE_FLAGS,
-            })
-          } else {
-            await setWorktreeReady({
-              threadId: thread.id,
-              worktreeDirectory: worktreeResult.directory,
-            })
-            sessionDirectory = worktreeResult.directory
-            discordLogger.log(
-              `[WORKTREE] Created: ${worktreeResult.directory} (branch: ${worktreeResult.branch})`,
-            )
-            // React with tree emoji to mark as worktree thread
-            await reactToThread({
-              rest: discordClient.rest,
-              threadId: thread.id,
-              channelId: thread.parentId || undefined,
-              emoji: '🌳',
-            })
+          if (!(result instanceof Error)) {
+            sessionDirectory = result
           }
         }
 
@@ -832,6 +817,8 @@ export async function startDiscordBot({
           userId: message.author.id,
           username:
             message.member?.displayName || message.author.displayName,
+          sourceMessageId: message.id,
+          sourceThreadId: thread.id,
           appId: currentAppId,
           preprocess: () => {
             return preprocessNewThreadMessage({
@@ -961,66 +948,24 @@ export async function startDiscordBot({
 
         const worktreeStatusMessage = await thread
           .send({
-            content: `🌳 Creating worktree: ${marker.worktree}\n⏳ Setting up (this can take a bit)...`,
+            content: worktreeCreatingMessage(marker.worktree),
             flags: SILENT_MESSAGE_FLAGS,
           })
-          .catch(() => {
-            return null
-          })
+          .catch(() => undefined)
 
-        await createPendingWorktree({
-          threadId: thread.id,
+        const result = await createWorktreeInBackground({
+          thread,
+          starterMessage: worktreeStatusMessage,
           worktreeName: marker.worktree,
           projectDirectory,
+          rest: discordClient.rest,
         })
 
-        const worktreeResult = await createWorktreeWithSubmodules({
-          directory: projectDirectory,
-          name: marker.worktree,
-        })
-
-        if (errore.isError(worktreeResult)) {
-          discordLogger.error(
-            `[BOT_SESSION] Worktree creation failed: ${worktreeResult.message}`,
-          )
-          await setWorktreeError({
-            threadId: thread.id,
-            errorMessage: worktreeResult.message,
-          })
-          await (worktreeStatusMessage?.edit({
-            content: `⚠️ Failed to create worktree: ${worktreeResult.message}\nUsing main project directory instead.`,
-            flags: NOTIFY_MESSAGE_FLAGS,
-          }) ||
-            thread.send({
-              content: `⚠️ Failed to create worktree: ${worktreeResult.message}\nUsing main project directory instead.`,
-              flags: NOTIFY_MESSAGE_FLAGS,
-            }))
+        if (result instanceof Error) {
           return projectDirectory
         }
 
-        await setWorktreeReady({
-          threadId: thread.id,
-          worktreeDirectory: worktreeResult.directory,
-        })
-        discordLogger.log(
-          `[BOT_SESSION] Worktree created: ${worktreeResult.directory}`,
-        )
-        // React with tree emoji to mark as worktree thread
-        await reactToThread({
-          rest: discordClient.rest,
-          threadId: thread.id,
-          channelId: thread.parentId || undefined,
-          emoji: '🌳',
-        })
-        await (worktreeStatusMessage?.edit({
-          content: `🌳 **Worktree ready: ${marker.worktree}**\n📁 \`${worktreeResult.directory}\`\n🌿 Branch: \`${worktreeResult.branch}\``,
-          flags: SILENT_MESSAGE_FLAGS,
-        }) ||
-          thread.send({
-            content: `🌳 **Worktree ready: ${marker.worktree}**\n📁 \`${worktreeResult.directory}\`\n🌿 Branch: \`${worktreeResult.branch}\``,
-            flags: SILENT_MESSAGE_FLAGS,
-          }))
-        return worktreeResult.directory
+        return result
       })()
 
       discordLogger.log(
@@ -1082,6 +1027,25 @@ export async function startDiscordBot({
     disposeRuntime(thread.id)
   })
 
+  // Clean up SQLite when a Discord channel is deleted so project list
+  // doesn't show stale ghost entries. Thread runtimes inside the deleted
+  // channel are disposed by their own ThreadDelete events from Discord.
+  discordClient.on(Events.ChannelDelete, async (channel) => {
+    try {
+      const deleted = await deleteChannelDirectoryById(channel.id)
+      if (deleted) {
+        discordLogger.log(
+          `Cleaned up channel_directories for deleted channel ${channel.id}`,
+        )
+      }
+    } catch (error) {
+      notifyError(
+        error instanceof Error ? error : new Error(String(error)),
+        `Failed to clean up channel_directories for deleted channel ${channel.id}`,
+      )
+    }
+  })
+
   // Skip login if the caller already connected the client (e.g. cli.ts logs in
   // before calling startDiscordBot). Calling login() again destroys the existing
   // WebSocket (close code 1000) and triggers a spurious ShardReconnecting event.
@@ -1138,6 +1102,7 @@ export async function startDiscordBot({
       }
 
       voiceLogger.log('[SHUTDOWN] Stopping OpenCode server')
+      stopExternalOpencodeSessionSync()
       await stopOpencodeServer()
 
       discordLogger.log('Closing database...')

package/src/discord-command-registration.ts

@@ -484,7 +484,7 @@ export async function registerCommands({
       .toJSON(),
     new SlashCommandBuilder()
       .setName('screenshare')
-      .setDescription(truncateCommandDescription('Start screen sharing via VNC tunnel (auto-stops after 1 hour)'))
+      .setDescription(truncateCommandDescription('Start screen sharing via VNC tunnel (auto-stops after 30 minutes)'))
       .setDMPermission(false)
       .toJSON(),
     new SlashCommandBuilder()