jjpr 0.18.0

Manage stacked pull requests in Jujutsu repositories
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
/// Stack navigation generation, parsing, and in-place editing.
///
/// The `StackNav` trait abstracts where stack navigation lives (comment vs PR
/// description). `CommentNav` is the default — it stores stack info as a PR
/// comment. Alternative implementations can store it elsewhere.
use anyhow::Result;
use base64::{Engine, engine::general_purpose::STANDARD as BASE64};
use serde::{Deserialize, Serialize};

use super::Forge;
use super::types::{IssueComment, PullRequest};

const SENTINEL: &str = "<!-- jjpr:stack-info -->";
const FOOTER: &str = "*Created with [jjpr](https://github.com/michaeldhopkins/jjpr)*";
// Also detect jj-stack comments for migration
const LEGACY_FOOTER: &str = "*Created with [jj-stack]";

/// Machine-readable state embedded in the comment.
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct StackCommentData {
    pub version: u32,
    pub stack: Vec<StackCommentItem>,
}

#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct StackCommentItem {
    pub bookmark_name: String,
    pub pr_url: String,
    pub pr_number: u64,
    #[serde(default)]
    pub is_merged: bool,
}

/// Entry for rendering the stack comment.
pub struct StackEntry {
    pub bookmark_name: String,
    pub pr_url: Option<String>,
    pub pr_number: Option<u64>,
    pub is_current: bool,
    pub is_merged: bool,
}

/// Generate the body for a stack navigation comment.
pub fn generate_comment_body(entries: &[StackEntry]) -> String {
    let data = StackCommentData {
        version: 1,
        stack: entries
            .iter()
            .filter_map(|e| {
                Some(StackCommentItem {
                    bookmark_name: e.bookmark_name.clone(),
                    pr_url: e.pr_url.clone()?,
                    pr_number: e.pr_number?,
                    is_merged: e.is_merged,
                })
            })
            .collect(),
    };

    let json = serde_json::to_string(&data).expect("StackCommentData serialization cannot fail");
    let encoded = BASE64.encode(json.as_bytes());

    let mut body = String::new();
    body.push_str(SENTINEL);
    body.push('\n');
    body.push_str(&format!("<!--- JJPR_DATA: {encoded} --->"));
    body.push('\n');
    body.push_str("This PR is part of a stack:\n\n");

    for entry in entries {
        if entry.is_current {
            body.push_str(&format!("1. **`{}` <-- this PR**\n", entry.bookmark_name));
        } else if entry.is_merged {
            if let Some(url) = &entry.pr_url {
                body.push_str(&format!(
                    "1. ~~[`{}`]({url})~~ :white_check_mark:\n",
                    entry.bookmark_name
                ));
            } else {
                body.push_str(&format!(
                    "1. ~~`{}`~~ :white_check_mark:\n",
                    entry.bookmark_name
                ));
            }
        } else if let Some(url) = &entry.pr_url {
            body.push_str(&format!("1. [`{}`]({url})\n", entry.bookmark_name));
        } else {
            body.push_str(&format!("1. `{}`\n", entry.bookmark_name));
        }
    }

    body.push_str(&format!("\n---\n{FOOTER}\n"));
    body
}

/// Parse the machine-readable data from an existing stack comment.
pub fn parse_comment_data(body: &str) -> Option<StackCommentData> {
    let suffix = " --->";

    for line in body.lines() {
        let line = line.trim();
        let encoded = line
            .strip_prefix("<!--- JJPR_DATA: ")
            .or_else(|| line.strip_prefix("<!--- STACKER_DATA: "))
            .and_then(|rest| rest.strip_suffix(suffix));

        if let Some(encoded) = encoded {
            let bytes = BASE64.decode(encoded).ok()?;
            let data: StackCommentData = serde_json::from_slice(&bytes).ok()?;
            return Some(data);
        }
    }
    None
}

/// Find an existing jjpr (or legacy jj-stack) comment in a list of comments.
pub fn find_stack_comment(comments: &[IssueComment]) -> Option<&IssueComment> {
    comments.iter().find(|c| {
        let body = c.body.as_deref().unwrap_or("");
        body.contains(SENTINEL) || body.contains(LEGACY_FOOTER)
    })
}

/// Adapter for reading and writing stack navigation on PRs.
///
/// Each method that touches the forge should make at most one API call
/// for the navigation data. Callers use `has_existing` for the skip check
/// and `update` for the full read-merge-write cycle.
pub trait StackNav: Send + Sync {
    /// Check if this PR already has stack nav content.
    fn has_existing(
        &self,
        forge: &dyn Forge,
        owner: &str,
        repo: &str,
        pr: &PullRequest,
    ) -> Result<bool>;

