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
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
//! #2791: ground admin-directory detection in real Git and tool dispatch on every OS.
use super::*;
use crate::agentic::tools::disable_ocap_tests::{env_lock, EnvVar};
use crate::worktree_adoption::WorktreeSession;

struct NullPresentation;
impl ToolPresentation for NullPresentation {
    fn preview(&mut self, _: &str, _: usize) {}
    fn document(&mut self, _: &str) {}
    fn override_result(&mut self, _: String) {}
}

/// #2791: aggregate shell syntax must not hide a newly created linked checkout.
/// Grounds the directory-delta binding rule in real Git, then verifies command
/// cwd and relative file tools follow it without arming an adoption fence.
#[tokio::test]
async fn worktree_detect_2791_compound_routes_tools() {
    let _lock = env_lock().await;
    let _bypass = EnvVar::set("NEWT_DISABLE_OCAP", "1");
    let _cmd = EnvVar::set("NEWT_WINDOWS_CMD", "1");
    let _venv = EnvVar::unset("NEWT_VENV");
    let _virtual = EnvVar::unset("VIRTUAL_ENV");
    let _git_env: Vec<_> = [
        "GIT_DIR",
        "GIT_WORK_TREE",
        "GIT_COMMON_DIR",
        "GIT_CONFIG",
        "GIT_CONFIG_COUNT",
        "GIT_CONFIG_PARAMETERS",
        "GIT_NAMESPACE",
        "GIT_OBJECT_DIRECTORY",
        "GIT_CEILING_DIRECTORIES",
    ]
    .iter()
    .map(|name| EnvVar::unset(name))
    .collect();
    let temp = tempfile::tempdir().unwrap();
    let root = temp.path().join("main");
    std::fs::create_dir(&root).unwrap();
    let empty = temp.path().join("empty-config");
    std::fs::write(&empty, "").unwrap();
    let templates = temp.path().join("templates");
    std::fs::create_dir(&templates).unwrap();
    let _global = EnvVar::set("GIT_CONFIG_GLOBAL", empty.to_str().unwrap());
    let _system = EnvVar::set("GIT_CONFIG_NOSYSTEM", "1");
    let _templates = EnvVar::set("GIT_TEMPLATE_DIR", templates.to_str().unwrap());
    for args in [
        vec!["init", "-q", "-b", "main"],
        vec![
            "-c",
            "commit.gpgsign=false",
            "commit",
            "--allow-empty",
            "-qm",
            "fixture",
        ],
    ] {
        real_git(&root, &args);
    }
    // #2792: an unrelated invocation cannot claim an externally created tree,
    // whether the session is empty or already has an advisory task binding.
    for (name, prior) in [
        ("external-empty", None),
        ("external-bound", Some("external-empty")),
    ] {
        let session = WorktreeSession::default();
        if let Some(prior) = prior {
            session.record_task_worktree(&temp.path().join(prior), prior);
        }
        let previous = session.task_root(&root);
        let before = detect::Snapshot::before(&root, &crate::Scope::All).unwrap();
        real_git(&root, &["status", "--short"]);
        real_git(
            &root,
            &["worktree", "add", "-b", name, &format!("../{name}")],
        );
        let notice = before.record(
            &session,
            &root,
            &serde_json::json!({"command":"git status --short"}),
            Some(&crate::ExecOutcome::Passed),
        );
        assert_eq!(
            session.task_root(&root),
            previous,
            "unrelated status captured another process's checkout"
        );
        let notice = notice.expect("unmatched candidate must be advisory");
        assert!(notice.contains(name), "{notice}");
    }

    let session = WorktreeSession::default();
    let outcome = std::sync::OnceLock::new();
    let text = execute(
        &mut NullPresentation, "run_command",
        &serde_json::json!({"command":"git worktree add -b detected ../detected 2>&1 | git hash-object --stdin && git worktree list"}),
        root.to_str().unwrap(), false, 40, &Caveats::top(), &mut crate::agentic::NoMcp,
        ToolCollaborators { worktree_session: Some(&session), execution: Some(&outcome), ..Default::default() }, false, PromptDisposition::Act,
    ).await;
    assert_eq!(outcome.get(), Some(&crate::ExecOutcome::Passed), "{text}");
    let task = temp.path().join("detected").canonicalize().unwrap();
    assert_eq!(session.task_root(&root), Some(task.clone()), "{text}");
    assert!(text.contains("Task worktree:"), "{text}");
    assert!(
        session.snapshot().is_none(),
        "detection grants no authority"
    );
    std::fs::write(task.join("marker"), "new task marker").unwrap();
    let directory = std::sync::OnceLock::new();
    let text = execute(
        &mut NullPresentation,
        "run_command",
        &serde_json::json!({"command":"git branch --show-current"}),
        root.to_str().unwrap(),
        false,
        40,
        &Caveats::top(),
        &mut crate::agentic::NoMcp,
        ToolCollaborators {
            worktree_session: Some(&session),
            command_directory: Some(&directory),
            ..Default::default()
        },
        false,
        PromptDisposition::Act,
    )
    .await;
    assert!(text.contains("detected"), "{text}");
    assert_eq!(
        directory.get().map(|p| p.canonicalize().unwrap()),
        Some(task)
    );
    let text = execute(
        &mut NullPresentation,
        "read_file",
        &serde_json::json!({"path":"marker"}),
        root.to_str().unwrap(),
        false,
        40,
        &Caveats::top(),
        &mut crate::agentic::NoMcp,
        ToolCollaborators {
            worktree_session: Some(&session),
            ..Default::default()
        },
        false,
        PromptDisposition::Act,
    )
    .await;
    assert!(text.contains("new task marker"), "{text}");
    for (command, ambiguous) in [
        ("git status --short", false),
        (
            "git worktree add -b one ../one && git worktree add -b two ../two",
            true,
        ),
    ] {
        let session = WorktreeSession::default();
        let outcome = std::sync::OnceLock::new();
        let text = execute(
            &mut NullPresentation,
            "run_command",
            &serde_json::json!({"command":command}),
            root.to_str().unwrap(),
            false,
            40,
            &Caveats::top(),
            &mut crate::agentic::NoMcp,
            ToolCollaborators {
                worktree_session: Some(&session),
                execution: Some(&outcome),
                ..Default::default()
            },
            false,
            PromptDisposition::Act,
        )
        .await;
        assert_eq!(outcome.get(), Some(&crate::ExecOutcome::Passed), "{text}");
        assert!(session.task_hint().is_none(), "{text}");
        assert_eq!(text.contains("Multiple new worktrees"), ambiguous, "{text}");
    }
}

