fix(cli): only follow logs if agent is starting when using ssh

mafredri · mafredri · commit 5f89ac37226e · 2024-07-10T11:32:05.000Z
diff --git a/cli/cliui/agent.go b/cli/cliui/agent.go
@@ -132,7 +132,7 @@ func Agent(ctx context.Context, writer io.Writer, agentID uuid.UUID, opts AgentO
 			}
 
 			stage := "Running workspace agent startup scripts"
-			follow := opts.Wait
+			follow := opts.Wait && agent.LifecycleState.Starting()
 			if !follow {
 				stage += " (non-blocking)"
 			}
diff --git a/cli/cliui/agent_test.go b/cli/cliui/agent_test.go
@@ -258,10 +258,9 @@ func TestAgent(t *testing.T) {
 				},
 			},
 			want: []string{
-				"⧗ Running workspace agent startup scripts",
-				"ℹ︎ To connect immediately, reconnect with --wait=no or CODER_SSH_WAIT=no, see --help for more information.",
+				"⧗ Running workspace agent startup scripts (non-blocking)",
 				"Hello world",
-				"✘ Running workspace agent startup scripts",
+				"✘ Running workspace agent startup scripts (non-blocking)",
 				"Warning: A startup script exited with an error and your workspace may be incomplete.",
 				"For more information and troubleshooting, see",
 			},

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ func Agent(ctx context.Context, writer io.Writer, agentID uuid.UUID, opts AgentO`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`stage := "Running workspace agent startup scripts"`
`135`		`- follow := opts.Wait`
	`135`	`+ follow := opts.Wait && agent.LifecycleState.Starting()`
`136`	`136`	`if !follow {`
`137`	`137`	`stage += " (non-blocking)"`
`138`	`138`	`}`