kimaki 0.4.89 → 0.4.91

package/dist/agent-model.e2e.test.js

@@ -23,7 +23,7 @@ import { setBotToken, initDatabase, closeDatabase, setChannelDirectory, setChann
 import { getPrisma } from './db.js';
 import { startHranaServer, stopHranaServer } from './hrana-server.js';
 import { initializeOpencodeForDirectory, stopOpencodeServer } from './opencode.js';
-import { chooseLockPort, cleanupTestSessions, waitForBotMessageContaining, waitForFooterMessage, } from './test-utils.js';
+import { chooseLockPort, cleanupTestSessions, initTestGitRepo, waitForBotMessageContaining, waitForFooterMessage, } from './test-utils.js';
 import { buildQuickAgentCommandDescription } from './commands/agent.js';
 const TEST_USER_ID = '200000000000000920';
 const TEXT_CHANNEL_ID = '200000000000000921';
@@ -38,6 +38,7 @@ function createRunDirectories() {
     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 }) {
@@ -67,7 +68,7 @@ function createDeterministicMatchers() {
         when: {
             lastMessageRole: 'user',
             latestUserTextIncludes: 'Reply with exactly: system-context-check',
-            rawPromptIncludes: `Current Discord user ID is: ${TEST_USER_ID}`,
+            promptTextIncludes: `<discord-user name="agent-model-tester" user-id="${TEST_USER_ID}"`,
         },
         then: {
             parts: [
@@ -88,6 +89,33 @@ function createDeterministicMatchers() {
             partDelaysMs: [0, 100, 0, 0, 0],
         },
     };
+    const replyContextMatcher = {
+        id: 'reply-context-check',
+        priority: 15,
+        when: {
+            lastMessageRole: 'user',
+            latestUserTextIncludes: 'Reply with exactly: reply-context-check',
+            promptTextIncludes: 'This message was a reply to message\n\n<replied-message author="agent-model-tester">\nfirst message in thread\n</replied-message>',
+        },
+        then: {
+            parts: [
+                { type: 'stream-start', warnings: [] },
+                { type: 'text-start', id: 'reply-context-reply' },
+                {
+                    type: 'text-delta',
+                    id: 'reply-context-reply',
+                    delta: 'reply-context-ok',
+                },
+                { type: 'text-end', id: 'reply-context-reply' },
+                {
+                    type: 'finish',
+                    finishReason: 'stop',
+                    usage: { inputTokens: 1, outputTokens: 1, totalTokens: 2 },
+                },
+            ],
+            partDelaysMs: [0, 100, 0, 0, 0],
+        },
+    };
     const userReplyMatcher = {
         id: 'user-reply',
         priority: 10,
@@ -110,7 +138,7 @@ function createDeterministicMatchers() {
             partDelaysMs: [0, 100, 0, 0, 0],
         },
     };
-    return [systemContextMatcher, userReplyMatcher];
+    return [systemContextMatcher, replyContextMatcher, userReplyMatcher];
 }
 /**
  * Create an opencode agent .md file that uses a specific model.
@@ -348,6 +376,57 @@ describe('agent model resolution', () => {
         *project ⋅ main ⋅ Ns ⋅ N% ⋅ agent-model-v2 ⋅ **test-agent***"
       `);
     }, 15_000);
+    test('reply message injects replied-message context', async () => {
+        await discord.channel(TEXT_CHANNEL_ID).user(TEST_USER_ID).sendMessage({
+            content: 'first message in thread',
+        });
+        const thread = await discord.channel(TEXT_CHANNEL_ID).waitForThread({
+            timeout: 4_000,
+            predicate: (t) => {
+                return t.name === 'first message in thread';
+            },
+        });
+        const threadMessagesBeforeReply = await discord.thread(thread.id).getMessages();
+        const firstUserMessage = threadMessagesBeforeReply.find((message) => {
+            return (message.author.id === TEST_USER_ID
+                && message.content === 'first message in thread');
+        });
+        expect(firstUserMessage).toBeDefined();
+        if (!firstUserMessage) {
+            throw new Error('Expected first user message in thread');
+        }
+        await discord.thread(thread.id).user(TEST_USER_ID).sendMessage({
+            content: 'Reply with exactly: reply-context-check',
+            messageReference: {
+                message_id: firstUserMessage.id,
+                channel_id: thread.id,
+                guild_id: discord.guildId,
+            },
+        });
+        await waitForBotMessageContaining({
+            discord,
+            threadId: thread.id,
+            userId: TEST_USER_ID,
+            text: 'reply-context-ok',
+            timeout: 4_000,
+        });
+        await waitForFooterMessage({
+            discord,
+            threadId: thread.id,
+            timeout: 4_000,
+            afterMessageIncludes: 'reply-context-ok',
+            afterAuthorId: discord.botUserId,
+        });
+        expect(await discord.thread(thread.id).text()).toMatchInlineSnapshot(`
+        "--- from: user (agent-model-tester)
+        first message in thread
+        Reply with exactly: reply-context-check
+        --- from: assistant (TestBot)
+        ⬥ ok
+        ⬥ reply-context-ok
+        *project ⋅ main ⋅ Ns ⋅ N% ⋅ agent-model-v2 ⋅ **test-agent***"
+      `);
+    }, 15_000);
     test('new thread uses channel model when channel model preference is set', async () => {
         // Clear channel agent so model resolution falls through to channel model
         const prisma = await getPrisma();