fn metadata_repo() -> tempfile::TempDir {
    let temp = tempfile::tempdir().unwrap();
    std::fs::create_dir_all(temp.path().join("main/.git")).unwrap();
    temp
}

fn add_metadata(temp: &Path, name: &str) -> PathBuf {
    let root = temp.join(name);
    let admin = temp.join("main/.git/worktrees").join(name);
    std::fs::create_dir_all(&admin).unwrap();
    std::fs::create_dir(&root).unwrap();
    std::fs::write(
        root.join(".git"),
        format!("gitdir: ../main/.git/worktrees/{name}\n"),
    )
    .unwrap();
    std::fs::write(admin.join("gitdir"), format!("../../../../{name}/.git\n")).unwrap();
    std::fs::write(admin.join("commondir"), "../..\n").unwrap();
    std::fs::write(admin.join("HEAD"), format!("ref: refs/heads/{name}\n")).unwrap();
    root.canonicalize().unwrap()
}

/// #2791: successful non-worktree commands are silent; multiple new entries
/// bind none and explain the ambiguity, preserving the previous task locator.
#[test]
fn worktree_detect_2791_zero_or_multiple_preserve_state() {
    let temp = metadata_repo();
    let root = temp.path().join("main");
    let session = WorktreeSession::default();
    let before = detect::Snapshot::before(&root, &crate::Scope::All).unwrap();
    assert!(before
        .record(
            &session,
            &root,
            &serde_json::json!({"command":"git worktree add -b task ../task"}),
            Some(&crate::ExecOutcome::Passed)
        )
        .is_none());
    assert!(session.task_hint().is_none());
    let old = add_metadata(temp.path(), "old");
    session.record_task_worktree(&old, "old");
    let before = detect::Snapshot::before(&root, &crate::Scope::All).unwrap();
    add_metadata(temp.path(), "one");
    add_metadata(temp.path(), "two");
    let notice = before
        .record(
            &session,
            &root,
            &serde_json::json!({"command":"git worktree add -b task ../task"}),
            Some(&crate::ExecOutcome::Passed),
        )
        .unwrap();
    assert!(notice.contains("Multiple new worktrees"));
    assert_eq!(session.task_root(&root), Some(old));
}

