ag-git 0.15.15

Agentty is an ADE (Agentic Development Environment) for structured, controllable AI-assisted software development.
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
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
use std::fs;
#[cfg(unix)]
use std::os::unix::fs::PermissionsExt;
use std::path::Path;
use std::process::Command;

use mockall::Sequence;
use tempfile::tempdir;

use crate::error::GitError;
use crate::merge::{
    CompatibilityMergeOutput, MergeTreeAttempt, MockCompatibilityMergeRunner, SquashMergeOutcome,
    classify_merge_tree_attempt, has_merge_conflicts,
    has_merge_conflicts_via_temporary_clone_with_runner, resolve_merge_tree_attempt, squash_merge,
};

/// Runs `git` in `repo_path` and asserts the command succeeds.
fn run_git_command(repo_path: &Path, args: &[&str]) {
    let output = Command::new("git")
        .args(args)
        .current_dir(repo_path)
        .output()
        .expect("failed to run git command");

    assert!(
        output.status.success(),
        "git command {:?} failed: {}",
        args,
        String::from_utf8_lossy(&output.stderr)
    );
}

/// Runs `git` in `repo_path` and returns trimmed stdout.
fn run_git_stdout(repo_path: &Path, args: &[&str]) -> String {
    let output = Command::new("git")
        .args(args)
        .current_dir(repo_path)
        .output()
        .expect("failed to run git command");

    assert!(
        output.status.success(),
        "git command {:?} failed: {}",
        args,
        String::from_utf8_lossy(&output.stderr)
    );

    String::from_utf8_lossy(&output.stdout).trim().to_string()
}

/// Creates a committed repository rooted at `repo_path`.
fn setup_test_git_repo(repo_path: &Path) {
    run_git_command(repo_path, &["init", "-b", "main"]);
    run_git_command(repo_path, &["config", "user.name", "Test User"]);
    run_git_command(repo_path, &["config", "user.email", "test@example.com"]);
    fs::write(repo_path.join("README.md"), "base\n").expect("failed to write base file");
    run_git_command(repo_path, &["add", "README.md"]);
    run_git_command(repo_path, &["commit", "-m", "Initial commit"]);
}

/// Creates diverged branches that edit the same line differently.
fn setup_conflicting_branches(repo_path: &Path) {
    run_git_command(repo_path, &["checkout", "-b", "session-branch"]);
    fs::write(repo_path.join("README.md"), "session\n").expect("failed to write session content");
    run_git_command(repo_path, &["add", "README.md"]);
    run_git_command(repo_path, &["commit", "-m", "Session change"]);
    run_git_command(repo_path, &["checkout", "main"]);
    fs::write(repo_path.join("README.md"), "main\n").expect("failed to write main content");
    run_git_command(repo_path, &["add", "README.md"]);
    run_git_command(repo_path, &["commit", "-m", "Main change"]);
}

/// Creates unrelated target and source branches that cannot be merged
/// without an explicit unrelated-histories override.
fn setup_unrelated_branches(repo_path: &Path) {
    run_git_command(repo_path, &["checkout", "--orphan", "unrelated-branch"]);
    run_git_command(repo_path, &["rm", "-rf", "."]);
    fs::write(repo_path.join("unrelated.txt"), "unrelated\n")
        .expect("failed to write unrelated content");
    run_git_command(repo_path, &["add", "unrelated.txt"]);
    run_git_command(repo_path, &["commit", "-m", "Unrelated change"]);
    run_git_command(repo_path, &["checkout", "main"]);
}

/// Adds one ordered checked-command result to a compatibility runner.
fn expect_checked_command(
    command_runner: &mut MockCompatibilityMergeRunner,
    sequence: &mut Sequence,
    result: Result<String, GitError>,
) {
    command_runner
        .expect_run_git_command()
        .times(1)
        .in_sequence(sequence)
        .return_once(move |_, _, _| result);
}

/// Adds successful source and target resolution to a compatibility runner.
fn expect_resolved_revisions(
    command_runner: &mut MockCompatibilityMergeRunner,
    sequence: &mut Sequence,
) {
    expect_checked_command(command_runner, sequence, Ok("source-commit\n".to_string()));
    expect_checked_command(command_runner, sequence, Ok("target-commit\n".to_string()));
}

/// Adds successful clone creation and target checkout to a compatibility
/// runner.
fn expect_prepared_clone(
    command_runner: &mut MockCompatibilityMergeRunner,
    sequence: &mut Sequence,
) {
    expect_checked_command(command_runner, sequence, Ok(String::new()));
    expect_checked_command(command_runner, sequence, Ok(String::new()));
}

