From f546a8a1578bef9fbc144580b84f51e3e90480b1 Mon Sep 17 00:00:00 2001 From: Elvis Claros Castro Date: Sat, 3 Oct 2026 22:45:27 -0300 Subject: Show branches with their inherited history and mark directory changes --- server/render.go | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) (limited to 'server/render.go') diff --git a/server/render.go b/server/render.go index be3ba01..2c72c1a 100644 --- a/server/render.go +++ b/server/render.go @@ -45,6 +45,9 @@ type Session struct { K float64 `json:"k"` V *string `json:"v"` C []Block `json:"c"` + H int `json:"h"` + O *string `json:"o"` + OT *string `json:"ot"` } type Payload struct { @@ -81,10 +84,16 @@ func ParsePayload(raw []byte, maxSessions int) (*Payload, []byte, error) { return nil, nil, fmt.Errorf("payload: session %d: no c", i) } for j, b := range s.C { - if b.R != "u" && b.R != "a" && b.R != "t" && b.R != "c" { + if b.R != "u" && b.R != "a" && b.R != "t" && b.R != "c" && b.R != "d" { return nil, nil, fmt.Errorf("payload: session %d block %d: bad r", i, j) } } + if s.H < 0 || s.H > len(s.C) { + return nil, nil, fmt.Errorf("payload: session %d: bad h", i) + } + if s.O != nil && !sessionIDRE.MatchString(*s.O) { + return nil, nil, fmt.Errorf("payload: session %d: bad o", i) + } } p.M = []json.RawMessage{} clean, err := json.Marshal(p) @@ -185,12 +194,28 @@ func RenderText(p *Payload) []byte { continue } prev := "" - for _, c := range s.C { + for j, c := range s.C { + if s.H > 0 && j == 0 { + origin := deref(s.OT, "") + if origin == "" && s.O != nil { + origin = *s.O + } + fmt.Fprintf(&b, "\n--- inherited history, from %s ---\n", origin) + } + if s.H > 0 && j == s.H { + b.WriteString("\n--- the branch starts here ---\n") + prev = "" + } switch c.R { + case "d": + if prev != "t" && prev != "d" { + b.WriteString("\n") + } + fmt.Fprintf(&b, "> cd: %s\n", c.X) case "c": b.WriteString("\n--- context compacted here ---\n") case "t": - if prev != "t" { + if prev != "t" && prev != "d" { b.WriteString("\n") } fmt.Fprintf(&b, "> tool: %s\n", strings.ReplaceAll(c.X, "\n", " ")) -- cgit v1.2.3