/// #2791: a linked starting checkout uses the common directory; detection
/// needs neither ambient mode nor an adoption policy, and emits no repeat.
#[test]
fn worktree_detect_2791_linked_origin_and_once_only() {
    let temp = metadata_repo();
    let original = add_metadata(temp.path(), "original");
    let before = detect::Snapshot::before(&original, &crate::Scope::All).unwrap();
    let task = add_metadata(temp.path(), "task");
    let session = WorktreeSession::default();
    let text = before
        .record(
            &session,
            &original,
            &serde_json::json!({"command":"git worktree add -b task ../task"}),
            Some(&crate::ExecOutcome::Passed),
        )
        .unwrap();
    assert!(text.contains("branch task"));
    assert_eq!(session.task_root(&original), Some(task));
    assert!(session.snapshot().is_none());
    let before = detect::Snapshot::before(&original, &crate::Scope::All).unwrap();
    assert!(before
        .record(
            &session,
            &original,
            &serde_json::json!({"command":"git worktree add -b task ../task"}),
            Some(&crate::ExecOutcome::Passed)
        )
        .is_none());
}

/// #2791: failed/unobserved execution and forged/missing reciprocal metadata
/// cannot bind; an alias entry cannot relabel an existing worktree as new.
#[test]
fn worktree_detect_2791_rejects_unproven_candidates() {
    for case in [
        "failed",
        "unobserved",
        "backlink",
        "gitfile",
        "alias",
        "head",
    ] {
        let temp = metadata_repo();
        let root = temp.path().join("main");
        let old = add_metadata(temp.path(), "old");
        let session = WorktreeSession::default();
        session.record_task_worktree(&old, "old");
        let before = detect::Snapshot::before(&root, &crate::Scope::All).unwrap();
        let task = add_metadata(temp.path(), "task");
        let admin = root.join(".git/worktrees/task");
        match case {
            "backlink" => std::fs::write(admin.join("gitdir"), "").unwrap(),
            "gitfile" => std::fs::write(task.join(".git"), "gitdir: missing").unwrap(),
            "alias" => std::fs::write(admin.join("gitdir"), "../../../../old/.git\n").unwrap(),
            "head" => std::fs::write(admin.join("HEAD"), "ref: refs/heads/../bad").unwrap(),
            _ => {}
        }
        let outcome = match case {
            "failed" => Some(&crate::ExecOutcome::Failed),
            "unobserved" => None,
            _ => Some(&crate::ExecOutcome::Passed),
        };
        assert!(
            before
                .record(
                    &session,
                    &root,
                    &serde_json::json!({"command":"git worktree add -b task ../task"}),
                    outcome
                )
                .is_none(),
            "{case}"
        );
        assert_eq!(session.task_root(&root), Some(old), "{case}");
    }
}

