Skip to content

The cross-harness, self-improving memory layer for AI agents. Join our community: https://discord.com/invite/zdNChS2fBu

fix: dshsession partial cursor, parent session, and diff whitespace bugs

Cursor Agent1ee55ecc6fb7
diff --git a/cli/beacon/internal/dshsession/collect.go b/cli/beacon/internal/dshsession/collect.go
index cd4f0458..d253b321 100644
--- a/cli/beacon/internal/dshsession/collect.go
+++ b/cli/beacon/internal/dshsession/collect.go
@@ -177,7 +177,7 @@ func collectSession(store *Store, ref SessionRef, state *State, opts CollectOpti
}
for i, item := range mapped {
if err := emit(item.Event, opts); err != nil {
- advanceCursorPartial(cursor, ref, mapped, i)
+ advanceCursorPartial(cursor, mapped, i)
return true, err
}
summary.EventsEmitted++
@@ -206,7 +206,7 @@ func advanceCursor(cursor *Cursor, ref SessionRef, records []Record, stats Stats
}
}
-func advanceCursorPartial(cursor *Cursor, ref SessionRef, mapped []MappedEvent, failedIdx int) {
+func advanceCursorPartial(cursor *Cursor, mapped []MappedEvent, failedIdx int) {
var lastLine int
for i := 0; i < failedIdx; i++ {
if mapped[i].SourceLine > lastLine {
@@ -219,8 +219,6 @@ func advanceCursorPartial(cursor *Cursor, ref SessionRef, mapped []MappedEvent,
if lastLine > cursor.LastLine {
cursor.LastLine = lastLine
}
- cursor.SizeBytes = ref.SizeBytes
- cursor.ModTimeMS = ref.ModTimeUnixMS
}
func emit(event schema.Event, opts CollectOptions) error {
diff --git a/cli/beacon/internal/dshsession/mapper.go b/cli/beacon/internal/dshsession/mapper.go
index fe9f54a5..9774072f 100644
--- a/cli/beacon/internal/dshsession/mapper.go
+++ b/cli/beacon/internal/dshsession/mapper.go
@@ -259,9 +259,6 @@ func (m *mapper) base(record Record, action, category string, severity schema.Se
ev.Timestamp = schema.FormatTimestamp(time.UnixMilli(ts))
}
ev.Session = &schema.SessionInfo{ID: firstNonEmpty(m.session.ID, m.ref.ID), WorkingDirectory: m.session.CWD}
- if m.session.ParentSessionID != "" {
- ev.Raw = mergeRaw(ev.Raw, map[string]interface{}{"parent_session": m.session.ParentSessionID})
- }
if model := firstNonEmpty(m.model, m.session.Model); model != "" {
ev.Model = model
}
@@ -271,6 +268,9 @@ func (m *mapper) base(record Record, action, category string, severity schema.Se
func (m *mapper) append(record Record, suffix string, ev schema.Event) {
dedupID := fmt.Sprintf("%s:%s:%d:%s", m.ref.Path, firstNonEmpty(m.session.ID, m.ref.ID), record.Line, suffix)
ev.Event.ID = dshEventID(dedupID)
+ if m.session.ParentSessionID != "" {
+ ev.Raw = mergeRaw(ev.Raw, map[string]interface{}{"parent_session": m.session.ParentSessionID})
+ }
m.out = append(m.out, MappedEvent{SourceLine: record.Line, DedupID: dedupID, Event: ev})
}
@@ -379,27 +379,27 @@ func diffFromCall(call toolCall) string {
path := firstString(call.Arguments, "file_path", "path")
switch name {
case "write":
- content := firstString(call.Arguments, "content", "file_text")
+ content := firstStringRaw(call.Arguments, "content", "file_text")
if path != "" && content != "" {
return "--- /dev/null\n+++ " + path + "\n+" + strings.ReplaceAll(content, "\n", "\n+") + "\n"
}
case "edit":
- oldText := firstString(call.Arguments, "old_string", "old_str")
- newText := firstString(call.Arguments, "new_string", "new_str")
+ oldText := firstStringRaw(call.Arguments, "old_string", "old_str")
+ newText := firstStringRaw(call.Arguments, "new_string", "new_str")
if oldText != "" || newText != "" {
return "-" + strings.ReplaceAll(oldText, "\n", "\n-") + "\n+" + strings.ReplaceAll(newText, "\n", "\n+") + "\n"
}
case "str_replace_editor":
op := dshEditorOperation(call.Name, call.Arguments)
if op == "create" {
- content := firstString(call.Arguments, "file_text")
+ content := firstStringRaw(call.Arguments, "file_text")
if content != "" {
return "--- /dev/null\n+++ " + path + "\n+" + strings.ReplaceAll(content, "\n", "\n+") + "\n"
}
}
if op == "str_replace" || op == "insert" {
- oldText := firstString(call.Arguments, "old_str")
- newText := firstString(call.Arguments, "new_str", "insert")
+ oldText := firstStringRaw(call.Arguments, "old_str")
+ newText := firstStringRaw(call.Arguments, "new_str", "insert")
if oldText != "" || newText != "" {
return "-" + strings.ReplaceAll(oldText, "\n", "\n-") + "\n+" + strings.ReplaceAll(newText, "\n", "\n+") + "\n"
}
@@ -618,6 +618,17 @@ func firstString(data map[string]interface{}, keys ...string) string {
return ""
}
+func firstStringRaw(data map[string]interface{}, keys ...string) string {
+ for _, key := range keys {
+ if value, ok := data[key]; ok {
+ if text := textValue(value); text != "" {
+ return text
+ }
+ }
+ }
+ return ""
+}
+
func firstNonEmpty(values ...string) string {
for _, value := range values {
if strings.TrimSpace(value) != "" {