/// Adds one ordered merge-command result to a compatibility runner.
fn expect_merge_command(
    command_runner: &mut MockCompatibilityMergeRunner,
    sequence: &mut Sequence,
    result: Result<CompatibilityMergeOutput, GitError>,
) {
    command_runner
        .expect_run_git_command_output()
        .times(1)
        .in_sequence(sequence)
        .return_once(move |_, _| result);
}

/// Executes the compatibility probe through a configured mock runner.
fn run_compatibility_probe_with_mock(
    command_runner: &MockCompatibilityMergeRunner,
) -> Result<bool, GitError> {
    let temporary_directory = tempdir().expect("failed to create temp dir");

    has_merge_conflicts_via_temporary_clone_with_runner(
        Path::new("repository"),
        "session-branch",
        "main",
        &temporary_directory,
        command_runner,
    )
}

/// Creates a deterministic command failure for compatibility-probe tests.
fn compatibility_command_error(detail: &str) -> GitError {
    GitError::CommandFailed {
        command: "git compatibility-probe".to_string(),
        stderr: detail.to_string(),
    }
}

/// Returns merge output that requires an unmerged-file inspection.
fn conflicting_merge_output() -> CompatibilityMergeOutput {
    CompatibilityMergeOutput {
        stderr: b"merge conflict".to_vec(),
        stdout: Vec::new(),
        success: false,
    }
}

#[test]
fn classify_merge_tree_attempt_recognizes_legacy_git_synopsis() {
    // Arrange
    let stderr = b"error: unknown option `write-tree'\nusage: git merge-tree <base-tree> <branch1> <branch2>\n";

    // Act
    let attempt = classify_merge_tree_attempt(Some(129), b"", stderr);

    // Assert
    assert_eq!(attempt, MergeTreeAttempt::Unsupported);
}

#[test]
fn classify_merge_tree_attempt_keeps_supported_usage_errors_failed() {
    // Arrange
    let stderr = b"error: unknown option `invalid'\nusage: git merge-tree [--write-tree] [<options>] <branch1> <branch2>\n";

    // Act
    let attempt = classify_merge_tree_attempt(Some(129), b"", stderr);

    // Assert
    assert_eq!(attempt, MergeTreeAttempt::Failed);
}

#[test]
fn compatibility_probe_preserves_source_resolution_error() {
    // Arrange
    let mut command_runner = MockCompatibilityMergeRunner::new();
    let mut sequence = Sequence::new();
    expect_checked_command(
        &mut command_runner,
        &mut sequence,
        Err(compatibility_command_error("source resolution failed")),
    );

    // Act
    let error = run_compatibility_probe_with_mock(&command_runner)
        .expect_err("source resolution should fail the compatibility probe");

    // Assert
    assert_eq!(
        error.to_string(),
        "git compatibility-probe: source resolution failed"
    );
}

#[test]
fn compatibility_probe_preserves_target_resolution_error() {
    // Arrange
    let mut command_runner = MockCompatibilityMergeRunner::new();
    let mut sequence = Sequence::new();
    expect_checked_command(
        &mut command_runner,
        &mut sequence,
        Ok("source-commit\n".to_string()),
    );
    expect_checked_command(
        &mut command_runner,
        &mut sequence,
        Err(compatibility_command_error("target resolution failed")),
    );

    // Act
    let error = run_compatibility_probe_with_mock(&command_runner)
        .expect_err("target resolution should fail the compatibility probe");

    // Assert
    assert_eq!(
        error.to_string(),
        "git compatibility-probe: target resolution failed"
    );
}

#[test]
fn compatibility_probe_preserves_clone_creation_error() {
    // Arrange
    let mut command_runner = MockCompatibilityMergeRunner::new();
    let mut sequence = Sequence::new();
    expect_resolved_revisions(&mut command_runner, &mut sequence);
    expect_checked_command(
        &mut command_runner,
        &mut sequence,
        Err(compatibility_command_error("clone creation failed")),
    );

    // Act
    let error = run_compatibility_probe_with_mock(&command_runner)
        .expect_err("clone creation should fail the compatibility probe");

    // Assert
    assert_eq!(
        error.to_string(),
        "git compatibility-probe: clone creation failed"
    );
}

