ag-store 0.15.4

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
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
//! Session review-request persistence adapters and query helpers.

use ag_session::ReviewRequest;
use async_trait::async_trait;
use sqlx::{SqliteConnection, SqlitePool};

use crate::DbError;

/// Durable input for one review-comment resolution operation.
#[derive(Clone, Debug, Eq, PartialEq)]
pub struct NewSessionReviewCommentResolution {
    /// Full commit hash containing the reported fix, once auto-commit succeeds.
    pub commit_hash: Option<String>,
    /// Original agent-authored reply retained across retries.
    pub reply: String,
    /// Unguessable token embedded in the posted reply.
    pub reply_token: String,
    /// Persisted normalized resolution decision.
    pub resolution: String,
    /// Forge-native review-request identifier such as `#123` or `!123`.
    pub review_request_display_id: String,
    /// Forge-native review-thread identifier.
    pub thread_id: String,
}

/// Row returned for one unfinished review-comment resolution operation.
#[derive(Clone, Debug, Eq, PartialEq)]
pub struct SessionReviewCommentResolutionRow {
    /// Full commit hash that must remain reachable from the pushed branch.
    pub commit_hash: Option<String>,
    /// Whether a forge reply attempt may already have exposed the token.
    pub is_posting: bool,
    /// Original agent-authored reply retained across retries.
    pub reply: String,
    /// Unguessable token embedded in the posted reply.
    pub reply_token: String,
    /// Persisted normalized resolution decision.
    pub resolution: String,
    /// Forge-native review-request identifier such as `#123` or `!123`.
    pub review_request_display_id: String,
    /// Forge-native review-thread identifier.
    pub thread_id: String,
}

/// Row returned when loading one `session_review_request`.
#[derive(Clone, Debug, Eq, PartialEq)]
pub struct SessionReviewRequestRow {
    /// Forge-native display identifier such as `#123` or `!123`.
    pub display_id: String,
    /// Persisted forge-family discriminator.
    pub forge_kind: String,
    /// Most recent successful refresh timestamp in Unix seconds.
    pub last_refreshed_at: i64,
    /// Review request source branch.
    pub source_branch: String,
    /// Persisted normalized lifecycle state.
    pub state: String,
    /// Optional normalized checks or merge-status summary.
    pub status_summary: Option<String>,
    /// Review request target branch.
    pub target_branch: String,
    /// Review request title.
    pub title: String,
    /// Browser-openable review request URL.
    pub web_url: String,
}

/// Review-request persistence boundary used by app orchestration and tests.
#[cfg_attr(test, mockall::automock)]
#[async_trait]
pub trait ReviewRepository: Send + Sync {
    /// Binds newly inserted operations to the commit produced for their turn.
    async fn bind_session_review_comment_resolutions_to_commit(
        &self,
        id: &str,
        resolutions: &[NewSessionReviewCommentResolution],
        commit_hash: &str,
    ) -> Result<(), DbError>;

    /// Discards unfinished operations created with the supplied reply tokens.
    async fn discard_session_review_comment_resolutions(
        &self,
        id: &str,
        resolutions: &[NewSessionReviewCommentResolution],
    ) -> Result<(), DbError>;

    /// Inserts one atomic set of review-comment resolution operations.
    ///
    /// A bound operation for the same thread wins. A fresh agent turn may
    /// replace an unbound operation left by interrupted commit binding.
    async fn insert_session_review_comment_resolutions(
        &self,
        id: &str,
        resolutions: &[NewSessionReviewCommentResolution],
    ) -> Result<(), DbError>;

    /// Loads unfinished review-comment resolution operations for a session.
    async fn load_session_review_comment_resolutions(
        &self,
        id: &str,
    ) -> Result<Vec<SessionReviewCommentResolutionRow>, DbError>;

    /// Loads the persisted forge review-request linkage for a session.
    async fn load_session_review_request(
        &self,
        id: &str,
    ) -> Result<Option<SessionReviewRequestRow>, DbError>;