    /// Read existing data, merge with new entries, and write the result.
    /// Returns true if content was written or updated.
    ///
    /// `previous_items` is called to get the entries to merge with. This
    /// callback receives the existing stack data (if any) and returns the
    /// merged entries to write.
    fn update(
        &self,
        forge: &dyn Forge,
        owner: &str,
        repo: &str,
        pr: &PullRequest,
        build_entries: &dyn Fn(Option<&StackCommentData>) -> Vec<StackEntry>,
    ) -> Result<bool>;
}

/// Store stack navigation as a PR comment (default behavior).
pub struct CommentNav;

impl StackNav for CommentNav {
    fn has_existing(
        &self,
        forge: &dyn Forge,
        owner: &str,
        repo: &str,
        pr: &PullRequest,
    ) -> Result<bool> {
        let comments = forge.list_comments(owner, repo, pr.number)?;
        Ok(find_stack_comment(&comments).is_some())
    }

    fn update(
        &self,
        forge: &dyn Forge,
        owner: &str,
        repo: &str,
        pr: &PullRequest,
        build_entries: &dyn Fn(Option<&StackCommentData>) -> Vec<StackEntry>,
    ) -> Result<bool> {
        // Single list_comments call — used for reading existing data AND writing
        let comments = forge.list_comments(owner, repo, pr.number)?;
        let existing = find_stack_comment(&comments);

        let previous_data = existing
            .and_then(|c| c.body.as_deref())
            .and_then(parse_comment_data);

        let entries = build_entries(previous_data.as_ref());
        if entries.is_empty() {
            return Ok(false);
        }
        let body = generate_comment_body(&entries);

        if let Some(existing_comment) = existing {
            if existing_comment.body.as_deref() != Some(&body) {
                forge.update_comment(owner, repo, existing_comment.id, &body)?;
                return Ok(true);
            }
            Ok(false)
        } else {
            forge.create_comment(owner, repo, pr.number, &body)?;
            Ok(true)
        }
    }
}

const NAV_START: &str = "<!-- jjpr:stack-nav -->";
const NAV_END: &str = "<!-- /jjpr:stack-nav -->";

/// Store stack navigation in the PR description/body.
pub struct DescriptionNav;

impl DescriptionNav {
    fn extract_section(body: &str) -> Option<&str> {
        let start_idx = body.find(NAV_START)?;
        let end_tag_start = body[start_idx..].find(NAV_END)?;
        let end_idx = start_idx + end_tag_start + NAV_END.len();
        Some(&body[start_idx..end_idx])
    }

    fn splice_section(body: &str, new_section: &str) -> String {
        if let Some(start_idx) = body.find(NAV_START)
            && let Some(end_tag_start) = body[start_idx..].find(NAV_END)
        {
            let end_idx = start_idx + end_tag_start + NAV_END.len();
            let before = &body[..start_idx];
            let after = &body[end_idx..];
            format!("{before}{new_section}{after}")
        } else {
            // Append at the end, separated by blank lines
            let trimmed = body.trim_end();
            if trimmed.is_empty() {
                new_section.to_string()
            } else {
                format!("{trimmed}\n\n{new_section}\n")
            }
        }
    }

    fn wrap_section(content: &str) -> String {
        format!("{NAV_START}\n{content}{NAV_END}")
    }
}

impl StackNav for DescriptionNav {
    fn has_existing(
        &self,
        _forge: &dyn Forge,
        _owner: &str,
        _repo: &str,
        pr: &PullRequest,
    ) -> Result<bool> {
        Ok(pr.body.as_deref().is_some_and(|b| b.contains(NAV_START)))
    }

    fn update(
        &self,
        forge: &dyn Forge,
        owner: &str,
        repo: &str,
        pr: &PullRequest,
        build_entries: &dyn Fn(Option<&StackCommentData>) -> Vec<StackEntry>,
    ) -> Result<bool> {
        let current_body = pr.body.as_deref().unwrap_or("");

        let previous_data = Self::extract_section(current_body)
            .and_then(parse_comment_data);

        let entries = build_entries(previous_data.as_ref());
        if entries.is_empty() {
            return Ok(false);
        }

        let nav_content = generate_comment_body(&entries);
        let new_section = Self::wrap_section(&nav_content);

        let new_body = Self::splice_section(current_body, &new_section);

        if new_body.trim() == current_body.trim() {
            return Ok(false);
        }

        forge.update_pr_body(owner, repo, pr.number, &new_body)?;
        Ok(true)
    }
}

