@otto-assistant/otto 0.1.2 → 0.7.15

package/src/cli-parsing.test.ts

@@ -0,0 +1,197 @@
+// Regression tests for CLI argument parsing around Discord ID string preservation.
+import { describe, expect, test } from 'vitest'
+import { execAsync } from './exec-async.js'
+
+async function parseWithGoke(argv: string[]) {
+  const script = [
+    "import { goke } from 'goke'",
+    'const cli = goke(\'otto\')',
+    "cli.command('send', 'Send a message').option('-c, --channel <channelId>', 'Discord channel ID').option('--thread <threadId>', 'Thread ID').option('--session <sessionId>', 'Session ID').option('--send-at <schedule>', 'Schedule').option('--gateway-platform <platform>', 'Gateway platform').option('--telegram-bot-token <token>', 'Telegram bot token').option('--telegram-chat-id <id>', 'Telegram chat ID')",
+    "cli.command('session archive <threadId>', 'Archive a thread')",
+    "cli.command('session search <query>', 'Search sessions').option('--channel <channelId>', 'Discord channel ID').option('--project <path>', 'Project path')",
+    "cli.command('session export-events-jsonl', 'Export in-memory events to JSONL').option('--session <sessionId>', 'Session ID').option('--out <file>', 'Output path')",
+    "cli.command('add-project', 'Add a project').option('-g, --guild <guildId>', 'Discord guild/server ID')",
+    "cli.command('task delete <id>', 'Delete task')",
+    "cli.command('anthropic-accounts list', 'List stored Anthropic accounts')",
+    "cli.command('anthropic-accounts remove <indexOrEmail>', 'Remove stored Anthropic account')",
+    `const result = cli.parse(${JSON.stringify(argv)}, { run: false })`,
+    'process.stdout.write(JSON.stringify({ args: result.args, options: result.options }))',
+  ].join(';')
+
+  const { stdout } = await execAsync(`node --input-type=module -e ${JSON.stringify(script)}`, {
+    cwd: import.meta.dirname,
+    timeout: 10_000,
+  })
+  return JSON.parse(stdout) as {
+    args: string[]
+    options: Record<string, string>
+  }
+}
+
+async function getHelpOutput() {
+  const script = [
+    "import { goke } from 'goke'",
+    'const stdout = { text: \'\', write(data) { this.text += String(data) } }',
+    "const cli = goke('otto', { stdout })",
+    "cli.command('send', 'Send a message')",
+    "cli.command('anthropic-accounts list', 'List stored Anthropic accounts')",
+    'cli.help()',
+    "cli.parse(['node', 'otto', '--help'], { run: false })",
+    'process.stdout.write(stdout.text)',
+  ].join(';')
+
+  const { stdout } = await execAsync(`node --input-type=module -e ${JSON.stringify(script)}`, {
+    cwd: import.meta.dirname,
+    timeout: 10_000,
+  })
+  return stdout
+}
+
+describe('goke CLI ID parsing', () => {
+  test('keeps large Discord IDs as strings', async () => {
+    const channelId = '1234567890123456789'
+    const threadId = '9876543210987654321'
+    const sessionId = '1111222233334444555'
+
+    const channelResult = await parseWithGoke(
+      ['node', 'otto', 'send', '--channel', channelId],
+    )
+    expect(channelResult.options.channel).toBe(channelId)
+    expect(typeof channelResult.options.channel).toBe('string')
+
+    const threadResult = await parseWithGoke(
+      ['node', 'otto', 'send', '--thread', threadId],
+    )
+    expect(threadResult.options.thread).toBe(threadId)
+    expect(typeof threadResult.options.thread).toBe('string')
+
+    const sessionResult = await parseWithGoke(
+      ['node', 'otto', 'send', '--session', sessionId],
+    )
+    expect(sessionResult.options.session).toBe(sessionId)
+    expect(typeof sessionResult.options.session).toBe('string')
+  })
+
+  test('preserves leading zeros in Discord IDs', async () => {
+    const guildId = '001230045600789'
+
+    const result = await parseWithGoke(
+      ['node', 'otto', 'add-project', '--guild', guildId],
+    )
+
+    expect(result.options.guild).toBe(guildId)
+    expect(typeof result.options.guild).toBe('string')
+  })
+
+  test('keeps session archive thread ID as string', async () => {
+    const threadId = '0098765432109876543'
+
+    const result = await parseWithGoke(
+      ['node', 'otto', 'session', 'archive', threadId],
+    )
+
+    expect(result.args[0]).toBe(threadId)
+    expect(typeof result.args[0]).toBe('string')
+  })
+
+  test('keeps session search regex and channel ID as strings', async () => {
+    const channelId = '0012345678901234567'
+    const query = '/error\\s+42/i'
+
+    const result = await parseWithGoke(
+      ['node', 'otto', 'session', 'search', query, '--channel', channelId],
+    )
+
+    expect(result.args[0]).toBe(query)
+    expect(typeof result.args[0]).toBe('string')
+    expect(result.options.channel).toBe(channelId)
+    expect(typeof result.options.channel).toBe('string')
+  })
+
+  test('keeps session export options as strings', async () => {
+    const sessionId = '001111222233334444'
+    const outPath = './tmp/session-events.jsonl'
+
+    const result = await parseWithGoke(
+      [
+        'node',
+        'otto',
+        'session',
+        'export-events-jsonl',
+        '--session',
+        sessionId,
+        '--out',
+        outPath,
+      ],
+    )
+
+    expect(result.options.session).toBe(sessionId)
+    expect(typeof result.options.session).toBe('string')
+    expect(result.options.out).toBe(outPath)
+    expect(typeof result.options.out).toBe('string')
+  })
+
+  test('keeps --send-at cron string intact', async () => {
+    const cron = '0 9 * * 1'
+
+    const result = await parseWithGoke(['node', 'otto', 'send', '--send-at', cron])
+
+    expect(result.options.sendAt).toBe(cron)
+    expect(typeof result.options.sendAt).toBe('string')
+  })
+
+  test('keeps gateway onboarding options as strings', async () => {
+    const platform = 'telegram'
+    const botToken = '123456:ABCDEF'
+    const chatId = '-1001234567890'
+
+    const result = await parseWithGoke([
+      'node',
+      'otto',
+      'send',
+      '--gateway-platform',
+      platform,
+      '--telegram-bot-token',
+      botToken,
+      `--telegram-chat-id=${chatId}`,
+    ])
+
+    expect(result.options.gatewayPlatform).toBe(platform)
+    expect(typeof result.options.gatewayPlatform).toBe('string')
+    expect(result.options.telegramBotToken).toBe(botToken)
+    expect(typeof result.options.telegramBotToken).toBe('string')
+    expect(result.options.telegramChatId).toBe(chatId)
+    expect(typeof result.options.telegramChatId).toBe('string')
+  })
+
+  test('keeps task delete ID as string before validation', async () => {
+    const taskId = '0012345'
+
+    const result = await parseWithGoke(['node', 'otto', 'task', 'delete', taskId])
+
+    expect(result.args[0]).toBe(taskId)
+    expect(typeof result.args[0]).toBe('string')
+  })
+
+  test('anthropic account remove parses index and email as strings', async () => {
+    const indexResult = await parseWithGoke(
+      ['node', 'otto', 'anthropic-accounts', 'remove', '2'],
+    )
+
+    const emailResult = await parseWithGoke(
+      ['node', 'otto', 'anthropic-accounts', 'remove', 'user@example.com'],
+    )
+
+    expect(indexResult.args[0]).toBe('2')
+    expect(typeof indexResult.args[0]).toBe('string')
+    expect(emailResult.args[0]).toBe('user@example.com')
+    expect(typeof emailResult.args[0]).toBe('string')
+  })
+
+  test('anthropic account commands are included in help output', async () => {
+    const stdout = await getHelpOutput()
+
+    expect(stdout).toContain('send')
+    expect(stdout).toContain('anthropic-accounts')
+  })
+})

