kimaki 0.20.0 → 0.20.1

package/dist/commands/user-command.js

@@ -1,11 +1,14 @@
 // User-defined OpenCode command handler.
 // Handles slash commands that map to user-configured commands in opencode.json.
-import { ChannelType, MessageFlags, } from 'discord.js';
+import { ChannelType, MessageFlags, ThreadAutoArchiveDuration, } from 'discord.js';
 import { getOrCreateRuntime } from '../session-handler/thread-session-runtime.js';
 import { SILENT_MESSAGE_FLAGS } from '../discord-utils.js';
 import { createLogger, LogPrefix } from '../logger.js';
-import { getChannelDirectory, getThreadSession } from '../database.js';
+import { getChannelDirectory, getChannelWorktreesEnabled, getThreadSession, } from '../database.js';
 import { store } from '../store.js';
+import { isGitRepositoryRoot } from '../worktrees.js';
+import { formatAutoWorktreeName, createWorktreeInBackground, worktreeCreatingMessage, } from './new-worktree.js';
+import { WORKTREE_PREFIX } from './merge-worktree.js';
 import fs from 'node:fs';
 const userCommandLogger = createLogger(LogPrefix.USER_CMD);
 const DISCORD_MESSAGE_LIMIT = 2000;
@@ -107,23 +110,62 @@ export const handleUserCommand = async ({ command, appId, }) => {
         }
         else if (textChannel) {
             // Running in text channel - create a new thread
+            // Check if worktrees should be enabled (CLI flag OR channel setting),
+            // mirroring the logic in discord-bot.ts message handler.
+            const wantsWorktrees = store.getState().useWorktrees ||
+                (await getChannelWorktreesEnabled(textChannel.id));
+            const shouldUseWorktrees = wantsWorktrees && (await isGitRepositoryRoot(projectDirectory));
+            if (wantsWorktrees && !shouldUseWorktrees) {
+                userCommandLogger.warn(`[WORKTREE] Skipping automatic worktree for non-git project directory: ${projectDirectory}`);
+            }
+            const baseThreadName = commandInvocation.slice(0, DISCORD_THREAD_NAME_LIMIT);
+            const threadName = shouldUseWorktrees
+                ? `${WORKTREE_PREFIX}${baseThreadName}`
+                : baseThreadName;
             const starterMessage = await textChannel.send({
                 content: threadOpeningMessage,
                 flags: SILENT_MESSAGE_FLAGS,
             });
             const newThread = await starterMessage.startThread({
-                name: commandInvocation.slice(0, DISCORD_THREAD_NAME_LIMIT),
-                autoArchiveDuration: 1440,
+                name: threadName.slice(0, DISCORD_THREAD_NAME_LIMIT),
+                autoArchiveDuration: ThreadAutoArchiveDuration.OneDay,
                 reason: `OpenCode command: ${commandName}`,
             });
             // Add user to thread so it appears in their sidebar
             await newThread.members.add(command.user.id);
+            // Create worktree in background if enabled, same as discord-bot.ts
+            let worktreePromise;
+            if (shouldUseWorktrees) {
+                const worktreeName = formatAutoWorktreeName(baseThreadName.slice(0, 50));
+                userCommandLogger.log(`[WORKTREE] Creating worktree: ${worktreeName}`);
+                const worktreeStatusMessage = await newThread
+                    .send({
+                    content: worktreeCreatingMessage(worktreeName),
+                    flags: SILENT_MESSAGE_FLAGS,
+                })
+                    .catch(() => undefined);
+                worktreePromise = createWorktreeInBackground({
+                    thread: newThread,
+                    starterMessage: worktreeStatusMessage,
+                    worktreeName,
+                    projectDirectory,
+                    rest: command.client.rest,
+                });
+            }
+            const sessionDirectory = await (async () => {
+                if (!worktreePromise)
+                    return projectDirectory;
+                const result = await worktreePromise;
+                if (result instanceof Error)
+                    return projectDirectory;
+                return result;
+            })();
             await command.editReply(`Started /${commandName} in ${newThread.toString()}`);
             const runtime = getOrCreateRuntime({
                 threadId: newThread.id,
                 thread: newThread,
                 projectDirectory,
-                sdkDirectory: projectDirectory,
+                sdkDirectory: sessionDirectory,
                 channelId: textChannel.id,
                 appId,
             });

package/dist/discord-bot.js

@@ -261,9 +261,8 @@ export async function startDiscordBot({ token, appId, discordClient, useWorktree
         discordLogger.warn(`[GATEWAY] Shard ${shardId} reconnecting: ${parts.join(', ')}`);
         if (state.attempts >= MAX_RECONNECT_ATTEMPTS) {
             discordLogger.error(`[GATEWAY] Shard ${shardId} exceeded ${MAX_RECONNECT_ATTEMPTS} reconnect attempts, self-restarting`);
-            // Self-restart: cleanup then spawn a fresh process. This works whether
-            // the bin.ts wrapper is present or not (unlike process.exit(1) which
-            // only restarts when the wrapper is the parent).
+            // Self-restart: cleanup, then exit non-zero so the bin.ts wrapper
+            // restarts us. Without the wrapper this exits after logging a warning.
             void selfRestart('gateway-reconnect-limit');
         }
     });
@@ -1166,7 +1165,13 @@ export async function startDiscordBot({ token, appId, discordClient, useWorktree
             discordLogger.error('Failed to write heap snapshot:', e instanceof Error ? e.message : String(e));
         });
     });
