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 ++++++++++++++++++++++++++++--- server/server_test.go | 20 ++++++++++++++++++++ 2 files changed, 48 insertions(+), 3 deletions(-) (limited to 'server') 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", " ")) diff --git a/server/server_test.go b/server/server_test.go index d19c5e8..1ad36ee 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -127,6 +127,24 @@ func TestCompactionBlock(t *testing.T) { } } +func TestBranchAndDirectoryChange(t *testing.T) { + h := newHarness(t, nil) + branch := strings.Replace(session, `"c":[`, `"h":1,"o":"bbbbbbbb-0000","ot":"The original",`+ + `"c":[{"r":"u","x":"old question"},{"r":"d","x":"/home/u/proj/sub"},`, 1) + r := h.create(`{"payload":` + payload(branch) + `}`) + txt := h.do("GET", "/share/"+r.ID+".txt", "", "").Body.String() + for _, want := range []string{"--- inherited history, from The original ---\n\n## User\n\nold question", + "--- the branch starts here ---\n\n> cd: /home/u/proj/sub\n"} { + if !strings.Contains(txt, want) { + t.Fatalf("missing %q in txt: %s", want, txt) + } + } + js := h.do("GET", "/share/"+r.ID+".json", "", "").Body.String() + if !strings.Contains(js, `"h":1,"o":"bbbbbbbb-0000","ot":"The original"`) { + t.Fatalf("json: %s", js) + } +} + func TestUpdateAndDeleteNeedTheSecret(t *testing.T) { h := newHarness(t, nil) r := h.create(`{"payload":` + payload() + `}`) @@ -187,6 +205,8 @@ func TestRejectsBadPayloads(t *testing.T) { "two sessions": `{"payload":` + payload(session, session) + `}`, "bad role": `{"payload":` + payload(strings.Replace(session, `"r":"t"`, `"r":"z"`, 1)) + `}`, "bad type": `{"payload":` + payload(strings.Replace(session, `"u":1`, `"u":"1"`, 1)) + `}`, + "h too big": `{"payload":` + payload(strings.Replace(session, `"c":[`, `"h":9,"c":[`, 1)) + `}`, + "bad origin": `{"payload":` + payload(strings.Replace(session, `"c":[`, `"o":"../x","c":[`, 1)) + `}`, "memories": `{"payload":{"s":[` + session + `],"m":[{"name":"x"}]}}`, "bad expire": `{"payload":` + payload() + `,"expire":"never"}`, "extra field": `{"payload":` + payload() + `,"html":"x"}`, -- cgit v1.2.3