Skip to content

Every agent's model. One place. Codex on DeepSeek, Claude Code on Kimi, from the menu bar.

sessions: a prompt's title reads only as far as it keeps, not through a regexp and runes of the whole prompt

yetonee68a0b1db580
diff --git a/internal/sessions/sessions.go b/internal/sessions/sessions.go
index a2b3413da..9d2c031a2 100644
--- a/internal/sessions/sessions.go
+++ b/internal/sessions/sessions.go
@@ -30,6 +30,8 @@ import (
"sync"
"sync/atomic"
"time"
+ "unicode"
+ "unicode/utf8"
"github.com/klauspost/compress/zstd"
"github.com/yetone/magpie/internal/appdir"
@@ -1744,21 +1746,37 @@ func tsAt(b []byte, last bool) time.Time {
return t
}
-var (
- space = regexp.MustCompile(`\s+`)
- tag = regexp.MustCompile(`</?[A-Za-z][\w-]*[^<>]*>`)
-)
+var tag = regexp.MustCompile(`</?[A-Za-z][\w-]*[^<>]*>`)
// untagged is a message the agent or a harness wrapped in tags, as words.
func untagged(s string) string { return title(tag.ReplaceAllString(s, " ")) }
-// title is a prompt made one short line.
+// title is a prompt made one short line: each run of ASCII white space (as
+// regexp's \s) one space, trimmed, and cut at 160 characters. It reads only
+// as far as it keeps, and one past: a pasted file as a prompt went through
+// a regexp and into runes whole, 0.45 GB of a cold start's first 2 minutes.
func title(s string) string {
- s = strings.TrimSpace(space.ReplaceAllString(s, " "))
- if r := []rune(s); len(r) > 160 {
- s = strings.TrimSpace(string(r[:160])) + "…"
+ const most = 160
+ s = strings.TrimLeftFunc(s, unicode.IsSpace)
+ b := make([]byte, 0, min(len(s), 4*most))
+ n, in, i := 0, false, 0 // runes kept; in a run of \s
+ for ; i < len(s) && n < most; i++ {
+ switch c := s[i]; c {
+ case '\t', '\n', '\f', '\r', ' ':
+ if !in {
+ b, n, in = append(b, ' '), n+1, true
+ }
+ default:
+ _, w := utf8.DecodeRuneInString(s[i:])
+ b, n, in = append(b, s[i:i+w]...), n+1, false
+ i += w - 1
+ }
}
- return s
+ if strings.IndexFunc(s[i:], func(r rune) bool { return !unicode.IsSpace(r) }) < 0 {
+ return strings.TrimRightFunc(string(b), unicode.IsSpace)
+ }
+ // as []rune made it: each byte not UTF-8 one U+FFFD
+ return strings.TrimSpace(string([]rune(string(b)))) + "…"
}
// ---- pricing ----------------------------------------------------------------
diff --git a/internal/sessions/title_test.go b/internal/sessions/title_test.go
new file mode 100644
index 000000000..8753e3e8b
--- /dev/null
+++ b/internal/sessions/title_test.go
@@ -0,0 +1,61 @@
+package sessions
+
+import (
+ "math/rand"
+ "regexp"
+ "strings"
+ "testing"
+)
+
+// oldTitle is title as it was, through a regexp and runes of the whole.
+func oldTitle(s string) string {
+ s = strings.TrimSpace(regexp.MustCompile(`\s+`).ReplaceAllString(s, " "))
+ if r := []rune(s); len(r) > 160 {
+ s = strings.TrimSpace(string(r[:160])) + "…"
+ }
+ return s
+}
+
+func TestTitleAsBefore(t *testing.T) {
+ cases := []string{
+ "", " ", "\t\n", "hi", " a b\t\tc \n", "\v x \v", " x ", " \v x",
+ strings.Repeat("a", 159), strings.Repeat("a", 160), strings.Repeat("a", 161),
+ strings.Repeat("a", 160) + " ", strings.Repeat("a", 160) + "\v  \n",
+ strings.Repeat("a", 159) + " b", strings.Repeat("a", 159) + "\vb",
+ strings.Repeat("字", 200), strings.Repeat("a ", 100), "\xff\xfe" + strings.Repeat("b", 170),
+ "ok\xff", strings.Repeat("\xff", 161), strings.Repeat("x ", 90), "\u0085a\u0085",
+ }
+ alphabet := []string{"a", "字", " ", "\t", "\n", "\r", "\f", "\v", " ", "\u0085", " ", "\xff", "é", " "}
+ rng := rand.New(rand.NewSource(1))
+ for range 20000 {
+ var b strings.Builder
+ for n := rng.Intn(400); n > 0; n-- {
+ b.WriteString(alphabet[rng.Intn(len(alphabet))])
+ }
+ cases = append(cases, b.String())
+ }
+ for _, c := range cases {
+ if got, want := title(c), oldTitle(c); got != want {
+ t.Fatalf("title(%q) = %q, was %q", c, got, want)
+ }
+ }
+}
+
+// A pasted file as the prompt is read only as far as its title.
+func TestTitleOfALongPromptAllocatesItsTitle(t *testing.T) {
+ long := strings.Repeat("word \n", 1<<17) // ~900 KB
+ if allocs := testing.AllocsPerRun(20, func() { title(long) }); allocs > 8 {
+ t.Fatalf("%v allocations", allocs)
+ }
+ var sink string
+ n := testing.Benchmark(func(b *testing.B) {
+ b.ReportAllocs()
+ for b.Loop() {
+ sink = title(long)
+ }
+ })
+ _ = sink
+ if per := n.AllocedBytesPerOp(); per > 4<<10 {
+ t.Fatalf("a %d KB prompt's title allocated %d KB", len(long)>>10, per>>10)
+ }
+}