Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion internal/eventstore/projection.go
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,9 @@ func buildManagerSummaries(
if !ok {
continue
}
summary.Artifacts++
if isManagerVisibleArtifact(artifact.Kind) {
summary.Artifacts++
}
summary.UpdatedAt = latestTime(summary.UpdatedAt, artifact.UpdatedAt)
summaries[artifact.TaskID] = summary
}
Expand Down Expand Up @@ -505,6 +507,10 @@ func isTerminalPullRequestState(state string) bool {
return strings.EqualFold(state, "MERGED") || strings.EqualFold(state, "CLOSED")
}

func isManagerVisibleArtifact(kind string) bool {
return !strings.EqualFold(strings.TrimSpace(kind), "worker_log")
}

func managerSummaryTone(current string, next string) string {
rank := map[string]int{"good": 0, "info": 1, "warning": 2, "danger": 3}
if rank[next] > rank[current] {
Expand Down
10 changes: 9 additions & 1 deletion internal/eventstore/projection_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -205,15 +205,23 @@ func TestBuildManagerSummariesCountsOnlyCurrentSignals(t *testing.T) {
"artifact": {
ID: "artifact",
TaskID: "task",
Kind: "benchmark",
UpdatedAt: base.Add(13 * time.Minute),
},
"worker-log": {
ID: "worker-log",
TaskID: "task",
Kind: "worker_log",
Name: "Remote stdout",
UpdatedAt: base.Add(14 * time.Minute),
},
}
steering := map[string]core.SteeringItem{
"steering": {
ID: "steering",
TaskID: "task",
Status: "pending",
UpdatedAt: base.Add(14 * time.Minute),
UpdatedAt: base.Add(15 * time.Minute),
},
}

Expand Down
6 changes: 5 additions & 1 deletion internal/orchestrator/task_assignments.go
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@ func (b *taskAssignmentBuilder) addPullRequestDisplayRows(pullRequests []core.Pu

func (b *taskAssignmentBuilder) addArtifactDisplayRows(artifacts []core.Artifact, task core.Task) {
for index, artifact := range artifacts {
if artifact.TaskID != b.taskID {
if artifact.TaskID != b.taskID || !isManagerVisibleArtifact(artifact.Kind) {
continue
}
key := nonEmpty(artifact.ID, artifact.Ref, artifact.URL, fmt.Sprintf("%s-%d", humanizeAssignmentKey(artifact.Kind), index+1))
Expand Down Expand Up @@ -806,6 +806,10 @@ func isDisplayWorkItemStatus(status core.WorkItemStatus) bool {
return status == core.WorkItemQueued || status == core.WorkItemRunning
}

func isManagerVisibleArtifact(kind string) bool {
return !strings.EqualFold(strings.TrimSpace(kind), "worker_log")
}

func isActiveAssignmentStatus(status string) bool {
normalized := strings.ToLower(strings.TrimSpace(status))
return normalized == "pending" || normalized == "queued" || normalized == "running"
Expand Down
6 changes: 6 additions & 0 deletions internal/orchestrator/task_assignments_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,10 @@ func TestBuildTaskAssignmentsDisplayRowsHideHistoricalFailures(t *testing.T) {
{ID: "feedback-merged", TaskID: "task-1", PullRequestID: "pr-merged", Status: "pending", Reason: "review", CreatedAt: now, UpdatedAt: now.Add(time.Minute)},
{ID: "feedback-open", TaskID: "task-1", PullRequestID: "pr-open", Status: "pending", Reason: "review", CreatedAt: now, UpdatedAt: now.Add(2 * time.Minute)},
},
Artifacts: []core.Artifact{
{ID: "stdout-log", TaskID: "task-1", Kind: "worker_log", Name: "Remote stdout", Ref: "/home/bot/work/worker/stdout.log", CreatedAt: now, UpdatedAt: now.Add(time.Minute)},
{ID: "benchmark", TaskID: "task-1", Kind: "benchmark", Name: "Benchmark", Ref: "shared/bench.txt", CreatedAt: now, UpdatedAt: now.Add(2 * time.Minute)},
},
}

result, err := BuildTaskAssignments(snapshot, "task-1")
Expand All @@ -293,12 +297,14 @@ func TestBuildTaskAssignmentsDisplayRowsHideHistoricalFailures(t *testing.T) {
displayRowAbsent(t, result.DisplayRows, "execution_node:node-failed")
displayRowAbsent(t, result.DisplayRows, "pr:pr-merged")
displayRowAbsent(t, result.DisplayRows, "feedback:feedback-merged")
displayRowAbsent(t, result.DisplayRows, "artifact:stdout-log")

displayRowByID(t, result.DisplayRows, "work:queued-work")
displayRowByID(t, result.DisplayRows, "debug_worker:worker-queued")
displayRowByID(t, result.DisplayRows, "execution_node:node-queued")
displayRowByID(t, result.DisplayRows, "pr:pr-open")
displayRowByID(t, result.DisplayRows, "feedback:feedback-open")
displayRowByID(t, result.DisplayRows, "artifact:benchmark")
}

func TestBuildTaskAssignmentsMissingTask(t *testing.T) {
Expand Down
10 changes: 7 additions & 3 deletions web/src/main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2572,7 +2572,7 @@ function deriveAssignmentRows({
});
}

for (const [index, artifact] of artifacts.entries()) {
for (const [index, artifact] of artifacts.filter(isManagerVisibleArtifact).entries()) {
const artifactKey = artifact.id || artifact.ref || artifact.url || `${humanizeKey(artifact.kind)}-${index + 1}`;
rows.push({
id: `artifact:${artifactKey}`,
Expand Down Expand Up @@ -3246,7 +3246,7 @@ function ObjectiveBrief({
</div>
</details>
<TaskAttentionPanel items={attentionItems} />
{(artifacts.length || task.milestones?.length) && <TaskObjectiveStrip task={task} artifacts={artifacts} />}
{(artifacts.some(isManagerVisibleArtifact) || task.milestones?.length) && <TaskObjectiveStrip task={task} artifacts={artifacts.filter(isManagerVisibleArtifact)} />}
<MemoryEntryPanel taskId={task.id} entries={memoryEntries} />
<SharedScratchPanel sessions={sessions} />
{taskError && (
Expand Down Expand Up @@ -4539,6 +4539,10 @@ function isTerminalPullRequestState(state: PullRequestState["state"] | undefined
return normalized === "MERGED" || normalized === "CLOSED";
}

function isManagerVisibleArtifact(artifact: Artifact): boolean {
return artifact.kind.trim().toLowerCase() !== "worker_log";
}

function formatDuration(start: string, end: string): string {
const startMs = Date.parse(start);
const endMs = Date.parse(end);
Expand Down Expand Up @@ -7073,7 +7077,7 @@ function deriveManagerSummaryForTask(snapshot: AppSnapshot, taskId: string): Man
activeWorkers,
activeWorkItems,
pullRequests: pullRequests.filter((pr) => !isTerminalPullRequestState(pr.state)).length,
artifacts: artifacts.length,
artifacts: artifacts.filter(isManagerVisibleArtifact).length,
latestAction,
latestActionAt,
latestActionLabel,
Expand Down
Loading