worktrunk 0.50.0

A CLI for Git worktree management, designed for parallel AI agent workflows
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
//! Remote ref info types.
//!
//! Provides unified types for PR/MR metadata across platforms.

use crate::git::{RefContext, RefType};

/// Platform-specific data for a remote ref.
///
/// Contains fields that differ between GitHub, GitLab, and Azure DevOps.
#[derive(Debug, Clone)]
pub enum PlatformData {
    /// GitHub-specific data.
    GitHub {
        /// GitHub host (e.g., "github.com", "github.enterprise.com").
        host: String,
        /// Owner of the head (source) repository.
        head_owner: String,
        /// Name of the head (source) repository.
        head_repo: String,
        /// Owner of the base (target) repository.
        base_owner: String,
        /// Name of the base (target) repository.
        base_repo: String,
    },
    /// Gitea-specific data.
    Gitea {
        /// Gitea host (e.g., "gitea.com", "git.example.com").
        host: String,
        /// Owner of the head (source) repository.
        head_owner: String,
        /// Name of the head (source) repository.
        head_repo: String,
        /// Owner of the base (target) repository.
        base_owner: String,
        /// Name of the base (target) repository.
        base_repo: String,
    },
    /// GitLab-specific data.
    GitLab {
        /// GitLab host (e.g., "gitlab.com", "gitlab.example.com").
        host: String,
        /// Owner/namespace of the base (target) project.
        base_owner: String,
        /// Name of the base (target) project.
        base_repo: String,
        /// Source project ID (used for deferred URL fetching).
        source_project_id: u64,
        /// Target project ID (used for deferred URL fetching).
        target_project_id: u64,
    },
    /// Azure DevOps-specific data.
    AzureDevOps {
        /// Azure DevOps host (e.g., "dev.azure.com", "myorg.visualstudio.com").
        host: String,
        /// Azure DevOps organization name.
        organization: String,
        /// Azure DevOps project name.
        project: String,
        /// Repository name.
        repo_name: String,
    },
}

/// Unified information about a PR or MR.
///
/// This struct contains all the data needed to create a local branch
/// for a PR/MR, regardless of platform.
#[derive(Debug, Clone)]
pub struct RemoteRefInfo {
    /// The reference type (PR or MR).
    pub ref_type: RefType,
    /// The PR/MR number.
    pub number: u32,
    /// The PR/MR title.
    pub title: String,
    /// The PR/MR author's username.
    pub author: String,
    /// The PR/MR state ("open", "closed", "merged", etc.).
    pub state: String,
    /// Whether this is a draft PR/MR.
    pub draft: bool,
    /// The branch name in the source repository.
    pub source_branch: String,
    /// Whether this is a cross-repository (fork) PR/MR.
    pub is_cross_repo: bool,
    /// The PR/MR web URL.
    pub url: String,
    /// URL to push to for fork PRs/MRs, or `None` if push isn't supported.
    pub fork_push_url: Option<String>,
    /// Platform-specific data.
    pub platform_data: PlatformData,
}

impl RefContext for RemoteRefInfo {
    fn ref_type(&self) -> RefType {
        self.ref_type
    }

    fn number(&self) -> u32 {
        self.number
    }

    fn title(&self) -> &str {
        &self.title
    }

    fn author(&self) -> &str {
        &self.author
    }

    fn state(&self) -> &str {
        &self.state
    }

    fn draft(&self) -> bool {
        self.draft
    }

    fn url(&self) -> &str {
        &self.url
    }

