kimaki 0.4.78 → 0.4.80

package/src/cli.ts

@@ -3,6 +3,7 @@
 // Handles interactive setup, Discord OAuth, slash command registration,
 // project channel creation, and launching the bot with opencode integration.
 import { goke } from 'goke'
+import { z } from 'zod'
 import {
   intro,
   outro,
@@ -39,6 +40,7 @@ import {
 } from './discord-bot.js'
 import {
   getBotTokenWithMode,
+  ensureServiceAuthToken,
   setBotToken,
   setBotMode,
   setChannelDirectory,
@@ -50,6 +52,8 @@ import {
   createScheduledTask,
   listScheduledTasks,
   cancelScheduledTask,
+  getScheduledTask,
+  updateScheduledTask,
   getSessionStartSourcesBySessionIds,
 } from './database.js'
 import { ShareMarkdown } from './markdown.js'
@@ -83,7 +87,7 @@ import {
   SlashCommandBuilder,
   AttachmentBuilder,
 } from 'discord.js'
-import { createDiscordRest, discordApiUrl, getDiscordRestApiUrl, getGatewayProxyRestBaseUrl } from './discord-urls.js'
+import { createDiscordRest, discordApiUrl, getDiscordRestApiUrl, getGatewayProxyRestBaseUrl, getInternetReachableBaseUrl } from './discord-urls.js'
 import crypto from 'node:crypto'
 import path from 'node:path'
 import fs from 'node:fs'
@@ -117,9 +121,9 @@ import {
 import { startHranaServer } from './hrana-server.js'
 import { startIpcPolling, stopIpcPolling } from './ipc-polling.js'
 import {
-  getLocalTimeZone,
   getPromptPreview,
   parseSendAtValue,
+  parseScheduledTaskPayload,
   serializeScheduledTaskPayload,
   type ParsedSendAt,
   type ScheduledTaskPayload,
@@ -248,7 +252,37 @@ async function sendDiscordMessageWithOptionalAttachment({
     fs.mkdirSync(tmpDir, { recursive: true })
   }
   const tmpFile = path.join(tmpDir, `prompt-${Date.now()}.md`)
-  fs.writeFileSync(tmpFile, prompt)
+  // Wrap long lines so the file is readable in Discord's preview
+  // (Discord doesn't wrap text in file attachments)
+  const wrappedPrompt = prompt
+    .split('\n')
+    .flatMap((line) => {
+      if (line.length <= 120) {
+        return [line]
+      }
+      const wrapped: string[] = []
+      let remaining = line
+      const maxCol = 120
+      // Only soft-break at a space if it's reasonably close to maxCol,
+      // otherwise hard-break to avoid tiny fragments from early spaces
+      const minSoftBreak = 90
+      while (remaining.length > maxCol) {
+        const lastSpace = remaining.lastIndexOf(' ', maxCol)
+        const useSoftBreak = lastSpace >= minSoftBreak
+        const breakAt = useSoftBreak ? lastSpace : maxCol
+        wrapped.push(remaining.slice(0, breakAt))
+        // Only consume the separator space on soft breaks
+        remaining = useSoftBreak
+          ? remaining.slice(breakAt + 1)
+          : remaining.slice(breakAt)
+      }
+      if (remaining.length > 0) {
+        wrapped.push(remaining)
+      }
+      return wrapped
+    })
+    .join('\n')
+  fs.writeFileSync(tmpFile, wrappedPrompt)
 
   try {
     const formData = new FormData()
@@ -543,7 +577,7 @@ async function ensureCommandAvailable({
     cliLogger.log(`Failed to install ${name}`)
     cliLogger.error(
       'Installation error:',
-      error instanceof Error ? error.message : String(error),
+      error instanceof Error ? error.stack : String(error),
     )
     process.exit(EXIT_NO_RESTART)
   }
@@ -603,16 +637,18 @@ async function ensureCommandAvailable({
 // Run opencode upgrade in the background so the user always has the latest version.
 
 // Spawn caffeinate on macOS to prevent system sleep while bot is running.
-// Not detached, so it dies automatically with the parent process.
+// Uses -w to watch the parent PID so caffeinate self-terminates if kimaki
+// exits for any reason (SIGTERM, crash, process.exit, supervisor stop).
 function startCaffeinate() {
   if (process.platform !== 'darwin') {
     return
   }
   try {
-    const proc = spawn('caffeinate', ['-i'], {
+    const proc = spawn('caffeinate', ['-i', '-w', String(process.pid)], {
       stdio: 'ignore',
       detached: false,
     })
+    proc.unref()
     proc.on('error', (err) => {
       cliLogger.warn('Failed to start caffeinate:', err.message)
     })
@@ -740,11 +776,17 @@ async function deleteLegacyGlobalCommands({
     }
   } catch (error) {
     cliLogger.warn(
-      `COMMANDS: Could not clean legacy global commands: ${error instanceof Error ? error.message : String(error)}`,
+      `COMMANDS: Could not clean legacy global commands: ${error instanceof Error ? error.stack : String(error)}`,
     )
   }
 }
 
+// Discord slash command descriptions must be 1-100 chars.
+// Truncate to 100 so @sapphire/shapeshift validation never throws.
+function truncateCommandDescription(description: string): string {
+  return description.slice(0, 100)
+}
+
 async function registerCommands({
   token,
   appId,
@@ -761,11 +803,11 @@ async function registerCommands({
   const commands = [
     new SlashCommandBuilder()
       .setName('resume')
-      .setDescription('Resume an existing OpenCode session')
+      .setDescription(truncateCommandDescription('Resume an existing OpenCode session'))
       .addStringOption((option) => {
         option
           .setName('session')
-          .setDescription('The session to resume')
+          .setDescription(truncateCommandDescription('The session to resume'))
           .setRequired(true)
           .setAutocomplete(true)
 
@@ -775,11 +817,11 @@ async function registerCommands({
       .toJSON(),
     new SlashCommandBuilder()
       .setName('new-session')
-      .setDescription('Start a new OpenCode session')
+      .setDescription(truncateCommandDescription('Start a new OpenCode session'))
       .addStringOption((option) => {
         option
           .setName('prompt')
-          .setDescription('Prompt content for the session')
+          .setDescription(truncateCommandDescription('Prompt content for the session'))
           .setRequired(true)
 
         return option
@@ -788,7 +830,7 @@ async function registerCommands({
         option
           .setName('files')
           .setDescription(
-            'Files to mention (comma or space separated; autocomplete)',
+            truncateCommandDescription('Files to mention (comma or space separated; autocomplete)'),
           )
           .setAutocomplete(true)
           .setMaxLength(6000)
@@ -798,7 +840,7 @@ async function registerCommands({
       .addStringOption((option) => {
         option
           .setName('agent')
-          .setDescription('Agent to use for this session')
+          .setDescription(truncateCommandDescription('Agent to use for this session'))
           .setAutocomplete(true)
 
         return option
@@ -808,13 +850,13 @@ async function registerCommands({
     new SlashCommandBuilder()
       .setName('new-worktree')
       .setDescription(
-        'Create a git worktree branch from origin/HEAD (or main). Optionally pick a base branch.',
+        truncateCommandDescription('Create a git worktree branch from origin/HEAD (or main). Optionally pick a base branch.'),
       )
       .addStringOption((option) => {
         option
           .setName('name')
           .setDescription(
-            'Name for worktree (optional in threads - uses thread name)',
+            truncateCommandDescription('Name for worktree (optional in threads - uses thread name)'),
           )
           .setRequired(false)
 
@@ -824,7 +866,7 @@ async function registerCommands({
         option
           .setName('base-branch')
           .setDescription(
-            'Branch to create the worktree from (default: origin/HEAD or main)',
+            truncateCommandDescription('Branch to create the worktree from (default: origin/HEAD or main)'),
           )
           .setRequired(false)
           .setAutocomplete(true)
@@ -836,13 +878,13 @@ async function registerCommands({
     new SlashCommandBuilder()
       .setName('merge-worktree')
       .setDescription(
-        'Squash-merge worktree into the default branch. Optionally pick a target branch.',
+        truncateCommandDescription('Squash-merge worktree into default branch. Aborts if main has uncommitted changes.'),
       )
       .addStringOption((option) => {
         option
           .setName('target-branch')
           .setDescription(
-            'Branch to merge into (default: origin/HEAD or main)',
+            truncateCommandDescription('Branch to merge into (default: origin/HEAD or main)'),
           )
           .setRequired(false)
           .setAutocomplete(true)
@@ -854,32 +896,44 @@ async function registerCommands({
     new SlashCommandBuilder()
       .setName('toggle-worktrees')
       .setDescription(
-        'Toggle automatic git worktree creation for new sessions in this channel',
+        truncateCommandDescription('Toggle automatic git worktree creation for new sessions in this channel'),
       )
       .setDMPermission(false)
       .toJSON(),
     new SlashCommandBuilder()
       .setName('worktrees')
-      .setDescription('List all active worktree sessions')
+      .setDescription(truncateCommandDescription('List all active worktree sessions'))
+      .setDMPermission(false)
+      .toJSON(),
+    new SlashCommandBuilder()
+      .setName('tasks')
+      .setDescription(truncateCommandDescription('List scheduled tasks created via send --send-at'))
+      .addBooleanOption((option) => {
+        return option
+          .setName('all')
+          .setDescription(
+            truncateCommandDescription('Include completed, cancelled, and failed tasks'),
+          )
+      })
       .setDMPermission(false)
       .toJSON(),
     new SlashCommandBuilder()
       .setName('toggle-mention-mode')
       .setDescription(
-        'Toggle mention-only mode (bot only responds when @mentioned)',
+        truncateCommandDescription('Toggle mention-only mode (bot only responds when @mentioned)'),
       )
       .setDMPermission(false)
       .toJSON(),
     new SlashCommandBuilder()
       .setName('add-project')
       .setDescription(
-        'Create Discord channels for a project. Use `npx kimaki project add` for unlisted projects',
+        truncateCommandDescription('Create Discord channels for a project. Use `npx kimaki project add` for unlisted projects'),
       )
       .addStringOption((option) => {
         option
           .setName('project')
           .setDescription(
-            'Recent OpenCode projects. Use `npx kimaki project add` if not listed',
+            truncateCommandDescription('Recent OpenCode projects. Use `npx kimaki project add` if not listed'),
           )
           .setRequired(true)
           .setAutocomplete(true)
@@ -890,11 +944,11 @@ async function registerCommands({
       .toJSON(),
     new SlashCommandBuilder()
       .setName('remove-project')
-      .setDescription('Remove Discord channels for a project')
+      .setDescription(truncateCommandDescription('Remove Discord channels for a project'))
       .addStringOption((option) => {
         option
           .setName('project')
-          .setDescription('Select a project to remove')
+          .setDescription(truncateCommandDescription('Select a project to remove'))
           .setRequired(true)
           .setAutocomplete(true)
 
@@ -905,12 +959,12 @@ async function registerCommands({
     new SlashCommandBuilder()
       .setName('create-new-project')
       .setDescription(
-        'Create a new project folder, initialize git, and start a session',
+        truncateCommandDescription('Create a new project folder, initialize git, and start a session'),
       )
       .addStringOption((option) => {
         option
           .setName('name')
-          .setDescription('Name for the new project folder')
+          .setDescription(truncateCommandDescription('Name for the new project folder'))
           .setRequired(true)
 
         return option
@@ -919,74 +973,74 @@ async function registerCommands({
       .toJSON(),
     new SlashCommandBuilder()
       .setName('abort')
-      .setDescription('Abort the current OpenCode request in this thread')
+      .setDescription(truncateCommandDescription('Abort the current OpenCode request in this thread'))
       .setDMPermission(false)
       .toJSON(),
     new SlashCommandBuilder()
       .setName('compact')
       .setDescription(
-        'Compact the session context by summarizing conversation history',
+        truncateCommandDescription('Compact the session context by summarizing conversation history'),
       )
       .setDMPermission(false)
       .toJSON(),
     new SlashCommandBuilder()
       .setName('stop')
-      .setDescription('Abort the current OpenCode request in this thread')
+      .setDescription(truncateCommandDescription('Abort the current OpenCode request in this thread'))
       .setDMPermission(false)
       .toJSON(),
     new SlashCommandBuilder()
       .setName('share')
-      .setDescription('Share the current session as a public URL')
+      .setDescription(truncateCommandDescription('Share the current session as a public URL'))
       .setDMPermission(false)
       .toJSON(),
     new SlashCommandBuilder()
       .setName('diff')
-      .setDescription('Show git diff as a shareable URL')
+      .setDescription(truncateCommandDescription('Show git diff as a shareable URL'))
       .setDMPermission(false)
       .toJSON(),
     new SlashCommandBuilder()
       .setName('fork')
-      .setDescription('Fork the session from a past user message')
+      .setDescription(truncateCommandDescription('Fork the session from a past user message'))
       .setDMPermission(false)
       .toJSON(),
     new SlashCommandBuilder()
       .setName('model')
-      .setDescription('Set the preferred model for this channel or session')
+      .setDescription(truncateCommandDescription('Set the preferred model for this channel or session'))
       .setDMPermission(false)
       .toJSON(),
     new SlashCommandBuilder()
       .setName('model-variant')
       .setDescription(
-        'Quickly change the thinking level variant for the current model',
+        truncateCommandDescription('Quickly change the thinking level variant for the current model'),
       )
       .setDMPermission(false)
       .toJSON(),
     new SlashCommandBuilder()
       .setName('unset-model-override')
-      .setDescription('Remove model override and use default instead')
+      .setDescription(truncateCommandDescription('Remove model override and use default instead'))
       .setDMPermission(false)
       .toJSON(),
     new SlashCommandBuilder()
       .setName('login')
       .setDescription(
-        'Authenticate with an AI provider (OAuth or API key). Use this instead of /connect',
+        truncateCommandDescription('Authenticate with an AI provider (OAuth or API key). Use this instead of /connect'),
       )
       .setDMPermission(false)
       .toJSON(),
     new SlashCommandBuilder()
       .setName('agent')
-      .setDescription('Set the preferred agent for this channel or session')
+      .setDescription(truncateCommandDescription('Set the preferred agent for this channel or session'))
       .setDMPermission(false)
       .toJSON(),
     new SlashCommandBuilder()
       .setName('queue')
       .setDescription(
-        'Queue a message to be sent after the current response finishes',
+        truncateCommandDescription('Queue a message to be sent after the current response finishes'),
       )
       .addStringOption((option) => {
         option
           .setName('message')
-          .setDescription('The message to queue')
+          .setDescription(truncateCommandDescription('The message to queue'))
           .setRequired(true)
 
         return option
@@ -995,18 +1049,18 @@ async function registerCommands({
       .toJSON(),
     new SlashCommandBuilder()
       .setName('clear-queue')
-      .setDescription('Clear all queued messages in this thread')
+      .setDescription(truncateCommandDescription('Clear all queued messages in this thread'))
       .setDMPermission(false)
       .toJSON(),
     new SlashCommandBuilder()
       .setName('queue-command')
       .setDescription(
-        'Queue a user command to run after the current response finishes',
+        truncateCommandDescription('Queue a user command to run after the current response finishes'),
       )
       .addStringOption((option) => {
         option
           .setName('command')
-          .setDescription('The command to run')
+          .setDescription(truncateCommandDescription('The command to run'))
           .setRequired(true)
           .setAutocomplete(true)
         return option
@@ -1014,7 +1068,7 @@ async function registerCommands({
       .addStringOption((option) => {
         option
           .setName('arguments')
-          .setDescription('Arguments to pass to the command')
+          .setDescription(truncateCommandDescription('Arguments to pass to the command'))
           .setRequired(false)
         return option
       })
@@ -1022,35 +1076,35 @@ async function registerCommands({
       .toJSON(),
     new SlashCommandBuilder()
       .setName('undo')
-      .setDescription('Undo the last assistant message (revert file changes)')
+      .setDescription(truncateCommandDescription('Undo the last assistant message (revert file changes)'))
       .setDMPermission(false)
       .toJSON(),
     new SlashCommandBuilder()
       .setName('redo')
-      .setDescription('Redo previously undone changes')
+      .setDescription(truncateCommandDescription('Redo previously undone changes'))
       .setDMPermission(false)
       .toJSON(),
     new SlashCommandBuilder()
       .setName('verbosity')
-      .setDescription('Set output verbosity for this channel')
+      .setDescription(truncateCommandDescription('Set output verbosity for this channel'))
       .setDMPermission(false)
       .toJSON(),
     new SlashCommandBuilder()
       .setName('restart-opencode-server')
       .setDescription(
-        'Restart the shared opencode server (fixes state/auth/plugins)',
+        truncateCommandDescription('Restart the shared opencode server (fixes state/auth/plugins)'),
       )
       .setDMPermission(false)
       .toJSON(),
     new SlashCommandBuilder()
       .setName('run-shell-command')
       .setDescription(
-        'Run a shell command in the project directory. Tip: prefix messages with ! as shortcut',
+        truncateCommandDescription('Run a shell command in the project directory. Tip: prefix messages with ! as shortcut'),
       )
       .addStringOption((option) => {
         option
           .setName('command')
-          .setDescription('Command to run')
+          .setDescription(truncateCommandDescription('Command to run'))
           .setRequired(true)
         return option
       })
@@ -1059,44 +1113,44 @@ async function registerCommands({
     new SlashCommandBuilder()
       .setName('context-usage')
       .setDescription(
-        'Show token usage and context window percentage for this session',
+        truncateCommandDescription('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',
+        truncateCommandDescription('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',
+        truncateCommandDescription('Upgrade kimaki to the latest version and restart the bot'),
       )
       .setDMPermission(false)
       .toJSON(),
     new SlashCommandBuilder()
       .setName('transcription-key')
       .setDescription(
-        'Set API key for voice message transcription (OpenAI or Gemini)',
+        truncateCommandDescription('Set API key for voice message transcription (OpenAI or Gemini)'),
       )
       .setDMPermission(false)
       .toJSON(),
     new SlashCommandBuilder()
       .setName('mcp')
-      .setDescription('List and manage MCP servers for this project')
+      .setDescription(truncateCommandDescription('List and manage MCP servers for this project'))
       .setDMPermission(false)
       .toJSON(),
     new SlashCommandBuilder()
       .setName('screenshare')
-      .setDescription('Start screen sharing via VNC tunnel (auto-stops after 1 hour)')
+      .setDescription(truncateCommandDescription('Start screen sharing via VNC tunnel (auto-stops after 1 hour)'))
       .setDMPermission(false)
       .toJSON(),
     new SlashCommandBuilder()
       .setName('screenshare-stop')
-      .setDescription('Stop screen sharing')
+      .setDescription(truncateCommandDescription('Stop screen sharing'))
       .setDMPermission(false)
       .toJSON(),
   ]
@@ -1142,11 +1196,11 @@ async function registerCommands({
     commands.push(
       new SlashCommandBuilder()
         .setName(commandName)
-        .setDescription(description.slice(0, 100)) // Discord limits to 100 chars
+        .setDescription(truncateCommandDescription(description))
         .addStringOption((option) => {
           option
             .setName('arguments')
-            .setDescription('Arguments to pass to the command')
+            .setDescription(truncateCommandDescription('Arguments to pass to the command'))
             .setRequired(false)
           return option
         })
@@ -1181,7 +1235,7 @@ async function registerCommands({
     commands.push(
       new SlashCommandBuilder()
         .setName(commandName)
-        .setDescription(description)
+        .setDescription(truncateCommandDescription(description))
         .setDMPermission(false)
         .toJSON(),
     )
@@ -1470,7 +1524,7 @@ async function ensureDefaultChannelsWithWelcome({
       }
     } catch (error) {
       cliLogger.warn(
-        `Failed to create default kimaki channel in ${guild.name}: ${error instanceof Error ? error.message : String(error)}`,
+        `Failed to create default kimaki channel in ${guild.name}: ${error instanceof Error ? error.stack : String(error)}`,
       )
     }
   }
@@ -1516,7 +1570,7 @@ async function backgroundInit({
         .catch((error) => {
           cliLogger.warn(
             'Failed to load user commands during background init:',
-            error instanceof Error ? error.message : String(error),
+            error instanceof Error ? error.stack : String(error),
           )
           return []
         }),
@@ -1526,7 +1580,7 @@ async function backgroundInit({
         .catch((error) => {
           cliLogger.warn(
             'Failed to load agents during background init:',
-            error instanceof Error ? error.message : String(error),
+            error instanceof Error ? error.stack : String(error),
           )
           return []
         }),
@@ -1537,7 +1591,7 @@ async function backgroundInit({
   } catch (error) {
     cliLogger.error(
       'Background init failed:',
-      error instanceof Error ? error.message : String(error),
+      error instanceof Error ? error.stack : String(error),
     )
     void notifyError(error, 'Background init failed')
   }
@@ -1689,6 +1743,7 @@ async function resolveCredentials({
       clientId,
       clientSecret,
       gatewayCallbackUrl,
+      reachableUrl: getInternetReachableBaseUrl() || undefined,
     })
     if (oauthUrlResult instanceof Error) {
       throw oauthUrlResult
@@ -1894,33 +1949,35 @@ async function run({
   const forceRestartOnboarding = Boolean(restartOnboarding)
   const forceGateway = Boolean(gateway)
 
-  // Step 0: Ensure required CLI tools are installed (OpenCode + Bun)
-  await ensureCommandAvailable({
-    name: 'opencode',
-    envPathKey: 'OPENCODE_PATH',
-    installUnix: 'curl -fsSL https://opencode.ai/install | bash',
-    installWindows: 'irm https://opencode.ai/install.ps1 | iex',
-    possiblePathsUnix: [
-      '~/.local/bin/opencode',
-      '~/.opencode/bin/opencode',
-      '/usr/local/bin/opencode',
-      '/opt/opencode/bin/opencode',
-    ],
-    possiblePathsWindows: [
-      '~\\.local\\bin\\opencode.exe',
-      '~\\AppData\\Local\\opencode\\opencode.exe',
-      '~\\.opencode\\bin\\opencode.exe',
-    ],
-  })
-
-  await ensureCommandAvailable({
-    name: 'bun',
-    envPathKey: 'BUN_PATH',
-    installUnix: 'curl -fsSL https://bun.sh/install | bash',
-    installWindows: 'irm bun.sh/install.ps1 | iex',
-    possiblePathsUnix: ['~/.bun/bin/bun', '/usr/local/bin/bun'],
-    possiblePathsWindows: ['~\\.bun\\bin\\bun.exe'],
-  })
+  // Step 0: Ensure required CLI tools are installed (OpenCode + Bun).
+  // Run checks in parallel since they're independent `which` calls.
+  await Promise.all([
+    ensureCommandAvailable({
+      name: 'opencode',
+      envPathKey: 'OPENCODE_PATH',
+      installUnix: 'curl -fsSL https://opencode.ai/install | bash',
+      installWindows: 'irm https://opencode.ai/install.ps1 | iex',
+      possiblePathsUnix: [
+        '~/.local/bin/opencode',
+        '~/.opencode/bin/opencode',
+        '/usr/local/bin/opencode',
+        '/opt/opencode/bin/opencode',
+      ],
+      possiblePathsWindows: [
+        '~\\.local\\bin\\opencode.exe',
+        '~\\AppData\\Local\\opencode\\opencode.exe',
+        '~\\.opencode\\bin\\opencode.exe',
+      ],
+    }),
+    ensureCommandAvailable({
+      name: 'bun',
+      envPathKey: 'BUN_PATH',
+      installUnix: 'curl -fsSL https://bun.sh/install | bash',
+      installWindows: 'irm bun.sh/install.ps1 | iex',
+      possiblePathsUnix: ['~/.bun/bin/bun', '/usr/local/bin/bun'],
+      possiblePathsWindows: ['~\\.bun\\bin\\bun.exe'],
+    }),
+  ])
 
 
   backgroundUpgradeKimaki()
@@ -1931,6 +1988,7 @@ async function run({
   // don't work. CLI subcommands skip the server and use file: directly.
   const hranaResult = await startHranaServer({
     dbPath: path.join(getDataDir(), 'discord-sessions.db'),
+    bindAll: getInternetReachableBaseUrl() !== null,
   })
   if (hranaResult instanceof Error) {
     cliLogger.error('Failed to start hrana server:', hranaResult.message)
@@ -1946,6 +2004,14 @@ async function run({
     gatewayCallbackUrl,
   })
 
+  const gatewayToken = await ensureServiceAuthToken({
+    appId,
+    preferredGatewayToken: isGatewayMode ? token : undefined,
+  })
+  // Always set service auth token so local and internet control-plane paths
+  // share one auth model (/kimaki/wake and future service endpoints).
+  store.setState({ gatewayToken })
+
   // In gateway mode, ensure REST calls route through the gateway proxy.
   // getBotTokenWithMode() sets this for saved-credential paths, but the fresh
   // onboarding path returns directly without going through getBotTokenWithMode(),
@@ -1956,6 +2022,34 @@ async function run({
     store.setState({ discordBaseUrl: KIMAKI_GATEWAY_PROXY_REST_BASE_URL })
   }
 
+  // When KIMAKI_INTERNET_REACHABLE_URL is set, the hrana server exposes
+  // a /kimaki/wake endpoint for the gateway-proxy to wake this instance and
+  // wait until discord.js is connected. Keep Discord traffic on the normal
+  // configured base URL (gateway-proxy in gateway mode).
+  if (getInternetReachableBaseUrl()) {
+    cliLogger.log('Internet-reachable mode: enabling /kimaki/wake endpoint on hrana server')
+  }
+
+  // Start OpenCode server as early as possible — non-blocking.
+  // All dependencies are met (dataDir, lockPort, gatewayToken, hranaUrl set).
+  // Runs in parallel with last_used_at update, skipChannelSetup check, and
+  // Discord Gateway login so cold start is not blocked by OpenCode spawn.
+  const currentDir = process.cwd()
+  cliLogger.log('Starting OpenCode server...')
+  const opencodePromise = initializeOpencodeForDirectory(currentDir).then(
+    (result) => {
+      if (result instanceof Error) {
+        throw new Error(result.message)
+      }
+      cliLogger.log('OpenCode server ready!')
+      return result
+    },
+  )
+  // Prevent unhandled rejection if OpenCode fails before backgroundInit
+  // or the channel setup path awaits it. Errors are handled by the
+  // respective consumers (backgroundInit catches, channel setup re-throws).
+  opencodePromise.catch(() => {})
+
   // Mark this bot as the most recently used so subcommands in separate
   // processes (send, upload-to-discord, project list) pick the correct bot.
   // getBotTokenWithMode() orders by last_used_at DESC as cross-process
@@ -1995,19 +2089,6 @@ async function run({
     return true
   })()
 
-  // Start OpenCode server EARLY - let it initialize in parallel with Discord login.
-  // This is the biggest startup bottleneck (can take 1-30 seconds to spawn and wait for ready)
-  const currentDir = process.cwd()
-  cliLogger.log('Starting OpenCode server...')
-  const opencodePromise = initializeOpencodeForDirectory(currentDir).then(
-    (result) => {
-      if (result instanceof Error) {
-        throw new Error(result.message)
-      }
-      return result
-    },
-  )
-
   cliLogger.log(`Connecting to ${getDiscordRestApiUrl()}...`)
   const discordClient = await createDiscordClient()
 
@@ -2066,7 +2147,7 @@ async function run({
   } catch (error) {
     cliLogger.log('Failed to connect to Discord', discordClient.ws.gateway)
     cliLogger.error(
-      'Error: ' + (error instanceof Error ? error.message : String(error)),
+      'Error: ' + (error instanceof Error ? error.stack : String(error)),
     )
     process.exit(EXIT_NO_RESTART)
   }
@@ -2126,7 +2207,7 @@ async function run({
       } catch (error) {
         cliLogger.warn(
           'Background channel sync failed:',
-          error instanceof Error ? error.message : String(error),
+          error instanceof Error ? error.stack : String(error),
         )
       }
 
@@ -2143,7 +2224,7 @@ async function run({
       } catch (error) {
         cliLogger.warn(
           'Background default channel creation failed:',
-          error instanceof Error ? error.message : String(error),
+          error instanceof Error ? error.stack : String(error),
         )
       }
     })()
@@ -2184,7 +2265,6 @@ async function run({
     // Wait for OpenCode, fetch projects, show prompts, create channels if needed
     cliLogger.log('Waiting for OpenCode server...')
     const getClient = await opencodePromise
-    cliLogger.log('OpenCode server ready!')
 
     cliLogger.log('Fetching OpenCode data...')
 
@@ -2197,7 +2277,7 @@ async function run({
           cliLogger.log('Failed to fetch projects')
           cliLogger.error(
             'Error:',
-            error instanceof Error ? error.message : String(error),
+            error instanceof Error ? error.stack : String(error),
           )
           discordClient.destroy()
           process.exit(EXIT_NO_RESTART)
@@ -2208,7 +2288,7 @@ async function run({
         .catch((error) => {
           cliLogger.warn(
             'Failed to load user commands during setup:',
-            error instanceof Error ? error.message : String(error),
+            error instanceof Error ? error.stack : String(error),
           )
           return []
         }),
@@ -2218,7 +2298,7 @@ async function run({
         .catch((error) => {
           cliLogger.warn(
             'Failed to load agents during setup:',
-            error instanceof Error ? error.message : String(error),
+            error instanceof Error ? error.stack : String(error),
           )
           return []
         }),
@@ -2375,7 +2455,7 @@ async function run({
       .catch((error) => {
         cliLogger.error(
           'Failed to register slash commands:',
-          error instanceof Error ? error.message : String(error),
+          error instanceof Error ? error.stack : String(error),
         )
       })
 
@@ -2594,7 +2674,7 @@ cli
     } catch (error) {
       cliLogger.error(
         'Error:',
-        error instanceof Error ? error.message : String(error),
+        error instanceof Error ? error.stack : String(error),
       )
       process.exit(EXIT_NO_RESTART)
     }
@@ -2649,7 +2729,7 @@ cli
     } catch (error) {
       cliLogger.error(
         'Error:',
-        error instanceof Error ? error.message : String(error),
+        error instanceof Error ? error.stack : String(error),
       )
       process.exit(EXIT_NO_RESTART)
     }
@@ -2799,7 +2879,7 @@ cli
       } catch (error) {
         cliLogger.error(
           'Error:',
-          error instanceof Error ? error.message : String(error),
+          error instanceof Error ? error.stack : String(error),
         )
         process.exit(EXIT_NO_RESTART)
       }
@@ -2853,7 +2933,7 @@ cli
     } catch (error) {
       cliLogger.error(
         'Error:',
-        error instanceof Error ? error.message : String(error),
+        error instanceof Error ? error.stack : String(error),
       )
       process.exit(EXIT_NO_RESTART)
     }
@@ -2924,7 +3004,7 @@ cli
     } catch (error) {
       cliLogger.error(
         'Error:',
-        error instanceof Error ? error.message : String(error),
+        error instanceof Error ? error.stack : String(error),
       )
       process.exit(EXIT_NO_RESTART)
     }
@@ -2961,6 +3041,13 @@ cli
   .option('-u, --user <username>', 'Discord username to add to thread')
   .option('--agent <agent>', 'Agent to use for the session')
   .option('--model <model>', 'Model to use (format: provider/model)')
+  .option(
+    '--permission <rule>',
+    z.array(z.string()).describe(
+      'Session permission rule (repeatable). Format: "tool:action" or "tool:pattern:action". ' +
+      'Actions: allow, deny, ask. Examples: --permission "bash:deny" --permission "edit:deny"',
+    ),
+  )
   .option(
     '--send-at <schedule>',
     'Schedule send for future (UTC ISO date/time ending in Z, or cron expression)',
@@ -2986,6 +3073,7 @@ cli
       user?: string
       agent?: string
       model?: string
+      permission?: string[]
       sendAt?: string
       thread?: string
       session?: string
@@ -3045,10 +3133,12 @@ cli
           if (!sendAt) {
             return null
           }
+          // Cron expressions use UTC so the schedule is consistent regardless of
+          // which machine runs the bot. The system message tells the model to use UTC.
           return parseSendAtValue({
             value: sendAt,
             now: new Date(),
-            timezone: getLocalTimeZone(),
+            timezone: 'UTC',
           })
         })()
         if (parsedSchedule instanceof Error) {
@@ -3190,7 +3280,7 @@ cli
                   } catch (error) {
                     cliLogger.debug(
                       'Failed to fetch existing channel while selecting guild:',
-                      error instanceof Error ? error.message : String(error),
+                      error instanceof Error ? error.stack : String(error),
                     )
                   }
                 }
@@ -3282,6 +3372,7 @@ cli
               model: options.model || null,
               username: null,
               userId: null,
+              permissions: options.permission?.length ? options.permission : null,
             }
             const taskId = await createScheduledTask({
               scheduleKind: parsedSchedule.scheduleKind,
@@ -3308,6 +3399,7 @@ cli
 
           const threadPromptMarker: ThreadStartMarker = {
             cliThreadPrompt: true,
+            ...(options.permission?.length ? { permissions: options.permission } : {}),
           }
           const promptEmbed = [
             {
@@ -3439,6 +3531,7 @@ cli
             model: options.model || null,
             username: resolvedUser?.username || null,
             userId: resolvedUser?.id || null,
+            permissions: options.permission?.length ? options.permission : null,
           }
           const taskId = await createScheduledTask({
             scheduleKind: parsedSchedule.scheduleKind,
@@ -3474,6 +3567,7 @@ cli
               }),
               ...(options.agent && { agent: options.agent }),
               ...(options.model && { model: options.model }),
+              ...(options.permission?.length && { permissions: options.permission }),
             }
         const autoStartEmbed = embedMarker
           ? [{ color: 0x2b2d31, footer: { text: yaml.dump(embedMarker) } }]
@@ -3532,7 +3626,7 @@ cli
       } catch (error) {
         cliLogger.error(
           'Error:',
-          error instanceof Error ? error.message : String(error),
+          error instanceof Error ? error.stack : String(error),
         )
         process.exit(EXIT_NO_RESTART)
       }
@@ -3583,7 +3677,7 @@ cli
     } catch (error) {
       cliLogger.error(
         'Error:',
-        error instanceof Error ? error.message : String(error),
+        error instanceof Error ? error.stack : String(error),
       )
       process.exit(EXIT_NO_RESTART)
     }
@@ -3611,7 +3705,100 @@ cli
     } catch (error) {
       cliLogger.error(
         'Error:',
-        error instanceof Error ? error.message : String(error),
+        error instanceof Error ? error.stack : String(error),
+      )
+      process.exit(EXIT_NO_RESTART)
+    }
+  })
+
+cli
+  .command('task edit <id>', 'Edit prompt or schedule of a planned task')
+  .option('--prompt <prompt>', 'New prompt text')
+  .option('--send-at <sendAt>', 'New schedule (UTC ISO date or cron expression)')
+  .action(async (id: string, options: { prompt?: string; sendAt?: string }) => {
+    try {
+      const trimmedPrompt =
+        options.prompt === undefined ? undefined : options.prompt.trim()
+
+      if (!trimmedPrompt && !options.sendAt) {
+        cliLogger.error('Provide at least --prompt or --send-at')
+        process.exit(EXIT_NO_RESTART)
+      }
+      if (trimmedPrompt !== undefined && trimmedPrompt.length === 0) {
+        cliLogger.error('--prompt cannot be empty')
+        process.exit(EXIT_NO_RESTART)
+      }
+      if (trimmedPrompt !== undefined && trimmedPrompt.length > 1900) {
+        cliLogger.error('--prompt currently supports up to 1900 characters')
+        process.exit(EXIT_NO_RESTART)
+      }
+
+      const taskId = Number.parseInt(id, 10)
+      if (Number.isNaN(taskId) || taskId < 1) {
+        cliLogger.error(`Invalid task ID: ${id}`)
+        process.exit(EXIT_NO_RESTART)
+      }
+
+      await initDatabase()
+      const task = await getScheduledTask(taskId)
+      if (!task) {
+        cliLogger.error(`Task ${taskId} not found`)
+        process.exit(EXIT_NO_RESTART)
+      }
+      if (task.status !== 'planned') {
+        cliLogger.error(
+          `Task ${taskId} is ${task.status}, only planned tasks can be edited`,
+        )
+        process.exit(EXIT_NO_RESTART)
+      }
+
+      const existingPayload = parseScheduledTaskPayload(task.payload_json)
+      if (existingPayload instanceof Error) {
+        cliLogger.error(`Failed to parse task payload: ${existingPayload.message}`)
+        process.exit(EXIT_NO_RESTART)
+      }
+
+      const newPrompt = trimmedPrompt ?? existingPayload.prompt
+      const updatedPayload: ScheduledTaskPayload = {
+        ...existingPayload,
+        prompt: newPrompt,
+      }
+
+      const updateData: Parameters<typeof updateScheduledTask>[0] = {
+        taskId,
+        payloadJson: serializeScheduledTaskPayload(updatedPayload),
+        promptPreview: getPromptPreview(newPrompt),
+      }
+
+      if (options.sendAt) {
+        const parsed = parseSendAtValue({
+          value: options.sendAt,
+          now: new Date(),
+          timezone: 'UTC',
+        })
+        if (parsed instanceof Error) {
+          cliLogger.error(`Invalid --send-at: ${parsed.message}`)
+          process.exit(EXIT_NO_RESTART)
+        }
+        updateData.scheduleKind = parsed.scheduleKind
+        updateData.runAt = parsed.runAt
+        updateData.cronExpr = parsed.cronExpr
+        updateData.timezone = parsed.timezone
+        updateData.nextRunAt = parsed.nextRunAt
+      }
+
+      const updated = await updateScheduledTask(updateData)
+      if (!updated) {
+        cliLogger.error(`Task ${taskId} could not be updated (status may have changed)`)
+        process.exit(EXIT_NO_RESTART)
+      }
+
+      cliLogger.log(`Updated task ${taskId}`)
+      process.exit(0)
+    } catch (error) {
+      cliLogger.error(
+        'Error:',
+        error instanceof Error ? error.stack : String(error),
       )
       process.exit(EXIT_NO_RESTART)
     }
@@ -3703,7 +3890,7 @@ cli
           } catch (error) {
             cliLogger.debug(
               'Failed to fetch existing channel while selecting guild:',
-              error instanceof Error ? error.message : String(error),
+              error instanceof Error ? error.stack : String(error),
             )
             let firstGuild = client.guilds.cache.first()
             if (!firstGuild) {
@@ -3763,14 +3950,14 @@ cli
           } catch (error) {
             cliLogger.debug(
               `Failed to fetch channel ${existingChannel.channel_id} while checking existing channels:`,
-              error instanceof Error ? error.message : String(error),
+              error instanceof Error ? error.stack : String(error),
             )
           }
         }
       } catch (error) {
         cliLogger.debug(
           'Database lookup failed while checking existing channels:',
-          error instanceof Error ? error.message : String(error),
+          error instanceof Error ? error.stack : String(error),
         )
       }
 
@@ -4096,7 +4283,7 @@ cli
     } catch (error) {
       cliLogger.error(
         'Error:',
-        error instanceof Error ? error.message : String(error),
+        error instanceof Error ? error.stack : String(error),
       )
       process.exit(EXIT_NO_RESTART)
     }
@@ -4276,7 +4463,7 @@ cli
     } catch (error) {
       cliLogger.error(
         'Error:',
-        error instanceof Error ? error.message : String(error),
+        error instanceof Error ? error.stack : String(error),
       )
       process.exit(EXIT_NO_RESTART)
     }
@@ -4350,7 +4537,7 @@ cli
     } catch (error) {
       cliLogger.error(
         'Error:',
-        error instanceof Error ? error.message : String(error),
+        error instanceof Error ? error.stack : String(error),
       )
       process.exit(EXIT_NO_RESTART)
     }
@@ -4559,7 +4746,7 @@ cli
     } catch (error) {
       cliLogger.error(
         'Error:',
-        error instanceof Error ? error.message : String(error),
+        error instanceof Error ? error.stack : String(error),
       )
       process.exit(EXIT_NO_RESTART)
     }
@@ -4752,12 +4939,47 @@ cli
     } catch (error) {
       cliLogger.error(
         'Error:',
-        error instanceof Error ? error.message : String(error),
+        error instanceof Error ? error.stack : String(error),
       )
       process.exit(EXIT_NO_RESTART)
     }
   })
 
+cli
+  .command(
+    'session discord-url <sessionId>',
+    'Print the Discord thread URL for a session',
+  )
+  .option('--json', 'Output as JSON')
+  .action(async (sessionId, options) => {
+    await initDatabase()
+    const threadId = await getThreadIdBySessionId(sessionId)
+    if (!threadId) {
+      cliLogger.error(`No Discord thread found for session: ${sessionId}`)
+      process.exit(EXIT_NO_RESTART)
+    }
+    const { token: botToken } = await resolveBotCredentials()
+    const rest = createDiscordRest(botToken)
+    const threadData = (await rest.get(Routes.channel(threadId))) as {
+      id: string
+      guild_id: string
+      name?: string
+    }
+    const url = `https://discord.com/channels/${threadData.guild_id}/${threadData.id}`
+    if (options.json) {
+      console.log(JSON.stringify({
+        url,
+        threadId: threadData.id,
+        guildId: threadData.guild_id,
+        sessionId,
+        threadName: threadData.name,
+      }))
+    } else {
+      console.log(url)
+    }
+    process.exit(0)
+  })
+
 cli
   .command(
     'upgrade',
@@ -4795,7 +5017,7 @@ cli
     } catch (error) {
       cliLogger.error(
         'Upgrade failed:',
-        error instanceof Error ? error.message : String(error),
+        error instanceof Error ? error.stack : String(error),
       )
       process.exit(EXIT_NO_RESTART)
     }
@@ -4897,7 +5119,7 @@ cli
       } catch (error) {
         cliLogger.error(
           'Merge failed:',
-          error instanceof Error ? error.message : String(error),
+          error instanceof Error ? error.stack : String(error),
         )
         process.exit(EXIT_NO_RESTART)
       }