    /// Updates the persisted forge review-request linkage for a session.
    async fn update_session_review_request(
        &self,
        id: &str,
        review_request: Option<ReviewRequest>,
    ) -> Result<(), DbError>;

    /// Records that one operation is about to attempt its forge reply.
    async fn mark_session_review_comment_resolution_posting(
        &self,
        id: &str,
        reply_token: &str,
    ) -> Result<(), DbError>;

    /// Removes one operation after its requested forge effects finish.
    async fn remove_session_review_comment_resolution(
        &self,
        id: &str,
        reply_token: &str,
    ) -> Result<(), DbError>;
}

/// `SQLite` implementation of [`ReviewRepository`].
#[derive(Clone)]
pub(crate) struct SqliteReviewRepository(SqlitePool);

impl SqliteReviewRepository {
    /// Creates a review repository backed by the provided pool.
    pub(crate) fn new(pool: SqlitePool) -> Self {
        Self(pool)
    }
}

/// Inserts review-comment resolutions through the caller's transaction.
pub(crate) async fn insert_review_comment_resolutions(
    connection: &mut SqliteConnection,
    session_id: &str,
    resolutions: &[NewSessionReviewCommentResolution],
) -> Result<(), DbError> {
    for resolution in resolutions {
        sqlx::query!(
            r"
INSERT INTO session_review_comment_resolution (
    session_id,
    commit_hash,
    review_request_display_id,
    thread_id,
    reply,
    reply_token,
    resolution
)
VALUES (?, ?, ?, ?, ?, ?, ?)
ON CONFLICT(session_id, review_request_display_id, thread_id)
DO UPDATE SET
    commit_hash = excluded.commit_hash,
    reply = excluded.reply,
    reply_token = excluded.reply_token,
    resolution = excluded.resolution,
    is_posting = 0
WHERE session_review_comment_resolution.commit_hash IS NULL
",
            session_id,
            resolution.commit_hash,
            resolution.review_request_display_id,
            resolution.thread_id,
            resolution.reply,
            resolution.reply_token,
            resolution.resolution
        )
        .execute(&mut *connection)
        .await?;
    }

    Ok(())
}

#[async_trait]
impl ReviewRepository for SqliteReviewRepository {
    async fn bind_session_review_comment_resolutions_to_commit(
        &self,
        id: &str,
        resolutions: &[NewSessionReviewCommentResolution],
        commit_hash: &str,
    ) -> Result<(), DbError> {
        let mut transaction = self.0.begin().await?;
        for resolution in resolutions {
            sqlx::query!(
                r"
UPDATE session_review_comment_resolution
SET commit_hash = ?
WHERE session_id = ?
  AND reply_token = ?
  AND commit_hash IS NULL
",
                commit_hash,
                id,
                resolution.reply_token
            )
            .execute(&mut *transaction)
            .await?;
        }
        transaction.commit().await?;

        Ok(())
    }

    async fn discard_session_review_comment_resolutions(
        &self,
        id: &str,
        resolutions: &[NewSessionReviewCommentResolution],
    ) -> Result<(), DbError> {
        let mut transaction = self.0.begin().await?;
        for resolution in resolutions {
            sqlx::query!(
                r"
DELETE FROM session_review_comment_resolution
WHERE session_id = ?
  AND reply_token = ?
",
                id,
                resolution.reply_token
            )
            .execute(&mut *transaction)
            .await?;
        }
        transaction.commit().await?;

        Ok(())
    }

    async fn insert_session_review_comment_resolutions(
        &self,
        id: &str,
        resolutions: &[NewSessionReviewCommentResolution],
    ) -> Result<(), DbError> {
        let mut transaction = self.0.begin().await?;
        insert_review_comment_resolutions(&mut transaction, id, resolutions).await?;
        transaction.commit().await?;

        Ok(())
    }