    fn source_ref(&self) -> String {
        if self.is_cross_repo {
            // Try to extract owner for display
            match &self.platform_data {
                PlatformData::GitHub { head_owner, .. } => {
                    format!("{}:{}", head_owner, self.source_branch)
                }
                PlatformData::Gitea { head_owner, .. } => {
                    format!("{}:{}", head_owner, self.source_branch)
                }
                PlatformData::GitLab { .. } => {
                    // For GitLab, try to extract namespace from fork_push_url
                    if let Some(url) = &self.fork_push_url
                        && let Some(namespace) = extract_namespace_from_url(url)
                    {
                        return format!("{}:{}", namespace, self.source_branch);
                    }
                    self.source_branch.clone()
                }
                PlatformData::AzureDevOps { .. } => {
                    // Azure DevOps fork PRs are uncommon; just show branch name
                    self.source_branch.clone()
                }
            }
        } else {
            self.source_branch.clone()
        }
    }
}

impl RemoteRefInfo {
    /// Generate a prefixed local branch name for when the unprefixed name conflicts.
    ///
    /// Returns `<owner>/<branch>` (e.g., `contributor/main`).
    /// Used for GitHub/Gitea fork PRs; GitLab and Azure DevOps don't support this pattern.
    pub fn prefixed_local_branch_name(&self) -> Option<String> {
        match &self.platform_data {
            PlatformData::GitHub { head_owner, .. } | PlatformData::Gitea { head_owner, .. } => {
                Some(format!("{}/{}", head_owner, self.source_branch))
            }
            PlatformData::GitLab { .. } | PlatformData::AzureDevOps { .. } => None,
        }
    }
}

/// Extract namespace (owner or group/subgroup) from a git URL.
///
/// Handles both SSH (`git@host:namespace/repo.git`) and HTTPS
/// (`https://host/namespace/repo.git`) formats. Supports GitLab nested
/// namespaces like `group/subgroup/repo.git` → `group/subgroup`.
fn extract_namespace_from_url(url: &str) -> Option<String> {
    // SSH format: git@host:namespace/repo.git
    if let Some(path) = url.strip_prefix("git@").and_then(|s| s.split(':').nth(1)) {
        return extract_namespace_from_path(path);
    }
    // HTTPS format: https://host/namespace/repo.git
    if let Some(rest) = url
        .strip_prefix("https://")
        .or_else(|| url.strip_prefix("http://"))
    {
        // Skip the host segment
        let path = rest.split('/').skip(1).collect::<Vec<_>>().join("/");
        return extract_namespace_from_path(&path);
    }
    None
}

