everruns-core 0.9.0

Core agent abstractions for Everruns - agent loop, events, tools, LLM providers
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
// Composable configuration overlay for Harness → Agent → Session merging.
//
// See specs/concepts.md#AgentConfigOverlay for design rationale and diagrams.
//
// Harness, Agent, and Session share additive fields (system_prompt, capabilities,
// initial_files, network_access, tools, max_iterations, default_model_id).
// AgentConfigOverlay extracts this shared shape so merge semantics are defined
// once and tested in one place.
//
// Each entity produces an AgentConfigOverlay via From<&T>. Harness inheritance
// chains produce one overlay per harness. All overlays fold bottom-up into a
// single effective config that RuntimeAgentBuilder::from_overlay() resolves
// into a RuntimeAgent.
//
// Merge semantics per field:
// - system_prompt: base first, overlay appended (concatenate non-empty parts)
// - capabilities: overlay overrides base by capability ID (last wins)
// - initial_files: overlay overrides base by normalized path (last wins)
// - network_access: allowed intersects, blocked unions (can only narrow)
// - default_model_id: overlay wins if set, else inherit base
// - tools: additive (overlay appended after base, deduplicated at build time)
// - max_iterations: overlay wins if set, else inherit base
// - mcp_servers: overlay overrides base by logical server name (last wins)

use crate::agent::Agent;
use crate::capability_types::AgentCapabilityConfig;
use crate::harness::Harness;
use crate::mcp_server::{ScopedMcpServers, merge_scoped_mcp_servers};
use crate::network_access::{self, NetworkAccessList};
use crate::session::Session;
use crate::session_file::InitialFile;
use crate::tool_types::ToolDefinition;
use crate::typed_id::ModelId;

/// A composable configuration layer.
///
/// Produced by Harness, Agent, or Session via `From<&T>`. Layers merge
/// bottom-up into a single effective config for RuntimeAgent building.
#[derive(Debug, Clone, Default)]
pub struct AgentConfigOverlay {
    /// System prompt fragment for this layer.
    pub system_prompt: Option<String>,
    /// Capabilities with per-layer configuration.
    pub capabilities: Vec<AgentCapabilityConfig>,
    /// Starter files for the session filesystem.
    pub initial_files: Vec<InitialFile>,
    /// Network access restrictions.
    pub network_access: Option<NetworkAccessList>,
    /// Default model ID for this layer.
    pub default_model_id: Option<ModelId>,
    /// Tool definitions (client-side or capability-provided).
    pub tools: Vec<ToolDefinition>,
    /// Max iterations per turn.
    pub max_iterations: Option<usize>,
    /// Remote MCP servers scoped to this layer.
    pub mcp_servers: ScopedMcpServers,
}

impl AgentConfigOverlay {
    /// Merge an overlay on top of this base layer, producing a new effective layer.
    ///
    /// This is the core composition operation. Each field follows its own merge
    /// semantic (see module-level docs). The result represents the combined
    /// configuration of both layers.
    pub fn merge(self, overlay: AgentConfigOverlay) -> AgentConfigOverlay {
        let system_prompt = merge_system_prompts(self.system_prompt, overlay.system_prompt);
        let capabilities = merge_capabilities(&self.capabilities, &overlay.capabilities);
        let initial_files = merge_initial_files(&self.initial_files, &overlay.initial_files);
        let network_access = network_access::merge_network_access(
            self.network_access.as_ref(),
            overlay.network_access.as_ref(),
        );
        let default_model_id = overlay.default_model_id.or(self.default_model_id);
        let max_iterations = overlay.max_iterations.or(self.max_iterations);
        let mcp_servers = merge_scoped_mcp_servers(&self.mcp_servers, &overlay.mcp_servers);

        let mut tools = self.tools;
        tools.extend(overlay.tools);

        AgentConfigOverlay {
            system_prompt,
            capabilities,
            initial_files,
            network_access,
            default_model_id,
            tools,
            max_iterations,
            mcp_servers,
        }
    }

    /// Fold multiple layers bottom-up into a single effective layer.
    ///
    /// Layers are applied in order: the first layer is the base, each subsequent
    /// layer is merged on top.
    pub fn fold(layers: impl IntoIterator<Item = AgentConfigOverlay>) -> AgentConfigOverlay {
        layers
            .into_iter()
            .fold(AgentConfigOverlay::default(), |acc, layer| acc.merge(layer))
    }
}

// ---------------------------------------------------------------------------
// Merge helpers (shared by harness inheritance and config layer merging)
// ---------------------------------------------------------------------------