#[test]
fn compatibility_probe_preserves_target_checkout_error() {
    // Arrange
    let mut command_runner = MockCompatibilityMergeRunner::new();
    let mut sequence = Sequence::new();
    expect_resolved_revisions(&mut command_runner, &mut sequence);
    expect_checked_command(&mut command_runner, &mut sequence, Ok(String::new()));
    expect_checked_command(
        &mut command_runner,
        &mut sequence,
        Err(compatibility_command_error("target checkout failed")),
    );

    // Act
    let error = run_compatibility_probe_with_mock(&command_runner)
        .expect_err("target checkout should fail the compatibility probe");

    // Assert
    assert_eq!(
        error.to_string(),
        "git compatibility-probe: target checkout failed"
    );
}

#[test]
fn compatibility_probe_preserves_merge_execution_error() {
    // Arrange
    let mut command_runner = MockCompatibilityMergeRunner::new();
    let mut sequence = Sequence::new();
    expect_resolved_revisions(&mut command_runner, &mut sequence);
    expect_prepared_clone(&mut command_runner, &mut sequence);
    expect_merge_command(
        &mut command_runner,
        &mut sequence,
        Err(compatibility_command_error("merge execution failed")),
    );

    // Act
    let error = run_compatibility_probe_with_mock(&command_runner)
        .expect_err("merge execution should fail the compatibility probe");

    // Assert
    assert_eq!(
        error.to_string(),
        "git compatibility-probe: merge execution failed"
    );
}

#[test]
fn compatibility_probe_preserves_unmerged_inspection_error() {
    // Arrange
    let mut command_runner = MockCompatibilityMergeRunner::new();
    let mut sequence = Sequence::new();
    expect_resolved_revisions(&mut command_runner, &mut sequence);
    expect_prepared_clone(&mut command_runner, &mut sequence);
    expect_merge_command(
        &mut command_runner,
        &mut sequence,
        Ok(conflicting_merge_output()),
    );
    expect_checked_command(
        &mut command_runner,
        &mut sequence,
        Err(compatibility_command_error("unmerged inspection failed")),
    );

    // Act
    let error = run_compatibility_probe_with_mock(&command_runner)
        .expect_err("unmerged inspection should fail the compatibility probe");

    // Assert
    assert_eq!(
        error.to_string(),
        "git compatibility-probe: unmerged inspection failed"
    );
}

#[test]
fn compatibility_probe_returns_false_for_clean_merge() {
    // Arrange
    let temp_dir = tempdir().expect("failed to create temp dir");
    setup_test_git_repo(temp_dir.path());
    run_git_command(temp_dir.path(), &["checkout", "-b", "session-branch"]);
    fs::write(temp_dir.path().join("session.txt"), "session\n")
        .expect("failed to write session file");
    run_git_command(temp_dir.path(), &["add", "session.txt"]);
    run_git_command(temp_dir.path(), &["commit", "-m", "Session change"]);

    // Act
    let has_conflicts = resolve_merge_tree_attempt(
        temp_dir.path(),
        "session-branch",
        "main",
        MergeTreeAttempt::Unsupported,
        b"",
        b"legacy git usage",
    )
    .expect("compatibility probe should succeed");

    // Assert
    assert!(!has_conflicts);
}

#[test]
fn compatibility_probe_returns_true_for_conflicting_merge() {
    // Arrange
    let temp_dir = tempdir().expect("failed to create temp dir");
    setup_test_git_repo(temp_dir.path());
    setup_conflicting_branches(temp_dir.path());
    let original_head = run_git_stdout(temp_dir.path(), &["rev-parse", "HEAD"]);

    // Act
    let has_conflicts = resolve_merge_tree_attempt(
        temp_dir.path(),
        "session-branch",
        "main",
        MergeTreeAttempt::Unsupported,
        b"",
        b"legacy git usage",
    )
    .expect("compatibility probe should succeed");

    // Assert
    assert!(has_conflicts);
    assert_eq!(
        run_git_stdout(temp_dir.path(), &["rev-parse", "HEAD"]),
        original_head
    );
    assert_eq!(
        run_git_stdout(temp_dir.path(), &["status", "--porcelain"]),
        ""
    );
}

#[test]
fn compatibility_probe_returns_error_when_merge_cannot_start() {
    // Arrange
    let temp_dir = tempdir().expect("failed to create temp dir");
    setup_test_git_repo(temp_dir.path());
    setup_unrelated_branches(temp_dir.path());

    // Act
    let error = resolve_merge_tree_attempt(
        temp_dir.path(),
        "unrelated-branch",
        "main",
        MergeTreeAttempt::Unsupported,
        b"",
        b"legacy git usage",
    )
    .expect_err("unrelated histories should fail the compatibility probe");

    // Assert
    assert!(
        error
            .to_string()
            .contains("refusing to merge unrelated histories")
    );
}

