Skip to content

fix: send heartbeat on new orchestrator sessions #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
RaghavSood wants to merge 1 commit into from
Closed

fix: send heartbeat on new orchestrator sessions #73

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions internal/agent/orchestrator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,11 +176,10 @@ func (o *Orchestrator) SendHeartbeat(ctx context.Context) error {
return fmt.Errorf("ensure session: %w", err)
}

if justCreated {
log.Printf("agent: session just bootstrapped, skipping duplicate heartbeat")
return nil
}

// Always send a heartbeat message, even if the session was just bootstrapped.
// The orchestrator needs to receive heartbeat instructions to write decision
// files (new_tasks.json, etc.). Without this, ProcessDecisions would run
// immediately but find no decision files to process.
msg := o.composeHeartbeatMessage(ctx)

if err := o.client.SendMessage(ctx, orch.SessionID, msg, ""); err != nil {
Expand All @@ -190,10 +189,18 @@ func (o *Orchestrator) SendHeartbeat(ctx context.Context) error {
if err != nil {
return fmt.Errorf("recreate session after send failure: %w", err)
}
return nil
// Retry sending heartbeat to the new session
msg = o.composeHeartbeatMessage(ctx)
if err := o.client.SendMessage(ctx, orch.SessionID, msg, ""); err != nil {
return fmt.Errorf("retry heartbeat after recreation: %w", err)
}
}

o.queries.IncrementHeartbeatCount(ctx, orch.ID)
// Only increment heartbeat count for non-bootstrap heartbeats.
// When justCreated is true, this is the bootstrap heartbeat, not a regular one.
if !justCreated {
o.queries.IncrementHeartbeatCount(ctx, orch.ID)
}

if err := o.waitForIdle(ctx, orch.SessionID); err != nil {
return fmt.Errorf("wait for idle: %w", err)
Expand Down
Loading