    async fn load_session_review_comment_resolutions(
        &self,
        id: &str,
    ) -> Result<Vec<SessionReviewCommentResolutionRow>, DbError> {
        let resolutions = sqlx::query_as!(
            SessionReviewCommentResolutionRow,
            r#"
SELECT is_posting AS "is_posting: bool",
       commit_hash,
       reply,
       reply_token,
       resolution,
       review_request_display_id,
       thread_id
FROM session_review_comment_resolution
WHERE session_id = ?
ORDER BY rowid
"#,
            id
        )
        .fetch_all(&self.0)
        .await?;

        Ok(resolutions)
    }

    async fn load_session_review_request(
        &self,
        id: &str,
    ) -> Result<Option<SessionReviewRequestRow>, DbError> {
        let review_request = sqlx::query_as!(
            SessionReviewRequestRow,
            r"
SELECT display_id,
       forge_kind,
       last_refreshed_at,
       source_branch,
       state,
       status_summary,
       target_branch,
       title,
       web_url
FROM session_review_request
WHERE session_id = ?
",
            id
        )
        .fetch_optional(&self.0)
        .await?;

        Ok(review_request)
    }

    async fn update_session_review_request(
        &self,
        id: &str,
        review_request: Option<ReviewRequest>,
    ) -> Result<(), DbError> {
        if let Some(review_request) = review_request.as_ref() {
            sqlx::query!(
                r"
INSERT INTO session_review_request (
    session_id,
    display_id,
    forge_kind,
    last_refreshed_at,
    source_branch,
    state,
    status_summary,
    target_branch,
    title,
    web_url
)
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
ON CONFLICT(session_id) DO UPDATE
SET display_id = excluded.display_id,
    forge_kind = excluded.forge_kind,
    last_refreshed_at = excluded.last_refreshed_at,
    source_branch = excluded.source_branch,
    state = excluded.state,
    status_summary = excluded.status_summary,
    target_branch = excluded.target_branch,
    title = excluded.title,
    web_url = excluded.web_url
",
                id,
                review_request.summary.display_id.as_str(),
                review_request.summary.forge_kind.as_str(),
                review_request.last_refreshed_at,
                review_request.summary.source_branch.as_str(),
                review_request.summary.state.as_str(),
                review_request.summary.status_summary.as_deref(),
                review_request.summary.target_branch.as_str(),
                review_request.summary.title.as_str(),
                review_request.summary.web_url.as_str()
            )
            .execute(&self.0)
            .await?;
        } else {
            sqlx::query!(
                r"
DELETE FROM session_review_request
WHERE session_id = ?
",
                id
            )
            .execute(&self.0)
            .await?;
        }

        Ok(())
    }

    async fn mark_session_review_comment_resolution_posting(
        &self,
        id: &str,
        reply_token: &str,
    ) -> Result<(), DbError> {
        let update_result = sqlx::query!(
            r"
UPDATE session_review_comment_resolution
SET is_posting = 1
WHERE session_id = ?
  AND reply_token = ?
  AND is_posting = 0
",
            id,
            reply_token
        )
        .execute(&self.0)
        .await?;
        if update_result.rows_affected() != 1 {
            return Err(DbError::InvalidData {
                entity: "review-comment operation",
                reason: format!("posting update matched no pending row for token `{reply_token}`"),
            });
        }

        Ok(())
    }

    async fn remove_session_review_comment_resolution(
        &self,
        id: &str,
        reply_token: &str,
    ) -> Result<(), DbError> {
        let delete_result = sqlx::query!(
            r"
DELETE FROM session_review_comment_resolution
WHERE session_id = ?
  AND reply_token = ?
",
            id,
            reply_token
        )
        .execute(&self.0)
        .await?;
        if delete_result.rows_affected() != 1 {
            return Err(DbError::InvalidData {
                entity: "review-comment operation",
                reason: format!("delete matched no row for token `{reply_token}`"),
            });
        }

        Ok(())
    }
}

