kimaki 0.4.38 → 0.4.40

package/dist/cli.js

@@ -9,7 +9,9 @@ import { getChannelsWithDescriptions, createDiscordClient, getDatabase, startDis
 import { Events, ChannelType, REST, Routes, SlashCommandBuilder, AttachmentBuilder, } from 'discord.js';
 import path from 'node:path';
 import fs from 'node:fs';
+import * as errore from 'errore';
 import { createLogger } from './logger.js';
+import { uploadFilesToDiscord } from './discord-utils.js';
 import { spawn, spawnSync, execSync } from 'node:child_process';
 import http from 'node:http';
 import { setDataDir, getDataDir, getLockPort } from './config.js';
@@ -135,7 +137,7 @@ async function registerCommands({ token, appId, userCommands = [], agents = [],
         })
             .toJSON(),
         new SlashCommandBuilder()
-            .setName('session')
+            .setName('new-session')
             .setDescription('Start a new OpenCode session')
             .addStringOption((option) => {
             option.setName('prompt').setDescription('Prompt content for the session').setRequired(true);
@@ -157,6 +159,17 @@ async function registerCommands({ token, appId, userCommands = [], agents = [],
             return option;
         })
             .toJSON(),
+        new SlashCommandBuilder()
+            .setName('new-worktree')
+            .setDescription('Create a new git worktree and start a session thread')
+            .addStringOption((option) => {
+            option
+                .setName('name')
+                .setDescription('Name for the worktree (will be formatted: lowercase, spaces to dashes)')
+                .setRequired(true);
+            return option;
+        })
+            .toJSON(),
         new SlashCommandBuilder()
             .setName('add-project')
             .setDescription('Create Discord channels for a new OpenCode project')
@@ -256,8 +269,8 @@ async function registerCommands({ token, appId, userCommands = [], agents = [],
             .toJSON());
     }
     // Add agent-specific quick commands like /plan-agent, /build-agent
-    // Filter to primary/all mode agents (same as /agent command shows)
-    const primaryAgents = agents.filter((a) => a.mode === 'primary' || a.mode === 'all');
+    // Filter to primary/all mode agents (same as /agent command shows), excluding hidden agents
+    const primaryAgents = agents.filter((a) => (a.mode === 'primary' || a.mode === 'all') && !a.hidden);
     for (const agent of primaryAgents) {
         const sanitizedName = sanitizeAgentName(agent.name);
         const commandName = `${sanitizedName}-agent`;
@@ -432,7 +445,12 @@ async function run({ restart, addChannels }) {
     // This is the biggest startup bottleneck (can take 1-30 seconds to spawn and wait for ready)
     const currentDir = process.cwd();
     s.start('Starting OpenCode server...');
-    const opencodePromise = initializeOpencodeForDirectory(currentDir);
+    const opencodePromise = initializeOpencodeForDirectory(currentDir).then((result) => {
+        if (result instanceof Error) {
+            throw new Error(result.message);
+        }
+        return result;
+    });
     s.message('Connecting to Discord...');
     const discordClient = await createDiscordClient();
     const guilds = [];
@@ -735,25 +753,11 @@ cli
         }
         const s = spinner();
         s.start(`Uploading ${resolvedFiles.length} file(s)...`);
-        for (const file of resolvedFiles) {
-            const buffer = fs.readFileSync(file);
-            const formData = new FormData();
-            formData.append('payload_json', JSON.stringify({
-                attachments: [{ id: 0, filename: path.basename(file) }],
-            }));
-            formData.append('files[0]', new Blob([buffer]), path.basename(file));
-            const response = await fetch(`https://discord.com/api/v10/channels/${threadRow.thread_id}/messages`, {
-                method: 'POST',
-                headers: {
-                    Authorization: `Bot ${botRow.token}`,
-                },
-                body: formData,
-            });
-            if (!response.ok) {
-                const error = await response.text();
-                throw new Error(`Discord API error: ${response.status} - ${error}`);
-            }
-        }
+        await uploadFilesToDiscord({
+            threadId: threadRow.thread_id,
+            botToken: botRow.token,
+            files: resolvedFiles,
+        });
         s.stop(`Uploaded ${resolvedFiles.length} file(s)!`);
         note(`Files uploaded to Discord thread!\n\nFiles: ${resolvedFiles.map((f) => path.basename(f)).join(', ')}`, '✅ Success');
         process.exit(0);

package/dist/commands/abort.js

@@ -5,6 +5,7 @@ import { initializeOpencodeForDirectory } from '../opencode.js';
 import { resolveTextChannel, getKimakiMetadata, SILENT_MESSAGE_FLAGS } from '../discord-utils.js';
 import { abortControllers } from '../session-handler.js';
 import { createLogger } from '../logger.js';
+import * as errore from 'errore';
 const logger = createLogger('ABORT');
 export async function handleAbortCommand({ command }) {
     const channel = command.channel;
@@ -51,13 +52,21 @@ export async function handleAbortCommand({ command }) {
         return;
     }
     const sessionId = row.session_id;
+    const existingController = abortControllers.get(sessionId);
+    if (existingController) {
+        existingController.abort(new Error('User requested abort'));
+        abortControllers.delete(sessionId);
+    }
+    const getClient = await initializeOpencodeForDirectory(directory);
+    if (getClient instanceof Error) {
+        await command.reply({
+            content: `Failed to abort: ${getClient.message}`,
+            ephemeral: true,
+            flags: SILENT_MESSAGE_FLAGS,
+        });
+        return;
+    }
     try {
-        const existingController = abortControllers.get(sessionId);
-        if (existingController) {
-            existingController.abort(new Error('User requested abort'));
-            abortControllers.delete(sessionId);
-        }
-        const getClient = await initializeOpencodeForDirectory(directory);
         await getClient().session.abort({
             path: { id: sessionId },
         });

package/dist/commands/add-project.js

@@ -6,6 +6,7 @@ import { initializeOpencodeForDirectory } from '../opencode.js';
 import { createProjectChannels } from '../channel-management.js';
 import { createLogger } from '../logger.js';
 import { abbreviatePath } from '../utils.js';
+import * as errore from 'errore';
 const logger = createLogger('ADD-PROJECT');
 export async function handleAddProjectCommand({ command, appId }) {
     await command.deferReply({ ephemeral: false });
@@ -18,6 +19,10 @@ export async function handleAddProjectCommand({ command, appId }) {
     try {
         const currentDir = process.cwd();
         const getClient = await initializeOpencodeForDirectory(currentDir);
+        if (getClient instanceof Error) {
+            await command.editReply(getClient.message);
+            return;
+        }
         const projectsResponse = await getClient().project.list({});
         if (!projectsResponse.data) {
             await command.editReply('Failed to fetch projects');
@@ -60,6 +65,10 @@ export async function handleAddProjectAutocomplete({ interaction, appId, }) {
     try {
         const currentDir = process.cwd();
         const getClient = await initializeOpencodeForDirectory(currentDir);
+        if (getClient instanceof Error) {
+            await interaction.respond([]);
+            return;
+        }
         const projectsResponse = await getClient().project.list({});
         if (!projectsResponse.data) {
             await interaction.respond([]);

package/dist/commands/agent.js

@@ -6,6 +6,7 @@ import { getDatabase, setChannelAgent, setSessionAgent, clearSessionModel, runMo
 import { initializeOpencodeForDirectory } from '../opencode.js';
 import { resolveTextChannel, getKimakiMetadata } from '../discord-utils.js';
 import { createLogger } from '../logger.js';
+import * as errore from 'errore';
 const agentLogger = createLogger('AGENT');
 const pendingAgentContexts = new Map();
 /**
@@ -102,6 +103,10 @@ export async function handleAgentCommand({ interaction, appId, }) {
     }
     try {
         const getClient = await initializeOpencodeForDirectory(context.dir);
+        if (getClient instanceof Error) {
+            await interaction.editReply({ content: getClient.message });
+            return;
+        }
         const agentsResponse = await getClient().app.agents({
             query: { directory: context.dir },
         });
@@ -110,7 +115,10 @@ export async function handleAgentCommand({ interaction, appId, }) {
             return;
         }
         const agents = agentsResponse.data
-            .filter((a) => a.mode === 'primary' || a.mode === 'all')
+            .filter((agent) => {
+            const hidden = agent.hidden;
+            return (agent.mode === 'primary' || agent.mode === 'all') && !hidden;
+        })
             .slice(0, 25);
         if (agents.length === 0) {
             await interaction.editReply({ content: 'No primary agents available' });
@@ -202,6 +210,10 @@ export async function handleQuickAgentCommand({ command, appId, }) {
     }
     try {
         const getClient = await initializeOpencodeForDirectory(context.dir);
+        if (getClient instanceof Error) {
+            await command.editReply({ content: getClient.message });
+            return;
+        }
         const agentsResponse = await getClient().app.agents({
             query: { directory: context.dir },
         });

package/dist/commands/fork.js

@@ -5,6 +5,7 @@ import { initializeOpencodeForDirectory } from '../opencode.js';
 import { resolveTextChannel, getKimakiMetadata, sendThreadMessage } from '../discord-utils.js';
 import { collectLastAssistantParts } from '../message-formatting.js';
 import { createLogger } from '../logger.js';
+import * as errore from 'errore';
 const sessionLogger = createLogger('SESSION');
 const forkLogger = createLogger('FORK');
 export async function handleForkCommand(interaction) {
@@ -50,8 +51,14 @@ export async function handleForkCommand(interaction) {
     // Defer reply before API calls to avoid 3-second timeout
     await interaction.deferReply({ ephemeral: true });
     const sessionId = row.session_id;
+    const getClient = await initializeOpencodeForDirectory(directory);
+    if (getClient instanceof Error) {
+        await interaction.editReply({
+            content: `Failed to load messages: ${getClient.message}`,
+        });
+        return;
+    }
     try {
-        const getClient = await initializeOpencodeForDirectory(directory);
         const messagesResponse = await getClient().session.messages({
             path: { id: sessionId },
         });
@@ -120,8 +127,12 @@ export async function handleForkSelectMenu(interaction) {
         return;
     }
     await interaction.deferReply({ ephemeral: false });
+    const getClient = await initializeOpencodeForDirectory(directory);
+    if (getClient instanceof Error) {
+        await interaction.editReply(`Failed to fork session: ${getClient.message}`);
+        return;
+    }
     try {
-        const getClient = await initializeOpencodeForDirectory(directory);
         const forkResponse = await getClient().session.fork({
             path: { id: sessionId },
             body: { messageID: selectedMessageId },

package/dist/commands/model.js

@@ -6,6 +6,7 @@ import { initializeOpencodeForDirectory } from '../opencode.js';
 import { resolveTextChannel, getKimakiMetadata } from '../discord-utils.js';
 import { abortAndRetrySession } from '../session-handler.js';
 import { createLogger } from '../logger.js';
+import * as errore from 'errore';
 const modelLogger = createLogger('MODEL');
 // Store context by hash to avoid customId length limits (Discord max: 100 chars)
 const pendingModelContexts = new Map();
@@ -77,6 +78,10 @@ export async function handleModelCommand({ interaction, appId, }) {
     }
     try {
         const getClient = await initializeOpencodeForDirectory(projectDirectory);
+        if (getClient instanceof Error) {
+            await interaction.editReply({ content: getClient.message });
+            return;
+        }
         const providersResponse = await getClient().provider.list({
             query: { directory: projectDirectory },
         });
@@ -162,6 +167,13 @@ export async function handleProviderSelectMenu(interaction) {
     }
     try {
         const getClient = await initializeOpencodeForDirectory(context.dir);
+        if (getClient instanceof Error) {
+            await interaction.editReply({
+                content: getClient.message,
+                components: [],
+            });
+            return;
+        }
         const providersResponse = await getClient().provider.list({
             query: { directory: context.dir },
         });

package/dist/commands/remove-project.js

@@ -1,5 +1,6 @@
 // /remove-project command - Remove Discord channels for a project.
 import path from 'node:path';
+import * as errore from 'errore';
 import { getDatabase } from '../database.js';
 import { createLogger } from '../logger.js';
 import { abbreviatePath } from '../utils.js';
@@ -25,20 +26,27 @@ export async function handleRemoveProjectCommand({ command, appId }) {
         const deletedChannels = [];
         const failedChannels = [];
         for (const { channel_id, channel_type } of channels) {
-            try {
-                const channel = await guild.channels.fetch(channel_id).catch(() => null);
-                if (channel) {
+            const channel = await errore.tryAsync({
+                try: () => guild.channels.fetch(channel_id),
+                catch: (e) => e,
+            });
+            if (channel instanceof Error) {
+                logger.error(`Failed to fetch channel ${channel_id}:`, channel);
+                failedChannels.push(`${channel_type}: ${channel_id}`);
+                continue;
+            }
+            if (channel) {
+                try {
                     await channel.delete(`Removed by /remove-project command`);
                     deletedChannels.push(`${channel_type}: ${channel_id}`);
                 }
-                else {
-                    // Channel doesn't exist in this guild or was already deleted
-                    deletedChannels.push(`${channel_type}: ${channel_id} (already deleted)`);
+                catch (error) {
+                    logger.error(`Failed to delete channel ${channel_id}:`, error);
+                    failedChannels.push(`${channel_type}: ${channel_id}`);
                 }
             }
-            catch (error) {
-                logger.error(`Failed to delete channel ${channel_id}:`, error);
-                failedChannels.push(`${channel_type}: ${channel_id}`);
+            else {
+                deletedChannels.push(`${channel_type}: ${channel_id} (already deleted)`);
             }
         }
         // Remove from database
@@ -76,14 +84,16 @@ export async function handleRemoveProjectAutocomplete({ interaction, appId, }) {
         // Filter to only channels that exist in this guild
         const projectsInGuild = [];
         for (const { directory, channel_id } of allChannels) {
-            try {
-                const channel = await guild.channels.fetch(channel_id).catch(() => null);
-                if (channel) {
-                    projectsInGuild.push({ directory, channelId: channel_id });
-                }
-            }
-            catch {
+            const channel = await errore.tryAsync({
+                try: () => guild.channels.fetch(channel_id),
+                catch: (e) => e,
+            });
+            if (channel instanceof Error) {
                 // Channel not in this guild, skip
+                continue;
+            }
+            if (channel) {
+                projectsInGuild.push({ directory, channelId: channel_id });
             }
         }
         const projects = projectsInGuild

package/dist/commands/resume.js

@@ -7,6 +7,7 @@ import { sendThreadMessage, resolveTextChannel, getKimakiMetadata } from '../dis
 import { extractTagsArrays } from '../xml.js';
 import { collectLastAssistantParts } from '../message-formatting.js';
 import { createLogger } from '../logger.js';
+import * as errore from 'errore';
 const logger = createLogger('RESUME');
 export async function handleResumeCommand({ command, appId }) {
     await command.deferReply({ ephemeral: false });
@@ -41,6 +42,10 @@ export async function handleResumeCommand({ command, appId }) {
     }
     try {
         const getClient = await initializeOpencodeForDirectory(projectDirectory);
+        if (getClient instanceof Error) {
+            await command.editReply(getClient.message);
+            return;
+        }
         const sessionResponse = await getClient().session.get({
             path: { id: sessionId },
         });
@@ -111,6 +116,10 @@ export async function handleResumeAutocomplete({ interaction, appId, }) {
     }
     try {
         const getClient = await initializeOpencodeForDirectory(projectDirectory);
+        if (getClient instanceof Error) {
+            await interaction.respond([]);
+            return;
+        }
         const sessionsResponse = await getClient().session.list();
         if (!sessionsResponse.data) {
             await interaction.respond([]);

package/dist/commands/session.js

@@ -1,4 +1,4 @@
-// /session command - Start a new OpenCode session.
+// /new-session command - Start a new OpenCode session.
 import { ChannelType } from 'discord.js';
 import fs from 'node:fs';
 import path from 'node:path';
@@ -8,6 +8,7 @@ import { SILENT_MESSAGE_FLAGS } from '../discord-utils.js';
 import { extractTagsArrays } from '../xml.js';
 import { handleOpencodeSession } from '../session-handler.js';
 import { createLogger } from '../logger.js';
+import * as errore from 'errore';
 const logger = createLogger('SESSION');
 export async function handleSessionCommand({ command, appId }) {
     await command.deferReply({ ephemeral: false });
@@ -44,6 +45,10 @@ export async function handleSessionCommand({ command, appId }) {
     }
     try {
         const getClient = await initializeOpencodeForDirectory(projectDirectory);
+        if (getClient instanceof Error) {
+            await command.editReply(getClient.message);
+            return;
+        }
         const files = filesString
             .split(',')
             .map((f) => f.trim())
@@ -102,6 +107,10 @@ async function handleAgentAutocomplete({ interaction, appId }) {
     }
     try {
         const getClient = await initializeOpencodeForDirectory(projectDirectory);
+        if (getClient instanceof Error) {
+            await interaction.respond([]);
+            return;
+        }
         const agentsResponse = await getClient().app.agents({
             query: { directory: projectDirectory },
         });
@@ -165,6 +174,10 @@ export async function handleSessionAutocomplete({ interaction, appId, }) {
     }
     try {
         const getClient = await initializeOpencodeForDirectory(projectDirectory);
+        if (getClient instanceof Error) {
+            await interaction.respond([]);
+            return;
+        }
         const response = await getClient().find.files({
             query: {
                 query: currentQuery || '',

package/dist/commands/share.js

@@ -4,6 +4,7 @@ import { getDatabase } from '../database.js';
 import { initializeOpencodeForDirectory } from '../opencode.js';
 import { resolveTextChannel, getKimakiMetadata, SILENT_MESSAGE_FLAGS } from '../discord-utils.js';
 import { createLogger } from '../logger.js';
+import * as errore from 'errore';
 const logger = createLogger('SHARE');
 export async function handleShareCommand({ command }) {
     const channel = command.channel;
@@ -50,8 +51,16 @@ export async function handleShareCommand({ command }) {
         return;
     }
     const sessionId = row.session_id;
+    const getClient = await initializeOpencodeForDirectory(directory);
+    if (getClient instanceof Error) {
+        await command.reply({
+            content: `Failed to share session: ${getClient.message}`,
+            ephemeral: true,
+            flags: SILENT_MESSAGE_FLAGS,
+        });
+        return;
+    }
     try {
-        const getClient = await initializeOpencodeForDirectory(directory);
         const response = await getClient().session.share({
             path: { id: sessionId },
         });

package/dist/commands/undo-redo.js

@@ -4,6 +4,7 @@ import { getDatabase } from '../database.js';
 import { initializeOpencodeForDirectory } from '../opencode.js';
 import { resolveTextChannel, getKimakiMetadata, SILENT_MESSAGE_FLAGS } from '../discord-utils.js';
 import { createLogger } from '../logger.js';
+import * as errore from 'errore';
 const logger = createLogger('UNDO-REDO');
 export async function handleUndoCommand({ command }) {
     const channel = command.channel;
@@ -50,9 +51,13 @@ export async function handleUndoCommand({ command }) {
         return;
     }
     const sessionId = row.session_id;
+    await command.deferReply({ flags: SILENT_MESSAGE_FLAGS });
+    const getClient = await initializeOpencodeForDirectory(directory);
+    if (getClient instanceof Error) {
+        await command.editReply(`Failed to undo: ${getClient.message}`);
+        return;
+    }
     try {
-        await command.deferReply({ flags: SILENT_MESSAGE_FLAGS });
-        const getClient = await initializeOpencodeForDirectory(directory);
         // Fetch messages to find the last assistant message
         const messagesResponse = await getClient().session.messages({
             path: { id: sessionId },
@@ -133,9 +138,13 @@ export async function handleRedoCommand({ command }) {
         return;
     }
     const sessionId = row.session_id;
+    await command.deferReply({ flags: SILENT_MESSAGE_FLAGS });
+    const getClient = await initializeOpencodeForDirectory(directory);
+    if (getClient instanceof Error) {
+        await command.editReply(`Failed to redo: ${getClient.message}`);
+        return;
+    }
     try {
-        await command.deferReply({ flags: SILENT_MESSAGE_FLAGS });
-        const getClient = await initializeOpencodeForDirectory(directory);
         // Check if session has reverted state
         const sessionResponse = await getClient().session.get({
             path: { id: sessionId },

package/dist/commands/worktree.js

@@ -0,0 +1,180 @@
+// Worktree management command: /new-worktree
+// Uses OpenCode SDK v2 to create worktrees with kimaki- prefix
+// Creates thread immediately, then worktree in background so user can type
+import { ChannelType } from 'discord.js';
+import fs from 'node:fs';
+import { createPendingWorktree, setWorktreeReady, setWorktreeError, } from '../database.js';
+import { initializeOpencodeForDirectory, getOpencodeClientV2 } from '../opencode.js';
+import { SILENT_MESSAGE_FLAGS } from '../discord-utils.js';
+import { extractTagsArrays } from '../xml.js';
+import { createLogger } from '../logger.js';
+import * as errore from 'errore';
+const logger = createLogger('WORKTREE');
+class WorktreeError extends Error {
+    constructor(message, options) {
+        super(message, options);
+        this.name = 'WorktreeError';
+    }
+}
+/**
+ * Format worktree name: lowercase, spaces to dashes, remove special chars, add kimaki- prefix.
+ * "My Feature" → "kimaki-my-feature"
+ */
+function formatWorktreeName(name) {
+    const formatted = name
+        .toLowerCase()
+        .trim()
+        .replace(/\s+/g, '-')
+        .replace(/[^a-z0-9-]/g, '');
+    return `kimaki-${formatted}`;
+}
+/**
+ * Get project directory from channel topic.
+ */
+function getProjectDirectoryFromChannel(channel, appId) {
+    if (!channel.topic) {
+        return new WorktreeError('This channel has no topic configured');
+    }
+    const extracted = extractTagsArrays({
+        xml: channel.topic,
+        tags: ['kimaki.directory', 'kimaki.app'],
+    });
+    const projectDirectory = extracted['kimaki.directory']?.[0]?.trim();
+    const channelAppId = extracted['kimaki.app']?.[0]?.trim();
+    if (channelAppId && channelAppId !== appId) {
+        return new WorktreeError('This channel is not configured for this bot');
+    }
+    if (!projectDirectory) {
+        return new WorktreeError('This channel is not configured with a project directory');
+    }
+    if (!fs.existsSync(projectDirectory)) {
+        return new WorktreeError(`Directory does not exist: ${projectDirectory}`);
+    }
+    return projectDirectory;
+}
+/**
+ * Create worktree in background and update starter message when done.
+ */
+async function createWorktreeInBackground({ thread, starterMessage, worktreeName, projectDirectory, clientV2, }) {
+    // Create worktree using SDK v2
+    logger.log(`Creating worktree "${worktreeName}" for project ${projectDirectory}`);
+    const worktreeResult = await errore.tryAsync({
+        try: async () => {
+            const response = await clientV2.worktree.create({
+                directory: projectDirectory,
+                worktreeCreateInput: {
+                    name: worktreeName,
+                },
+            });
+            if (response.error) {
+                throw new Error(`SDK error: ${JSON.stringify(response.error)}`);
+            }
+            if (!response.data) {
+                throw new Error('No worktree data returned from SDK');
+            }
+            return response.data;
+        },
+        catch: (e) => new WorktreeError('Failed to create worktree', { cause: e }),
+    });
+    if (errore.isError(worktreeResult)) {
+        const errorMsg = worktreeResult.message;
+        logger.error('[NEW-WORKTREE] Error:', worktreeResult.cause);
+        setWorktreeError({ threadId: thread.id, errorMessage: errorMsg });
+        await starterMessage.edit(`🌳 **Worktree: ${worktreeName}**\n❌ ${errorMsg}`);
+        return;
+    }
+    // Success - update database and edit starter message
+    setWorktreeReady({ threadId: thread.id, worktreeDirectory: worktreeResult.directory });
+    await starterMessage.edit(`🌳 **Worktree: ${worktreeName}**\n` +
+        `📁 \`${worktreeResult.directory}\`\n` +
+        `🌿 Branch: \`${worktreeResult.branch}\``);
+}
+export async function handleNewWorktreeCommand({ command, appId, }) {
+    await command.deferReply({ ephemeral: false });
+    const rawName = command.options.getString('name', true);
+    const worktreeName = formatWorktreeName(rawName);
+    if (worktreeName === 'kimaki-') {
+        await command.editReply('Invalid worktree name. Please use letters, numbers, and spaces.');
+        return;
+    }
+    const channel = command.channel;
+    if (!channel || channel.type !== ChannelType.GuildText) {
+        await command.editReply('This command can only be used in text channels');
+        return;
+    }
+    const textChannel = channel;
+    const projectDirectory = getProjectDirectoryFromChannel(textChannel, appId);
+    if (errore.isError(projectDirectory)) {
+        await command.editReply(projectDirectory.message);
+        return;
+    }
+    // Initialize opencode and check if worktree already exists
+    const getClient = await initializeOpencodeForDirectory(projectDirectory);
+    if (errore.isError(getClient)) {
+        await command.editReply(`Failed to initialize OpenCode: ${getClient.message}`);
+        return;
+    }
+    const clientV2 = getOpencodeClientV2(projectDirectory);
+    if (!clientV2) {
+        await command.editReply('Failed to get OpenCode client');
+        return;
+    }
+    // Check if worktree with this name already exists
+    // SDK returns array of directory paths like "~/.opencode/worktree/abc/kimaki-my-feature"
+    const listResult = await errore.tryAsync({
+        try: async () => {
+            const response = await clientV2.worktree.list({ directory: projectDirectory });
+            return response.data || [];
+        },
+        catch: (e) => new WorktreeError('Failed to list worktrees', { cause: e }),
+    });
+    if (errore.isError(listResult)) {
+        await command.editReply(listResult.message);
+        return;
+    }
+    // Check if any worktree path ends with our name
+    const existingWorktree = listResult.find((dir) => dir.endsWith(`/${worktreeName}`));
+    if (existingWorktree) {
+        await command.editReply(`Worktree \`${worktreeName}\` already exists at \`${existingWorktree}\``);
+        return;
+    }
+    // Create thread immediately so user can start typing
+    const result = await errore.tryAsync({
+        try: async () => {
+            const starterMessage = await textChannel.send({
+                content: `🌳 **Creating worktree: ${worktreeName}**\n⏳ Setting up...`,
+                flags: SILENT_MESSAGE_FLAGS,
+            });
+            const thread = await starterMessage.startThread({
+                name: `worktree: ${worktreeName}`,
+                autoArchiveDuration: 1440,
+                reason: 'Worktree session',
+            });
+            return { thread, starterMessage };
+        },
+        catch: (e) => new WorktreeError('Failed to create thread', { cause: e }),
+    });
+    if (errore.isError(result)) {
+        logger.error('[NEW-WORKTREE] Error:', result.cause);
+        await command.editReply(result.message);
+        return;
+    }
+    const { thread, starterMessage } = result;
+    // Store pending worktree in database
+    createPendingWorktree({
+        threadId: thread.id,
+        worktreeName,
+        projectDirectory,
+    });
+    await command.editReply(`Creating worktree in ${thread.toString()}`);
+    // Create worktree in background (don't await)
+    createWorktreeInBackground({
+        thread,
+        starterMessage,
+        worktreeName,
+        projectDirectory,
+        clientV2,
+    }).catch((e) => {
+        logger.error('[NEW-WORKTREE] Background error:', e);
+    });
+}