#[tokio::test]
async fn has_merge_conflicts_returns_false_for_clean_merge() {
    // Arrange
    let temp_dir = tempdir().expect("failed to create temp dir");
    setup_test_git_repo(temp_dir.path());
    run_git_command(temp_dir.path(), &["checkout", "-b", "session-branch"]);
    fs::write(temp_dir.path().join("session.txt"), "session\n")
        .expect("failed to write session file");
    run_git_command(temp_dir.path(), &["add", "session.txt"]);
    run_git_command(temp_dir.path(), &["commit", "-m", "Session change"]);

    // Act
    let has_conflicts = has_merge_conflicts(
        temp_dir.path().to_path_buf(),
        "session-branch".to_string(),
        "main".to_string(),
    )
    .await
    .expect("merge conflict probe should succeed");

    // Assert
    assert!(!has_conflicts);
}

#[tokio::test]
async fn has_merge_conflicts_returns_true_for_conflicting_merge() {
    // Arrange
    let temp_dir = tempdir().expect("failed to create temp dir");
    setup_test_git_repo(temp_dir.path());
    setup_conflicting_branches(temp_dir.path());

    // Act
    let has_conflicts = has_merge_conflicts(
        temp_dir.path().to_path_buf(),
        "session-branch".to_string(),
        "main".to_string(),
    )
    .await
    .expect("merge conflict probe should succeed");

    // Assert
    assert!(has_conflicts);
}

#[tokio::test]
async fn has_merge_conflicts_returns_error_for_missing_branch() {
    // Arrange
    let temp_dir = tempdir().expect("failed to create temp dir");
    setup_test_git_repo(temp_dir.path());

    // Act
    let error = has_merge_conflicts(
        temp_dir.path().to_path_buf(),
        "missing-branch".to_string(),
        "main".to_string(),
    )
    .await
    .expect_err("missing branch should fail conflict detection");

    // Assert
    assert!(error.to_string().contains("git merge-tree"));
    assert!(error.to_string().contains("missing-branch"));
}

#[tokio::test]
async fn has_merge_conflicts_returns_error_for_missing_repository() {
    // Arrange
    let temp_dir = tempdir().expect("failed to create temp dir");
    let missing_repo = temp_dir.path().join("missing");

    // Act
    let error = has_merge_conflicts(
        missing_repo,
        "session-branch".to_string(),
        "main".to_string(),
    )
    .await
    .expect_err("missing repository should fail conflict detection");

    // Assert
    assert!(error.to_string().contains("git merge-tree"));
}

#[tokio::test]
async fn squash_merge_returns_branch_mismatch_error_when_target_is_not_checked_out() {
    // Arrange
    let temp_dir = tempdir().expect("failed to create temp dir");
    setup_test_git_repo(temp_dir.path());
    run_git_command(temp_dir.path(), &["checkout", "-b", "feature-branch"]);

    // Act
    let result = squash_merge(
        temp_dir.path().to_path_buf(),
        "feature-branch".to_string(),
        "main".to_string(),
        "Merge feature".to_string(),
    )
    .await;

    // Assert
    let error = result.expect_err("branch mismatch should fail").to_string();
    assert!(error.contains("repository is on 'feature-branch'"));
    assert!(error.contains("Switch to 'main' first."));
}

#[tokio::test]
async fn squash_merge_commits_the_provided_multiline_message() {
    // Arrange
    let temp_dir = tempdir().expect("failed to create temp dir");
    setup_test_git_repo(temp_dir.path());
    run_git_command(temp_dir.path(), &["checkout", "-b", "feature-branch"]);
    fs::write(temp_dir.path().join("feature.txt"), "feature content")
        .expect("failed to write feature file");
    run_git_command(temp_dir.path(), &["add", "feature.txt"]);
    run_git_command(temp_dir.path(), &["commit", "-m", "Add feature"]);
    run_git_command(temp_dir.path(), &["checkout", "main"]);
    let commit_message = "Refine merge flow\n\n- Reuse the session commit body".to_string();

    // Act
    let result = squash_merge(
        temp_dir.path().to_path_buf(),
        "feature-branch".to_string(),
        "main".to_string(),
        commit_message.clone(),
    )
    .await;
    let head_message = run_git_stdout(temp_dir.path(), &["log", "-1", "--pretty=%B"]);

    // Assert
    assert_eq!(
        result.expect("squash merge should succeed"),
        SquashMergeOutcome::Committed,
    );
    assert_eq!(head_message, commit_message);
}

