agit 1.3.0

AI-native Git wrapper for capturing context alongside code
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
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
//! Commit pipeline implementation.
//!
//! Orchestrates the full commit workflow:
//! 1. Acquire lock
//!    1.5. Check for semantic conflicts (Safety Valve)
//! 2. Read index entries
//! 3. Create trace blob
//! 4. Create/get roadmap blob
//! 5. Create git commit (if staged changes exist)
//! 6. Get git commit hash
//! 7. Create neural commit
//! 8. Update refs
//! 9. Clear index
//! 10. Release lock (automatic on drop)

use std::path::PathBuf;

use crate::core::reconcile;
use crate::core::SynthesizeSummary;
use crate::domain::{BlobContent, NeuralCommit, WrappedBlob, WrappedNeuralCommit};
use crate::error::{AgitError, Result};
use crate::git::GitRepository;
use crate::safety::{lock_path, LockGuard};
use crate::storage::{
    FileHeadStore, FileIndexStore, FileObjectStore, FileRefStore, GitObjectStore, GitRefStore,
    HeadStore, IndexStore, ObjectStore, RefStore,
};

/// The state of changes detected in the repository.
#[derive(Debug, Clone, PartialEq, Eq)]
pub enum ChangeState {
    /// Code + Memory changed - Standard git commit.
    CodeAndMemory,
    /// Memory only changed - \[Agit\] prefix commit.
    MemoryOnly,
    /// Nothing changed - Abort.
    NoChanges,
}

/// Result of a successful commit.
pub struct CommitResult {
    /// The hash of the new neural commit.
    pub neural_hash: String,
    /// The hash of the git commit.
    pub git_hash: String,
    /// Whether a new git commit was created (vs linking to existing HEAD).
    pub git_commit_created: bool,
    /// Whether this was a memory-only commit (with \[Agit\] prefix).
    pub is_memory_only: bool,
}

/// The commit pipeline orchestrates the full commit workflow.
pub struct CommitPipeline {
    agit_dir: PathBuf,
    git: GitRepository,
    objects: FileObjectStore,
    refs: FileRefStore,
    head: FileHeadStore,
    index: FileIndexStore,
}

impl CommitPipeline {
    /// Create a new commit pipeline with file-based storage (V1).
    pub fn new(
        agit_dir: PathBuf,
        git: GitRepository,
        objects: FileObjectStore,
        refs: FileRefStore,
        head: FileHeadStore,
        index: FileIndexStore,
    ) -> Self {
        Self {
            agit_dir,
            git,
            objects,
            refs,
            head,
            index,
        }
    }

    /// Detect the current change state.
    pub fn detect_change_state(&self) -> Result<ChangeState> {
        let has_staged = self.git.has_staged_changes()?;
        let has_code = self.git.has_code_changes()?;
        let has_index = !self.index.is_empty()?;
        let has_agit_only = self.git.has_agit_only_changes()?;

        if has_staged || has_code {
            Ok(ChangeState::CodeAndMemory)
        } else if has_index || has_agit_only {
            Ok(ChangeState::MemoryOnly)
        } else {
            Ok(ChangeState::NoChanges)
        }
    }

