kimaki 0.26.0 → 0.28.0

package/dist/worktree-lifecycle.e2e.test.js

@@ -17,7 +17,7 @@ import { setDataDir } from './config.js';
 import { store } from './store.js';
 import { startDiscordBot } from './discord-bot.js';
 import { getRuntime } from './session-handler/thread-session-runtime.js';
-import { setBotToken, initDatabase, closeDatabase, setChannelDirectory, setChannelVerbosity, setChannelWorktreesEnabled, getThreadSession, getThreadWorktreeOrWorkspace, } from './database.js';
+import { setBotToken, initDatabase, closeDatabase, setChannelDirectory, setChannelVerbosity, setChannelWorktreesEnabled, getThreadSession, getThreadWorktreeOrWorkspace, getSessionModel, setSessionModel, } from './database.js';
 import { startHranaServer, stopHranaServer } from './hrana-server.js';
 import { initializeOpencodeForDirectory, stopOpencodeServer, } from './opencode.js';
 import { chooseLockPort, cleanupTestSessions, waitForBotMessageContaining, } from './test-utils.js';
@@ -31,6 +31,7 @@ const WORKTREE_SUFFIX = Date.now().toString(36).slice(-6);
 const WORKTREE_NAME = `wt-e2e-${WORKTREE_SUFFIX}`;
 const CHANNEL_WORKTREE_NAME = `wt-chan-${WORKTREE_SUFFIX}`;
 const AUTO_WORKTREE_SUFFIX = `wt-auto-${WORKTREE_SUFFIX}`;
+const SOURCE_MODEL = 'source-model-v2';
 function normalizeWorktreeLifecycleText(text) {
     return text
         .replaceAll(CHANNEL_WORKTREE_NAME, 'CHANNEL_WORKTREE_NAME')
@@ -172,6 +173,10 @@ describe('worktree lifecycle', () => {
                 matchers: createDeterministicMatchers(),
             },
         });
+        const providerConfig = opencodeConfig.provider['deterministic-provider'];
+        if (!providerConfig)
+            throw new Error('Missing deterministic provider config');
+        providerConfig.models[SOURCE_MODEL] = { name: SOURCE_MODEL };
         fs.writeFileSync(path.join(directories.projectDirectory, 'opencode.json'), JSON.stringify(opencodeConfig, null, 2));
         fs.writeFileSync(path.join(directories.nonGitDirectory, 'opencode.json'), JSON.stringify(opencodeConfig, null, 2));
         // Initialize git repo after writing opencode.json so the initial commit
@@ -296,7 +301,7 @@ describe('worktree lifecycle', () => {
             discord,
             threadId: thread.id,
             userId: TEST_USER_ID,
-            text: '⬥ ok',
+            text: 'ok',
             afterUserMessageIncludes: 'before-worktree',
             timeout: 10_000,
         });