/// Merge two optional system prompt fragments. Base first, overlay appended.
fn merge_system_prompts(base: Option<String>, overlay: Option<String>) -> Option<String> {
    let base = base.map(|s| s.trim().to_string()).filter(|s| !s.is_empty());
    let overlay = overlay
        .map(|s| s.trim().to_string())
        .filter(|s| !s.is_empty());

    match (base, overlay) {
        (None, None) => None,
        (Some(b), None) => Some(b),
        (None, Some(o)) => Some(o),
        (Some(b), Some(o)) => Some(format!("{b}\n\n{o}")),
    }
}

/// Merge capabilities: overlay overrides base by capability ID (last wins).
pub fn merge_capabilities(
    base: &[AgentCapabilityConfig],
    overlay: &[AgentCapabilityConfig],
) -> Vec<AgentCapabilityConfig> {
    let mut merged = base.to_vec();

    for overlay_cap in overlay {
        if let Some(existing) = merged
            .iter_mut()
            .find(|existing| existing.capability_id() == overlay_cap.capability_id())
        {
            *existing = overlay_cap.clone();
        } else {
            merged.push(overlay_cap.clone());
        }
    }

    merged
}

/// Merge initial files: overlay overrides base by normalized path (last wins).
pub fn merge_initial_files(base: &[InitialFile], overlay: &[InitialFile]) -> Vec<InitialFile> {
    let mut merged = base.to_vec();

    for overlay_file in overlay {
        let normalized_path = normalize_initial_file_path(&overlay_file.path);
        if let Some(existing) = merged
            .iter_mut()
            .find(|existing| normalize_initial_file_path(&existing.path) == normalized_path)
        {
            *existing = overlay_file.clone();
        } else {
            merged.push(overlay_file.clone());
        }
    }

    merged
}

/// Normalize an initial file path to a canonical form for comparison.
///
/// Strips `/workspace/` prefix, ensures leading `/`.
pub fn normalize_initial_file_path(path: &str) -> String {
    if path == "/workspace" {
        "/".to_string()
    } else if let Some(stripped) = path.strip_prefix("/workspace/") {
        format!("/{}", stripped.trim_start_matches('/'))
    } else if path.starts_with('/') {
        path.to_string()
    } else {
        format!("/{}", path)
    }
}

// ---------------------------------------------------------------------------
// From conversions
// ---------------------------------------------------------------------------

impl From<&Harness> for AgentConfigOverlay {
    fn from(h: &Harness) -> Self {
        AgentConfigOverlay {
            system_prompt: Some(h.system_prompt.clone()),
            capabilities: h.capabilities.clone(),
            initial_files: h.initial_files.clone(),
            network_access: h.network_access.clone(),
            default_model_id: h.default_model_id,
            tools: vec![],
            max_iterations: None,
            mcp_servers: h.mcp_servers.clone(),
        }
    }
}

impl From<&Agent> for AgentConfigOverlay {
    fn from(a: &Agent) -> Self {
        AgentConfigOverlay {
            system_prompt: Some(a.system_prompt.clone()),
            capabilities: a.capabilities.clone(),
            initial_files: a.initial_files.clone(),
            network_access: a.network_access.clone(),
            default_model_id: a.default_model_id,
            tools: a.tools.clone(),
            max_iterations: a.max_iterations,
            mcp_servers: a.mcp_servers.clone(),
        }
    }
}

impl From<&Session> for AgentConfigOverlay {
    fn from(s: &Session) -> Self {
        AgentConfigOverlay {
            system_prompt: s.system_prompt.clone(),
            capabilities: s.capabilities.clone(),
            initial_files: s.initial_files.clone(),
            network_access: s.network_access.clone(),
            default_model_id: s.model_id,
            tools: s.tools.clone(),
            max_iterations: s.max_iterations,
            mcp_servers: s.mcp_servers.clone(),
        }
    }
}

#[cfg(test)]
mod tests {
    use super::*;
    use crate::capability_types::AgentCapabilityConfig;
    use crate::mcp_server::ScopedMcpServer;
    use crate::network_access::NetworkAccessList;
    use crate::session_file::InitialFile;

    fn make_file(path: &str, content: &str) -> InitialFile {
        InitialFile {
            path: path.to_string(),
            content: content.to_string(),
            encoding: "text".to_string(),
            is_readonly: false,
        }
    }

    #[test]
    fn merge_system_prompts_concatenates() {
        let base = AgentConfigOverlay {
            system_prompt: Some("Base prompt.".into()),
            ..Default::default()
        };
        let overlay = AgentConfigOverlay {
            system_prompt: Some("Overlay prompt.".into()),
            ..Default::default()
        };
        let merged = base.merge(overlay);
        assert_eq!(
            merged.system_prompt.as_deref(),
            Some("Base prompt.\n\nOverlay prompt.")
        );
    }