#[cfg(test)]
mod tests {
    use super::*;
    use crate::AppRepositories;

    #[tokio::test]
    async fn active_review_comment_operation_preserves_original_reply_across_retries() {
        // Arrange
        let repositories = AppRepositories::in_memory()
            .await
            .expect("failed to open in-memory repositories");
        let project_id = repositories
            .projects()
            .upsert_project("/tmp/project", Some("main".to_string()))
            .await
            .expect("failed to insert project");
        repositories
            .sessions()
            .insert_session("session-id", "codex", "main", "Review", project_id)
            .await
            .expect("failed to insert session");
        let original = review_comment_resolution("Original reply", "token-1");
        let regenerated = review_comment_resolution("Regenerated reply", "token-2");
        repositories
            .reviews()
            .insert_session_review_comment_resolutions(
                "session-id",
                std::slice::from_ref(&original),
            )
            .await
            .expect("failed to insert original operation");
        repositories
            .reviews()
            .bind_session_review_comment_resolutions_to_commit(
                "session-id",
                std::slice::from_ref(&original),
                "commit-original",
            )
            .await
            .expect("failed to bind original operation");

        // Act
        repositories
            .reviews()
            .insert_session_review_comment_resolutions(
                "session-id",
                std::slice::from_ref(&regenerated),
            )
            .await
            .expect("failed to ignore regenerated operation");
        repositories
            .reviews()
            .bind_session_review_comment_resolutions_to_commit(
                "session-id",
                std::slice::from_ref(&regenerated),
                "commit-regenerated",
            )
            .await
            .expect("failed to ignore regenerated binding");
        let active = repositories
            .reviews()
            .load_session_review_comment_resolutions("session-id")
            .await
            .expect("failed to load active operation");
        repositories
            .reviews()
            .mark_session_review_comment_resolution_posting("session-id", "token-1")
            .await
            .expect("failed to mark original operation as posting");
        let posting = repositories
            .reviews()
            .load_session_review_comment_resolutions("session-id")
            .await
            .expect("failed to reload posting operation");
        repositories
            .reviews()
            .remove_session_review_comment_resolution("session-id", "token-1")
            .await
            .expect("failed to remove original operation");
        repositories
            .reviews()
            .insert_session_review_comment_resolutions("session-id", &[regenerated])
            .await
            .expect("failed to insert later operation");
        let replacement = repositories
            .reviews()
            .load_session_review_comment_resolutions("session-id")
            .await
            .expect("failed to load replacement operation");
        let missing_update_error = repositories
            .reviews()
            .mark_session_review_comment_resolution_posting("session-id", "missing-token")
            .await
            .expect_err("missing operation should reject state update");
        let missing_delete_error = repositories
            .reviews()
            .remove_session_review_comment_resolution("session-id", "missing-token")
            .await
            .expect_err("missing operation should reject deletion");

        // Assert
        assert_eq!(active.len(), 1);
        assert_eq!(active[0].reply, "Original reply");
        assert_eq!(active[0].reply_token, "token-1");
        assert_eq!(active[0].commit_hash.as_deref(), Some("commit-original"));
        assert!(!active[0].is_posting);
        assert!(posting[0].is_posting);
        assert_eq!(replacement.len(), 1);
        assert_eq!(replacement[0].reply, "Regenerated reply");
        assert!(matches!(missing_update_error, DbError::InvalidData { .. }));
        assert!(matches!(missing_delete_error, DbError::InvalidData { .. }));
    }

