kimaki 0.4.65 → 0.4.67

package/dist/bin.js

@@ -8,7 +8,18 @@
 // since they are short-lived and don't need crash recovery.
 //
 // When __KIMAKI_CHILD is set, we're the child process -- just run cli.js directly.
+//
+// V8 heap snapshot flags:
+// Injects --heapsnapshot-near-heap-limit=3 and --diagnostic-dir so V8 writes
+// heap snapshots internally as it approaches the heap limit. This catches OOM
+// situations where SIGKILL (exit 137) would kill the process before our
+// heap-monitor.ts polling can react. The polling monitor is kept as an early
+// warning system at 85% usage; the V8 flag is the last-resort safety net.
 import { spawn } from 'node:child_process';
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+const HEAP_SNAPSHOT_DIR = path.join(os.homedir(), '.kimaki', 'heap-snapshots');
 // First arg after node + script is either a subcommand or a flag.
 // If it doesn't start with '-', it's a subcommand (e.g. "send", "tunnel", "project").
 const firstArg = process.argv[2];
@@ -27,7 +38,11 @@ else {
     // Track when we forwarded a termination signal so we don't restart after graceful shutdown
     let shutdownRequested = false;
     function start() {
-        child = spawn(process.argv[0], [...process.execArgv, ...process.argv.slice(1)], {
+        if (!fs.existsSync(HEAP_SNAPSHOT_DIR)) {
+            fs.mkdirSync(HEAP_SNAPSHOT_DIR, { recursive: true });
+        }
+        const heapArgs = [`--heapsnapshot-near-heap-limit=3`, `--diagnostic-dir=${HEAP_SNAPSHOT_DIR}`];
+        child = spawn(process.argv[0], [...heapArgs, ...process.execArgv, ...process.argv.slice(1)], {
             stdio: 'inherit',
             env: { ...process.env, __KIMAKI_CHILD: '1' },
         });

package/dist/cli-parsing.test.js

@@ -9,6 +9,10 @@ function createCliForIdParsing() {
         .option('--thread <threadId>', 'Thread ID')
         .option('--session <sessionId>', 'Session ID');
     cli.command('session archive <threadId>', 'Archive a thread');
+    cli
+        .command('session search <query>', 'Search sessions')
+        .option('--channel <channelId>', 'Discord channel ID')
+        .option('--project <path>', 'Project path');
     cli
         .command('add-project', 'Add a project')
         .option('-g, --guild <guildId>', 'Discord guild/server ID');
@@ -50,4 +54,16 @@ describe('goke CLI ID parsing', () => {
         expect(result.args[0]).toBe(threadId);
         expect(typeof result.args[0]).toBe('string');
     });
+    test('keeps session search regex and channel ID as strings', () => {
+        const cli = createCliForIdParsing();
+        const channelId = '0012345678901234567';
+        const query = '/error\\s+42/i';
+        const result = cli.parse(['node', 'kimaki', 'session', 'search', query, '--channel', channelId], {
+            run: false,
+        });
+        expect(result.args[0]).toBe(query);
+        expect(typeof result.args[0]).toBe('string');
+        expect(result.options.channel).toBe(channelId);
+        expect(typeof result.options.channel).toBe('string');
+    });
 });

package/dist/cli.js

@@ -8,6 +8,7 @@ import { deduplicateByKey, generateBotInstallUrl, abbreviatePath } from './utils
 import { getChannelsWithDescriptions, createDiscordClient, initDatabase, getChannelDirectory, startDiscordBot, initializeOpencodeForDirectory, ensureKimakiCategory, createProjectChannels, } from './discord-bot.js';
 import { getBotToken, setBotToken, setChannelDirectory, findChannelsByDirectory, findChannelByAppId, getThreadSession, getThreadIdBySessionId, getPrisma, } from './database.js';
 import { ShareMarkdown } from './markdown.js';
+import { parseSessionSearchPattern, findFirstSessionSearchHit, buildSessionSearchSnippet, getPartSearchTexts, } from './session-search.js';
 import { formatWorktreeName } from './commands/worktree.js';
 import { WORKTREE_PREFIX } from './commands/merge-worktree.js';
 import yaml from 'js-yaml';
@@ -19,7 +20,7 @@ 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, getProjectsDir, } from './config.js';
+import { setDataDir, getDataDir, getLockPort, setDefaultVerbosity, setDefaultMentionMode, setCritiqueEnabled, setVerboseOpencodeServer, getProjectsDir, } from './config.js';
 import { sanitizeAgentName } from './commands/agent.js';
 import { showFileUploadButton } from './commands/file-upload.js';
 import { execAsync } from './worktree-utils.js';
@@ -611,6 +612,11 @@ async function registerCommands({ token, appId, userCommands = [], agents = [],
             .setDescription('Show token usage and context window percentage for this session')
             .setDMPermission(false)
             .toJSON(),
+        new SlashCommandBuilder()
+            .setName('session-id')
+            .setDescription('Show current session ID and opencode attach command for this thread')
+            .setDMPermission(false)
+            .toJSON(),
         new SlashCommandBuilder()
             .setName('upgrade-and-restart')
             .setDescription('Upgrade kimaki to the latest version and restart the bot')
@@ -738,14 +744,14 @@ async function backgroundInit({ currentDir, token, appId, }) {
         const getClient = opencodeResult;
         const [userCommands, agents] = await Promise.all([
             getClient()
-                .command.list({ query: { directory: currentDir } })
+                .command.list({ directory: currentDir })
                 .then((r) => r.data || [])
                 .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 } })
+                .app.agents({ directory: currentDir })
                 .then((r) => r.data || [])
                 .catch((error) => {
                 cliLogger.warn('Failed to load agents during background init:', error instanceof Error ? error.message : String(error));
@@ -978,7 +984,7 @@ async function run({ restart, addChannels, useWorktrees, enableVoiceChannels })
     // Fetch projects, commands, and agents in parallel
     const [projects, allUserCommands, allAgents] = await Promise.all([
         getClient()
-            .project.list({})
+            .project.list()
             .then((r) => r.data || [])
             .catch((error) => {
             cliLogger.log('Failed to fetch projects');
@@ -987,14 +993,14 @@ async function run({ restart, addChannels, useWorktrees, enableVoiceChannels })
             process.exit(EXIT_NO_RESTART);
         }),
         getClient()
-            .command.list({ query: { directory: currentDir } })
+            .command.list({ directory: currentDir })
             .then((r) => r.data || [])
             .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 } })
+            .app.agents({ directory: currentDir })
             .then((r) => r.data || [])
             .catch((error) => {
             cliLogger.warn('Failed to load agents during setup:', error instanceof Error ? error.message : String(error));
@@ -1116,6 +1122,7 @@ cli
     .option('--mention-mode', 'Bot only responds when @mentioned (default for all channels)')
     .option('--no-critique', 'Disable automatic diff upload to critique.work in system prompts')
     .option('--auto-restart', 'Automatically restart the bot on crash or OOM kill')
+    .option('--verbose-opencode-server', 'Forward OpenCode server stdout/stderr to kimaki.log')
     .action(async (options) => {
     try {
         // Set data directory early, before any database access
@@ -1140,6 +1147,10 @@ cli
             setCritiqueEnabled(false);
             cliLogger.log('Critique disabled: diffs will not be auto-uploaded to critique.work');
         }
+        if (options.verboseOpencodeServer) {
+            setVerboseOpencodeServer(true);
+            cliLogger.log('Verbose OpenCode server: stdout/stderr will be forwarded to kimaki.log');
+        }
         if (options.installUrl) {
             await initDatabase();
             const existingBot = await getBotToken();
@@ -1916,7 +1927,7 @@ cli
 cli
     .command('tunnel', 'Expose a local port via tunnel')
     .option('-p, --port <port>', 'Local port to expose (required)')
-    .option('-t, --tunnel-id [id]', 'Tunnel ID (random if omitted)')
+    .option('-t, --tunnel-id [id]', 'Custom tunnel ID (only for services safe to expose publicly; prefer random default)')
     .option('-h, --host [host]', 'Local host (default: localhost)')
     .option('-s, --server [url]', 'Tunnel server URL')
     .action(async (options) => {
@@ -2025,7 +2036,7 @@ cli
         // project.list() returns all known projects globally from any OpenCode server,
         // but session.list/get are scoped to the server's own project. So we try each.
         cliLogger.log('Session not in current project, searching all projects...');
-        const projectsResponse = await getClient().project.list({});
+        const projectsResponse = await getClient().project.list();
         const projects = projectsResponse.data || [];
         const otherProjects = projects
             .filter((p) => path.resolve(p.worktree) !== projectDirectory)
@@ -2062,6 +2073,157 @@ cli
         process.exit(EXIT_NO_RESTART);
     }
 });
+cli
+    .command('session search <query>', 'Search past sessions for text or /regex/flags in the selected project')
+    .option('--project <path>', 'Project directory (defaults to cwd)')
+    .option('--channel <channelId>', 'Resolve project from a Discord channel ID')
+    .option('--limit <n>', 'Maximum matched sessions to return (default: 20)')
+    .option('--json', 'Output as JSON')
+    .action(async (query, options) => {
+    try {
+        await initDatabase();
+        if (options.project && options.channel) {
+            cliLogger.error('Use either --project or --channel, not both');
+            process.exit(EXIT_NO_RESTART);
+        }
+        const limit = (() => {
+            const rawLimit = typeof options.limit === 'string' ? options.limit : '20';
+            const parsed = Number.parseInt(rawLimit, 10);
+            if (Number.isNaN(parsed) || parsed < 1) {
+                return new Error(`Invalid --limit value: ${rawLimit}`);
+            }
+            return parsed;
+        })();
+        if (limit instanceof Error) {
+            cliLogger.error(limit.message);
+            process.exit(EXIT_NO_RESTART);
+        }
+        const projectDirectoryResult = await (async () => {
+            if (options.channel) {
+                const channelConfig = await getChannelDirectory(options.channel);
+                if (!channelConfig) {
+                    return new Error(`No project mapping found for channel: ${options.channel}`);
+                }
+                return path.resolve(channelConfig.directory);
+            }
+            return path.resolve(options.project || '.');
+        })();
+        if (projectDirectoryResult instanceof Error) {
+            cliLogger.error(projectDirectoryResult.message);
+            process.exit(EXIT_NO_RESTART);
+        }
+        const projectDirectory = projectDirectoryResult;
+        if (!fs.existsSync(projectDirectory)) {
+            cliLogger.error(`Directory does not exist: ${projectDirectory}`);
+            process.exit(EXIT_NO_RESTART);
+        }
+        const searchPattern = parseSessionSearchPattern(query);
+        if (searchPattern instanceof Error) {
+            cliLogger.error(searchPattern.message);
+            process.exit(EXIT_NO_RESTART);
+        }
+        cliLogger.log('Connecting to OpenCode server...');
+        const getClient = await initializeOpencodeForDirectory(projectDirectory);
+        if (getClient instanceof Error) {
+            cliLogger.error('Failed to connect to OpenCode:', getClient.message);
+            process.exit(EXIT_NO_RESTART);
+        }
+        const sessionsResponse = await getClient().session.list();
+        const sessions = sessionsResponse.data || [];
+        if (sessions.length === 0) {
+            cliLogger.log('No sessions found');
+            process.exit(0);
+        }
+        const prisma = await getPrisma();
+        const threadSessions = await prisma.thread_sessions.findMany({
+            select: { thread_id: true, session_id: true },
+        });
+        const sessionToThread = new Map(threadSessions
+            .filter((row) => row.session_id !== '')
+            .map((row) => [row.session_id, row.thread_id]));
+        const sortedSessions = [...sessions].sort((a, b) => {
+            return b.time.updated - a.time.updated;
+        });
+        const matchedSessions = [];
+        let scannedSessions = 0;
+        for (const session of sortedSessions) {
+            scannedSessions++;
+            const messagesResponse = await getClient().session.messages({
+                sessionID: session.id,
+            });
+            const messages = messagesResponse.data || [];
+            const snippets = messages
+                .flatMap((message) => {
+                const rolePrefix = message.info.role === 'assistant'
+                    ? 'assistant'
+                    : message.info.role === 'user'
+                        ? 'user'
+                        : 'message';
+                return message.parts.flatMap((part) => {
+                    return getPartSearchTexts(part).flatMap((text) => {
+                        const hit = findFirstSessionSearchHit({
+                            text,
+                            searchPattern,
+                        });
+                        if (!hit) {
+                            return [];
+                        }
+                        const snippet = buildSessionSearchSnippet({ text, hit });
+                        if (!snippet) {
+                            return [];
+                        }
+                        return [`${rolePrefix}: ${snippet}`];
+                    });
+                });
+            })
+                .slice(0, 3);
+            if (snippets.length === 0) {
+                continue;
+            }
+            const threadId = sessionToThread.get(session.id);
+            matchedSessions.push({
+                id: session.id,
+                title: session.title || 'Untitled Session',
+                directory: session.directory,
+                updated: new Date(session.time.updated).toISOString(),
+                source: threadId ? 'kimaki' : 'opencode',
+                threadId: threadId || null,
+                snippets,
+            });
+            if (matchedSessions.length >= limit) {
+                break;
+            }
+        }
+        if (options.json) {
+            console.log(JSON.stringify({
+                query: searchPattern.raw,
+                mode: searchPattern.mode,
+                projectDirectory,
+                scannedSessions,
+                matches: matchedSessions,
+            }, null, 2));
+            process.exit(0);
+        }
+        if (matchedSessions.length === 0) {
+            cliLogger.log(`No matches found for ${searchPattern.raw} in ${projectDirectory} (${scannedSessions} sessions scanned)`);
+            process.exit(0);
+        }
+        cliLogger.log(`Found ${matchedSessions.length} matching session(s) for ${searchPattern.raw} in ${projectDirectory}`);
+        for (const match of matchedSessions) {
+            const threadInfo = match.threadId ? ` | thread: ${match.threadId}` : '';
+            console.log(`${match.id} | ${match.title} | ${match.updated} | ${match.source}${threadInfo}`);
+            console.log(`  Directory: ${match.directory}`);
+            match.snippets.forEach((snippet) => {
+                console.log(`  - ${snippet}`);
+            });
+        }
+        process.exit(0);
+    }
+    catch (error) {
+        cliLogger.error('Error:', error instanceof Error ? error.message : String(error));
+        process.exit(EXIT_NO_RESTART);
+    }
+});
 cli
     .command('session archive <threadId>', 'Archive a Discord thread and stop its mapped OpenCode session')
     .action(async (threadId) => {
@@ -2115,7 +2277,10 @@ cli
         process.exit(EXIT_NO_RESTART);
     }
 });
-cli.command('upgrade', 'Upgrade kimaki to the latest version').action(async () => {
+cli
+    .command('upgrade', 'Upgrade kimaki to the latest version and restart the running bot')
+    .option('--skip-restart', 'Only upgrade, do not restart the running bot')
+    .action(async (options) => {
     try {
         const current = getCurrentVersion();
         cliLogger.log(`Current version: v${current}`);
@@ -2125,6 +2290,19 @@ cli.command('upgrade', 'Upgrade kimaki to the latest version').action(async () =
             process.exit(0);
         }
         cliLogger.log(`Upgraded to v${newVersion}`);
+        if (options.skipRestart) {
+            process.exit(0);
+        }
+        // Spawn a new kimaki process without args (starts the bot with default command).
+        // The new process kills the old one via the single-instance lock.
+        // No args passed to avoid recursively running `upgrade` again.
+        const child = spawn('kimaki', [], {
+            shell: true,
+            stdio: 'ignore',
+            detached: true,
+        });
+        child.unref();
+        cliLogger.log('Restarting bot with new version...');
         process.exit(0);
     }
     catch (error) {

package/dist/commands/abort.js

@@ -63,7 +63,7 @@ export async function handleAbortCommand({ command }) {
     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 },
+            sessionID: sessionId,
         });
         await command.reply({
             content: `🛑 Request **aborted**`,

package/dist/commands/agent.js

@@ -126,7 +126,7 @@ export async function handleAgentCommand({ interaction, appId, }) {
             return;
         }
         const agentsResponse = await getClient().app.agents({
-            query: { directory: context.dir },
+            directory: context.dir,
         });
         if (!agentsResponse.data || agentsResponse.data.length === 0) {
             await interaction.editReply({ content: 'No agents available' });

package/dist/commands/ask-question.js

@@ -4,7 +4,7 @@
 import { StringSelectMenuBuilder, StringSelectMenuInteraction, ActionRowBuilder, MessageFlags, } from 'discord.js';
 import crypto from 'node:crypto';
 import { sendThreadMessage, NOTIFY_MESSAGE_FLAGS } from '../discord-utils.js';
-import { getOpencodeClientV2 } from '../opencode.js';
+import { getOpencodeClient } from '../opencode.js';
 import { createLogger, LogPrefix } from '../logger.js';
 const logger = createLogger(LogPrefix.ASK_QUESTION);
 // Store pending question contexts by hash
@@ -56,7 +56,7 @@ export async function showAskUserQuestionDropdowns({ thread, sessionId, director
         }
         const actionRow = new ActionRowBuilder().addComponents(selectMenu);
         await thread.send({
-            content: `**${q.header}**\n${q.question}`,
+            content: `**${(q.header || '').slice(0, 200)}**\n${q.question.slice(0, 1700)}`,
             components: [actionRow],
             flags: NOTIFY_MESSAGE_FLAGS,
         });
@@ -129,16 +129,17 @@ export async function handleAskQuestionSelectMenu(interaction) {
  */
 async function submitQuestionAnswers(context) {
     try {
-        const clientV2 = getOpencodeClientV2(context.directory);
-        if (!clientV2) {
+        const client = getOpencodeClient(context.directory);
+        if (!client) {
             throw new Error('OpenCode server not found for directory');
         }
         // Build answers array: each element is an array of selected labels for that question
         const answers = context.questions.map((_, i) => {
             return context.answers[i] || [];
         });
-        await clientV2.question.reply({
+        await client.question.reply({
             requestID: context.requestId,
+            directory: context.directory,
             answers,
         });
         logger.log(`Submitted answers for question ${context.requestId} in session ${context.sessionId}`);
@@ -195,8 +196,8 @@ export async function cancelPendingQuestion(threadId, userMessage) {
         return false;
     }
     try {
-        const clientV2 = getOpencodeClientV2(context.directory);
-        if (!clientV2) {
+        const client = getOpencodeClient(context.directory);
+        if (!client) {
             throw new Error('OpenCode server not found for directory');
         }
         // Use user's message as answer if provided, otherwise mark as "Other"
@@ -204,8 +205,9 @@ export async function cancelPendingQuestion(threadId, userMessage) {
         const answers = context.questions.map((_, i) => {
             return context.answers[i] || [customAnswer];
         });
-        await clientV2.question.reply({
+        await client.question.reply({
             requestID: context.requestId,
+            directory: context.directory,
             answers,
         });
         logger.log(`Answered question ${context.requestId} with user message`);

package/dist/commands/compact.js

@@ -1,7 +1,7 @@
 // /compact command - Trigger context compaction (summarization) for the current session.
 import { ChannelType, MessageFlags } from 'discord.js';
 import { getThreadSession } from '../database.js';
-import { initializeOpencodeForDirectory, getOpencodeClientV2 } from '../opencode.js';
+import { initializeOpencodeForDirectory, getOpencodeClient } from '../opencode.js';
 import { resolveWorkingDirectory, SILENT_MESSAGE_FLAGS } from '../discord-utils.js';
 import { createLogger, LogPrefix } from '../logger.js';
 const logger = createLogger(LogPrefix.COMPACT);
@@ -54,8 +54,8 @@ export async function handleCompactCommand({ command }) {
         });
         return;
     }
-    const clientV2 = getOpencodeClientV2(projectDirectory);
-    if (!clientV2) {
+    const client = getOpencodeClient(projectDirectory);
+    if (!client) {
         await command.reply({
             content: 'Failed to get OpenCode client',
             flags: MessageFlags.Ephemeral | SILENT_MESSAGE_FLAGS,
@@ -66,7 +66,7 @@ export async function handleCompactCommand({ command }) {
     await command.deferReply({ flags: SILENT_MESSAGE_FLAGS });
     try {
         // Get session messages to find the model from the last user message
-        const messagesResult = await clientV2.session.messages({
+        const messagesResult = await client.session.messages({
             sessionID: sessionId,
             directory: workingDirectory,
         });
@@ -88,7 +88,7 @@ export async function handleCompactCommand({ command }) {
             return;
         }
         const { providerID, modelID } = lastUserMessage.info.model;
-        const result = await clientV2.session.summarize({
+        const result = await client.session.summarize({
             sessionID: sessionId,
             directory: workingDirectory,
             providerID,

package/dist/commands/context-usage.js

@@ -60,8 +60,8 @@ export async function handleContextUsageCommand({ command }) {
     await command.deferReply({ flags: SILENT_MESSAGE_FLAGS });
     try {
         const messagesResponse = await getClient().session.messages({
-            path: { id: sessionId },
-            query: { directory: workingDirectory },
+            sessionID: sessionId,
+            directory: workingDirectory,
         });
         const messages = messagesResponse.data || [];
         const assistantMessages = messages.filter((m) => m.info.role === 'assistant');
@@ -99,7 +99,7 @@ export async function handleContextUsageCommand({ command }) {
         // Fetch model context limit from provider API
         let contextLimit;
         const providersResult = await errore.tryAsync(() => {
-            return getClient().provider.list({ query: { directory: workingDirectory } });
+            return getClient().provider.list({ directory: workingDirectory });
         });
         if (providersResult instanceof Error) {
             logger.error('[CONTEXT-USAGE] Failed to fetch provider info:', providersResult);
@@ -117,7 +117,7 @@ export async function handleContextUsageCommand({ command }) {
         if (contextLimit) {
             const percentage = Math.round((totalTokens / contextLimit) * 100);
             const formattedLimit = contextLimit.toLocaleString('en-US');
-            lines.push(`**Context usage:** ${formattedTokens} / ${formattedLimit} tokens (${percentage}%)`);
+            lines.push(`**Context usage:** ${percentage}%, ${formattedTokens} / ${formattedLimit} tokens`);
         }
         else {
             lines.push(`**Context usage:** ${formattedTokens} tokens (context limit unavailable)`);

package/dist/commands/file-upload.js

@@ -70,7 +70,7 @@ export function showFileUploadButton({ thread, sessionId, directory, prompt, max
                         .fetch(ctx.messageId)
                         .then((msg) => {
                         return msg.edit({
-                            content: `**File Upload Requested**\n${prompt}\n_Timed out_`,
+                            content: `**File Upload Requested**\n${prompt.slice(0, 1900)}\n_Timed out_`,
                             components: [],
                         });
                     })
@@ -98,7 +98,7 @@ export function showFileUploadButton({ thread, sessionId, directory, prompt, max
         const actionRow = new ActionRowBuilder().addComponents(uploadButton);
         thread
             .send({
-            content: `**File Upload Requested**\n${prompt}`,
+            content: `**File Upload Requested**\n${prompt.slice(0, 1900)}`,
             components: [actionRow],
             flags: NOTIFY_MESSAGE_FLAGS,
         })
@@ -240,7 +240,7 @@ function updateButtonMessage(context, status) {
         .fetch(context.messageId)
         .then((msg) => {
         return msg.edit({
-            content: `**File Upload Requested**\n${context.prompt}\n${status}`,
+            content: `**File Upload Requested**\n${context.prompt.slice(0, 1900)}\n${status}`,
             components: [],
         });
     })

package/dist/commands/fork.js

@@ -57,7 +57,7 @@ export async function handleForkCommand(interaction) {
     }
     try {
         const messagesResponse = await getClient().session.messages({
-            path: { id: sessionId },
+            sessionID: sessionId,
         });
         if (!messagesResponse.data) {
             await interaction.editReply({
@@ -143,8 +143,8 @@ export async function handleForkSelectMenu(interaction) {
     }
     try {
         const forkResponse = await getClient().session.fork({
-            path: { id: sessionId },
-            body: { messageID: selectedMessageId },
+            sessionID: sessionId,
+            messageID: selectedMessageId,
         });
         if (!forkResponse.data) {
             await interaction.editReply('Failed to fork session');
@@ -178,7 +178,7 @@ export async function handleForkSelectMenu(interaction) {
         await sendThreadMessage(thread, `**Forked session created!**\nFrom: \`${sessionId}\`\nNew session: \`${forkedSession.id}\``);
         // Fetch and display the last assistant messages from the forked session
         const messagesResponse = await getClient().session.messages({
-            path: { id: forkedSession.id },
+            sessionID: forkedSession.id,
         });
         if (messagesResponse.data) {
             const { partIds, content } = collectLastAssistantParts({

package/dist/commands/login.js

@@ -73,7 +73,7 @@ export async function handleLoginCommand({ interaction, appId, }) {
             return;
         }
         const providersResponse = await getClient().provider.list({
-            query: { directory: projectDirectory },
+            directory: projectDirectory,
         });
         if (!providersResponse.data) {
             await interaction.editReply({
@@ -160,13 +160,13 @@ export async function handleLoginProviderSelectMenu(interaction) {
         }
         // Get provider info for display
         const providersResponse = await getClient().provider.list({
-            query: { directory: context.dir },
+            directory: context.dir,
         });
         const provider = providersResponse.data?.all.find((p) => p.id === selectedProviderId);
         const providerName = provider?.name || selectedProviderId;
         // Get auth methods for all providers
         const authMethodsResponse = await getClient().provider.auth({
-            query: { directory: context.dir },
+            directory: context.dir,
         });
         if (!authMethodsResponse.data) {
             await interaction.deferUpdate();
@@ -273,7 +273,7 @@ export async function handleLoginMethodSelectMenu(interaction) {
         }
         // Get auth methods again to get the selected one
         const authMethodsResponse = await getClient().provider.auth({
-            query: { directory: context.dir },
+            directory: context.dir,
         });
         const methods = authMethodsResponse.data?.[context.providerId] || [
             { type: 'api', label: 'API Key' },
@@ -361,9 +361,9 @@ async function startOAuthFlow(interaction, context, contextHash) {
         });
         // Start OAuth authorization
         const authorizeResponse = await getClient().provider.oauth.authorize({
-            path: { id: context.providerId },
-            body: { method: context.methodIndex },
-            query: { directory: context.dir },
+            providerID: context.providerId,
+            method: context.methodIndex,
+            directory: context.dir,
         });
         if (!authorizeResponse.data) {
             const errorData = authorizeResponse.error;
@@ -397,9 +397,9 @@ async function startOAuthFlow(interaction, context, contextHash) {
         if (method === 'auto') {
             // Poll for completion (device flow)
             const callbackResponse = await getClient().provider.oauth.callback({
-                path: { id: context.providerId },
-                body: { method: context.methodIndex },
-                query: { directory: context.dir },
+                providerID: context.providerId,
+                method: context.methodIndex,
+                directory: context.dir,
             });
             if (callbackResponse.error) {
                 const errorData = callbackResponse.error;
@@ -410,7 +410,7 @@ async function startOAuthFlow(interaction, context, contextHash) {
                 return;
             }
             // Dispose to refresh provider state so new credentials are recognized
-            await getClient().instance.dispose({ query: { directory: context.dir } });
+            await getClient().instance.dispose({ directory: context.dir });
             await interaction.editReply({
                 content: `✅ **Successfully authenticated with ${context.providerName}!**\n\nYou can now use models from this provider.`,
                 components: [],
@@ -464,15 +464,14 @@ export async function handleApiKeyModalSubmit(interaction) {
         }
         // Set the API key
         await getClient().auth.set({
-            path: { id: context.providerId },
-            body: {
+            providerID: context.providerId,
+            auth: {
                 type: 'api',
                 key: apiKey.trim(),
             },
-            query: { directory: context.dir },
         });
         // Dispose to refresh provider state so new credentials are recognized
-        await getClient().instance.dispose({ query: { directory: context.dir } });
+        await getClient().instance.dispose({ directory: context.dir });
         await interaction.editReply({
             content: `✅ **Successfully authenticated with ${context.providerName}!**\n\nYou can now use models from this provider.`,
         });

package/dist/commands/merge-worktree.js

@@ -62,7 +62,7 @@ async function sendPromptToModel({ prompt, thread, projectDirectory, command, ap
         appId,
     }).catch((e) => {
         logger.error(`[merge] Failed to send prompt to model:`, e);
-        sendThreadMessage(thread, `Failed to send prompt: ${e instanceof Error ? e.message : String(e)}`).catch(() => { });
+        sendThreadMessage(thread, `Failed to send prompt: ${(e instanceof Error ? e.message : String(e)).slice(0, 1900)}`).catch(() => { });
     });
 }
 export async function handleMergeWorktreeCommand({ command, appId, }) {