The cross-harness, self-improving memory layer for AI agents. Join our community: https://discord.com/invite/zdNChS2fBu
Go agent-ai-cliagent-harnessesagent-securitybrowser-extensionciclaude-codecloudcodexcursordetection-engineeringjevknowledge-basememorymobile-device-managementobservabilitysecuritysecurity-information-and-event-managementsecurity-toolstelemetrytraces
Correlate fallback cloud run IDs
shukieshah912a2ed9a6de
diff --git a/cli/beacon-hooks/internal/logging/endpoint_event_test.go b/cli/beacon-hooks/internal/logging/endpoint_event_test.goindex eeb79f9f..5c2f9440 100644--- a/cli/beacon-hooks/internal/logging/endpoint_event_test.go+++ b/cli/beacon-hooks/internal/logging/endpoint_event_test.go@@ -103,6 +103,46 @@ func TestEndpointEventPrefersCloudUserHash(t *testing.T) {}}+func TestEndpointEventUsesStableFallbackCloudRunID(t *testing.T) {+ dir := t.TempDir()+ logPath := filepath.Join(dir, "runtime.jsonl")+ statePath := filepath.Join(dir, "shuttle-state.json")+ t.Setenv("BEACON_ENDPOINT_LOG", logPath)+ t.Setenv("BEACON_ORIGIN", "cloud")+ t.Setenv("BEACON_RUN_PROVIDER", "claude_code_web")+ t.Setenv("BEACON_CLOUD_GCS_BUCKET", "bucket")+ t.Setenv("BEACON_CLOUD_GCS_CREDENTIALS_B64", "credentials")+ t.Setenv("BEACON_CLOUD_SHUTTLE_STATE", statePath)++ logger := NewLoggerForPlatform("session-start", "claude")+ if err := logger.EndpointEvent("session.started", "session", "info", "Session started", nil); err != nil {+ t.Fatalf("EndpointEvent returned error: %v", err)+ }+ if err := logger.EndpointEvent("tool.completed", "tool", "info", "Done", nil); err != nil {+ t.Fatalf("EndpointEvent returned error: %v", err)+ }+ data, err := os.ReadFile(logPath)+ if err != nil {+ t.Fatalf("read endpoint log: %v", err)+ }+ lines := strings.Split(strings.TrimSpace(string(data)), "\n")+ if len(lines) != 2 {+ t.Fatalf("lines = %d, want 2", len(lines))+ }+ var first, second map[string]interface{}+ if err := json.Unmarshal([]byte(lines[0]), &first); err != nil {+ t.Fatalf("unmarshal first event: %v", err)+ }+ if err := json.Unmarshal([]byte(lines[1]), &second); err != nil {+ t.Fatalf("unmarshal second event: %v", err)+ }+ firstRunID := first["run"].(map[string]interface{})["run_id"]+ secondRunID := second["run"].(map[string]interface{})["run_id"]+ if firstRunID == "" || firstRunID != secondRunID {+ t.Fatalf("fallback run IDs = %q and %q, want same non-empty value", firstRunID, secondRunID)+ }+}+func TestEndpointEventRotatesRuntimeLog(t *testing.T) {logPath := filepath.Join(t.TempDir(), "runtime.jsonl")if err := os.WriteFile(logPath, []byte("old log contents"), 0644); err != nil {diff --git a/cli/beacon-hooks/internal/logging/logging.go b/cli/beacon-hooks/internal/logging/logging.goindex 15c95d7c..1cbf9bb4 100644--- a/cli/beacon-hooks/internal/logging/logging.go+++ b/cli/beacon-hooks/internal/logging/logging.go@@ -164,6 +164,8 @@ func cloudRunFields() map[string]interface{} {}if runID := firstEnv("BEACON_RUN_ID", "CLAUDE_CODE_REMOTE_SESSION_ID"); runID != "" {run["run_id"] = runID+ } else if runID := fallbackCloudRunID(); runID != "" {+ run["run_id"] = runID}if attempt := firstEnv("BEACON_RUN_ATTEMPT"); attempt != "" {run["run_attempt"] = attempt@@ -212,6 +214,30 @@ func firstEnv(keys ...string) string {return ""}+func fallbackCloudRunID() string {+ if firstEnv("BEACON_ORIGIN") != "cloud" {+ return ""+ }+ if firstEnv("BEACON_CLOUD_GCS_BUCKET") == "" || firstEnv("BEACON_CLOUD_GCS_CREDENTIALS_B64") == "" {+ return ""+ }+ statePath := firstEnv("BEACON_CLOUD_SHUTTLE_STATE")+ if statePath == "" {+ statePath = "/tmp/beacon/shuttle-state.json"+ }+ path := statePath + ".run-id"+ if data, err := os.ReadFile(path); err == nil {+ if value := strings.TrimSpace(string(data)); value != "" {+ return value+ }+ }+ value := fmt.Sprintf("manual-%d", time.Now().UTC().UnixNano())+ if err := os.MkdirAll(filepath.Dir(path), 0755); err == nil {+ _ = os.WriteFile(path, []byte(value+"\n"), 0644)+ }+ return value+}+func writeEndpointJSON(path string, event map[string]interface{}) error {if err := os.MkdirAll(filepath.Dir(path), 0755); err != nil {return err