    #[tokio::test]
    async fn discard_failed_retry_preserves_older_conflicting_operation() {
        // Arrange
        let repositories = AppRepositories::in_memory()
            .await
            .expect("failed to open in-memory repositories");
        let project_id = repositories
            .projects()
            .upsert_project("/tmp/project", Some("main".to_string()))
            .await
            .expect("failed to insert project");
        repositories
            .sessions()
            .insert_session("session-id", "codex", "main", "Review", project_id)
            .await
            .expect("failed to insert session");
        let original = review_comment_resolution("Original reply", "token-original");
        let regenerated = review_comment_resolution("Regenerated reply", "token-regenerated");
        let mut unrelated = review_comment_resolution("Unrelated reply", "token-unrelated");
        unrelated.thread_id = "thread-2".to_string();
        let mut inserted = review_comment_resolution("Inserted reply", "token-inserted");
        inserted.thread_id = "thread-3".to_string();
        repositories
            .reviews()
            .insert_session_review_comment_resolutions(
                "session-id",
                &[original.clone(), unrelated.clone()],
            )
            .await
            .expect("failed to insert review operations");
        repositories
            .reviews()
            .bind_session_review_comment_resolutions_to_commit(
                "session-id",
                std::slice::from_ref(&original),
                "commit-original",
            )
            .await
            .expect("failed to bind original operation");
        repositories
            .reviews()
            .insert_session_review_comment_resolutions(
                "session-id",
                &[regenerated.clone(), inserted.clone()],
            )
            .await
            .expect("failed to insert later review operations");

        // Act
        repositories
            .reviews()
            .discard_session_review_comment_resolutions("session-id", &[regenerated, inserted])
            .await
            .expect("failed to discard newly inserted review operations");
        let remaining = repositories
            .reviews()
            .load_session_review_comment_resolutions("session-id")
            .await
            .expect("failed to load remaining review operations");

        // Assert
        assert_eq!(remaining.len(), 2);
        assert_eq!(remaining[0].reply_token, original.reply_token);
        assert_eq!(remaining[0].reply, original.reply);
        assert_eq!(remaining[1].reply_token, unrelated.reply_token);
        assert_eq!(remaining[1].reply, unrelated.reply);
    }

    #[tokio::test]
    async fn fresh_retry_replaces_unbound_operation() {
        // Arrange
        let repositories = AppRepositories::in_memory()
            .await
            .expect("failed to open in-memory repositories");
        let project_id = repositories
            .projects()
            .upsert_project("/tmp/project", Some("main".to_string()))
            .await
            .expect("failed to insert project");
        repositories
            .sessions()
            .insert_session("session-id", "codex", "main", "Review", project_id)
            .await
            .expect("failed to insert session");
        let original = review_comment_resolution("Original reply", "token-original");
        let regenerated = review_comment_resolution("Regenerated reply", "token-regenerated");
        repositories
            .reviews()
            .insert_session_review_comment_resolutions("session-id", &[original])
            .await
            .expect("failed to insert unbound operation");

        // Act
        repositories
            .reviews()
            .insert_session_review_comment_resolutions(
                "session-id",
                std::slice::from_ref(&regenerated),
            )
            .await
            .expect("failed to replace unbound operation");
        repositories
            .reviews()
            .bind_session_review_comment_resolutions_to_commit(
                "session-id",
                std::slice::from_ref(&regenerated),
                "commit-regenerated",
            )
            .await
            .expect("failed to bind replacement operation");
        let active = repositories
            .reviews()
            .load_session_review_comment_resolutions("session-id")
            .await
            .expect("failed to load replacement operation");

        // Assert
        assert_eq!(active.len(), 1);
        assert_eq!(active[0].reply, "Regenerated reply");
        assert_eq!(active[0].reply_token, "token-regenerated");
        assert_eq!(active[0].commit_hash.as_deref(), Some("commit-regenerated"));
        assert!(!active[0].is_posting);
    }

    fn review_comment_resolution(
        reply: &str,
        reply_token: &str,
    ) -> NewSessionReviewCommentResolution {
        NewSessionReviewCommentResolution {
            commit_hash: None,
            reply: reply.to_string(),
            reply_token: reply_token.to_string(),
            resolution: "fixed".to_string(),
            review_request_display_id: "#42".to_string(),
            thread_id: "thread-1".to_string(),
        }
    }
}