Skip to content

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

Fix three bugs in Cline session sync: system state path, trace key collision, kanban re-emit

Cursor Agente730994585dc
diff --git a/cli/beacon/cmd/endpoint_cline.go b/cli/beacon/cmd/endpoint_cline.go
index 681fcbfb..7870d788 100644
--- a/cli/beacon/cmd/endpoint_cline.go
+++ b/cli/beacon/cmd/endpoint_cline.go
@@ -9,6 +9,7 @@ import (
"time"
"github.com/asymptote-labs/agent-beacon/cli/beacon/internal/clinesession"
+ endpointconfig "github.com/asymptote-labs/agent-beacon/cli/beacon/internal/endpoint/config"
"github.com/asymptote-labs/agent-beacon/cli/beacon/internal/endpoint/lifecycle"
"github.com/spf13/cobra"
)
@@ -219,9 +220,8 @@ func resolveClineStatePath(path string, userMode bool) string {
if strings.TrimSpace(path) != "" {
return path
}
- base := filepath.Join("/var", "lib", "beacon", "endpoint", "state")
if userMode {
- base = filepath.Dir(clinesession.DefaultStatePath())
+ return clinesession.DefaultStatePath()
}
- return filepath.Join(base, "cline-sessions.json")
+ return filepath.Join(endpointconfig.BaseDir(false), "state", "cline-sessions.json")
}
diff --git a/cli/beacon/internal/clinesession/collect.go b/cli/beacon/internal/clinesession/collect.go
index f541b998..cb9d07ee 100644
--- a/cli/beacon/internal/clinesession/collect.go
+++ b/cli/beacon/internal/clinesession/collect.go
@@ -152,7 +152,11 @@ func collectTrace(store *Store, ref TraceRef, state *State, opts CollectOptions,
if err != nil {
return false, err
}
- mapped := MapTrace(ref, records, MapOptions{MinOrder: cursor.LastOrder, SkipStarted: cursor.Started})
+ minOrder := cursor.LastOrder
+ if ref.Kind == SourceKanban {
+ minOrder = 0
+ }
+ mapped := MapTrace(ref, records, MapOptions{MinOrder: minOrder, SkipStarted: cursor.Started})
if len(mapped) == 0 {
if len(records) > 0 && records[len(records)-1].Order > cursor.LastOrder {
cursor.LastOrder = records[len(records)-1].Order
diff --git a/cli/beacon/internal/clinesession/store.go b/cli/beacon/internal/clinesession/store.go
index 2ad3ae08..5a627382 100644
--- a/cli/beacon/internal/clinesession/store.go
+++ b/cli/beacon/internal/clinesession/store.go
@@ -183,8 +183,9 @@ func (s *Store) collectHistoryRefs(out map[string]TraceRef) {
if !ok {
continue
}
- if prev, exists := out[ref.ID]; !exists || ref.UpdatedAtUnixMS > prev.UpdatedAtUnixMS {
- out[ref.ID] = ref
+ key := ref.Kind + ":" + ref.ID
+ if prev, exists := out[key]; !exists || ref.UpdatedAtUnixMS > prev.UpdatedAtUnixMS {
+ out[key] = ref
}
}
}
@@ -240,8 +241,9 @@ func (s *Store) collectSessionRefs(out map[string]TraceRef) {
if dir := extractDirectoryFromRecord(meta); dir != "" {
ref.Directory = dir
}
- if prev, exists := out[ref.ID]; !exists || ref.UpdatedAtUnixMS > prev.UpdatedAtUnixMS {
- out[ref.ID] = ref
+ key := ref.Kind + ":" + ref.ID
+ if prev, exists := out[key]; !exists || ref.UpdatedAtUnixMS > prev.UpdatedAtUnixMS {
+ out[key] = ref
}
}
}
@@ -298,8 +300,9 @@ func (s *Store) collectKanbanRefs(out map[string]TraceRef) {
if info, err := os.Stat(sessionsPath); err == nil {
ref.SizeBytes = info.Size()
}
- if prev, exists := out[ref.ID]; !exists || ref.UpdatedAtUnixMS > prev.UpdatedAtUnixMS {
- out[ref.ID] = ref
+ key := ref.Kind + ":" + ref.ID
+ if prev, exists := out[key]; !exists || ref.UpdatedAtUnixMS > prev.UpdatedAtUnixMS {
+ out[key] = ref
}
}
}