kimaki 0.4.68 → 0.4.69

package/dist/cli.js

@@ -18,15 +18,14 @@ import fs from 'node:fs';
 import * as errore from 'errore';
 import { createLogger, formatErrorWithStack, LogPrefix } from './logger.js';
 import { archiveThread, uploadFilesToDiscord, stripMentions, } from './discord-utils.js';
-import { spawn, spawnSync, execSync, } from 'node:child_process';
-import http from 'node:http';
-import { setDataDir, getDataDir, getLockPort, setDefaultVerbosity, setDefaultMentionMode, setCritiqueEnabled, setVerboseOpencodeServer, getMemoryEnabled, setMemoryEnabled, getProjectsDir, } from './config.js';
+import { spawn, execSync } from 'node:child_process';
+import { setDataDir, getDataDir, setDefaultVerbosity, setDefaultMentionMode, setCritiqueEnabled, setVerboseOpencodeServer, getMemoryEnabled, setMemoryEnabled, getProjectsDir, } from './config.js';
 import { sanitizeAgentName } from './commands/agent.js';
-import { showFileUploadButton, } from './commands/file-upload.js';
-import { queueActionButtonsRequest, } from './commands/action-buttons.js';
 import { execAsync } from './worktree-utils.js';
 import { backgroundUpgradeKimaki, upgrade, getCurrentVersion, } from './upgrade.js';
 import { startConfiguredForumSync } from './forum-sync/index.js';
+import { startHranaServer } from './hrana-server.js';
+import { startIpcPolling, stopIpcPolling } from './ipc-polling.js';
 import { getLocalTimeZone, getPromptPreview, parseSendAtValue, serializeScheduledTaskPayload, } from './task-schedule.js';
 const cliLogger = createLogger(LogPrefix.CLI);
 // Strip bracketed paste escape sequences from terminal input.