    /// Execute the commit pipeline.
    ///
    /// # Arguments
    ///
    /// * `message` - The commit message
    /// * `summary` - The synthesized summary
    /// * `force` - If true, skip semantic conflict check
    pub fn execute(&mut self, message: &str, summary: &str, force: bool) -> Result<CommitResult> {
        // 1. Acquire exclusive lock
        let _lock = LockGuard::acquire(&lock_path(&self.agit_dir))?;

        // 2. Read index entries
        let entries = if self.index.has_staged()? {
            self.index.read_staged()?
        } else {
            self.index.read_all()?
        };

        // 1.5. Check for semantic conflicts (Safety Valve)
        if !force {
            let branch = self.head.get()?.unwrap_or_else(|| "main".to_string());
            let conflict = reconcile::check_for_conflicts(
                &self.git,
                &self.objects,
                &self.refs,
                &branch,
                &entries,
            )?;

            if conflict.has_conflict {
                return Err(AgitError::SemanticConflict {
                    files: conflict.conflicting_files,
                });
            }
        }

        // 3. Create trace blob
        let trace_content = SynthesizeSummary::format_trace(&entries);
        let trace_blob = BlobContent::trace(&trace_content);
        let trace_json = serde_json::to_vec(&WrappedBlob::wrap(trace_blob))?;
        let trace_hash = self.objects.save(&trace_json)?;

        // 4. Get or create roadmap blob
        let roadmap_hash = self.get_or_create_roadmap()?;

        // 5. Get current branch
        let branch = self.head.get()?.unwrap_or_else(|| "main".to_string());

        // 6. Get parent neural commit hash(es)
        let parent_hashes = self.get_parent_hashes(&branch)?;

        // 7. Handle change state
        let change_state = self.detect_change_state()?;
        let (git_hash, git_commit_created, is_memory_only) = match change_state {
            ChangeState::CodeAndMemory => {
                if self.git.has_staged_changes()? {
                    (self.git.commit(message)?, true, false)
                } else {
                    (self.git.head_commit_hash()?, false, false)
                }
            },
            ChangeState::MemoryOnly => {
                // V1: Stage .agit/ and create git commit for Journal Entry
                self.git.stage_files(&[".agit/"])?;
                let prefixed = format!("[Agit] Journal: {}", message);
                (self.git.commit(&prefixed)?, true, true)
            },
            ChangeState::NoChanges => {
                // NoChanges reaching here means --journal was passed (checked in CLI)
                // V1: Stage .agit/ and create git commit for Journal Entry (decision checkpoint)
                self.git.stage_files(&[".agit/"])?;
                let prefixed = format!("[Agit] Journal: {}", message);
                (self.git.commit(&prefixed)?, true, true)
            },
        };

        // 8. Create neural commit
        let author = self
            .git
            .config_user_email()?
            .unwrap_or_else(|| "unknown".to_string());

        let neural_commit = if parent_hashes.len() > 1 {
            NeuralCommit::new_with_parents(
                &git_hash,
                parent_hashes,
                &author,
                &roadmap_hash,
                &trace_hash,
                summary,
            )
        } else {
            NeuralCommit::new(
                &git_hash,
                parent_hashes.into_iter().next(),
                &author,
                &roadmap_hash,
                &trace_hash,
                summary,
            )
        };

        // 9. Save neural commit
        let wrapped = WrappedNeuralCommit::wrap(neural_commit);
        let commit_json = serde_json::to_vec(&wrapped)?;
        let neural_hash = self.objects.save(&commit_json)?;

        // 10. Update branch ref
        self.refs.update(&branch, &neural_hash)?;

        // 10.5. Index entries for full-text search (non-fatal)
        if let Err(e) = crate::search::indexer::index_entries(&self.agit_dir, &entries) {
            tracing::warn!("Failed to index entries for search: {}", e);
        }

        // 11. Clear index
        if self.index.has_staged()? {
            self.index.clear_staged()?;
        } else {
            self.index.clear()?;
        }

        Ok(CommitResult {
            neural_hash,
            git_hash,
            git_commit_created,
            is_memory_only,
        })
    }

    /// Get or create the roadmap blob.
    fn get_or_create_roadmap(&self) -> Result<String> {
        let roadmap =
            BlobContent::roadmap("No roadmap set. Use 'agit roadmap' to set project goals.");
        let wrapped = WrappedBlob::wrap(roadmap);
        let json = serde_json::to_vec(&wrapped)?;
        self.objects.save(&json)
    }

    /// Find neural commit hash by git commit hash.
    fn find_neural_by_git_hash(&self, git_hash: &str) -> Result<Option<String>> {
        for branch in self.refs.list()? {
            if let Some(mut neural_hash) = self.refs.get(&branch)? {
                let mut visited = std::collections::HashSet::new();
                loop {
                    if visited.contains(&neural_hash) {
                        break;
                    }
                    visited.insert(neural_hash.clone());

                    let data = self.objects.load(&neural_hash)?;
                    let wrapped: WrappedNeuralCommit = serde_json::from_slice(&data)?;

                    if wrapped.data.git_hash.starts_with(git_hash)
                        || git_hash.starts_with(&wrapped.data.git_hash)
                    {
                        return Ok(Some(neural_hash));
                    }

                    if let Some(parent) = wrapped.data.first_parent() {
                        neural_hash = parent.to_string();
                    } else {
                        break;
                    }
                }
            }
        }
        Ok(None)
    }

    /// Get parent hashes for the neural commit.
    fn get_parent_hashes(&self, branch: &str) -> Result<Vec<String>> {
        let mut parents = Vec::new();

        if let Some(hash) = self.refs.get(branch)? {
            parents.push(hash);
        }

        if self.git.is_merging()? {
            if let Some(merge_git_hash) = self.git.merge_head_hash()? {
                if let Some(neural_hash) = self.find_neural_by_git_hash(&merge_git_hash)? {
                    if !parents.contains(&neural_hash) {
                        parents.push(neural_hash);
                    }
                }
            }
        }

        Ok(parents)
    }