#[cfg(unix)]
#[tokio::test]
async fn squash_merge_runs_pre_commit_hook() {
    // Arrange
    let temp_dir = tempdir().expect("failed to create temp dir");
    setup_test_git_repo(temp_dir.path());
    run_git_command(temp_dir.path(), &["checkout", "-b", "feature-branch"]);
    fs::write(temp_dir.path().join("feature.txt"), "feature content")
        .expect("failed to write feature file");
    run_git_command(temp_dir.path(), &["add", "feature.txt"]);
    run_git_command(temp_dir.path(), &["commit", "-m", "Add feature"]);
    run_git_command(temp_dir.path(), &["checkout", "main"]);
    let hooks_dir = temp_dir.path().join("test-hooks");
    fs::create_dir(&hooks_dir).expect("failed to create hooks directory");
    let hook_path = hooks_dir.join("pre-commit");
    fs::write(&hook_path, "#!/bin/sh\necho hook-blocked >&2\nexit 1\n")
        .expect("failed to write pre-commit hook");
    let mut permissions = fs::metadata(&hook_path)
        .expect("failed to read hook metadata")
        .permissions();
    permissions.set_mode(0o750);
    fs::set_permissions(&hook_path, permissions).expect("failed to make hook executable");
    run_git_command(temp_dir.path(), &["config", "core.hooksPath", "test-hooks"]);

    // Act
    let error = squash_merge(
        temp_dir.path().to_path_buf(),
        "feature-branch".to_string(),
        "main".to_string(),
        "Squash merge feature".to_string(),
    )
    .await
    .expect_err("pre-commit hook should block the squash commit");

    // Assert
    assert!(error.to_string().contains("hook-blocked"));
}

#[tokio::test]
async fn squash_merge_skips_commit_creation_when_changes_are_already_present() {
    // Arrange
    let temp_dir = tempdir().expect("failed to create temp dir");
    setup_test_git_repo(temp_dir.path());
    run_git_command(temp_dir.path(), &["checkout", "-b", "session-branch"]);
    fs::write(temp_dir.path().join("session.txt"), "session change")
        .expect("failed to write session file");
    run_git_command(temp_dir.path(), &["add", "session.txt"]);
    run_git_command(temp_dir.path(), &["commit", "-m", "Session change"]);
    run_git_command(temp_dir.path(), &["checkout", "main"]);
    fs::write(temp_dir.path().join("session.txt"), "session change")
        .expect("failed to write main file");
    run_git_command(temp_dir.path(), &["add", "session.txt"]);
    run_git_command(
        temp_dir.path(),
        &["commit", "-m", "Apply same change on main"],
    );
    let commit_count_before = run_git_stdout(temp_dir.path(), &["rev-list", "--count", "HEAD"]);
    let head_message_before = run_git_stdout(temp_dir.path(), &["log", "-1", "--pretty=%B"]);

    // Act
    let result = squash_merge(
        temp_dir.path().to_path_buf(),
        "session-branch".to_string(),
        "main".to_string(),
        "Merge session".to_string(),
    )
    .await;
    let commit_count_after = run_git_stdout(temp_dir.path(), &["rev-list", "--count", "HEAD"]);
    let head_message_after = run_git_stdout(temp_dir.path(), &["log", "-1", "--pretty=%B"]);

    // Assert
    assert_eq!(
        result.expect("squash merge should succeed"),
        SquashMergeOutcome::AlreadyPresentInTarget,
    );
    assert_eq!(commit_count_after, commit_count_before);
    assert_eq!(head_message_after, head_message_before);
}

#[tokio::test]
async fn squash_merge_returns_command_detail_for_missing_source_branch() {
    // Arrange
    let temp_dir = tempdir().expect("failed to create temp dir");
    setup_test_git_repo(temp_dir.path());

    // Act
    let result = squash_merge(
        temp_dir.path().to_path_buf(),
        "missing-branch".to_string(),
        "main".to_string(),
        "Merge feature".to_string(),
    )
    .await;

    // Assert
    let error = result.expect_err("missing branch should fail").to_string();
    assert!(error.contains("Failed to squash merge missing-branch"));
    assert!(error.contains("missing-branch"));
}