Skip to content

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

fix: clear collector UID for Cowork users

shukieshah00c07416131d
diff --git a/collector-builder/exporter/beaconjsonexporter/internal/beaconevent/converter.go b/collector-builder/exporter/beaconjsonexporter/internal/beaconevent/converter.go
index eaa68e53..967d1149 100644
--- a/collector-builder/exporter/beaconjsonexporter/internal/beaconevent/converter.go
+++ b/collector-builder/exporter/beaconjsonexporter/internal/beaconevent/converter.go
@@ -752,9 +752,10 @@ func normalizeClaudeCoworkContext(event *Event, attrs map[string]interface{}) {
}
if name := FirstString(attrs, "user.email", "enduser.id", "user.account_id", "user.account_uuid", "user.id"); name != "" {
event.User.Name = name
- }
- if uid := FirstString(attrs, "user.account_uuid", "user.account_id", "user.id"); uid != "" {
- event.User.UID = uid
+ // The base event carries the collector process UID. Once a cloud identity
+ // replaces that process user, keep only a source-provided account ID;
+ // otherwise the record would mix a Cowork operator with the collector UID.
+ event.User.UID = FirstString(attrs, "user.account_uuid", "user.account_id", "user.id")
}
}
diff --git a/collector-builder/exporter/beaconjsonexporter/internal/beaconevent/converter_test.go b/collector-builder/exporter/beaconjsonexporter/internal/beaconevent/converter_test.go
index f6053a0f..185d3b45 100644
--- a/collector-builder/exporter/beaconjsonexporter/internal/beaconevent/converter_test.go
+++ b/collector-builder/exporter/beaconjsonexporter/internal/beaconevent/converter_test.go
@@ -1250,6 +1250,7 @@ func TestClaudeNormalizerDoesNotAffectOtherHarnesses(t *testing.T) {
}
func TestCapturedClaudeCoworkNormalizesThroughClaudeOTelPipeline(t *testing.T) {
+ t.Setenv("UID", "501")
fixture, events := capturedLogEvents(t, "claude-cowork-2.1.251.json")
if len(events) != len(fixture.Records) {
t.Fatalf("events = %d, want %d", len(events), len(fixture.Records))
@@ -1290,6 +1291,9 @@ func TestCapturedClaudeCoworkNormalizesThroughClaudeOTelPipeline(t *testing.T) {
if response.Content == nil || !response.Content.Included {
t.Fatalf("assistant response content marker = %#v, want retained content", response.Content)
}
+ if response.User.Name != "[email protected]" || response.User.UID != "" {
+ t.Fatalf("assistant response user = %#v, want cloud identity without collector UID", response.User)
+ }
apiRequest := byName["api_request"]
if apiRequest.Event.Action != "session.activity" || apiRequest.GenAI == nil || apiRequest.GenAI.Usage == nil {