-    // Self-restart: prefer bin.ts wrapper (keeps Ctrl+C), fall back to detached spawn.
+    // Self-restart: exit with code 1 so the bin.ts wrapper restarts us with
+    // exponential backoff and crash-loop detection. When running without the
+    // wrapper (e.g. `tsx src/cli.ts`), the process just exits and the user
+    // sees the non-zero exit code — they should use `tsx src/bin.ts` instead
+    // for auto-restart support. The previous detached-spawn fallback was
+    // unreliable: process.exit(0) could kill the child before it started,
+    // there was no backoff between restarts, and spawn failures were silent.
     let selfRestarting = false;
     async function selfRestart(reason) {
         if (selfRestarting) {
@@ -1181,20 +1186,10 @@ export async function startDiscordBot({ token, appId, discordClient, useWorktree
         catch (error) {
             voiceLogger.error(`[${reason}] Error during shutdown:`, error);
         }
-        if (process.env.__KIMAKI_CHILD) {
-            discordLogger.log('Wrapper detected, exiting for wrapper restart');
-            process.exit(1);
+        if (!process.env.__KIMAKI_CHILD) {
+            discordLogger.warn('No restart wrapper detected. Run via `tsx src/bin.ts` (dev) or `kimaki` (npm) for auto-restart on crash.');
         }
-        const { spawn } = await import('node:child_process');
-        const env = { ...process.env };
-        delete env.__KIMAKI_CHILD;
-        spawn(process.argv[0], [...process.execArgv, ...process.argv.slice(1)], {
-            stdio: 'inherit',
-            detached: true,
-            cwd: process.cwd(),
-            env,
-        }).unref();
-        process.exit(0);
+        process.exit(1);
     }
     process.on('SIGUSR2', () => {
         discordLogger.log('Received SIGUSR2, restarting after cleanup...');

package/dist/discord-utils.js

@@ -590,14 +590,31 @@ export async function resolveWorkingDirectory({ channel, }) {
         workingDirectory,
     };
 }
+// Discord upload size limits per server boost tier (bytes).
+// Bots default to 25 MB; boosted servers raise the ceiling.
+export const DISCORD_DEFAULT_MAX_FILE_SIZE = 25 * 1024 * 1024;
 /**
  * Upload files to a Discord thread/channel in a single message.
  * Sending all files in one message causes Discord to display images in a grid layout.
+ *
+ * Files are validated against the Discord upload size limit before reading them
+ * into memory. Pass `maxFileSize` if you know the guild's boost tier limit;
+ * otherwise the conservative 25 MB bot default is used.
  */
-export async function uploadFilesToDiscord({ threadId, botToken, files, }) {
+export async function uploadFilesToDiscord({ threadId, botToken, files, maxFileSize = DISCORD_DEFAULT_MAX_FILE_SIZE, }) {
     if (files.length === 0) {
         return;
     }
+    // Fail fast: check file sizes before reading anything into memory
+    const sizeLimit = maxFileSize ?? DISCORD_DEFAULT_MAX_FILE_SIZE;
+    for (const file of files) {
+        const stat = fs.statSync(file);
+        if (stat.size > sizeLimit) {
+            const fileMB = (stat.size / 1024 / 1024).toFixed(1);
+            const limitMB = (sizeLimit / 1024 / 1024).toFixed(0);
+            throw new Error(`File "${path.basename(file)}" is ${fileMB} MB, which exceeds Discord's ${limitMB} MB upload limit`);
+        }
+    }
     // Build attachments array for all files
     const attachments = files.map((file, index) => ({
         id: index,

package/dist/message-formatting.js

@@ -272,9 +272,9 @@ const MAX_BASH_COMMAND_INLINE_LENGTH = 100;
  * 2. Long/multiline command with description → show description
  * 3. Long/multiline command without description → truncate first line of command
  *
- * The description field was removed from the bash tool schema in newer opencode
- * versions, so case 3 is the common path now. Without this fallback, long commands
- * would render as just "┣ bash" with no context.
+ * The description field was removed from the opencode v2 bash tool schema but
+ * kimaki's system prompt instructs models to always send it as an extra field.
+ * Case 3 is the fallback when a model omits it.
  */
 export function formatBashToolTitle({ command, description, stateTitle, }) {
     if (!command && !description && !stateTitle)
@@ -292,10 +292,12 @@ export function formatBashToolTitle({ command, description, stateTitle, }) {
         return ` _${escapeInlineMarkdown(description)}_`;
     }
     if (firstMeaningfulLine.length > 0) {
-        const truncated = firstMeaningfulLine.length > MAX_BASH_COMMAND_INLINE_LENGTH
-            ? firstMeaningfulLine.slice(0, MAX_BASH_COMMAND_INLINE_LENGTH) + '…'
+        const needsTruncation = firstMeaningfulLine.length > MAX_BASH_COMMAND_INLINE_LENGTH;
+        const base = needsTruncation
+            ? firstMeaningfulLine.slice(0, MAX_BASH_COMMAND_INLINE_LENGTH)
             : firstMeaningfulLine;
-        return ` _${escapeInlineMarkdown(truncated)}_`;
+        // Always add ellipsis when showing a partial command (multiline or length-truncated)
+        return ` _${escapeInlineMarkdown(base)}…_`;
     }
     if (stateTitle) {
         return ` _${escapeInlineMarkdown(stateTitle)}_`;

package/dist/message-formatting.test.js

@@ -47,7 +47,7 @@ describe('formatBashToolTitle', () => {
         expect(formatBashToolTitle({ command: 'echo hello' })).toMatchInlineSnapshot(`" _echo hello_"`);
     });
     test('multiline command without description truncates to first line', () => {
-        expect(formatBashToolTitle({ command: 'echo hello\necho world\necho done' })).toMatchInlineSnapshot(`" _echo hello_"`);
+        expect(formatBashToolTitle({ command: 'echo hello\necho world\necho done' })).toMatchInlineSnapshot(`" _echo hello…_"`);
     });
     test('long single-line command is truncated with ellipsis', () => {
         const longCommand = 'a'.repeat(150);
@@ -68,16 +68,16 @@ describe('formatBashToolTitle', () => {
         expect(formatBashToolTitle({ command: '' })).toBe('');
     });
     test('leading blank line skipped, uses first meaningful line', () => {
-        expect(formatBashToolTitle({ command: '\npnpm test\npnpm build' })).toMatchInlineSnapshot(`" _pnpm test_"`);
+        expect(formatBashToolTitle({ command: '\npnpm test\npnpm build' })).toMatchInlineSnapshot(`" _pnpm test…_"`);
     });
     test('whitespace-only first line skipped', () => {
-        expect(formatBashToolTitle({ command: '   \npnpm test' })).toMatchInlineSnapshot(`" _pnpm test_"`);
+        expect(formatBashToolTitle({ command: '   \npnpm test' })).toMatchInlineSnapshot(`" _pnpm test…_"`);
     });
     test('no description field (new opencode) with multiline command', () => {
         // This is the exact scenario that was broken: opencode removed `description`
         // from the bash tool schema, so multiline commands rendered as just "┣ bash"
         const command = 'git diff HEAD~1 --stat && git log --oneline -5';
-        expect(formatBashToolTitle({ command: command + '\n' + 'echo done' })).toMatchInlineSnapshot(`" _git diff HEAD\\~1 --stat && git log --oneline -5_"`);
+        expect(formatBashToolTitle({ command: command + '\n' + 'echo done' })).toMatchInlineSnapshot(`" _git diff HEAD\\~1 --stat && git log --oneline -5…_"`);
     });
 });
 describe('formatTodoList', () => {

package/dist/system-message.js

@@ -279,10 +279,22 @@ The user is reading your messages from inside Discord, via kimaki.dev
 
 ## bash tool
 
-When calling the bash tool, always include a boolean field \`hasSideEffect\`.
-Set \`hasSideEffect: true\` for any command that writes files, modifies repo state, installs packages, changes config, runs scripts that mutate state, or triggers external effects.
-Set \`hasSideEffect: false\` for read-only commands (e.g. ls, tree, cat, rg, grep, git status, git diff, pwd, whoami, etc).
-This is required to distinguish essential bash calls from read-only ones in low-verbosity mode.
+When calling the bash tool, always include these extra fields alongside \`command\`:
+
+\`\`\`ts
+interface BashToolInput {
+  command: string
+  /** Short 5-10 word summary of what this command does */
+  description: string
+  /** true if the command writes files, modifies state, installs packages, or triggers external effects */
+  hasSideEffect: boolean
+  workdir?: string
+  timeout?: number
+}
+\`\`\`
+
+\`description\` is shown to the user in Discord as a summary of the bash call.
+\`hasSideEffect\` distinguishes essential bash calls from read-only ones in low-verbosity mode.
 
 Your current OpenCode session ID is: ${sessionId}${channelId ? `\nYour current Discord channel ID is: ${channelId}` : ''}${threadId ? `\nYour current Discord thread ID is: ${threadId}` : ''}${guildId ? `\nYour current Discord guild ID is: ${guildId}` : ''}
 

package/dist/system-message.test.js

@@ -34,10 +34,22 @@ describe('system-message', () => {
 
       ## bash tool
 
-      When calling the bash tool, always include a boolean field \`hasSideEffect\`.
-      Set \`hasSideEffect: true\` for any command that writes files, modifies repo state, installs packages, changes config, runs scripts that mutate state, or triggers external effects.
-      Set \`hasSideEffect: false\` for read-only commands (e.g. ls, tree, cat, rg, grep, git status, git diff, pwd, whoami, etc).
-      This is required to distinguish essential bash calls from read-only ones in low-verbosity mode.
+      When calling the bash tool, always include these extra fields alongside \`command\`:
+
+      \`\`\`ts
+      interface BashToolInput {
+        command: string
+        /** Short 5-10 word summary of what this command does */
+        description: string
+        /** true if the command writes files, modifies state, installs packages, or triggers external effects */
+        hasSideEffect: boolean
+        workdir?: string
+        timeout?: number
+      }
+      \`\`\`
+
+      \`description\` is shown to the user in Discord as a summary of the bash call.
+      \`hasSideEffect\` distinguishes essential bash calls from read-only ones in low-verbosity mode.
 
       Your current OpenCode session ID is: ses_123
       Your current Discord channel ID is: chan_123

package/package.json

@@ -2,7 +2,7 @@
   "name": "kimaki",
   "module": "index.ts",
   "type": "module",
-  "version": "0.20.0",
+  "version": "0.20.1",
   "repository": "https://github.com/remorses/kimaki",
   "bin": "bin.js",
   "files": [
@@ -62,9 +62,9 @@
     "yaml": "^2.8.3",
     "zod": "^4.3.6",
     "zustand": "^5.0.11",
-    "libsqlproxy": "^0.1.0",
-    "opencode-injection-guard": "^0.2.1",
     "errore": "^0.14.1",
+    "opencode-injection-guard": "^0.2.1",
+    "libsqlproxy": "^0.1.0",
     "traforo": "^0.7.1"
   },
   "optionalDependencies": {

package/skills/egaki/SKILL.md

@@ -54,6 +54,23 @@ The `--model` / `-m` flag is **optional** on both `egaki image` and `egaki video
 
 Agents should always pass `-m` explicitly to avoid the interactive picker.
 
+### Preferred image models
+
+When the user does not specify a model, prefer these in order:
+
+1. **`gpt-image-1`** (or `gpt-image-2` / `chatgpt-image-latest` if available)
+2. **`grok-imagine-image`** (xAI Grok)
+3. **`nano-banana-pro-preview`**
+
+Always try the first available model. Fall back to the next if auth is missing
+for the preferred one.
+
+### Preferred video models
+
+When the user does not specify a video model, prefer:
+
+1. **`grok-imagine-video-1.5`** (xAI Grok)
+
 ## Example commands
 
 ```bash

package/skills/sigillo/SKILL.md

@@ -25,6 +25,19 @@ sigillo --help
 
 **NEVER truncate this either.**
 
+If a flag or command documented here is missing from `--help`, the installed binary is likely outdated. Update before proceeding:
+
+```bash
+npm i -g sigillo@latest
+```
+
+If sigillo is symlinked to a local dev build (check with `which sigillo`), rebuild from source instead:
+
+```bash
+cd /path/to/sigillo/cli && zig build -Dtarget=aarch64-macos
+cp zig-out/bin/sigillo dist/darwin-arm64/sigillo
+```
+
 ## New project setup workflow
 
 This mirrors the Doppler workflow: check auth → link project → list secrets → run.
@@ -88,6 +101,16 @@ To read a specific value:
 sigillo secrets get DATABASE_URL
 ```
 
+`secrets get` returns YAML by default. Pass `--raw` to output only the raw value (no YAML wrapping). When stdout is piped, `--raw` is implied automatically:
+
+```bash
+# copy a secret between environments (piped stdout auto-enables raw mode)
+sigillo secrets get DATABASE_URL -c dev | sigillo secrets set DATABASE_URL -c preview
+
+# force raw output in a terminal (useful for scripting)
+sigillo secrets get DATABASE_URL --raw
+```
+
 **5. Run your app with secrets injected:**
 
 ```bash
@@ -113,11 +136,11 @@ Never read a secret value into the agent context window or pass it as plain text
 **Copying a secret from one env to another:**
 
 ```bash
-# value flows through stdin, never seen by the agent
+# piped stdout auto-enables raw mode, value never seen by the agent
 sigillo secrets get DATABASE_URL -c dev | sigillo secrets set DATABASE_URL -c preview
 ```
 
-The same pattern works for any secret copy — between environments, or when seeding a new environment from an existing one.
+The same pattern works for any secret copy, between environments, or when seeding a new environment from an existing one.
 
 ### Never read `.env` files or `~/.sigillo/*`
 
@@ -145,14 +168,22 @@ If a `package.json` script requires secrets, embed `sigillo run` directly in the
 {
   "scripts": {
     "dev": "sigillo run -c dev -- vite dev",
-    "deployment": "sigillo run -c preview -- pnpm db:migrate:preview && CLOUDFLARE_ENV=preview sigillo run -c preview --command 'vite build && wrangler deploy --env preview'",
-    "deployment:prod": "sigillo run -c prod -- pnpm db:migrate:prod && sigillo run -c prod --command 'vite build && wrangler deploy'"
+    "deploy": "pnpm db:migrate:preview && CLOUDFLARE_ENV=preview sigillo run -c preview --command 'tsc && vite build && wrangler deploy --env preview'",
+    "deploy:prod": "pnpm db:migrate:prod && sigillo run -c prod --command 'tsc && vite build && wrangler deploy'"
   }
 }
 ```
 
+These scripts work because pnpm adds `node_modules/.bin` to PATH before executing the script string, and sigillo inherits that PATH. Commands like `tsc`, `vite`, and `wrangler` resolve correctly inside `--command` as long as the entry point is `pnpm run deploy`.
+
 Use `-c dev` for local development, `-c preview` for staging or preview deployments, and `-c prod` or the repo's production slug for production.
 
+### Always run `sigillo run` via pnpm scripts, not directly
+
+`sigillo run --command` spawns `$SHELL -c '...'` and passes the inherited `PATH`. But pnpm only adds `node_modules/.bin` to `PATH` when it's running a `package.json` script. If you call `sigillo run --command 'tsc && vite build'` directly from the terminal, `tsc` and `vite` won't be found because `node_modules/.bin` is not in PATH.
+
+Always invoke deploy/build commands through `pnpm run <script>` so pnpm augments PATH before sigillo inherits it. If you must run sigillo directly, use `pnpm exec` to resolve binaries: `sigillo run --command 'pnpm exec tsc && pnpm exec vite build'`.
+
 ### Use `--command` for shell expansion
 
 Use direct argv mode when no shell syntax is needed:

package/src/commands/user-command.ts

@@ -5,14 +5,26 @@ import type { CommandHandler } from './types.js'
 import {
   ChannelType,
   MessageFlags,
+  ThreadAutoArchiveDuration,
   type TextChannel,
   type ThreadChannel,
 } from 'discord.js'
 import { getOrCreateRuntime } from '../session-handler/thread-session-runtime.js'
 import { SILENT_MESSAGE_FLAGS } from '../discord-utils.js'
 import { createLogger, LogPrefix } from '../logger.js'
-import { getChannelDirectory, getThreadSession } from '../database.js'
+import {
+  getChannelDirectory,
+  getChannelWorktreesEnabled,
+  getThreadSession,
+} from '../database.js'
 import { store } from '../store.js'
+import { isGitRepositoryRoot } from '../worktrees.js'
+import {
+  formatAutoWorktreeName,
+  createWorktreeInBackground,
+  worktreeCreatingMessage,
+} from './new-worktree.js'
+import { WORKTREE_PREFIX } from './merge-worktree.js'
 import fs from 'node:fs'
 
 const userCommandLogger = createLogger(LogPrefix.USER_CMD)
@@ -144,20 +156,69 @@ export const handleUserCommand: CommandHandler = async ({
       })
     } else if (textChannel) {
       // Running in text channel - create a new thread
+
+      // Check if worktrees should be enabled (CLI flag OR channel setting),
+      // mirroring the logic in discord-bot.ts message handler.
+      const wantsWorktrees =
+        store.getState().useWorktrees ||
+        (await getChannelWorktreesEnabled(textChannel.id))
+      const shouldUseWorktrees =
+        wantsWorktrees && (await isGitRepositoryRoot(projectDirectory))
+
+      if (wantsWorktrees && !shouldUseWorktrees) {
+        userCommandLogger.warn(
+          `[WORKTREE] Skipping automatic worktree for non-git project directory: ${projectDirectory}`,
+        )
+      }
+
+      const baseThreadName = commandInvocation.slice(0, DISCORD_THREAD_NAME_LIMIT)
+      const threadName = shouldUseWorktrees
+        ? `${WORKTREE_PREFIX}${baseThreadName}`
+        : baseThreadName
+
       const starterMessage = await textChannel.send({
         content: threadOpeningMessage,
         flags: SILENT_MESSAGE_FLAGS,
       })
 
       const newThread = await starterMessage.startThread({
-        name: commandInvocation.slice(0, DISCORD_THREAD_NAME_LIMIT),
-        autoArchiveDuration: 1440,
+        name: threadName.slice(0, DISCORD_THREAD_NAME_LIMIT),
+        autoArchiveDuration: ThreadAutoArchiveDuration.OneDay,
         reason: `OpenCode command: ${commandName}`,
       })
 
       // Add user to thread so it appears in their sidebar
       await newThread.members.add(command.user.id)
 
+      // Create worktree in background if enabled, same as discord-bot.ts
+      let worktreePromise: Promise<string | Error> | undefined
+      if (shouldUseWorktrees) {
+        const worktreeName = formatAutoWorktreeName(baseThreadName.slice(0, 50))
+        userCommandLogger.log(`[WORKTREE] Creating worktree: ${worktreeName}`)
+
+        const worktreeStatusMessage = await newThread
+          .send({
+            content: worktreeCreatingMessage(worktreeName),
+            flags: SILENT_MESSAGE_FLAGS,
+          })
+          .catch(() => undefined)
+
+        worktreePromise = createWorktreeInBackground({
+          thread: newThread,
+          starterMessage: worktreeStatusMessage,
+          worktreeName,
+          projectDirectory,
+          rest: command.client.rest,
+        })
+      }
+
+      const sessionDirectory = await (async () => {
+        if (!worktreePromise) return projectDirectory
+        const result = await worktreePromise
+        if (result instanceof Error) return projectDirectory
+        return result
+      })()
+
       await command.editReply(
         `Started /${commandName} in ${newThread.toString()}`,
       )
@@ -166,7 +227,7 @@ export const handleUserCommand: CommandHandler = async ({
         threadId: newThread.id,
         thread: newThread,
         projectDirectory,
-        sdkDirectory: projectDirectory,
+        sdkDirectory: sessionDirectory,
         channelId: textChannel.id,
         appId,
       })

package/src/discord-bot.ts

@@ -415,9 +415,8 @@ export async function startDiscordBot({
       discordLogger.error(
         `[GATEWAY] Shard ${shardId} exceeded ${MAX_RECONNECT_ATTEMPTS} reconnect attempts, self-restarting`,
       )
-      // Self-restart: cleanup then spawn a fresh process. This works whether
-      // the bin.ts wrapper is present or not (unlike process.exit(1) which
-      // only restarts when the wrapper is the parent).
+      // Self-restart: cleanup, then exit non-zero so the bin.ts wrapper
+      // restarts us. Without the wrapper this exits after logging a warning.
       void selfRestart('gateway-reconnect-limit')
     }
   })
@@ -1525,7 +1524,13 @@ export async function startDiscordBot({
     })
   })
 
-  // Self-restart: prefer bin.ts wrapper (keeps Ctrl+C), fall back to detached spawn.
+  // Self-restart: exit with code 1 so the bin.ts wrapper restarts us with
+  // exponential backoff and crash-loop detection. When running without the
+  // wrapper (e.g. `tsx src/cli.ts`), the process just exits and the user
+  // sees the non-zero exit code — they should use `tsx src/bin.ts` instead
+  // for auto-restart support. The previous detached-spawn fallback was
+  // unreliable: process.exit(0) could kill the child before it started,
+  // there was no backoff between restarts, and spawn failures were silent.
   let selfRestarting = false
   async function selfRestart(reason: string) {
     if (selfRestarting) {
@@ -1540,21 +1545,12 @@ export async function startDiscordBot({
       voiceLogger.error(`[${reason}] Error during shutdown:`, error)
     }
 
-    if (process.env.__KIMAKI_CHILD) {
-      discordLogger.log('Wrapper detected, exiting for wrapper restart')
-      process.exit(1)
+    if (!process.env.__KIMAKI_CHILD) {
+      discordLogger.warn(
+        'No restart wrapper detected. Run via `tsx src/bin.ts` (dev) or `kimaki` (npm) for auto-restart on crash.',
+      )
     }
-
-    const { spawn } = await import('node:child_process')
-    const env = { ...process.env }
-    delete env.__KIMAKI_CHILD
-    spawn(process.argv[0]!, [...process.execArgv, ...process.argv.slice(1)], {
-      stdio: 'inherit',
-      detached: true,
-      cwd: process.cwd(),
-      env,
-    }).unref()
-    process.exit(0)
+    process.exit(1)
   }
 
   process.on('SIGUSR2', () => {

package/src/discord-utils.ts

@@ -788,23 +788,47 @@ export async function resolveWorkingDirectory({
   }
 }
 
+// Discord upload size limits per server boost tier (bytes).
+// Bots default to 25 MB; boosted servers raise the ceiling.
+export const DISCORD_DEFAULT_MAX_FILE_SIZE = 25 * 1024 * 1024
+
 /**
  * Upload files to a Discord thread/channel in a single message.
  * Sending all files in one message causes Discord to display images in a grid layout.
+ *
+ * Files are validated against the Discord upload size limit before reading them
+ * into memory. Pass `maxFileSize` if you know the guild's boost tier limit;
+ * otherwise the conservative 25 MB bot default is used.
  */
 export async function uploadFilesToDiscord({
   threadId,
   botToken,
   files,
+  maxFileSize = DISCORD_DEFAULT_MAX_FILE_SIZE,
 }: {
   threadId: string
   botToken: string
   files: string[]
+  /** Per-file size limit in bytes. Defaults to 25 MB (bot default). */
+  maxFileSize?: number
 }): Promise<void> {
   if (files.length === 0) {
     return
   }
 
+  // Fail fast: check file sizes before reading anything into memory
+  const sizeLimit = maxFileSize ?? DISCORD_DEFAULT_MAX_FILE_SIZE
+  for (const file of files) {
+    const stat = fs.statSync(file)
+    if (stat.size > sizeLimit) {
+      const fileMB = (stat.size / 1024 / 1024).toFixed(1)
+      const limitMB = (sizeLimit / 1024 / 1024).toFixed(0)
+      throw new Error(
+        `File "${path.basename(file)}" is ${fileMB} MB, which exceeds Discord's ${limitMB} MB upload limit`,
+      )
+    }
+  }
+
   // Build attachments array for all files
   const attachments = files.map((file, index) => ({
     id: index,

package/src/message-formatting.test.ts

@@ -56,7 +56,7 @@ describe('formatBashToolTitle', () => {
   test('multiline command without description truncates to first line', () => {
     expect(
       formatBashToolTitle({ command: 'echo hello\necho world\necho done' }),
-    ).toMatchInlineSnapshot(`" _echo hello_"`)
+    ).toMatchInlineSnapshot(`" _echo hello…_"`)
   })
 
   test('long single-line command is truncated with ellipsis', () => {
@@ -88,13 +88,13 @@ describe('formatBashToolTitle', () => {
   test('leading blank line skipped, uses first meaningful line', () => {
     expect(
       formatBashToolTitle({ command: '\npnpm test\npnpm build' }),
-    ).toMatchInlineSnapshot(`" _pnpm test_"`)
+    ).toMatchInlineSnapshot(`" _pnpm test…_"`)
   })
 
   test('whitespace-only first line skipped', () => {
     expect(
       formatBashToolTitle({ command: '   \npnpm test' }),
-    ).toMatchInlineSnapshot(`" _pnpm test_"`)
+    ).toMatchInlineSnapshot(`" _pnpm test…_"`)
   })
 
   test('no description field (new opencode) with multiline command', () => {
@@ -102,7 +102,7 @@ describe('formatBashToolTitle', () => {
     // from the bash tool schema, so multiline commands rendered as just "┣ bash"
     const command = 'git diff HEAD~1 --stat && git log --oneline -5'
     expect(formatBashToolTitle({ command: command + '\n' + 'echo done' })).toMatchInlineSnapshot(
-      `" _git diff HEAD\\~1 --stat && git log --oneline -5_"`,
+      `" _git diff HEAD\\~1 --stat && git log --oneline -5…_"`,
     )
   })
 })

package/src/message-formatting.ts

@@ -356,9 +356,9 @@ const MAX_BASH_COMMAND_INLINE_LENGTH = 100
  * 2. Long/multiline command with description → show description
  * 3. Long/multiline command without description → truncate first line of command
  *
- * The description field was removed from the bash tool schema in newer opencode
- * versions, so case 3 is the common path now. Without this fallback, long commands
- * would render as just "┣ bash" with no context.
+ * The description field was removed from the opencode v2 bash tool schema but
+ * kimaki's system prompt instructs models to always send it as an extra field.
+ * Case 3 is the fallback when a model omits it.
  */
 export function formatBashToolTitle({
   command,
@@ -386,11 +386,12 @@ export function formatBashToolTitle({
     return ` _${escapeInlineMarkdown(description)}_`
   }
   if (firstMeaningfulLine.length > 0) {
-    const truncated =
-      firstMeaningfulLine.length > MAX_BASH_COMMAND_INLINE_LENGTH
-        ? firstMeaningfulLine.slice(0, MAX_BASH_COMMAND_INLINE_LENGTH) + '…'
-        : firstMeaningfulLine
-    return ` _${escapeInlineMarkdown(truncated)}_`
+    const needsTruncation = firstMeaningfulLine.length > MAX_BASH_COMMAND_INLINE_LENGTH
+    const base = needsTruncation
+      ? firstMeaningfulLine.slice(0, MAX_BASH_COMMAND_INLINE_LENGTH)
+      : firstMeaningfulLine
+    // Always add ellipsis when showing a partial command (multiline or length-truncated)
+    return ` _${escapeInlineMarkdown(base)}…_`
   }
   if (stateTitle) {
     return ` _${escapeInlineMarkdown(stateTitle)}_`

package/src/system-message.test.ts

@@ -44,10 +44,22 @@ describe('system-message', () => {
 
       ## bash tool
 
-      When calling the bash tool, always include a boolean field \`hasSideEffect\`.
-      Set \`hasSideEffect: true\` for any command that writes files, modifies repo state, installs packages, changes config, runs scripts that mutate state, or triggers external effects.
-      Set \`hasSideEffect: false\` for read-only commands (e.g. ls, tree, cat, rg, grep, git status, git diff, pwd, whoami, etc).
-      This is required to distinguish essential bash calls from read-only ones in low-verbosity mode.
+      When calling the bash tool, always include these extra fields alongside \`command\`:
+
+      \`\`\`ts
+      interface BashToolInput {
+        command: string
+        /** Short 5-10 word summary of what this command does */
+        description: string
+        /** true if the command writes files, modifies state, installs packages, or triggers external effects */
+        hasSideEffect: boolean
+        workdir?: string
+        timeout?: number
+      }
+      \`\`\`
+
+      \`description\` is shown to the user in Discord as a summary of the bash call.
+      \`hasSideEffect\` distinguishes essential bash calls from read-only ones in low-verbosity mode.
 
       Your current OpenCode session ID is: ses_123
       Your current Discord channel ID is: chan_123

package/src/system-message.ts

@@ -392,10 +392,22 @@ The user is reading your messages from inside Discord, via kimaki.dev
 
 ## bash tool
 
-When calling the bash tool, always include a boolean field \`hasSideEffect\`.
-Set \`hasSideEffect: true\` for any command that writes files, modifies repo state, installs packages, changes config, runs scripts that mutate state, or triggers external effects.
-Set \`hasSideEffect: false\` for read-only commands (e.g. ls, tree, cat, rg, grep, git status, git diff, pwd, whoami, etc).
-This is required to distinguish essential bash calls from read-only ones in low-verbosity mode.
+When calling the bash tool, always include these extra fields alongside \`command\`:
+
+\`\`\`ts
+interface BashToolInput {
+  command: string
+  /** Short 5-10 word summary of what this command does */
+  description: string
+  /** true if the command writes files, modifies state, installs packages, or triggers external effects */
+  hasSideEffect: boolean
+  workdir?: string
+  timeout?: number
+}
+\`\`\`
+
+\`description\` is shown to the user in Discord as a summary of the bash call.
+\`hasSideEffect\` distinguishes essential bash calls from read-only ones in low-verbosity mode.
 
 Your current OpenCode session ID is: ${sessionId}${channelId ? `\nYour current Discord channel ID is: ${channelId}` : ''}${threadId ? `\nYour current Discord thread ID is: ${threadId}` : ''}${guildId ? `\nYour current Discord guild ID is: ${guildId}` : ''}