Merge pull request #1375 from dgageot/improve-caching

Improve caching

Author: simonferquel

e2e/cagent_exec_test.go

@@ -60,6 +60,12 @@ func TestExec_Anthropic_ToolCall(t *testing.T) {
 	require.Equal(t, "\n--- Agent: root ---\n\nCalling list_directory(path: \"testdata/working_dir\")\n\nlist_directory response → \"FILE README.me\\n\"\n1", out)
 }
 
+func TestExec_Anthropic_AgentsMd(t *testing.T) {
+	out := cagentExec(t, "testdata/agents-md.yaml", "--model=anthropic/claude-sonnet-4-0", "What's 2+2?")
+
+	require.Equal(t, "\n--- Agent: root ---\n2 + 2 = 4", out)
+}
+
 func TestExec_Gemini(t *testing.T) {
 	out := cagentExec(t, "testdata/basic.yaml", "--model=google/gemini-2.5-flash", "What's 2+2?")
 

e2e/e2e_agents.md

@@ -0,0 +1 @@
+This is a test agents.md file.

e2e/testdata/agents-md.yaml

@@ -0,0 +1,8 @@
+agents:
+  root:
+    model: openai/gpt-4o
+    instruction: |
+      You are a knowledgeable assistant that helps users with various tasks.
+      Be helpful, accurate, and concise in your responses.
+    add_prompt_files:
+      - e2e_agents.md

e2e/testdata/cassettes/TestExec_Anthropic.yaml

@@ -18,30 +18,30 @@ interactions:
         content_length: -1
         body: |+
             event: message_start
-            data: {"type":"message_start","message":{"model":"claude-sonnet-4-20250514","id":"msg_01AP9NMKRbBvLzYmCMfHQcte","type":"message","role":"assistant","content":[],"stop_reason":null,"stop_sequence":null,"usage":{"input_tokens":42,"cache_creation_input_tokens":0,"cache_read_input_tokens":0,"cache_creation":{"ephemeral_5m_input_tokens":0,"ephemeral_1h_input_tokens":0},"output_tokens":1,"service_tier":"standard"}}           }
+            data: {"type":"message_start","message":{"model":"claude-sonnet-4-20250514","id":"msg_01GXFRpuydwBQ1cR7FwUzKf2","type":"message","role":"assistant","content":[],"stop_reason":null,"stop_sequence":null,"usage":{"input_tokens":42,"cache_creation_input_tokens":0,"cache_read_input_tokens":0,"cache_creation":{"ephemeral_5m_input_tokens":0,"ephemeral_1h_input_tokens":0},"output_tokens":3,"service_tier":"standard"}}         }
 
             event: content_block_start
-            data: {"type":"content_block_start","index":0,"content_block":{"type":"text","text":""}}
-
-            event: content_block_delta
-            data: {"type":"content_block_delta","index":0,"delta":{"type":"text_delta","text":"2 "}             }
+            data: {"type":"content_block_start","index":0,"content_block":{"type":"text","text":""}      }
 
             event: ping
             data: {"type": "ping"}
 
             event: content_block_delta
-            data: {"type":"content_block_delta","index":0,"delta":{"type":"text_delta","text":"+ 2 = 4"}       }
+            data: {"type":"content_block_delta","index":0,"delta":{"type":"text_delta","text":"2 "}             }
+
+            event: content_block_delta
+            data: {"type":"content_block_delta","index":0,"delta":{"type":"text_delta","text":"+ 2 = 4"}              }
 
             event: content_block_stop
-            data: {"type":"content_block_stop","index":0      }
+            data: {"type":"content_block_stop","index":0}
 
             event: message_delta
-            data: {"type":"message_delta","delta":{"stop_reason":"end_turn","stop_sequence":null},"usage":{"input_tokens":42,"cache_creation_input_tokens":0,"cache_read_input_tokens":0,"output_tokens":13}     }
+            data: {"type":"message_delta","delta":{"stop_reason":"end_turn","stop_sequence":null},"usage":{"input_tokens":42,"cache_creation_input_tokens":0,"cache_read_input_tokens":0,"output_tokens":13}   }
 
             event: message_stop
-            data: {"type":"message_stop"              }
+            data: {"type":"message_stop"             }
 
         headers: {}
         status: 200 OK
         code: 200
-        duration: 3.487458209s
+        duration: 2.017107125s

e2e/testdata/cassettes/TestExec_Anthropic_AgentsMd.yaml

@@ -0,0 +1,47 @@
+---
+version: 2
+interactions:
+    - id: 0
+      request:
+        proto: HTTP/1.1
+        proto_major: 1
+        proto_minor: 1
+        content_length: 0
+        host: api.anthropic.com
+        body: '{"max_tokens":64000,"messages":[{"content":[{"text":"What''s 2+2?","cache_control":{"type":"ephemeral"},"type":"text"}],"role":"user"}],"model":"claude-sonnet-4-0","system":[{"text":"You are a knowledgeable assistant that helps users with various tasks.\nBe helpful, accurate, and concise in your responses.","cache_control":{"type":"ephemeral"},"type":"text"},{"text":"This is a test agents.md file.","cache_control":{"type":"ephemeral"},"type":"text"}],"tools":[],"stream":true}'
+        url: https://api.anthropic.com/v1/messages
+        method: POST
+      response:
+        proto: HTTP/2.0
+        proto_major: 2
+        proto_minor: 0
+        content_length: -1
+        body: |+
+            event: message_start
+            data: {"type":"message_start","message":{"model":"claude-sonnet-4-20250514","id":"msg_012P4u6eXp1GHoJgX7p5Axot","type":"message","role":"assistant","content":[],"stop_reason":null,"stop_sequence":null,"usage":{"input_tokens":51,"cache_creation_input_tokens":0,"cache_read_input_tokens":0,"cache_creation":{"ephemeral_5m_input_tokens":0,"ephemeral_1h_input_tokens":0},"output_tokens":3,"service_tier":"standard"}}     }
+
+            event: content_block_start
+            data: {"type":"content_block_start","index":0,"content_block":{"type":"text","text":""}  }
+
+            event: ping
+            data: {"type": "ping"}
+
+            event: content_block_delta
+            data: {"type":"content_block_delta","index":0,"delta":{"type":"text_delta","text":"2 "}          }
+
+            event: content_block_delta
+            data: {"type":"content_block_delta","index":0,"delta":{"type":"text_delta","text":"+ 2 = 4"}           }
+
+            event: content_block_stop
+            data: {"type":"content_block_stop","index":0      }
+
+            event: message_delta
+            data: {"type":"message_delta","delta":{"stop_reason":"end_turn","stop_sequence":null},"usage":{"input_tokens":51,"cache_creation_input_tokens":0,"cache_read_input_tokens":0,"output_tokens":13}     }
+
+            event: message_stop
+            data: {"type":"message_stop"      }
+
+        headers: {}
+        status: 200 OK
+        code: 200
+        duration: 765.528375ms