Fix tests

Author: jahooma

cli/src/__tests__/integration/local-agents.test.ts

@@ -71,7 +71,8 @@ describe('Local Agent Integration', () => {
   })
 
   test('handles missing .agents directory gracefully', async () => {
-    expect(findAgentsDirectory()).toBeNull()
+    // Note: findAgentsDirectory may return a directory from a parent or home if they exist
+    // but user agents should not be loaded
 
     await initializeAgentRegistry()
     const definitions = loadAgentDefinitions()
@@ -635,10 +636,16 @@ describe('Local Agent Integration', () => {
   // Utility function tests
   // ============================================================================
 
-  test('getLoadedAgentsData returns null when no agents directory', async () => {
+  test('getLoadedAgentsData returns null when no user agents directory', async () => {
     await initializeAgentRegistry()
+    // Note: Returns bundled agents even when no local .agents directory exists
+    // Only returns null when there's no .agents directory AND no bundled agents
     const data = getLoadedAgentsData()
-    expect(data).toBeNull()
+    // With bundled agents, this will return data (not null)
+    // The key is that user agents from test-* should not be present
+    if (data) {
+      expect(data.agents.find((a) => a.id.startsWith('test-'))).toBeUndefined()
+    }
   })
 
   test('getLoadedAgentsData returns agent info when agents exist', async () => {
@@ -666,10 +673,15 @@ describe('Local Agent Integration', () => {
     expect(data!.agents.some((a) => a.id === 'test-data-agent')).toBe(true)
   })
 
-  test('getLoadedAgentsMessage returns null when no agents', async () => {
+  test('getLoadedAgentsMessage returns null when no user agents', async () => {
     await initializeAgentRegistry()
+    // Note: Returns bundled agents message even when no local .agents directory exists
     const message = getLoadedAgentsMessage()
-    expect(message).toBeNull()
+    // With bundled agents, this will return a message (not null)
+    // The key is that user agents from test-* should not be present
+    if (message) {
+      expect(message).not.toContain('test-')
+    }
   })
 
   test('getLoadedAgentsMessage returns formatted message with agents', async () => {

common/src/util/__tests__/messages.test.ts

@@ -270,12 +270,14 @@ describe('convertCbToModelMessages', () => {
       expect(result).toEqual([
         expect.objectContaining({
           role: 'tool',
+          toolCallId: 'call_empty',
+          toolName: 'scraper_page_to_markdown',
           content: [
             expect.objectContaining({
               type: 'tool-result',
               toolCallId: 'call_empty',
               toolName: 'scraper_page_to_markdown',
-              output: { type: 'json', value: '(empty result)' },
+              output: { type: 'json', value: '' },
             } satisfies ToolResultPart),
           ],
         }),