@otto-assistant/bridge 0.4.97 → 0.4.100

package/src/commands/vscode.ts

@@ -0,0 +1,342 @@
+import crypto from 'node:crypto'
+import { spawn, type ChildProcess } from 'node:child_process'
+import net from 'node:net'
+import {
+  ChannelType,
+  MessageFlags,
+  type TextChannel,
+  type ThreadChannel,
+} from 'discord.js'
+import { TunnelClient } from 'traforo/client'
+import type { CommandContext } from './types.js'
+import {
+  resolveWorkingDirectory,
+  SILENT_MESSAGE_FLAGS,
+} from '../discord-utils.js'
+import { createLogger } from '../logger.js'
+
+const logger = createLogger('VSCODE')
+const SECURE_REPLY_FLAGS = MessageFlags.Ephemeral | SILENT_MESSAGE_FLAGS
+const MAX_SESSION_MINUTES = 30
+const MAX_SESSION_MS = MAX_SESSION_MINUTES * 60 * 1000
+const TUNNEL_BASE_DOMAIN = 'kimaki.dev'
+const TUNNEL_ID_BYTES = 16
+const READY_TIMEOUT_MS = 60_000
+const LOCAL_HOST = '127.0.0.1'
+
+export type VscodeSession = {
+  coderaftProcess: ChildProcess
+  tunnelClient: TunnelClient
+  url: string
+  workingDirectory: string
+  startedBy: string
+  startedAt: number
+  timeoutTimer: ReturnType<typeof setTimeout>
+}
+
+const activeSessions = new Map<string, VscodeSession>()
+
+export function createVscodeTunnelId(): string {
+  return crypto.randomBytes(TUNNEL_ID_BYTES).toString('hex')
+}
+
+export function buildCoderaftArgs({
+  port,
+  workingDirectory,
+}: {
+  port: number
+  workingDirectory: string
+}): string[] {
+  return [
+    'coderaft',
+    '--port',
+    String(port),
+    '--host',
+    LOCAL_HOST,
+    '--without-connection-token',
+    '--disable-workspace-trust',
+    '--default-folder',
+    workingDirectory,
+  ]
+}
+
+function createPortWaiter({
+  port,
+  process: proc,
+  timeoutMs,
+}: {
+  port: number
+  process: ChildProcess
+  timeoutMs: number
+}): Promise<void> {
+  return new Promise((resolve, reject) => {
+    const maxAttempts = Math.ceil(timeoutMs / 100)
+    let attempts = 0
+
+    const check = (): void => {
+      if (proc.exitCode !== null) {
+        reject(new Error(`coderaft exited with code ${proc.exitCode} before becoming ready`))
+        return
+      }
+
+      const socket = net.createConnection(port, LOCAL_HOST)
+      socket.on('connect', () => {
+        socket.destroy()
+        resolve()
+      })
+      socket.on('error', () => {
+        socket.destroy()
+        attempts += 1
+        if (attempts >= maxAttempts) {
+          reject(new Error(`Port ${port} not reachable after ${timeoutMs}ms`))
+          return
+        }
+        setTimeout(check, 100)
+      })
+    }
+
+    check()
+  })
+}
+
+function getAvailablePort(): Promise<number> {
+  return new Promise((resolve, reject) => {
+    const server = net.createServer()
+    server.on('error', reject)
+    server.listen(0, LOCAL_HOST, () => {
+      const address = server.address()
+      if (!address || typeof address === 'string') {
+        server.close(() => {
+          reject(new Error('Failed to resolve an available port'))
+        })
+        return
+      }
+      const port = address.port
+      server.close((error) => {
+        if (error) {
+          reject(error)
+          return
+        }
+        resolve(port)
+      })
+    })
+  })
+}
+
+function cleanupSession(session: VscodeSession): void {
+  clearTimeout(session.timeoutTimer)
+  try {
+    session.tunnelClient.close()
+  } catch {}
+  if (session.coderaftProcess.exitCode === null) {
+    try {
+      session.coderaftProcess.kill('SIGTERM')
+    } catch {}
+  }
+}
+
+export function getActiveVscodeSession({ sessionKey }: { sessionKey: string }): VscodeSession | undefined {
+  return activeSessions.get(sessionKey)
+}
+
+export function stopVscode({ sessionKey }: { sessionKey: string }): boolean {
+  const session = activeSessions.get(sessionKey)
+  if (!session) {
+    return false
+  }
+
+  activeSessions.delete(sessionKey)
+  cleanupSession(session)
+  logger.log(`VS Code stopped (key: ${sessionKey})`)
+  return true
+}
+
+export async function startVscode({
+  sessionKey,
+  startedBy,
+  workingDirectory,
+}: {
+  sessionKey: string
+  startedBy: string
+  workingDirectory: string
+}): Promise<VscodeSession> {
+  const existing = activeSessions.get(sessionKey)
+  if (existing) {
+    return existing
+  }
+
+  const port = await getAvailablePort()
+  const tunnelId = createVscodeTunnelId()
+  const args = buildCoderaftArgs({
+    port,
+    workingDirectory,
+  })
+  const coderaftProcess = spawn('bunx', args, {
+    cwd: workingDirectory,
+    stdio: ['ignore', 'pipe', 'pipe'],
+    env: {
+      ...process.env,
+      PORT: String(port),
+    },
+  })
+
+  coderaftProcess.stdout?.on('data', (data: Buffer) => {
+    logger.log(data.toString().trim())
+  })
+  coderaftProcess.stderr?.on('data', (data: Buffer) => {
+    logger.error(data.toString().trim())
+  })
+
+  try {
+    await createPortWaiter({
+      port,
+      process: coderaftProcess,
+      timeoutMs: READY_TIMEOUT_MS,
+    })
+  } catch (error) {
+    if (coderaftProcess.exitCode === null) {
+      coderaftProcess.kill('SIGTERM')
+    }
+    throw error
+  }
+
+  const tunnelClient = new TunnelClient({
+    localPort: port,
+    localHost: LOCAL_HOST,
+    tunnelId,
+    baseDomain: TUNNEL_BASE_DOMAIN,
+  })
+
+  try {
+    await Promise.race([
+      tunnelClient.connect(),
+      new Promise<never>((_, reject) => {
+        setTimeout(() => {
+          reject(new Error('Tunnel connection timed out after 15s'))
+        }, 15_000)
+      }),
+    ])
+  } catch (error) {
+    tunnelClient.close()
+    if (coderaftProcess.exitCode === null) {
+      coderaftProcess.kill('SIGTERM')
+    }
+    throw error
+  }
+
+  const url = tunnelClient.url
+
+  const timeoutTimer = setTimeout(() => {
+    logger.log(`VS Code auto-stopped after ${MAX_SESSION_MINUTES} minutes (key: ${sessionKey})`)
+    stopVscode({ sessionKey })
+  }, MAX_SESSION_MS)
+  timeoutTimer.unref()
+
+  const session: VscodeSession = {
+    coderaftProcess,
+    tunnelClient,
+    url,
+    workingDirectory,
+    startedBy,
+    startedAt: Date.now(),
+    timeoutTimer,
+  }
+
+  coderaftProcess.once('exit', (code, signal) => {
+    const current = activeSessions.get(sessionKey)
+    if (current !== session) {
+      return
+    }
+    logger.log(`VS Code process exited (key: ${sessionKey}, code: ${code}, signal: ${signal ?? 'none'})`)
+    stopVscode({ sessionKey })
+  })
+
+  activeSessions.set(sessionKey, session)
+  logger.log(`VS Code started by ${startedBy}: ${url}`)
+  return session
+}
+
+export async function handleVscodeCommand({
+  command,
+}: CommandContext): Promise<void> {
+  const channel = command.channel
+  if (!channel) {
+    await command.reply({
+      content: 'This command can only be used in a channel.',
+      flags: SECURE_REPLY_FLAGS,
+    })
+    return
+  }
+
+  const isThread = [
+    ChannelType.PublicThread,
+    ChannelType.PrivateThread,
+    ChannelType.AnnouncementThread,
+  ].includes(channel.type)
+  const isTextChannel = channel.type === ChannelType.GuildText
+  if (!isThread && !isTextChannel) {
+    await command.reply({
+      content: 'This command can only be used in a text channel or thread.',
+      flags: SECURE_REPLY_FLAGS,
+    })
+    return
+  }
+
+  const resolved = await resolveWorkingDirectory({
+    channel: channel as TextChannel | ThreadChannel,
+  })
+  if (!resolved) {
+    await command.reply({
+      content: 'Could not determine project directory for this channel.',
+      flags: SECURE_REPLY_FLAGS,
+    })
+    return
+  }
+
+  await command.deferReply({ flags: SECURE_REPLY_FLAGS })
+
+  const sessionKey = channel.id
+  const existing = getActiveVscodeSession({ sessionKey })
+  if (existing) {
+    await command.editReply({
+      content:
+        `VS Code is already running for this thread. ` +
+        `This unique tunnel auto-stops after ${MAX_SESSION_MINUTES} minutes from startup.\n` +
+        `${existing.url}`,
+    })
+    return
+  }
+
+  try {
+    const session = await startVscode({
+      sessionKey,
+      startedBy: command.user.tag,
+      workingDirectory: resolved.workingDirectory,
+    })
+    await command.editReply({
+      content:
+        `VS Code started for \`${session.workingDirectory}\`. ` +
+        `This unique tunnel auto-stops after ${MAX_SESSION_MINUTES} minutes, so open it before it expires.\n` +
+        `${session.url}`,
+    })
+  } catch (error) {
+    logger.error('Failed to start VS Code:', error)
+    await command.editReply({
+      content: `Failed to start VS Code: ${error instanceof Error ? error.message : String(error)}`,
+    })
+  }
+}
+
+export function cleanupAllVscodeSessions(): void {
+  for (const sessionKey of activeSessions.keys()) {
+    stopVscode({ sessionKey })
+  }
+}
+
+function onProcessExit(): void {
+  cleanupAllVscodeSessions()
+}
+
+process.on('SIGINT', onProcessExit)
+process.on('SIGTERM', onProcessExit)
+process.on('exit', onProcessExit)

