Added ability to skip pre-apply plan

README.md

@@ -21,6 +21,7 @@ The Overmind plugin installs the Overmind CLI (and GitHub CLI) and executes one
 | `post_comment`     | Whether `wait-for-simulation` should post the Overmind markdown to GitHub PR or GitLab MR. Defaults to `true` when running against a PR/MR, otherwise `false`. When `true`, `comment_provider` must be set. | No       |
 | `comment_provider` | Where `wait-for-simulation` should post comments when `post_comment=true`. Must be one of: `github`, `gitlab`.                                                                                              | No       |
 | `on_failure`       | Behavior when the plugin step errors. `fail` (default) fails the step and blocks the deployment; `pass` allows the deployment to continue even if this step errors. Must be one of: `fail`, `pass`.         | No       |
+| `skip_after_approval` | When `true` (default), `submit-plan` exits early once a deployment has been approved (`ENV0_REVIEWER_NAME` is set), avoiding duplicate analysis from the post-approval re-plan. Set to `false` to submit on every plan. | No       |
 
 ## Usage
 
@@ -222,6 +223,8 @@ deploy:
             api_key: ${OVERMIND_API_KEY}
 ```
 
+> **Note:** By default, `submit-plan` runs only on the first plan (typically the PR/MR plan). The post-approval re-plan is automatically skipped to avoid duplicate Overmind analysis. Set `skip_after_approval: false` to submit on every plan.
+
 ## How It Works
 
 1. **Installation**: The plugin automatically installs the latest version of the Overmind CLI and GitHub CLI (for GitHub support) to a writable directory in your PATH. GitLab support uses `curl` which is typically available on most systems.
@@ -236,6 +239,8 @@ deploy:
 
 4. **Ticket Links**: When `ENV0_PR_NUMBER` is set (i.e., the deployment is triggered by a PR/MR), the plugin constructs a stable merge request URL from `ENV0_PR_SOURCE_REPOSITORY` (or `ENV0_TEMPLATE_REPOSITORY` as a fallback) and `ENV0_PR_NUMBER`. This ensures multiple plans for the same MR update the same Overmind change. For non-PR deployments, the ticket link falls back to the env0 deployment URL.
 
+5. **Post-Approval Re-Plan Gating**: env0 always re-runs `terraformPlan` between approval and apply, even when the code hasn't changed. By default (`skip_after_approval: true`), the plugin detects this by checking `ENV0_REVIEWER_NAME` (set by env0 after a reviewer approves) and skips the redundant `submit-plan`. This avoids duplicate Overmind analysis and prevents `start-change` from waiting on a second analysis that no human will review. Set `skip_after_approval: false` if you need both submissions (e.g. auto-deploy environments with no prior PR plan).
+
 ## Requirements
 
 - The plugin requires env0 environment variables to be available:

env0.plugin.yaml

@@ -22,6 +22,9 @@ inputs:
   on_failure:
     description: "Behavior when an error occurs. 'fail' (default) fails the plugin step and blocks the deployment; 'pass' allows the deployment to continue even if this step errors."
     required: false
+  skip_after_approval:
+    description: "When true (default), submit-plan exits early once a deployment has been approved (ENV0_REVIEWER_NAME is set), avoiding wasted resubmission of the post-approval re-plan. Set to false to submit on every plan, including the apply pipeline's re-plan."
+    required: false
 run:
   exec: |
     #!/bin/sh
@@ -255,6 +258,16 @@ run:
     # Execute the appropriate action based on input
     case "${inputs.action}" in
         submit-plan)
+            _skip_after_approval="${inputs.skip_after_approval}"
+            _skip_after_approval=$(echo "${_skip_after_approval:-true}" | tr '[:upper:]' '[:lower:]')
+            case "${_skip_after_approval}" in
+                true|false) ;;
+                *) echo "Error: skip_after_approval must be 'true' or 'false'"; exit 1 ;;
+            esac
+            if [ "${_skip_after_approval}" = "true" ] && [ -n "${ENV0_REVIEWER_NAME}" ]; then
+                echo "Skipping submit-plan: deployment past approval (ENV0_REVIEWER_NAME=${ENV0_REVIEWER_NAME}). Set skip_after_approval=false to override."
+                exit 0
+            fi
             if [ -z "${ENV0_TF_PLAN_JSON}" ]; then
                 echo "Error: ENV0_TF_PLAN_JSON environment variable is not set"
                 exit 1