    /// Link pending thoughts to an existing git commit.
    ///
    /// This is used by git hooks to attach thoughts recorded via MCP
    /// to commits made directly with `git commit`.
    ///
    /// Unlike `execute()`, this does NOT create a new git commit -
    /// it only creates a neural commit pointing to the provided git hash.
    pub fn link_to_existing_commit(
        &mut self,
        git_hash: &str,
        summary: &str,
    ) -> Result<CommitResult> {
        // 1. Acquire exclusive lock
        let _lock = LockGuard::acquire(&lock_path(&self.agit_dir))?;

        // 2. Read index entries
        let entries = if self.index.has_staged()? {
            self.index.read_staged()?
        } else {
            self.index.read_all()?
        };

        // 3. Create trace blob
        let trace_content = SynthesizeSummary::format_trace(&entries);
        let trace_blob = BlobContent::trace(&trace_content);
        let trace_json = serde_json::to_vec(&WrappedBlob::wrap(trace_blob))?;
        let trace_hash = self.objects.save(&trace_json)?;

        // 4. Get or create roadmap blob
        let roadmap_hash = self.get_or_create_roadmap()?;

        // 5. Get current branch
        let branch = self.head.get()?.unwrap_or_else(|| "main".to_string());

        // 6. Get parent neural commit hash(es)
        let parent_hashes = self.get_parent_hashes(&branch)?;

        // 7. Create neural commit linked to existing git hash
        let author = self
            .git
            .config_user_email()?
            .unwrap_or_else(|| "unknown".to_string());

        let neural_commit = if parent_hashes.len() > 1 {
            NeuralCommit::new_with_parents(
                git_hash,
                parent_hashes,
                &author,
                &roadmap_hash,
                &trace_hash,
                summary,
            )
        } else {
            NeuralCommit::new(
                git_hash,
                parent_hashes.into_iter().next(),
                &author,
                &roadmap_hash,
                &trace_hash,
                summary,
            )
        };

        // 8. Save neural commit
        let wrapped = WrappedNeuralCommit::wrap(neural_commit);
        let commit_json = serde_json::to_vec(&wrapped)?;
        let neural_hash = self.objects.save(&commit_json)?;

        // 9. Update branch ref
        self.refs.update(&branch, &neural_hash)?;

        // 9.5. Index entries for full-text search (non-fatal)
        if let Err(e) = crate::search::indexer::index_entries(&self.agit_dir, &entries) {
            tracing::warn!("Failed to index entries for search: {}", e);
        }

        // 10. Clear index
        if self.index.has_staged()? {
            self.index.clear_staged()?;
        } else {
            self.index.clear()?;
        }

        Ok(CommitResult {
            neural_hash,
            git_hash: git_hash.to_string(),
            git_commit_created: false,
            is_memory_only: false,
        })
    }
}

/// Git-native commit pipeline using Git ODB and refs/agit/* namespace.
///
/// This is the V2 storage implementation that makes Agit invisible
/// in `git status` and `git branch -a`.
pub struct GitNativeCommitPipeline {
    agit_dir: PathBuf,
    git: GitRepository,
    objects: GitObjectStore,
    refs: GitRefStore,
    head: FileHeadStore,
    index: FileIndexStore,
}

impl GitNativeCommitPipeline {
    /// Create a new Git-native commit pipeline (V2).
    ///
    /// # Arguments
    ///
    /// * `agit_dir` - Path to the .agit directory (for local state)
    /// * `git` - Git repository wrapper
    pub fn new(agit_dir: PathBuf, git: GitRepository) -> Result<Self> {
        let repo_path = git
            .workdir()
            .ok_or(AgitError::NotGitRepository)?
            .to_path_buf();

        Ok(Self {
            agit_dir: agit_dir.clone(),
            git,
            objects: GitObjectStore::new(&repo_path),
            refs: GitRefStore::new(&repo_path),
            head: FileHeadStore::new(&agit_dir),
            index: FileIndexStore::new(&agit_dir),
        })
    }

    /// Detect the current change state.
    pub fn detect_change_state(&self) -> Result<ChangeState> {
        let has_staged = self.git.has_staged_changes()?;
        let has_code = self.git.has_code_changes()?;
        let has_index = !self.index.is_empty()?;

        if has_staged || has_code {
            Ok(ChangeState::CodeAndMemory)
        } else if has_index {
            // In V2, memory-only doesn't stage .agit/ - just creates neural commit
            Ok(ChangeState::MemoryOnly)
        } else {
            Ok(ChangeState::NoChanges)
        }
    }

