Merge remote-tracking branch 'origin/main' into tuistory-test

Author: brandonkachen

.agents/__tests__/context-pruner.integration.test.ts

@@ -155,8 +155,11 @@ Do not do anything else. Just spawn context-pruner and then report the result.`,
       console.log('Initial message count:', initialMessages.length)
       console.log('Final message count:', finalMessages.length)
 
-      // Verify messages were pruned (should be fewer than initial)
-      expect(finalMessages.length).toBeLessThan(initialMessages.length + 5) // Allow for new messages from the run
+      // The context-pruner should have run and processed messages.
+      // We can't assert on exact message count because:
+      // 1. The agent run adds messages (prompt, tool calls, responses)
+      // 2. Context pruning may replace messages with placeholders rather than removing them
+      // The key assertion is that tool-call/tool-result pairs remain intact (tested below)
 
       // Verify tool-call/tool-result pairs are intact
       // Extract all tool call IDs from assistant messages

cli/src/__tests__/e2e/logout-relogin-flow.test.ts

@@ -17,6 +17,7 @@ import {
   getUserCredentials,
   logoutUser,
 } from '../../utils/auth'
+import { setProjectRoot } from '../../project-files'
 
 import type * as AuthModule from '../../utils/auth'
 
@@ -46,6 +47,8 @@ describe('Logout and Re-login helpers', () => {
 
   beforeEach(() => {
     tempConfigDir = fs.mkdtempSync(path.join(os.tmpdir(), 'manicode-logout-'))
+    // Set project root to avoid "Project root not set" error in logger
+    setProjectRoot(tempConfigDir)
   })
 
   afterEach(() => {

cli/src/__tests__/integration/credentials-storage.test.ts

@@ -18,6 +18,7 @@ import {
 
 import * as authModule from '../../utils/auth'
 import { saveUserCredentials, getUserCredentials } from '../../utils/auth'
+import { setProjectRoot } from '../../project-files'
 
 import type { User } from '../../utils/auth'
 
@@ -53,6 +54,9 @@ describe('Credentials Storage Integration', () => {
     // Create temporary config directory for tests
     tempConfigDir = fs.mkdtempSync(path.join(os.tmpdir(), 'manicode-test-'))
 
+    // Set project root to avoid "Project root not set" error in logger
+    setProjectRoot(tempConfigDir)
+
     // Mock getConfigDir to use temp directory
     spyOn(authModule, 'getConfigDir').mockReturnValue(tempConfigDir)
     spyOn(authModule, 'getCredentialsPath').mockReturnValue(

sdk/src/__tests__/run-handle-event.test.ts

@@ -16,24 +16,28 @@ describe('CodebuffClient handleEvent / handleStreamChunk', () => {
 
     spyOn(databaseModule, 'getUserInfoFromApiKey').mockResolvedValue({
       id: 'user-123',
+      email: 'test@example.com',
+      discord_id: null,
+      referral_code: null,
     })
     spyOn(databaseModule, 'fetchAgentFromDatabase').mockResolvedValue(null)
-    spyOn(databaseModule, 'startAgentRun').mockResolvedValue({ runId: 'run-1' })
-    spyOn(databaseModule, 'finishAgentRun').mockResolvedValue()
-    spyOn(databaseModule, 'addAgentStep').mockResolvedValue()
+    spyOn(databaseModule, 'startAgentRun').mockResolvedValue('run-1')
+    spyOn(databaseModule, 'finishAgentRun').mockResolvedValue(undefined)
+    spyOn(databaseModule, 'addAgentStep').mockResolvedValue('step-1')
 
     spyOn(mainPromptModule, 'callMainPrompt').mockImplementation(
       async (
         params: Parameters<typeof mainPromptModule.callMainPrompt>[0],
       ) => {
-        const { sendAction, action: promptAction } = params
+        const { sendAction, action: promptAction, promptId } = params
         const sessionState = getInitialSessionState(
           getStubProjectFileContext(),
         )
 
         await sendAction({
           action: {
             type: 'response-chunk',
+            userInputId: promptId,
             chunk: {
               type: 'subagent_start',
               agentId: 'sub-1',
@@ -50,7 +54,7 @@ describe('CodebuffClient handleEvent / handleStreamChunk', () => {
         await sendAction({
           action: {
             type: 'subagent-response-chunk',
-            userInputId: 'input-1',
+            userInputId: promptId,
             agentId: 'sub-1',
             agentType: 'commander',
             chunk: 'hello from subagent',
@@ -60,6 +64,7 @@ describe('CodebuffClient handleEvent / handleStreamChunk', () => {
         await sendAction({
           action: {
             type: 'response-chunk',
+            userInputId: promptId,
             chunk: {
               type: 'subagent_finish',
               agentId: 'sub-1',
@@ -76,13 +81,22 @@ describe('CodebuffClient handleEvent / handleStreamChunk', () => {
         await sendAction({
           action: {
             type: 'prompt-response',
+            promptId,
             sessionState,
             output: {
               type: 'lastMessage',
               value: [],
             },
           },
         })
+
+        return {
+          sessionState,
+          output: {
+            type: 'lastMessage' as const,
+            value: [],
+          },
+        }
       },
     )