    #[test]
    fn merge_system_prompts_base_only() {
        let base = AgentConfigOverlay {
            system_prompt: Some("Base.".into()),
            ..Default::default()
        };
        let overlay = AgentConfigOverlay::default();
        let merged = base.merge(overlay);
        assert_eq!(merged.system_prompt.as_deref(), Some("Base."));
    }

    #[test]
    fn merge_system_prompts_overlay_only() {
        let base = AgentConfigOverlay::default();
        let overlay = AgentConfigOverlay {
            system_prompt: Some("Overlay.".into()),
            ..Default::default()
        };
        let merged = base.merge(overlay);
        assert_eq!(merged.system_prompt.as_deref(), Some("Overlay."));
    }

    #[test]
    fn merge_system_prompts_both_empty() {
        let merged = AgentConfigOverlay::default().merge(AgentConfigOverlay::default());
        assert!(merged.system_prompt.is_none());
    }

    #[test]
    fn merge_capabilities_override_by_id() {
        let base = AgentConfigOverlay {
            capabilities: vec![
                AgentCapabilityConfig::new("session_file_system"),
                AgentCapabilityConfig::with_config(
                    "web_fetch",
                    serde_json::json!({"enable_file_download": true}),
                ),
            ],
            ..Default::default()
        };
        let overlay = AgentConfigOverlay {
            capabilities: vec![
                AgentCapabilityConfig::with_config(
                    "web_fetch",
                    serde_json::json!({"enable_file_download": false}),
                ),
                AgentCapabilityConfig::new("current_time"),
            ],
            ..Default::default()
        };
        let merged = base.merge(overlay);

        assert_eq!(merged.capabilities.len(), 3);
        assert_eq!(
            merged.capabilities[0].capability_id(),
            "session_file_system"
        );
        assert_eq!(merged.capabilities[1].capability_id(), "web_fetch");
        assert_eq!(
            merged.capabilities[1],
            AgentCapabilityConfig::with_config(
                "web_fetch",
                serde_json::json!({"enable_file_download": false})
            )
        );
        assert_eq!(merged.capabilities[2].capability_id(), "current_time");
    }

    #[test]
    fn merge_initial_files_override_by_path() {
        let base = AgentConfigOverlay {
            initial_files: vec![
                make_file("/workspace/README.md", "parent"),
                make_file("/workspace/config.txt", "parent-config"),
            ],
            ..Default::default()
        };
        let overlay = AgentConfigOverlay {
            initial_files: vec![
                make_file("README.md", "child"),
                make_file("/notes.txt", "notes"),
            ],
            ..Default::default()
        };
        let merged = base.merge(overlay);

        assert_eq!(merged.initial_files.len(), 3);
        assert_eq!(merged.initial_files[0].content, "child"); // overridden
        assert_eq!(merged.initial_files[1].content, "parent-config"); // kept
        assert_eq!(merged.initial_files[2].content, "notes"); // added
    }

    #[test]
    fn merge_network_access_narrows() {
        let base = AgentConfigOverlay {
            network_access: Some(NetworkAccessList::allow_only([
                "*.example.com",
                "*.github.com",
            ])),
            ..Default::default()
        };
        let overlay = AgentConfigOverlay {
            network_access: Some(NetworkAccessList::allow_only(["api.example.com"])),
            ..Default::default()
        };
        let merged = base.merge(overlay);

        let na = merged.network_access.unwrap();
        assert_eq!(na.allowed, vec!["api.example.com".to_string()]);
    }

    #[test]
    fn merge_model_overlay_wins() {
        let base = AgentConfigOverlay {
            default_model_id: Some(ModelId::from_uuid(uuid::Uuid::from_u128(1))),
            ..Default::default()
        };
        let overlay = AgentConfigOverlay {
            default_model_id: Some(ModelId::from_uuid(uuid::Uuid::from_u128(2))),
            ..Default::default()
        };
        let merged = base.merge(overlay);
        assert_eq!(
            merged.default_model_id,
            Some(ModelId::from_uuid(uuid::Uuid::from_u128(2)))
        );
    }

    #[test]
    fn merge_model_inherits_base() {
        let base = AgentConfigOverlay {
            default_model_id: Some(ModelId::from_uuid(uuid::Uuid::from_u128(1))),
            ..Default::default()
        };
        let overlay = AgentConfigOverlay::default();
        let merged = base.merge(overlay);
        assert_eq!(
            merged.default_model_id,
            Some(ModelId::from_uuid(uuid::Uuid::from_u128(1)))
        );
    }