package/src/cli-send-thread.e2e.test.ts

@@ -0,0 +1,463 @@
+// E2e test for `otto send --channel` flow.
+// Reproduces the race condition where the bot's MessageCreate GuildText handler
+// tries to call startThread() on the same message that the CLI already created
+// a thread for via REST, causing DiscordAPIError[160004].
+//
+// The test simulates the exact flow: bot posts a starter message with a
+// `start: true` embed marker, then creates a thread on that message via REST.
+// The ThreadCreate handler should pick it up and start a session. The
+// MessageCreate handler must NOT try to startThread() on the same message.
+//
+// Uses opencode-deterministic-provider (no real LLM calls).
+// Poll timeouts: 4s max, 100ms interval.
+
+import fs from 'node:fs'
+import path from 'node:path'
+import url from 'node:url'
+import { describe, beforeAll, afterAll, test, expect } from 'vitest'
+import {
+  ChannelType,
+  Client,
+  GatewayIntentBits,
+  Partials,
+  Routes,
+} from 'discord.js'
+import { DigitalDiscord } from 'discord-digital-twin/src'
+import {
+  buildDeterministicOpencodeConfig,
+  type DeterministicMatcher,
+} from 'opencode-deterministic-provider'
+import { setDataDir } from './config.js'
+import { store } from './store.js'
+import { startDiscordBot } from './discord-bot.js'
+import {
+  setBotToken,
+  initDatabase,
+  closeDatabase,
+  setChannelDirectory,
+  setChannelVerbosity,
+  type VerbosityLevel,
+} from './database.js'
+import { startHranaServer, stopHranaServer } from './hrana-server.js'
+import {
+  initializeOpencodeForDirectory,
+  stopOpencodeServer,
+} from './opencode.js'
+import {
+  chooseLockPort,
+  cleanupTestSessions,
+  initTestGitRepo,
+  waitForBotMessageContaining,
+  waitForFooterMessage,
+} from './test-utils.js'
+import YAML from 'yaml'
+import type { ThreadStartMarker } from './system-message.js'
+
+const TEST_USER_ID = '200000000000000830'
+const TEXT_CHANNEL_ID = '200000000000000831'
+const BOT_USER_ID = '200000000000000832'
+
+function createRunDirectories() {
+  const root = path.resolve(process.cwd(), 'tmp', 'cli-send-thread-e2e')
+  fs.mkdirSync(root, { recursive: true })
+  const dataDir = fs.mkdtempSync(path.join(root, 'data-'))
+  const projectDirectory = path.join(root, 'project')
+  fs.mkdirSync(projectDirectory, { recursive: true })
+  initTestGitRepo(projectDirectory)
+  return { root, dataDir, projectDirectory }
+}
+
+function createDiscordJsClient({ restUrl }: { restUrl: string }) {
+  return new Client({
+    intents: [
+      GatewayIntentBits.Guilds,
+      GatewayIntentBits.GuildMessages,
+      GatewayIntentBits.MessageContent,
+      GatewayIntentBits.GuildVoiceStates,
+    ],
+    partials: [
+      Partials.Channel,
+      Partials.Message,
+      Partials.User,
+      Partials.ThreadMember,
+    ],
+    rest: {
+      api: restUrl,
+      version: '10',
+    },
+  })
+}
+
+function createDeterministicMatchers(): DeterministicMatcher[] {
+  const userReplyMatcher: DeterministicMatcher = {
+    id: 'user-reply',
+    priority: 10,
+    when: {
+      lastMessageRole: 'user',
+      latestUserTextIncludes: 'Reply with exactly:',
+    },
+    then: {
+      parts: [
+        { type: 'stream-start', warnings: [] },
+        { type: 'text-start', id: 'default-reply' },
+        { type: 'text-delta', id: 'default-reply', delta: 'ok' },
+        { type: 'text-end', id: 'default-reply' },
+        {
+          type: 'finish',
+          finishReason: 'stop',
+          usage: { inputTokens: 1, outputTokens: 1, totalTokens: 2 },
+        },
+      ],
+      partDelaysMs: [0, 100, 0, 0, 0],
+    },
+  }
+
+  // Catch-all: any user message gets a reply
+  const catchAll: DeterministicMatcher = {
+    id: 'catch-all',
+    priority: 0,
+    when: { lastMessageRole: 'user' },
+    then: {
+      parts: [
+        { type: 'stream-start', warnings: [] },
+        { type: 'text-start', id: 'catch' },
+        { type: 'text-delta', id: 'catch', delta: 'caught-by-model' },
+        { type: 'text-end', id: 'catch' },
+        {
+          type: 'finish',
+          finishReason: 'stop',
+          usage: { inputTokens: 1, outputTokens: 1, totalTokens: 2 },
+        },
+      ],
+    },
+  }
+
+  return [userReplyMatcher, catchAll]
+}
+
+describe('otto send --channel thread creation', () => {
+  let directories: ReturnType<typeof createRunDirectories>
+  let discord: DigitalDiscord
+  let botClient: Client
+  let previousDefaultVerbosity: VerbosityLevel | null = null
+  let testStartTime = Date.now()
+
+  beforeAll(async () => {
+    testStartTime = Date.now()
+    directories = createRunDirectories()
+    const lockPort = chooseLockPort({ key: TEXT_CHANNEL_ID })
+
+    process.env['OTTO_LOCK_PORT'] = String(lockPort)
+    setDataDir(directories.dataDir)
+    previousDefaultVerbosity = store.getState().defaultVerbosity
+    store.setState({ defaultVerbosity: 'tools_and_text' })
+
+    const digitalDiscordDbPath = path.join(
+      directories.dataDir,
+      'digital-discord.db',
+    )
+
+    discord = new DigitalDiscord({
+      botUser: { id: BOT_USER_ID },
+      guild: {
+        name: 'CLI Send E2E Guild',
+        // Use bot as guild owner so bot-authored messages pass
+        // hasOttoBotPermission (owner check). This matches production where
+        // the bot typically has admin or is the app owner. Without this, the
+        // MessageCreate handler drops bot messages before reaching the GuildText
+        // path, hiding the race condition we're testing.
+        ownerId: BOT_USER_ID,
+      },
+      channels: [
+        {
+          id: TEXT_CHANNEL_ID,
+          name: 'cli-send-e2e',
+          type: ChannelType.GuildText,
+        },
+      ],
+      users: [
+        {
+          id: TEST_USER_ID,
+          username: 'cli-send-tester',
+        },
+      ],
+      dbUrl: `file:${digitalDiscordDbPath}`,
+    })
+
+    await discord.start()
+
+    const providerNpm = url
+      .pathToFileURL(
+        path.resolve(
+          process.cwd(),
+          '..',
+          'opencode-deterministic-provider',
+          'src',
+          'index.ts',
+        ),
+      )
+      .toString()
+
+    const opencodeConfig = buildDeterministicOpencodeConfig({
+      providerName: 'deterministic-provider',
+      providerNpm,
+      model: 'deterministic-v2',
+      smallModel: 'deterministic-v2',
+      settings: {
+        strict: false,
+        matchers: createDeterministicMatchers(),
+      },
+    })
+    fs.writeFileSync(
+      path.join(directories.projectDirectory, 'opencode.json'),
+      JSON.stringify(opencodeConfig, null, 2),
+    )
+
+    const dbPath = path.join(directories.dataDir, 'discord-sessions.db')
+    const hranaResult = await startHranaServer({ dbPath })
+    if (hranaResult instanceof Error) {
+      throw hranaResult
+    }
+    process.env['OTTO_DB_URL'] = hranaResult
+    await initDatabase()
+    await setBotToken(discord.botUserId, discord.botToken)
+
+    await setChannelDirectory({
+      channelId: TEXT_CHANNEL_ID,
+      directory: directories.projectDirectory,
+      channelType: 'text',
+    })
+    await setChannelVerbosity(TEXT_CHANNEL_ID, 'tools_and_text')
+
+    botClient = createDiscordJsClient({ restUrl: discord.restUrl })
+    await startDiscordBot({
+      token: discord.botToken,
+      appId: discord.botUserId,
+      discordClient: botClient,
+    })
+
+    // Pre-warm the opencode server
+    const warmup = await initializeOpencodeForDirectory(
+      directories.projectDirectory,
+    )
+    if (warmup instanceof Error) {
+      throw warmup
+    }
+  }, 20_000)
+
+  afterAll(async () => {
+    if (directories) {
+      await cleanupTestSessions({
+        projectDirectory: directories.projectDirectory,
+        testStartTime,
+      })
+    }
+    if (botClient) {
+      botClient.destroy()
+    }
+    await stopOpencodeServer()
+    await Promise.all([
+      closeDatabase().catch(() => {
+        return
+      }),
+      stopHranaServer().catch(() => {
+        return
+      }),
+      discord?.stop().catch(() => {
+        return
+      }),
+    ])
+    delete process.env['OTTO_LOCK_PORT']
+    delete process.env['OTTO_DB_URL']
+    if (previousDefaultVerbosity) {
+      store.setState({ defaultVerbosity: previousDefaultVerbosity })
+    }
+    if (directories) {
+      fs.rmSync(directories.dataDir, { recursive: true, force: true })
+    }
+  }, 5_000)
+
+  test(
+    'otto send --prompt "/hello-test-cmd" falls through as text when registeredUserCommands is empty (repro #97)',
+    async () => {
+      // Reproduce GitHub #97: when registeredUserCommands is empty (gateway mode
+      // startup race, or backgroundInit not complete), the prompt "/hello-test-cmd"
+      // is NOT detected as a command and is sent to the model as plain text.
+
+      const prevCommands = store.getState().registeredUserCommands
+      // Ensure store is empty — this is the bug condition
+      store.setState({ registeredUserCommands: [] })
+
+      try {
+        const prompt = '/hello-test-cmd'
+        const embedMarker: ThreadStartMarker = {
+          start: true,
+          username: 'cli-send-tester',
+          userId: TEST_USER_ID,
+        }
+
+        const starterMessage = (await botClient.rest.post(
+          Routes.channelMessages(TEXT_CHANNEL_ID),
+          {
+            body: {
+              content: prompt,
+              embeds: [
+                { color: 0x2b2d31, footer: { text: YAML.stringify(embedMarker) } },
+              ],
+            },
+          },
+        )) as { id: string }
+
+        await new Promise((resolve) => {
+          setTimeout(resolve, 200)
+        })
+
+        const threadData = (await botClient.rest.post(
+          Routes.threads(TEXT_CHANNEL_ID, starterMessage.id),
+          {
+            body: { name: 'cmd-detection-test', auto_archive_duration: 1440 },
+          },
+        )) as { id: string }
+
+        await botClient.rest.put(
+          Routes.threadMembers(threadData.id, TEST_USER_ID),
+        )
+
+        // Wait for any bot reply AFTER the starter message
+        await waitForBotMessageContaining({
+          discord,
+          threadId: threadData.id,
+          userId: discord.botUserId,
+          text: '',
+          afterMessageId: starterMessage.id,
+          timeout: 4_000,
+        })
+
+        const messages = await discord.thread(threadData.id).getMessages()
+        const botReplies = messages.filter((m) => {
+          return m.author.id === discord.botUserId && m.id !== starterMessage.id
+        })
+
+        const allContent = botReplies.map((m) => {
+          return m.content
+        })
+        expect(
+          allContent.some((content) => {
+            return content.includes('Command not found: "hello-test"')
+          }),
+        ).toBe(true)
+      } finally {
+        store.setState({ registeredUserCommands: prevCommands })
+      }
+    },
+    15_000,
+  )
+
+  test(
+    'bot-posted starter message with start marker creates thread without DiscordAPIError[160004]',
+    async () => {
+      // Simulate what `otto send --channel` does:
+      // 1. Bot posts a starter message with `start: true` embed marker
+      // 2. Bot creates a thread on that message via REST
+      // The ThreadCreate handler should pick it up. The MessageCreate GuildText
+      // handler must NOT try to startThread() on the same message (race).
+
+      const prompt = 'Reply with exactly: cli-send-test'
+      const embedMarker: ThreadStartMarker = {
+        start: true,
+        username: 'cli-send-tester',
+        userId: TEST_USER_ID,
+      }
+
+      // Step 1: Bot posts the starter message (same as CLI's sendDiscordMessageWithOptionalAttachment)
+      const starterMessage = (await botClient.rest.post(
+        Routes.channelMessages(TEXT_CHANNEL_ID),
+        {
+          body: {
+            content: prompt,
+            embeds: [
+              { color: 0x2b2d31, footer: { text: YAML.stringify(embedMarker) } },
+            ],
+          },
+        },
+      )) as { id: string }
+
+      // Give the bot's MessageCreate handler time to process the starter
+      // message. Without the fix, the handler enters the GuildText path and
+      // tries to startThread() on this message, which races the CLI's thread
+      // creation below. The digital twin enforces Discord's 160004 uniqueness
+      // constraint, so the second startThread call fails.
+      await new Promise((resolve) => {
+        setTimeout(resolve, 200)
+      })
+
+      // Verify the MessageCreate handler did NOT create a thread on this
+      // message. If the handler ignored the start marker (correct behavior),
+      // no thread exists yet and the REST call below succeeds.
+      const threadsBeforeCliCreate = await discord
+        .channel(TEXT_CHANNEL_ID)
+        .getThreads()
+      const preExistingThread = threadsBeforeCliCreate.find((t) => {
+        return t.name?.includes('cli-send-test')
+      })
+      // This is the core regression assertion: without the fix in discord-bot.ts
+      // (skipping start markers in the GuildText handler), the MessageCreate
+      // handler would create a thread here, and the CLI's REST call below would
+      // fail with 160004.
+      expect(preExistingThread).toBeUndefined()
+
+      // Step 2: Bot creates a thread on the starter message (same as CLI's Routes.threads call)
+      const threadData = (await botClient.rest.post(
+        Routes.threads(TEXT_CHANNEL_ID, starterMessage.id),
+        {
+          body: {
+            name: 'cli-send-test',
+            auto_archive_duration: 1440,
+          },
+        },
+      )) as { id: string; name: string }
+
+      // Add test user to thread
+      await botClient.rest.put(
+        Routes.threadMembers(threadData.id, TEST_USER_ID),
+      )
+
+      // Wait for the bot to reply with the ⬥ prefix (proves ThreadCreate
+      // handler picked up the starter message and started a session)
+      await waitForBotMessageContaining({
+        discord,
+        threadId: threadData.id,
+        userId: discord.botUserId,
+        text: '⬥',
+        timeout: 4_000,
+      })
+
+      // Wait for footer message (proves session completed successfully)
+      await waitForFooterMessage({
+        discord,
+        threadId: threadData.id,
+        timeout: 4_000,
+        afterMessageIncludes: '⬥',
+        afterAuthorId: discord.botUserId,
+      })
+
+      // Verify no DiscordAPIError[160004] or other errors in the thread.
+      // Before the fix, the MessageCreate GuildText handler would race the
+      // CLI's thread creation and produce an error message here.
+      const messages = await discord.thread(threadData.id).getMessages()
+      const errorMessages = messages.filter((m) => {
+        return m.content.includes('Error:') || m.content.includes('160004')
+      })
+      expect(errorMessages).toHaveLength(0)
+
+      // Verify at least one ⬥ reply exists (session produced output)
+      const botReplies = messages.filter((m) => {
+        return (
+          m.author.id === discord.botUserId && m.content.startsWith('⬥')
+        )
+      })
+      expect(botReplies.length).toBeGreaterThanOrEqual(1)
+    },
+    15_000,
+  )
+})