kimaki 0.4.38 → 0.4.40

package/dist/voice.js

@@ -1,49 +1,51 @@
 // Audio transcription service using Google Gemini.
 // Transcribes voice messages with code-aware context, using grep/glob tools
 // to verify technical terms, filenames, and function names in the codebase.
+// Uses errore for type-safe error handling.
 import { GoogleGenAI, Type } from '@google/genai';
+import * as errore from 'errore';
 import { createLogger } from './logger.js';
 import { glob } from 'glob';
 import { ripGrep } from 'ripgrep-js';
+import { ApiKeyMissingError, InvalidAudioFormatError, TranscriptionError, EmptyTranscriptionError, NoResponseContentError, NoToolResponseError, GrepSearchError, GlobSearchError, } from './errors.js';
 const voiceLogger = createLogger('VOICE');
-async function runGrep({ pattern, directory, }) {
-    try {
-        const results = await ripGrep(directory, {
-            string: pattern,
-            globs: ['!node_modules/**', '!.git/**', '!dist/**', '!build/**'],
-        });
-        if (results.length === 0) {
-            return 'No matches found';
-        }
-        const output = results
-            .slice(0, 10)
-            .map((match) => {
-            return `${match.path.text}:${match.line_number}: ${match.lines.text.trim()}`;
-        })
-            .join('\n');
-        return output.slice(0, 2000);
-    }
-    catch (e) {
-        voiceLogger.error('grep search failed:', e);
-        return 'grep search failed';
-    }
+function runGrep({ pattern, directory }) {
+    return errore.tryAsync({
+        try: async () => {
+            const results = await ripGrep(directory, {
+                string: pattern,
+                globs: ['!node_modules/**', '!.git/**', '!dist/**', '!build/**'],
+            });
+            if (results.length === 0) {
+                return 'No matches found';
+            }
+            const output = results
+                .slice(0, 10)
+                .map((match) => {
+                return `${match.path.text}:${match.line_number}: ${match.lines.text.trim()}`;
+            })
+                .join('\n');
+            return output.slice(0, 2000);
+        },
+        catch: (e) => new GrepSearchError({ pattern, cause: e }),
+    });
 }
-async function runGlob({ pattern, directory, }) {
-    try {
-        const files = await glob(pattern, {
-            cwd: directory,
-            nodir: false,
-            ignore: ['node_modules/**', '.git/**', 'dist/**', 'build/**'],
-            maxDepth: 10,
-        });
-        if (files.length === 0) {
-            return 'No files found';
-        }
-        return files.slice(0, 30).join('\n');
-    }
-    catch (error) {
-        return `Glob search failed: ${error instanceof Error ? error.message : 'Unknown error'}`;
-    }
+function runGlob({ pattern, directory }) {
+    return errore.tryAsync({
+        try: async () => {
+            const files = await glob(pattern, {
+                cwd: directory,
+                nodir: false,
+                ignore: ['node_modules/**', '.git/**', 'dist/**', 'build/**'],
+                maxDepth: 10,
+            });
+            if (files.length === 0) {
+                return 'No files found';
+            }
+            return files.slice(0, 30).join('\n');
+        },
+        catch: (e) => new GlobSearchError({ pattern, cause: e }),
+    });
 }
 const grepToolDeclaration = {
     name: 'grep',
@@ -99,14 +101,28 @@ function createToolRunner({ directory }) {
         if (name === 'grep' && hasDirectory) {
             const pattern = args?.pattern || '';
             voiceLogger.log(`Grep search: "${pattern}"`);
-            const output = await runGrep({ pattern, directory });
+            const result = await runGrep({ pattern, directory });
+            const output = (() => {
+                if (result instanceof Error) {
+                    voiceLogger.error('grep search failed:', result);
+                    return 'grep search failed';
+                }
+                return result;
+            })();
             voiceLogger.log(`Grep result: ${output.slice(0, 100)}...`);
             return { type: 'toolResponse', name: 'grep', output };
         }
         if (name === 'glob' && hasDirectory) {
             const pattern = args?.pattern || '';
             voiceLogger.log(`Glob search: "${pattern}"`);
-            const output = await runGlob({ pattern, directory });
+            const result = await runGlob({ pattern, directory });
+            const output = (() => {
+                if (result instanceof Error) {
+                    voiceLogger.error('glob search failed:', result);
+                    return 'glob search failed';
+                }
+                return result;
+            })();
             voiceLogger.log(`Glob result: ${output.slice(0, 100)}...`);
             return { type: 'toolResponse', name: 'glob', output };
         }
@@ -114,17 +130,25 @@ function createToolRunner({ directory }) {
     };
 }
 export async function runTranscriptionLoop({ genAI, model, initialContents, tools, temperature, toolRunner, maxSteps = 10, }) {
-    let response = await genAI.models.generateContent({
-        model,
-        contents: initialContents,
-        config: {
-            temperature,
-            thinkingConfig: {
-                thinkingBudget: 1024,
+    // Wrap external API call that can throw
+    const initialResponse = await errore.tryAsync({
+        try: () => genAI.models.generateContent({
+            model,
+            contents: initialContents,
+            config: {
+                temperature,
+                thinkingConfig: {
+                    thinkingBudget: 1024,
+                },
+                tools,
             },
-            tools,
-        },
+        }),
+        catch: (e) => new TranscriptionError({ reason: `API call failed: ${String(e)}`, cause: e }),
     });
+    if (initialResponse instanceof Error) {
+        return initialResponse;
+    }
+    let response = initialResponse;
     const conversationHistory = [...initialContents];
     let stepsRemaining = maxSteps;
     while (true) {
@@ -135,7 +159,7 @@ export async function runTranscriptionLoop({ genAI, model, initialContents, tool
                 voiceLogger.log(`No parts but got text response: "${text.slice(0, 100)}..."`);
                 return text;
             }
-            throw new Error('Transcription failed: No response content from model');
+            return new NoResponseContentError();
         }
         const functionCalls = candidate.content.parts.filter((part) => 'functionCall' in part && !!part.functionCall);
         if (functionCalls.length === 0) {
@@ -144,7 +168,7 @@ export async function runTranscriptionLoop({ genAI, model, initialContents, tool
                 voiceLogger.log(`No function calls but got text: "${text.slice(0, 100)}..."`);
                 return text;
             }
-            throw new Error('Transcription failed: Model did not produce a transcription');
+            return new TranscriptionError({ reason: 'Model did not produce a transcription' });
         }
         conversationHistory.push({
             role: 'model',
@@ -159,7 +183,7 @@ export async function runTranscriptionLoop({ genAI, model, initialContents, tool
                 const transcription = result.transcription?.trim() || '';
                 voiceLogger.log(`Transcription result received: "${transcription.slice(0, 100)}..."`);
                 if (!transcription) {
-                    throw new Error('Transcription failed: Model returned empty transcription');
+                    return new EmptyTranscriptionError();
                 }
                 return transcription;
             }
@@ -186,67 +210,76 @@ export async function runTranscriptionLoop({ genAI, model, initialContents, tool
             }
         }
         if (functionResponseParts.length === 0) {
-            throw new Error('Transcription failed: No valid tool responses');
+            return new NoToolResponseError();
         }
         conversationHistory.push({
             role: 'user',
             parts: functionResponseParts,
         });
-        response = await genAI.models.generateContent({
-            model,
-            contents: conversationHistory,
-            config: {
-                temperature,
-                thinkingConfig: {
-                    thinkingBudget: 512,
+        // Wrap external API call that can throw
+        const nextResponse = await errore.tryAsync({
+            try: () => genAI.models.generateContent({
+                model,
+                contents: conversationHistory,
+                config: {
+                    temperature,
+                    thinkingConfig: {
+                        thinkingBudget: 512,
+                    },
+                    tools: stepsRemaining <= 0
+                        ? [{ functionDeclarations: [transcriptionResultToolDeclaration] }]
+                        : tools,
                 },
-                tools: stepsRemaining <= 0
-                    ? [{ functionDeclarations: [transcriptionResultToolDeclaration] }]
-                    : tools,
-            },
+            }),
+            catch: (e) => new TranscriptionError({ reason: `API call failed: ${String(e)}`, cause: e }),
         });
+        if (nextResponse instanceof Error) {
+            return nextResponse;
+        }
+        response = nextResponse;
     }
 }
-export async function transcribeAudio({ audio, prompt, language, temperature, geminiApiKey, directory, currentSessionContext, lastSessionContext, }) {
-    try {
-        const apiKey = geminiApiKey || process.env.GEMINI_API_KEY;
-        if (!apiKey) {
-            throw new Error('Gemini API key is required for audio transcription');
-        }
-        const genAI = new GoogleGenAI({ apiKey });
-        let audioBase64;
+export function transcribeAudio({ audio, prompt, language, temperature, geminiApiKey, directory, currentSessionContext, lastSessionContext, }) {
+    const apiKey = geminiApiKey || process.env.GEMINI_API_KEY;
+    if (!apiKey) {
+        return Promise.resolve(new ApiKeyMissingError({ service: 'Gemini' }));
+    }
+    const genAI = new GoogleGenAI({ apiKey });
+    const audioBase64 = (() => {
         if (typeof audio === 'string') {
-            audioBase64 = audio;
-        }
-        else if (audio instanceof Buffer) {
-            audioBase64 = audio.toString('base64');
+            return audio;
         }
-        else if (audio instanceof Uint8Array) {
-            audioBase64 = Buffer.from(audio).toString('base64');
+        if (audio instanceof Buffer) {
+            return audio.toString('base64');
         }
-        else if (audio instanceof ArrayBuffer) {
-            audioBase64 = Buffer.from(audio).toString('base64');
+        if (audio instanceof Uint8Array) {
+            return Buffer.from(audio).toString('base64');
         }
-        else {
-            throw new Error('Invalid audio format');
+        if (audio instanceof ArrayBuffer) {
+            return Buffer.from(audio).toString('base64');
         }
-        const languageHint = language ? `The audio is in ${language}.\n\n` : '';
-        // build session context section
-        const sessionContextParts = [];
-        if (lastSessionContext) {
-            sessionContextParts.push(`<last_session>
+        return '';
+    })();
+    if (!audioBase64) {
+        return Promise.resolve(new InvalidAudioFormatError());
+    }
+    const languageHint = language ? `The audio is in ${language}.\n\n` : '';
+    // build session context section
+    const sessionContextParts = [];
+    if (lastSessionContext) {
+        sessionContextParts.push(`<last_session>
 ${lastSessionContext}
 </last_session>`);
-        }
-        if (currentSessionContext) {
-            sessionContextParts.push(`<current_session>
+    }
+    if (currentSessionContext) {
+        sessionContextParts.push(`<current_session>
 ${currentSessionContext}
 </current_session>`);
-        }
-        const sessionContextSection = sessionContextParts.length > 0
-            ? `\nSession context (use to understand references to files, functions, tools used):\n${sessionContextParts.join('\n\n')}`
-            : '';
-        const transcriptionPrompt = `${languageHint}Transcribe this audio for a coding agent (like Claude Code or OpenCode).
+    }
+    const sessionContextSection = sessionContextParts.length > 0
+        ? `\nSession context (use to understand references to files, functions, tools used):\n${sessionContextParts.join('\n\n')}`
+        : '';
+    const transcriptionPrompt = `${languageHint}Transcribe this audio for a coding agent (like Claude Code or OpenCode).
 
 CRITICAL REQUIREMENT: You MUST call the "transcriptionResult" tool to complete this task.
 - The transcriptionResult tool is the ONLY way to return results
@@ -275,42 +308,37 @@ ${sessionContextSection}
 REMEMBER: Call "transcriptionResult" tool with your transcription. This is mandatory.
 
 Note: "critique" is a CLI tool for showing diffs in the browser.`;
-        // const hasDirectory = directory && directory.trim().length > 0
-        const tools = [
-            {
-                functionDeclarations: [
-                    transcriptionResultToolDeclaration,
-                    // grep/glob disabled - was causing transcription to hang
-                    // ...(hasDirectory ? [grepToolDeclaration, globToolDeclaration] : []),
-                ],
-            },
-        ];
-        const initialContents = [
-            {
-                role: 'user',
-                parts: [
-                    { text: transcriptionPrompt },
-                    {
-                        inlineData: {
-                            data: audioBase64,
-                            mimeType: 'audio/mpeg',
-                        },
+    // const hasDirectory = directory && directory.trim().length > 0
+    const tools = [
+        {
+            functionDeclarations: [
+                transcriptionResultToolDeclaration,
+                // grep/glob disabled - was causing transcription to hang
+                // ...(hasDirectory ? [grepToolDeclaration, globToolDeclaration] : []),
+            ],
+        },
+    ];
+    const initialContents = [
+        {
+            role: 'user',
+            parts: [
+                { text: transcriptionPrompt },
+                {
+                    inlineData: {
+                        data: audioBase64,
+                        mimeType: 'audio/mpeg',
                     },
-                ],
-            },
-        ];
-        const toolRunner = createToolRunner({ directory });
-        return await runTranscriptionLoop({
-            genAI,
-            model: 'gemini-2.5-flash',
-            initialContents,
-            tools,
-            temperature: temperature ?? 0.3,
-            toolRunner,
-        });
-    }
-    catch (error) {
-        voiceLogger.error('Failed to transcribe audio:', error);
-        throw new Error(`Audio transcription failed: ${error instanceof Error ? error.message : 'Unknown error'}`);
-    }
+                },
+            ],
+        },
+    ];
+    const toolRunner = createToolRunner({ directory });
+    return runTranscriptionLoop({
+        genAI,
+        model: 'gemini-2.5-flash',
+        initialContents,
+        tools,
+        temperature: temperature ?? 0.3,
+        toolRunner,
+    });
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "kimaki",
   "module": "index.ts",
   "type": "module",
-  "version": "0.4.38",
+  "version": "0.4.40",
   "scripts": {
     "dev": "tsx --env-file .env src/cli.ts",
     "prepublishOnly": "pnpm tsc",
@@ -34,17 +34,19 @@
     "@clack/prompts": "^0.11.0",
     "@discordjs/voice": "^0.19.0",
     "@google/genai": "^1.34.0",
-    "@opencode-ai/sdk": "^1.1.12",
+    "@opencode-ai/sdk": "^1.1.31",
     "@purinton/resampler": "^1.0.4",
     "ai": "^5.0.114",
     "better-sqlite3": "^12.3.0",
     "cac": "^6.7.14",
     "discord.js": "^14.16.3",
     "domhandler": "^5.0.3",
+    "errore": "workspace:^",
     "glob": "^13.0.0",
     "htmlparser2": "^10.0.0",
     "js-yaml": "^4.1.0",
     "marked": "^16.3.0",
+    "mime": "^4.1.0",
     "picocolors": "^1.1.1",
     "pretty-ms": "^9.3.0",
     "ripgrep-js": "^3.0.0",

package/src/cli.ts

@@ -40,8 +40,10 @@ import {
 } 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, type ExecSyncOptions } from 'node:child_process'
 import http from 'node:http'
 import { setDataDir, getDataDir, getLockPort } from './config.js'
@@ -181,6 +183,7 @@ type AgentInfo = {
   name: string
   description?: string
   mode: string
+  hidden?: boolean
 }
 
 async function registerCommands({
@@ -209,7 +212,7 @@ async function registerCommands({
       })
       .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)
@@ -234,6 +237,18 @@ async function registerCommands({
         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')
@@ -343,8 +358,10 @@ async function registerCommands({
   }
 
   // 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`
@@ -577,7 +594,12 @@ async function run({ restart, addChannels }: CliOptions) {
   // 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()
@@ -989,34 +1011,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)!`)
 

package/src/commands/abort.ts

@@ -7,6 +7,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')
 
@@ -64,14 +65,23 @@ export async function handleAbortCommand({ command }: CommandContext): Promise<v
 
   const sessionId = row.session_id
 
-  try {
-    const existingController = abortControllers.get(sessionId)
-    if (existingController) {
-      existingController.abort(new Error('User requested abort'))
-      abortControllers.delete(sessionId)
-    }
+  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
+  }
 
-    const getClient = await initializeOpencodeForDirectory(directory)
+  try {
     await getClient().session.abort({
       path: { id: sessionId },
     })

package/src/commands/add-project.ts

@@ -8,6 +8,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')
 
@@ -25,6 +26,10 @@ export async function handleAddProjectCommand({ command, appId }: CommandContext
   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) {
@@ -89,6 +94,10 @@ export async function handleAddProjectAutocomplete({
   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) {

package/src/commands/agent.ts

@@ -15,6 +15,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')
 
@@ -161,6 +162,10 @@ export async function handleAgentCommand({
 
   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 },
@@ -172,7 +177,10 @@ export async function handleAgentCommand({
     }
 
     const agents = agentsResponse.data
-      .filter((a) => a.mode === 'primary' || a.mode === 'all')
+      .filter((agent) => {
+        const hidden = (agent as { hidden?: boolean }).hidden
+        return (agent.mode === 'primary' || agent.mode === 'all') && !hidden
+      })
       .slice(0, 25)
 
     if (agents.length === 0) {
@@ -289,6 +297,10 @@ export async function handleQuickAgentCommand({
 
   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 },