fix: address review feedback on --ssh-after-step

- Early-exit waitForLogMarker when attempt reaches terminal status
  instead of polling forever if a step before the debug step fails
- Remove duplicate "Connecting to sandbox" message (already in waitForSandbox)
- Fix printSSHInfo to use run ID for `depot ci ssh` suggestion
- Remove arbitrary 10min timeout on log marker polling (rely on
  terminal status check and context cancellation instead)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: robstolarz

pkg/cmd/ci/run.go

@@ -240,9 +240,8 @@ This command is in beta and subject to change.`,
 				if sshAfterStep > 0 {
 					fmt.Fprintf(os.Stderr, "Run 'touch /tmp/depot-continue' to resume the workflow. (Your session will not end.)\n")
 				}
-				fmt.Fprintf(os.Stderr, "Connecting to sandbox %s...\n", sandboxID)
 				if !helpers.IsTerminal() {
-					return printSSHInfo(sandboxID, sessionID, "")
+					return printSSHInfo(resp.RunId, sandboxID, sessionID, "")
 				}
 				return pty.Run(ctx, pty.SessionOptions{
 					Token:     tokenVal,
@@ -513,14 +512,8 @@ func formatStatus(s civ1.CIRunStatus) string {
 // appears. This is used to detect when the injected debug step is running.
 func waitForLogMarker(ctx context.Context, token, orgID, runID, jobKey, marker string) error {
 	const pollInterval = 3 * time.Second
-	const timeout = 10 * time.Minute
-
-	deadline := time.Now().Add(timeout)
 
 	for {
-		if time.Now().After(deadline) {
-			return fmt.Errorf("timed out waiting for log marker (waited %s)", timeout)
-		}
 
 		// Resolve the latest attempt ID for the job.
 		resp, err := api.CIGetRunStatus(ctx, token, orgID, runID)
@@ -554,6 +547,12 @@ func waitForLogMarker(ctx context.Context, token, orgID, runID, jobKey, marker s
 			continue
 		}
 
+		// Early exit if the job has already completed — the marker will never appear.
+		switch attempt.Status {
+		case "finished", "failed", "cancelled":
+			return fmt.Errorf("job completed before debug step was reached (status: %s)", attempt.Status)
+		}
+
 		lines, err := api.CIGetJobAttemptLogs(ctx, token, orgID, attempt.AttemptId)
 		if err == nil {
 			for _, line := range lines {

pkg/cmd/ci/ssh.go

@@ -73,7 +73,7 @@ This command is in beta and subject to change.`,
 			}
 
 			if info || !helpers.IsTerminal() {
-				return printSSHInfo(sandboxID, sessionID, output)
+				return printSSHInfo(runID, sandboxID, sessionID, output)
 			}
 
 			return pty.Run(ctx, pty.SessionOptions{
@@ -276,12 +276,13 @@ func workflowErrorMessage(resp *civ1.GetRunStatusResponse) string {
 	return ""
 }
 
-func printSSHInfo(sandboxID, sessionID, output string) error {
+func printSSHInfo(runID, sandboxID, sessionID, output string) error {
 	if output == "json" {
 		enc := json.NewEncoder(os.Stdout)
 		enc.SetIndent("", "  ")
 		return enc.Encode(map[string]string{
 			"host":        "api.depot.dev",
+			"run_id":      runID,
 			"sandbox_id":  sandboxID,
 			"session_id":  sessionID,
 			"ssh_command": fmt.Sprintf("ssh %s@api.depot.dev", sandboxID),
@@ -293,7 +294,7 @@ func printSSHInfo(sandboxID, sessionID, output string) error {
 	fmt.Printf("Password: Your Depot API token ($DEPOT_TOKEN)\n")
 	fmt.Println()
 	fmt.Printf("Connect interactively:\n")
-	fmt.Printf("  depot ci ssh %s\n", sandboxID)
+	fmt.Printf("  depot ci ssh %s\n", runID)
 	fmt.Println()
 	fmt.Printf("Or via SSH directly:\n")
 	fmt.Printf("  ssh %s@api.depot.dev\n", sandboxID)