pkg/client/clientimplementation/workspace_client.go (2)

776-808: Potential infinite loop when workspace status remains Stopped or NotFound without create=true.

When create is false and status is StatusStopped or StatusNotFound, the handler functions return an error immediately (lines 826, 837). However, when create is true and the Create/Start call succeeds, the loop continues without a status change check, potentially causing repeated Create/Start attempts if the status doesn't transition quickly.

Consider adding a brief sleep after successful Create/Start to allow the workspace to transition, or return after initiating the operation:

♻️ Suggested improvement

 func handleStoppedStatus(ctx context.Context, workspaceClient client.WorkspaceClient, create bool) error {
 	if create {
 		err := workspaceClient.Start(ctx, client.StartOptions{})
 		if err != nil {
 			return fmt.Errorf("start workspace %w", err)
 		}
-		return nil
+		time.Sleep(pollInterval)
+		return nil // Continue polling for status change
 	}
 	return fmt.Errorf("workspace is stopped")
 }

 func handleNotFoundStatus(ctx context.Context, workspaceClient client.WorkspaceClient, create bool) error {
 	if create {
 		err := workspaceClient.Create(ctx, client.CreateOptions{})
 		if err != nil {
 			return err
 		}
-		return nil
+		time.Sleep(pollInterval)
+		return nil // Continue polling for status change
 	}
 	return fmt.Errorf("workspace not found")
 }

---

918-949: Error from agent injection goroutine may be silently ignored on tunnel server failure.

In BuildAgentClient, if runTunnelServer returns an error (line 878), the function returns immediately without waiting for errChan. This means the goroutine in runAgentInjection continues running until it completes or the context is cancelled, but its error is never consumed.

Additionally, if the tunnel server succeeds but agent injection fails, the error from errChan is returned (line 882), but there's no aggregation of both errors.

Consider ensuring both errors are properly handled:

♻️ Suggested improvement

 	result, err := runTunnelServer(cancelCtx, opts, stdoutReader, stdinWriter)
-	if err != nil {
-		return nil, err
-	}
-
-	return result, <-errChan
+	agentErr := <-errChan
+	if err != nil {
+		// Tunnel server failed; agent error is secondary
+		return nil, err
+	}
+	if agentErr != nil {
+		return nil, agentErr
+	}
+	return result, nil