newt-core 0.8.0

Newt-Agent core types, errors, and the NeMoCode-style tier router
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

use super::*;

#[test]
fn management_discovery_retains_sources_and_namespace_conflicts_without_changing_winners() {
    let dir = tempfile::tempdir().unwrap();
    let home = dir.path().join("home");
    let workspace = dir.path().join("project");
    std::fs::create_dir_all(&home).unwrap();
    std::fs::create_dir_all(&workspace).unwrap();
    let native = home.join("mcp.toml");
    std::fs::write(&native, "[[mcp_servers]]\nname = 'docs_server'\ncommand = 'native-docs'\n[[mcp_servers]]\nname = 'native'\ncommand = 'native-tool'\n").unwrap();
    std::fs::write(
        home.join(".claude.json"),
        r#"{"mcpServers":{"borrowed":{"command":"borrowed-tool"}}}"#,
    )
    .unwrap();
    std::fs::write(workspace.join(".mcp.json"), r#"{"mcpServers":{"borrowed":{"command":"project-tool"},"project":{"command":"project-only"}}}"#).unwrap();
    let configured = [stdio("docs-server", "configured-docs")];
    let report = discover_report_with_namespace_mode(
        &configured,
        Some(&native),
        Some(&home),
        &workspace,
        true,
    );
    assert_eq!(
        report
            .servers
            .iter()
            .map(|server| (server.entry.name.as_str(), server.source))
            .collect::<Vec<_>>(),
        vec![
            ("docs-server", McpSource::Configuration),
            ("native", McpSource::UserMcpFile),
            ("borrowed", McpSource::ClaudeUser),
            ("project", McpSource::ClaudeProject),
        ]
    );
    assert_eq!(report.conflicts.len(), 2);
    assert_eq!(report.conflicts[0].name, "docs_server");
    assert_eq!(report.conflicts[0].source, McpSource::UserMcpFile);
    assert_eq!(report.conflicts[0].winner, "docs-server");
    assert_eq!(report.conflicts[1].source, McpSource::ClaudeProject);
    assert_eq!(report.conflicts[1].winner, "borrowed");
    let legacy =
        discover_with_namespace_mode(&configured, Some(&native), Some(&home), &workspace, true);
    assert_eq!(
        legacy,
        report
            .servers
            .into_iter()
            .map(|server| server.entry)
            .collect::<Vec<_>>()
    );
}

#[test]
fn management_discovery_does_not_elevate_project_configuration() {
    let mut entry = stdio("project", "tool");
    entry.trust = McpTrust::Untrusted;
    let dir = tempfile::tempdir().unwrap();
    let report = discover_report_with_namespace_mode(&[entry], None, None, dir.path(), true);
    assert_eq!(report.servers[0].source, McpSource::Configuration);
    assert_eq!(report.servers[0].entry.trust, McpTrust::Untrusted);
    assert!(admit(&report.servers[0].entry).is_err());
}

#[test]
fn discovers_from_claude_user_and_project_files() {
    let dir = tempfile::tempdir().unwrap();
    let home = dir.path().join("home");
    let ws = dir.path().join("ws");
    std::fs::create_dir_all(&home).unwrap();
    std::fs::create_dir_all(&ws).unwrap();
    std::fs::write(
        home.join(".claude.json"),
        r#"{ "mcpServers": { "user_srv": { "command": "u" } } }"#,
    )
    .unwrap();
    std::fs::write(
        ws.join(".mcp.json"),
        r#"{ "mcpServers": { "proj_srv": { "command": "p" } } }"#,
    )
    .unwrap();

    let got = discover(&[], None, Some(&home), &ws);
    let names: std::collections::BTreeSet<_> = got.iter().map(|e| e.name.as_str()).collect();
    assert!(
        names.contains("user_srv"),
        "user config discovered: {names:?}"
    );
    assert!(
        names.contains("proj_srv"),
        "project config discovered: {names:?}"
    );
}
#[test]
fn discover_marks_newt_sources_trusted_and_claude_untrusted() {
    // Trust provenance is stamped by discover(): the in-memory newt source is
    // trusted; a Claude project overlay is untrusted.
    let dir = tempfile::tempdir().unwrap();
    let ws = dir.path();
    std::fs::write(
        ws.join(".mcp.json"),
        r#"{ "mcpServers": { "proj": { "command": "p" } } }"#,
    )
    .unwrap();
    let got = discover(&[stdio("owned", "o")], None, None, ws);
    let owned = got.iter().find(|e| e.name == "owned").unwrap();
    let proj = got.iter().find(|e| e.name == "proj").unwrap();
    assert_eq!(owned.trust, McpTrust::Trusted);
    assert_eq!(proj.trust, McpTrust::Untrusted);
}
#[test]
fn discover_preserves_untrusted_project_origin_and_does_not_re_elevate() {
    // #1301 residual vector: `Config::resolve` stamps a walked-up project
    // `.newt/config.toml`'s entries UNTRUSTED before handing `cfg.mcp_servers`
    // to discover() as `newt_servers`. discover() must PRESERVE that mark —
    // never re-elevate it to Trusted — while still stamping a genuine
    // newt-owned entry Trusted.
    let mut project_origin = stdio("proj", "p");
    project_origin.trust = McpTrust::Untrusted;
    let owned = stdio("owned", "o"); // default Trusted

    let got = discover(
        &[project_origin, owned],
        None,
        None,
        Path::new("/nonexistent"),
    );
    assert_eq!(
        got.iter().find(|e| e.name == "proj").unwrap().trust,
        McpTrust::Untrusted,
        "a project-origin Untrusted mark must survive discover(), not be re-elevated"
    );
    assert_eq!(
        got.iter().find(|e| e.name == "owned").unwrap().trust,
        McpTrust::Trusted,
        "a genuine newt-owned entry is (still) trusted"
    );
}
#[test]
fn discover_reads_mcp_toml_as_a_newt_owned_source() {
    let dir = tempfile::tempdir().unwrap();
    let mcp_toml = dir.path().join("mcp.toml");
    std::fs::write(
        &mcp_toml,
        "[[mcp_servers]]\nname = \"broken-out\"\ncommand = \"bo-mcp\"\n",
    )
    .unwrap();
    let got = discover(&[], Some(&mcp_toml), None, Path::new("/nonexistent"));
    assert_eq!(got.len(), 1);
    assert_eq!(got[0].name, "broken-out");
    // A missing mcp.toml path is simply skipped (non-fatal).
    assert!(discover(
        &[],
        Some(Path::new("/no/such/mcp.toml")),
        None,
        Path::new("/nope")
    )
    .is_empty());
}

/// #2484: discovery stamps each borrowed entry with the file it came from, so a
/// refusal can name the exact import command.
#[test]
fn discovery_stamps_the_origin_of_borrowed_entries() {
    let dir = tempfile::tempdir().unwrap();
    let home = dir.path().join("home");
    let workspace = dir.path().join("project");
    std::fs::create_dir_all(&home).unwrap();
    std::fs::create_dir_all(&workspace).unwrap();
    std::fs::write(
        home.join(".claude.json"),
        r#"{"mcpServers":{"user-srv":{"command":"u"}}}"#,
    )
    .unwrap();
    std::fs::write(
        workspace.join(".mcp.json"),
        r#"{"mcpServers":{"proj-srv":{"command":"p"}}}"#,
    )
    .unwrap();
    let got = discover(&[], None, Some(&home), &workspace);
    let origin = |name: &str| got.iter().find(|e| e.name == name).unwrap().origin.clone();
    assert_eq!(origin("user-srv"), Some(McpOrigin::ClaudeUser));
    assert_eq!(
        origin("proj-srv"),
        Some(McpOrigin::File(workspace.join(".mcp.json")))
    );
}