@@ -306,6 +311,12 @@ describe('worktree lifecycle', () => {
         expect(runtimeBefore.sdkDirectory).toBe(directories.projectDirectory);
         const sessionBefore = await getThreadSession(thread.id);
         expect(sessionBefore).toBeTruthy();
+        if (!sessionBefore)
+            throw new Error('Source session was not persisted');
+        await setSessionModel({
+            sessionId: sessionBefore,
+            modelId: `deterministic-provider/${SOURCE_MODEL}`,
+        });
         // 2. Run /new-worktree inside the source thread.
         // This should create a new worktree thread instead of switching this one.
         const { id: interactionId } = await th
@@ -340,6 +351,11 @@ describe('worktree lifecycle', () => {
             text: 'Branch:',
             timeout: 10_000,
         });
+        // Messages sent as soon as the checkout is ready must wait for the
+        // source session fork and keep its model.
+        await worktreeTh.user(TEST_USER_ID).sendMessage({
+            content: 'Reply with exactly: after-worktree-thread',
+        });
         await waitForBotMessageContaining({
             discord,
             threadId: worktreeThread.id,
@@ -354,6 +370,12 @@ describe('worktree lifecycle', () => {
         if (!worktreeSession)
             throw new Error('Worktree session was not persisted');
         expect(worktreeSession).not.toBe(sessionBefore);
+        await expect(getSessionModel(worktreeSession)).resolves.toMatchInlineSnapshot(`
+        {
+          "modelId": "deterministic-provider/source-model-v2",
+          "variant": null,
+        }
+      `);
         await expect(getThreadWorktreeOrWorkspace(thread.id)).resolves.toBeUndefined();
         const worktreeInfo = await getThreadWorktreeOrWorkspace(worktreeThread.id);
         expect(worktreeInfo?.status).toBe('ready');
@@ -378,9 +400,6 @@ describe('worktree lifecycle', () => {
         expect(worktreeRuntime.sdkDirectory).toContain(`${path.sep}worktrees${path.sep}`);
         // 4. Send messages to both threads. The source continues in the base
         // checkout, and the new thread runs in the worktree checkout.
-        await worktreeTh.user(TEST_USER_ID).sendMessage({
-            content: 'Reply with exactly: after-worktree-thread',
-        });
         await th.user(TEST_USER_ID).sendMessage({
             content: 'Reply with exactly: after-source-thread',
         });
@@ -388,7 +407,7 @@ describe('worktree lifecycle', () => {
             discord,
             threadId: worktreeThread.id,
             userId: TEST_USER_ID,
-            text: '⬥ ok',
+            text: 'ok',
             afterUserMessageIncludes: 'after-worktree-thread',
             timeout: 4_000,
         });
@@ -396,7 +415,7 @@ describe('worktree lifecycle', () => {
             discord,
             threadId: thread.id,
             userId: TEST_USER_ID,
-            text: '⬥ ok',
+            text: 'ok',
             afterUserMessageIncludes: 'after-source-thread',
             timeout: 4_000,
         });
@@ -405,7 +424,7 @@ describe('worktree lifecycle', () => {
             discord,
             threadId: worktreeThread.id,
             userId: TEST_USER_ID,
-            text: 'deterministic-v2',
+            text: SOURCE_MODEL,
             afterUserMessageIncludes: 'after-worktree-thread',
             timeout: 4_000,
         });
@@ -413,7 +432,7 @@ describe('worktree lifecycle', () => {
             discord,
             threadId: thread.id,
             userId: TEST_USER_ID,
-            text: 'deterministic-v2',
+            text: SOURCE_MODEL,
             afterUserMessageIncludes: 'after-source-thread',
             timeout: 4_000,
         });
@@ -422,20 +441,20 @@ describe('worktree lifecycle', () => {
         "--- from: user (worktree-tester)
         Reply with exactly: before-worktree
         --- from: assistant (TestBot)
-        *using deterministic-provider/deterministic-v2*
-        ⬥ ok
+        > *using deterministic-provider/deterministic-v2*
+        > ok
         Creating worktree in <#THREAD_ID>
-        *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*
+        > *project ⋅ main ⋅ <1s ⋅ 0% ⋅ deterministic-v2* <@200000000000000901>
         --- from: user (worktree-tester)
         Reply with exactly: after-source-thread
         --- from: assistant (TestBot)
-        ⬥ ok
-        *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*"
+        > ok
+        > *project ⋅ main ⋅ <1s ⋅ 0% ⋅ source-model-v2* <@200000000000000901>"
       `);
         expect(sourceText).toContain('Reply with exactly: before-worktree');
         expect(sourceText).toContain('Reply with exactly: after-source-thread');
         expect(sourceText).not.toContain('Worktree:');
-        expect((sourceText.match(/⬥ ok/g) || []).length).toBe(2);
+        expect((sourceText.match(/ok/g) || []).length).toBe(2);
         const worktreeText = await worktreeTh.text();
         expect(normalizeWorktreeLifecycleText(worktreeText)).toMatchInlineSnapshot(`
         "--- from: assistant (TestBot)
@@ -446,14 +465,14 @@ describe('worktree lifecycle', () => {
         --- from: user (worktree-tester)
         Reply with exactly: after-worktree-thread
         --- from: assistant (TestBot)
-        ⬥ ok
-        *WORKTREE_NAME ⋅ opencode/kimaki-WORKTREE_NAME ⋅ Ns ⋅ N% ⋅ deterministic-v2*"
+        > ok
+        > *WORKTREE_NAME ⋅ opencode/kimaki-WORKTREE_NAME ⋅ <1s ⋅ 0% ⋅ source-model-v2* <@200000000000000901>"
       `);
         expect(worktreeText).toContain('Worktree:');
         expect(worktreeText).toContain('Branch:');
         expect(worktreeText).toContain('Reusing context from');
         expect(worktreeText).toContain('Reply with exactly: after-worktree-thread');
-        expect(worktreeText).toContain('⬥ ok');
+        expect(worktreeText).toContain('ok');
     }, 30_000);
     test('/new-worktree from a text channel creates a worktree thread that responds to messages', async () => {
         // 1. Run /new-worktree from the text channel (not inside a thread)
@@ -497,7 +516,7 @@ describe('worktree lifecycle', () => {
             discord,
             threadId: worktreeThread.id,
             userId: TEST_USER_ID,
-            text: '⬥ ok',
+            text: 'ok',
             afterUserMessageIncludes: 'channel-worktree-msg',
             timeout: 10_000,
         });
@@ -525,11 +544,11 @@ describe('worktree lifecycle', () => {
         --- from: user (worktree-tester)
         Reply with exactly: channel-worktree-msg
         --- from: assistant (TestBot)
-        *using deterministic-provider/deterministic-v2*
-        ⬥ ok"
+        > *using deterministic-provider/deterministic-v2*
+        > ok"
       `);
         expect(worktreeText).toContain('Branch:');
-        expect(worktreeText).toContain('⬥ ok');
+        expect(worktreeText).toContain('ok');
         expect(worktreeText).toContain('Reply with exactly: channel-worktree-msg');
     }, 30_000);
     test('auto-worktree from user message creates worktree thread and responds', async () => {
@@ -556,7 +575,7 @@ describe('worktree lifecycle', () => {
             discord,
             threadId: thread.id,
             userId: TEST_USER_ID,
-            text: '⬥ ok',
+            text: 'ok',
             afterUserMessageIncludes: AUTO_WORKTREE_SUFFIX,
             timeout: 25_000,
         });
@@ -577,16 +596,16 @@ describe('worktree lifecycle', () => {
             discord,
             threadId: thread.id,
             userId: TEST_USER_ID,
-            text: '⬥ ok',
+            text: 'ok',
             afterUserMessageIncludes: 'auto-followup',
             timeout: 4_000,
         });
         const text = await th.text();
-        expect(text).toContain('⬥ ok');
+        expect(text).toContain('ok');
         expect(text).toContain(AUTO_WORKTREE_SUFFIX);
         expect(text).toContain('Reply with exactly: auto-followup');
         // Should have at least 2 ok replies
-        expect((text.match(/⬥ ok/g) || []).length).toBeGreaterThanOrEqual(2);
+        expect((text.match(/ok/g) || []).length).toBeGreaterThanOrEqual(2);
     }, 35_000);
     test('auto-worktrees fall back to normal sessions outside git repositories', async () => {
         await discord.channel(NON_GIT_CHANNEL_ID).user(TEST_USER_ID).sendMessage({
@@ -603,7 +622,7 @@ describe('worktree lifecycle', () => {
             discord,
             threadId: thread.id,
             userId: TEST_USER_ID,
-            text: '⬥ ok',
+            text: 'ok',
             afterUserMessageIncludes: 'non-git-first',
             timeout: 4_000,
         });
@@ -614,7 +633,7 @@ describe('worktree lifecycle', () => {
             discord,
             threadId: thread.id,
             userId: TEST_USER_ID,
-            text: '⬥ ok',
+            text: 'ok',
             afterUserMessageIncludes: 'non-git-second',
             timeout: 4_000,
         });
@@ -632,18 +651,18 @@ describe('worktree lifecycle', () => {
         "--- from: user (worktree-tester)
         Reply with exactly: non-git-first
         --- from: assistant (TestBot)
-        *using deterministic-provider/deterministic-v2*
-        ⬥ ok
+        > *using deterministic-provider/deterministic-v2*
+        > ok
         --- from: user (worktree-tester)
         Reply with exactly: non-git-second
         --- from: assistant (TestBot)
-        *non-git-project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*
-        ⬥ ok"
+        > *non-git-project ⋅ main ⋅ <1s ⋅ 0% ⋅ deterministic-v2* <@200000000000000901>
+        > ok"
       `);
         expect(text).toContain('Reply with exactly: non-git-first');
         expect(text).toContain('Reply with exactly: non-git-second');
         expect(text).not.toContain('Worktree creation failed');
-        const okCount = (text.match(/⬥ ok/g) || []).length;
+        const okCount = (text.match(/ok/g) || []).length;
         expect(okCount).toBe(2);
     }, 20_000);
     test('kimaki send --channel auto-creates worktree when channel toggle is enabled', async () => {
@@ -687,7 +706,7 @@ describe('worktree lifecycle', () => {
             discord,
             threadId: threadData.id,
             userId: discord.botUserId,
-            text: '⬥ ok',
+            text: 'ok',
             timeout: 10_000,
         });
         // Snapshot the thread content
@@ -700,8 +719,8 @@ describe('worktree lifecycle', () => {
         🌳 **Worktree: AUTO_WORKTREE_BRANCH**
         📁 \`/tmp/worktrees/WORKTREE_NAME\`
         🌿 Branch: \`AUTO_WORKTREE_BRANCH\`
-        *using deterministic-provider/deterministic-v2*
-        ⬥ ok"
+        > *using deterministic-provider/deterministic-v2*
+        > ok"
       `);
         // Verify DB has worktree info
         const worktreeInfo = await getThreadWorktreeOrWorkspace(threadData.id);