/// Create a StackNav adapter for the given mode.
pub fn create_stack_nav(mode: crate::config::StackNavMode) -> Box<dyn StackNav> {
    match mode {
        crate::config::StackNavMode::Comment => Box::new(CommentNav),
        crate::config::StackNavMode::Description => Box::new(DescriptionNav),
    }
}

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

    fn sample_entries() -> Vec<StackEntry> {
        vec![
            StackEntry {
                bookmark_name: "auth".to_string(),
                pr_url: Some("https://github.com/o/r/pull/1".to_string()),
                pr_number: Some(1),
                is_current: false,
                is_merged: false,
            },
            StackEntry {
                bookmark_name: "profile".to_string(),
                pr_url: Some("https://github.com/o/r/pull/2".to_string()),
                pr_number: Some(2),
                is_current: true,
                is_merged: false,
            },
            StackEntry {
                bookmark_name: "settings".to_string(),
                pr_url: None,
                pr_number: None,
                is_current: false,
                is_merged: false,
            },
        ]
    }

    #[test]
    fn test_generate_comment_body_contains_sentinel() {
        let body = generate_comment_body(&sample_entries());
        assert!(body.contains(SENTINEL));
    }

    #[test]
    fn test_generate_comment_body_contains_footer() {
        let body = generate_comment_body(&sample_entries());
        assert!(body.contains(FOOTER));
    }

    #[test]
    fn test_generate_comment_body_marks_current_pr() {
        let body = generate_comment_body(&sample_entries());
        assert!(body.contains("**`profile` <-- this PR**"));
    }

    #[test]
    fn test_generate_comment_body_links_other_prs() {
        let body = generate_comment_body(&sample_entries());
        assert!(body.contains("1. [`auth`](https://github.com/o/r/pull/1)\n"));
    }

    #[test]
    fn test_generate_comment_body_shows_unlinked_bookmarks() {
        let body = generate_comment_body(&sample_entries());
        assert!(body.contains("`settings`"));
    }

    #[test]
    fn test_generate_comment_body_excludes_default_branch() {
        let body = generate_comment_body(&sample_entries());
        // Trunk is the target, not part of the stack
        assert!(!body.contains("1. `main`"));
    }

    #[test]
    fn test_roundtrip_comment_data() {
        let body = generate_comment_body(&sample_entries());
        let data = parse_comment_data(&body).expect("should parse embedded data");
        assert_eq!(data.version, 1);
        assert_eq!(data.stack.len(), 2);
        assert_eq!(data.stack[0].bookmark_name, "auth");
        assert_eq!(data.stack[0].pr_number, 1);
        assert!(!data.stack[0].is_merged);
        assert_eq!(data.stack[1].bookmark_name, "profile");
    }

    #[test]
    fn test_parse_comment_data_missing() {
        assert!(parse_comment_data("no data here").is_none());
    }

    #[test]
    fn test_find_stack_comment_by_sentinel() {
        let comments = vec![
            IssueComment {
                id: 1,
                body: Some("unrelated comment".to_string()),
            },
            IssueComment {
                id: 2,
                body: Some(format!("{SENTINEL}\nstack info")),
            },
        ];
        let found = find_stack_comment(&comments).unwrap();
        assert_eq!(found.id, 2);
    }

    #[test]
    fn test_find_stack_comment_by_legacy_footer() {
        let comments = vec![IssueComment {
            id: 5,
            body: Some(format!(
                "stack\n{LEGACY_FOOTER}(https://github.com/keanemind/jj-stack)*"
            )),
        }];
        let found = find_stack_comment(&comments).unwrap();
        assert_eq!(found.id, 5);
    }

    #[test]
    fn test_find_stack_comment_none() {
        let comments = vec![IssueComment {
            id: 1,
            body: Some("nothing relevant".to_string()),
        }];
        assert!(find_stack_comment(&comments).is_none());
    }

    #[test]
    fn test_bookmark_name_with_markdown_chars() {
        let entries = vec![StackEntry {
            bookmark_name: "[evil](https://evil.com)".to_string(),
            pr_url: Some("https://github.com/o/r/pull/1".to_string()),
            pr_number: Some(1),
            is_current: false,
            is_merged: false,
        }];
        let body = generate_comment_body(&entries);
        // Bookmark name is wrapped in backticks inside the link, neutralizing markdown injection
        assert!(body.contains("1. [`[evil](https://evil.com)`](https://github.com/o/r/pull/1)\n"));
        // The evil URL appears only inside backticks (code span), not as a rendered link
        assert!(!body.contains("](https://evil.com)\""));
    }

    #[test]
    fn test_new_comments_use_jjpr_data_prefix() {
        let body = generate_comment_body(&sample_entries());
        assert!(body.contains("JJPR_DATA"), "should use JJPR_DATA prefix");
        assert!(
            !body.contains("STACKER_DATA"),
            "should not use old STACKER_DATA prefix"
        );
    }

    #[test]
    fn test_parse_legacy_stacker_data() {
        // Simulate a comment written by the old version using STACKER_DATA
        let data = StackCommentData {
            version: 0,
            stack: vec![StackCommentItem {
                bookmark_name: "old-bookmark".to_string(),
                pr_url: "https://github.com/o/r/pull/1".to_string(),
                pr_number: 1,
                is_merged: false,
            }],
        };
        let json = serde_json::to_string(&data).unwrap();
        let encoded = BASE64.encode(json.as_bytes());
        let old_body = format!("<!--- STACKER_DATA: {encoded} --->");

        let parsed = parse_comment_data(&old_body).expect("should parse legacy format");
        assert_eq!(parsed.stack[0].bookmark_name, "old-bookmark");
    }

    #[test]
    fn test_backward_compat_missing_is_merged() {
        // Old blobs won't have is_merged — should default to false
        let json = r#"{"version":0,"stack":[{"bookmark_name":"feat","pr_url":"https://github.com/o/r/pull/1","pr_number":1}]}"#;
        let encoded = BASE64.encode(json.as_bytes());
        let body = format!("<!--- JJPR_DATA: {encoded} --->");

        let parsed = parse_comment_data(&body).expect("should parse old format");
        assert!(!parsed.stack[0].is_merged, "missing is_merged should default to false");
    }

    #[test]
    fn test_is_merged_roundtrips() {
        let entries = vec![
            StackEntry {
                bookmark_name: "auth".to_string(),
                pr_url: Some("https://github.com/o/r/pull/1".to_string()),
                pr_number: Some(1),
                is_current: false,
                is_merged: true,
            },
            StackEntry {
                bookmark_name: "profile".to_string(),
                pr_url: Some("https://github.com/o/r/pull/2".to_string()),
                pr_number: Some(2),
                is_current: false,
                is_merged: false,
            },
        ];
        let body = generate_comment_body(&entries);
        let data = parse_comment_data(&body).unwrap();
        assert!(data.stack[0].is_merged);
        assert!(!data.stack[1].is_merged);
    }

    #[test]
    fn test_merged_entry_renders_strikethrough() {
        let entries = vec![StackEntry {
            bookmark_name: "auth".to_string(),
            pr_url: Some("https://github.com/o/r/pull/1".to_string()),
            pr_number: Some(1),
            is_current: false,
            is_merged: true,
        }];
        let body = generate_comment_body(&entries);
        assert!(
            body.contains("~~[`auth`](https://github.com/o/r/pull/1)~~ :white_check_mark:"),
            "merged entry should have strikethrough and checkmark: {body}"
        );
    }

    // --- DescriptionNav tests ---

    #[test]
    fn test_description_nav_extract_section() {
        let body = format!(
            "PR description\n\n{}\ncontent here\n{}\n\nuser notes",
            NAV_START, NAV_END
        );
        let section = DescriptionNav::extract_section(&body).unwrap();
        assert!(section.starts_with(NAV_START));
        assert!(section.ends_with(NAV_END));
        assert!(section.contains("content here"));
    }

    #[test]
    fn test_description_nav_extract_section_missing() {
        assert!(DescriptionNav::extract_section("no nav here").is_none());
    }

    #[test]
    fn test_description_nav_splice_appends_when_absent() {
        let body = "PR description";
        let result = DescriptionNav::splice_section(body, "NEW NAV");
        assert!(result.starts_with("PR description"));
        assert!(result.contains("NEW NAV"));
    }

    #[test]
    fn test_description_nav_splice_replaces_when_present() {
        let body = format!(
            "before\n\n{}old nav{}\n\nafter",
            NAV_START, NAV_END
        );
        let new_section = format!("{NAV_START}new nav{NAV_END}");
        let result = DescriptionNav::splice_section(&body, &new_section);
        assert!(result.contains("before"));
        assert!(result.contains("after"));
        assert!(result.contains("new nav"));
        assert!(!result.contains("old nav"));
    }

    #[test]
    fn test_description_nav_roundtrip() {
        let entries = sample_entries();
        let content = generate_comment_body(&entries);
        let section = DescriptionNav::wrap_section(&content);

        // The section should contain parseable data
        let data = parse_comment_data(&section).unwrap();
        assert_eq!(data.stack.len(), 2);
        assert_eq!(data.stack[0].bookmark_name, "auth");
    }

    #[test]
    fn test_description_nav_preserves_description_sentinels() {
        let body = "<!-- jjpr:description -->\ncommit body\n<!-- /jjpr:description -->\n\nuser notes";
        let section = DescriptionNav::wrap_section("stack nav content\n");
        let result = DescriptionNav::splice_section(body, &section);
        assert!(result.contains("<!-- jjpr:description -->"));
        assert!(result.contains("commit body"));
        assert!(result.contains("<!-- /jjpr:description -->"));
        assert!(result.contains("user notes"));
        assert!(result.contains("stack nav content"));
    }
}