/// Extract namespace from a path like `group/subgroup/repo.git`.
///
/// Returns everything except the last segment (repo name).
fn extract_namespace_from_path(path: &str) -> Option<String> {
    let path = path.strip_suffix(".git").unwrap_or(path);
    let segments: Vec<_> = path.split('/').collect();
    if segments.len() < 2 {
        return None;
    }
    // All segments except the last (which is the repo name)
    Some(segments[..segments.len() - 1].join("/"))
}

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

    #[test]
    fn test_source_ref_same_repo() {
        let info = RemoteRefInfo {
            ref_type: RefType::Pr,
            number: 101,
            title: "Fix bug".to_string(),
            author: "alice".to_string(),
            state: "open".to_string(),
            draft: false,
            source_branch: "feature-auth".to_string(),
            is_cross_repo: false,
            url: "https://github.com/owner/repo/pull/101".to_string(),
            fork_push_url: None,
            platform_data: PlatformData::GitHub {
                host: "github.com".to_string(),
                head_owner: "owner".to_string(),
                head_repo: "repo".to_string(),
                base_owner: "owner".to_string(),
                base_repo: "repo".to_string(),
            },
        };
        assert_eq!(info.source_ref(), "feature-auth");
    }

    #[test]
    fn test_source_ref_fork_gitea() {
        let info = RemoteRefInfo {
            ref_type: RefType::Pr,
            number: 42,
            title: "Add feature".to_string(),
            author: "contributor".to_string(),
            state: "open".to_string(),
            draft: false,
            source_branch: "feature-fix".to_string(),
            is_cross_repo: true,
            url: "https://git.example.com/owner/repo/pulls/42".to_string(),
            fork_push_url: Some("https://git.example.com/contributor/repo.git".to_string()),
            platform_data: PlatformData::Gitea {
                host: "git.example.com".to_string(),
                head_owner: "contributor".to_string(),
                head_repo: "repo".to_string(),
                base_owner: "owner".to_string(),
                base_repo: "repo".to_string(),
            },
        };
        assert_eq!(info.source_ref(), "contributor:feature-fix");
    }

    #[test]
    fn test_source_ref_fork_github() {
        let info = RemoteRefInfo {
            ref_type: RefType::Pr,
            number: 42,
            title: "Add feature".to_string(),
            author: "contributor".to_string(),
            state: "open".to_string(),
            draft: false,
            source_branch: "feature-fix".to_string(),
            is_cross_repo: true,
            url: "https://github.com/owner/repo/pull/42".to_string(),
            fork_push_url: Some("git@github.com:contributor/repo.git".to_string()),
            platform_data: PlatformData::GitHub {
                host: "github.com".to_string(),
                head_owner: "contributor".to_string(),
                head_repo: "repo".to_string(),
                base_owner: "owner".to_string(),
                base_repo: "repo".to_string(),
            },
        };
        assert_eq!(info.source_ref(), "contributor:feature-fix");
    }

    #[test]
    fn test_source_ref_fork_gitlab() {
        let info = RemoteRefInfo {
            ref_type: RefType::Mr,
            number: 101,
            title: "Fix bug".to_string(),
            author: "contributor".to_string(),
            state: "opened".to_string(),
            draft: false,
            source_branch: "feature-fix".to_string(),
            is_cross_repo: true,
            url: "https://gitlab.com/owner/repo/-/merge_requests/101".to_string(),
            fork_push_url: Some("git@gitlab.com:contributor/repo.git".to_string()),
            platform_data: PlatformData::GitLab {
                host: "gitlab.com".to_string(),
                base_owner: "owner".to_string(),
                base_repo: "repo".to_string(),
                source_project_id: 456,
                target_project_id: 123,
            },
        };
        assert_eq!(info.source_ref(), "contributor:feature-fix");
    }

    #[test]
    fn test_prefixed_local_branch_name_github() {
        let info = RemoteRefInfo {
            ref_type: RefType::Pr,
            number: 101,
            title: "Test".to_string(),
            author: "contributor".to_string(),
            state: "open".to_string(),
            draft: false,
            source_branch: "main".to_string(),
            is_cross_repo: true,
            url: "https://github.com/owner/repo/pull/101".to_string(),
            fork_push_url: Some("git@github.com:contributor/repo.git".to_string()),
            platform_data: PlatformData::GitHub {
                host: "github.com".to_string(),
                head_owner: "contributor".to_string(),
                head_repo: "repo".to_string(),
                base_owner: "owner".to_string(),
                base_repo: "repo".to_string(),
            },
        };
        assert_eq!(
            info.prefixed_local_branch_name(),
            Some("contributor/main".to_string())
        );
    }

    #[test]
    fn test_prefixed_local_branch_name_gitea() {
        let info = RemoteRefInfo {
            ref_type: RefType::Pr,
            number: 101,
            title: "Test".to_string(),
            author: "contributor".to_string(),
            state: "open".to_string(),
            draft: false,
            source_branch: "main".to_string(),
            is_cross_repo: true,
            url: "https://git.example.com/owner/repo/pulls/101".to_string(),
            fork_push_url: Some("https://git.example.com/contributor/repo.git".to_string()),
            platform_data: PlatformData::Gitea {
                host: "git.example.com".to_string(),
                head_owner: "contributor".to_string(),
                head_repo: "repo".to_string(),
                base_owner: "owner".to_string(),
                base_repo: "repo".to_string(),
            },
        };
        assert_eq!(
            info.prefixed_local_branch_name(),
            Some("contributor/main".to_string())
        );
    }

    #[test]
    fn test_prefixed_local_branch_name_gitlab() {
        let info = RemoteRefInfo {
            ref_type: RefType::Mr,
            number: 101,
            title: "Test".to_string(),
            author: "contributor".to_string(),
            state: "opened".to_string(),
            draft: false,
            source_branch: "main".to_string(),
            is_cross_repo: true,
            url: "https://gitlab.com/owner/repo/-/merge_requests/101".to_string(),
            fork_push_url: Some("git@gitlab.com:contributor/repo.git".to_string()),
            platform_data: PlatformData::GitLab {
                host: "gitlab.com".to_string(),
                base_owner: "owner".to_string(),
                base_repo: "repo".to_string(),
                source_project_id: 456,
                target_project_id: 123,
            },
        };
        // GitLab doesn't support prefixed branch names
        assert_eq!(info.prefixed_local_branch_name(), None);
    }

    #[test]
    fn test_extract_namespace_from_url_ssh() {
        assert_eq!(
            extract_namespace_from_url("git@gitlab.com:owner/repo.git"),
            Some("owner".to_string())
        );
        assert_eq!(
            extract_namespace_from_url("git@github.com:contributor/repo.git"),
            Some("contributor".to_string())
        );
    }

    #[test]
    fn test_extract_namespace_from_url_https() {
        assert_eq!(
            extract_namespace_from_url("https://gitlab.com/owner/repo.git"),
            Some("owner".to_string())
        );
        assert_eq!(
            extract_namespace_from_url("http://github.com/owner/repo.git"),
            Some("owner".to_string())
        );
    }

    #[test]
    fn test_extract_namespace_from_url_nested() {
        // GitLab nested namespaces
        assert_eq!(
            extract_namespace_from_url("git@gitlab.com:group/subgroup/repo.git"),
            Some("group/subgroup".to_string())
        );
        assert_eq!(
            extract_namespace_from_url("https://gitlab.com/group/subgroup/repo.git"),
            Some("group/subgroup".to_string())
        );
        // Even deeper nesting
        assert_eq!(
            extract_namespace_from_url("git@gitlab.com:org/team/project/repo.git"),
            Some("org/team/project".to_string())
        );
    }

    #[test]
    fn test_source_ref_azure_same_repo() {
        let info = RemoteRefInfo {
            ref_type: RefType::Pr,
            number: 550,
            title: "Add ACH mandate support".to_string(),
            author: "crogers".to_string(),
            state: "active".to_string(),
            draft: false,
            source_branch: "crogers/ACHMandate".to_string(),
            is_cross_repo: false,
            url: "https://dev.azure.com/myorg/myproject/_git/myrepo/pullrequest/550".to_string(),
            fork_push_url: None,
            platform_data: PlatformData::AzureDevOps {
                host: "dev.azure.com".to_string(),
                organization: "myorg".to_string(),
                project: "myproject".to_string(),
                repo_name: "myrepo".to_string(),
            },
        };
        assert_eq!(info.source_ref(), "crogers/ACHMandate");
    }

    #[test]
    fn test_prefixed_local_branch_name_azure() {
        let info = RemoteRefInfo {
            ref_type: RefType::Pr,
            number: 550,
            title: "Test".to_string(),
            author: "crogers".to_string(),
            state: "active".to_string(),
            draft: false,
            source_branch: "main".to_string(),
            is_cross_repo: true,
            url: "https://dev.azure.com/myorg/myproject/_git/myrepo/pullrequest/550".to_string(),
            fork_push_url: None,
            platform_data: PlatformData::AzureDevOps {
                host: "dev.azure.com".to_string(),
                organization: "myorg".to_string(),
                project: "myproject".to_string(),
                repo_name: "myrepo".to_string(),
            },
        };
        assert_eq!(info.prefixed_local_branch_name(), None);
    }

    #[test]
    fn test_extract_namespace_from_url_invalid() {
        assert_eq!(extract_namespace_from_url("invalid-url"), None);
        assert_eq!(extract_namespace_from_url(""), None);
        // Just a repo name, no namespace
        assert_eq!(extract_namespace_from_url("git@gitlab.com:repo.git"), None);
    }
}