worktrunk 0.36.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
//! Parse wt-trace log lines into structured entries.
//!
//! Trace lines are emitted by `shell_exec::Cmd` with this format:
//! ```text
//! [wt-trace] ts=1234567 tid=3 context=worktree cmd="git status" dur_us=12300 ok=true
//! [wt-trace] ts=1234567 tid=3 cmd="gh pr list" dur_us=45200 ok=false
//! [wt-trace] ts=1234567 tid=3 context=main cmd="git merge-base" dur_us=100000 err="fatal: ..."
//! ```
//!
//! Instant events (milestones without duration) use this format:
//! ```text
//! [wt-trace] ts=1234567 tid=3 event="Showed skeleton"
//! ```
//!
//! The `ts` (timestamp in microseconds since trace epoch) and `tid` (thread ID) fields
//! enable concurrency analysis and Chrome Trace Format export for visualizing
//! thread utilization in tools like chrome://tracing or Perfetto.
//!
//! Duration is specified in microseconds via `dur_us`.

use std::time::Duration;

/// The kind of trace entry: command execution or instant event.
#[derive(Debug, Clone, PartialEq)]
pub enum TraceEntryKind {
    /// A command execution with duration and result
    Command {
        /// Full command string (e.g., "git status --porcelain")
        command: String,
        /// Command duration
        duration: Duration,
        /// Command result
        result: TraceResult,
    },
    /// An instant event (milestone marker with no duration)
    Instant {
        /// Event name (e.g., "Showed skeleton")
        name: String,
    },
}

/// A parsed trace entry from a wt-trace log line.
#[derive(Debug, Clone, PartialEq)]
pub struct TraceEntry {
    /// Optional context (typically worktree name for git commands)
    pub context: Option<String>,
    /// The kind of trace entry
    pub kind: TraceEntryKind,
    /// Start timestamp in microseconds since Unix epoch (for Chrome Trace Format)
    pub start_time_us: Option<u64>,
    /// Thread ID that executed this command (for concurrency analysis)
    pub thread_id: Option<u64>,
}

/// Result of a traced command.
#[derive(Debug, Clone, PartialEq)]
pub enum TraceResult {
    /// Command completed (ok=true or ok=false)
    Completed { success: bool },
    /// Command failed with error (err="...")
    Error { message: String },
}

impl TraceEntry {
    /// Returns true if the command succeeded.
    /// Instant events always return true.
    pub fn is_success(&self) -> bool {
        match &self.kind {
            TraceEntryKind::Command { result, .. } => {
                matches!(result, TraceResult::Completed { success: true })
            }
            TraceEntryKind::Instant { .. } => true,
        }
    }
}

/// Parse a single trace line.
///
/// Returns `None` if the line doesn't match the expected format.
/// The `[wt-trace]` marker can appear anywhere in the line (to handle log prefixes).
///
/// Supports two entry types:
/// - Command events: `cmd="..." dur_us=... ok=true/false` or `err="..."`
/// - Instant events: `event="..."`
fn parse_line(line: &str) -> Option<TraceEntry> {
    // Find the [wt-trace] marker anywhere in the line
    let marker = "[wt-trace] ";
    let marker_pos = line.find(marker)?;
    let rest = &line[marker_pos + marker.len()..];

    // Parse key=value pairs
    let mut context = None;
    let mut command = None;
    let mut event = None;
    let mut duration = None;
    let mut result = None;
    let mut start_time_us = None;
    let mut thread_id = None;

    let mut remaining = rest;

    while !remaining.is_empty() {
        remaining = remaining.trim_start();
        if remaining.is_empty() {
            break;
        }

        // Find key=
        let eq_pos = remaining.find('=')?;
        let key = &remaining[..eq_pos];
        remaining = &remaining[eq_pos + 1..];

        // Parse value (quoted or unquoted)
        let value = if remaining.starts_with('"') {
            // Quoted value - find closing quote
            remaining = &remaining[1..];
            let end_quote = remaining.find('"')?;
            let val = &remaining[..end_quote];
            remaining = &remaining[end_quote + 1..];
            val
        } else {
            // Unquoted value - ends at space or end
            let end = remaining.find(' ').unwrap_or(remaining.len());
            let val = &remaining[..end];
            remaining = &remaining[end..];
            val
        };

        match key {
            "context" => context = Some(value.to_string()),
            "cmd" => command = Some(value.to_string()),
            "event" => event = Some(value.to_string()),
            "dur_us" => {
                let us: u64 = value.parse().ok()?;
                duration = Some(Duration::from_micros(us));
            }
            "ok" => {
                let success = value == "true";
                result = Some(TraceResult::Completed { success });
            }
            "err" => {
                result = Some(TraceResult::Error {
                    message: value.to_string(),
                });
            }
            "ts" => {
                start_time_us = value.parse().ok();
            }
            "tid" => {
                thread_id = value.parse().ok();
            }
            _ => {} // Ignore unknown keys for forward compatibility
        }
    }

    // Determine the entry kind based on what was parsed
    let kind = if let Some(event_name) = event {
        // Instant event
        TraceEntryKind::Instant { name: event_name }
    } else {
        // Command event - requires cmd, dur, and result
        TraceEntryKind::Command {
            command: command?,
            duration: duration?,
            result: result?,
        }
    };

    Some(TraceEntry {
        context,
        kind,
        start_time_us,
        thread_id,
    })
}