/// #2791: discovery cannot replace or arm a confined adoption, or scan an
/// unreadable/non-directory admin list as though it had been empty.
#[test]
fn worktree_detect_2791_preserves_adoption_and_unknown_snapshot() {
    let (temp, policy, _) = crate::worktree_adoption::tests::fixture(false);
    crate::worktree_adoption::tests::link(&policy);
    let root = temp.path().join("main");
    let session = WorktreeSession::default();
    record_verified_creation(&session, policy.clone(), false);
    let before = detect::Snapshot::before(&root, &crate::Scope::All).unwrap();
    add_metadata(temp.path(), "later");
    assert!(before
        .record(
            &session,
            &root,
            &serde_json::json!({"command":"git worktree add -b task ../task"}),
            Some(&crate::ExecOutcome::Passed)
        )
        .is_none());
    assert_eq!(session.task_root(&root), Some(policy.worktree));
    assert!(session.snapshot().is_some());
    assert!(detect::Snapshot::before(&root, &crate::Scope::none()).is_none());
    let temp = metadata_repo();
    let root = temp.path().join("main");
    std::fs::write(root.join(".git/worktrees"), "not a directory").unwrap();
    assert!(detect::Snapshot::before(&root, &crate::Scope::All).is_none());
}

fn real_git(root: &Path, args: &[&str]) {
    let out = std::process::Command::new("git")
        .current_dir(root)
        .env("GIT_AUTHOR_NAME", "Test")
        .env("GIT_AUTHOR_EMAIL", "test@example.invalid")
        .env("GIT_COMMITTER_NAME", "Test")
        .env("GIT_COMMITTER_EMAIL", "test@example.invalid")
        .args(args)
        .output()
        .unwrap();
    assert!(
        out.status.success(),
        "{}",
        String::from_utf8_lossy(&out.stderr)
    );
}

/// #2792: only a destination operand from an inspected creation stage can
/// attribute a candidate. Resolve cwd/-C before comparing canonical paths;
/// quoted lookalikes, branch/start-point operands and expansions cannot bind.
#[test]
fn worktree_detect_2792_destination_provenance() {
    for (command, cwd, matches) in [
        (
            "git worktree add -b task ../task 2>&1 | cat && echo done",
            None,
            true,
        ),
        (
            "echo ready; git worktree add ../task task; git status",
            None,
            true,
        ),
        ("git worktree add -B task -- ../task", None, true),
        ("git -C sub -C .. worktree add ../task", None, true),
        (
            "cd sub && git worktree add ../../task && echo done",
            None,
            true,
        ),
        ("git worktree add ../../task", Some("sub"), true),
        ("git worktree add ../task", Some("sub"), false),
        ("git status", None, false),
        ("echo 'git worktree add ../task'", None, false),
        ("echo git worktree add ../task", None, false),
        (
            "git worktree add -b task ../different && echo ../task",
            None,
            false,
        ),
        ("git worktree add -b ../task ../different", None, false),
        ("git worktree add ../different ../task", None, false),
        ("git worktree add \"$DEST\"", None, false),
        (
            "echo before && cd sub && git worktree add ../task",
            None,
            false,
        ),
        ("sh -c 'git worktree add ../task'", None, false),
        ("git worktree add --unknown ../task", None, false),
    ] {
        let temp = metadata_repo();
        let root = temp.path().join("main");
        std::fs::create_dir(root.join("sub")).unwrap();
        let before = detect::Snapshot::before(&root, &crate::Scope::All).unwrap();
        let task = add_metadata(temp.path(), "task");
        let session = WorktreeSession::default();
        let mut args = serde_json::json!({"command":command});
        if let Some(cwd) = cwd {
            args["cwd"] = cwd.into();
        }
        let notice = before
            .record(&session, &root, &args, Some(&crate::ExecOutcome::Passed))
            .unwrap();
        assert_eq!(
            session.task_root(&root).is_some(),
            matches,
            "{command}: {notice}"
        );
        assert!(
            notice.contains(&crate::worktree_adoption::task_path_literal(&task)),
            "{notice}"
        );
        assert_eq!(
            notice.contains("routing is unchanged"),
            !matches,
            "{notice}"
        );
    }
}