package/src/db.ts

@@ -235,6 +235,7 @@ async function migrateSchema(prisma: PrismaClient): Promise<void> {
   // Also fix NULL worktree status rows that predate the required enum.
   const defensiveMigrations = [
     "UPDATE bot_tokens SET bot_mode = 'self_hosted' WHERE bot_mode = 'self-hosted'",
+    "UPDATE bot_tokens SET proxy_url = REPLACE(proxy_url, 'discord-gateway.kimaki.xyz', 'discord-gateway.kimaki.dev') WHERE bot_mode = 'gateway' AND proxy_url LIKE '%discord-gateway.kimaki.xyz%'",
     "UPDATE thread_worktrees SET status = 'pending' WHERE status IS NULL",
   ]
   for (const stmt of defensiveMigrations) {

package/src/discord-command-registration.ts

@@ -488,6 +488,13 @@ export async function registerCommands({
       .setDescription(truncateCommandDescription('Stop screen sharing'))
       .setDMPermission(false)
       .toJSON(),
+    new SlashCommandBuilder()
+      .setName('vscode')
+      .setDescription(
+        truncateCommandDescription('Open VS Code in the browser for this project or worktree (auto-stops after 30 minutes)'),
+      )
+      .setDMPermission(false)
+      .toJSON(),
   ]
 
   // Dynamic commands are registered in priority order: agents → user commands → skills → MCP prompts.

package/src/gateway-proxy-reconnect.e2e.test.ts

@@ -6,7 +6,7 @@
 //   Starts a digital-twin + local gateway-proxy binary, kills and restarts the proxy.
 //
 // Production mode (env vars):
-//   GATEWAY_TEST_URL        - production gateway WS+REST URL (e.g. wss://discord-gateway.kimaki.xyz)
+//   GATEWAY_TEST_URL        - production gateway WS+REST URL (e.g. wss://discord-gateway.kimaki.dev)
 //   GATEWAY_TEST_TOKEN      - client token (clientId:secret)
 //   GATEWAY_TEST_REDEPLOY   - if "1", runs `fly deploy` between kill/restart instead of local binary
 //
@@ -15,7 +15,7 @@
 //   pnpm test --run src/gateway-proxy-reconnect.e2e.test.ts
 //
 //   # Against production (just connect + kill WS + wait for reconnect):
-//   GATEWAY_TEST_URL=wss://discord-gateway.kimaki.xyz \
+//   GATEWAY_TEST_URL=wss://discord-gateway.kimaki.dev \
 //   GATEWAY_TEST_TOKEN=myclientid:mysecret \
 //   KIMAKI_TEST_LOGS=1 \
 //   pnpm test --run src/gateway-proxy-reconnect.e2e.test.ts -t "production"

package/src/interaction-handler.ts

@@ -101,6 +101,7 @@ import {
   handleScreenshareCommand,
   handleScreenshareStopCommand,
 } from './commands/screenshare.js'
+import { handleVscodeCommand } from './commands/vscode.js'
 import { handleModelVariantSelectMenu } from './commands/model.js'
 import {
   handleModelVariantCommand,
@@ -356,6 +357,10 @@ export function registerInteractionHandler({
                 appId,
               })
               return
+
+            case 'vscode':
+              await handleVscodeCommand({ command: interaction, appId })
+              return
           }
 
           // Handle quick agent commands (ending with -agent suffix, but not the base /agent command)

package/src/system-message.test.ts

@@ -23,7 +23,7 @@ describe('system-message', () => {
       }).replace(/`[^`]*\/kimaki\.log`/, '`<data-dir>/kimaki.log`'),
     ).toMatchInlineSnapshot(`
       "
-      The user is reading your messages from inside Discord, via kimaki.xyz
+      The user is reading your messages from inside Discord, via kimaki.dev
 
       ## bash tool
 
@@ -92,39 +92,40 @@ describe('system-message', () => {
 
       To start a new thread/session in this channel pro-grammatically, run:
 
-      kimaki send --channel chan_123 --prompt "your prompt here" --user "Tommy"
+      kimaki send --channel chan_123 --prompt "your prompt here" --agent <current_agent> --user "Tommy"
 
       You can use this to "spawn" parallel helper sessions like teammates: start new threads with focused prompts, then come back and collect the results.
+      Prefer passing the current agent with \`--agent <current_agent>\` so spawned or scheduled sessions keep the same agent unless you are intentionally switching. Replace \`<current_agent>\` with the value from the per-turn \`Current agent\` reminder.
 
       IMPORTANT: NEVER use \`--worktree\` unless the user explicitly asks for a worktree. Default to creating normal threads without worktrees.
 
       To send a prompt to an existing thread instead of creating a new one:
 
-      kimaki send --thread <thread_id> --prompt "follow-up prompt"
+      kimaki send --thread <thread_id> --prompt "follow-up prompt" --agent <current_agent>
 
       Use this when you already have the Discord thread ID.
 
       To send to the thread associated with a known session:
 
-      kimaki send --session <session_id> --prompt "follow-up prompt"
+      kimaki send --session <session_id> --prompt "follow-up prompt" --agent <current_agent>
 
       Use this when you have the OpenCode session ID.
 
       Use --notify-only to create a notification thread without starting an AI session:
 
-      kimaki send --channel chan_123 --prompt "User cancelled subscription" --notify-only --user "Tommy"
+      kimaki send --channel chan_123 --prompt "User cancelled subscription" --notify-only --agent <current_agent> --user "Tommy"
 
       Use --user to add a specific Discord user to the new thread:
 
-      kimaki send --channel chan_123 --prompt "Review the latest CI failure" --user "Tommy"
+      kimaki send --channel chan_123 --prompt "Review the latest CI failure" --agent <current_agent> --user "Tommy"
 
       Use --worktree to create a git worktree for the session (ONLY when the user explicitly asks for a worktree):
 
-      kimaki send --channel chan_123 --prompt "Add dark mode support" --worktree dark-mode --user "Tommy"
+      kimaki send --channel chan_123 --prompt "Add dark mode support" --worktree dark-mode --agent <current_agent> --user "Tommy"
 
       Use --cwd to start a session in an existing git worktree directory (must be a worktree of the project):
 
-      kimaki send --channel chan_123 --prompt "Continue work on feature" --cwd /path/to/existing-worktree --user "Tommy"
+      kimaki send --channel chan_123 --prompt "Continue work on feature" --cwd /path/to/existing-worktree --agent <current_agent> --user "Tommy"
 
       Important:
       - NEVER use \`--worktree\` unless the user explicitly requests a worktree. Most tasks should use normal threads without worktrees.
@@ -146,8 +147,8 @@ describe('system-message', () => {
 
       You can trigger registered opencode commands (slash commands, skills, MCP prompts) by starting the \`--prompt\` with \`/commandname\`:
 
-      kimaki send --thread <thread_id> --prompt "/review fix the auth module"
-      kimaki send --channel chan_123 --prompt "/build-cmd update dependencies" --user "Tommy"
+      kimaki send --thread <thread_id> --prompt "/review fix the auth module" --agent <current_agent>
+      kimaki send --channel chan_123 --prompt "/build-cmd update dependencies" --agent <current_agent> --user "Tommy"
 
       The command name must match a registered opencode command. If the command is not recognized, the prompt is sent as plain text to the model. This works for both new threads (\`--channel\`) and existing threads (\`--thread\`/\`--session\`).
 
@@ -157,14 +158,14 @@ describe('system-message', () => {
 
       You can also switch agents via \`kimaki send\`:
 
-      kimaki send --thread <thread_id> --prompt "/<agentname>-agent"
+      kimaki send --thread <thread_id> --prompt "/<agentname>-agent" --agent <current_agent>
 
       ## scheduled sends and task management
 
       Use \`--send-at\` to schedule a one-time or recurring task:
 
-      kimaki send --channel chan_123 --prompt "Reminder: review open PRs" --send-at "2026-03-01T09:00:00Z" --user "Tommy"
-      kimaki send --channel chan_123 --prompt "Run weekly test suite and summarize failures" --send-at "0 9 * * 1" --user "Tommy"
+      kimaki send --channel chan_123 --prompt "Reminder: review open PRs" --send-at "2026-03-01T09:00:00Z" --agent <current_agent> --user "Tommy"
+      kimaki send --channel chan_123 --prompt "Run weekly test suite and summarize failures" --send-at "0 9 * * 1" --agent <current_agent> --user "Tommy"
 
       ALL scheduling is in UTC. Dates must be UTC ISO format ending with \`Z\`. Cron expressions also fire in UTC (e.g. \`0 9 * * 1\` means 9:00 UTC every Monday).
       When the user specifies a time without a timezone, ask them to confirm their timezone or the UTC equivalent. Never guess the user's timezone.
@@ -198,13 +199,13 @@ describe('system-message', () => {
 
       Use case patterns:
       - Reminder flows: create deadline reminders in this channel with one-time \`--send-at\`; mention only if action is required.
-      - Proactive reminders: when you encounter time-sensitive information during your work (e.g. creating an API key that expires in 90 days, a certificate with an expiration date, a trial period ending, a deadline mentioned in code comments), proactively schedule a \`--notify-only\` reminder before the expiration so the user gets notified in time. For example, if you generate an API key expiring on 2026-06-01, schedule a reminder a few days before: \`kimaki send --channel chan_123 --prompt "Reminder: <@USER_ID> the API key created on 2026-03-01 expires on 2026-06-01. Renew it before it breaks production." --send-at "2026-05-28T09:00:00Z" --notify-only\`. Always tell the user you scheduled the reminder so they know.
+      - Proactive reminders: when you encounter time-sensitive information during your work (e.g. creating an API key that expires in 90 days, a certificate with an expiration date, a trial period ending, a deadline mentioned in code comments), proactively schedule a \`--notify-only\` reminder before the expiration so the user gets notified in time. For example, if you generate an API key expiring on 2026-06-01, schedule a reminder a few days before: \`kimaki send --channel chan_123 --prompt "Reminder: <@USER_ID> the API key created on 2026-03-01 expires on 2026-06-01. Renew it before it breaks production." --send-at "2026-05-28T09:00:00Z" --notify-only --agent <current_agent>\`. Always tell the user you scheduled the reminder so they know.
       - Weekly QA: schedule "run full test suite, inspect failures, post summary, and mention @username only when failures require review".
       - Weekly benchmark automation: schedule a benchmark prompt that runs model evals, writes JSON outputs in the repo, commits results, and mentions only for regressions.
       - Recurring maintenance: use cron \`--send-at\` for repetitive tasks like rotating secrets, checking dependency updates, running security audits, or cleaning up stale branches. Example: \`--send-at "0 9 1 * *"\` to run on the 1st of every month.
       - Thread reminders: when the user says "remind me about this in 2 hours" (or any duration), use \`--send-at\` with \`--thread\` to resurface the current thread. Compute the future UTC time and send a mention so Discord shows a notification:
 
-      kimaki send --session ses_123 --prompt "Reminder: <@USER_ID> you asked to be reminded about this thread." --send-at "<future_UTC_time>" --notify-only
+      kimaki send --session ses_123 --prompt "Reminder: <@USER_ID> you asked to be reminded about this thread." --send-at "<future_UTC_time>" --notify-only --agent <current_agent>
 
       Replace \`<future_UTC_time>\` with the computed UTC ISO timestamp. The \`--notify-only\` flag creates just a notification message without starting a new AI session. The \`<@userId>\` mention ensures the user gets a Discord notification.
 
@@ -219,7 +220,7 @@ describe('system-message', () => {
       When the user asks to "create a worktree" or "make a worktree", they mean you should use the kimaki CLI to create it. Do NOT use raw \`git worktree add\` commands. Instead use:
 
       \`\`\`bash
-      kimaki send --channel chan_123 --prompt "your task description" --worktree worktree-name --user "Tommy"
+      kimaki send --channel chan_123 --prompt "your task description" --worktree worktree-name --agent <current_agent> --user "Tommy"
       \`\`\`
 
       This creates a new Discord thread with an isolated git worktree and starts a session in it. The worktree name should be kebab-case and descriptive of the task.
@@ -235,7 +236,7 @@ describe('system-message', () => {
       Use \`--cwd\` to start a session in an existing git worktree directory instead of creating a new one:
 
       \`\`\`bash
-      kimaki send --channel chan_123 --prompt "Continue work on feature X" --cwd /path/to/existing-worktree --user "Tommy"
+      kimaki send --channel chan_123 --prompt "Continue work on feature X" --cwd /path/to/existing-worktree --agent <current_agent> --user "Tommy"
       \`\`\`
 
       The path must be a git worktree of the project (validated via \`git worktree list\`). The session resolves to the correct project channel but uses the worktree as its working directory. Use \`--worktree\` to create a new worktree, \`--cwd\` to reuse an existing one.
@@ -249,7 +250,7 @@ describe('system-message', () => {
       When you are approaching the **context window limit** or the user explicitly asks to **handoff to a new thread**, use the \`kimaki send\` command to start a fresh session with context:
 
       \`\`\`bash
-      kimaki send --channel chan_123 --prompt "Continuing from previous session: <summary of current task and state>" --user "Tommy"
+      kimaki send --channel chan_123 --prompt "Continuing from previous session: <summary of current task and state>" --agent <current_agent> --user "Tommy"
       \`\`\`
 
       The command automatically handles long prompts (over 2000 chars) by sending them as file attachments.
@@ -307,10 +308,10 @@ describe('system-message', () => {
 
       \`\`\`bash
       # Send to a specific channel
-      kimaki send --channel <channel_id> --prompt "Plan how to update the API client to v2"
+      kimaki send --channel <channel_id> --prompt "Plan how to update the API client to v2" --agent <current_agent>
 
       # Or use --project to resolve from directory
-      kimaki send --project /path/to/other-repo --prompt "Plan how to bump version to 1.2.0"
+      kimaki send --project /path/to/other-repo --prompt "Plan how to bump version to 1.2.0" --agent <current_agent>
       \`\`\`
 
       When sending prompts to other projects, always ask the agent to plan first, never build upfront. The prompt should start with "Plan how to ..." so the user can review before greenlighting implementation.
@@ -333,10 +334,10 @@ describe('system-message', () => {
 
       \`\`\`bash
       # Start a session and wait for it to finish
-      kimaki send --channel <channel_id> --prompt "Fix the auth bug" --wait
+      kimaki send --channel <channel_id> --prompt "Fix the auth bug" --wait --agent <current_agent>
 
       # Send to an existing thread and wait
-      kimaki send --thread <thread_id> --prompt "Run the tests" --wait
+      kimaki send --thread <thread_id> --prompt "Run the tests" --wait --agent <current_agent>
       \`\`\`
 
       The command exits with the session markdown on stdout once the model finishes responding.