/// Parse multiple lines, filtering to only valid trace entries.
pub fn parse_lines(input: &str) -> Vec<TraceEntry> {
    input.lines().filter_map(parse_line).collect()
}

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

    #[test]
    fn test_parse_basic() {
        let line = r#"[wt-trace] cmd="git status" dur_us=12300 ok=true"#;
        let entry = parse_line(line).unwrap();

        assert_eq!(entry.context, None);
        let TraceEntryKind::Command {
            command, duration, ..
        } = &entry.kind
        else {
            panic!("expected command");
        };
        assert_eq!(command, "git status");
        assert_eq!(*duration, Duration::from_micros(12300));
        assert!(entry.is_success());
    }

    #[test]
    fn test_parse_with_context() {
        let line =
            r#"[wt-trace] context=main cmd="git merge-base HEAD origin/main" dur_us=45200 ok=true"#;
        let entry = parse_line(line).unwrap();

        assert_eq!(entry.context, Some("main".to_string()));
        let TraceEntryKind::Command { command, .. } = &entry.kind else {
            panic!("expected command");
        };
        assert_eq!(command, "git merge-base HEAD origin/main");
    }

    #[test]
    fn test_parse_error() {
        let line = r#"[wt-trace] cmd="git rev-list" dur_us=100000 err="fatal: bad revision""#;
        let entry = parse_line(line).unwrap();

        assert!(!entry.is_success());
        assert!(matches!(
            &entry.kind,
            TraceEntryKind::Command { result: TraceResult::Error { message }, .. } if message == "fatal: bad revision"
        ));
    }

    #[test]
    fn test_parse_ok_false() {
        let line = r#"[wt-trace] cmd="git diff" dur_us=5000 ok=false"#;
        let entry = parse_line(line).unwrap();

        assert!(!entry.is_success());
        assert!(matches!(
            &entry.kind,
            TraceEntryKind::Command {
                result: TraceResult::Completed { success: false },
                ..
            }
        ));
    }

    #[test]
    fn test_parse_non_trace_line() {
        assert!(parse_line("some random log line").is_none());
        assert!(parse_line("[other-tag] something").is_none());
    }

    #[test]
    fn test_parse_with_log_prefix() {
        // Real output has thread ID prefix like "[a] "
        let line = r#"[a] [wt-trace] cmd="git status" dur_us=5000 ok=true"#;
        let entry = parse_line(line).unwrap();
        assert!(matches!(
            &entry.kind,
            TraceEntryKind::Command { command, .. } if command == "git status"
        ));
    }

    #[test]
    fn test_parse_unknown_keys_ignored() {
        // Unknown keys should be ignored for forward compatibility
        let line =
            r#"[wt-trace] future_field=xyz cmd="git status" dur_us=5000 ok=true extra=ignored"#;
        let entry = parse_line(line).unwrap();
        assert!(matches!(
            &entry.kind,
            TraceEntryKind::Command { command, .. } if command == "git status"
        ));
        assert!(entry.is_success());
    }

    #[test]
    fn test_parse_trailing_whitespace() {
        // Trailing whitespace should be handled (exercises trim_start + break)
        let line = "[wt-trace] cmd=\"git status\" dur_us=5000 ok=true   ";
        let entry = parse_line(line).unwrap();
        assert!(matches!(
            &entry.kind,
            TraceEntryKind::Command { command, .. } if command == "git status"
        ));
    }

    #[test]
    fn test_parse_lines() {
        let input = r#"
DEBUG some other log
[wt-trace] cmd="git status" dur_us=10000 ok=true
more noise
[wt-trace] cmd="git diff" dur_us=20000 ok=true
"#;
        let entries = parse_lines(input);
        assert_eq!(entries.len(), 2);
        assert!(matches!(
            &entries[0].kind,
            TraceEntryKind::Command { command, .. } if command == "git status"
        ));
        assert!(matches!(
            &entries[1].kind,
            TraceEntryKind::Command { command, .. } if command == "git diff"
        ));
    }

    #[test]
    fn test_parse_with_timestamp_and_thread_id() {
        let line = r#"[wt-trace] ts=1736600000000000 tid=5 context=feature cmd="git status" dur_us=12300 ok=true"#;
        let entry = parse_line(line).unwrap();

        assert_eq!(entry.start_time_us, Some(1736600000000000));
        assert_eq!(entry.thread_id, Some(5));
        assert_eq!(entry.context, Some("feature".to_string()));
        assert!(matches!(
            &entry.kind,
            TraceEntryKind::Command { command, .. } if command == "git status"
        ));
        assert!(entry.is_success());
    }

    #[test]
    fn test_parse_without_timestamp_and_thread_id() {
        // Traces without ts/tid should parse with None values
        let line = r#"[wt-trace] cmd="git status" dur_us=12300 ok=true"#;
        let entry = parse_line(line).unwrap();

        assert_eq!(entry.start_time_us, None);
        assert_eq!(entry.thread_id, None);
        assert!(matches!(
            &entry.kind,
            TraceEntryKind::Command { command, .. } if command == "git status"
        ));
    }

    #[test]
    fn test_parse_partial_new_fields() {
        // Only ts provided, no tid
        let line = r#"[wt-trace] ts=1736600000000000 cmd="git status" dur_us=12300 ok=true"#;
        let entry = parse_line(line).unwrap();

        assert_eq!(entry.start_time_us, Some(1736600000000000));
        assert_eq!(entry.thread_id, None);
    }

    // ========================================================================
    // Instant event tests
    // ========================================================================

    #[test]
    fn test_parse_instant_event() {
        let line = r#"[wt-trace] ts=1736600000000000 tid=3 event="Showed skeleton""#;
        let entry = parse_line(line).unwrap();

        assert_eq!(entry.start_time_us, Some(1736600000000000));
        assert_eq!(entry.thread_id, Some(3));
        let TraceEntryKind::Instant { name } = &entry.kind else {
            panic!("expected instant event");
        };
        assert_eq!(name, "Showed skeleton");
        assert!(entry.is_success()); // Instant events are always "successful"
    }

    #[test]
    fn test_parse_instant_event_with_context() {
        let line = r#"[wt-trace] ts=1736600000000000 tid=3 context=main event="Skeleton rendered""#;
        let entry = parse_line(line).unwrap();

        assert_eq!(entry.context, Some("main".to_string()));
        assert!(matches!(
            &entry.kind,
            TraceEntryKind::Instant { name } if name == "Skeleton rendered"
        ));
    }

    #[test]
    fn test_parse_instant_event_minimal() {
        // Instant event with only the required field
        let line = r#"[wt-trace] event="Started""#;
        let entry = parse_line(line).unwrap();

        assert!(matches!(
            &entry.kind,
            TraceEntryKind::Instant { name } if name == "Started"
        ));
        assert_eq!(entry.start_time_us, None);
        assert_eq!(entry.thread_id, None);
    }

    #[test]
    fn test_parse_lines_mixed() {
        let input = r#"
[wt-trace] event="Started"
[wt-trace] cmd="git status" dur_us=10000 ok=true
[wt-trace] event="Showed skeleton"
[wt-trace] cmd="git diff" dur_us=20000 ok=true
[wt-trace] event="Done"
"#;
        let entries = parse_lines(input);
        assert_eq!(entries.len(), 5);
        assert!(matches!(&entries[0].kind, TraceEntryKind::Instant { name } if name == "Started"));
        assert!(
            matches!(&entries[1].kind, TraceEntryKind::Command { command, .. } if command == "git status")
        );
        assert!(
            matches!(&entries[2].kind, TraceEntryKind::Instant { name } if name == "Showed skeleton")
        );
        assert!(
            matches!(&entries[3].kind, TraceEntryKind::Command { command, .. } if command == "git diff")
        );
        assert!(matches!(&entries[4].kind, TraceEntryKind::Instant { name } if name == "Done"));
    }
}