    #[test]
    fn merge_max_iterations_overlay_wins() {
        let base = AgentConfigOverlay {
            max_iterations: Some(100),
            ..Default::default()
        };
        let overlay = AgentConfigOverlay {
            max_iterations: Some(50),
            ..Default::default()
        };
        let merged = base.merge(overlay);
        assert_eq!(merged.max_iterations, Some(50));
    }

    #[test]
    fn merge_max_iterations_inherits_base() {
        let base = AgentConfigOverlay {
            max_iterations: Some(100),
            ..Default::default()
        };
        let overlay = AgentConfigOverlay::default();
        let merged = base.merge(overlay);
        assert_eq!(merged.max_iterations, Some(100));
    }

    #[test]
    fn merge_tools_additive() {
        use crate::tool_types::{BuiltinTool, ToolDefinition, ToolPolicy};

        let make_tool = |name: &str| {
            ToolDefinition::Builtin(BuiltinTool {
                name: name.to_string(),
                display_name: None,
                description: format!("{name} tool"),
                parameters: serde_json::json!({}),
                policy: ToolPolicy::Auto,
                category: None,
                deferrable: Default::default(),
                hints: crate::tool_types::ToolHints::default(),
                full_parameters: None,
            })
        };

        let base = AgentConfigOverlay {
            tools: vec![make_tool("tool_a")],
            ..Default::default()
        };
        let overlay = AgentConfigOverlay {
            tools: vec![make_tool("tool_b")],
            ..Default::default()
        };
        let merged = base.merge(overlay);
        assert_eq!(merged.tools.len(), 2);
        assert_eq!(merged.tools[0].name(), "tool_a");
        assert_eq!(merged.tools[1].name(), "tool_b");
    }

    #[test]
    fn merge_mcp_servers_overlay_wins_by_name() {
        let mut base_servers = ScopedMcpServers::default();
        base_servers.insert(
            "docs".to_string(),
            ScopedMcpServer {
                url: "https://base.example.com/mcp".to_string(),
                ..Default::default()
            },
        );

        let mut overlay_servers = ScopedMcpServers::default();
        overlay_servers.insert(
            "docs".to_string(),
            ScopedMcpServer {
                url: "https://overlay.example.com/mcp".to_string(),
                ..Default::default()
            },
        );
        overlay_servers.insert(
            "search".to_string(),
            ScopedMcpServer {
                url: "https://search.example.com/mcp".to_string(),
                ..Default::default()
            },
        );

        let merged = AgentConfigOverlay {
            mcp_servers: base_servers,
            ..Default::default()
        }
        .merge(AgentConfigOverlay {
            mcp_servers: overlay_servers,
            ..Default::default()
        });

        assert_eq!(merged.mcp_servers.len(), 2);
        assert_eq!(
            merged
                .mcp_servers
                .get("docs")
                .map(|server| server.url.as_str()),
            Some("https://overlay.example.com/mcp")
        );
        assert_eq!(
            merged
                .mcp_servers
                .get("search")
                .map(|server| server.url.as_str()),
            Some("https://search.example.com/mcp")
        );
    }

    #[test]
    fn fold_three_layers() {
        let harness = AgentConfigOverlay {
            system_prompt: Some("Harness prompt.".into()),
            capabilities: vec![AgentCapabilityConfig::new("session_file_system")],
            initial_files: vec![make_file("/config.txt", "harness")],
            max_iterations: None,
            ..Default::default()
        };
        let agent = AgentConfigOverlay {
            system_prompt: Some("Agent prompt.".into()),
            capabilities: vec![AgentCapabilityConfig::new("current_time")],
            initial_files: vec![make_file("/config.txt", "agent")],
            max_iterations: Some(200),
            ..Default::default()
        };
        let session = AgentConfigOverlay {
            system_prompt: Some("Session prompt.".into()),
            max_iterations: Some(50),
            ..Default::default()
        };

        let effective = AgentConfigOverlay::fold([harness, agent, session]);

        assert_eq!(
            effective.system_prompt.as_deref(),
            Some("Harness prompt.\n\nAgent prompt.\n\nSession prompt.")
        );
        assert_eq!(effective.capabilities.len(), 2);
        assert_eq!(effective.initial_files.len(), 1);
        assert_eq!(effective.initial_files[0].content, "agent");
        assert_eq!(effective.max_iterations, Some(50));
    }

    #[test]
    fn normalize_workspace_prefix() {
        assert_eq!(
            normalize_initial_file_path("/workspace/README.md"),
            "/README.md"
        );
        assert_eq!(normalize_initial_file_path("/workspace"), "/");
        assert_eq!(normalize_initial_file_path("README.md"), "/README.md");
        assert_eq!(normalize_initial_file_path("/README.md"), "/README.md");
    }
}