Fix get_apply_logs tool hanging when run is in pending state (#468)

Author: MulyaP

CHANGELOG.md

@@ -8,6 +8,10 @@ FEATURES
 * [New Tool] `get_project` Fetches detailed information about a Terraform project by its ID. Requires `project_id`.
 * [New Tool] `create_team` Creates a new team in a Terraform Cloud/Enterprise organization. Requires `terraform_org_name` and `team_name`; optional `visibility` ("secret" or "organization"). [427](https://github.com/hashicorp/terraform-mcp-server/pull/427)
 
+FIXES
+
+* `get_apply_logs` now checks the apply status before attempting to stream logs. If the apply is not yet in a terminal state (`finished`, `errored`, `canceled`), the tool returns an informative message instead of timing out.
+
 # 1.2.0
 
 FEATURES

pkg/tools/tfe/get_apply_logs.go

@@ -5,8 +5,11 @@ package tools
 
 import (
 	"context"
+	"fmt"
 	"io"
+	"slices"
 
+	tfe "github.com/hashicorp/go-tfe"
 	"github.com/hashicorp/terraform-mcp-server/pkg/client"
 	"github.com/mark3labs/mcp-go/mcp"
 	"github.com/mark3labs/mcp-go/server"
@@ -43,6 +46,24 @@ func getApplyLogsHandler(ctx context.Context, request mcp.CallToolRequest, logge
 		return ToolError(logger, "failed to get Terraform client", err)
 	}
 
+	apply, err := tfeClient.Applies.Read(ctx, applyID)
+	if err != nil {
+		return ToolErrorf(logger, "apply not found: %s", applyID)
+	}
+
+	terminalStatuses := []tfe.ApplyStatus{
+		tfe.ApplyErrored,
+		tfe.ApplyFinished,
+		tfe.ApplyCanceled,
+	}
+
+	if !slices.Contains(terminalStatuses, apply.Status) {
+		return mcp.NewToolResultText(fmt.Sprintf(
+			"Apply %s is currently in status %q. Wait for the status to change to a terminal state (finished, errored, canceled) before calling again.",
+			applyID, apply.Status,
+		)), nil
+	}
+
 	logReader, err := tfeClient.Applies.Logs(ctx, applyID)
 	if err != nil {
 		return ToolErrorf(logger, "failed to retrieve apply logs: %s", applyID)