fix: correct agent selection logic and handle nil timestamps

ThomasK33 · ThomasK33 · commit bbdf0cc3b599 · 2025-07-21T23:10:36.000+02:00
Change-Id: I12e96df671e52eb9e2ae85127ac1aa40f5671e52
Signed-off-by: Thomas Kosiewski &lt;tk@coder.com&gt;
diff --git a/cli/cliui/agent.go b/cli/cliui/agent.go
@@ -127,7 +127,7 @@ func Agent(ctx context.Context, writer io.Writer, agentID uuid.UUID, opts AgentO
 					}
 				}
 			}
-			sw.Complete(stage, agent.FirstConnectedAt.Sub(agent.CreatedAt))
+			sw.Complete(stage, safeDuration(sw, agent.FirstConnectedAt, &agent.CreatedAt))
 
 		case codersdk.WorkspaceAgentConnected:
 			if !showStartupLogs && agent.LifecycleState == codersdk.WorkspaceAgentLifecycleReady {
diff --git a/cli/ssh.go b/cli/ssh.go
@@ -943,7 +943,7 @@ func getWorkspaceAgent(workspace codersdk.Workspace, agentName string) (workspac
 	slices.Sort(availableNames)
 	if agentName != "" {
 		for i, agent := range agents {
-			if agent.Name != agentName || agent.ID.String() == agentName {
+			if agent.Name != agentName && agent.ID.String() != agentName {
 				continue
 			}
 			otherAgents := slices.Delete(agents, i, i+1)

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ func Agent(ctx context.Context, writer io.Writer, agentID uuid.UUID, opts AgentO`
`127`	`127`	`}`
`128`	`128`	`}`
`129`	`129`	`}`
`130`		`- sw.Complete(stage, agent.FirstConnectedAt.Sub(agent.CreatedAt))`
	`130`	`+ sw.Complete(stage, safeDuration(sw, agent.FirstConnectedAt, &agent.CreatedAt))`
`131`	`131`
`132`	`132`	`case codersdk.WorkspaceAgentConnected:`
`133`	`133`	`if !showStartupLogs && agent.LifecycleState == codersdk.WorkspaceAgentLifecycleReady {`
Original file line number	Diff line number	Diff line change
`@@ -943,7 +943,7 @@ func getWorkspaceAgent(workspace codersdk.Workspace, agentName string) (workspac`
`943`	`943`	`slices.Sort(availableNames)`
`944`	`944`	`if agentName != "" {`
`945`	`945`	`for i, agent := range agents {`
`946`		`- if agent.Name != agentName \|\| agent.ID.String() == agentName {`
	`946`	`+ if agent.Name != agentName && agent.ID.String() != agentName {`
`947`	`947`	`continue`
`948`	`948`	`}`
`949`	`949`	`otherAgents := slices.Delete(agents, i, i+1)`