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
Harden detached CI session cleanup
shukieshah68d644924ea3
diff --git a/cli/beacon/cmd/ci.go b/cli/beacon/cmd/ci.goindex ac1f599b..c85458fa 100644--- a/cli/beacon/cmd/ci.go+++ b/cli/beacon/cmd/ci.go@@ -211,6 +211,12 @@ func runCIStart(cmd *cobra.Command, args []string) error {return err}if err := writeGitHubEnv(ciOpts.githubEnvPath, result.Exports); err != nil {+ cleanupCtx, cancel := context.WithTimeout(context.Background(), 5*time.Second)+ _ = session.StopDetached(cleanupCtx)+ cancel()+ if result.StatePath != "" {+ _ = os.Remove(result.StatePath)+ }return err}if ciOpts.jsonOutput {diff --git a/cli/beacon/internal/ci/session.go b/cli/beacon/internal/ci/session.goindex f501f277..cae8392a 100644--- a/cli/beacon/internal/ci/session.go+++ b/cli/beacon/internal/ci/session.go@@ -216,6 +216,7 @@ func (s *Session) Start(ctx context.Context, stdout, stderr io.Writer) error {cmd := collectorCommand(s.CollectorBinary, "--config", s.ConfigPath)cmd.Stdout = stdoutcmd.Stderr = stderr+ cmd.Env = stripEnv(os.Environ(), "RUNNER_TRACKING_ID")if err := cmd.Start(); err != nil {return err}@@ -303,6 +304,9 @@ func (s *Session) StopDetached(ctx context.Context) error {if err := terminateProcess(process); err != nil {return err}+ if runtime.GOOS == "windows" {+ return nil+ }ticker := time.NewTicker(100 * time.Millisecond)defer ticker.Stop()for {@@ -326,10 +330,6 @@ func (s *Session) RunChild(ctx context.Context, args []string, stdout, stderr iocmd.Dir = s.WorkDirchildEnv := envMap(os.Environ())for key, value := range s.Exports() {- if key == "OTEL_RESOURCE_ATTRIBUTES" && strings.TrimSpace(childEnv[key]) != "" && strings.TrimSpace(value) != "" {- childEnv[key] = childEnv[key] + "," + value- continue- }childEnv[key] = value}env := flattenEnv(childEnv)@@ -360,7 +360,7 @@ func (s *Session) Exports() map[string]string {if strings.TrimSpace(harness) == "" {harness = DefaultHarness}- cfg, err := BuildHarnessConfig(nil, harness, s.GRPCEndpoint, s.BaseDir, s.Run)+ cfg, err := BuildHarnessConfig(os.Environ(), harness, s.GRPCEndpoint, s.BaseDir, s.Run)if err == nil {s.Env = cfg.Envs.Paths = cfg.Pathsdiff --git a/cli/beacon/internal/ci/session_test.go b/cli/beacon/internal/ci/session_test.goindex 23092493..a8e7dd4b 100644--- a/cli/beacon/internal/ci/session_test.go+++ b/cli/beacon/internal/ci/session_test.go@@ -76,7 +76,8 @@ func TestStartStopCollectorProcess(t *testing.T) {if runtime.GOOS == "windows" {t.Skip("shell fake uses POSIX signal semantics")}- collector := fakeExecutable(t, "collector", "#!/bin/sh\ntrap 'exit 0' TERM\nwhile true; do sleep 1; done\n")+ t.Setenv("RUNNER_TRACKING_ID", "github-actions-tracker")+ collector := fakeExecutable(t, "collector", "#!/bin/sh\nenv > \"$2.env\"\ntrap 'exit 0' TERM\nwhile true; do sleep 1; done\n")oldWait := waitCollectorReadywaitCollectorReady = func(endpointconfig.Config, time.Duration) error { return nil }t.Cleanup(func() { waitCollectorReady = oldWait })@@ -92,6 +93,21 @@ func TestStartStopCollectorProcess(t *testing.T) {if err := session.Start(context.Background(), nil, nil); err != nil {t.Fatalf("Start returned error: %v", err)}+ var data []byte+ for i := 0; i < 20; i++ {+ var err error+ data, err = os.ReadFile(session.ConfigPath + ".env")+ if err == nil {+ break+ }+ time.Sleep(25 * time.Millisecond)+ }+ if len(data) == 0 {+ t.Fatalf("collector did not write env file")+ }+ if strings.Contains(string(data), "RUNNER_TRACKING_ID=") {+ t.Fatalf("collector env should not inherit RUNNER_TRACKING_ID:\n%s", data)+ }ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)defer cancel()if err := session.Stop(ctx); err != nil {@@ -215,6 +231,9 @@ func TestRunChildInjectsClaudeEnvAndBeaconPaths(t *testing.T) {if !strings.HasPrefix(resourceAttrs, "service.name=custom,beacon.origin=ci,") {t.Fatalf("OTEL_RESOURCE_ATTRIBUTES should preserve existing attributes first: %q", resourceAttrs)}+ if strings.Count(resourceAttrs, "service.name=custom") != 1 {+ t.Fatalf("OTEL_RESOURCE_ATTRIBUTES duplicated existing attributes: %q", resourceAttrs)+ }}func envVarValue(env, key string) string {