    /// Execute the commit pipeline.
    ///
    /// For V2 Git-native storage:
    /// - Code changes: Create Git commit, then neural commit pointing to it
    /// - Memory-only: Create neural commit only (no Git commit needed)
    ///
    /// # Arguments
    ///
    /// * `message` - The commit message
    /// * `summary` - The synthesized summary
    /// * `force` - If true, skip semantic conflict check
    pub fn execute(&mut self, message: &str, summary: &str, force: bool) -> Result<CommitResult> {
        // 1. Acquire exclusive lock
        let _lock = LockGuard::acquire(&lock_path(&self.agit_dir))?;

        // 2. Read index entries
        let entries = if self.index.has_staged()? {
            self.index.read_staged()?
        } else {
            self.index.read_all()?
        };

        // 1.5. Check for semantic conflicts (Safety Valve)
        if !force {
            let branch = self.head.get()?.unwrap_or_else(|| "main".to_string());
            let conflict = reconcile::check_for_conflicts(
                &self.git,
                &self.objects,
                &self.refs,
                &branch,
                &entries,
            )?;

            if conflict.has_conflict {
                return Err(AgitError::SemanticConflict {
                    files: conflict.conflicting_files,
                });
            }
        }

        // 3. Create trace blob
        let trace_content = SynthesizeSummary::format_trace(&entries);
        let trace_blob = BlobContent::trace(&trace_content);
        let trace_json = serde_json::to_vec(&WrappedBlob::wrap(trace_blob))?;
        let trace_hash = self.objects.save(&trace_json)?;

        // 4. Get or create roadmap blob
        let roadmap_hash = self.get_or_create_roadmap()?;

        // 5. Get current branch
        let branch = self.head.get()?.unwrap_or_else(|| "main".to_string());

        // 6. Get parent neural commit hash(es)
        let parent_hashes = self.get_parent_hashes(&branch)?;

        // 7. Handle change state
        let change_state = self.detect_change_state()?;
        let (git_hash, git_commit_created, is_memory_only) = match change_state {
            ChangeState::CodeAndMemory => {
                if self.git.has_staged_changes()? {
                    (self.git.commit(message)?, true, false)
                } else {
                    (self.git.head_commit_hash()?, false, false)
                }
            },
            ChangeState::MemoryOnly => {
                // V2: Create empty Git commit for Journal Entry (memory-only)
                let prefixed = format!("[Agit] Journal: {}", message);
                (self.git.commit_empty(&prefixed)?, true, true)
            },
            ChangeState::NoChanges => {
                // NoChanges reaching here means --journal was passed (checked in CLI)
                // V2: Create empty Git commit for Journal Entry (decision checkpoint)
                let prefixed = format!("[Agit] Journal: {}", message);
                (self.git.commit_empty(&prefixed)?, true, true)
            },
        };

        // 8. Create neural commit
        let author = self
            .git
            .config_user_email()?
            .unwrap_or_else(|| "unknown".to_string());

        let neural_commit = if parent_hashes.len() > 1 {
            NeuralCommit::new_with_parents(
                &git_hash,
                parent_hashes,
                &author,
                &roadmap_hash,
                &trace_hash,
                summary,
            )
        } else {
            NeuralCommit::new(
                &git_hash,
                parent_hashes.into_iter().next(),
                &author,
                &roadmap_hash,
                &trace_hash,
                summary,
            )
        };

        // 9. Save neural commit
        let wrapped = WrappedNeuralCommit::wrap(neural_commit);
        let commit_json = serde_json::to_vec(&wrapped)?;
        let neural_hash = self.objects.save(&commit_json)?;

        // 10. Update branch ref
        self.refs.update(&branch, &neural_hash)?;

        // 10.5. Index entries for full-text search (non-fatal)
        if let Err(e) = crate::search::indexer::index_entries(&self.agit_dir, &entries) {
            tracing::warn!("Failed to index entries for search: {}", e);
        }

        // 11. Clear index
        if self.index.has_staged()? {
            self.index.clear_staged()?;
        } else {
            self.index.clear()?;
        }

        Ok(CommitResult {
            neural_hash,
            git_hash,
            git_commit_created,
            is_memory_only,
        })
    }

    /// Get or create the roadmap blob.
    fn get_or_create_roadmap(&self) -> Result<String> {
        let roadmap =
            BlobContent::roadmap("No roadmap set. Use 'agit roadmap' to set project goals.");
        let wrapped = WrappedBlob::wrap(roadmap);
        let json = serde_json::to_vec(&wrapped)?;
        self.objects.save(&json)
    }