@@ -41,6 +40,46 @@ function stripBracketedPaste(value) {
         .replace(/\x1b\[201~/g, '')
         .trim();
 }
+// Derive the Discord Application ID from a bot token.
+// Discord bot tokens have the format: base64(userId).timestamp.hmac
+// The first segment is the bot's user ID (= Application ID) base64-encoded.
+function appIdFromToken(token) {
+    const segment = token.split('.')[0];
+    if (!segment) {
+        return undefined;
+    }
+    try {
+        const decoded = Buffer.from(segment, 'base64').toString('utf8');
+        if (/^\d{17,20}$/.test(decoded)) {
+            return decoded;
+        }
+        return undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+// Resolve bot token and app ID from env var or database.
+// Used by CLI subcommands (send, project add) that need credentials
+// but don't run the interactive wizard.
+async function resolveBotCredentials({ appIdOverride } = {}) {
+    const envToken = process.env.KIMAKI_BOT_TOKEN;
+    if (envToken) {
+        // Prefer token-derived appId over stale DB values when using env token,
+        // since the DB may have credentials from a different bot.
+        const appId = appIdOverride || appIdFromToken(envToken);
+        return { token: envToken, appId };
+    }
+    const botRow = await getBotToken().catch((e) => {
+        cliLogger.error('Database error:', e instanceof Error ? e.message : String(e));
+        return null;
+    });
+    if (!botRow) {
+        cliLogger.error('No bot token found. Set KIMAKI_BOT_TOKEN env var or run `kimaki` first to set up.');
+        process.exit(EXIT_NO_RESTART);
+    }
+    return { token: botRow.token, appId: appIdOverride || botRow.app_id };
+}
 function isThreadChannelType(type) {
     return [
         ChannelType.PublicThread,
@@ -213,17 +252,6 @@ async function ensureCommandAvailable({ name, envPathKey, installUnix, installWi
     process.env[envPathKey] = installedPath;
 }
 // Run opencode upgrade in the background so the user always has the latest version.
-// Fire-and-forget: errors are silently ignored since this is non-critical.
-function backgroundUpgradeOpencode() {
-    const opencodeCommand = process.env.OPENCODE_PATH || 'opencode';
-    const child = spawn(opencodeCommand, ['upgrade'], {
-        shell: true,
-        stdio: 'ignore',
-        detached: true,
-    });
-    child.unref();
-    cliLogger.debug('Started background opencode upgrade');
-}
 // Spawn caffeinate on macOS to prevent system sleep while bot is running.
 // Not detached, so it dies automatically with the parent process.
 function startCaffeinate() {
@@ -246,274 +274,6 @@ function startCaffeinate() {
 }
 const cli = goke('kimaki');
 process.title = 'kimaki';
-async function killProcessOnPort(port) {
-    const isWindows = process.platform === 'win32';
-    const myPid = process.pid;
-    try {
-        if (isWindows) {
-            // Windows: find PID using netstat, then kill
-            const result = spawnSync('cmd', [
-                '/c',
-                `for /f "tokens=5" %a in ('netstat -ano ^| findstr :${port} ^| findstr LISTENING') do @echo %a`,
-            ], {
-                shell: false,
-                encoding: 'utf-8',
-            });
-            const pids = result.stdout
-                ?.trim()
-                .split('\n')
-                .map((p) => p.trim())
-                .filter((p) => /^\d+$/.test(p));
-            // Filter out our own PID and take the first (oldest)
-            const targetPid = pids?.find((p) => parseInt(p, 10) !== myPid);
-            if (targetPid) {
-                cliLogger.log(`Killing existing kimaki process (PID: ${targetPid})`);
-                spawnSync('taskkill', ['/F', '/PID', targetPid], { shell: false });
-                return true;
-            }
-        }
-        else {
-            // Unix: use lsof with -sTCP:LISTEN to only find the listening process
-            const result = spawnSync('lsof', ['-i', `:${port}`, '-sTCP:LISTEN', '-t'], {
-                shell: false,
-                encoding: 'utf-8',
-            });
-            const pids = result.stdout
-                ?.trim()
-                .split('\n')
-                .map((p) => p.trim())
-                .filter((p) => /^\d+$/.test(p));
-            // Filter out our own PID and take the first (oldest)
-            const targetPid = pids?.find((p) => parseInt(p, 10) !== myPid);
-            if (targetPid) {
-                const pid = parseInt(targetPid, 10);
-                cliLogger.log(`Stopping existing kimaki process (PID: ${pid})`);
-                process.kill(pid, 'SIGKILL');
-                return true;
-            }
-        }
-    }
-    catch (e) {
-        cliLogger.debug(`Failed to kill process on port ${port}:`, e);
-    }
-    return false;
-}
-async function checkSingleInstance() {
-    const lockPort = getLockPort();
-    try {
-        const response = await fetch(`http://127.0.0.1:${lockPort}`, {
-            signal: AbortSignal.timeout(1000),
-        });
-        if (response.ok) {
-            cliLogger.log(`Another kimaki instance detected for data dir: ${getDataDir()}`);
-            await killProcessOnPort(lockPort);
-            // Wait a moment for port to be released
-            await new Promise((resolve) => {
-                setTimeout(resolve, 500);
-            });
-        }
-    }
-    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');
-    }
-}
-// Set after Discord login. Used by the lock server /file-upload route.
-let discordClientRef = null;
-async function startLockServer() {
-    const lockPort = getLockPort();
-    return new Promise((resolve, reject) => {
-        const server = http.createServer(async (req, res) => {
-            // POST /file-upload - handle file upload requests from the opencode plugin
-            if (req.method === 'POST' && req.url === '/file-upload') {
-                if (!discordClientRef) {
-                    res.writeHead(503, { 'Content-Type': 'application/json' });
-                    res.end(JSON.stringify({ error: 'Discord client not ready' }));
-                    return;
-                }
-                let body = '';
-                req.on('data', (chunk) => {
-                    body += chunk.toString();
-                });
-                // Track if the client (plugin) disconnected so we don't write to closed socket.
-                // Use res.on('close') not req.on('close') because req 'close' fires after body
-                // is received (normal flow), while res 'close' fires on socket teardown.
-                let clientDisconnected = false;
-                res.on('close', () => {
-                    if (!res.writableFinished) {
-                        clientDisconnected = true;
-                    }
-                });
-                req.on('end', async () => {
-                    try {
-                        const parsed = JSON.parse(body);
-                        // Validate required fields
-                        const request = {
-                            sessionId: String(parsed.sessionId || ''),
-                            threadId: String(parsed.threadId || ''),
-                            directory: String(parsed.directory || ''),
-                            prompt: String(parsed.prompt || 'Please upload files'),
-                            maxFiles: Math.min(10, Math.max(1, Number(parsed.maxFiles) || 5)),
-                        };
-                        if (!request.sessionId || !request.threadId || !request.directory) {
-                            res.writeHead(400, { 'Content-Type': 'application/json' });
-                            res.end(JSON.stringify({
-                                error: 'Missing required fields: sessionId, threadId, directory',
-                            }));
-                            return;
-                        }
-                        const thread = await discordClientRef.channels.fetch(request.threadId);
-                        if (!thread || !thread.isThread()) {
-                            res.writeHead(404, { 'Content-Type': 'application/json' });
-                            res.end(JSON.stringify({ error: 'Thread not found' }));
-                            return;
-                        }
-                        const filePaths = await showFileUploadButton({
-                            thread,
-                            sessionId: request.sessionId,
-                            directory: request.directory,
-                            prompt: request.prompt,
-                            maxFiles: request.maxFiles,
-                        });
-                        if (clientDisconnected) {
-                            return;
-                        }
-                        res.writeHead(200, { 'Content-Type': 'application/json' });
-                        res.end(JSON.stringify({ filePaths }));
-                    }
-                    catch (err) {
-                        const message = err instanceof Error ? err.message : String(err);
-                        cliLogger.error('[FILE-UPLOAD] Error handling request:', message);
-                        if (clientDisconnected) {
-                            return;
-                        }
-                        res.writeHead(500, { 'Content-Type': 'application/json' });
-                        res.end(JSON.stringify({ error: message }));
-                    }
-                });
-                return;
-            }
-            // POST /action-buttons - queue action buttons for session-handler to render
-            if (req.method === 'POST' && req.url === '/action-buttons') {
-                if (!discordClientRef) {
-                    res.writeHead(503, { 'Content-Type': 'application/json' });
-                    res.end(JSON.stringify({ error: 'Discord client not ready' }));
-                    return;
-                }
-                let body = '';
-                req.on('data', (chunk) => {
-                    body += chunk.toString();
-                });
-                let clientDisconnected = false;
-                res.on('close', () => {
-                    if (!res.writableFinished) {
-                        clientDisconnected = true;
-                    }
-                });
-                req.on('end', async () => {
-                    try {
-                        const parsed = JSON.parse(body);
-                        const parsedButtons = Array.isArray(parsed.buttons)
-                            ? parsed.buttons
-                                .map((value) => {
-                                if (!value || typeof value !== 'object') {
-                                    return null;
-                                }
-                                const maybeLabel = 'label' in value && typeof value.label === 'string'
-                                    ? value.label
-                                    : '';
-                                const maybeColor = 'color' in value && typeof value.color === 'string'
-                                    ? value.color
-                                    : undefined;
-                                const safeColor = maybeColor === 'white' ||
-                                    maybeColor === 'blue' ||
-                                    maybeColor === 'green' ||
-                                    maybeColor === 'red'
-                                    ? maybeColor
-                                    : undefined;
-                                const label = maybeLabel.trim().slice(0, 80);
-                                if (!label) {
-                                    return null;
-                                }
-                                return {
-                                    label,
-                                    color: safeColor,
-                                };
-                            })
-                                .filter((value) => {
-                                return value !== null;
-                            })
-                                .slice(0, 3)
-                            : [];
-                        const request = {
-                            sessionId: typeof parsed.sessionId === 'string' ? parsed.sessionId : '',
-                            threadId: typeof parsed.threadId === 'string' ? parsed.threadId : '',
-                            directory: typeof parsed.directory === 'string' ? parsed.directory : '',
-                            buttons: parsedButtons,
-                        };
-                        if (!request.sessionId || !request.threadId || !request.directory) {
-                            res.writeHead(400, { 'Content-Type': 'application/json' });
-                            res.end(JSON.stringify({
-                                error: 'Missing required fields: sessionId, threadId, directory',
-                            }));
-                            return;
-                        }
-                        if (request.buttons.length === 0) {
-                            res.writeHead(400, { 'Content-Type': 'application/json' });
-                            res.end(JSON.stringify({
-                                error: 'At least one valid button is required',
-                            }));
-                            return;
-                        }
-                        const thread = await discordClientRef.channels.fetch(request.threadId);
-                        if (!thread || !thread.isThread()) {
-                            res.writeHead(404, { 'Content-Type': 'application/json' });
-                            res.end(JSON.stringify({ error: 'Thread not found' }));
-                            return;
-                        }
-                        queueActionButtonsRequest(request);
-                        if (clientDisconnected) {
-                            return;
-                        }
-                        res.writeHead(200, { 'Content-Type': 'application/json' });
-                        res.end(JSON.stringify({ ok: true }));
-                    }
-                    catch (err) {
-                        const message = err instanceof Error ? err.message : String(err);
-                        cliLogger.error('[ACTION-BUTTONS] Error handling request:', message);
-                        if (clientDisconnected) {
-                            return;
-                        }
-                        res.writeHead(500, { 'Content-Type': 'application/json' });
-                        res.end(JSON.stringify({ error: message }));
-                    }
-                });
-                return;
-            }
-            res.writeHead(200);
-            res.end('kimaki');
-        });
-        server.listen(lockPort, '127.0.0.1');
-        server.once('listening', () => {
-            cliLogger.debug(`Lock server started on port ${lockPort}`);
-            resolve();
-        });
-        server.on('error', async (err) => {
-            if (err.code === 'EADDRINUSE') {
-                cliLogger.log('Port still in use, retrying...');
-                await killProcessOnPort(lockPort);
-                await new Promise((r) => {
-                    setTimeout(r, 500);
-                });
-                // Retry once
-                server.listen(lockPort, '127.0.0.1');
-            }
-            else {
-                reject(err);
-            }
-        });
-    });
-}
 // Commands to skip when registering user commands (reserved names)
 const SKIP_USER_COMMANDS = ['init'];
 import { registeredUserCommands } from './config.js';
@@ -769,6 +529,11 @@ async function registerCommands({ token, appId, userCommands = [], agents = [],
             .setDescription('Upgrade kimaki to the latest version and restart the bot')
             .setDMPermission(false)
             .toJSON(),
+        new SlashCommandBuilder()
+            .setName('transcription-key')
+            .setDescription('Set API key for voice message transcription (OpenAI or Gemini)')
+            .setDMPermission(false)
+            .toJSON(),
     ];
     // Add user-defined commands with -cmd suffix
     // Also populate registeredUserCommands for /queue-command autocomplete
@@ -1020,47 +785,52 @@ async function run({ restart, addChannels, useWorktrees, enableVoiceChannels, })
         possiblePathsUnix: ['~/.bun/bin/bun', '/usr/local/bin/bun'],
         possiblePathsWindows: ['~\\.bun\\bin\\bun.exe'],
     });
-    backgroundUpgradeOpencode();
     backgroundUpgradeKimaki();
-    // Initialize database
-    await initDatabase();
-    let appId;
-    let token;
-    const existingBot = await getBotToken();
-    const shouldAddChannels = !existingBot?.token || forceSetup || Boolean(addChannels);
-    const isQuickStart = Boolean(existingBot && !forceSetup && !addChannels);
-    if (existingBot && !forceSetup) {
-        appId = existingBot.app_id;
-        token = existingBot.token;
-        note(`Using saved bot credentials:\nApp ID: ${appId}\n\nTo use different credentials, run with --restart`, 'Existing Bot Found');
-        note(`Bot install URL (in case you need to add it to another server):\n${generateBotInstallUrl({ clientId: appId })}`, 'Install URL');
+    // Start in-process Hrana server before database init. Required for the bot
+    // process because it serves as both the DB server and the single-instance
+    // lock (binds the fixed lock port). Without it, IPC and lock enforcement
+    // don't work. CLI subcommands skip the server and use file: directly.
+    const hranaResult = await startHranaServer({
+        dbPath: path.join(getDataDir(), 'discord-sessions.db'),
+    });
+    if (hranaResult instanceof Error) {
+        cliLogger.error('Failed to start hrana server:', hranaResult.message);
+        process.exit(EXIT_NO_RESTART);
     }
-    else {
+    // Initialize database (connects to hrana server via HTTP)
+    await initDatabase();
+    // Resolve bot credentials from (in priority order):
+    // 1. KIMAKI_BOT_TOKEN env var (headless/CI deployments)
+    // 2. Saved credentials in the database
+    // 3. Interactive setup wizard (first-time users)
+    // App ID is always derived from the token (base64 first segment).
+    const { appId, token, isQuickStart } = await (async () => {
+        const envToken = process.env.KIMAKI_BOT_TOKEN;
+        const existingBot = await getBotToken();
+        // 1. Env var takes precedence (headless deployments)
+        if (envToken && !forceSetup) {
+            const derivedAppId = appIdFromToken(envToken);
+            if (!derivedAppId) {
+                cliLogger.error('Could not derive Application ID from KIMAKI_BOT_TOKEN. The token appears malformed.');
+                process.exit(EXIT_NO_RESTART);
+            }
+            await setBotToken(derivedAppId, envToken);
+            cliLogger.log(`Using KIMAKI_BOT_TOKEN env var (App ID: ${derivedAppId})`);
+            return { appId: derivedAppId, token: envToken, isQuickStart: !addChannels };
+        }
+        // 2. Saved credentials in the database
+        if (existingBot && !forceSetup) {
+            note(`Using saved bot credentials:\nApp ID: ${existingBot.app_id}\n\nTo use different credentials, run with --restart`, 'Existing Bot Found');
+            note(`Bot install URL (in case you need to add it to another server):\n${generateBotInstallUrl({ clientId: existingBot.app_id })}`, 'Install URL');
+            return { appId: existingBot.app_id, token: existingBot.token, isQuickStart: !addChannels };
+        }
+        // 3. Interactive setup wizard
         if (forceSetup && existingBot) {
             note('Ignoring saved credentials due to --restart flag', 'Restart Setup');
         }
         note('1. Go to https://discord.com/developers/applications\n' +
             '2. Click "New Application"\n' +
-            '3. Give your application a name\n' +
-            '4. Copy the Application ID from the "General Information" section', 'Step 1: Create Discord Application');
-        const appIdInput = await text({
-            message: 'Enter your Discord Application ID:',
-            placeholder: 'e.g., 1234567890123456789',
-            validate(value) {
-                const cleaned = stripBracketedPaste(value);
-                if (!cleaned) {
-                    return 'Application ID is required';
-                }
-                if (!/^\d{17,20}$/.test(cleaned)) {
-                    return 'Invalid Application ID format (should be 17-20 digits)';
-                }
-            },
-        });
-        if (isCancel(appIdInput)) {
-            cancel('Setup cancelled');
-            process.exit(0);
-        }
-        appId = stripBracketedPaste(appIdInput);
+            '3. Give your application a name', 'Step 1: Create Discord Application');
         note('1. Go to the "Bot" section in the left sidebar\n' +
             '2. Scroll down to "Privileged Gateway Intents"\n' +
             '3. Enable these intents by toggling them ON:\n' +
@@ -1094,9 +864,14 @@ async function run({ restart, addChannels, useWorktrees, enableVoiceChannels, })
             cancel('Setup cancelled');
             process.exit(0);
         }
-        token = stripBracketedPaste(tokenInput);
-        await setBotToken(appId, token);
-        note(`Bot install URL:\n${generateBotInstallUrl({ clientId: appId })}\n\nYou MUST install the bot in your Discord server before continuing.`, 'Step 4: Install Bot to Server');
+        const wizardToken = stripBracketedPaste(tokenInput);
+        const derivedAppId = appIdFromToken(wizardToken);
+        if (!derivedAppId) {
+            cliLogger.error('Could not derive Application ID from the bot token. The token appears malformed.');
+            process.exit(EXIT_NO_RESTART);
+        }
+        await setBotToken(derivedAppId, wizardToken);
+        note(`Bot install URL:\n${generateBotInstallUrl({ clientId: derivedAppId })}\n\nYou MUST install the bot in your Discord server before continuing.`, 'Step 4: Install Bot to Server');
         const installed = await text({
             message: 'Press Enter AFTER you have installed the bot in your server:',
             placeholder: 'Enter',
@@ -1105,7 +880,9 @@ async function run({ restart, addChannels, useWorktrees, enableVoiceChannels, })
             cancel('Setup cancelled');
             process.exit(0);
         }
-    }
+        return { appId: derivedAppId, token: wizardToken, isQuickStart: false };
+    })();
+    const shouldAddChannels = !isQuickStart || forceSetup || Boolean(addChannels);
     // Start OpenCode server EARLY - let it initialize in parallel with Discord login.
     // This is the biggest startup bottleneck (can take 1-30 seconds to spawn and wait for ready)
     const currentDir = process.cwd();
@@ -1145,7 +922,10 @@ async function run({ restart, addChannels, useWorktrees, enableVoiceChannels, })
             discordClient.login(token).catch(reject);
         });
         cliLogger.log('Connected to Discord!');
-        discordClientRef = discordClient;
+        // Start IPC polling now that Discord client is ready.
+        // Register cleanup on process exit since the shutdown handler lives in discord-bot.ts.
+        await startIpcPolling({ discordClient });
+        process.on('exit', stopIpcPolling);
     }
     catch (error) {
         cliLogger.log('Failed to connect to Discord');
@@ -1435,8 +1215,8 @@ cli
             cliLogger.log(generateBotInstallUrl({ clientId: existingBot.app_id }));
             process.exit(0);
         }
-        await checkSingleInstance();
-        await startLockServer();
+        // Single-instance enforcement is handled by the hrana server binding the lock port.
+        // startHranaServer() in run() evicts any existing instance before binding.
         await run({
             restart: options.restart,
             addChannels: options.addChannels,
@@ -1596,43 +1376,11 @@ cli
                 process.exit(EXIT_NO_RESTART);
             }
         }
-        // Get bot token from env var or database
-        const envToken = process.env.KIMAKI_BOT_TOKEN;
-        let botToken;
-        let appId = optionAppId;
         // Initialize database first
         await initDatabase();
-        if (envToken) {
-            botToken = envToken;
-            if (!appId) {
-                // Try to get app_id from database if available (optional in CI)
-                try {
-                    const botRow = await getBotToken();
-                    appId = botRow?.app_id;
-                }
-                catch (error) {
-                    cliLogger.debug('Database lookup failed while resolving app ID:', error instanceof Error ? error.message : String(error));
-                }
-            }
-        }
-        else {
-            // Fall back to database
-            try {
-                const botRow = await getBotToken();
-                if (botRow) {
-                    botToken = botRow.token;
-                    appId = appId || botRow.app_id;
-                }
-            }
-            catch (e) {
-                // Database error - will fall through to the check below
-                cliLogger.error('Database error:', e instanceof Error ? e.message : String(e));
-            }
-        }
-        if (!botToken) {
-            cliLogger.error('No bot token found. Set KIMAKI_BOT_TOKEN env var or run `kimaki` first to set up.');
-            process.exit(EXIT_NO_RESTART);
-        }
+        const { token: botToken, appId } = await resolveBotCredentials({
+            appIdOverride: optionAppId,
+        });
         // If --project provided (or defaulting to cwd), resolve to channel ID
         if (resolvedProjectPath) {
             const absolutePath = path.resolve(resolvedProjectPath);
@@ -2049,38 +1797,9 @@ cli
     }
     // Initialize database
     await initDatabase();
-    // Get bot token from env var or database
-    const envToken = process.env.KIMAKI_BOT_TOKEN;
-    let botToken;
-    let appId = options.appId;
-    if (envToken) {
-        botToken = envToken;
-        if (!appId) {
-            try {
-                const botRow = await getBotToken();
-                appId = botRow?.app_id;
-            }
-            catch (error) {
-                cliLogger.debug('Database lookup failed while resolving app ID:', error instanceof Error ? error.message : String(error));
-            }
-        }
-    }
-    else {
-        try {
-            const botRow = await getBotToken();
-            if (botRow) {
-                botToken = botRow.token;
-                appId = appId || botRow.app_id;
-            }
-        }
-        catch (e) {
-            cliLogger.error('Database error:', e instanceof Error ? e.message : String(e));
-        }
-    }
-    if (!botToken) {
-        cliLogger.error('No bot token found. Set KIMAKI_BOT_TOKEN env var or run `kimaki` first to set up.');
-        process.exit(EXIT_NO_RESTART);
-    }
+    const { token: botToken, appId } = await resolveBotCredentials({
+        appIdOverride: options.appId,
+    });
     if (!appId) {
         cliLogger.error('App ID is required to create channels. Use --app-id or run `kimaki` first.');
         process.exit(EXIT_NO_RESTART);
@@ -2724,12 +2443,7 @@ cli
     .action(async (threadId) => {
     try {
         await initDatabase();
-        const envToken = process.env.KIMAKI_BOT_TOKEN;
-        const botToken = envToken || (await getBotToken())?.token;
-        if (!botToken) {
-            cliLogger.error('No bot token found. Set KIMAKI_BOT_TOKEN env var or run `kimaki` first to set up.');
-            process.exit(EXIT_NO_RESTART);
-        }
+        const { token: botToken } = await resolveBotCredentials();
         const rest = new REST().setToken(botToken);
         const threadData = (await rest.get(Routes.channel(threadId)));
         if (!isThreadChannelType(threadData.type)) {

package/dist/commands/action-buttons.js

@@ -8,7 +8,7 @@ import { NOTIFY_MESSAGE_FLAGS, resolveWorkingDirectory, sendThreadMessage, } fro
 import { createLogger } from '../logger.js';
 import { abortControllers, addToQueue, handleOpencodeSession, } from '../session-handler.js';
 const logger = createLogger('ACT_BTN');
-const PENDING_TTL_MS = 30 * 60 * 1000;
+const PENDING_TTL_MS = 24 * 60 * 60 * 1000;
 export const pendingActionButtonContexts = new Map();
 const pendingActionButtonRequests = new Map();
 const pendingActionButtonRequestWaiters = new Map();

package/dist/commands/file-upload.js

@@ -1,13 +1,10 @@
 // File upload tool handler - Shows Discord modal with FileUploadBuilder.
-// When the AI uses the kimaki_file_upload tool, the plugin POSTs to the bot's
-// lock server HTTP endpoint. The bot shows a button in the thread, user clicks
-// it to open a modal with a native file picker. Uploaded files are downloaded
-// to the project directory and paths returned to the AI.
-//
-// Architecture: The plugin tool (running in OpenCode's process) communicates
-// with the Discord bot via HTTP. The bot holds the HTTP response open until
-// the user completes the upload or the request is cancelled. This bridges the
-// gap between the plugin process and Discord's interaction-based UI.
+// When the AI uses the kimaki_file_upload tool, the plugin inserts a row into
+// the ipc_requests DB table. The bot polls this table, picks up the request,
+// and shows a button in the thread. User clicks it to open a modal with a
+// native file picker. Uploaded files are downloaded to the project directory.
+// The bot writes file paths back to ipc_requests.response, and the plugin
+// polls until the response appears.
 import { ButtonBuilder, ButtonStyle, ActionRowBuilder, ModalBuilder, FileUploadBuilder, LabelBuilder, ComponentType, MessageFlags, } from 'discord.js';
 import crypto from 'node:crypto';
 import fs from 'node:fs';