diff --git a/xtest/setup-cli-tool/action.yaml b/xtest/setup-cli-tool/action.yaml
index 3cb5e95a9..9c446de47 100644
--- a/xtest/setup-cli-tool/action.yaml
+++ b/xtest/setup-cli-tool/action.yaml
@@ -175,14 +175,12 @@ runs:
               checkout_path="${INPUT_PATH}/${INPUT_SDK}/platform-src/${tag}"
             fi
           elif [[ "$INPUT_SDK" == "go" && -n "$PLATFORM_OTDFCTL_DIR" && "$needs_source" == "true" ]]; then
-            # Auto-detect fallback: resolver used standalone repo but the
-            # test job detected otdfctl in the platform checkout.
-            # NOTE: SHA comparison across repos is not meaningful (the standalone
-            # repo and platform repo have different commit histories), so we
-            # cannot safely reuse the platform checkout here. Fall through to
-            # a standalone checkout. To use the platform source, set
-            # otdfctl-source=platform explicitly.
-            echo "::notice::Go version ${tag} resolved from standalone repo; platform checkout available but cannot auto-reuse (different repo). Set otdfctl-source=platform to use the platform source."
+            # Auto-detect: resolver used standalone repo but detect-otdfctl found
+            # an embedded otdfctl/ in the platform checkout. PLATFORM_OTDFCTL_DIR
+            # is only set after confirming the directory exists, so reuse it directly.
+            echo "::notice::Go version ${tag} resolved from standalone repo; reusing platform-embedded otdfctl at $PLATFORM_OTDFCTL_DIR."
+            use_existing=true
+            needs_source=false
           fi
 
           echo "needs-checkout-${slot}=${needs_source}" >> "$GITHUB_OUTPUT"