    /// Find neural commit hash by git commit hash.
    fn find_neural_by_git_hash(&self, git_hash: &str) -> Result<Option<String>> {
        for branch in self.refs.list()? {
            if let Some(mut neural_hash) = self.refs.get(&branch)? {
                let mut visited = std::collections::HashSet::new();
                loop {
                    if visited.contains(&neural_hash) {
                        break;
                    }
                    visited.insert(neural_hash.clone());

                    let data = self.objects.load(&neural_hash)?;
                    let wrapped: WrappedNeuralCommit = serde_json::from_slice(&data)?;

                    if wrapped.data.git_hash.starts_with(git_hash)
                        || git_hash.starts_with(&wrapped.data.git_hash)
                    {
                        return Ok(Some(neural_hash));
                    }

                    if let Some(parent) = wrapped.data.first_parent() {
                        neural_hash = parent.to_string();
                    } else {
                        break;
                    }
                }
            }
        }
        Ok(None)
    }

    /// Get parent hashes for the neural commit.
    fn get_parent_hashes(&self, branch: &str) -> Result<Vec<String>> {
        let mut parents = Vec::new();

        if let Some(hash) = self.refs.get(branch)? {
            parents.push(hash);
        }

        if self.git.is_merging()? {
            if let Some(merge_git_hash) = self.git.merge_head_hash()? {
                if let Some(neural_hash) = self.find_neural_by_git_hash(&merge_git_hash)? {
                    if !parents.contains(&neural_hash) {
                        parents.push(neural_hash);
                    }
                }
            }
        }

        Ok(parents)
    }

    /// Link pending thoughts to an existing git commit.
    ///
    /// This is used by git hooks to attach thoughts recorded via MCP
    /// to commits made directly with `git commit`.
    ///
    /// Unlike `execute()`, this does NOT create a new git commit -
    /// it only creates a neural commit pointing to the provided git hash.
    pub fn link_to_existing_commit(
        &mut self,
        git_hash: &str,
        summary: &str,
    ) -> Result<CommitResult> {
        // 1. Acquire exclusive lock
        let _lock = LockGuard::acquire(&lock_path(&self.agit_dir))?;

        // 2. Read index entries
        let entries = if self.index.has_staged()? {
            self.index.read_staged()?
        } else {
            self.index.read_all()?
        };

        // 3. Create trace blob
        let trace_content = SynthesizeSummary::format_trace(&entries);
        let trace_blob = BlobContent::trace(&trace_content);
        let trace_json = serde_json::to_vec(&WrappedBlob::wrap(trace_blob))?;
        let trace_hash = self.objects.save(&trace_json)?;

        // 4. Get or create roadmap blob
        let roadmap_hash = self.get_or_create_roadmap()?;

        // 5. Get current branch
        let branch = self.head.get()?.unwrap_or_else(|| "main".to_string());

        // 6. Get parent neural commit hash(es)
        let parent_hashes = self.get_parent_hashes(&branch)?;

        // 7. Create neural commit linked to existing git hash
        let author = self
            .git
            .config_user_email()?
            .unwrap_or_else(|| "unknown".to_string());

        let neural_commit = if parent_hashes.len() > 1 {
            NeuralCommit::new_with_parents(
                git_hash,
                parent_hashes,
                &author,
                &roadmap_hash,
                &trace_hash,
                summary,
            )
        } else {
            NeuralCommit::new(
                git_hash,
                parent_hashes.into_iter().next(),
                &author,
                &roadmap_hash,
                &trace_hash,
                summary,
            )
        };

        // 8. Save neural commit
        let wrapped = WrappedNeuralCommit::wrap(neural_commit);
        let commit_json = serde_json::to_vec(&wrapped)?;
        let neural_hash = self.objects.save(&commit_json)?;

        // 9. Update branch ref
        self.refs.update(&branch, &neural_hash)?;

        // 9.5. Index entries for full-text search (non-fatal)
        if let Err(e) = crate::search::indexer::index_entries(&self.agit_dir, &entries) {
            tracing::warn!("Failed to index entries for search: {}", e);
        }

        // 10. Clear index
        if self.index.has_staged()? {
            self.index.clear_staged()?;
        } else {
            self.index.clear()?;
        }

        Ok(CommitResult {
            neural_hash,
            git_hash: git_hash.to_string(),
            git_commit_created: false,
            is_memory_only: false,
        })
    }
}